DetailedBolusInfo -> interfaces

app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt

@@ -7,7 +7,7 @@ import android.view.View
 import android.view.ViewGroup
 import com.google.common.base.Joiner
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.database.impl.transactions.InsertIfNewByTimestampTherapyEventTransaction
 import info.nightscout.androidaps.databinding.DialogFillBinding

app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt

@@ -9,9 +9,6 @@ import android.view.View
 import android.view.ViewGroup
 import com.google.common.base.Joiner
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.data.DetailedBolusInfo
-import info.nightscout.database.impl.AppRepository
-import info.nightscout.database.impl.transactions.InsertAndCancelCurrentTemporaryTargetTransaction
 import info.nightscout.androidaps.databinding.DialogInsulinBinding
 import info.nightscout.androidaps.extensions.formatColor
 import info.nightscout.androidaps.interfaces.ActivePlugin
@@ -27,15 +24,19 @@ import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.extensions.toSignedString
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import info.nightscout.androidaps.utils.protection.ProtectionCheck.Protection.BOLUS
+import info.nightscout.core.pumpExtensions.insertBolusTransaction
 import info.nightscout.database.entities.TemporaryTarget
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
 import info.nightscout.database.entities.ValueWithUnit
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.database.impl.transactions.InsertAndCancelCurrentTemporaryTargetTransaction
 import info.nightscout.interfaces.ActivityNames
 import info.nightscout.interfaces.BolusTimer
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.Constraint
 import info.nightscout.interfaces.GlucoseUnit
+import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.interfaces.queue.Callback
 import info.nightscout.interfaces.utils.HtmlHelper
 import info.nightscout.rx.logging.LTag

app/src/main/java/info/nightscout/androidaps/dialogs/LoopDialog.kt

@@ -38,7 +38,7 @@ import info.nightscout.interfaces.ConfigBuilder
 import info.nightscout.interfaces.Constraint
 import info.nightscout.interfaces.PluginBase
 import info.nightscout.interfaces.PluginType
-import info.nightscout.interfaces.pump.PumpDescription
+import info.nightscout.interfaces.pump.defs.PumpDescription
 import info.nightscout.interfaces.queue.Callback
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.EventRefreshOverview

app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt

@@ -24,7 +24,7 @@ import info.nightscout.database.entities.UserEntry.Sources
 import info.nightscout.database.entities.ValueWithUnit
 import info.nightscout.interfaces.ActivityNames
 import info.nightscout.interfaces.Constraint
-import info.nightscout.interfaces.pump.PumpDescription
+import info.nightscout.interfaces.pump.defs.PumpDescription
 import info.nightscout.interfaces.queue.Callback
 import info.nightscout.interfaces.utils.HtmlHelper
 import info.nightscout.rx.logging.LTag

app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt

@@ -9,8 +9,6 @@ import android.view.View
 import android.view.ViewGroup
 import com.google.common.base.Joiner
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.data.DetailedBolusInfo
-import info.nightscout.database.impl.AppRepository
 import info.nightscout.androidaps.databinding.DialogTreatmentBinding
 import info.nightscout.androidaps.extensions.formatColor
 import info.nightscout.androidaps.interfaces.ActivePlugin
@@ -22,12 +20,16 @@ import info.nightscout.androidaps.utils.ToastUtils
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import info.nightscout.androidaps.utils.protection.ProtectionCheck.Protection.BOLUS
+import info.nightscout.core.pumpExtensions.insertBolusTransaction
+import info.nightscout.core.pumpExtensions.insertCarbsTransaction
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
 import info.nightscout.database.entities.ValueWithUnit
+import info.nightscout.database.impl.AppRepository
 import info.nightscout.interfaces.ActivityNames
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.Constraint
+import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.interfaces.queue.Callback
 import info.nightscout.interfaces.utils.HtmlHelper
 import info.nightscout.rx.logging.LTag

app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt

@@ -16,7 +16,7 @@ import info.nightscout.androidaps.BuildConfig
 import info.nightscout.androidaps.MainActivity
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.annotations.OpenForTesting
-import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.androidaps.data.PumpEnactResultImpl
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.database.impl.ValueWrapper
@@ -56,7 +56,7 @@ import info.nightscout.interfaces.PluginBase
 import info.nightscout.interfaces.PluginDescription
 import info.nightscout.interfaces.PluginType
 import info.nightscout.interfaces.notifications.Notification
-import info.nightscout.interfaces.pump.PumpDescription
+import info.nightscout.interfaces.pump.defs.PumpDescription
 import info.nightscout.interfaces.queue.Callback
 import info.nightscout.plugins.configBuilder.RunningConfiguration
 import info.nightscout.plugins.pump.virtual.VirtualPumpPlugin

app/src/main/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPlugin.kt

@@ -18,7 +18,7 @@ import info.nightscout.interfaces.PluginBase
 import info.nightscout.interfaces.PluginDescription
 import info.nightscout.interfaces.PluginType
 import info.nightscout.androidaps.interfaces.Profile
-import info.nightscout.interfaces.pump.PumpDescription
+import info.nightscout.interfaces.pump.defs.PumpDescription
 import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.interfaces.Safety
 import info.nightscout.androidaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt

@@ -84,7 +84,7 @@ import info.nightscout.interfaces.Constants
 import info.nightscout.interfaces.Constraint
 import info.nightscout.interfaces.GlucoseUnit
 import info.nightscout.interfaces.PluginBase
-import info.nightscout.interfaces.pump.PumpType
+import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.interfaces.utils.JsonHelper
 import info.nightscout.plugins.constraints.bgQualityCheck.BgQualityCheckPlugin
 import info.nightscout.plugins.general.overview.notifications.NotificationStore

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/StatusLightHandler.kt

@@ -11,7 +11,7 @@ import info.nightscout.androidaps.utils.DecimalFormatter
 import info.nightscout.androidaps.utils.WarnColors
 import info.nightscout.database.entities.TherapyEvent
 import info.nightscout.interfaces.Config
-import info.nightscout.interfaces.pump.PumpType
+import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.plugins.sync.nsclient.extensions.age
 import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP

app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataHandlerMobile.kt

@@ -4,7 +4,7 @@ import android.app.NotificationManager
 import android.content.Context
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.database.impl.ValueWrapper
 import info.nightscout.database.impl.transactions.CancelCurrentTemporaryTargetIfAnyTransaction

app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt

@@ -5,7 +5,7 @@ import android.text.Spanned
 import com.google.common.base.Joiner
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.database.impl.transactions.InsertOrUpdateBolusCalculatorResultTransaction
 import info.nightscout.androidaps.extensions.formatColor
@@ -35,7 +35,7 @@ import info.nightscout.interfaces.CarbTimer
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.Constraint
 import info.nightscout.interfaces.PluginBase
-import info.nightscout.interfaces.pump.PumpDescription
+import info.nightscout.interfaces.pump.defs.PumpDescription
 import info.nightscout.interfaces.queue.Callback
 import info.nightscout.interfaces.utils.HtmlHelper
 import info.nightscout.interfaces.utils.Round

app/src/test/java/info/nightscout/androidaps/TestPumpPlugin.kt

@@ -1,15 +1,15 @@
 package info.nightscout.androidaps
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.interfaces.data.PumpEnactResult
 import info.nightscout.androidaps.data.PumpEnactResultImpl
 import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.Pump
-import info.nightscout.interfaces.pump.PumpDescription
+import info.nightscout.interfaces.pump.defs.PumpDescription
 import info.nightscout.androidaps.interfaces.PumpSync
-import info.nightscout.interfaces.pump.ManufacturerType
+import info.nightscout.interfaces.pump.defs.ManufacturerType
-import info.nightscout.interfaces.pump.PumpType
+import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.interfaces.utils.TimeChangeType
 import org.json.JSONObject
 

app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt

@@ -35,7 +35,7 @@ import info.nightscout.interfaces.BuildHelper
 import info.nightscout.interfaces.Constraint
 import info.nightscout.interfaces.PluginBase
 import info.nightscout.interfaces.PluginType
