MDT: fix keys (inc)

core/interfaces/src/main/kotlin/app/aaps/core/interfaces/sharedPreferences/SP.kt

@@ -67,7 +67,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 incLong(key: String)
     fun putBoolean(key: String, value: Boolean)
     fun putBoolean(@StringRes resourceID: Int, value: Boolean)
     fun putDouble(key: String, value: Double)
@@ -76,7 +76,7 @@ interface SP {
     fun putLong(@StringRes resourceID: Int, value: Long)
     fun putInt(key: String, value: Int)
     fun putInt(@StringRes resourceID: Int, value: Int)
-    fun incInt(@StringRes resourceID: Int)
+    fun incInt(key: String)
     fun putString(@StringRes resourceID: Int, value: String)
     fun putString(key: String, value: String)
 }

core/keys/src/main/kotlin/app/aaps/core/keys/Preferences.kt

@@ -333,6 +333,14 @@ interface Preferences {
      */
     fun get(key: LongPreferenceKey): Long
 
+    /**
+     * Increment [Long] value in [android.content.SharedPreferences]
+     *
+     * @param key [LongNonPreferenceKey] enum
+     * @param value value
+     */
+    fun inc(key: LongNonPreferenceKey)
+
     /**
      * Get [String] value from [android.content.SharedPreferences]
      * *

implementation/src/main/kotlin/app/aaps/implementation/sharedPreferences/PreferencesImpl.kt

@@ -158,7 +158,7 @@ class PreferencesImpl @Inject constructor(
     }
 
     override fun inc(key: IntNonPreferenceKey) {
-        sp.putInt(key.key, get(key) + 1)
+        sp.incInt(key.key)
     }
 
     override fun get(key: IntPreferenceKey): Int =
@@ -170,6 +170,10 @@ class PreferencesImpl @Inject constructor(
     override fun get(key: LongNonPreferenceKey): Long =
         sp.getLong(key.key, key.defaultValue)
 
+    override fun inc(key: LongNonPreferenceKey) {
+        sp.incLong(key.key)
+    }
+
     override fun getIfExists(key: LongNonPreferenceKey): Long? =
         if (sp.contains(key.key)) sp.getLong(key.key, key.defaultValue) else null
 

pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/InternalSP.kt

@@ -168,9 +168,14 @@ class InternalSP(
         }
     }
 
-    override fun incLong(resourceID: Int) {
-        val value = getLong(resourceID, 0) + 1L
-        sharedPreferences.edit().putLong(context.getString(resourceID), value).apply()
+    override fun incLong(key: String) {
+        val value = getLong(key, 0) + 1L
+        sharedPreferences.edit().putLong(key, value).apply()
+    }
+
+    override fun incInt(key: String) {
+        val value = getInt(key, 0) + 1
+        sharedPreferences.edit().putInt(key, value).apply()
     }
 
     override fun putBoolean(key: String, value: Boolean) = sharedPreferences.edit().putBoolean(key, value).apply()
@@ -197,11 +202,6 @@ class InternalSP(
     override fun putInt(resourceID: Int, value: Int) =
         sharedPreferences.edit().putInt(context.getString(resourceID), value).apply()
 
-    override fun incInt(resourceID: Int) {
-        val value = getInt(resourceID, 0) + 1
-        sharedPreferences.edit().putInt(context.getString(resourceID), value).apply()
-    }
-
     override fun putString(resourceID: Int, value: String) =
         sharedPreferences.edit().putString(context.getString(resourceID), value).apply()
 

pump/medtronic/src/main/kotlin/app/aaps/pump/medtronic/MedtronicPumpPlugin.kt

@@ -93,7 +93,6 @@ import app.aaps.pump.medtronic.driver.MedtronicPumpStatus
 import app.aaps.pump.medtronic.events.EventMedtronicPumpConfigurationChanged
 import app.aaps.pump.medtronic.events.EventMedtronicPumpValuesChanged
 import app.aaps.pump.medtronic.keys.MedtronicBooleanPreferenceKey
-import app.aaps.pump.medtronic.keys.MedtronicIntNonKey
 import app.aaps.pump.medtronic.keys.MedtronicIntPreferenceKey
 import app.aaps.pump.medtronic.keys.MedtronicLongNonKey
 import app.aaps.pump.medtronic.keys.MedtronicStringPreferenceKey
@@ -150,7 +149,7 @@ class MedtronicPumpPlugin @Inject constructor(
     ownPreferences = listOf(
         RileylinkBooleanPreferenceKey::class.java, RileyLinkDoubleKey::class.java, RileyLinkIntentPreferenceKey::class.java,
         RileyLinkLongKey::class.java, RileyLinkStringKey::class.java, RileyLinkStringPreferenceKey::class.java,
-        MedtronicBooleanPreferenceKey::class.java, MedtronicIntNonKey::class.java, MedtronicIntPreferenceKey::class.java,
+        MedtronicBooleanPreferenceKey::class.java, MedtronicIntPreferenceKey::class.java,
         MedtronicLongNonKey::class.java, MedtronicStringPreferenceKey::class.java
     ),
     PumpType.MEDTRONIC_522_722,  // we default to most basic model, correct model from config is loaded later
@@ -675,7 +674,7 @@ class MedtronicPumpPlugin @Inject constructor(
 
                 // we subtract insulin, exact amount will be visible with next remainingInsulin update.
                 medtronicPumpStatus.reservoirRemainingUnits = medtronicPumpStatus.reservoirRemainingUnits - detailedBolusInfo.insulin
-                preferences.inc(if (detailedBolusInfo.bolusType === BS.Type.SMB) MedtronicIntNonKey.SmbBoluses else MedtronicIntNonKey.StandardBoluses)
+                preferences.inc(if (detailedBolusInfo.bolusType === BS.Type.SMB) MedtronicLongNonKey.SmbBoluses else MedtronicLongNonKey.StandardBoluses)
 
                 // calculate time for bolus and set driver to busy for that time
                 val bolusTime = (detailedBolusInfo.insulin * 42.0).toInt()
@@ -787,7 +786,7 @@ class MedtronicPumpPlugin @Inject constructor(
             medtronicPumpStatus.runningTBRWithTemp = tempData
             pumpSyncStorage.addTemporaryBasalRateWithTempId(tempData, true, this)
 
-            preferences.inc(MedtronicIntNonKey.TbrsSet)
+            preferences.inc(MedtronicLongNonKey.TbrsSet)
             finishAction("TBR")
             instantiator.providePumpEnactResult().success(true).enacted(true) //
                 .absolute(absoluteRate).duration(durationInMinutes)

pump/medtronic/src/main/kotlin/app/aaps/pump/medtronic/keys/MedtronicLongNonKey.kt

@@ -7,6 +7,9 @@ enum class MedtronicLongNonKey(
     override val defaultValue: Long,
 ) : LongNonPreferenceKey {
 
+    TbrsSet("medtronic_tbrs_set", 0),
+    SmbBoluses("medtronic_smb_boluses_delivered", 0),
+    StandardBoluses("medtronic_std_boluses_delivered", 0),
     FirstPumpUse("medtronic_first_pump_use", 0),
     LastGoodPumpCommunicationTime("medtronic_lastGoodPumpCommunicationTime", 0L),
     LastPumpHistoryEntry("medtronic_pump_history_entry", 0L),

shared/impl/src/main/kotlin/app/aaps/shared/impl/sharedPreferences/SPImpl.kt

@@ -159,9 +159,9 @@ class SPImpl @Inject constructor(
             SafeParse.stringToLong(sharedPreferences.getString(key, defaultValue.toString()), defaultValue)
         }
 
-    override fun incLong(resourceID: Int) {
-        val value = getLong(resourceID, 0) + 1L
-        sharedPreferences.edit().putLong(context.getString(resourceID), value).apply()
+    override fun incLong(key: String) {
+        val value = getLong(key, 0) + 1L
+        sharedPreferences.edit().putLong(key, value).apply()
     }
 
     override fun putBoolean(key: String, value: Boolean) = sharedPreferences.edit().putBoolean(key, value).apply()
@@ -187,9 +187,9 @@ class SPImpl @Inject constructor(
     override fun putInt(resourceID: Int, value: Int) =
         sharedPreferences.edit().putInt(context.getString(resourceID), value).apply()
 
-    override fun incInt(resourceID: Int) {
-        val value = getInt(resourceID, 0) + 1
-        sharedPreferences.edit().putInt(context.getString(resourceID), value).apply()
+    override fun incInt(key: String) {
+        val value = getInt(key, 0) + 1
+        sharedPreferences.edit().putInt(key, value).apply()
     }
 
     override fun putString(resourceID: Int, value: String) =

wear/src/main/kotlin/app/aaps/wear/sharedPreferences/PreferencesImpl.kt

@@ -123,7 +123,7 @@ class PreferencesImpl @Inject constructor(
     }
 
     override fun inc(key: IntNonPreferenceKey) {
-        sp.putInt(key.key, get(key) + 1)
+        sp.incInt(key.key)
     }
 
     override fun get(key: IntPreferenceKey): Int = sp.getInt(key.key, key.defaultValue)
@@ -139,6 +139,10 @@ class PreferencesImpl @Inject constructor(
 
     override fun get(key: LongPreferenceKey): Long = sp.getLong(key.key, key.defaultValue)
 
+    override fun inc(key: LongNonPreferenceKey) {
+        sp.incLong(key.key)
+    }
+
     override fun remove(key: NonPreferenceKey) {
         sp.remove(key.key)
     }