From cb9ea1d06b86573ee10809a189b570689d0cb1a6 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Tue, 22 Nov 2022 13:13:18 +0100 Subject: [PATCH] move receivers --- app/src/main/java/info/nightscout/androidaps/MainApp.kt | 2 +- .../plugins/general/wear/wearintegration/DataHandlerMobile.kt | 2 +- .../wear/wearintegration/DataLayerListenerServiceMobile.kt | 2 +- .../plugins/iob/iobCobCalculator/IobCobOref1Worker.kt | 2 +- .../plugins/iob/iobCobCalculator/IobCobOrefWorker.kt | 2 +- .../nightscout/androidaps/receivers/ChargingStateReceiver.kt | 1 + .../java/info/nightscout/androidaps/receivers/DataReceiver.kt | 1 + .../info/nightscout/androidaps/receivers/KeepAliveWorker.kt | 1 + .../info/nightscout/androidaps/workflow/CalculationWorkflow.kt | 2 +- .../info/nightscout/androidaps/workflow/InvokeLoopWorker.kt | 2 +- .../info/nightscout/androidaps/workflow/LoadBgDataWorker.kt | 2 +- .../nightscout/androidaps/workflow/PrepareBasalDataWorker.kt | 2 +- .../info/nightscout/androidaps/workflow/PrepareBgDataWorker.kt | 2 +- .../androidaps/workflow/PrepareBucketedDataWorker.kt | 2 +- .../androidaps/workflow/PrepareIobAutosensGraphDataWorker.kt | 2 +- .../nightscout/androidaps/workflow/PreparePredictionsWorker.kt | 2 +- .../androidaps/workflow/PrepareTemporaryTargetDataWorker.kt | 2 +- .../androidaps/workflow/PrepareTreatmentsDataWorker.kt | 2 +- .../nightscout/androidaps/plugins/aps/loop/LoopPluginTest.kt | 2 +- .../plugins/constraints/versionChecker/VersionCheckerUtils.kt | 2 +- .../main/java/info/nightscout/core/di/CoreReceiversModule.kt | 2 +- .../contraints/versionChecker/VersionCheckerUtilsKtTest.kt | 2 +- .../java/info/nightscout/androidaps/utils/StringUtilsTest.kt | 2 +- .../info/nightscout/core/utils}/receivers/DataWorkerStorage.kt | 2 +- .../nightscout/core/utils}/receivers/NetworkChangeReceiver.kt | 3 +-- .../nightscout/core/utils}/receivers/ReceiverStatusStore.kt | 2 +- .../java/info/nightscout/core/utils/receivers}/StringUtils.kt | 2 +- .../info/nightscout/automation/triggers/TriggerWifiSsid.kt | 2 +- .../info/nightscout/automation/triggers/TriggerTestBase.kt | 2 +- .../main/java/info/nightscout/plugins/aps/loop/LoopPlugin.kt | 2 +- .../plugins/constraints/objectives/ObjectivesFragment.kt | 2 +- .../plugins/general/dataBroadcaster/DataBroadcastPlugin.kt | 2 +- .../java/info/nightscout/plugins/general/food/FoodPlugin.kt | 2 +- .../plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt | 2 +- .../main/java/info/nightscout/plugins/profile/ProfilePlugin.kt | 2 +- .../main/java/info/nightscout/plugins/source/AidexPlugin.kt | 2 +- .../main/java/info/nightscout/plugins/source/DexcomPlugin.kt | 2 +- .../java/info/nightscout/plugins/source/EversensePlugin.kt | 2 +- .../main/java/info/nightscout/plugins/source/MM640gPlugin.kt | 2 +- .../info/nightscout/plugins/source/NSClientSourcePlugin.kt | 2 +- .../main/java/info/nightscout/plugins/source/XdripPlugin.kt | 2 +- .../plugins/sync/nsclient/NsClientReceiverDelegate.kt | 2 +- .../plugins/sync/nsclient/extensions/DeviceStatusExtension.kt | 2 +- .../plugins/sync/nsclient/services/NSClientService.kt | 2 +- .../plugins/sync/nsclient/workers/NSClientAddAckWorker.kt | 2 +- .../plugins/sync/nsclient/workers/NSClientAddUpdateWorker.kt | 2 +- .../plugins/sync/nsclient/workers/NSClientMbgWorker.kt | 2 +- .../sync/nsclient/workers/NSClientUpdateRemoveAckWorker.kt | 2 +- .../nightscout/plugins/sync/nsclientV3/workers/LoadBgWorker.kt | 2 +- .../plugins/sync/nsclientV3/workers/LoadDeviceStatusWorker.kt | 2 +- .../plugins/sync/nsclientV3/workers/LoadTreatmentsWorker.kt | 2 +- .../plugins/sync/nsclientV3/workers/ProcessTreatmentsWorker.kt | 2 +- .../info/nightscout/plugins/sync/tidepool/TidepoolPlugin.kt | 2 +- .../plugins/sync/nsclient/NsClientReceiverDelegateTest.kt | 2 +- 54 files changed, 54 insertions(+), 52 deletions(-) rename core/{core-main/src/main/java/info/nightscout/androidaps => utils/src/main/java/info/nightscout/core/utils}/receivers/DataWorkerStorage.kt (97%) rename core/{core-main/src/main/java/info/nightscout/androidaps => utils/src/main/java/info/nightscout/core/utils}/receivers/NetworkChangeReceiver.kt (97%) rename core/{core-main/src/main/java/info/nightscout/androidaps => utils/src/main/java/info/nightscout/core/utils}/receivers/ReceiverStatusStore.kt (96%) rename {interfaces/src/main/java/info/nightscout/interfaces/utils => core/utils/src/main/java/info/nightscout/core/utils/receivers}/StringUtils.kt (88%) diff --git a/app/src/main/java/info/nightscout/androidaps/MainApp.kt b/app/src/main/java/info/nightscout/androidaps/MainApp.kt index 55c66bb9dc..5303ed09b3 100644 --- a/app/src/main/java/info/nightscout/androidaps/MainApp.kt +++ b/app/src/main/java/info/nightscout/androidaps/MainApp.kt @@ -23,7 +23,7 @@ import info.nightscout.androidaps.plugins.constraints.versionChecker.VersionChec import info.nightscout.androidaps.receivers.BTReceiver import info.nightscout.androidaps.receivers.ChargingStateReceiver import info.nightscout.androidaps.receivers.KeepAliveWorker -import info.nightscout.androidaps.receivers.NetworkChangeReceiver +import info.nightscout.core.utils.receivers.NetworkChangeReceiver import info.nightscout.androidaps.receivers.TimeDateOrTZChangeReceiver import info.nightscout.androidaps.services.AlarmSoundServiceHelper import info.nightscout.androidaps.utils.ProcessLifecycleListener diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataHandlerMobile.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataHandlerMobile.kt index 37e8d1794c..1c9c81d543 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataHandlerMobile.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataHandlerMobile.kt @@ -12,7 +12,7 @@ import info.nightscout.androidaps.extensions.valueToUnitsString import info.nightscout.androidaps.logging.UserEntryLogger import info.nightscout.androidaps.plugins.general.overview.graphExtensions.GlucoseValueDataPoint import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider -import info.nightscout.androidaps.receivers.ReceiverStatusStore +import info.nightscout.core.utils.receivers.ReceiverStatusStore import info.nightscout.androidaps.services.AlarmSoundServiceHelper import info.nightscout.androidaps.utils.DecimalFormatter import info.nightscout.androidaps.utils.DefaultValueHelper diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataLayerListenerServiceMobile.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataLayerListenerServiceMobile.kt index 580ac12fd4..b17522624d 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataLayerListenerServiceMobile.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataLayerListenerServiceMobile.kt @@ -18,7 +18,7 @@ import dagger.android.AndroidInjection import info.nightscout.androidaps.R import info.nightscout.androidaps.plugins.general.wear.WearPlugin import info.nightscout.androidaps.plugins.general.wear.events.EventWearUpdateGui -import info.nightscout.androidaps.receivers.ReceiverStatusStore +import info.nightscout.core.utils.receivers.ReceiverStatusStore import info.nightscout.androidaps.utils.DefaultValueHelper import info.nightscout.core.utils.fabric.FabricPrivacy import info.nightscout.database.impl.AppRepository diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Worker.kt b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Worker.kt index 860e6095ea..89823b2110 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Worker.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Worker.kt @@ -11,10 +11,10 @@ import info.nightscout.androidaps.extensions.target import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification import info.nightscout.androidaps.plugins.iob.iobCobCalculator.data.AutosensDataObject import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventIobCalculationProgress -import info.nightscout.androidaps.receivers.DataWorkerStorage import info.nightscout.androidaps.utils.DecimalFormatter import info.nightscout.androidaps.workflow.CalculationWorkflow import info.nightscout.core.utils.fabric.FabricPrivacy +import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.ValueWrapper import info.nightscout.interfaces.Config diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOrefWorker.kt b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOrefWorker.kt index 94fbc4f4f1..7ab3a1c620 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOrefWorker.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOrefWorker.kt @@ -10,10 +10,10 @@ import info.nightscout.androidaps.R import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification import info.nightscout.androidaps.plugins.iob.iobCobCalculator.data.AutosensDataObject import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventIobCalculationProgress -import info.nightscout.androidaps.receivers.DataWorkerStorage import info.nightscout.androidaps.utils.DecimalFormatter import info.nightscout.androidaps.workflow.CalculationWorkflow import info.nightscout.core.utils.fabric.FabricPrivacy +import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.database.impl.AppRepository import info.nightscout.interfaces.Config import info.nightscout.interfaces.Constants diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/ChargingStateReceiver.kt b/app/src/main/java/info/nightscout/androidaps/receivers/ChargingStateReceiver.kt index 161f548878..d03dc63c32 100644 --- a/app/src/main/java/info/nightscout/androidaps/receivers/ChargingStateReceiver.kt +++ b/app/src/main/java/info/nightscout/androidaps/receivers/ChargingStateReceiver.kt @@ -5,6 +5,7 @@ import android.content.Intent import android.content.IntentFilter import android.os.BatteryManager import dagger.android.DaggerBroadcastReceiver +import info.nightscout.core.utils.receivers.ReceiverStatusStore import info.nightscout.rx.bus.RxBus import info.nightscout.rx.events.EventChargingState import info.nightscout.rx.logging.AAPSLogger diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/DataReceiver.kt b/app/src/main/java/info/nightscout/androidaps/receivers/DataReceiver.kt index e7b01476c9..e459c0223c 100644 --- a/app/src/main/java/info/nightscout/androidaps/receivers/DataReceiver.kt +++ b/app/src/main/java/info/nightscout/androidaps/receivers/DataReceiver.kt @@ -9,6 +9,7 @@ import dagger.android.DaggerBroadcastReceiver import info.nightscout.core.utils.extensions.copyDouble import info.nightscout.core.utils.extensions.copyLong import info.nightscout.core.utils.extensions.copyString +import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.interfaces.receivers.Intents import info.nightscout.plugins.general.smsCommunicator.SmsCommunicatorPlugin import info.nightscout.plugins.source.AidexPlugin diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveWorker.kt b/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveWorker.kt index c1ae353c8f..0d1453e18b 100644 --- a/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveWorker.kt +++ b/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveWorker.kt @@ -17,6 +17,7 @@ import info.nightscout.androidaps.R import info.nightscout.androidaps.data.ProfileSealed import info.nightscout.androidaps.plugins.general.maintenance.MaintenancePlugin import info.nightscout.core.utils.fabric.FabricPrivacy +import info.nightscout.core.utils.receivers.ReceiverStatusStore import info.nightscout.database.impl.AppRepository import info.nightscout.interfaces.Config import info.nightscout.interfaces.LocalAlertUtils diff --git a/app/src/main/java/info/nightscout/androidaps/workflow/CalculationWorkflow.kt b/app/src/main/java/info/nightscout/androidaps/workflow/CalculationWorkflow.kt index eacc4d29de..b31170d640 100644 --- a/app/src/main/java/info/nightscout/androidaps/workflow/CalculationWorkflow.kt +++ b/app/src/main/java/info/nightscout/androidaps/workflow/CalculationWorkflow.kt @@ -15,8 +15,8 @@ import info.nightscout.androidaps.plugins.general.overview.OverviewData import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobOref1Worker import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobOrefWorker -import info.nightscout.androidaps.receivers.DataWorkerStorage import info.nightscout.core.utils.fabric.FabricPrivacy +import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.interfaces.iob.IobCobCalculator import info.nightscout.interfaces.plugin.ActivePlugin import info.nightscout.rx.AapsSchedulers diff --git a/app/src/main/java/info/nightscout/androidaps/workflow/InvokeLoopWorker.kt b/app/src/main/java/info/nightscout/androidaps/workflow/InvokeLoopWorker.kt index ffa873b28b..b215713f4e 100644 --- a/app/src/main/java/info/nightscout/androidaps/workflow/InvokeLoopWorker.kt +++ b/app/src/main/java/info/nightscout/androidaps/workflow/InvokeLoopWorker.kt @@ -6,7 +6,7 @@ import androidx.work.WorkerParameters import androidx.work.workDataOf import dagger.android.HasAndroidInjector import info.nightscout.androidaps.events.EventNewBG -import info.nightscout.androidaps.receivers.DataWorkerStorage +import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.interfaces.aps.Loop import info.nightscout.interfaces.iob.IobCobCalculator import info.nightscout.rx.events.Event diff --git a/app/src/main/java/info/nightscout/androidaps/workflow/LoadBgDataWorker.kt b/app/src/main/java/info/nightscout/androidaps/workflow/LoadBgDataWorker.kt index 1a73750663..3c16202c7e 100644 --- a/app/src/main/java/info/nightscout/androidaps/workflow/LoadBgDataWorker.kt +++ b/app/src/main/java/info/nightscout/androidaps/workflow/LoadBgDataWorker.kt @@ -5,8 +5,8 @@ import androidx.work.Worker import androidx.work.WorkerParameters import androidx.work.workDataOf import dagger.android.HasAndroidInjector -import info.nightscout.androidaps.receivers.DataWorkerStorage import info.nightscout.core.aps.loadBgData +import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.database.impl.AppRepository import info.nightscout.interfaces.iob.IobCobCalculator import info.nightscout.rx.bus.RxBus diff --git a/app/src/main/java/info/nightscout/androidaps/workflow/PrepareBasalDataWorker.kt b/app/src/main/java/info/nightscout/androidaps/workflow/PrepareBasalDataWorker.kt index 8059bd5ab6..4c795b2882 100644 --- a/app/src/main/java/info/nightscout/androidaps/workflow/PrepareBasalDataWorker.kt +++ b/app/src/main/java/info/nightscout/androidaps/workflow/PrepareBasalDataWorker.kt @@ -12,7 +12,7 @@ import info.nightscout.androidaps.R import info.nightscout.androidaps.plugins.general.overview.OverviewData import info.nightscout.androidaps.plugins.general.overview.graphExtensions.ScaledDataPoint import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventIobCalculationProgress -import info.nightscout.androidaps.receivers.DataWorkerStorage +import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.interfaces.iob.IobCobCalculator import info.nightscout.interfaces.profile.ProfileFunction import info.nightscout.rx.bus.RxBus diff --git a/app/src/main/java/info/nightscout/androidaps/workflow/PrepareBgDataWorker.kt b/app/src/main/java/info/nightscout/androidaps/workflow/PrepareBgDataWorker.kt index ca229ed726..01ec0480a3 100644 --- a/app/src/main/java/info/nightscout/androidaps/workflow/PrepareBgDataWorker.kt +++ b/app/src/main/java/info/nightscout/androidaps/workflow/PrepareBgDataWorker.kt @@ -9,7 +9,7 @@ import info.nightscout.androidaps.plugins.general.overview.OverviewData import info.nightscout.androidaps.plugins.general.overview.graphExtensions.DataPointWithLabelInterface import info.nightscout.androidaps.plugins.general.overview.graphExtensions.GlucoseValueDataPoint import info.nightscout.androidaps.plugins.general.overview.graphExtensions.PointsWithLabelGraphSeries -import info.nightscout.androidaps.receivers.DataWorkerStorage +import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.androidaps.utils.DefaultValueHelper import info.nightscout.core.profile.fromMgdlToUnits import info.nightscout.database.impl.AppRepository diff --git a/app/src/main/java/info/nightscout/androidaps/workflow/PrepareBucketedDataWorker.kt b/app/src/main/java/info/nightscout/androidaps/workflow/PrepareBucketedDataWorker.kt index b3bc599f66..b0ba1acb9f 100644 --- a/app/src/main/java/info/nightscout/androidaps/workflow/PrepareBucketedDataWorker.kt +++ b/app/src/main/java/info/nightscout/androidaps/workflow/PrepareBucketedDataWorker.kt @@ -9,7 +9,7 @@ import info.nightscout.androidaps.plugins.general.overview.OverviewData import info.nightscout.androidaps.plugins.general.overview.graphExtensions.DataPointWithLabelInterface import info.nightscout.androidaps.plugins.general.overview.graphExtensions.InMemoryGlucoseValueDataPoint import info.nightscout.androidaps.plugins.general.overview.graphExtensions.PointsWithLabelGraphSeries -import info.nightscout.androidaps.receivers.DataWorkerStorage +import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.interfaces.iob.IobCobCalculator import info.nightscout.interfaces.profile.ProfileFunction import info.nightscout.rx.logging.AAPSLogger diff --git a/app/src/main/java/info/nightscout/androidaps/workflow/PrepareIobAutosensGraphDataWorker.kt b/app/src/main/java/info/nightscout/androidaps/workflow/PrepareIobAutosensGraphDataWorker.kt index 310a8494bc..cc486b0b77 100644 --- a/app/src/main/java/info/nightscout/androidaps/workflow/PrepareIobAutosensGraphDataWorker.kt +++ b/app/src/main/java/info/nightscout/androidaps/workflow/PrepareIobAutosensGraphDataWorker.kt @@ -19,7 +19,7 @@ import info.nightscout.androidaps.plugins.general.overview.graphExtensions.Point import info.nightscout.androidaps.plugins.general.overview.graphExtensions.ScaledDataPoint import info.nightscout.androidaps.plugins.iob.iobCobCalculator.data.AutosensDataObject import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventIobCalculationProgress -import info.nightscout.androidaps.receivers.DataWorkerStorage +import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.androidaps.utils.DecimalFormatter import info.nightscout.core.iob.combine import info.nightscout.core.iob.copy diff --git a/app/src/main/java/info/nightscout/androidaps/workflow/PreparePredictionsWorker.kt b/app/src/main/java/info/nightscout/androidaps/workflow/PreparePredictionsWorker.kt index 6eb9c03f9c..ab0edde209 100644 --- a/app/src/main/java/info/nightscout/androidaps/workflow/PreparePredictionsWorker.kt +++ b/app/src/main/java/info/nightscout/androidaps/workflow/PreparePredictionsWorker.kt @@ -10,7 +10,7 @@ import info.nightscout.androidaps.plugins.general.overview.OverviewMenus import info.nightscout.androidaps.plugins.general.overview.graphExtensions.DataPointWithLabelInterface import info.nightscout.androidaps.plugins.general.overview.graphExtensions.GlucoseValueDataPoint import info.nightscout.androidaps.plugins.general.overview.graphExtensions.PointsWithLabelGraphSeries -import info.nightscout.androidaps.receivers.DataWorkerStorage +import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.androidaps.utils.DefaultValueHelper import info.nightscout.database.impl.AppRepository import info.nightscout.interfaces.Config diff --git a/app/src/main/java/info/nightscout/androidaps/workflow/PrepareTemporaryTargetDataWorker.kt b/app/src/main/java/info/nightscout/androidaps/workflow/PrepareTemporaryTargetDataWorker.kt index efe07c6fd9..b234017e0a 100644 --- a/app/src/main/java/info/nightscout/androidaps/workflow/PrepareTemporaryTargetDataWorker.kt +++ b/app/src/main/java/info/nightscout/androidaps/workflow/PrepareTemporaryTargetDataWorker.kt @@ -11,7 +11,7 @@ import info.nightscout.androidaps.R import info.nightscout.androidaps.extensions.target import info.nightscout.androidaps.plugins.general.overview.OverviewData import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventIobCalculationProgress -import info.nightscout.androidaps.receivers.DataWorkerStorage +import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.core.profile.fromMgdlToUnits import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.ValueWrapper diff --git a/app/src/main/java/info/nightscout/androidaps/workflow/PrepareTreatmentsDataWorker.kt b/app/src/main/java/info/nightscout/androidaps/workflow/PrepareTreatmentsDataWorker.kt index 884e78ab52..7a956d3a80 100644 --- a/app/src/main/java/info/nightscout/androidaps/workflow/PrepareTreatmentsDataWorker.kt +++ b/app/src/main/java/info/nightscout/androidaps/workflow/PrepareTreatmentsDataWorker.kt @@ -14,7 +14,7 @@ import info.nightscout.androidaps.plugins.general.overview.graphExtensions.Exten import info.nightscout.androidaps.plugins.general.overview.graphExtensions.PointsWithLabelGraphSeries import info.nightscout.androidaps.plugins.general.overview.graphExtensions.TherapyEventDataPoint import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventIobCalculationProgress -import info.nightscout.androidaps.receivers.DataWorkerStorage +import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.androidaps.utils.DefaultValueHelper import info.nightscout.androidaps.utils.Translator import info.nightscout.core.profile.fromMgdlToUnits diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/LoopPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/LoopPluginTest.kt index 980c135ab4..2b7e7264af 100644 --- a/app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/LoopPluginTest.kt +++ b/app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/LoopPluginTest.kt @@ -7,7 +7,7 @@ import dagger.android.HasAndroidInjector import info.nightscout.androidaps.R import info.nightscout.androidaps.TestBase import info.nightscout.androidaps.logging.UserEntryLogger -import info.nightscout.androidaps.receivers.ReceiverStatusStore +import info.nightscout.core.utils.receivers.ReceiverStatusStore import info.nightscout.core.utils.fabric.FabricPrivacy import info.nightscout.database.impl.AppRepository import info.nightscout.interfaces.Config diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerUtils.kt b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerUtils.kt index 19b482e9ff..c76aef7f76 100644 --- a/core/core-main/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerUtils.kt +++ b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerUtils.kt @@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.constraints.versionChecker import android.os.Build import dagger.Lazy import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification -import info.nightscout.androidaps.receivers.ReceiverStatusStore +import info.nightscout.core.utils.receivers.ReceiverStatusStore import info.nightscout.core.main.R import info.nightscout.interfaces.Config import info.nightscout.interfaces.constraints.versionChecker.AllowedVersions diff --git a/core/core-main/src/main/java/info/nightscout/core/di/CoreReceiversModule.kt b/core/core-main/src/main/java/info/nightscout/core/di/CoreReceiversModule.kt index f6bc260f71..f54ef62ed4 100644 --- a/core/core-main/src/main/java/info/nightscout/core/di/CoreReceiversModule.kt +++ b/core/core-main/src/main/java/info/nightscout/core/di/CoreReceiversModule.kt @@ -2,7 +2,7 @@ package info.nightscout.core.di import dagger.Module import dagger.android.ContributesAndroidInjector -import info.nightscout.androidaps.receivers.NetworkChangeReceiver +import info.nightscout.core.utils.receivers.NetworkChangeReceiver @Module abstract class CoreReceiversModule { diff --git a/core/core-main/src/test/java/info/nightscout/androidaps/plugins/contraints/versionChecker/VersionCheckerUtilsKtTest.kt b/core/core-main/src/test/java/info/nightscout/androidaps/plugins/contraints/versionChecker/VersionCheckerUtilsKtTest.kt index 47756950b2..41554703bd 100644 --- a/core/core-main/src/test/java/info/nightscout/androidaps/plugins/contraints/versionChecker/VersionCheckerUtilsKtTest.kt +++ b/core/core-main/src/test/java/info/nightscout/androidaps/plugins/contraints/versionChecker/VersionCheckerUtilsKtTest.kt @@ -4,7 +4,7 @@ import dagger.Lazy import info.nightscout.androidaps.TestBase import info.nightscout.androidaps.plugins.constraints.versionChecker.VersionCheckerUtils import info.nightscout.androidaps.plugins.constraints.versionChecker.numericVersionPart -import info.nightscout.androidaps.receivers.ReceiverStatusStore +import info.nightscout.core.utils.receivers.ReceiverStatusStore import info.nightscout.interfaces.Config import info.nightscout.rx.bus.RxBus import info.nightscout.shared.interfaces.ResourceHelper diff --git a/core/core-main/src/test/java/info/nightscout/androidaps/utils/StringUtilsTest.kt b/core/core-main/src/test/java/info/nightscout/androidaps/utils/StringUtilsTest.kt index e571002ca2..272dcfb061 100644 --- a/core/core-main/src/test/java/info/nightscout/androidaps/utils/StringUtilsTest.kt +++ b/core/core-main/src/test/java/info/nightscout/androidaps/utils/StringUtilsTest.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.utils -import info.nightscout.interfaces.utils.StringUtils +import info.nightscout.core.utils.receivers.StringUtils import org.junit.Assert import org.junit.Test diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/receivers/DataWorkerStorage.kt b/core/utils/src/main/java/info/nightscout/core/utils/receivers/DataWorkerStorage.kt similarity index 97% rename from core/core-main/src/main/java/info/nightscout/androidaps/receivers/DataWorkerStorage.kt rename to core/utils/src/main/java/info/nightscout/core/utils/receivers/DataWorkerStorage.kt index 2e9a1ecc7a..0e77bbc720 100644 --- a/core/core-main/src/main/java/info/nightscout/androidaps/receivers/DataWorkerStorage.kt +++ b/core/utils/src/main/java/info/nightscout/core/utils/receivers/DataWorkerStorage.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.receivers +package info.nightscout.core.utils.receivers import android.content.Context import android.os.Bundle diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.kt b/core/utils/src/main/java/info/nightscout/core/utils/receivers/NetworkChangeReceiver.kt similarity index 97% rename from core/core-main/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.kt rename to core/utils/src/main/java/info/nightscout/core/utils/receivers/NetworkChangeReceiver.kt index 4e33dec317..f204c42097 100644 --- a/core/core-main/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.kt +++ b/core/utils/src/main/java/info/nightscout/core/utils/receivers/NetworkChangeReceiver.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.receivers +package info.nightscout.core.utils.receivers import android.content.Context import android.content.Intent @@ -10,7 +10,6 @@ import android.net.wifi.WifiManager import android.os.Handler import android.os.HandlerThread import dagger.android.DaggerBroadcastReceiver -import info.nightscout.interfaces.utils.StringUtils import info.nightscout.rx.bus.RxBus import info.nightscout.rx.events.EventNetworkChange import info.nightscout.rx.logging.AAPSLogger diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/receivers/ReceiverStatusStore.kt b/core/utils/src/main/java/info/nightscout/core/utils/receivers/ReceiverStatusStore.kt similarity index 96% rename from core/core-main/src/main/java/info/nightscout/androidaps/receivers/ReceiverStatusStore.kt rename to core/utils/src/main/java/info/nightscout/core/utils/receivers/ReceiverStatusStore.kt index 38d6e96645..90ec180096 100644 --- a/core/core-main/src/main/java/info/nightscout/androidaps/receivers/ReceiverStatusStore.kt +++ b/core/utils/src/main/java/info/nightscout/core/utils/receivers/ReceiverStatusStore.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.receivers +package info.nightscout.core.utils.receivers import android.content.Context import android.content.Intent diff --git a/interfaces/src/main/java/info/nightscout/interfaces/utils/StringUtils.kt b/core/utils/src/main/java/info/nightscout/core/utils/receivers/StringUtils.kt similarity index 88% rename from interfaces/src/main/java/info/nightscout/interfaces/utils/StringUtils.kt rename to core/utils/src/main/java/info/nightscout/core/utils/receivers/StringUtils.kt index 4576d18f8f..728f62c020 100644 --- a/interfaces/src/main/java/info/nightscout/interfaces/utils/StringUtils.kt +++ b/core/utils/src/main/java/info/nightscout/core/utils/receivers/StringUtils.kt @@ -1,4 +1,4 @@ -package info.nightscout.interfaces.utils +package info.nightscout.core.utils.receivers /** * class contains useful String functions diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerWifiSsid.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerWifiSsid.kt index 53804ea6e8..ea85b34413 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerWifiSsid.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerWifiSsid.kt @@ -3,7 +3,7 @@ package info.nightscout.automation.triggers import android.widget.LinearLayout import com.google.common.base.Optional import dagger.android.HasAndroidInjector -import info.nightscout.androidaps.receivers.ReceiverStatusStore +import info.nightscout.core.utils.receivers.ReceiverStatusStore import info.nightscout.interfaces.utils.JsonHelper import info.nightscout.automation.R import info.nightscout.automation.elements.Comparator diff --git a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerTestBase.kt b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerTestBase.kt index 8c7c0f413a..9d53cf225e 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerTestBase.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerTestBase.kt @@ -7,7 +7,7 @@ import info.nightscout.androidaps.TestBaseWithProfile import info.nightscout.androidaps.TestPumpPlugin import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensDataStoreObject import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider -import info.nightscout.androidaps.receivers.ReceiverStatusStore +import info.nightscout.core.utils.receivers.ReceiverStatusStore import info.nightscout.automation.AutomationPlugin import info.nightscout.automation.services.LastLocationDataContainer import info.nightscout.interfaces.iob.IobCobCalculator diff --git a/plugins/main/src/main/java/info/nightscout/plugins/aps/loop/LoopPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/aps/loop/LoopPlugin.kt index 16bdbd94af..6840be0698 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/aps/loop/LoopPlugin.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/aps/loop/LoopPlugin.kt @@ -19,7 +19,7 @@ import info.nightscout.androidaps.extensions.plannedRemainingMinutes import info.nightscout.androidaps.logging.UserEntryLogger import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification -import info.nightscout.androidaps.receivers.ReceiverStatusStore +import info.nightscout.core.utils.receivers.ReceiverStatusStore import info.nightscout.core.utils.fabric.FabricPrivacy import info.nightscout.database.entities.OfflineEvent import info.nightscout.database.entities.UserEntry.Action diff --git a/plugins/main/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesFragment.kt b/plugins/main/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesFragment.kt index 60e643aecd..7fbd80264d 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesFragment.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesFragment.kt @@ -17,7 +17,7 @@ import androidx.recyclerview.widget.LinearSmoothScroller import androidx.recyclerview.widget.RecyclerView import dagger.android.support.DaggerFragment import info.nightscout.androidaps.logging.UserEntryLogger -import info.nightscout.androidaps.receivers.ReceiverStatusStore +import info.nightscout.core.utils.receivers.ReceiverStatusStore import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.core.utils.fabric.FabricPrivacy import info.nightscout.database.entities.UserEntry.Action diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/dataBroadcaster/DataBroadcastPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/dataBroadcaster/DataBroadcastPlugin.kt index 8e1c2865a5..cf4598790b 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/dataBroadcaster/DataBroadcastPlugin.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/dataBroadcaster/DataBroadcastPlugin.kt @@ -8,7 +8,7 @@ import dagger.android.HasAndroidInjector import info.nightscout.androidaps.extensions.durationInMinutes import info.nightscout.androidaps.extensions.toStringFull import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider -import info.nightscout.androidaps.receivers.ReceiverStatusStore +import info.nightscout.core.utils.receivers.ReceiverStatusStore import info.nightscout.androidaps.utils.DefaultValueHelper import info.nightscout.core.iob.round import info.nightscout.core.utils.fabric.FabricPrivacy diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/food/FoodPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/food/FoodPlugin.kt index cb29c791b7..fa32505b63 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/food/FoodPlugin.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/food/FoodPlugin.kt @@ -6,7 +6,7 @@ import androidx.work.WorkerParameters import androidx.work.workDataOf import dagger.android.HasAndroidInjector import info.nightscout.androidaps.extensions.foodFromJson -import info.nightscout.androidaps.receivers.DataWorkerStorage +import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.database.entities.Food import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.transactions.SyncNsFoodTransaction diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt index 0ec25d275a..197e18d71d 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt @@ -16,7 +16,7 @@ import info.nightscout.androidaps.extensions.valueToUnitsString import info.nightscout.androidaps.logging.UserEntryLogger import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider -import info.nightscout.androidaps.receivers.DataWorkerStorage +import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.androidaps.utils.DecimalFormatter import info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference import info.nightscout.core.iob.generateCOBString diff --git a/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfilePlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfilePlugin.kt index 80cd2f5c69..ccf7135f4b 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfilePlugin.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfilePlugin.kt @@ -10,7 +10,7 @@ import info.nightscout.androidaps.annotations.OpenForTesting import info.nightscout.androidaps.data.ProfileSealed import info.nightscout.androidaps.extensions.blockFromJsonArray import info.nightscout.androidaps.extensions.pureProfileFromJson -import info.nightscout.androidaps.receivers.DataWorkerStorage +import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.androidaps.utils.DecimalFormatter import info.nightscout.core.profile.ProfileStoreObject import info.nightscout.core.profile.toMgdl diff --git a/plugins/main/src/main/java/info/nightscout/plugins/source/AidexPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/source/AidexPlugin.kt index 62fcab5714..6991a3f87c 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/source/AidexPlugin.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/source/AidexPlugin.kt @@ -5,7 +5,7 @@ import androidx.work.Worker import androidx.work.WorkerParameters import androidx.work.workDataOf import dagger.android.HasAndroidInjector -import info.nightscout.androidaps.receivers.DataWorkerStorage +import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.database.entities.GlucoseValue import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.transactions.CgmSourceTransaction diff --git a/plugins/main/src/main/java/info/nightscout/plugins/source/DexcomPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/source/DexcomPlugin.kt index 96cab8978e..2ae2891e68 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/source/DexcomPlugin.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/source/DexcomPlugin.kt @@ -10,8 +10,8 @@ import androidx.work.workDataOf import dagger.android.HasAndroidInjector import info.nightscout.androidaps.extensions.fromConstant import info.nightscout.androidaps.logging.UserEntryLogger -import info.nightscout.androidaps.receivers.DataWorkerStorage import info.nightscout.core.profile.unit +import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.database.entities.GlucoseValue import info.nightscout.database.entities.TherapyEvent import info.nightscout.database.entities.UserEntry.Action diff --git a/plugins/main/src/main/java/info/nightscout/plugins/source/EversensePlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/source/EversensePlugin.kt index 50d2e17aae..4d90f9acf0 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/source/EversensePlugin.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/source/EversensePlugin.kt @@ -5,7 +5,7 @@ import androidx.work.Worker import androidx.work.WorkerParameters import androidx.work.workDataOf import dagger.android.HasAndroidInjector -import info.nightscout.androidaps.receivers.DataWorkerStorage +import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.database.entities.GlucoseValue import info.nightscout.database.entities.TherapyEvent import info.nightscout.database.impl.AppRepository diff --git a/plugins/main/src/main/java/info/nightscout/plugins/source/MM640gPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/source/MM640gPlugin.kt index 4d1158f6c9..05c27e6cc5 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/source/MM640gPlugin.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/source/MM640gPlugin.kt @@ -5,7 +5,7 @@ import androidx.work.Worker import androidx.work.WorkerParameters import androidx.work.workDataOf import dagger.android.HasAndroidInjector -import info.nightscout.androidaps.receivers.DataWorkerStorage +import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.database.entities.GlucoseValue import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.transactions.CgmSourceTransaction diff --git a/plugins/main/src/main/java/info/nightscout/plugins/source/NSClientSourcePlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/source/NSClientSourcePlugin.kt index 0a9c884984..2d8727d782 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/source/NSClientSourcePlugin.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/source/NSClientSourcePlugin.kt @@ -6,7 +6,7 @@ import androidx.work.WorkerParameters import androidx.work.workDataOf import dagger.android.HasAndroidInjector import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification -import info.nightscout.androidaps.receivers.DataWorkerStorage +import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.database.entities.GlucoseValue import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.transactions.CgmSourceTransaction diff --git a/plugins/main/src/main/java/info/nightscout/plugins/source/XdripPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/source/XdripPlugin.kt index 97074f97c7..338756e91f 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/source/XdripPlugin.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/source/XdripPlugin.kt @@ -5,7 +5,7 @@ import androidx.work.Worker import androidx.work.WorkerParameters import androidx.work.workDataOf import dagger.android.HasAndroidInjector -import info.nightscout.androidaps.receivers.DataWorkerStorage +import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.interfaces.receivers.Intents import info.nightscout.database.entities.GlucoseValue import info.nightscout.database.impl.AppRepository diff --git a/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/NsClientReceiverDelegate.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/NsClientReceiverDelegate.kt index d307d8d047..ab65c897ca 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/NsClientReceiverDelegate.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/NsClientReceiverDelegate.kt @@ -1,6 +1,6 @@ package info.nightscout.plugins.sync.nsclient -import info.nightscout.androidaps.receivers.ReceiverStatusStore +import info.nightscout.core.utils.receivers.ReceiverStatusStore import info.nightscout.plugins.R import info.nightscout.rx.bus.RxBus import info.nightscout.rx.events.EventChargingState diff --git a/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/DeviceStatusExtension.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/DeviceStatusExtension.kt index 954ed4b39b..caeecb48db 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/DeviceStatusExtension.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/DeviceStatusExtension.kt @@ -1,7 +1,7 @@ package info.nightscout.plugins.sync.nsclient.extensions import android.os.Build -import info.nightscout.androidaps.receivers.ReceiverStatusStore +import info.nightscout.core.utils.receivers.ReceiverStatusStore import info.nightscout.core.iob.json import info.nightscout.database.entities.DeviceStatus import info.nightscout.interfaces.aps.Loop diff --git a/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/services/NSClientService.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/services/NSClientService.kt index 42b7ced67b..2c8afc7297 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/services/NSClientService.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/services/NSClientService.kt @@ -18,7 +18,7 @@ import dagger.android.DaggerService import dagger.android.HasAndroidInjector import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification -import info.nightscout.androidaps.receivers.DataWorkerStorage +import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.core.utils.fabric.FabricPrivacy import info.nightscout.database.impl.AppRepository import info.nightscout.interfaces.Config diff --git a/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddAckWorker.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddAckWorker.kt index 1ac219492a..e6b1f9c58e 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddAckWorker.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddAckWorker.kt @@ -6,7 +6,7 @@ import androidx.work.Worker import androidx.work.WorkerParameters import androidx.work.workDataOf import dagger.android.HasAndroidInjector -import info.nightscout.androidaps.receivers.DataWorkerStorage +import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.database.entities.DeviceStatus import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.transactions.UpdateNsIdBolusCalculatorResultTransaction diff --git a/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddUpdateWorker.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddUpdateWorker.kt index dde49b1766..e4dfa2cba4 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddUpdateWorker.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddUpdateWorker.kt @@ -7,7 +7,7 @@ import androidx.work.workDataOf import dagger.android.HasAndroidInjector import info.nightscout.androidaps.extensions.bolusCalculatorResultFromJson import info.nightscout.androidaps.logging.UserEntryLogger -import info.nightscout.androidaps.receivers.DataWorkerStorage +import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.database.entities.TherapyEvent import info.nightscout.database.impl.AppRepository import info.nightscout.interfaces.Config diff --git a/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientMbgWorker.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientMbgWorker.kt index 033f1e2cc5..a32c26d006 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientMbgWorker.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientMbgWorker.kt @@ -5,7 +5,7 @@ import androidx.work.Worker import androidx.work.WorkerParameters import androidx.work.workDataOf import dagger.android.HasAndroidInjector -import info.nightscout.androidaps.receivers.DataWorkerStorage +import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.interfaces.Config import info.nightscout.plugins.R import info.nightscout.plugins.sync.nsShared.StoreDataForDb diff --git a/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientUpdateRemoveAckWorker.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientUpdateRemoveAckWorker.kt index fdd09bd6f3..3b9902547f 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientUpdateRemoveAckWorker.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientUpdateRemoveAckWorker.kt @@ -5,7 +5,7 @@ import androidx.work.Worker import androidx.work.WorkerParameters import androidx.work.workDataOf import dagger.android.HasAndroidInjector -import info.nightscout.androidaps.receivers.DataWorkerStorage +import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.database.impl.AppRepository import info.nightscout.interfaces.sync.DataSyncSelector import info.nightscout.interfaces.sync.DataSyncSelector.PairBolus diff --git a/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorker.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorker.kt index be6e4606fc..a2f8135e05 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorker.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorker.kt @@ -8,7 +8,7 @@ import androidx.work.Worker import androidx.work.WorkerParameters import androidx.work.workDataOf import dagger.android.HasAndroidInjector -import info.nightscout.androidaps.receivers.DataWorkerStorage +import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.interfaces.sync.NsClient import info.nightscout.plugins.R import info.nightscout.plugins.source.NSClientSourcePlugin diff --git a/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadDeviceStatusWorker.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadDeviceStatusWorker.kt index 3f985178a8..e204e429b7 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadDeviceStatusWorker.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadDeviceStatusWorker.kt @@ -5,7 +5,7 @@ import androidx.work.Worker import androidx.work.WorkerParameters import androidx.work.workDataOf import dagger.android.HasAndroidInjector -import info.nightscout.androidaps.receivers.DataWorkerStorage +import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.interfaces.sync.NsClient import info.nightscout.plugins.sync.nsShared.events.EventNSClientNewLog import info.nightscout.plugins.sync.nsclient.data.NSDeviceStatusHandler diff --git a/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadTreatmentsWorker.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadTreatmentsWorker.kt index 8c44b303b2..477a3b257a 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadTreatmentsWorker.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadTreatmentsWorker.kt @@ -8,7 +8,7 @@ import androidx.work.Worker import androidx.work.WorkerParameters import androidx.work.workDataOf import dagger.android.HasAndroidInjector -import info.nightscout.androidaps.receivers.DataWorkerStorage +import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.interfaces.sync.NsClient import info.nightscout.plugins.sync.nsShared.StoreDataForDb import info.nightscout.plugins.sync.nsShared.events.EventNSClientNewLog diff --git a/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/ProcessTreatmentsWorker.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/ProcessTreatmentsWorker.kt index 0be0795064..a5d24a8fa0 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/ProcessTreatmentsWorker.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/ProcessTreatmentsWorker.kt @@ -6,7 +6,7 @@ import androidx.work.WorkerParameters import androidx.work.workDataOf import dagger.android.HasAndroidInjector import info.nightscout.androidaps.logging.UserEntryLogger -import info.nightscout.androidaps.receivers.DataWorkerStorage +import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.database.impl.AppRepository import info.nightscout.interfaces.Config import info.nightscout.interfaces.Constants diff --git a/plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolPlugin.kt index 218594406b..7998fd016d 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolPlugin.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolPlugin.kt @@ -6,7 +6,7 @@ import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat import dagger.android.HasAndroidInjector import info.nightscout.androidaps.events.EventNewBG -import info.nightscout.androidaps.receivers.ReceiverStatusStore +import info.nightscout.core.utils.receivers.ReceiverStatusStore import info.nightscout.core.toast.showToastAdNotification import info.nightscout.core.ui.toast.ToastUtils import info.nightscout.core.utils.fabric.FabricPrivacy diff --git a/plugins/main/src/test/java/info/nightscout/plugins/sync/nsclient/NsClientReceiverDelegateTest.kt b/plugins/main/src/test/java/info/nightscout/plugins/sync/nsclient/NsClientReceiverDelegateTest.kt index 9d3635d528..287757f3e7 100644 --- a/plugins/main/src/test/java/info/nightscout/plugins/sync/nsclient/NsClientReceiverDelegateTest.kt +++ b/plugins/main/src/test/java/info/nightscout/plugins/sync/nsclient/NsClientReceiverDelegateTest.kt @@ -2,7 +2,7 @@ package info.nightscout.plugins.sync.nsclient import android.content.Context import info.nightscout.androidaps.TestBase -import info.nightscout.androidaps.receivers.ReceiverStatusStore +import info.nightscout.core.utils.receivers.ReceiverStatusStore import info.nightscout.plugins.R import info.nightscout.rx.bus.RxBus import info.nightscout.rx.events.EventChargingState