-import info.nightscout.interfaces.pump.PumpDescription
+import info.nightscout.interfaces.pump.defs.PumpDescription
 import info.nightscout.plugins.pump.virtual.VirtualPumpPlugin
 import info.nightscout.shared.sharedPreferences.SP
 import org.junit.Assert

app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/LoopPluginTest.kt

@@ -18,7 +18,7 @@ import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.interfaces.ActivityNames
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.PluginType
-import info.nightscout.interfaces.pump.PumpDescription
+import info.nightscout.interfaces.pump.defs.PumpDescription
 import info.nightscout.plugins.configBuilder.RunningConfiguration
 import info.nightscout.plugins.pump.virtual.VirtualPumpPlugin
 import info.nightscout.rx.bus.RxBus

app/src/test/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPluginTest.kt

@@ -8,7 +8,7 @@ import info.nightscout.database.impl.AppRepository
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.Constraints
-import info.nightscout.interfaces.pump.PumpDescription
+import info.nightscout.interfaces.pump.defs.PumpDescription
 import info.nightscout.androidaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
 import info.nightscout.androidaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
 import info.nightscout.androidaps.plugins.aps.openAPSSMBDynamicISF.OpenAPSSMBDynamicISFPlugin

app/src/test/java/info/nightscout/androidaps/utils/wizard/BolusWizardTest.kt

@@ -14,7 +14,7 @@ import info.nightscout.androidaps.interfaces.IobCobCalculator
 import info.nightscout.androidaps.interfaces.Loop
 import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.interfaces.pump.PumpDescription
+import info.nightscout.interfaces.pump.defs.PumpDescription
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensDataStore
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.plugins.pump.virtual.VirtualPumpPlugin

automation/src/test/java/info/nightscout/androidaps/TestPumpPlugin.kt

@@ -1,18 +1,18 @@
 package info.nightscout.androidaps
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.interfaces.data.PumpEnactResult
 import info.nightscout.androidaps.data.PumpEnactResultImpl
 import info.nightscout.interfaces.PluginBase
 import info.nightscout.interfaces.PluginDescription
 import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.Pump
-import info.nightscout.interfaces.pump.PumpDescription
+import info.nightscout.interfaces.pump.defs.PumpDescription
 import info.nightscout.androidaps.interfaces.PumpSync
 import info.nightscout.shared.interfaces.ResourceHelper
-import info.nightscout.interfaces.pump.ManufacturerType
+import info.nightscout.interfaces.pump.defs.ManufacturerType
-import info.nightscout.interfaces.pump.PumpType
+import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.interfaces.utils.TimeChangeType
 import info.nightscout.rx.logging.AAPSLogger
 import org.json.JSONObject

build.gradle

