From 9be6424c25df159e858a2d491b41576857cf8ec7 Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Wed, 8 Jun 2022 07:42:00 +0200
Subject: [PATCH] Fix loadLastRun

---
 .../general/autotune/AutotunePlugin.kt        | 51 ++++++++++---------
 1 file changed, 27 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/autotune/AutotunePlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/autotune/AutotunePlugin.kt
index 1e5a83fe7a..bd14feee11 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/autotune/AutotunePlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/autotune/AutotunePlugin.kt
@@ -351,31 +351,34 @@ class AutotunePlugin @Inject constructor(
     fun loadLastRun() {
         result = ""
         lastRunSuccess = false
-        val json = JSONObject(sp.getString(R.string.key_autotune_last_run, ""))
-        lastNbDays = JsonHelper.safeGetString(json, "lastNbDays", "")
-        lastRun = JsonHelper.safeGetLong(json, "lastRun")
-        val pumpPeak = JsonHelper.safeGetInt(json, "pumpPeak")
-        val pumpDia = JsonHelper.safeGetDouble(json, "pumpDia")
-        var localInsulin = LocalInsulin("PumpInsulin", pumpPeak, pumpDia)
-        selectedProfile = JsonHelper.safeGetString(json, "pumpProfileName", "")
-        val profile = JsonHelper.safeGetJSONObject(json, "pumpProfile", null)?.let { pureProfileFromJson(it, dateUtil) }
-            ?:return
-        pumpProfile = ATProfile(ProfileSealed.Pure(profile), localInsulin, injector).also { it.profilename = selectedProfile }
-        val tunedPeak = JsonHelper.safeGetInt(json, "tunedPeak")
-        val tunedDia = JsonHelper.safeGetDouble(json, "tunedDia")
-        localInsulin = LocalInsulin("PumpInsulin", tunedPeak, tunedDia)
-        val tunedProfileName = JsonHelper.safeGetString(json, "tunedProfileName", "")
-        val tuned = JsonHelper.safeGetJSONObject(json, "tunedProfile", null)?.let { pureProfileFromJson(it, dateUtil) }
-            ?: return
-        val circadianTuned = JsonHelper.safeGetJSONObject(json, "tunedCircadianProfile", null)?.let { pureProfileFromJson(it, dateUtil) }
-            ?: return
-        tunedProfile = ATProfile(ProfileSealed.Pure(tuned), localInsulin, injector).also { atProfile ->
-            atProfile.profilename = tunedProfileName
-            atProfile.circadianProfile = ProfileSealed.Pure(circadianTuned)
+        try {
+            val json = JSONObject(sp.getString(R.string.key_autotune_last_run, ""))
+            lastNbDays = JsonHelper.safeGetString(json, "lastNbDays", "")
+            lastRun = JsonHelper.safeGetLong(json, "lastRun")
+            val pumpPeak = JsonHelper.safeGetInt(json, "pumpPeak")
+            val pumpDia = JsonHelper.safeGetDouble(json, "pumpDia")
+            var localInsulin = LocalInsulin("PumpInsulin", pumpPeak, pumpDia)
+            selectedProfile = JsonHelper.safeGetString(json, "pumpProfileName", "")
+            val profile = JsonHelper.safeGetJSONObject(json, "pumpProfile", null)?.let { pureProfileFromJson(it, dateUtil) }
+                ?: return
+            pumpProfile = ATProfile(ProfileSealed.Pure(profile), localInsulin, injector).also { it.profilename = selectedProfile }
+            val tunedPeak = JsonHelper.safeGetInt(json, "tunedPeak")
+            val tunedDia = JsonHelper.safeGetDouble(json, "tunedDia")
+            localInsulin = LocalInsulin("PumpInsulin", tunedPeak, tunedDia)
+            val tunedProfileName = JsonHelper.safeGetString(json, "tunedProfileName", "")
+            val tuned = JsonHelper.safeGetJSONObject(json, "tunedProfile", null)?.let { pureProfileFromJson(it, dateUtil) }
+                ?: return
+            val circadianTuned = JsonHelper.safeGetJSONObject(json, "tunedCircadianProfile", null)?.let { pureProfileFromJson(it, dateUtil) }
+                ?: return
+            tunedProfile = ATProfile(ProfileSealed.Pure(tuned), localInsulin, injector).also { atProfile ->
+                atProfile.profilename = tunedProfileName
+                atProfile.circadianProfile = ProfileSealed.Pure(circadianTuned)
+            }
+            result = JsonHelper.safeGetString(json, "result", "")
+            updateButtonVisibility = JsonHelper.safeGetInt(json, "updateButtonVisibility")
+            lastRunSuccess = true
+        } catch (e: Exception) {
         }
-        result = JsonHelper.safeGetString(json, "result", "")
-        updateButtonVisibility = JsonHelper.safeGetInt(json, "updateButtonVisibility")
-        lastRunSuccess = true
     }
 
     fun calcDays(daysBack:Int): Int {