Fix loadLastRun

This commit is contained in:
Philoul 2022-06-08 07:42:00 +02:00
parent 31d9c0ea50
commit 9be6424c25

View file

@ -351,6 +351,7 @@ class AutotunePlugin @Inject constructor(
fun loadLastRun() { fun loadLastRun() {
result = "" result = ""
lastRunSuccess = false lastRunSuccess = false
try {
val json = JSONObject(sp.getString(R.string.key_autotune_last_run, "")) val json = JSONObject(sp.getString(R.string.key_autotune_last_run, ""))
lastNbDays = JsonHelper.safeGetString(json, "lastNbDays", "") lastNbDays = JsonHelper.safeGetString(json, "lastNbDays", "")
lastRun = JsonHelper.safeGetLong(json, "lastRun") lastRun = JsonHelper.safeGetLong(json, "lastRun")
@ -359,7 +360,7 @@ class AutotunePlugin @Inject constructor(
var localInsulin = LocalInsulin("PumpInsulin", pumpPeak, pumpDia) var localInsulin = LocalInsulin("PumpInsulin", pumpPeak, pumpDia)
selectedProfile = JsonHelper.safeGetString(json, "pumpProfileName", "") selectedProfile = JsonHelper.safeGetString(json, "pumpProfileName", "")
val profile = JsonHelper.safeGetJSONObject(json, "pumpProfile", null)?.let { pureProfileFromJson(it, dateUtil) } val profile = JsonHelper.safeGetJSONObject(json, "pumpProfile", null)?.let { pureProfileFromJson(it, dateUtil) }
?:return ?: return
pumpProfile = ATProfile(ProfileSealed.Pure(profile), localInsulin, injector).also { it.profilename = selectedProfile } pumpProfile = ATProfile(ProfileSealed.Pure(profile), localInsulin, injector).also { it.profilename = selectedProfile }
val tunedPeak = JsonHelper.safeGetInt(json, "tunedPeak") val tunedPeak = JsonHelper.safeGetInt(json, "tunedPeak")
val tunedDia = JsonHelper.safeGetDouble(json, "tunedDia") val tunedDia = JsonHelper.safeGetDouble(json, "tunedDia")
@ -376,6 +377,8 @@ class AutotunePlugin @Inject constructor(
result = JsonHelper.safeGetString(json, "result", "") result = JsonHelper.safeGetString(json, "result", "")
updateButtonVisibility = JsonHelper.safeGetInt(json, "updateButtonVisibility") updateButtonVisibility = JsonHelper.safeGetInt(json, "updateButtonVisibility")
lastRunSuccess = true lastRunSuccess = true
} catch (e: Exception) {
}
} }
fun calcDays(daysBack:Int): Int { fun calcDays(daysBack:Int): Int {