@@ -70,7 +70,7 @@ plugins {
     id "io.gitlab.arturbosch.detekt" version "1.21.0"
     id "org.jlleitschuh.gradle.ktlint" version "11.0.0"
     id 'org.barfuin.gradle.jacocolog' version '2.0.0'
-    id 'org.jetbrains.kotlin.android' version '1.7.21' apply false
+    id 'org.jetbrains.kotlin.android' version "$kotlin_version" apply false
 }
 
 allprojects {

core/core-main/src/main/java/info/nightscout/androidaps/interfaces/CommandQueue.kt

@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.interfaces
 
 import android.text.Spanned
-import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.interfaces.queue.Callback
 import info.nightscout.androidaps.queue.commands.Command
 import info.nightscout.interfaces.queue.CustomCommand

core/core-main/src/main/java/info/nightscout/androidaps/interfaces/Pump.kt

@@ -1,10 +1,10 @@
 package info.nightscout.androidaps.interfaces
 
-import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.interfaces.pump.DetailedBolusInfo
-import info.nightscout.interfaces.pump.PumpType
+import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.interfaces.data.PumpEnactResult
-import info.nightscout.interfaces.pump.ManufacturerType
+import info.nightscout.interfaces.pump.defs.ManufacturerType
-import info.nightscout.interfaces.pump.PumpDescription
+import info.nightscout.interfaces.pump.defs.PumpDescription
 import info.nightscout.interfaces.pump.actions.CustomAction
 import info.nightscout.interfaces.pump.actions.CustomActionType
 import info.nightscout.interfaces.queue.CustomCommand

core/core-main/src/main/java/info/nightscout/androidaps/interfaces/PumpSync.kt

@@ -1,8 +1,8 @@
 package info.nightscout.androidaps.interfaces
 
-import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.database.entities.TemporaryBasal
-import info.nightscout.interfaces.pump.PumpType
+import info.nightscout.interfaces.pump.defs.PumpType
 
 /**
  * This interface allows pump drivers to push data changes (creation and update of treatments, temporary basals and extended boluses) back to AAPS-core.

core/core-main/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.kt

@@ -13,7 +13,7 @@ import info.nightscout.androidaps.utils.DecimalFormatter
 import info.nightscout.core.main.R
 import info.nightscout.database.entities.GlucoseValue
 import info.nightscout.interfaces.Constraint
-import info.nightscout.interfaces.pump.PumpDescription
+import info.nightscout.interfaces.pump.defs.PumpDescription
 import info.nightscout.interfaces.utils.HtmlHelper.fromHtml
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag

core/core-main/src/main/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/DetailedBolusInfoStorage.kt

@@ -1,7 +1,8 @@
 package info.nightscout.androidaps.plugins.pump.common.bolusInfo
 
 import info.nightscout.androidaps.annotations.OpenForTesting
-import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.core.pumpExtensions.toJsonString
+import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.shared.utils.T
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
@@ -19,7 +20,7 @@ class DetailedBolusInfoStorage @Inject constructor(
 
     @Synchronized
     fun add(detailedBolusInfo: DetailedBolusInfo) {
-        aapsLogger.debug("Stored bolus info: $detailedBolusInfo")
+        aapsLogger.debug("Stored bolus info: ${detailedBolusInfo.toJsonString()}")
         store.add(detailedBolusInfo)
     }
 

core/core-main/src/main/java/info/nightscout/core/pumpExtensions/DetailedBolusInfoExtension.kt

@@ -0,0 +1,26 @@
+package info.nightscout.core.pumpExtensions
+
+import com.google.gson.Gson
+import info.nightscout.database.impl.transactions.InsertOrUpdateBolusTransaction
+import info.nightscout.database.impl.transactions.InsertOrUpdateCarbsTransaction
+import info.nightscout.interfaces.pump.DetailedBolusInfo
+
+fun DetailedBolusInfo.insertCarbsTransaction(): InsertOrUpdateCarbsTransaction {
+    if (carbs == 0.0) throw IllegalStateException("carbs == 0.0")
+    return InsertOrUpdateCarbsTransaction(createCarbs()!!)
+}
+
+fun DetailedBolusInfo.insertBolusTransaction(): InsertOrUpdateBolusTransaction {
+    if (insulin == 0.0) throw IllegalStateException("insulin == 0.0")
+    return InsertOrUpdateBolusTransaction(createBolus()!!)
+}
+
+fun DetailedBolusInfo.toJsonString(): String = Gson().toJson(this)
+
+// Cannot access Companion extension from java so create common
+fun DetailedBolusInfo.fromJsonString(json: String): DetailedBolusInfo =
+    Gson().fromJson(json, DetailedBolusInfo::class.java)
+
+
+
+

core/core-main/src/main/java/info/nightscout/core/pumpExtensions/PumpStateExtension.kt

@@ -2,9 +2,8 @@ package info.nightscout.androidaps.extensions
 
 import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.PumpSync
-import info.nightscout.shared.utils.DateUtil
 import info.nightscout.androidaps.utils.DecimalFormatter
-import info.nightscout.androidaps.utils.DecimalFormatter.to2Decimal
+import info.nightscout.shared.utils.DateUtil
 import info.nightscout.shared.utils.T
 import kotlin.math.ceil
 import kotlin.math.max
@@ -56,7 +55,7 @@ fun PumpSync.PumpState.ExtendedBolus.getPassedDurationToTimeInMinutes(time: Long
     ((min(time, end) - timestamp) / 60.0 / 1000).roundToInt()
 
 fun PumpSync.PumpState.ExtendedBolus.toStringFull(dateUtil: DateUtil): String =
-    "E " + to2Decimal(rate) + "U/h @" +
+    "E " + DecimalFormatter.to2Decimal(rate) + "U/h @" +
         dateUtil.timeString(timestamp) +
         " " + getPassedDurationToTimeInMinutes(dateUtil.now()) + "/" + T.msecs(duration).mins() + "min"
 

core/core-main/src/main/java/info/nightscout/core/pumpExtensions/PumpTypeExtension.kt

@@ -2,7 +2,7 @@ package info.nightscout.androidaps.extensions
 
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.embedments.InterfaceIDs
-import info.nightscout.interfaces.pump.PumpType
+import info.nightscout.interfaces.pump.defs.PumpType
 
 fun PumpType.Companion.fromDbSource(s: UserEntry.Sources): PumpType.Source =
     when (s) {

core/core-main/src/test/java/info/nightscout/androidaps/TestPumpPlugin.kt

@@ -1,15 +1,15 @@
 package info.nightscout.androidaps
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.interfaces.data.PumpEnactResult
 import info.nightscout.androidaps.data.PumpEnactResultImpl
 import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.Pump
-import info.nightscout.interfaces.pump.PumpDescription
+import info.nightscout.interfaces.pump.defs.PumpDescription
 import info.nightscout.androidaps.interfaces.PumpSync
-import info.nightscout.interfaces.pump.ManufacturerType
+import info.nightscout.interfaces.pump.defs.ManufacturerType
-import info.nightscout.interfaces.pump.PumpType
+import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.interfaces.utils.TimeChangeType
 import org.json.JSONObject
 

core/core-main/src/test/java/info/nightscout/androidaps/data/DetailedBolusInfoTest.kt

@@ -2,9 +2,12 @@ package info.nightscout.androidaps.data
 
 import android.content.Context
 import info.nightscout.androidaps.TestBase
+import info.nightscout.core.pumpExtensions.fromJsonString
+import info.nightscout.core.pumpExtensions.toJsonString
 import info.nightscout.database.entities.Bolus
 import info.nightscout.database.entities.BolusCalculatorResult
 import info.nightscout.database.entities.TherapyEvent
+import info.nightscout.interfaces.pump.DetailedBolusInfo
 import org.apache.commons.lang3.builder.EqualsBuilder
 import org.junit.Assert
 import org.junit.Test

core/core-main/src/test/java/info/nightscout/androidaps/interfaces/PumpDescriptionTest.kt

@@ -1,9 +1,9 @@
 package info.nightscout.androidaps.interfaces
 
-import info.nightscout.interfaces.pump.PumpCapability
+import info.nightscout.interfaces.pump.defs.PumpCapability
-import info.nightscout.interfaces.pump.PumpDescription
+import info.nightscout.interfaces.pump.defs.PumpDescription
-import info.nightscout.interfaces.pump.PumpTempBasalType
+import info.nightscout.interfaces.pump.defs.PumpTempBasalType
-import info.nightscout.interfaces.pump.PumpType
+import info.nightscout.interfaces.pump.defs.PumpType
 import org.junit.Assert
 import org.junit.Test
 

core/core-main/src/test/java/info/nightscout/androidaps/plugins/aps/loop/APSResultTest.kt

@@ -7,7 +7,7 @@ import info.nightscout.androidaps.interfaces.Constraints
 import info.nightscout.androidaps.interfaces.IobCobCalculator
 import info.nightscout.database.entities.TemporaryBasal
 import info.nightscout.interfaces.Constraint
-import info.nightscout.interfaces.pump.PumpType
+import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.interfaces.utils.JsonHelper.safeGetDouble
 import org.junit.Assert
 import org.junit.Before

core/core-main/src/test/java/info/nightscout/androidaps/pump/bolusInfo/DetailedBolusInfoStorageTest.kt

@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.pump.bolusInfo
 
 import info.nightscout.androidaps.TestBase
-import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull

implementation/src/main/java/info/nightscout/implementation/pump/PumpSyncImplementation.kt

@@ -1,6 +1,6 @@
 package info.nightscout.implementation.pump
 
-import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.database.impl.ValueWrapper
 import info.nightscout.database.impl.transactions.InsertBolusWithTempIdTransaction
@@ -39,7 +39,7 @@ import info.nightscout.database.entities.ValueWithUnit
 import info.nightscout.database.entities.embedments.InterfaceIDs
 import info.nightscout.interfaces.VirtualPump
 import info.nightscout.interfaces.notifications.Notification
-import info.nightscout.interfaces.pump.PumpType
+import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag

implementation/src/main/java/info/nightscout/implementation/queue/CommandQueueImplementation.kt

@@ -7,12 +7,13 @@ import android.text.Spanned
 import androidx.appcompat.app.AppCompatActivity
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.annotations.OpenForTesting
-import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.androidaps.data.ProfileSealed
 import info.nightscout.androidaps.data.PumpEnactResultImpl
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.database.impl.ValueWrapper
 import info.nightscout.androidaps.dialogs.BolusProgressDialog
+import info.nightscout.core.pumpExtensions.insertCarbsTransaction
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.CommandQueue
 import info.nightscout.androidaps.interfaces.Constraints

implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandBolus.kt

@@ -1,7 +1,7 @@
 package info.nightscout.implementation.queue.commands
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.androidaps.dialogs.BolusProgressDialog
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissBolusProgressIfRunning

implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandSMBBolus.kt

@@ -1,7 +1,7 @@
 package info.nightscout.implementation.queue.commands
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.interfaces.data.PumpEnactResult
 import info.nightscout.androidaps.data.PumpEnactResultImpl
 import info.nightscout.androidaps.interfaces.ActivePlugin

implementation/src/test/java/info/nightscout/androidaps/TestPumpPlugin.kt

@@ -1,15 +1,15 @@
 package info.nightscout.androidaps
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.interfaces.data.PumpEnactResult
 import info.nightscout.androidaps.data.PumpEnactResultImpl
 import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.Pump
-import info.nightscout.interfaces.pump.PumpDescription
+import info.nightscout.interfaces.pump.defs.PumpDescription
 import info.nightscout.androidaps.interfaces.PumpSync
-import info.nightscout.interfaces.pump.ManufacturerType
+import info.nightscout.interfaces.pump.defs.ManufacturerType
-import info.nightscout.interfaces.pump.PumpType
+import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.interfaces.utils.TimeChangeType
 import org.json.JSONObject
 

implementation/src/test/java/info/nightscout/implementation/queue/CommandQueueImplementationTest.kt

@@ -6,7 +6,7 @@ import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBaseWithProfile
 import info.nightscout.androidaps.TestPumpPlugin
-import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.androidaps.data.PumpEnactResultImpl
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.database.impl.ValueWrapper

implementation/src/test/java/info/nightscout/implementation/queue/QueueThreadTest.kt

@@ -12,7 +12,7 @@ import info.nightscout.interfaces.ActivityNames
 import info.nightscout.interfaces.AndroidPermission
 import info.nightscout.interfaces.BuildHelper
 import info.nightscout.interfaces.Constraint
-import info.nightscout.interfaces.pump.PumpDescription
+import info.nightscout.interfaces.pump.defs.PumpDescription
 import info.nightscout.androidaps.interfaces.PumpSync
 import info.nightscout.androidaps.interfaces.Constraints
 import info.nightscout.androidaps.queue.commands.Command

insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java

@@ -30,7 +30,7 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.data.DetailedBolusInfo;
+import info.nightscout.interfaces.pump.DetailedBolusInfo;
 import info.nightscout.interfaces.data.PumpEnactResult;
 import info.nightscout.androidaps.data.PumpEnactResultImpl;
 import info.nightscout.androidaps.insight.R;
@@ -47,17 +47,17 @@ import info.nightscout.interfaces.PluginDescription;
 import info.nightscout.androidaps.interfaces.Profile;
 import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.interfaces.Pump;
-import info.nightscout.interfaces.pump.PumpDescription;
+import info.nightscout.interfaces.pump.defs.PumpDescription;
 import info.nightscout.androidaps.interfaces.PumpPluginBase;
 import info.nightscout.androidaps.interfaces.PumpSync;
 import info.nightscout.androidaps.interfaces.PumpSync.PumpState.TemporaryBasal;
 import info.nightscout.shared.interfaces.ResourceHelper;
-import info.nightscout.interfaces.pump.ManufacturerType;
+import info.nightscout.interfaces.pump.defs.ManufacturerType;
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.rx.events.EventOverviewBolusProgress;
 import info.nightscout.interfaces.notifications.Notification;
-import info.nightscout.interfaces.pump.PumpType;
+import info.nightscout.interfaces.pump.defs.PumpType;
 import info.nightscout.androidaps.plugins.pump.insight.app_layer.Service;
 import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.HistoryReadingDirection;
 import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.ReadHistoryEventsMessage;

interfaces/build.gradle

@@ -23,6 +23,7 @@ dependencies {
     // (ResourceHelper, AAPSLogger interface)
     implementation project(':app-wear-shared:shared')
     implementation project(':app-wear-shared:rx')
+    implementation project(':database:entities')
 
     api "androidx.appcompat:appcompat:$appcompat_version"
     api "androidx.preference:preference-ktx:$preferencektx_version"

interfaces/src/main/java/info/nightscout/interfaces/pump/DetailedBolusInfo.kt

@@ -1,14 +1,11 @@
-package info.nightscout.androidaps.data
+package info.nightscout.interfaces.pump
 
 import android.content.Context
-import com.google.gson.Gson
-import info.nightscout.database.impl.transactions.InsertOrUpdateBolusTransaction
-import info.nightscout.database.impl.transactions.InsertOrUpdateCarbsTransaction
 import info.nightscout.database.entities.Bolus
 import info.nightscout.database.entities.BolusCalculatorResult
 import info.nightscout.database.entities.Carbs
 import info.nightscout.database.entities.TherapyEvent
-import info.nightscout.interfaces.pump.PumpType
+import info.nightscout.interfaces.pump.defs.PumpType
 
 class DetailedBolusInfo {
 
@@ -120,19 +117,6 @@ class DetailedBolusInfo {
             )
         else null
 
-    fun insertCarbsTransaction(): InsertOrUpdateCarbsTransaction {
-        if (carbs == 0.0) throw IllegalStateException("carbs == 0.0")
-        return InsertOrUpdateCarbsTransaction(createCarbs()!!)
-    }
-
-    fun insertBolusTransaction(): InsertOrUpdateBolusTransaction {
-        if (insulin == 0.0) throw IllegalStateException("insulin == 0.0")
-        return InsertOrUpdateBolusTransaction(createBolus()!!)
-    }
-
-    fun toJsonString(): String =
-        Gson().toJson(this)
-
     fun copy(): DetailedBolusInfo {
         val n = DetailedBolusInfo()
         n.insulin = insulin
@@ -159,11 +143,6 @@ class DetailedBolusInfo {
         return n
     }
 
-    override fun toString(): String = toJsonString()
-
     companion object {
-
-        fun fromJsonString(json: String): DetailedBolusInfo =
-            Gson().fromJson(json, DetailedBolusInfo::class.java)
     }
 }

interfaces/src/main/java/info/nightscout/interfaces/pump/defs/DoseSettings.kt

@@ -1,3 +1,3 @@
-package info.nightscout.interfaces.pump
+package info.nightscout.interfaces.pump.defs
 
 class DoseSettings constructor(val step: Double, val durationStep: Int, val maxDuration: Int, val minDose: Double, val maxDose: Double = Double.MAX_VALUE)

interfaces/src/main/java/info/nightscout/interfaces/pump/defs/DoseStepSize.kt

@@ -1,4 +1,4 @@
-package info.nightscout.interfaces.pump
+package info.nightscout.interfaces.pump.defs
 
 import java.util.Locale
 
@@ -7,24 +7,29 @@ enum class DoseStepSize(private val entries: Array<DoseStepSizeEntry>) {
     ComboBasal(arrayOf(
         DoseStepSizeEntry(0.0, 1.0, 0.01),
         DoseStepSizeEntry(1.0, 10.0, 0.05),
-        DoseStepSizeEntry(10.0, Double.MAX_VALUE, 0.1))),
+        DoseStepSizeEntry(10.0, Double.MAX_VALUE, 0.1)
+    )),
     InsightBolus(arrayOf(
         DoseStepSizeEntry(0.0, 2.0, 0.05),
         DoseStepSizeEntry(2.0, 5.0, 0.1),
         DoseStepSizeEntry(5.0, 10.0, 0.2),
-        DoseStepSizeEntry(10.0, Double.MAX_VALUE, 0.5))),
+        DoseStepSizeEntry(10.0, Double.MAX_VALUE, 0.5)
+    )),
     InsightBasal(arrayOf(
         DoseStepSizeEntry(0.0, 5.0, 0.01),
-        DoseStepSizeEntry(5.0, Double.MAX_VALUE, 0.1))),
+        DoseStepSizeEntry(5.0, Double.MAX_VALUE, 0.1)
+    )),
     MedtronicVeoBasal(arrayOf(
         DoseStepSizeEntry(0.0, 1.0, 0.025),
         DoseStepSizeEntry(1.0, 10.0, 0.05),
-        DoseStepSizeEntry(10.0, Double.MAX_VALUE, 0.1))),
+        DoseStepSizeEntry(10.0, Double.MAX_VALUE, 0.1)
+    )),
     YpsopumpBasal(arrayOf(
         DoseStepSizeEntry(0.0, 1.0, 0.01),
         DoseStepSizeEntry(1.0, 2.0, 0.02),
         DoseStepSizeEntry(2.0, 15.0, 0.1),
-        DoseStepSizeEntry(15.0, 40.0, 0.5))
+        DoseStepSizeEntry(15.0, 40.0, 0.5)
+    )
     );
 
     fun getStepSizeForAmount(amount: Double): Double {

interfaces/src/main/java/info/nightscout/interfaces/pump/defs/ManufacturerType.kt

@@ -1,4 +1,4 @@
-package info.nightscout.interfaces.pump
+package info.nightscout.interfaces.pump.defs
 
 enum class ManufacturerType(val description: String) {
     AAPS("AAPS"),

interfaces/src/main/java/info/nightscout/interfaces/pump/defs/PumpCapability.kt

@@ -1,4 +1,4 @@
-package info.nightscout.interfaces.pump
+package info.nightscout.interfaces.pump.defs
 
 enum class PumpCapability {
 

interfaces/src/main/java/info/nightscout/interfaces/pump/defs/PumpDescription.kt

@@ -1,4 +1,4 @@
-package info.nightscout.interfaces.pump
+package info.nightscout.interfaces.pump.defs
 
 class PumpDescription() {
 

interfaces/src/main/java/info/nightscout/interfaces/pump/defs/PumpTempBasalType.kt

@@ -1,4 +1,4 @@
-package info.nightscout.interfaces.pump
+package info.nightscout.interfaces.pump.defs
 
 enum class PumpTempBasalType {
 

interfaces/src/main/java/info/nightscout/interfaces/pump/defs/PumpType.kt

@@ -1,4 +1,4 @@
-package info.nightscout.interfaces.pump
+package info.nightscout.interfaces.pump.defs
 
 import info.nightscout.interfaces.R
 import info.nightscout.interfaces.utils.Round

plugins/src/main/java/info/nightscout/plugins/configBuilder/RunningConfiguration.kt

@@ -8,7 +8,7 @@ import info.nightscout.interfaces.NsClient
 import info.nightscout.androidaps.interfaces.PumpSync
 import info.nightscout.androidaps.interfaces.Sensitivity
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
-import info.nightscout.interfaces.pump.PumpType
+import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.PluginType
 import info.nightscout.interfaces.notifications.Notification

plugins/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt

@@ -12,7 +12,7 @@ import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.annotations.OpenForTesting
-import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.database.impl.transactions.CancelCurrentOfflineEventIfAnyTransaction
 import info.nightscout.database.impl.transactions.CancelCurrentTemporaryTargetIfAnyTransaction

plugins/src/main/java/info/nightscout/plugins/pump/virtual/VirtualPumpPlugin.kt

@@ -4,7 +4,7 @@ import android.os.SystemClock
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.SwitchPreference
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.androidaps.data.PumpEnactResultImpl
 import info.nightscout.androidaps.dialogs.BolusProgressDialog
 import info.nightscout.androidaps.events.EventPreferenceChange
@@ -25,9 +25,9 @@ import info.nightscout.interfaces.PluginType
 import info.nightscout.interfaces.VirtualPump
 import info.nightscout.interfaces.data.PumpEnactResult
 import info.nightscout.interfaces.notifications.Notification
-import info.nightscout.interfaces.pump.ManufacturerType
+import info.nightscout.interfaces.pump.defs.ManufacturerType
-import info.nightscout.interfaces.pump.PumpDescription
+import info.nightscout.interfaces.pump.defs.PumpDescription
-import info.nightscout.interfaces.pump.PumpType
+import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.interfaces.utils.TimeChangeType
 import info.nightscout.plugins.R
 import info.nightscout.plugins.pump.virtual.events.EventVirtualPumpUpdateGui

plugins/src/test/java/info/nightscout/androidaps/TestPumpPlugin.kt

@@ -1,15 +1,15 @@
 package info.nightscout.androidaps
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.interfaces.data.PumpEnactResult
 import info.nightscout.androidaps.data.PumpEnactResultImpl
 import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.Pump
-import info.nightscout.interfaces.pump.PumpDescription
+import info.nightscout.interfaces.pump.defs.PumpDescription
 import info.nightscout.androidaps.interfaces.PumpSync
-import info.nightscout.interfaces.pump.ManufacturerType
+import info.nightscout.interfaces.pump.defs.ManufacturerType
-import info.nightscout.interfaces.pump.PumpType
+import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.interfaces.utils.TimeChangeType
 import org.json.JSONObject
 

plugins/src/test/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt

@@ -28,8 +28,8 @@ import info.nightscout.interfaces.Constraint
 import info.nightscout.interfaces.GlucoseUnit
 import info.nightscout.interfaces.PluginType
 import info.nightscout.interfaces.data.smsCommunicator.Sms
-import info.nightscout.interfaces.pump.PumpDescription
+import info.nightscout.interfaces.pump.defs.PumpDescription
-import info.nightscout.interfaces.pump.PumpType
+import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.interfaces.queue.Callback
 import info.nightscout.plugins.R
 import info.nightscout.plugins.general.smsCommunicator.otp.OneTimePassword

plugins/src/test/java/info/nightscout/plugins/pump/virtual/VirtualPumpPluginUTest.kt

@@ -8,7 +8,7 @@ import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.interfaces.PumpSync
 import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.interfaces.Config
-import info.nightscout.interfaces.pump.PumpType
+import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.plugins.R
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.shared.interfaces.ResourceHelper

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

@@ -21,7 +21,7 @@ import javax.inject.Singleton;
 
 import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.combo.R;
-import info.nightscout.androidaps.data.DetailedBolusInfo;
+import info.nightscout.interfaces.pump.DetailedBolusInfo;
 import info.nightscout.androidaps.data.PumpEnactResultImpl;
 import info.nightscout.androidaps.extensions.PumpStateExtensionKt;
 import info.nightscout.androidaps.interfaces.CommandQueue;
@@ -52,9 +52,9 @@ import info.nightscout.interfaces.PluginDescription;
 import info.nightscout.interfaces.PluginType;
 import info.nightscout.interfaces.data.PumpEnactResult;
 import info.nightscout.interfaces.notifications.Notification;
-import info.nightscout.interfaces.pump.ManufacturerType;
+import info.nightscout.interfaces.pump.defs.ManufacturerType;
-import info.nightscout.interfaces.pump.PumpDescription;
+import info.nightscout.interfaces.pump.defs.PumpDescription;
-import info.nightscout.interfaces.pump.PumpType;
+import info.nightscout.interfaces.pump.defs.PumpType;
 import info.nightscout.rx.bus.RxBus;
 import info.nightscout.rx.events.EventInitializationChanged;
 import info.nightscout.rx.events.EventOverviewBolusProgress;

pump/dana/src/main/java/info/nightscout/androidaps/dana/DanaFragment.kt

@@ -27,7 +27,7 @@ import info.nightscout.androidaps.utils.userEntry.UserEntryMapper.Sources
 import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.interfaces.ActivityNames
 import info.nightscout.interfaces.Dana
-import info.nightscout.interfaces.pump.PumpType
+import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.EventExtendedBolusChange

pump/dana/src/main/java/info/nightscout/androidaps/dana/DanaPump.kt

@@ -6,7 +6,7 @@ import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.ProfileStore
 import info.nightscout.androidaps.interfaces.PumpSync
 import info.nightscout.rx.events.EventOverviewBolusProgress
-import info.nightscout.interfaces.pump.PumpType
+import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.shared.utils.DateUtil
 import info.nightscout.androidaps.utils.DecimalFormatter
 import info.nightscout.shared.utils.T

pump/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaHistoryActivity.kt

@@ -23,7 +23,7 @@ import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.utils.DecimalFormatter
 import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.interfaces.Constants
-import info.nightscout.interfaces.pump.PumpType
+import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.interfaces.queue.Callback
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.events.EventDanaRSyncStatus

pump/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaUserOptionsActivity.kt

@@ -11,7 +11,7 @@ import info.nightscout.androidaps.interfaces.CommandQueue
 import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.interfaces.ActivityNames
 import info.nightscout.interfaces.Constants
-import info.nightscout.interfaces.pump.PumpType
+import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.interfaces.queue.Callback
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.events.EventInitializationChanged

pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/DanaRKoreanPlugin.kt

@@ -10,7 +10,7 @@ import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danaRKorean.services.DanaRKoreanExecutionService
 import info.nightscout.androidaps.danar.AbstractDanaRPlugin
 import info.nightscout.androidaps.danar.R
-import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.androidaps.data.PumpEnactResultImpl
 import info.nightscout.androidaps.events.EventPreferenceChange
 import info.nightscout.androidaps.interfaces.ActivePlugin
@@ -22,7 +22,7 @@ import info.nightscout.androidaps.interfaces.PumpSync.TemporaryBasalType
 import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.interfaces.Constraint
 import info.nightscout.interfaces.data.PumpEnactResult
-import info.nightscout.interfaces.pump.PumpType
+import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.interfaces.utils.Round
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus

pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java

@@ -50,7 +50,7 @@ import info.nightscout.shared.interfaces.ResourceHelper;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.rx.events.EventOverviewBolusProgress;
 import info.nightscout.interfaces.notifications.Notification;
-import info.nightscout.interfaces.pump.PumpType;
+import info.nightscout.interfaces.pump.defs.PumpType;
 import info.nightscout.androidaps.queue.commands.Command;
 import info.nightscout.shared.utils.DateUtil;
 import info.nightscout.shared.utils.T;

pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java

@@ -16,7 +16,7 @@ import info.nightscout.androidaps.dana.DanaPump;
 import info.nightscout.androidaps.danaRv2.services.DanaRv2ExecutionService;
 import info.nightscout.androidaps.danar.AbstractDanaRPlugin;
 import info.nightscout.androidaps.danar.R;
-import info.nightscout.androidaps.data.DetailedBolusInfo;
+import info.nightscout.interfaces.pump.DetailedBolusInfo;
 import info.nightscout.androidaps.data.PumpEnactResultImpl;
 import info.nightscout.androidaps.interfaces.ActivePlugin;
 import info.nightscout.androidaps.interfaces.CommandQueue;
@@ -28,7 +28,7 @@ import info.nightscout.androidaps.plugins.pump.common.bolusInfo.TemporaryBasalSt
 import info.nightscout.core.fabric.FabricPrivacy;
 import info.nightscout.interfaces.Constraint;
 import info.nightscout.interfaces.data.PumpEnactResult;
-import info.nightscout.interfaces.pump.PumpType;
+import info.nightscout.interfaces.pump.defs.PumpType;
 import info.nightscout.interfaces.utils.Round;
 import info.nightscout.rx.AapsSchedulers;
 import info.nightscout.rx.bus.RxBus;

pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgHistoryEventsV2.kt

@@ -5,7 +5,7 @@ import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danar.R
 import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.events.EventPumpStatusChanged
-import info.nightscout.interfaces.pump.PumpType
+import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.shared.utils.T
 import info.nightscout.rx.logging.LTag
 import java.util.GregorianCalendar

pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java

@@ -64,7 +64,7 @@ import info.nightscout.shared.interfaces.ResourceHelper;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.rx.events.EventOverviewBolusProgress;
 import info.nightscout.interfaces.notifications.Notification;
-import info.nightscout.interfaces.pump.PumpType;
+import info.nightscout.interfaces.pump.defs.PumpType;
 import info.nightscout.interfaces.queue.Callback;
 import info.nightscout.androidaps.queue.commands.Command;
 import info.nightscout.shared.utils.DateUtil;

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

@@ -22,11 +22,11 @@ import info.nightscout.interfaces.Dana;
 import info.nightscout.interfaces.PluginDescription;
 import info.nightscout.androidaps.interfaces.Profile;
 import info.nightscout.androidaps.interfaces.Pump;
-import info.nightscout.interfaces.pump.PumpDescription;
+import info.nightscout.interfaces.pump.defs.PumpDescription;
 import info.nightscout.androidaps.interfaces.PumpPluginBase;
 import info.nightscout.androidaps.interfaces.PumpSync;
 import info.nightscout.shared.interfaces.ResourceHelper;
-import info.nightscout.interfaces.pump.ManufacturerType;
+import info.nightscout.interfaces.pump.defs.ManufacturerType;
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.interfaces.notifications.Notification;

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

@@ -14,7 +14,7 @@ import javax.inject.Singleton;
 import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.dana.DanaPump;
 import info.nightscout.androidaps.danar.services.DanaRExecutionService;
-import info.nightscout.androidaps.data.DetailedBolusInfo;
+import info.nightscout.interfaces.pump.DetailedBolusInfo;
 import info.nightscout.androidaps.data.PumpEnactResultImpl;
 import info.nightscout.androidaps.events.EventPreferenceChange;
 import info.nightscout.androidaps.interfaces.ActivePlugin;
@@ -25,7 +25,7 @@ import info.nightscout.androidaps.interfaces.PumpSync;
 import info.nightscout.core.fabric.FabricPrivacy;
 import info.nightscout.interfaces.Constraint;
 import info.nightscout.interfaces.data.PumpEnactResult;
-import info.nightscout.interfaces.pump.PumpType;
+import info.nightscout.interfaces.pump.defs.PumpType;
 import info.nightscout.interfaces.utils.Round;
 import info.nightscout.rx.AapsSchedulers;
 import info.nightscout.rx.bus.RxBus;

pump/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java

@@ -56,7 +56,7 @@ import info.nightscout.shared.interfaces.ResourceHelper;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.rx.events.EventOverviewBolusProgress;
 import info.nightscout.interfaces.notifications.Notification;
-import info.nightscout.interfaces.pump.PumpType;
+import info.nightscout.interfaces.pump.defs.PumpType;
 import info.nightscout.interfaces.queue.Callback;
 import info.nightscout.androidaps.queue.commands.Command;
 import info.nightscout.rx.bus.RxBus;

pump/danar/src/test/java/info/nightscout/androidaps/TestPumpPlugin.kt

@@ -1,15 +1,15 @@
 package info.nightscout.androidaps
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.interfaces.data.PumpEnactResult
 import info.nightscout.androidaps.data.PumpEnactResultImpl
 import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.Pump
-import info.nightscout.interfaces.pump.PumpDescription
+import info.nightscout.interfaces.pump.defs.PumpDescription
 import info.nightscout.androidaps.interfaces.PumpSync
-import info.nightscout.interfaces.pump.ManufacturerType
+import info.nightscout.interfaces.pump.defs.ManufacturerType
-import info.nightscout.interfaces.pump.PumpType
+import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.interfaces.utils.TimeChangeType
 import org.json.JSONObject
 

pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalTest.kt

@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgSettingBasal
-import info.nightscout.interfaces.pump.PumpDescription
+import info.nightscout.interfaces.pump.defs.PumpDescription
 import org.junit.Assert
 import org.junit.Test
 import org.mockito.Mockito.`when`

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

@@ -13,7 +13,7 @@ import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.dana.comm.RecordTypes
 import info.nightscout.androidaps.danars.events.EventDanaRSDeviceChange
 import info.nightscout.androidaps.danars.services.DanaRSService
-import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.androidaps.data.PumpEnactResultImpl
 import info.nightscout.androidaps.extensions.convertedToAbsolute
 import info.nightscout.androidaps.extensions.plannedRemainingMinutes
@@ -37,9 +37,9 @@ import info.nightscout.interfaces.PluginDescription
 import info.nightscout.interfaces.PluginType
 import info.nightscout.interfaces.data.PumpEnactResult
 import info.nightscout.interfaces.notifications.Notification
-import info.nightscout.interfaces.pump.ManufacturerType
+import info.nightscout.interfaces.pump.defs.ManufacturerType
-import info.nightscout.interfaces.pump.PumpDescription
+import info.nightscout.interfaces.pump.defs.PumpDescription
-import info.nightscout.interfaces.pump.PumpType
+import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.interfaces.utils.Round
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus

pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSHistoryEvents.kt

@@ -4,7 +4,7 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.R
 import info.nightscout.androidaps.danars.encryption.BleEncryption
-import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.androidaps.events.EventPumpStatusChanged
 import info.nightscout.androidaps.interfaces.PumpSync
 import info.nightscout.shared.interfaces.ResourceHelper

pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Plugin.kt

@@ -9,7 +9,7 @@ import android.text.format.DateFormat
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.androidaps.data.PumpEnactResultImpl
 import info.nightscout.androidaps.diaconn.events.EventDiaconnG8DeviceChange
 import info.nightscout.androidaps.diaconn.service.DiaconnG8Service
@@ -35,9 +35,9 @@ import info.nightscout.interfaces.PluginDescription
 import info.nightscout.interfaces.PluginType
 import info.nightscout.interfaces.data.PumpEnactResult
 import info.nightscout.interfaces.notifications.Notification
-import info.nightscout.interfaces.pump.ManufacturerType
+import info.nightscout.interfaces.pump.defs.ManufacturerType
-import info.nightscout.interfaces.pump.PumpDescription
+import info.nightscout.interfaces.pump.defs.PumpDescription
-import info.nightscout.interfaces.pump.PumpType
+import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.interfaces.pump.actions.CustomAction
 import info.nightscout.interfaces.pump.actions.CustomActionType
 import info.nightscout.interfaces.utils.Round

pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigLogInquireResponsePacket.kt

@@ -2,7 +2,7 @@ package info.nightscout.androidaps.diaconn.packet
 
 import android.content.Context
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.androidaps.diaconn.DiaconnG8Pump
 import info.nightscout.androidaps.diaconn.R
 import info.nightscout.androidaps.diaconn.api.ApiResponse
@@ -42,12 +42,12 @@ import info.nightscout.androidaps.diaconn.pumplog.PumplogUtil
 import info.nightscout.androidaps.events.EventPumpStatusChanged
 import info.nightscout.shared.extensions.safeGetPackageInfo
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.interfaces.pump.PumpDescription
+import info.nightscout.interfaces.pump.defs.PumpDescription
 import info.nightscout.androidaps.interfaces.PumpSync
 import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.TemporaryBasalStorage
-import info.nightscout.interfaces.pump.PumpType
+import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.shared.utils.T
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.logging.LTag

pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigMainInfoInquireResponsePacket.kt

@@ -4,9 +4,9 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.diaconn.DiaconnG8Pump
 import info.nightscout.androidaps.diaconn.R
 import info.nightscout.androidaps.diaconn.pumplog.PumplogUtil
-import info.nightscout.interfaces.pump.PumpDescription
+import info.nightscout.interfaces.pump.defs.PumpDescription
 import info.nightscout.shared.interfaces.ResourceHelper
-import info.nightscout.interfaces.pump.PumpType
+import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.rx.logging.LTag
 import info.nightscout.shared.sharedPreferences.SP
 import org.joda.time.DateTime

pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/service/DiaconnG8Service.kt

@@ -61,7 +61,7 @@ import info.nightscout.interfaces.ActivityNames
 import info.nightscout.interfaces.Constants
 import info.nightscout.interfaces.data.PumpEnactResult
 import info.nightscout.interfaces.notifications.Notification
-import info.nightscout.interfaces.pump.PumpType
+import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.interfaces.queue.Callback
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus

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

@@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.pump.eopatch
 
 import android.os.SystemClock
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.androidaps.data.PumpEnactResultImpl
 import info.nightscout.androidaps.events.EventPreferenceChange
 import info.nightscout.androidaps.interfaces.CommandQueue
@@ -23,9 +23,9 @@ import info.nightscout.interfaces.PluginDescription
 import info.nightscout.interfaces.PluginType
 import info.nightscout.interfaces.data.PumpEnactResult
 import info.nightscout.interfaces.notifications.Notification
-import info.nightscout.interfaces.pump.ManufacturerType
+import info.nightscout.interfaces.pump.defs.ManufacturerType
-import info.nightscout.interfaces.pump.PumpDescription
+import info.nightscout.interfaces.pump.defs.PumpDescription
-import info.nightscout.interfaces.pump.PumpType
+import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.interfaces.pump.actions.CustomAction
 import info.nightscout.interfaces.pump.actions.CustomActionType
 import info.nightscout.interfaces.queue.CustomCommand

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

@@ -23,7 +23,7 @@ import info.nightscout.androidaps.plugins.pump.eopatch.ui.AlarmHelperActivity
 import info.nightscout.androidaps.plugins.pump.eopatch.vo.Alarms
 import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.interfaces.notifications.Notification
-import info.nightscout.interfaces.pump.PumpType
+import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.logging.AAPSLogger

pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/IPatchManager.java

@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.eopatch.ble;
 
 
-import info.nightscout.androidaps.data.DetailedBolusInfo;
+import info.nightscout.interfaces.pump.DetailedBolusInfo;
 import info.nightscout.androidaps.plugins.pump.eopatch.core.scan.BleConnectionState;
 import info.nightscout.androidaps.plugins.pump.eopatch.core.scan.PatchSelfTestResult;
 import info.nightscout.androidaps.plugins.pump.eopatch.core.scan.ScanList;

pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/PatchManager.java

@@ -8,14 +8,14 @@ import java.util.concurrent.TimeUnit;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import info.nightscout.androidaps.data.DetailedBolusInfo;
+import info.nightscout.interfaces.pump.DetailedBolusInfo;
 import info.nightscout.androidaps.events.EventPumpStatusChanged;
 import info.nightscout.androidaps.interfaces.ActivePlugin;
 import info.nightscout.androidaps.interfaces.CommandQueue;
 import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.interfaces.PumpSync;
 import info.nightscout.shared.interfaces.ResourceHelper;
-import info.nightscout.interfaces.pump.PumpType;
+import info.nightscout.interfaces.pump.defs.PumpType;
 import info.nightscout.androidaps.plugins.pump.eopatch.R;
 import info.nightscout.androidaps.plugins.pump.eopatch.RxAction;
 import info.nightscout.androidaps.plugins.pump.eopatch.alarm.AlarmCode;

pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/PatchManagerImpl.java

@@ -33,9 +33,9 @@ import javax.crypto.KeyAgreement;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import info.nightscout.androidaps.data.DetailedBolusInfo;
+import info.nightscout.interfaces.pump.DetailedBolusInfo;
 import info.nightscout.androidaps.interfaces.PumpSync;
-import info.nightscout.interfaces.pump.PumpType;
+import info.nightscout.interfaces.pump.defs.PumpType;
 import info.nightscout.androidaps.plugins.pump.eopatch.EoPatchRxBus;
 import info.nightscout.androidaps.plugins.pump.eopatch.alarm.AlarmCode;
 import info.nightscout.androidaps.plugins.pump.eopatch.ble.task.ActivateTask;

pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/StartCalcBolusTask.java

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.pump.eopatch.ble.task;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import info.nightscout.androidaps.data.DetailedBolusInfo;
+import info.nightscout.interfaces.pump.DetailedBolusInfo;
 import info.nightscout.androidaps.plugins.pump.eopatch.core.api.BolusStart;
 import info.nightscout.androidaps.plugins.pump.eopatch.core.response.BolusResponse;
 import info.nightscout.rx.logging.LTag;

pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/viewmodel/EopatchOverviewViewModel.kt

@@ -6,7 +6,7 @@ import androidx.lifecycle.Transformations
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.interfaces.PumpSync
 import info.nightscout.shared.interfaces.ResourceHelper
-import info.nightscout.interfaces.pump.PumpType
+import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.androidaps.plugins.pump.eopatch.R
 import info.nightscout.androidaps.plugins.pump.eopatch.ble.IPatchManager
 import info.nightscout.androidaps.plugins.pump.eopatch.ble.IPreferenceManager

pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.kt

@@ -7,7 +7,7 @@ import android.os.IBinder
 import android.os.SystemClock
 import androidx.preference.Preference
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.androidaps.data.PumpEnactResultImpl
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.CommandQueue
@@ -59,8 +59,8 @@ import info.nightscout.interfaces.PluginDescription
 import info.nightscout.interfaces.PluginType
 import info.nightscout.interfaces.data.PumpEnactResult
 import info.nightscout.interfaces.notifications.Notification
-import info.nightscout.interfaces.pump.ManufacturerType
+import info.nightscout.interfaces.pump.defs.ManufacturerType
-import info.nightscout.interfaces.pump.PumpType
+import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.interfaces.pump.actions.CustomAction
 import info.nightscout.interfaces.pump.actions.CustomActionType
 import info.nightscout.interfaces.utils.TimeChangeType

pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.kt

@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.medtronic.comm
 
 import android.os.SystemClock
-import info.nightscout.interfaces.pump.PumpType
+import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkCommunicationManager
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkCommunicationException

pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverter.kt

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.medtronic.comm
 
-import info.nightscout.interfaces.pump.PumpType
+import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BasalProfile
 import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BatteryStatusDTO
 import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.PumpSettingDTO

pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.kt

@@ -3,11 +3,11 @@ package info.nightscout.androidaps.plugins.pump.medtronic.data
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.PumpSync
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
-import info.nightscout.interfaces.pump.PumpType
+import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.androidaps.plugins.pump.common.sync.PumpDbEntry
 import info.nightscout.androidaps.plugins.pump.common.sync.PumpDbEntryBolus
 import info.nightscout.androidaps.plugins.pump.common.sync.PumpDbEntryTBR

pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfile.kt

@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.medtronic.data.dto
 
 import com.google.gson.annotations.Expose
-import info.nightscout.interfaces.pump.PumpType
+import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil
 import info.nightscout.pump.core.utils.ByteUtil
 import info.nightscout.rx.logging.AAPSLogger

pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/driver/MedtronicPumpStatus.kt

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.medtronic.driver
 
-import info.nightscout.interfaces.pump.PumpType
+import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.data.RLHistoryItem

pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt

@@ -5,7 +5,7 @@ import android.os.Handler
 import android.os.HandlerThread
 import android.text.format.DateFormat
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.androidaps.data.PumpEnactResultImpl
 import info.nightscout.androidaps.events.EventPreferenceChange
 import info.nightscout.androidaps.extensions.convertedToAbsolute
@@ -57,9 +57,9 @@ import info.nightscout.interfaces.PluginDescription
 import info.nightscout.interfaces.PluginType
 import info.nightscout.interfaces.data.PumpEnactResult
 import info.nightscout.interfaces.notifications.Notification
-import info.nightscout.interfaces.pump.ManufacturerType
+import info.nightscout.interfaces.pump.defs.ManufacturerType
-import info.nightscout.interfaces.pump.PumpDescription
+import info.nightscout.interfaces.pump.defs.PumpDescription
-import info.nightscout.interfaces.pump.PumpType
+import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.interfaces.pump.actions.CustomAction
 import info.nightscout.interfaces.pump.actions.CustomActionType
 import info.nightscout.interfaces.queue.CustomCommand

pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state
 
-import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.Id
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.pair.PairResult
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.*

pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt

@@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state
 
 import android.os.SystemClock
 import com.google.gson.Gson
-import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.EventOmnipodDashPumpValuesChanged
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.R
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.Id

pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/Record.kt

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data
 
-import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.androidaps.interfaces.Profile
 
 sealed class Record

pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodHistoryActivity.kt

@@ -13,7 +13,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpHistoryEntryGroup
-import info.nightscout.interfaces.pump.PumpType
+import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil
 import info.nightscout.androidaps.plugins.pump.common.utils.ProfileUtil
 import info.nightscout.androidaps.plugins.pump.omnipod.common.definition.OmnipodCommandType

pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInsertCannulaViewModel.kt

@@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.activatio
 
 import androidx.annotation.StringRes
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.androidaps.data.PumpEnactResultImpl
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.interfaces.PumpSync
@@ -22,7 +22,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dash.util.mapProfileToBas
 import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.interfaces.data.PumpEnactResult
 import info.nightscout.interfaces.notifications.Notification
-import info.nightscout.interfaces.pump.PumpType
+import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.logging.AAPSLogger

pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/Functions.kt

@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dash.util
 
 import info.nightscout.androidaps.interfaces.Profile
-import info.nightscout.interfaces.pump.PumpType
+import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.BasalProgram
 import java.util.*
 import kotlin.math.roundToInt

pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPlugin.java

@@ -34,7 +34,8 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.data.DetailedBolusInfo;
+import info.nightscout.core.pumpExtensions.DetailedBolusInfoExtensionKt;
+import info.nightscout.interfaces.pump.DetailedBolusInfo;
 import info.nightscout.androidaps.data.PumpEnactResultImpl;
 import info.nightscout.androidaps.events.EventPreferenceChange;
 import info.nightscout.androidaps.interfaces.ActivePlugin;
@@ -94,9 +95,9 @@ import info.nightscout.interfaces.PluginDescription;
 import info.nightscout.interfaces.PluginType;
 import info.nightscout.interfaces.data.PumpEnactResult;
 import info.nightscout.interfaces.notifications.Notification;
-import info.nightscout.interfaces.pump.ManufacturerType;
+import info.nightscout.interfaces.pump.defs.ManufacturerType;
-import info.nightscout.interfaces.pump.PumpDescription;
+import info.nightscout.interfaces.pump.defs.PumpDescription;
-import info.nightscout.interfaces.pump.PumpType;
+import info.nightscout.interfaces.pump.defs.PumpType;
 import info.nightscout.interfaces.pump.actions.CustomActionType;
 import info.nightscout.interfaces.queue.Callback;
 import info.nightscout.interfaces.queue.CustomCommand;
@@ -366,7 +367,7 @@ public class OmnipodErosPumpPlugin extends PumpPluginBase implements Pump, Riley
                         String activeBolusString = sp.getString(OmnipodErosStorageKeys.Preferences.ACTIVE_BOLUS, "");
                         aapsLogger.warn(LTag.PUMP, "Found active bolus in SP: {}. Adding Treatment.", activeBolusString);
                         try {
-                            aapsOmnipodErosManager.addBolusToHistory(DetailedBolusInfo.Companion.fromJsonString(activeBolusString));
+                            aapsOmnipodErosManager.addBolusToHistory(DetailedBolusInfoExtensionKt.fromJsonString(new DetailedBolusInfo(), activeBolusString));
                         } catch (Exception ex) {
                             aapsLogger.error(LTag.PUMP, "Failed to add active bolus to history", ex);
                         }

pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsOmnipodErosManager.java

@@ -14,14 +14,12 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.data.DetailedBolusInfo;
 import info.nightscout.androidaps.data.PumpEnactResultImpl;
 import info.nightscout.androidaps.extensions.PumpStateExtensionKt;
 import info.nightscout.androidaps.interfaces.Profile;
 import info.nightscout.androidaps.interfaces.PumpSync;
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
-import info.nightscout.interfaces.pump.PumpType;
 import info.nightscout.androidaps.plugins.pump.common.defs.TempBasalPair;
 import info.nightscout.androidaps.plugins.pump.omnipod.common.definition.OmnipodCommandType;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.R;
@@ -69,9 +67,12 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.history.database.Ero
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.util.AapsOmnipodUtil;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.util.OmnipodAlertUtil;
+import info.nightscout.core.pumpExtensions.DetailedBolusInfoExtensionKt;
 import info.nightscout.interfaces.ActivityNames;
 import info.nightscout.interfaces.data.PumpEnactResult;
 import info.nightscout.interfaces.notifications.Notification;
+import info.nightscout.interfaces.pump.DetailedBolusInfo;
+import info.nightscout.interfaces.pump.defs.PumpType;
 import info.nightscout.pump.core.utils.ByteUtil;
 import info.nightscout.rx.AapsSchedulers;
 import info.nightscout.rx.bus.RxBus;
@@ -426,7 +427,7 @@ public class AapsOmnipodErosManager {
         //
         // I discussed this with the AAPS team but nobody seems to care so we're stuck with this ugly workaround for now
         try {
-            sp.putString(OmnipodErosStorageKeys.Preferences.ACTIVE_BOLUS, detailedBolusInfo.toJsonString());
+            sp.putString(OmnipodErosStorageKeys.Preferences.ACTIVE_BOLUS, DetailedBolusInfoExtensionKt.toJsonString(detailedBolusInfo));
             aapsLogger.debug(LTag.PUMP, "Stored active bolus to SP for recovery");
         } catch (Exception ex) {
             aapsLogger.error(LTag.PUMP, "Failed to store active bolus to SP", ex);

pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodHistoryActivity.java

@@ -26,7 +26,7 @@ import info.nightscout.androidaps.activities.NoSplashAppCompatActivity;
 import info.nightscout.androidaps.interfaces.Profile;
 import info.nightscout.shared.interfaces.ResourceHelper;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpHistoryEntryGroup;
-import info.nightscout.interfaces.pump.PumpType;
+import info.nightscout.interfaces.pump.defs.PumpType;
 import info.nightscout.androidaps.plugins.pump.common.defs.TempBasalPair;
 import info.nightscout.androidaps.plugins.pump.common.utils.ProfileUtil;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.R;

pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPluginTest.kt

@@ -10,7 +10,7 @@ import info.nightscout.androidaps.interfaces.CommandQueue
 import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.PumpSync
 import info.nightscout.shared.interfaces.ResourceHelper
-import info.nightscout.interfaces.pump.PumpType
+import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.androidaps.plugins.pump.common.defs.TempBasalPair
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsOmnipodErosManager