From f66afc8c029e84d538a95776e352bc341a91e810 Mon Sep 17 00:00:00 2001
From: jbr7rr <>
Date: Thu, 13 Jul 2023 09:35:40 +0200
Subject: [PATCH] Confirmation dialog for activation/deactivation cancel

---
 .../medtrum/ui/MedtrumActivateCompleteFragment.kt    |  2 +-
 .../pump/medtrum/ui/MedtrumActivateFragment.kt       | 10 +++++++++-
 .../pump/medtrum/ui/MedtrumAttachPatchFragment.kt    | 11 ++++++++++-
 .../medtrum/ui/MedtrumDeactivatePatchFragment.kt     | 10 +++++++++-
 .../ui/MedtrumDeactivationCompleteFragment.kt        |  2 +-
 .../medtrum/ui/MedtrumPreparePatchConnectFragment.kt | 10 +++++++++-
 .../pump/medtrum/ui/MedtrumPreparePatchFragment.kt   |  2 +-
 .../pump/medtrum/ui/MedtrumPrimeCompleteFragment.kt  | 11 ++++++++++-
 .../pump/medtrum/ui/MedtrumPrimeFragment.kt          | 11 ++++++++++-
 .../pump/medtrum/ui/MedtrumPrimingFragment.kt        | 10 +++++++++-
 .../ui/MedtrumRetryActivationConnectFragment.kt      | 12 +++++++++++-
 .../medtrum/ui/MedtrumRetryActivationFragment.kt     |  2 +-
 .../medtrum/ui/MedtrumStartDeactivationFragment.kt   |  2 +-
 .../main/res/layout/fragment_medtrum_activate.xml    |  3 +--
 .../res/layout/fragment_medtrum_attach_patch.xml     |  3 +--
 .../res/layout/fragment_medtrum_deactivate_patch.xml |  1 -
 .../fragment_medtrum_prepare_patch_connect.xml       |  3 +--
 .../src/main/res/layout/fragment_medtrum_prime.xml   |  3 +--
 .../res/layout/fragment_medtrum_prime_complete.xml   |  3 +--
 .../src/main/res/layout/fragment_medtrum_priming.xml |  3 +--
 .../fragment_medtrum_retry_activation_connect.xml    |  3 +--
 pump/medtrum/src/main/res/values/strings.xml         |  1 +
 22 files changed, 90 insertions(+), 28 deletions(-)

diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumActivateCompleteFragment.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumActivateCompleteFragment.kt
index 7334fee5fb..b714622053 100644
--- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumActivateCompleteFragment.kt
+++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumActivateCompleteFragment.kt
@@ -27,7 +27,7 @@ class MedtrumActivateCompleteFragment : MedtrumBaseFragment<FragmentMedtrumActiv
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         binding.apply {
-            viewModel = ViewModelProvider(requireActivity(), viewModelFactory).get(MedtrumViewModel::class.java)
+            viewModel = ViewModelProvider(requireActivity(), viewModelFactory)[MedtrumViewModel::class.java]
             viewModel?.apply {
                 setupStep.observe(viewLifecycleOwner) {
                     when (it) {
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 fe417c338d..0654dbfa64 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
@@ -3,6 +3,7 @@ package info.nightscout.pump.medtrum.ui
 import android.os.Bundle
 import android.view.View
 import androidx.lifecycle.ViewModelProvider
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
 import info.nightscout.pump.medtrum.R
 import info.nightscout.pump.medtrum.code.PatchStep
@@ -28,7 +29,7 @@ class MedtrumActivateFragment : MedtrumBaseFragment<FragmentMedtrumActivateBindi
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         binding.apply {
-            viewModel = ViewModelProvider(requireActivity(), viewModelFactory).get(MedtrumViewModel::class.java)
+            viewModel = ViewModelProvider(requireActivity(), viewModelFactory)[MedtrumViewModel::class.java]
             viewModel?.apply {
                 setupStep.observe(viewLifecycleOwner) {
                     when (it) {
@@ -51,6 +52,13 @@ class MedtrumActivateFragment : MedtrumBaseFragment<FragmentMedtrumActivateBindi
                 }
                 startActivate()
             }
+            btnNegative.setOnClickListener {
+                OKDialog.showConfirmation(requireActivity(), rh.gs(R.string.cancel_sure)) {
+                    viewModel?.apply {
+                        moveStep(PatchStep.CANCEL)
+                    }
+                }
+            }
         }
     }
 }
diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumAttachPatchFragment.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumAttachPatchFragment.kt
index 04c38c25df..524f6d8139 100644
--- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumAttachPatchFragment.kt
+++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumAttachPatchFragment.kt
@@ -3,8 +3,10 @@ package info.nightscout.pump.medtrum.ui
 import android.os.Bundle
 import android.view.View
 import androidx.lifecycle.ViewModelProvider
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
 import info.nightscout.pump.medtrum.R
+import info.nightscout.pump.medtrum.code.PatchStep
 import info.nightscout.pump.medtrum.databinding.FragmentMedtrumAttachPatchBinding
 import info.nightscout.pump.medtrum.ui.viewmodel.MedtrumViewModel
 import info.nightscout.rx.logging.AAPSLogger
@@ -28,7 +30,7 @@ class MedtrumAttachPatchFragment : MedtrumBaseFragment<FragmentMedtrumAttachPatc
         super.onViewCreated(view, savedInstanceState)
         aapsLogger.debug(LTag.PUMP, "MedtrumAttachPatchFragment onViewCreated")
         binding.apply {
-            viewModel = ViewModelProvider(requireActivity(), viewModelFactory).get(MedtrumViewModel::class.java)
+            viewModel = ViewModelProvider(requireActivity(), viewModelFactory)[MedtrumViewModel::class.java]
             viewModel?.apply {
                 setupStep.observe(viewLifecycleOwner) {
                     when (it) {
@@ -42,6 +44,13 @@ class MedtrumAttachPatchFragment : MedtrumBaseFragment<FragmentMedtrumAttachPatc
                     }
                 }
             }
+            btnNegative.setOnClickListener {
+                OKDialog.showConfirmation(requireActivity(), rh.gs(R.string.cancel_sure)) {
+                    viewModel?.apply {
+                        moveStep(PatchStep.CANCEL)
+                    }
+                }
+            }
         }
     }
 }
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 cf55d18e4c..ec94ef89f1 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
@@ -3,6 +3,7 @@ package info.nightscout.pump.medtrum.ui
 import android.os.Bundle
 import android.view.View
 import androidx.lifecycle.ViewModelProvider
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.pump.medtrum.R
 import info.nightscout.pump.medtrum.code.PatchStep
 import info.nightscout.pump.medtrum.databinding.FragmentMedtrumDeactivatePatchBinding
@@ -28,7 +29,7 @@ class MedtrumDeactivatePatchFragment : MedtrumBaseFragment<FragmentMedtrumDeacti
         super.onViewCreated(view, savedInstanceState)
         aapsLogger.debug(LTag.PUMP, "MedtrumDeactivatePatchFragment onViewCreated")
         binding.apply {
-            viewModel = ViewModelProvider(requireActivity(), viewModelFactory).get(MedtrumViewModel::class.java)
+            viewModel = ViewModelProvider(requireActivity(), viewModelFactory)[MedtrumViewModel::class.java]
             viewModel?.apply {
                 setupStep.observe(viewLifecycleOwner) {
                     when (it) {
@@ -49,6 +50,13 @@ class MedtrumDeactivatePatchFragment : MedtrumBaseFragment<FragmentMedtrumDeacti
                 }
                 deactivatePatch()
             }
+            btnNegative.setOnClickListener {
+                OKDialog.showConfirmation(requireActivity(), rh.gs(R.string.cancel_sure)) {
+                    viewModel?.apply {
+                        moveStep(PatchStep.CANCEL)
+                    }
+                }
+            }
         }
     }
 }
diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumDeactivationCompleteFragment.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumDeactivationCompleteFragment.kt
index ab2ae588c3..b0d72d2395 100644
--- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumDeactivationCompleteFragment.kt
+++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumDeactivationCompleteFragment.kt
@@ -25,7 +25,7 @@ class MedtrumDeactivationCompleteFragment : MedtrumBaseFragment<FragmentMedtrumD
         super.onViewCreated(view, savedInstanceState)
         aapsLogger.debug(LTag.PUMP, "MedtrumStartDeactivationFragment onViewCreated")
         binding.apply {
-            viewModel = ViewModelProvider(requireActivity(), viewModelFactory).get(MedtrumViewModel::class.java)
+            viewModel = ViewModelProvider(requireActivity(), viewModelFactory)[MedtrumViewModel::class.java]
             viewModel?.apply {
                 // Nothing to do here (yet)
             }
diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPreparePatchConnectFragment.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPreparePatchConnectFragment.kt
index 2c79372f9d..57e05b2032 100644
--- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPreparePatchConnectFragment.kt
+++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPreparePatchConnectFragment.kt
@@ -3,6 +3,7 @@ package info.nightscout.pump.medtrum.ui
 import android.os.Bundle
 import android.view.View
 import androidx.lifecycle.ViewModelProvider
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
 import info.nightscout.pump.medtrum.R
 import info.nightscout.pump.medtrum.code.PatchStep
@@ -29,7 +30,7 @@ class MedtrumPreparePatchConnectFragment : MedtrumBaseFragment<FragmentMedtrumPr
         super.onViewCreated(view, savedInstanceState)
         aapsLogger.debug(LTag.PUMP, "MedtrumPreparePatchFragment onViewCreated")
         binding.apply {
-            viewModel = ViewModelProvider(requireActivity(), viewModelFactory).get(MedtrumViewModel::class.java)
+            viewModel = ViewModelProvider(requireActivity(), viewModelFactory)[MedtrumViewModel::class.java]
             viewModel?.apply {
                 setupStep.observe(viewLifecycleOwner) {
                     when (it) {
@@ -46,6 +47,13 @@ class MedtrumPreparePatchConnectFragment : MedtrumBaseFragment<FragmentMedtrumPr
                 }
                 preparePatchConnect()
             }
+            btnNegative.setOnClickListener {
+                OKDialog.showConfirmation(requireActivity(), rh.gs(R.string.cancel_sure)) {
+                    viewModel?.apply {
+                        moveStep(PatchStep.CANCEL)
+                    }
+                }
+            }
         }
     }
 }
diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPreparePatchFragment.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPreparePatchFragment.kt
index 6823027a6e..5e23d96632 100644
--- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPreparePatchFragment.kt
+++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPreparePatchFragment.kt
@@ -26,7 +26,7 @@ class MedtrumPreparePatchFragment : MedtrumBaseFragment<FragmentMedtrumPreparePa
         super.onViewCreated(view, savedInstanceState)
         aapsLogger.debug(LTag.PUMP, "MedtrumPreparePatchFragment onViewCreated")
         binding.apply {
-            viewModel = ViewModelProvider(requireActivity(), viewModelFactory).get(MedtrumViewModel::class.java)
+            viewModel = ViewModelProvider(requireActivity(), viewModelFactory)[MedtrumViewModel::class.java]
             viewModel?.apply {
                 preparePatch()
             }
diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPrimeCompleteFragment.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPrimeCompleteFragment.kt
index 092cfce1a7..75b2bad284 100644
--- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPrimeCompleteFragment.kt
+++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPrimeCompleteFragment.kt
@@ -3,8 +3,10 @@ package info.nightscout.pump.medtrum.ui
 import android.os.Bundle
 import android.view.View
 import androidx.lifecycle.ViewModelProvider
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
 import info.nightscout.pump.medtrum.R
+import info.nightscout.pump.medtrum.code.PatchStep
 import info.nightscout.pump.medtrum.databinding.FragmentMedtrumPrimeCompleteBinding
 import info.nightscout.pump.medtrum.ui.MedtrumBaseFragment
 import info.nightscout.pump.medtrum.ui.viewmodel.MedtrumViewModel
@@ -28,7 +30,7 @@ class MedtrumPrimeCompleteFragment : MedtrumBaseFragment<FragmentMedtrumPrimeCom
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         binding.apply {
-            viewModel = ViewModelProvider(requireActivity(), viewModelFactory).get(MedtrumViewModel::class.java)
+            viewModel = ViewModelProvider(requireActivity(), viewModelFactory)[MedtrumViewModel::class.java]
             viewModel?.apply {
                 setupStep.observe(viewLifecycleOwner) {
                     when (it) {
@@ -42,6 +44,13 @@ class MedtrumPrimeCompleteFragment : MedtrumBaseFragment<FragmentMedtrumPrimeCom
                     }
                 }
             }
+            btnNegative.setOnClickListener {
+                OKDialog.showConfirmation(requireActivity(), rh.gs(R.string.cancel_sure)) {
+                    viewModel?.apply {
+                        moveStep(PatchStep.CANCEL)
+                    }
+                }
+            }
         }
     }
 }
diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPrimeFragment.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPrimeFragment.kt
index 3603c8a2fd..3322c8a54f 100644
--- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPrimeFragment.kt
+++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPrimeFragment.kt
@@ -3,8 +3,10 @@ package info.nightscout.pump.medtrum.ui
 import android.os.Bundle
 import android.view.View
 import androidx.lifecycle.ViewModelProvider
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
 import info.nightscout.pump.medtrum.R
+import info.nightscout.pump.medtrum.code.PatchStep
 import info.nightscout.pump.medtrum.databinding.FragmentMedtrumPrimeBinding
 import info.nightscout.pump.medtrum.ui.MedtrumBaseFragment
 import info.nightscout.pump.medtrum.ui.viewmodel.MedtrumViewModel
@@ -28,7 +30,7 @@ class MedtrumPrimeFragment : MedtrumBaseFragment<FragmentMedtrumPrimeBinding>()
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         binding.apply {
-            viewModel = ViewModelProvider(requireActivity(), viewModelFactory).get(MedtrumViewModel::class.java)
+            viewModel = ViewModelProvider(requireActivity(), viewModelFactory)[MedtrumViewModel::class.java]
             viewModel?.apply {
                 setupStep.observe(viewLifecycleOwner) {
                     when (it) {
@@ -42,6 +44,13 @@ class MedtrumPrimeFragment : MedtrumBaseFragment<FragmentMedtrumPrimeBinding>()
                     }
                 }
             }
+            btnNegative.setOnClickListener {
+                OKDialog.showConfirmation(requireActivity(), rh.gs(R.string.cancel_sure)) {
+                    viewModel?.apply {
+                        moveStep(PatchStep.CANCEL)
+                    }
+                }
+            }
         }
     }
 }
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 9751f4f70c..fe1234a5c3 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
@@ -3,6 +3,7 @@ package info.nightscout.pump.medtrum.ui
 import android.os.Bundle
 import android.view.View
 import androidx.lifecycle.ViewModelProvider
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
 import info.nightscout.pump.medtrum.R
 import info.nightscout.pump.medtrum.code.PatchStep
@@ -29,7 +30,7 @@ class MedtrumPrimingFragment : MedtrumBaseFragment<FragmentMedtrumPrimingBinding
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         binding.apply {
-            viewModel = ViewModelProvider(requireActivity(), viewModelFactory).get(MedtrumViewModel::class.java)
+            viewModel = ViewModelProvider(requireActivity(), viewModelFactory)[MedtrumViewModel::class.java]
             viewModel?.apply {
                 setupStep.observe(viewLifecycleOwner) {
                     when (it) {
@@ -54,6 +55,13 @@ class MedtrumPrimingFragment : MedtrumBaseFragment<FragmentMedtrumPrimingBinding
                 }
                 startPrime()
             }
+            btnNegative.setOnClickListener {
+                OKDialog.showConfirmation(requireActivity(), rh.gs(R.string.cancel_sure)) {
+                    viewModel?.apply {
+                        moveStep(PatchStep.CANCEL)
+                    }
+                }
+            }
         }
     }
 }
diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumRetryActivationConnectFragment.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumRetryActivationConnectFragment.kt
index 5a09b3bf0c..f1e3c5614a 100644
--- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumRetryActivationConnectFragment.kt
+++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumRetryActivationConnectFragment.kt
@@ -3,6 +3,7 @@ package info.nightscout.pump.medtrum.ui
 import android.os.Bundle
 import android.view.View
 import androidx.lifecycle.ViewModelProvider
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.pump.medtrum.R
 import info.nightscout.pump.medtrum.code.PatchStep
 import info.nightscout.pump.medtrum.databinding.FragmentMedtrumRetryActivationConnectBinding
@@ -10,11 +11,13 @@ import info.nightscout.pump.medtrum.ui.MedtrumBaseFragment
 import info.nightscout.pump.medtrum.ui.viewmodel.MedtrumViewModel
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
+import info.nightscout.shared.interfaces.ResourceHelper
 import javax.inject.Inject
 
 class MedtrumRetryActivationConnectFragment : MedtrumBaseFragment<FragmentMedtrumRetryActivationConnectBinding>() {
 
     @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var rh: ResourceHelper
 
     companion object {
 
@@ -27,7 +30,7 @@ class MedtrumRetryActivationConnectFragment : MedtrumBaseFragment<FragmentMedtru
         super.onViewCreated(view, savedInstanceState)
         aapsLogger.debug(LTag.PUMP, "MedtrumRetryActivationConnectFragment onViewCreated")
         binding.apply {
-            viewModel = ViewModelProvider(requireActivity(), viewModelFactory).get(MedtrumViewModel::class.java)
+            viewModel = ViewModelProvider(requireActivity(), viewModelFactory)[MedtrumViewModel::class.java]
             viewModel?.apply {
 
                 setupStep.observe(viewLifecycleOwner) {
@@ -45,6 +48,13 @@ class MedtrumRetryActivationConnectFragment : MedtrumBaseFragment<FragmentMedtru
                 }
                 retryActivationConnect()
             }
+            btnNegative.setOnClickListener {
+                OKDialog.showConfirmation(requireActivity(), rh.gs(R.string.cancel_sure)) {
+                    viewModel?.apply {
+                        moveStep(PatchStep.CANCEL)
+                    }
+                }
+            }
         }
     }
 }
diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumRetryActivationFragment.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumRetryActivationFragment.kt
index 2136ea0092..5e1673685b 100644
--- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumRetryActivationFragment.kt
+++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumRetryActivationFragment.kt
@@ -30,7 +30,7 @@ class MedtrumRetryActivationFragment : MedtrumBaseFragment<FragmentMedtrumRetryA
         super.onViewCreated(view, savedInstanceState)
         aapsLogger.debug(LTag.PUMP, "MedtrumRetryActivationFragment onViewCreated")
         binding.apply {
-            viewModel = ViewModelProvider(requireActivity(), viewModelFactory).get(MedtrumViewModel::class.java)
+            viewModel = ViewModelProvider(requireActivity(), viewModelFactory)[MedtrumViewModel::class.java]
             viewModel?.apply {
                 preparePatch() // Use this to make sure we are disconnceted at this stage
             }
diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumStartDeactivationFragment.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumStartDeactivationFragment.kt
index dea85b9e7f..94f3bd93d9 100644
--- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumStartDeactivationFragment.kt
+++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumStartDeactivationFragment.kt
@@ -30,7 +30,7 @@ class MedtrumStartDeactivationFragment : MedtrumBaseFragment<FragmentMedtrumStar
         super.onViewCreated(view, savedInstanceState)
         aapsLogger.debug(LTag.PUMP, "MedtrumStartDeactivationFragment onViewCreated")
         binding.apply {
-            viewModel = ViewModelProvider(requireActivity(), viewModelFactory).get(MedtrumViewModel::class.java)
+            viewModel = ViewModelProvider(requireActivity(), viewModelFactory)[MedtrumViewModel::class.java]
             viewModel?.apply {
                 updateSetupStep(MedtrumViewModel.SetupStep.START_DEACTIVATION)
             }
diff --git a/pump/medtrum/src/main/res/layout/fragment_medtrum_activate.xml b/pump/medtrum/src/main/res/layout/fragment_medtrum_activate.xml
index f1bbcaec00..5d476a8a1a 100644
--- a/pump/medtrum/src/main/res/layout/fragment_medtrum_activate.xml
+++ b/pump/medtrum/src/main/res/layout/fragment_medtrum_activate.xml
@@ -55,8 +55,7 @@
                     android:text="@string/cancel"
                     app:layout_constraintEnd_toStartOf="@id/btn_positive"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:onSafeClick="@{() -> viewModel.moveStep(PatchStep.CANCEL)}" />
+                    app:layout_constraintTop_toTopOf="parent" />
 
                 <Button
                     android:id="@+id/btn_positive"
diff --git a/pump/medtrum/src/main/res/layout/fragment_medtrum_attach_patch.xml b/pump/medtrum/src/main/res/layout/fragment_medtrum_attach_patch.xml
index 35aa8f53f1..a0a377a0b2 100644
--- a/pump/medtrum/src/main/res/layout/fragment_medtrum_attach_patch.xml
+++ b/pump/medtrum/src/main/res/layout/fragment_medtrum_attach_patch.xml
@@ -70,8 +70,7 @@
                     android:text="@string/cancel"
                     app:layout_constraintEnd_toStartOf="@id/btn_positive"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:onSafeClick="@{() -> viewModel.moveStep(PatchStep.CANCEL)}" />
+                    app:layout_constraintTop_toTopOf="parent" />
 
                 <Button
                     android:id="@+id/btn_positive"
diff --git a/pump/medtrum/src/main/res/layout/fragment_medtrum_deactivate_patch.xml b/pump/medtrum/src/main/res/layout/fragment_medtrum_deactivate_patch.xml
index 5006bb8428..03284721f8 100644
--- a/pump/medtrum/src/main/res/layout/fragment_medtrum_deactivate_patch.xml
+++ b/pump/medtrum/src/main/res/layout/fragment_medtrum_deactivate_patch.xml
@@ -57,7 +57,6 @@
                     app:layout_constraintEnd_toStartOf="@id/btn_positive"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
-                    app:onSafeClick="@{() -> viewModel.moveStep(PatchStep.CANCEL)}"
                     tools:visibility="visible" />
 
                 <Button
diff --git a/pump/medtrum/src/main/res/layout/fragment_medtrum_prepare_patch_connect.xml b/pump/medtrum/src/main/res/layout/fragment_medtrum_prepare_patch_connect.xml
index 34e4a7f939..bba17ab5ea 100644
--- a/pump/medtrum/src/main/res/layout/fragment_medtrum_prepare_patch_connect.xml
+++ b/pump/medtrum/src/main/res/layout/fragment_medtrum_prepare_patch_connect.xml
@@ -85,8 +85,7 @@
                     android:text="@string/cancel"
                     app:layout_constraintEnd_toStartOf="@id/btn_positive"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:onSafeClick="@{() -> viewModel.moveStep(PatchStep.CANCEL)}" />
+                    app:layout_constraintTop_toTopOf="parent" />
 
                 <Button
                     android:id="@+id/btn_positive"
diff --git a/pump/medtrum/src/main/res/layout/fragment_medtrum_prime.xml b/pump/medtrum/src/main/res/layout/fragment_medtrum_prime.xml
index 458e2e7ca1..b1709ae089 100644
--- a/pump/medtrum/src/main/res/layout/fragment_medtrum_prime.xml
+++ b/pump/medtrum/src/main/res/layout/fragment_medtrum_prime.xml
@@ -72,8 +72,7 @@
                     android:text="@string/cancel"
                     app:layout_constraintEnd_toStartOf="@id/btn_positive"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:onSafeClick="@{() -> viewModel.moveStep(PatchStep.CANCEL)}" />
+                    app:layout_constraintTop_toTopOf="parent" />
 
                 <Button
                     android:id="@+id/btn_positive"
diff --git a/pump/medtrum/src/main/res/layout/fragment_medtrum_prime_complete.xml b/pump/medtrum/src/main/res/layout/fragment_medtrum_prime_complete.xml
index 6761aad014..246e9dc148 100644
--- a/pump/medtrum/src/main/res/layout/fragment_medtrum_prime_complete.xml
+++ b/pump/medtrum/src/main/res/layout/fragment_medtrum_prime_complete.xml
@@ -72,8 +72,7 @@
                     android:text="@string/cancel"
                     app:layout_constraintEnd_toStartOf="@id/btn_positive"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:onSafeClick="@{() -> viewModel.moveStep(PatchStep.CANCEL)}" />
+                    app:layout_constraintTop_toTopOf="parent" />
 
                 <Button
                     android:id="@+id/btn_positive"
diff --git a/pump/medtrum/src/main/res/layout/fragment_medtrum_priming.xml b/pump/medtrum/src/main/res/layout/fragment_medtrum_priming.xml
index d33dbfd3d9..27e1d2f394 100644
--- a/pump/medtrum/src/main/res/layout/fragment_medtrum_priming.xml
+++ b/pump/medtrum/src/main/res/layout/fragment_medtrum_priming.xml
@@ -83,8 +83,7 @@
                     android:text="@string/cancel"
                     app:layout_constraintEnd_toStartOf="@id/btn_positive"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:onSafeClick="@{() -> viewModel.moveStep(PatchStep.CANCEL)}" />
+                    app:layout_constraintTop_toTopOf="parent" />
 
                 <Button
                     android:id="@+id/btn_positive"
diff --git a/pump/medtrum/src/main/res/layout/fragment_medtrum_retry_activation_connect.xml b/pump/medtrum/src/main/res/layout/fragment_medtrum_retry_activation_connect.xml
index a2ea67b914..04d2a769ad 100644
--- a/pump/medtrum/src/main/res/layout/fragment_medtrum_retry_activation_connect.xml
+++ b/pump/medtrum/src/main/res/layout/fragment_medtrum_retry_activation_connect.xml
@@ -55,8 +55,7 @@
                     android:contentDescription="@string/cancel"
                     android:text="@string/cancel"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:onSafeClick="@{() -> viewModel.moveStep(PatchStep.CANCEL)}" />
+                    app:layout_constraintTop_toTopOf="parent" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/pump/medtrum/src/main/res/values/strings.xml b/pump/medtrum/src/main/res/values/strings.xml
index 99b8478c92..c1ecf604ed 100644
--- a/pump/medtrum/src/main/res/values/strings.xml
+++ b/pump/medtrum/src/main/res/values/strings.xml
@@ -115,6 +115,7 @@
     <string name="press_OK_to_return">Press <b>OK</b> to return to main screen.</string>
 
     <string name="deactivate_sure">Are you sure that you want to deactivate the current patch?</string>
+    <string name="cancel_sure">Are you sure that you want to cancel the activation?</string>
     <string name="medtrum_deactivate_pump_confirm">Are you sure? This action cannot be reversed!!</string>
     <string name="press_next_or_cancel">Press <b>Next</b> to deactivate or <b>Cancel</b> to return to main screen.</string>
     <string name="deactivating_pump">Deactivating patch. Please Wait.</string>