From 43a3d8d8de7149a0a34a0127b7363a853a131388 Mon Sep 17 00:00:00 2001 From: jbr7rr <> Date: Sun, 21 Jan 2024 19:38:15 +0100 Subject: [PATCH] Fix stuck on error when activation failed due to disconnect > Remove PatchStep.ERROR state --- .../main/java/info/nightscout/pump/medtrum/code/PatchStep.kt | 1 - .../info/nightscout/pump/medtrum/ui/MedtrumActivateFragment.kt | 1 - .../java/info/nightscout/pump/medtrum/ui/MedtrumActivity.kt | 1 - .../pump/medtrum/ui/MedtrumDeactivatePatchFragment.kt | 1 - .../info/nightscout/pump/medtrum/ui/MedtrumPrimingFragment.kt | 1 - .../nightscout/pump/medtrum/ui/viewmodel/MedtrumViewModel.kt | 2 -- 6 files changed, 7 deletions(-) diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/code/PatchStep.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/code/PatchStep.kt index ea0cdf3d28..401dfa9a97 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/code/PatchStep.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/code/PatchStep.kt @@ -15,7 +15,6 @@ enum class PatchStep { ACTIVATE_COMPLETE, RETRY_ACTIVATION, RETRY_ACTIVATION_CONNECT, - ERROR, CANCEL, COMPLETE; } diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumActivateFragment.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumActivateFragment.kt index 44df41ee78..e56b0b800d 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumActivateFragment.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumActivateFragment.kt @@ -38,7 +38,6 @@ class MedtrumActivateFragment : MedtrumBaseFragment moveStep(PatchStep.ACTIVATE_COMPLETE) MedtrumViewModel.SetupStep.ERROR -> { - moveStep(PatchStep.ERROR) updateSetupStep(MedtrumViewModel.SetupStep.PRIMED) // Reset setup step binding.textActivatingPump.text = rh.gs(R.string.activating_error) binding.btnPositive.visibility = View.VISIBLE diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumActivity.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumActivity.kt index 65bec84601..94136e78fd 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumActivity.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumActivity.kt @@ -43,7 +43,6 @@ class MedtrumActivity : MedtrumBaseActivity() { PatchStep.ATTACH_PATCH -> setupViewFragment(MedtrumAttachPatchFragment.newInstance()) PatchStep.ACTIVATE -> setupViewFragment(MedtrumActivateFragment.newInstance()) PatchStep.ACTIVATE_COMPLETE -> setupViewFragment(MedtrumActivateCompleteFragment.newInstance()) - PatchStep.ERROR -> Unit // Do nothing, let activity handle this PatchStep.RETRY_ACTIVATION -> setupViewFragment(MedtrumRetryActivationFragment.newInstance()) PatchStep.RETRY_ACTIVATION_CONNECT -> setupViewFragment(MedtrumRetryActivationConnectFragment.newInstance()) PatchStep.START_DEACTIVATION -> setupViewFragment(MedtrumStartDeactivationFragment.newInstance()) diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumDeactivatePatchFragment.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumDeactivatePatchFragment.kt index 9201a158da..cdf039bb5d 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumDeactivatePatchFragment.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumDeactivatePatchFragment.kt @@ -38,7 +38,6 @@ class MedtrumDeactivatePatchFragment : MedtrumBaseFragment { - moveStep(PatchStep.ERROR) updateSetupStep(MedtrumViewModel.SetupStep.START_DEACTIVATION) // Reset setup step binding.textDeactivatingPump.text = rh.gs(R.string.deactivating_error) binding.btnNegative.visibility = View.VISIBLE diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPrimingFragment.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPrimingFragment.kt index 245e4a9526..13012c3eb4 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPrimingFragment.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPrimingFragment.kt @@ -39,7 +39,6 @@ class MedtrumPrimingFragment : MedtrumBaseFragment moveStep(PatchStep.PRIME_COMPLETE) MedtrumViewModel.SetupStep.ERROR -> { - moveStep(PatchStep.ERROR) updateSetupStep(MedtrumViewModel.SetupStep.FILLED) // Reset setup step binding.textWaitForPriming.text = rh.gs(R.string.priming_error) binding.btnNegative.visibility = View.VISIBLE diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/viewmodel/MedtrumViewModel.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/viewmodel/MedtrumViewModel.kt index a5e38c7c22..3745ab05e9 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/viewmodel/MedtrumViewModel.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/viewmodel/MedtrumViewModel.kt @@ -137,7 +137,6 @@ class MedtrumViewModel @Inject constructor( PatchStep.CANCEL, PatchStep.COMPLETE, PatchStep.ACTIVATE_COMPLETE, - PatchStep.ERROR, PatchStep.START_DEACTIVATION, PatchStep.DEACTIVATE, PatchStep.FORCE_DEACTIVATION, @@ -307,7 +306,6 @@ class MedtrumViewModel @Inject constructor( PatchStep.COMPLETE, PatchStep.FORCE_DEACTIVATION, - PatchStep.ERROR, PatchStep.CANCEL -> _title.value }