EOPATCH: fix setting of profile

core/ui/src/main/res/values/strings.xml

@@ -163,6 +163,8 @@
     <string name="dia">DIA</string>
     <string name="ic_short">IC</string>
     <string name="isf_short">ISF</string>
+    <string name="canceling_tbr_failed">Canceling of temporary basal failed</string>
+    <string name="canceling_eb_failed">Canceling of extended bolus failed</string>
 
     <!--    Protection-->
     <string name="wrongpassword">Wrong password</string>

pump/combo/src/main/java/info/nightscout/pump/combo/ComboPlugin.java

@@ -823,7 +823,7 @@ public class ComboPlugin extends PumpPluginBase implements Pump, Constraints {
                 );
                 return new PumpEnactResult(getInjector()).isTempCancel(true).success(true).enacted(true);
             } else {
-                return new PumpEnactResult(getInjector()).success(false).enacted(false);
+                return new PumpEnactResult(getInjector()).success(false).enacted(false).comment(info.nightscout.core.ui.R.string.canceling_eb_failed);
             }
         } else if (activeTemp == null) {
             return new PumpEnactResult(getInjector()).success(true).enacted(false);

pump/danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java

@@ -334,7 +334,7 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
                         serialNumber()
                 );
             } else
-                result.success(false).enacted(false).isTempCancel(true);
+                result.success(false).enacted(false).isTempCancel(true).comment(info.nightscout.core.ui.R.string.canceling_eb_failed);
         } else {
             result.success(true).comment(info.nightscout.core.ui.R.string.ok).isTempCancel(true);
             getAapsLogger().debug(LTag.PUMP, "cancelExtendedBolus: OK");

pump/danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java

@@ -353,9 +353,9 @@ public class DanaRPlugin extends AbstractDanaRPlugin {
                         getPumpDescription().getPumpType(),
                         serialNumber()
                 );
-                result.success(true).enacted(true).isTempCancel(true);
+                result.success(true).enacted(true).isTempCancel(true).comment(info.nightscout.core.ui.R.string.ok);
             } else
-                result.success(false).enacted(false).isTempCancel(true);
+                result.success(false).enacted(false).isTempCancel(true).comment(info.nightscout.core.ui.R.string.canceling_eb_failed);
         } else {
             result.success(true).isTempCancel(true).comment(info.nightscout.core.ui.R.string.ok);
             aapsLogger.debug(LTag.PUMP, "cancelRealTempBasal: OK");

pump/danars/src/main/java/info/nightscout/pump/danars/DanaRSPlugin.kt

@@ -522,35 +522,40 @@ class DanaRSPlugin @Inject constructor(
 
     @Synchronized
     override fun cancelTempBasal(enforceNew: Boolean): PumpEnactResult {
-        val result = PumpEnactResult(injector)
         if (danaPump.isTempBasalInProgress) {
+            aapsLogger.debug(LTag.PUMP, "cancelRealTempBasal: Failed")
             danaRSService?.tempBasalStop()
-            result.success = !danaPump.isTempBasalInProgress
+            return PumpEnactResult(injector)
-            result.enacted = true
+                .success(!danaPump.isTempBasalInProgress)
-            result.isTempCancel = true
+                .enacted(true)
+                .isTempCancel(true)
+                .comment(info.nightscout.core.ui.R.string.canceling_tbr_failed)
         } else {
-            result.success = true
-            result.enacted = false
-            result.isTempCancel = true
-            result.comment = rh.gs(info.nightscout.core.ui.R.string.ok)
             aapsLogger.debug(LTag.PUMP, "cancelRealTempBasal: OK")
+            return PumpEnactResult(injector)
+                .success(true)
+                .enacted(false)
+                .isTempCancel(true)
+                .comment(info.nightscout.core.ui.R.string.ok)
         }
-        return result
     }
 
     @Synchronized override fun cancelExtendedBolus(): PumpEnactResult {
-        val result = PumpEnactResult(injector)
         if (danaPump.isExtendedInProgress) {
             danaRSService?.extendedBolusStop()
-            result.success = !danaPump.isExtendedInProgress
+            aapsLogger.debug(LTag.PUMP, "cancelExtendedBolus: Failed")
-            result.enacted = true
+            return PumpEnactResult(injector)
+                .success(!danaPump.isExtendedInProgress)
+                .enacted(true)
+                .comment(info.nightscout.core.ui.R.string.canceling_eb_failed)
         } else {
-            result.success = true
-            result.enacted = false
-            result.comment = rh.gs(info.nightscout.core.ui.R.string.ok)
             aapsLogger.debug(LTag.PUMP, "cancelExtendedBolus: OK")
+            return PumpEnactResult(injector)
+                .success(true)
+                .enacted(false)
+                .isTempCancel(true)
+                .comment(info.nightscout.core.ui.R.string.ok)
         }
-        return result
     }
 
     override fun getJSONStatus(profile: Profile, profileName: String, version: String): JSONObject {

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

@@ -176,19 +176,25 @@ class EopatchPumpPlugin @Inject constructor(
     override fun setNewBasalProfile(profile: Profile): PumpEnactResult {
         mLastDataTime = System.currentTimeMillis()
         if (patchManager.isActivated) {
-            if (patchManager.patchState.isTempBasalActive || patchManager.patchState.isBolusActive) {
+            if (patchManager.patchState.isTempBasalActive) {
-                return PumpEnactResult(injector)
+                val cancelResult = cancelTempBasal(true)
-            } else {
+                if (!cancelResult.success) return PumpEnactResult(injector).isTempCancel(true).comment(info.nightscout.core.ui.R.string.canceling_tbr_failed)
-                var isSuccess: Boolean? = null
+            }
-                val result: BehaviorSubject<Boolean> = BehaviorSubject.create()
-                val disposable = result.hide()
-                    .subscribe {
-                        isSuccess = it
-                    }
 
-                val nb = preferenceManager.getNormalBasalManager().convertProfileToNormalBasal(profile)
+            if (patchManager.patchState.isExtBolusActive) {
-                mDisposables.add(
+                val cancelResult = cancelExtendedBolus()
-                    patchManager.startBasal(nb)
+                if (!cancelResult.success) return PumpEnactResult(injector).comment(info.nightscout.core.ui.R.string.canceling_eb_failed)
+            }
+            var isSuccess: Boolean? = null
+            val result: BehaviorSubject<Boolean> = BehaviorSubject.create()
+            val disposable = result.hide()
+                .subscribe {
+                    isSuccess = it
+                }
+
+            val nb = preferenceManager.getNormalBasalManager().convertProfileToNormalBasal(profile)
+            mDisposables.add(
+                patchManager.startBasal(nb)
                         .observeOn(aapsSchedulers.main)
                         .subscribe({ response ->
                                        result.onNext(response.isSuccess)
@@ -209,7 +215,6 @@ class EopatchPumpPlugin @Inject constructor(
                 } else {
                     return PumpEnactResult(injector)
                 }
-            }
         } else {
             preferenceManager.getNormalBasalManager().setNormalBasal(profile)
             preferenceManager.flushNormalBasalManager()
@@ -479,7 +484,7 @@ class EopatchPumpPlugin @Inject constructor(
                 .map { PumpEnactResult(injector).success(true).enacted(true).isTempCancel(true) }
                 .onErrorReturnItem(
                     PumpEnactResult(injector).success(false).enacted(false)
-                        .comment(rh.gs(info.nightscout.core.ui.R.string.error))
+                        .comment(rh.gs(info.nightscout.core.ui.R.string.canceling_eb_failed))
                 )
                 .blockingGet()
         } else {