catch NPE

combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java

@@ -650,11 +650,7 @@ public class ComboPlugin extends PumpPluginBase implements Pump, Constraints {
     }
 
     private void incrementBolusCount() {
-        try {
+        sp.incLong(R.string.combo_boluses_delivered);
-            sp.putLong(R.string.combo_boluses_delivered, sp.getLong(R.string.combo_boluses_delivered, 0L) + 1);
-        } catch (Exception e) {
-            // ignore
-        }
     }
 
     public Long getTbrsSet() {

core/src/main/java/info/nightscout/androidaps/utils/sharedPreferences/SP.kt

@@ -26,6 +26,7 @@ interface SP {
     fun getInt(key: String, defaultValue: Int): Int
     fun getLong(@StringRes resourceID: Int, defaultValue: Long): Long
     fun getLong(key: String, defaultValue: Long): Long
+    fun incLong(@StringRes resourceID: Int)
     fun putBoolean(key: String, value: Boolean)
     fun putBoolean(@StringRes resourceID: Int, value: Boolean)
     fun putDouble(key: String, value: Double)

core/src/main/java/info/nightscout/androidaps/utils/sharedPreferences/SPImplementation.kt

@@ -82,7 +82,11 @@ class SPImplementation @Inject constructor(
         return try {
             sharedPreferences.getLong(rh.gs(resourceID), defaultValue)
         } catch (e: Exception) {
+            try {
                 SafeParse.stringToLong(sharedPreferences.getString(rh.gs(resourceID), defaultValue.toString()))
+            } catch (e: Exception) {
+                defaultValue
+            }
         }
     }
 
@@ -98,6 +102,11 @@ class SPImplementation @Inject constructor(
         }
     }
 
+    override fun incLong(resourceID: Int) {
+        val value = getLong(resourceID, 0) + 1L
+        sharedPreferences.edit().putLong(rh.gs(resourceID), value).apply()
+    }
+
     override fun putBoolean(key: String, value: Boolean) = sharedPreferences.edit().putBoolean(key, value).apply()
 
     override fun putBoolean(resourceID: Int, value: Boolean) =