From b1e358e8b0f0a3524b8db6df8d1fbfd4f4484ed7 Mon Sep 17 00:00:00 2001 From: Bart Sopers Date: Sun, 15 Dec 2019 22:21:05 +0100 Subject: [PATCH] Fix logic for choosing short Omnipod setup wizard --- .../pump/omnipod/dialogs/PodManagementActivity.kt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/PodManagementActivity.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/PodManagementActivity.kt index 73d4319a07..c42a288b72 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/PodManagementActivity.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/PodManagementActivity.kt @@ -12,11 +12,10 @@ import info.nightscout.androidaps.activities.NoSplashActivity import info.nightscout.androidaps.events.EventRefreshOverview import info.nightscout.androidaps.plugins.bus.RxBus import info.nightscout.androidaps.plugins.pump.omnipod.defs.SetupProgress -import info.nightscout.androidaps.plugins.pump.omnipod.driver.comm.AapsOmnipodManager -import info.nightscout.androidaps.plugins.pump.omnipod.dialogs.wizard.initpod.InitPodCancelAction import info.nightscout.androidaps.plugins.pump.omnipod.dialogs.wizard.initpod.InitPodWizardModel import info.nightscout.androidaps.plugins.pump.omnipod.dialogs.wizard.pages.InitPodRefreshAction import info.nightscout.androidaps.plugins.pump.omnipod.dialogs.wizard.removepod.RemovePodWizardModel +import info.nightscout.androidaps.plugins.pump.omnipod.driver.comm.AapsOmnipodManager import info.nightscout.androidaps.plugins.pump.omnipod.events.EventOmnipodPumpValuesChanged import info.nightscout.androidaps.plugins.pump.omnipod.util.OmnipodUtil import info.nightscout.androidaps.utils.OKDialog @@ -85,7 +84,9 @@ class PodManagementActivity : NoSplashActivity() { wizardPagerContext.clearContext() wizardPagerContext.pagerSettings = pagerSettings - wizardPagerContext.wizardModel = InitPodWizardModel(applicationContext, OmnipodUtil.getPodSessionState() == null) + val podSessionState = OmnipodUtil.getPodSessionState() + val isFullInit = podSessionState == null || podSessionState.setupProgress.isBefore(SetupProgress.PRIMING_FINISHED) + wizardPagerContext.wizardModel = InitPodWizardModel(applicationContext, isFullInit) val myIntent = Intent(this@PodManagementActivity, WizardPagerActivity::class.java) this@PodManagementActivity.startActivity(myIntent) @@ -132,10 +133,10 @@ class PodManagementActivity : NoSplashActivity() { initpod_init_pod.isEnabled = (OmnipodUtil.getPodSessionState() == null || OmnipodUtil.getPodSessionState().getSetupProgress().isBefore(SetupProgress.COMPLETED)) - val isPodSessionActive = (OmnipodUtil.getPodSessionState()!=null) + val isPodSessionActive = (OmnipodUtil.getPodSessionState() != null) initpod_remove_pod.isEnabled = isPodSessionActive initpod_reset_pod.isEnabled = isPodSessionActive } -} \ No newline at end of file +}