caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #2788 from jbr7rr/medtrum-fixes

Browse source 
Medtrum: Move Initializers to onStart()
This commit is contained in:
Milos Kozak 2023-09-16 16:24:49 +02:00 committed by GitHub
parent c6f0da396f ac50149563
commit 7bed95f131
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pump/medtrum/src/main/java/info/nightscout/pump/medtrum/MedtrumPlugin.kt
View file

@ -95,6 +95,7 @@ import kotlin.math.abs
override fun onStart() { override fun onStart() {
super.onStart() super.onStart()
aapsLogger.debug(LTag.PUMP, "MedtrumPlugin onStart()") aapsLogger.debug(LTag.PUMP, "MedtrumPlugin onStart()")
medtrumPump.loadVarsFromSP()
val intent = Intent(context, MedtrumService::class.java) val intent = Intent(context, MedtrumService::class.java)
context.bindService(intent, mConnection, Context.BIND_AUTO_CREATE) context.bindService(intent, mConnection, Context.BIND_AUTO_CREATE)
disposable += rxBus disposable += rxBus

22
pump/medtrum/src/main/java/info/nightscout/pump/medtrum/MedtrumPump.kt
View file

@ -279,7 +279,16 @@ class MedtrumPump @Inject constructor(
var desiredHourlyMaxInsulin: Int = 40 var desiredHourlyMaxInsulin: Int = 40
var desiredDailyMaxInsulin: Int = 180 var desiredDailyMaxInsulin: Int = 180
init { fun pumpType(): PumpType = pumpType(deviceType)
fun pumpType(type: Int): PumpType =
when (type) {
MedtrumSnUtil.MD_0201, MedtrumSnUtil.MD_8201 -> PumpType.MEDTRUM_NANO
MedtrumSnUtil.MD_8301 -> PumpType.MEDTRUM_300U
else -> PumpType.MEDTRUM_UNTESTED
}
fun loadVarsFromSP() {
// Load stuff from SP // Load stuff from SP
_patchSessionToken = sp.getLong(R.string.key_session_token, 0L) _patchSessionToken = sp.getLong(R.string.key_session_token, 0L)
_lastConnection = sp.getLong(R.string.key_last_connection, 0L) _lastConnection = sp.getLong(R.string.key_last_connection, 0L)
@ -304,17 +313,10 @@ class MedtrumPump @Inject constructor(
} catch (e: Exception) { } catch (e: Exception) {
aapsLogger.warn(LTag.PUMP, "Error decoding basal profile from SP: $encodedString") aapsLogger.warn(LTag.PUMP, "Error decoding basal profile from SP: $encodedString")
} }
loadUserSettingsFromSP()
} }
fun pumpType(): PumpType = pumpType(deviceType)
fun pumpType(type: Int): PumpType =
when (type) {
MedtrumSnUtil.MD_0201, MedtrumSnUtil.MD_8201 -> PumpType.MEDTRUM_NANO
MedtrumSnUtil.MD_8301 -> PumpType.MEDTRUM_300U
else -> PumpType.MEDTRUM_UNTESTED
}
fun loadUserSettingsFromSP() { fun loadUserSettingsFromSP() {
desiredPatchExpiration = sp.getBoolean(R.string.key_patch_expiration, false) desiredPatchExpiration = sp.getBoolean(R.string.key_patch_expiration, false)
val alarmSettingCode = sp.getString(R.string.key_alarm_setting, AlarmSetting.LIGHT_VIBRATE_AND_BEEP.code.toString()).toByte() val alarmSettingCode = sp.getString(R.string.key_alarm_setting, AlarmSetting.LIGHT_VIBRATE_AND_BEEP.code.toString()).toByte()

2
pump/medtrum/src/main/java/info/nightscout/pump/medtrum/services/MedtrumService.kt
View file

@ -145,8 +145,6 @@ class MedtrumService : DaggerService(), BLECommCallback {
handleConnectionStateChange(connectionState) handleConnectionStateChange(connectionState)
} }
} }
medtrumPump.loadUserSettingsFromSP()
} }
override fun onDestroy() { override fun onDestroy() {