From 3a30f73aa11273e7e44938be60022ba9c668ea50 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Thu, 6 Jan 2022 12:11:53 +0100 Subject: [PATCH] Prevent Failed requirement --- .../nightscout/androidaps/dependencyInjection/APSModule.kt | 2 -- .../SyncPumpCancelTemporaryBasalIfAnyTransaction.kt | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/APSModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/APSModule.kt index 0e55e30b85..30b2c06d6c 100644 --- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/APSModule.kt +++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/APSModule.kt @@ -3,12 +3,10 @@ package info.nightscout.androidaps.dependencyInjection import dagger.Module import dagger.android.ContributesAndroidInjector import info.nightscout.androidaps.plugins.aps.logger.LoggerCallback -import info.nightscout.androidaps.plugins.aps.loop.APSResult import info.nightscout.androidaps.plugins.aps.openAPSAMA.DetermineBasalAdapterAMAJS import info.nightscout.androidaps.plugins.aps.openAPSAMA.DetermineBasalResultAMA import info.nightscout.androidaps.plugins.aps.openAPSSMB.DetermineBasalAdapterSMBJS import info.nightscout.androidaps.plugins.aps.openAPSSMB.DetermineBasalResultSMB -import info.nightscout.androidaps.plugins.iob.iobCobCalculator.data.AutosensData import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobOref1Thread import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobThread diff --git a/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncPumpCancelTemporaryBasalIfAnyTransaction.kt b/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncPumpCancelTemporaryBasalIfAnyTransaction.kt index fb7eaaadb9..58510f58c2 100644 --- a/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncPumpCancelTemporaryBasalIfAnyTransaction.kt +++ b/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncPumpCancelTemporaryBasalIfAnyTransaction.kt @@ -15,7 +15,8 @@ class SyncPumpCancelTemporaryBasalIfAnyTransaction( return result val current = database.temporaryBasalDao.getTemporaryBasalActiveAt(timestamp, pumpType, pumpSerial).blockingGet() if (current != null && current.interfaceIDs.endId == null) { // do not allow overwrite if cut by end event - current.end = timestamp + if (current.timestamp != timestamp) current.end = timestamp // prevent zero duration + else current.duration = 1 current.interfaceIDs.endId = endPumpId database.temporaryBasalDao.updateExistingEntry(current) result.updated.add(current)