caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

EOPATCH: rollback specialEnableCondition change

Browse source
This commit is contained in:
Milos Kozak 2023-06-14 18:13:09 +02:00
parent e27c510f75
commit a5774b6e2e
1 changed files with 26 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/EopatchPumpPlugin.kt
View file

@ -42,6 +42,7 @@ import info.nightscout.shared.utils.DateUtil
import info.nightscout.shared.utils.T import info.nightscout.shared.utils.T
import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.functions.Consumer import io.reactivex.rxjava3.functions.Consumer
import io.reactivex.rxjava3.kotlin.plusAssign
import io.reactivex.rxjava3.subjects.BehaviorSubject import io.reactivex.rxjava3.subjects.BehaviorSubject
import org.json.JSONException import org.json.JSONException
import org.json.JSONObject import org.json.JSONObject
@ -86,39 +87,35 @@ class EopatchPumpPlugin @Inject constructor(
override fun onStart() { override fun onStart() {
super.onStart() super.onStart()
mDisposables.add(rxBus mDisposables += rxBus
.toObservable(EventPreferenceChange::class.java) .toObservable(EventPreferenceChange::class.java)
.observeOn(aapsSchedulers.io) .observeOn(aapsSchedulers.io)
.subscribe({ event: EventPreferenceChange -> .subscribe({ event: EventPreferenceChange ->
if (event.isChanged(rh.gs(SettingKeys.LOW_RESERVOIR_REMINDERS)) || event.isChanged(rh.gs(SettingKeys.EXPIRATION_REMINDERS))) { if (event.isChanged(rh.gs(SettingKeys.LOW_RESERVOIR_REMINDERS)) || event.isChanged(rh.gs(SettingKeys.EXPIRATION_REMINDERS))) {
patchManager.changeReminderSetting() patchManager.changeReminderSetting()
} else if (event.isChanged(rh.gs(SettingKeys.BUZZER_REMINDERS))) { } else if (event.isChanged(rh.gs(SettingKeys.BUZZER_REMINDERS))) {
patchManager.changeBuzzerSetting() patchManager.changeBuzzerSetting()
} }
}) { throwable: Throwable -> fabricPrivacy.logException(throwable) } }, fabricPrivacy::logException)
)
mDisposables.add(rxBus mDisposables += rxBus
.toObservable(EventAppInitialized::class.java) .toObservable(EventAppInitialized::class.java)
.observeOn(aapsSchedulers.io) .observeOn(aapsSchedulers.io)
.subscribe({ .subscribe({
preferenceManager.init() preferenceManager.init()
patchManager.init() patchManager.init()
alarmManager.init() alarmManager.init()
}) { throwable: Throwable -> fabricPrivacy.logException(throwable) } }, fabricPrivacy::logException)
)
}
// following was moved from specialEnableCondition() // following was moved from specialEnableCondition()
// specialEnableCondition() is called too often to add there executive code // specialEnableCondition() is called too often to add there executive code
// This is a required code for maintaining the patch activation phase and maintaining the alarm. It should not be deleted. // This is a required code for maintaining the patch activation phase and maintaining the alarm. It should not be deleted.
override fun specialEnableCondition(): Boolean {
//BG -> FG, restart patch activation and trigger unhandled alarm //BG -> FG, restart patch activation and trigger unhandled alarm
if (preferenceManager.isInitDone()) { if (preferenceManager.isInitDone()) {
patchManager.checkActivationProcess() patchManager.checkActivationProcess()
alarmManager.restartAll() alarmManager.restartAll()
} }
return super.specialEnableCondition()
} }
override fun onStop() { override fun onStop() {
@ -203,12 +200,12 @@ class EopatchPumpPlugin @Inject constructor(
val nb = preferenceManager.getNormalBasalManager().convertProfileToNormalBasal(profile) val nb = preferenceManager.getNormalBasalManager().convertProfileToNormalBasal(profile)
mDisposables.add( mDisposables.add(
patchManager.startBasal(nb) patchManager.startBasal(nb)
.observeOn(aapsSchedulers.main) .observeOn(aapsSchedulers.main)
.subscribe({ response -> .subscribe({ response ->
result.onNext(response.isSuccess) result.onNext(response.isSuccess)
}, { }, {
result.onNext(false) result.onNext(false)
}) })
) )
do { do {