From ea9132bbe342390d5e1c93fbcf0f088e67976411 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Mon, 25 Sep 2023 12:34:13 +0200 Subject: [PATCH] :core:utils cleanup --- app/src/main/kotlin/app/aaps/MainActivity.kt | 14 +- .../kotlin/app/aaps/receivers/BTReceiver.kt | 2 +- .../kotlin/app/aaps/receivers/DataReceiver.kt | 8 +- .../aaps/workflow/CalculationWorkflowImpl.kt | 16 +- .../main/extensions/ProfileSwitchExtension.kt | 4 +- .../aaps/core/main/profile/ProfileSealed.kt | 16 +- .../app/aaps/core/main/utils/CryptoUtil.kt | 2 +- .../app/aaps/core/main/wizard/BolusWizard.kt | 14 +- .../aaps/core/main/wizard/QuickWizardEntry.kt | 10 +- .../nightscout/core/utils/DateTimeUtil.java | 312 ------------------ .../app/aaps}/core/utils/Concurrency.kt | 2 +- .../app/aaps/core/utils/DateTimeUtil.kt | 212 ++++++++++++ .../aaps}/core/utils/EspressoTestHelper.kt | 2 +- .../core/utils/HexByteArrayConversion.kt | 2 +- .../app/aaps}/core/utils/HtmlHelper.kt | 2 +- .../app/aaps}/core/utils/JsonHelper.kt | 2 +- .../app/aaps}/core/utils/MidnightUtils.kt | 2 +- .../app/aaps}/core/utils/Percentile.kt | 2 +- .../extensions/BluetoothAdapterExtension.kt | 2 +- .../core/utils/extensions/IntentExtension.kt | 2 +- .../utils/extensions/WorkerDataBuilder.kt | 2 +- .../app/aaps}/core/utils/fabric/InstanceId.kt | 2 +- .../core/utils/receivers/DataWorkerStorage.kt | 2 +- .../aaps}/core/utils/receivers/StringUtils.kt | 2 +- .../aaps}/core/utils/worker/WorkExtensions.kt | 2 +- .../app/aaps/core/utils/JsonHelperTest.kt | 1 - .../core/utils/receivers/StringUtilsTest.kt | 1 - .../pump/common/utils/DateTimeUtilUTest.kt | 2 +- .../profile/ProfileStoreObject.kt | 6 +- .../implementation/pump/BlePreCheckImpl.kt | 2 +- .../queue/CommandQueueImplementation.kt | 12 +- .../implementation/queue/QueueThread.kt | 4 +- .../receivers/NetworkChangeReceiver.kt | 2 +- .../UserEntryPresentationHelperImpl.kt | 4 +- .../pump/insight/InsightAlertService.java | 2 +- .../activities/InsightAlertActivity.java | 2 +- .../activities/InsightPairingActivity.java | 4 +- .../insight/utils/ConnectionEstablisher.java | 2 +- .../nightscout/plugins/aps/APSResultObject.kt | 8 +- .../plugins/aps/loop/LoopFragment.kt | 8 +- .../aps/openAPSAMA/OpenAPSAMAPlugin.kt | 8 +- .../aps/openAPSSMB/OpenAPSSMBPlugin.kt | 6 +- .../plugins/aps/utils/JSONFormatter.kt | 2 +- .../plugins/general/autotune/AutotuneCore.kt | 2 +- .../plugins/general/autotune/AutotuneIob.kt | 12 +- .../general/autotune/AutotunePlugin.kt | 8 +- .../general/autotune/data/ATProfile.kt | 8 +- .../general/autotune/AutotuneCoreTest.kt | 4 +- .../general/autotune/AutotunePrepTest.kt | 6 +- .../automation/AutomationFragment.kt | 14 +- .../automation/actions/ActionAlarm.kt | 2 +- .../actions/ActionCarePortalEvent.kt | 4 +- .../automation/actions/ActionLoopSuspend.kt | 2 +- .../automation/actions/ActionNotification.kt | 4 +- .../automation/actions/ActionProfileSwitch.kt | 2 +- .../actions/ActionProfileSwitchPercent.kt | 2 +- .../automation/actions/ActionRunAutotune.kt | 4 +- .../automation/actions/ActionSendSMS.kt | 2 +- .../actions/ActionStartTempTarget.kt | 6 +- .../automation/elements/InputTime.kt | 2 +- .../automation/elements/InputTimeRange.kt | 2 +- .../triggers/TriggerAutosensValue.kt | 4 +- .../automation/triggers/TriggerBTDevice.kt | 4 +- .../automation/triggers/TriggerBg.kt | 2 +- .../automation/triggers/TriggerBolusAgo.kt | 4 +- .../automation/triggers/TriggerCOB.kt | 4 +- .../automation/triggers/TriggerConnector.kt | 4 +- .../automation/triggers/TriggerDelta.kt | 2 +- .../automation/triggers/TriggerHeartRate.kt | 2 +- .../automation/triggers/TriggerIob.kt | 2 +- .../automation/triggers/TriggerLocation.kt | 2 +- .../triggers/TriggerProfilePercent.kt | 4 +- .../triggers/TriggerPumpLastConnection.kt | 4 +- .../triggers/TriggerRecurringTime.kt | 6 +- .../automation/triggers/TriggerTempTarget.kt | 2 +- .../triggers/TriggerTempTargetValue.kt | 2 +- .../automation/triggers/TriggerTime.kt | 2 +- .../automation/triggers/TriggerTimeRange.kt | 4 +- .../automation/triggers/TriggerWifiSsid.kt | 2 +- .../maintenance/MaintenanceFragment.kt | 8 +- .../maintenance/PrefsFileContract.kt | 2 +- .../formats/EncryptedPrefsFormat.kt | 6 +- .../configuration/setupwizard/SWDefinition.kt | 6 +- .../objectives/ObjectivesFragment.kt | 6 +- .../general/overview/OverviewFragment.kt | 22 +- .../SmsCommunicatorFragment.kt | 4 +- .../smsCommunicator/SmsCommunicatorPlugin.kt | 14 +- .../plugins/profile/ProfilePlugin.kt | 10 +- .../sensitivity/SensitivityAAPSPlugin.kt | 4 +- .../sensitivity/SensitivityOref1Plugin.kt | 4 +- .../SensitivityWeightedAveragePlugin.kt | 2 +- .../info/nightscout/source/AidexPlugin.kt | 4 +- .../info/nightscout/source/DexcomPlugin.kt | 6 +- .../info/nightscout/source/EversensePlugin.kt | 4 +- .../info/nightscout/source/PoctechPlugin.kt | 4 +- .../info/nightscout/source/RandomBgPlugin.kt | 2 +- .../nightscout/source/XdripSourcePlugin.kt | 4 +- .../plugins/sync/nsShared/NSAlarm.kt | 2 +- .../plugins/sync/nsShared/NSClientFragment.kt | 6 +- .../nightscout/plugins/sync/nsShared/NSSgv.kt | 2 +- .../sync/nsShared/NsIncomingDataProcessor.kt | 28 +- .../sync/nsclient/DataSyncSelectorV1.kt | 4 +- .../plugins/sync/nsclient/acks/NSAddAck.kt | 2 +- .../plugins/sync/nsclient/acks/NSUpdateAck.kt | 2 +- .../nsclient/data/NSDeviceStatusHandler.kt | 4 +- .../plugins/sync/nsclient/data/NSMbg.kt | 2 +- .../nsclient/data/NSSettingsStatusImpl.kt | 2 +- .../data/ProcessedDeviceStatusDataImpl.kt | 4 +- .../BolusCalculatorResultExtension.kt | 2 +- .../nsclient/extensions/BolusExtension.kt | 2 +- .../nsclient/extensions/CarbsExtension.kt | 2 +- .../EffectiveProfileSwitchExtension.kt | 6 +- .../extensions/ExtendedBolusExtension.kt | 4 +- .../sync/nsclient/extensions/FoodExtension.kt | 2 +- .../extensions/OfflineEventExtension.kt | 2 +- .../extensions/ProfileSwitchExtension.kt | 10 +- .../extensions/TemporaryBasalExtension.kt | 4 +- .../extensions/TemporaryTargetExtension.kt | 2 +- .../extensions/TherapyEventExtension.kt | 2 +- .../sync/nsclient/services/NSClientService.kt | 12 +- .../nsclient/workers/NSClientAddAckWorker.kt | 6 +- .../workers/NSClientAddUpdateWorker.kt | 6 +- .../nsclient/workers/NSClientMbgWorker.kt | 4 +- .../workers/NSClientUpdateRemoveAckWorker.kt | 6 +- .../sync/nsclientV3/DataSyncSelectorV3.kt | 2 +- .../workers/LoadDeviceStatusWorker.kt | 4 +- .../workers/LoadProfileStoreWorker.kt | 8 +- .../plugins/sync/tidepool/TidepoolPlugin.kt | 4 +- .../sync/xdrip/DataSyncSelectorXdripImpl.kt | 2 +- .../plugins/sync/xdrip/XdripPlugin.kt | 12 +- .../nsclientV3/workers/LoadBgWorkerTest.kt | 4 +- .../nightscout/pump/combo/ComboPlugin.java | 2 +- .../pump/danars/activities/BLEScanActivity.kt | 2 +- .../danars/activities/EnterPinActivity.kt | 4 +- .../pump/danars/services/BLEComm.kt | 6 +- .../activities/DiaconnG8BLEScanActivity.kt | 2 +- .../pump/diaconn/service/BLECommonService.kt | 6 +- .../pump/eopatch/ui/EopatchActivity.kt | 2 +- .../pump/medtronic/MedtronicPumpPlugin.kt | 4 +- .../comm/MedtronicCommunicationManager.kt | 2 +- .../comm/history/MedtronicHistoryEntry.kt | 2 +- .../comm/history/cgms/CGMSHistoryEntry.kt | 2 +- .../cgms/MedtronicCGMSHistoryDecoder.kt | 2 +- .../pump/MedtronicPumpHistoryDecoder.kt | 2 +- .../comm/history/pump/PumpHistoryResult.kt | 2 +- .../medtronic/data/MedtronicHistoryData.kt | 2 +- .../pump/medtronic/data/dto/BolusWizardDTO.kt | 2 +- .../medtronic/data/dto/TempBasalProcessDTO.kt | 2 +- .../pump/medtrum/ui/MedtrumActivity.kt | 2 +- .../activation/PodActivationWizardActivity.kt | 2 +- .../omnipod/dash/OmnipodDashPumpPlugin.kt | 4 +- .../pump/omnipod/dash/driver/comm/Id.kt | 2 +- .../driver/comm/OmnipodDashBleManagerImpl.kt | 2 +- .../driver/comm/callbacks/BleCommCallbacks.kt | 2 +- .../dash/driver/comm/command/BleCommand.kt | 2 +- .../dash/driver/comm/endecrypt/EnDecrypt.kt | 2 +- .../CouldNotParseMessageException.kt | 2 +- .../pump/omnipod/dash/driver/comm/io/BleIO.kt | 2 +- .../comm/message/CrcMismatchException.kt | 2 +- .../comm/message/IncorrectPacketException.kt | 2 +- .../dash/driver/comm/message/MessageIO.kt | 2 +- .../message/StringLengthPrefixEncoding.kt | 2 +- .../dash/driver/comm/pair/KeyExchange.kt | 2 +- .../dash/driver/comm/pair/LTKExchanger.kt | 4 +- .../dash/driver/comm/pair/PairResult.kt | 2 +- .../dash/driver/comm/session/Connection.kt | 2 +- .../driver/comm/session/EapAkaAttribute.kt | 2 +- .../dash/driver/comm/session/EapMessage.kt | 2 +- .../dash/driver/comm/session/Milenage.kt | 2 +- .../dash/driver/comm/session/Session.kt | 2 +- .../driver/comm/session/SessionEstablisher.kt | 2 +- .../omnipod/dash/ui/DashPodHistoryActivity.kt | 4 +- .../driver/comm/endecrypt/EnDecryptTest.kt | 2 +- .../driver/comm/message/MessagePacketTest.kt | 2 +- .../driver/comm/message/PayloadJoinerTest.kt | 2 +- .../comm/message/PayloadSplitJoinTest.kt | 2 +- .../comm/message/PayloadSplitterTest.kt | 2 +- .../message/StringLengthPrefixEncodingTest.kt | 2 +- .../dash/driver/comm/pair/KeyExchangeTest.kt | 2 +- .../driver/comm/session/EapMessageTest.kt | 2 +- .../dash/driver/comm/session/MilenageTest.kt | 2 +- .../omnipod/eros/OmnipodErosPumpPlugin.java | 4 +- .../database/ErosHistoryRecordEntity.java | 2 +- .../pump/common/ble/BondStateReceiver.kt | 2 +- .../pump/virtual/VirtualPumpPlugin.kt | 10 +- .../ui/activities/SurveyActivity.kt | 2 +- .../ui/dialogs/CalibrationDialog.kt | 4 +- .../info/nightscout/ui/dialogs/CarbsDialog.kt | 10 +- .../info/nightscout/ui/dialogs/CareDialog.kt | 6 +- .../ui/dialogs/ExtendedBolusDialog.kt | 10 +- .../info/nightscout/ui/dialogs/FillDialog.kt | 10 +- .../nightscout/ui/dialogs/InsulinDialog.kt | 10 +- .../ui/dialogs/ProfileSwitchDialog.kt | 6 +- .../ui/dialogs/ProfileViewerDialog.kt | 10 +- .../nightscout/ui/dialogs/TempBasalDialog.kt | 10 +- .../nightscout/ui/dialogs/TempTargetDialog.kt | 6 +- .../nightscout/ui/dialogs/TreatmentDialog.kt | 10 +- .../nightscout/ui/dialogs/WizardDialog.kt | 18 +- .../nightscout/workflow/InvokeLoopWorker.kt | 4 +- .../nightscout/workflow/LoadBgDataWorker.kt | 4 +- .../workflow/PrepareBasalDataWorker.kt | 10 +- .../workflow/PrepareBgDataWorker.kt | 12 +- .../workflow/PrepareBucketedDataWorker.kt | 10 +- .../PrepareIobAutosensGraphDataWorker.kt | 26 +- .../workflow/PreparePredictionsWorker.kt | 12 +- .../PrepareTemporaryTargetDataWorker.kt | 12 +- .../workflow/PrepareTreatmentsDataWorker.kt | 22 +- .../workflow/iob/IobCobOref1Worker.kt | 10 +- .../workflow/iob/IobCobOrefWorker.kt | 8 +- 209 files changed, 705 insertions(+), 807 deletions(-) delete mode 100644 core/utils/src/main/java/info/nightscout/core/utils/DateTimeUtil.java rename core/utils/src/main/{java/info/nightscout => kotlin/app/aaps}/core/utils/Concurrency.kt (95%) create mode 100644 core/utils/src/main/kotlin/app/aaps/core/utils/DateTimeUtil.kt rename core/utils/src/main/{java/info/nightscout => kotlin/app/aaps}/core/utils/EspressoTestHelper.kt (92%) rename core/utils/src/main/{java/info/nightscout => kotlin/app/aaps}/core/utils/HexByteArrayConversion.kt (95%) rename core/utils/src/main/{java/info/nightscout => kotlin/app/aaps}/core/utils/HtmlHelper.kt (90%) rename core/utils/src/main/{java/info/nightscout => kotlin/app/aaps}/core/utils/JsonHelper.kt (99%) rename core/utils/src/main/{java/info/nightscout => kotlin/app/aaps}/core/utils/MidnightUtils.kt (93%) rename core/utils/src/main/{java/info/nightscout => kotlin/app/aaps}/core/utils/Percentile.kt (95%) rename core/utils/src/main/{java/info/nightscout => kotlin/app/aaps}/core/utils/extensions/BluetoothAdapterExtension.kt (96%) rename core/utils/src/main/{java/info/nightscout => kotlin/app/aaps}/core/utils/extensions/IntentExtension.kt (94%) rename core/utils/src/main/{java/info/nightscout => kotlin/app/aaps}/core/utils/extensions/WorkerDataBuilder.kt (94%) rename core/utils/src/main/{java/info/nightscout => kotlin/app/aaps}/core/utils/fabric/InstanceId.kt (85%) rename core/utils/src/main/{java/info/nightscout => kotlin/app/aaps}/core/utils/receivers/DataWorkerStorage.kt (97%) rename core/utils/src/main/{java/info/nightscout => kotlin/app/aaps}/core/utils/receivers/StringUtils.kt (88%) rename core/utils/src/main/{java/info/nightscout => kotlin/app/aaps}/core/utils/worker/WorkExtensions.kt (82%) diff --git a/app/src/main/kotlin/app/aaps/MainActivity.kt b/app/src/main/kotlin/app/aaps/MainActivity.kt index ec9e821b54..b2faaf7c11 100644 --- a/app/src/main/kotlin/app/aaps/MainActivity.kt +++ b/app/src/main/kotlin/app/aaps/MainActivity.kt @@ -34,8 +34,6 @@ import app.aaps.activities.PreferencesActivity import app.aaps.configuration.activities.DaggerAppCompatActivityWithResult import app.aaps.configuration.activities.SingleFragmentActivity import app.aaps.configuration.setupwizard.SetupWizardActivity -import app.aaps.core.main.utils.CryptoUtil -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.androidPermissions.AndroidPermission import app.aaps.core.interfaces.aps.Loop import app.aaps.core.interfaces.configuration.Config @@ -55,6 +53,13 @@ import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.smsCommunicator.SmsCommunicator import app.aaps.core.interfaces.ui.IconsProvider import app.aaps.core.interfaces.versionChecker.VersionCheckerUtils +import app.aaps.core.main.utils.CryptoUtil +import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.ui.UIRunnable +import app.aaps.core.ui.dialogs.OKDialog +import app.aaps.core.ui.locale.LocaleHelper +import app.aaps.core.ui.toast.ToastUtils +import app.aaps.core.utils.isRunningRealPumpTest import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.tabs.TabLayoutMediator import com.google.firebase.crashlytics.FirebaseCrashlytics @@ -63,11 +68,6 @@ import com.joanzapata.iconify.fonts.FontAwesomeModule import info.nightscout.androidaps.BuildConfig import info.nightscout.androidaps.R import info.nightscout.androidaps.databinding.ActivityMainBinding -import app.aaps.core.ui.UIRunnable -import app.aaps.core.ui.dialogs.OKDialog -import app.aaps.core.ui.locale.LocaleHelper -import app.aaps.core.ui.toast.ToastUtils -import info.nightscout.core.utils.isRunningRealPumpTest import info.nightscout.database.entities.UserEntry.Action import info.nightscout.database.entities.UserEntry.Sources import info.nightscout.plugins.constraints.signatureVerifier.SignatureVerifierPlugin diff --git a/app/src/main/kotlin/app/aaps/receivers/BTReceiver.kt b/app/src/main/kotlin/app/aaps/receivers/BTReceiver.kt index 3d885b79da..8cd4dbb493 100644 --- a/app/src/main/kotlin/app/aaps/receivers/BTReceiver.kt +++ b/app/src/main/kotlin/app/aaps/receivers/BTReceiver.kt @@ -5,8 +5,8 @@ import android.content.Context import android.content.Intent import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.events.EventBTChange +import app.aaps.core.utils.extensions.safeGetParcelableExtra import dagger.android.DaggerBroadcastReceiver -import info.nightscout.core.utils.extensions.safeGetParcelableExtra import javax.inject.Inject class BTReceiver : DaggerBroadcastReceiver() { diff --git a/app/src/main/kotlin/app/aaps/receivers/DataReceiver.kt b/app/src/main/kotlin/app/aaps/receivers/DataReceiver.kt index 719abe1576..815b507bac 100644 --- a/app/src/main/kotlin/app/aaps/receivers/DataReceiver.kt +++ b/app/src/main/kotlin/app/aaps/receivers/DataReceiver.kt @@ -8,11 +8,11 @@ import androidx.work.OneTimeWorkRequest import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.receivers.Intents +import app.aaps.core.utils.extensions.copyDouble +import app.aaps.core.utils.extensions.copyLong +import app.aaps.core.utils.extensions.copyString +import app.aaps.core.utils.receivers.DataWorkerStorage 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.plugins.general.smsCommunicator.SmsCommunicatorPlugin import info.nightscout.source.AidexPlugin import info.nightscout.source.DexcomPlugin diff --git a/app/src/main/kotlin/app/aaps/workflow/CalculationWorkflowImpl.kt b/app/src/main/kotlin/app/aaps/workflow/CalculationWorkflowImpl.kt index 61a449cbce..46af8b740f 100644 --- a/app/src/main/kotlin/app/aaps/workflow/CalculationWorkflowImpl.kt +++ b/app/src/main/kotlin/app/aaps/workflow/CalculationWorkflowImpl.kt @@ -7,12 +7,6 @@ import androidx.work.ExistingWorkPolicy import androidx.work.OneTimeWorkRequest import androidx.work.WorkInfo import androidx.work.WorkManager -import app.aaps.core.main.graph.OverviewData -import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.core.main.workflow.CalculationWorkflow -import app.aaps.core.main.workflow.CalculationWorkflow.Companion.JOB -import app.aaps.core.main.workflow.CalculationWorkflow.Companion.MAIN_CALCULATION -import app.aaps.core.main.workflow.CalculationWorkflow.Companion.PASS import app.aaps.core.interfaces.iob.IobCobCalculator import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag @@ -27,9 +21,15 @@ import app.aaps.core.interfaces.rx.events.EventOfflineChange import app.aaps.core.interfaces.rx.events.EventPreferenceChange import app.aaps.core.interfaces.rx.events.EventTherapyEventChange import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.main.graph.OverviewData +import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.main.workflow.CalculationWorkflow +import app.aaps.core.main.workflow.CalculationWorkflow.Companion.JOB +import app.aaps.core.main.workflow.CalculationWorkflow.Companion.MAIN_CALCULATION +import app.aaps.core.main.workflow.CalculationWorkflow.Companion.PASS +import app.aaps.core.utils.receivers.DataWorkerStorage +import app.aaps.core.utils.worker.then import dagger.android.HasAndroidInjector -import info.nightscout.core.utils.receivers.DataWorkerStorage -import info.nightscout.core.utils.worker.then import info.nightscout.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin import info.nightscout.workflow.DummyWorker import info.nightscout.workflow.InvokeLoopWorker diff --git a/core/main/src/main/kotlin/app/aaps/core/main/extensions/ProfileSwitchExtension.kt b/core/main/src/main/kotlin/app/aaps/core/main/extensions/ProfileSwitchExtension.kt index 9589138d53..a6062fb4b4 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/extensions/ProfileSwitchExtension.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/extensions/ProfileSwitchExtension.kt @@ -1,13 +1,13 @@ package app.aaps.core.main.extensions -import app.aaps.core.main.profile.ProfileSealed import app.aaps.core.interfaces.configuration.Constants import app.aaps.core.interfaces.db.GlucoseUnit import app.aaps.core.interfaces.profile.PureProfile import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.T -import info.nightscout.core.utils.JsonHelper +import app.aaps.core.main.profile.ProfileSealed +import app.aaps.core.utils.JsonHelper import info.nightscout.database.entities.ProfileSwitch import org.json.JSONObject import java.util.TimeZone diff --git a/core/main/src/main/kotlin/app/aaps/core/main/profile/ProfileSealed.kt b/core/main/src/main/kotlin/app/aaps/core/main/profile/ProfileSealed.kt index ba34669933..a23e66893b 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/profile/ProfileSealed.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/profile/ProfileSealed.kt @@ -1,12 +1,5 @@ package app.aaps.core.main.profile -import app.aaps.core.main.events.EventNewNotification -import app.aaps.core.main.extensions.blockValueBySeconds -import app.aaps.core.main.extensions.highTargetBlockValueBySeconds -import app.aaps.core.main.extensions.lowTargetBlockValueBySeconds -import app.aaps.core.main.extensions.shiftBlock -import app.aaps.core.main.extensions.shiftTargetBlock -import app.aaps.core.main.extensions.targetBlockValueBySeconds import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.db.GlucoseUnit import app.aaps.core.interfaces.notifications.Notification @@ -19,7 +12,14 @@ import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.HardLimits import app.aaps.core.interfaces.utils.T -import info.nightscout.core.utils.MidnightUtils +import app.aaps.core.main.events.EventNewNotification +import app.aaps.core.main.extensions.blockValueBySeconds +import app.aaps.core.main.extensions.highTargetBlockValueBySeconds +import app.aaps.core.main.extensions.lowTargetBlockValueBySeconds +import app.aaps.core.main.extensions.shiftBlock +import app.aaps.core.main.extensions.shiftTargetBlock +import app.aaps.core.main.extensions.targetBlockValueBySeconds +import app.aaps.core.utils.MidnightUtils import info.nightscout.database.entities.EffectiveProfileSwitch import info.nightscout.database.entities.ProfileSwitch import info.nightscout.database.entities.data.Block diff --git a/core/main/src/main/kotlin/app/aaps/core/main/utils/CryptoUtil.kt b/core/main/src/main/kotlin/app/aaps/core/main/utils/CryptoUtil.kt index ee51b0ca8b..5f62aeebdb 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/utils/CryptoUtil.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/utils/CryptoUtil.kt @@ -1,7 +1,7 @@ package app.aaps.core.main.utils import app.aaps.core.interfaces.logging.AAPSLogger -import info.nightscout.core.utils.toHex +import app.aaps.core.utils.toHex import org.spongycastle.util.encoders.Base64 import java.nio.ByteBuffer import java.security.MessageDigest diff --git a/core/main/src/main/kotlin/app/aaps/core/main/wizard/BolusWizard.kt b/core/main/src/main/kotlin/app/aaps/core/main/wizard/BolusWizard.kt index 7244b6305d..8590bf11bb 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/wizard/BolusWizard.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/wizard/BolusWizard.kt @@ -2,11 +2,6 @@ package app.aaps.core.main.wizard import android.content.Context import android.text.Spanned -import app.aaps.core.main.constraints.ConstraintObject -import app.aaps.core.main.extensions.highValueToUnitsToString -import app.aaps.core.main.extensions.lowValueToUnitsToString -import app.aaps.core.main.iob.round -import app.aaps.core.main.utils.extensions.formatColor import app.aaps.core.interfaces.aps.Loop import app.aaps.core.interfaces.automation.Automation import app.aaps.core.interfaces.configuration.Config @@ -36,10 +31,15 @@ import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.Round import app.aaps.core.interfaces.utils.T +import app.aaps.core.main.constraints.ConstraintObject +import app.aaps.core.main.extensions.highValueToUnitsToString +import app.aaps.core.main.extensions.lowValueToUnitsToString +import app.aaps.core.main.iob.round +import app.aaps.core.main.utils.extensions.formatColor +import app.aaps.core.ui.dialogs.OKDialog +import app.aaps.core.utils.HtmlHelper import com.google.common.base.Joiner import dagger.android.HasAndroidInjector -import app.aaps.core.ui.dialogs.OKDialog -import info.nightscout.core.utils.HtmlHelper import info.nightscout.database.entities.BolusCalculatorResult import info.nightscout.database.entities.OfflineEvent import info.nightscout.database.entities.TemporaryTarget diff --git a/core/main/src/main/kotlin/app/aaps/core/main/wizard/QuickWizardEntry.kt b/core/main/src/main/kotlin/app/aaps/core/main/wizard/QuickWizardEntry.kt index c8eb72d855..478d23208f 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/wizard/QuickWizardEntry.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/wizard/QuickWizardEntry.kt @@ -1,8 +1,6 @@ package app.aaps.core.main.wizard import app.aaps.annotations.OpenForTesting -import app.aaps.core.main.extensions.valueToUnits -import app.aaps.core.main.iob.round import app.aaps.core.interfaces.aps.Loop import app.aaps.core.interfaces.db.PersistenceLayer import app.aaps.core.interfaces.iob.GlucoseStatusProvider @@ -13,10 +11,12 @@ import app.aaps.core.interfaces.profile.Profile import app.aaps.core.interfaces.profile.ProfileFunction import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.main.extensions.valueToUnits +import app.aaps.core.main.iob.round +import app.aaps.core.utils.JsonHelper.safeGetInt +import app.aaps.core.utils.JsonHelper.safeGetString +import app.aaps.core.utils.MidnightUtils import dagger.android.HasAndroidInjector -import info.nightscout.core.utils.JsonHelper.safeGetInt -import info.nightscout.core.utils.JsonHelper.safeGetString -import info.nightscout.core.utils.MidnightUtils import info.nightscout.database.ValueWrapper import org.json.JSONException import org.json.JSONObject diff --git a/core/utils/src/main/java/info/nightscout/core/utils/DateTimeUtil.java b/core/utils/src/main/java/info/nightscout/core/utils/DateTimeUtil.java deleted file mode 100644 index 8ec3c99f29..0000000000 --- a/core/utils/src/main/java/info/nightscout/core/utils/DateTimeUtil.java +++ /dev/null @@ -1,312 +0,0 @@ -package info.nightscout.core.utils; - -/* - * Created by andy on 10/25/18. - */ - -import org.joda.time.LocalDateTime; -import org.joda.time.Minutes; -import org.joda.time.Seconds; - -import java.util.Calendar; -import java.util.GregorianCalendar; - -/** - * This is simple version of ATechDate, limited only to one format (yyyymmddHHMIss) - */ -public class DateTimeUtil { - - /** - * DateTime is packed as long: yyyymmddHHMMss - * - * @param atechDateTime - * @return - */ - public static LocalDateTime toLocalDateTime(long atechDateTime) { - int year = (int) (atechDateTime / 10000000000L); - atechDateTime -= year * 10000000000L; - - int month = (int) (atechDateTime / 100000000L); - atechDateTime -= month * 100000000L; - - int dayOfMonth = (int) (atechDateTime / 1000000L); - atechDateTime -= dayOfMonth * 1000000L; - - int hourOfDay = (int) (atechDateTime / 10000L); - atechDateTime -= hourOfDay * 10000L; - - int minute = (int) (atechDateTime / 100L); - atechDateTime -= minute * 100L; - - int second = (int) atechDateTime; - - try { - return new LocalDateTime(year, month, dayOfMonth, hourOfDay, minute, second); - } catch (Exception ex) { - //LOG.error("Error creating LocalDateTime from values [atechDateTime={}, year={}, month={}, day={}, hour={}, minute={}, second={}]. Exception: {}", atechDateTime, year, month, dayOfMonth, hourOfDay, minute, second, ex.getMessage()); - //return null; - throw ex; - } - } - - - /** - * DateTime is packed as long: yyyymmddHHMMss - * - * @param atechDateTime - * @return - */ - public static GregorianCalendar toGregorianCalendar(long atechDateTime) { - int year = (int) (atechDateTime / 10000000000L); - atechDateTime -= year * 10000000000L; - - int month = (int) (atechDateTime / 100000000L); - atechDateTime -= month * 100000000L; - - int dayOfMonth = (int) (atechDateTime / 1000000L); - atechDateTime -= dayOfMonth * 1000000L; - - int hourOfDay = (int) (atechDateTime / 10000L); - atechDateTime -= hourOfDay * 10000L; - - int minute = (int) (atechDateTime / 100L); - atechDateTime -= minute * 100L; - - int second = (int) atechDateTime; - - try { - return new GregorianCalendar(year, month - 1, dayOfMonth, hourOfDay, minute, second); - } catch (Exception ex) { - //LOG.error("DateTimeUtil", String.format("Error creating GregorianCalendar from values [atechDateTime=%d, year=%d, month=%d, day=%d, hour=%d, minute=%d, second=%d]", atechDateTime, year, month, dayOfMonth, hourOfDay, minute, second)); - //return null; - throw ex; - } - } - - - public static long toATechDate(LocalDateTime ldt) { - long atechDateTime = 0L; - - atechDateTime += ldt.getYear() * 10000000000L; - atechDateTime += ldt.getMonthOfYear() * 100000000L; - atechDateTime += ldt.getDayOfMonth() * 1000000L; - atechDateTime += ldt.getHourOfDay() * 10000L; - atechDateTime += ldt.getMinuteOfHour() * 100L; - atechDateTime += ldt.getSecondOfMinute(); - - return atechDateTime; - } - - - public static long toATechDate(GregorianCalendar gc) { - long atechDateTime = 0L; - - atechDateTime += gc.get(Calendar.YEAR) * 10000000000L; - atechDateTime += (gc.get(Calendar.MONTH) + 1) * 100000000L; - atechDateTime += gc.get(Calendar.DAY_OF_MONTH) * 1000000L; - atechDateTime += gc.get(Calendar.HOUR_OF_DAY) * 10000L; - atechDateTime += gc.get(Calendar.MINUTE) * 100L; - atechDateTime += gc.get(Calendar.SECOND); - - return atechDateTime; - } - - - public static long toATechDate(long timeInMillis) { - GregorianCalendar gc = new GregorianCalendar(); - gc.setTimeInMillis(timeInMillis); - - return toATechDate(gc); - } - -/* - public static boolean isSameDay(LocalDateTime ldt1, LocalDateTime ldt2) { - - return (ldt1.getYear() == ldt2.getYear() && // - ldt1.getMonthOfYear() == ldt2.getMonthOfYear() && // - ldt1.getDayOfMonth() == ldt2.getDayOfMonth()); - - } -*/ - - public static boolean isSameDay(long ldt1, long ldt2) { - - long day1 = ldt1 / 10000L; - long day2 = ldt2 / 10000L; - - return day1 == day2; - } - - - public static long toATechDate(int year, int month, int dayOfMonth, int hour, int minutes, int seconds) { - - long atechDateTime = 0L; - - atechDateTime += year * 10000000000L; - atechDateTime += month * 100000000L; - atechDateTime += dayOfMonth * 1000000L; - atechDateTime += hour * 10000L; - atechDateTime += minutes * 100L; - atechDateTime += seconds; - - return atechDateTime; - } - - -// public static long toATechDate(Date date) { -// -// long atechDateTime = 0L; -// -// atechDateTime += (date.getYear() + 1900) * 10000000000L; -// atechDateTime += (date.getMonth() + 1) * 100000000L; -// atechDateTime += date.getDate() * 1000000L; -// atechDateTime += date.getHours() * 10000L; -// atechDateTime += date.getMinutes() * 100L; -// atechDateTime += date.getSeconds(); -// -// return atechDateTime; -// } - - - public static String toString(long atechDateTime) { - int year = (int) (atechDateTime / 10000000000L); - atechDateTime -= year * 10000000000L; - - int month = (int) (atechDateTime / 100000000L); - atechDateTime -= month * 100000000L; - - int dayOfMonth = (int) (atechDateTime / 1000000L); - atechDateTime -= dayOfMonth * 1000000L; - - int hourOfDay = (int) (atechDateTime / 10000L); - atechDateTime -= hourOfDay * 10000L; - - int minute = (int) (atechDateTime / 100L); - atechDateTime -= minute * 100L; - - int second = (int) atechDateTime; - - return getZeroPrefixed(dayOfMonth) + "." + getZeroPrefixed(month) + "." + year + " " + // - getZeroPrefixed(hourOfDay) + ":" + getZeroPrefixed(minute) + ":" + getZeroPrefixed(second); - } - - - public static String toString(GregorianCalendar gc) { - - return getZeroPrefixed(gc.get(Calendar.DAY_OF_MONTH)) + "." + getZeroPrefixed(gc.get(Calendar.MONTH) + 1) + "." - + gc.get(Calendar.YEAR) + " " - + // - getZeroPrefixed(gc.get(Calendar.HOUR_OF_DAY)) + ":" + getZeroPrefixed(gc.get(Calendar.MINUTE)) + ":" - + getZeroPrefixed(gc.get(Calendar.SECOND)); - } - - - public static String toStringFromTimeInMillis(long timeInMillis) { - - GregorianCalendar gc = new GregorianCalendar(); - gc.setTimeInMillis(timeInMillis); - - return toString(gc); - } - - - private static String getZeroPrefixed(int number) { - return (number < 10) ? "0" + number : "" + number; - } - - - public static int getYear(Long atechDateTime) { - - if (atechDateTime == null || atechDateTime == 0) { - return 2000; - } - - int year = (int) (atechDateTime / 10000000000L); - return year; - } - - -/* - public static boolean isSameDayATDAndMillis(long atechDateTime, long timeInMillis) { - - GregorianCalendar dt = new GregorianCalendar(); - dt.setTimeInMillis(timeInMillis); - - long entryDate = toATechDate(dt); - - return (isSameDay(atechDateTime, entryDate)); - } -*/ - - - public static long toMillisFromATD(long atechDateTime) { - - GregorianCalendar gc = toGregorianCalendar(atechDateTime); - - return gc.getTimeInMillis(); - } - - - public static int getATechDateDifferenceAsMinutes(Long date1, Long date2) { - Minutes minutes = Minutes.minutesBetween(toLocalDateTime(date1), toLocalDateTime(date2)); - return minutes.getMinutes(); - } - - - public static int getATechDateDifferenceAsSeconds(Long date1, Long date2) { - Seconds seconds = Seconds.secondsBetween(toLocalDateTime(date1), toLocalDateTime(date2)); - return seconds.getSeconds(); - } - - - public static long getMillisFromATDWithAddedMinutes(long atd, int minutesDiff) { - GregorianCalendar oldestEntryTime = DateTimeUtil.toGregorianCalendar(atd); - oldestEntryTime.add(Calendar.MINUTE, minutesDiff); - - return oldestEntryTime.getTimeInMillis(); - } - - - public static long getATDWithAddedSeconds(Long atd, int addedSeconds) { - GregorianCalendar oldestEntryTime = DateTimeUtil.toGregorianCalendar(atd); - oldestEntryTime.add(Calendar.SECOND, addedSeconds); - - return toATechDate(oldestEntryTime.getTimeInMillis()); - } - - -/* - public static long getATDWithAddedMinutes(Long atd, int minutesDiff) { - GregorianCalendar oldestEntryTime = DateTimeUtil.toGregorianCalendar(atd); - oldestEntryTime.add(Calendar.MINUTE, minutesDiff); - - return toATechDate(oldestEntryTime); - } -*/ - - public static long getATDWithAddedMinutes(GregorianCalendar oldestEntryTime, int minutesDiff) { - oldestEntryTime.add(Calendar.MINUTE, minutesDiff); - - return toATechDate(oldestEntryTime); - } - -/* - public static long getTimeInFutureFromMinutes(long startTime, int minutes) { - return startTime + getTimeInMs(minutes); - } -*/ - - public static long getTimeInFutureFromMinutes(int minutes) { - return System.currentTimeMillis() + getTimeInMs(minutes); - } - - - public static long getTimeInMs(int minutes) { - return getTimeInS(minutes) * 1000L; - } - - public static int getTimeInS(int minutes) { - return minutes * 60; - } - -} diff --git a/core/utils/src/main/java/info/nightscout/core/utils/Concurrency.kt b/core/utils/src/main/kotlin/app/aaps/core/utils/Concurrency.kt similarity index 95% rename from core/utils/src/main/java/info/nightscout/core/utils/Concurrency.kt rename to core/utils/src/main/kotlin/app/aaps/core/utils/Concurrency.kt index d76fd718f4..221407fc0c 100644 --- a/core/utils/src/main/java/info/nightscout/core/utils/Concurrency.kt +++ b/core/utils/src/main/kotlin/app/aaps/core/utils/Concurrency.kt @@ -1,4 +1,4 @@ -package info.nightscout.core.utils +package app.aaps.core.utils @Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN", "NOTHING_TO_INLINE") inline fun Any.wait() = (this as Object).wait() diff --git a/core/utils/src/main/kotlin/app/aaps/core/utils/DateTimeUtil.kt b/core/utils/src/main/kotlin/app/aaps/core/utils/DateTimeUtil.kt new file mode 100644 index 0000000000..101d7c9d5f --- /dev/null +++ b/core/utils/src/main/kotlin/app/aaps/core/utils/DateTimeUtil.kt @@ -0,0 +1,212 @@ +package app.aaps.core.utils + +import org.joda.time.LocalDateTime +import org.joda.time.Minutes +import org.joda.time.Seconds +import java.util.Calendar +import java.util.GregorianCalendar + +/* +* Created by andy on 10/25/18. +*/ +/** + * This is simple version of ATechDate, limited only to one format (yyyymmddHHMIss) + */ +object DateTimeUtil { + + /** + * DateTime is packed as long: yyyymmddHHMMss + * + * @param aTechDateTime + * @return + */ + fun toLocalDateTime(aTechDateTime: Long): LocalDateTime { + var dateTime = aTechDateTime + val year = (dateTime / 10000000000L).toInt() + dateTime -= year * 10000000000L + val month = (dateTime / 100000000L).toInt() + dateTime -= month * 100000000L + val dayOfMonth = (dateTime / 1000000L).toInt() + dateTime -= dayOfMonth * 1000000L + val hourOfDay = (dateTime / 10000L).toInt() + dateTime -= hourOfDay * 10000L + val minute = (dateTime / 100L).toInt() + dateTime -= minute * 100L + val second = dateTime.toInt() + return LocalDateTime(year, month, dayOfMonth, hourOfDay, minute, second) + } + + /** + * DateTime is packed as long: yyyymmddHHMMss + * + * @param aTechDateTime + * @return + */ + private fun toGregorianCalendar(aTechDateTime: Long): GregorianCalendar { + var dateTime = aTechDateTime + val year = (dateTime / 10000000000L).toInt() + dateTime -= year * 10000000000L + val month = (dateTime / 100000000L).toInt() + dateTime -= month * 100000000L + val dayOfMonth = (dateTime / 1000000L).toInt() + dateTime -= dayOfMonth * 1000000L + val hourOfDay = (dateTime / 10000L).toInt() + dateTime -= hourOfDay * 10000L + val minute = (dateTime / 100L).toInt() + dateTime -= minute * 100L + val second = dateTime.toInt() + return GregorianCalendar(year, month - 1, dayOfMonth, hourOfDay, minute, second) + } + + fun toATechDate(ldt: LocalDateTime): Long { + var aTechDateTime = 0L + aTechDateTime += ldt.year * 10000000000L + aTechDateTime += ldt.monthOfYear * 100000000L + aTechDateTime += ldt.dayOfMonth * 1000000L + aTechDateTime += ldt.hourOfDay * 10000L + aTechDateTime += ldt.minuteOfHour * 100L + aTechDateTime += ldt.secondOfMinute.toLong() + return aTechDateTime + } + + fun toATechDate(gc: GregorianCalendar): Long { + var aTechDateTime = 0L + aTechDateTime += gc[Calendar.YEAR] * 10000000000L + aTechDateTime += (gc[Calendar.MONTH] + 1) * 100000000L + aTechDateTime += gc[Calendar.DAY_OF_MONTH] * 1000000L + aTechDateTime += gc[Calendar.HOUR_OF_DAY] * 10000L + aTechDateTime += gc[Calendar.MINUTE] * 100L + aTechDateTime += gc[Calendar.SECOND].toLong() + return aTechDateTime + } + + @JvmStatic fun toATechDate(timeInMillis: Long): Long { + val gc = GregorianCalendar() + gc.setTimeInMillis(timeInMillis) + return toATechDate(gc) + } + + /* + public static boolean isSameDay(LocalDateTime ldt1, LocalDateTime ldt2) { + + return (ldt1.getYear() == ldt2.getYear() && // + ldt1.getMonthOfYear() == ldt2.getMonthOfYear() && // + ldt1.getDayOfMonth() == ldt2.getDayOfMonth()); + + } +*/ + fun isSameDay(ldt1: Long, ldt2: Long): Boolean { + val day1 = ldt1 / 10000L + val day2 = ldt2 / 10000L + return day1 == day2 + } + + fun toATechDate(year: Int, month: Int, dayOfMonth: Int, hour: Int, minutes: Int, seconds: Int): Long { + var aTechDateTime = 0L + aTechDateTime += year * 10000000000L + aTechDateTime += month * 100000000L + aTechDateTime += dayOfMonth * 1000000L + aTechDateTime += hour * 10000L + aTechDateTime += minutes * 100L + aTechDateTime += seconds.toLong() + return aTechDateTime + } + + fun toString(aTechDateTime: Long): String { + var dateTime = aTechDateTime + val year = (dateTime / 10000000000L).toInt() + dateTime -= year * 10000000000L + val month = (dateTime / 100000000L).toInt() + dateTime -= month * 100000000L + val dayOfMonth = (dateTime / 1000000L).toInt() + dateTime -= dayOfMonth * 1000000L + val hourOfDay = (dateTime / 10000L).toInt() + dateTime -= hourOfDay * 10000L + val minute = (dateTime / 100L).toInt() + dateTime -= minute * 100L + val second = dateTime.toInt() + return getZeroPrefixed(dayOfMonth) + "." + getZeroPrefixed(month) + "." + year + " " + // + getZeroPrefixed(hourOfDay) + ":" + getZeroPrefixed(minute) + ":" + getZeroPrefixed(second) + } + + fun toString(gc: GregorianCalendar): String { + return (getZeroPrefixed(gc[Calendar.DAY_OF_MONTH]) + "." + getZeroPrefixed(gc[Calendar.MONTH] + 1) + "." + + gc[Calendar.YEAR] + " " + + // + getZeroPrefixed(gc[Calendar.HOUR_OF_DAY]) + ":" + getZeroPrefixed(gc[Calendar.MINUTE]) + ":" + + getZeroPrefixed(gc[Calendar.SECOND])) + } + + @JvmStatic fun toStringFromTimeInMillis(timeInMillis: Long): String { + val gc = GregorianCalendar() + gc.setTimeInMillis(timeInMillis) + return toString(gc) + } + + private fun getZeroPrefixed(number: Int): String { + return if (number < 10) "0$number" else "" + number + } + + fun getYear(aTechDateTime: Long?): Int { + return if (aTechDateTime == null || aTechDateTime == 0L) { + 2000 + } else (aTechDateTime / 10000000000L).toInt() + } + + fun toMillisFromATD(aTechDateTime: Long): Long { + val gc = toGregorianCalendar(aTechDateTime) + return gc.getTimeInMillis() + } + + fun getATechDateDifferenceAsMinutes(date1: Long, date2: Long): Int { + val minutes = Minutes.minutesBetween(toLocalDateTime(date1), toLocalDateTime(date2)) + return minutes.minutes + } + + fun getATechDateDifferenceAsSeconds(date1: Long, date2: Long): Int { + val seconds = Seconds.secondsBetween(toLocalDateTime(date1), toLocalDateTime(date2)) + return seconds.seconds + } + + fun getMillisFromATDWithAddedMinutes(atd: Long, minutesDiff: Int): Long { + val oldestEntryTime = toGregorianCalendar(atd) + oldestEntryTime.add(Calendar.MINUTE, minutesDiff) + return oldestEntryTime.getTimeInMillis() + } + + fun getATDWithAddedSeconds(atd: Long, addedSeconds: Int): Long { + val oldestEntryTime = toGregorianCalendar(atd) + oldestEntryTime.add(Calendar.SECOND, addedSeconds) + return toATechDate(oldestEntryTime.getTimeInMillis()) + } + + /* + public static long getATDWithAddedMinutes(Long atd, int minutesDiff) { + GregorianCalendar oldestEntryTime = DateTimeUtil.toGregorianCalendar(atd); + oldestEntryTime.add(Calendar.MINUTE, minutesDiff); + + return toATechDate(oldestEntryTime); + } +*/ + fun getATDWithAddedMinutes(oldestEntryTime: GregorianCalendar, minutesDiff: Int): Long { + oldestEntryTime.add(Calendar.MINUTE, minutesDiff) + return toATechDate(oldestEntryTime) + } + + /* + public static long getTimeInFutureFromMinutes(long startTime, int minutes) { + return startTime + getTimeInMs(minutes); + } +*/ + @JvmStatic fun getTimeInFutureFromMinutes(minutes: Int): Long { + return System.currentTimeMillis() + getTimeInMs(minutes) + } + + private fun getTimeInMs(minutes: Int): Long { + return getTimeInS(minutes) * 1000L + } + + private fun getTimeInS(minutes: Int): Int { + return minutes * 60 + } +} diff --git a/core/utils/src/main/java/info/nightscout/core/utils/EspressoTestHelper.kt b/core/utils/src/main/kotlin/app/aaps/core/utils/EspressoTestHelper.kt similarity index 92% rename from core/utils/src/main/java/info/nightscout/core/utils/EspressoTestHelper.kt rename to core/utils/src/main/kotlin/app/aaps/core/utils/EspressoTestHelper.kt index aa5bde0a5b..f4f79f8824 100644 --- a/core/utils/src/main/java/info/nightscout/core/utils/EspressoTestHelper.kt +++ b/core/utils/src/main/kotlin/app/aaps/core/utils/EspressoTestHelper.kt @@ -1,4 +1,4 @@ -package info.nightscout.core.utils +package app.aaps.core.utils @Synchronized fun isRunningTest(): Boolean { diff --git a/core/utils/src/main/java/info/nightscout/core/utils/HexByteArrayConversion.kt b/core/utils/src/main/kotlin/app/aaps/core/utils/HexByteArrayConversion.kt similarity index 95% rename from core/utils/src/main/java/info/nightscout/core/utils/HexByteArrayConversion.kt rename to core/utils/src/main/kotlin/app/aaps/core/utils/HexByteArrayConversion.kt index 5ef6cc9b8a..58e6f6235f 100644 --- a/core/utils/src/main/java/info/nightscout/core/utils/HexByteArrayConversion.kt +++ b/core/utils/src/main/kotlin/app/aaps/core/utils/HexByteArrayConversion.kt @@ -1,4 +1,4 @@ -package info.nightscout.core.utils +package app.aaps.core.utils import java.util.Locale diff --git a/core/utils/src/main/java/info/nightscout/core/utils/HtmlHelper.kt b/core/utils/src/main/kotlin/app/aaps/core/utils/HtmlHelper.kt similarity index 90% rename from core/utils/src/main/java/info/nightscout/core/utils/HtmlHelper.kt rename to core/utils/src/main/kotlin/app/aaps/core/utils/HtmlHelper.kt index 2802deb92e..8657daf9ea 100644 --- a/core/utils/src/main/java/info/nightscout/core/utils/HtmlHelper.kt +++ b/core/utils/src/main/kotlin/app/aaps/core/utils/HtmlHelper.kt @@ -1,4 +1,4 @@ -package info.nightscout.core.utils +package app.aaps.core.utils import android.text.Html import android.text.SpannableStringBuilder diff --git a/core/utils/src/main/java/info/nightscout/core/utils/JsonHelper.kt b/core/utils/src/main/kotlin/app/aaps/core/utils/JsonHelper.kt similarity index 99% rename from core/utils/src/main/java/info/nightscout/core/utils/JsonHelper.kt rename to core/utils/src/main/kotlin/app/aaps/core/utils/JsonHelper.kt index fc7ecb608b..994c68fb2c 100644 --- a/core/utils/src/main/java/info/nightscout/core/utils/JsonHelper.kt +++ b/core/utils/src/main/kotlin/app/aaps/core/utils/JsonHelper.kt @@ -1,4 +1,4 @@ -package info.nightscout.core.utils +package app.aaps.core.utils import org.json.JSONException import org.json.JSONObject diff --git a/core/utils/src/main/java/info/nightscout/core/utils/MidnightUtils.kt b/core/utils/src/main/kotlin/app/aaps/core/utils/MidnightUtils.kt similarity index 93% rename from core/utils/src/main/java/info/nightscout/core/utils/MidnightUtils.kt rename to core/utils/src/main/kotlin/app/aaps/core/utils/MidnightUtils.kt index 77305be80e..3d36fa494a 100644 --- a/core/utils/src/main/java/info/nightscout/core/utils/MidnightUtils.kt +++ b/core/utils/src/main/kotlin/app/aaps/core/utils/MidnightUtils.kt @@ -1,4 +1,4 @@ -package info.nightscout.core.utils +package app.aaps.core.utils import org.joda.time.DateTime diff --git a/core/utils/src/main/java/info/nightscout/core/utils/Percentile.kt b/core/utils/src/main/kotlin/app/aaps/core/utils/Percentile.kt similarity index 95% rename from core/utils/src/main/java/info/nightscout/core/utils/Percentile.kt rename to core/utils/src/main/kotlin/app/aaps/core/utils/Percentile.kt index c336de8ded..ae5ddf2c10 100644 --- a/core/utils/src/main/java/info/nightscout/core/utils/Percentile.kt +++ b/core/utils/src/main/kotlin/app/aaps/core/utils/Percentile.kt @@ -1,4 +1,4 @@ -package info.nightscout.core.utils +package app.aaps.core.utils import kotlin.math.floor diff --git a/core/utils/src/main/java/info/nightscout/core/utils/extensions/BluetoothAdapterExtension.kt b/core/utils/src/main/kotlin/app/aaps/core/utils/extensions/BluetoothAdapterExtension.kt similarity index 96% rename from core/utils/src/main/java/info/nightscout/core/utils/extensions/BluetoothAdapterExtension.kt rename to core/utils/src/main/kotlin/app/aaps/core/utils/extensions/BluetoothAdapterExtension.kt index a313db4b41..8c93061ce6 100644 --- a/core/utils/src/main/java/info/nightscout/core/utils/extensions/BluetoothAdapterExtension.kt +++ b/core/utils/src/main/kotlin/app/aaps/core/utils/extensions/BluetoothAdapterExtension.kt @@ -1,4 +1,4 @@ -package info.nightscout.core.utils.extensions +package app.aaps.core.utils.extensions import android.bluetooth.BluetoothAdapter import android.os.SystemClock diff --git a/core/utils/src/main/java/info/nightscout/core/utils/extensions/IntentExtension.kt b/core/utils/src/main/kotlin/app/aaps/core/utils/extensions/IntentExtension.kt similarity index 94% rename from core/utils/src/main/java/info/nightscout/core/utils/extensions/IntentExtension.kt rename to core/utils/src/main/kotlin/app/aaps/core/utils/extensions/IntentExtension.kt index d3c236cb11..67bb5c8cc0 100644 --- a/core/utils/src/main/java/info/nightscout/core/utils/extensions/IntentExtension.kt +++ b/core/utils/src/main/kotlin/app/aaps/core/utils/extensions/IntentExtension.kt @@ -1,4 +1,4 @@ -package info.nightscout.core.utils.extensions +package app.aaps.core.utils.extensions import android.content.Intent import java.io.Serializable diff --git a/core/utils/src/main/java/info/nightscout/core/utils/extensions/WorkerDataBuilder.kt b/core/utils/src/main/kotlin/app/aaps/core/utils/extensions/WorkerDataBuilder.kt similarity index 94% rename from core/utils/src/main/java/info/nightscout/core/utils/extensions/WorkerDataBuilder.kt rename to core/utils/src/main/kotlin/app/aaps/core/utils/extensions/WorkerDataBuilder.kt index d72bbd12f3..ec02b3fbfd 100644 --- a/core/utils/src/main/java/info/nightscout/core/utils/extensions/WorkerDataBuilder.kt +++ b/core/utils/src/main/kotlin/app/aaps/core/utils/extensions/WorkerDataBuilder.kt @@ -1,4 +1,4 @@ -package info.nightscout.core.utils.extensions +package app.aaps.core.utils.extensions import android.os.Bundle import androidx.work.Data diff --git a/core/utils/src/main/java/info/nightscout/core/utils/fabric/InstanceId.kt b/core/utils/src/main/kotlin/app/aaps/core/utils/fabric/InstanceId.kt similarity index 85% rename from core/utils/src/main/java/info/nightscout/core/utils/fabric/InstanceId.kt rename to core/utils/src/main/kotlin/app/aaps/core/utils/fabric/InstanceId.kt index 1ad89a9684..77d0b89bbf 100644 --- a/core/utils/src/main/java/info/nightscout/core/utils/fabric/InstanceId.kt +++ b/core/utils/src/main/kotlin/app/aaps/core/utils/fabric/InstanceId.kt @@ -1,4 +1,4 @@ -package info.nightscout.core.utils.fabric +package app.aaps.core.utils.fabric import com.google.firebase.installations.FirebaseInstallations diff --git a/core/utils/src/main/java/info/nightscout/core/utils/receivers/DataWorkerStorage.kt b/core/utils/src/main/kotlin/app/aaps/core/utils/receivers/DataWorkerStorage.kt similarity index 97% rename from core/utils/src/main/java/info/nightscout/core/utils/receivers/DataWorkerStorage.kt rename to core/utils/src/main/kotlin/app/aaps/core/utils/receivers/DataWorkerStorage.kt index ada8a89f39..22d8c38208 100644 --- a/core/utils/src/main/java/info/nightscout/core/utils/receivers/DataWorkerStorage.kt +++ b/core/utils/src/main/kotlin/app/aaps/core/utils/receivers/DataWorkerStorage.kt @@ -1,4 +1,4 @@ -package info.nightscout.core.utils.receivers +package app.aaps.core.utils.receivers import android.content.Context import android.os.Bundle diff --git a/core/utils/src/main/java/info/nightscout/core/utils/receivers/StringUtils.kt b/core/utils/src/main/kotlin/app/aaps/core/utils/receivers/StringUtils.kt similarity index 88% rename from core/utils/src/main/java/info/nightscout/core/utils/receivers/StringUtils.kt rename to core/utils/src/main/kotlin/app/aaps/core/utils/receivers/StringUtils.kt index 728f62c020..4bf07f19e5 100644 --- a/core/utils/src/main/java/info/nightscout/core/utils/receivers/StringUtils.kt +++ b/core/utils/src/main/kotlin/app/aaps/core/utils/receivers/StringUtils.kt @@ -1,4 +1,4 @@ -package info.nightscout.core.utils.receivers +package app.aaps.core.utils.receivers /** * class contains useful String functions diff --git a/core/utils/src/main/java/info/nightscout/core/utils/worker/WorkExtensions.kt b/core/utils/src/main/kotlin/app/aaps/core/utils/worker/WorkExtensions.kt similarity index 82% rename from core/utils/src/main/java/info/nightscout/core/utils/worker/WorkExtensions.kt rename to core/utils/src/main/kotlin/app/aaps/core/utils/worker/WorkExtensions.kt index 93fd243d86..a772dd80c2 100644 --- a/core/utils/src/main/java/info/nightscout/core/utils/worker/WorkExtensions.kt +++ b/core/utils/src/main/kotlin/app/aaps/core/utils/worker/WorkExtensions.kt @@ -1,4 +1,4 @@ -package info.nightscout.core.utils.worker +package app.aaps.core.utils.worker import androidx.work.OneTimeWorkRequest import androidx.work.WorkContinuation diff --git a/core/utils/src/test/kotlin/app/aaps/core/utils/JsonHelperTest.kt b/core/utils/src/test/kotlin/app/aaps/core/utils/JsonHelperTest.kt index 126649cfd8..0347bd3c29 100644 --- a/core/utils/src/test/kotlin/app/aaps/core/utils/JsonHelperTest.kt +++ b/core/utils/src/test/kotlin/app/aaps/core/utils/JsonHelperTest.kt @@ -1,7 +1,6 @@ package app.aaps.core.utils import com.google.common.truth.Truth.assertThat -import info.nightscout.core.utils.JsonHelper import org.json.JSONObject import org.junit.jupiter.api.Test diff --git a/core/utils/src/test/kotlin/app/aaps/core/utils/receivers/StringUtilsTest.kt b/core/utils/src/test/kotlin/app/aaps/core/utils/receivers/StringUtilsTest.kt index 8acc041dea..586ffc1def 100644 --- a/core/utils/src/test/kotlin/app/aaps/core/utils/receivers/StringUtilsTest.kt +++ b/core/utils/src/test/kotlin/app/aaps/core/utils/receivers/StringUtilsTest.kt @@ -1,7 +1,6 @@ package app.aaps.core.utils.receivers import com.google.common.truth.Truth.assertThat -import info.nightscout.core.utils.receivers.StringUtils import org.junit.jupiter.api.Test class StringUtilsTest { diff --git a/core/utils/src/test/kotlin/app/aaps/pump/common/utils/DateTimeUtilUTest.kt b/core/utils/src/test/kotlin/app/aaps/pump/common/utils/DateTimeUtilUTest.kt index 8d2d3342d6..34d43f315a 100644 --- a/core/utils/src/test/kotlin/app/aaps/pump/common/utils/DateTimeUtilUTest.kt +++ b/core/utils/src/test/kotlin/app/aaps/pump/common/utils/DateTimeUtilUTest.kt @@ -1,7 +1,7 @@ package app.aaps.pump.common.utils +import app.aaps.core.utils.DateTimeUtil import com.google.common.truth.Truth.assertThat -import info.nightscout.core.utils.DateTimeUtil import org.junit.jupiter.api.Test internal class DateTimeUtilUTest { diff --git a/implementation/src/main/java/info/nightscout/implementation/profile/ProfileStoreObject.kt b/implementation/src/main/java/info/nightscout/implementation/profile/ProfileStoreObject.kt index 0e4f03b552..024d294138 100644 --- a/implementation/src/main/java/info/nightscout/implementation/profile/ProfileStoreObject.kt +++ b/implementation/src/main/java/info/nightscout/implementation/profile/ProfileStoreObject.kt @@ -1,8 +1,6 @@ package info.nightscout.implementation.profile import androidx.collection.ArrayMap -import app.aaps.core.main.extensions.pureProfileFromJson -import app.aaps.core.main.profile.ProfileSealed import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.plugin.ActivePlugin @@ -12,8 +10,10 @@ import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.HardLimits +import app.aaps.core.main.extensions.pureProfileFromJson +import app.aaps.core.main.profile.ProfileSealed +import app.aaps.core.utils.JsonHelper import dagger.android.HasAndroidInjector -import info.nightscout.core.utils.JsonHelper import org.json.JSONException import org.json.JSONObject import javax.inject.Inject diff --git a/implementation/src/main/java/info/nightscout/implementation/pump/BlePreCheckImpl.kt b/implementation/src/main/java/info/nightscout/implementation/pump/BlePreCheckImpl.kt index 7b2024a7f2..f61b53efb0 100644 --- a/implementation/src/main/java/info/nightscout/implementation/pump/BlePreCheckImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/pump/BlePreCheckImpl.kt @@ -14,7 +14,7 @@ import androidx.core.content.ContextCompat import app.aaps.core.interfaces.pump.BlePreCheck import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.ui.dialogs.OKDialog -import info.nightscout.core.utils.extensions.safeEnable +import app.aaps.core.utils.extensions.safeEnable import javax.inject.Inject import javax.inject.Singleton diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/CommandQueueImplementation.kt b/implementation/src/main/java/info/nightscout/implementation/queue/CommandQueueImplementation.kt index 744074f7b9..417a492818 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/CommandQueueImplementation.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/CommandQueueImplementation.kt @@ -8,11 +8,6 @@ import android.os.SystemClock import android.text.Spanned import androidx.appcompat.app.AppCompatActivity import app.aaps.annotations.OpenForTesting -import app.aaps.core.main.constraints.ConstraintObject -import app.aaps.core.main.events.EventNewNotification -import app.aaps.core.main.extensions.getCustomizedName -import app.aaps.core.main.profile.ProfileSealed -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.androidPermissions.AndroidPermission import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.constraints.ConstraintsChecker @@ -43,8 +38,13 @@ import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.main.constraints.ConstraintObject +import app.aaps.core.main.events.EventNewNotification +import app.aaps.core.main.extensions.getCustomizedName +import app.aaps.core.main.profile.ProfileSealed +import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.utils.HtmlHelper import dagger.android.HasAndroidInjector -import info.nightscout.core.utils.HtmlHelper import info.nightscout.database.ValueWrapper import info.nightscout.database.entities.EffectiveProfileSwitch import info.nightscout.database.entities.ProfileSwitch diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/QueueThread.kt b/implementation/src/main/java/info/nightscout/implementation/queue/QueueThread.kt index 1fb94e71b2..7317508a2f 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/QueueThread.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/QueueThread.kt @@ -20,8 +20,8 @@ import app.aaps.core.interfaces.rx.events.EventQueueChanged import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.T import app.aaps.core.ui.R -import info.nightscout.core.utils.extensions.safeDisable -import info.nightscout.core.utils.extensions.safeEnable +import app.aaps.core.utils.extensions.safeDisable +import app.aaps.core.utils.extensions.safeEnable class QueueThread internal constructor( private val queue: CommandQueue, diff --git a/implementation/src/main/java/info/nightscout/implementation/receivers/NetworkChangeReceiver.kt b/implementation/src/main/java/info/nightscout/implementation/receivers/NetworkChangeReceiver.kt index b07fc02f92..7be2ca397b 100644 --- a/implementation/src/main/java/info/nightscout/implementation/receivers/NetworkChangeReceiver.kt +++ b/implementation/src/main/java/info/nightscout/implementation/receivers/NetworkChangeReceiver.kt @@ -14,8 +14,8 @@ import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.receivers.ReceiverStatusStore import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.events.EventNetworkChange +import app.aaps.core.utils.receivers.StringUtils import dagger.android.DaggerBroadcastReceiver -import info.nightscout.core.utils.receivers.StringUtils import javax.inject.Inject class NetworkChangeReceiver : DaggerBroadcastReceiver() { diff --git a/implementation/src/main/java/info/nightscout/implementation/userEntry/UserEntryPresentationHelperImpl.kt b/implementation/src/main/java/info/nightscout/implementation/userEntry/UserEntryPresentationHelperImpl.kt index 54db25219a..f76292c46a 100644 --- a/implementation/src/main/java/info/nightscout/implementation/userEntry/UserEntryPresentationHelperImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/userEntry/UserEntryPresentationHelperImpl.kt @@ -1,7 +1,6 @@ package info.nightscout.implementation.userEntry import android.text.Spanned -import app.aaps.core.main.R import app.aaps.core.interfaces.configuration.Constants import app.aaps.core.interfaces.db.GlucoseUnit import app.aaps.core.interfaces.profile.ProfileUtil @@ -10,8 +9,9 @@ import app.aaps.core.interfaces.userEntry.UserEntryPresentationHelper import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.Translator +import app.aaps.core.main.R +import app.aaps.core.utils.HtmlHelper import dagger.Reusable -import info.nightscout.core.utils.HtmlHelper import info.nightscout.database.entities.UserEntry import info.nightscout.database.entities.UserEntry.Action import info.nightscout.database.entities.UserEntry.ColorGroup diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java index 600d11e2dc..e6fdf1fbe8 100644 --- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java +++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java @@ -23,6 +23,7 @@ import javax.inject.Inject; import app.aaps.core.interfaces.logging.AAPSLogger; import app.aaps.core.interfaces.logging.LTag; import app.aaps.core.interfaces.resources.ResourceHelper; +import app.aaps.core.utils.HtmlHelper; import dagger.android.DaggerService; import info.nightscout.androidaps.plugins.pump.insight.activities.InsightAlertActivity; import info.nightscout.androidaps.plugins.pump.insight.app_layer.remote_control.ConfirmAlertMessage; @@ -37,7 +38,6 @@ import info.nightscout.androidaps.plugins.pump.insight.exceptions.InsightExcepti import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.AppLayerErrorException; import info.nightscout.androidaps.plugins.pump.insight.utils.AlertUtils; import info.nightscout.androidaps.plugins.pump.insight.utils.ExceptionTranslator; -import info.nightscout.core.utils.HtmlHelper; public class InsightAlertService extends DaggerService implements InsightConnectionService.StateCallback { diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightAlertActivity.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightAlertActivity.java index 6ec58bff24..73798c3c5e 100644 --- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightAlertActivity.java +++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightAlertActivity.java @@ -16,13 +16,13 @@ import androidx.core.content.ContextCompat; import javax.inject.Inject; +import app.aaps.core.utils.HtmlHelper; import dagger.android.support.DaggerAppCompatActivity; import info.nightscout.androidaps.insight.R; import info.nightscout.androidaps.plugins.pump.insight.InsightAlertService; import info.nightscout.androidaps.plugins.pump.insight.descriptors.Alert; import info.nightscout.androidaps.plugins.pump.insight.descriptors.AlertStatus; import info.nightscout.androidaps.plugins.pump.insight.utils.AlertUtils; -import info.nightscout.core.utils.HtmlHelper; public class InsightAlertActivity extends DaggerAppCompatActivity { diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingActivity.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingActivity.java index 1814271670..0ca5390d87 100644 --- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingActivity.java +++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingActivity.java @@ -34,13 +34,13 @@ import javax.inject.Inject; import app.aaps.core.interfaces.pump.BlePreCheck; import app.aaps.core.interfaces.pump.PumpSync; +import app.aaps.core.utils.extensions.BluetoothAdapterExtensionKt; +import app.aaps.core.utils.extensions.IntentExtensionKt; import dagger.android.support.DaggerAppCompatActivity; import info.nightscout.androidaps.insight.R; import info.nightscout.androidaps.plugins.pump.insight.connection_service.InsightConnectionService; import info.nightscout.androidaps.plugins.pump.insight.descriptors.InsightState; import info.nightscout.androidaps.plugins.pump.insight.utils.ExceptionTranslator; -import info.nightscout.core.utils.extensions.BluetoothAdapterExtensionKt; -import info.nightscout.core.utils.extensions.IntentExtensionKt; public class InsightPairingActivity extends DaggerAppCompatActivity implements InsightConnectionService.StateCallback, View.OnClickListener, InsightConnectionService.ExceptionCallback { diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ConnectionEstablisher.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ConnectionEstablisher.java index 3b503bba25..a592a96ae7 100644 --- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ConnectionEstablisher.java +++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ConnectionEstablisher.java @@ -8,7 +8,7 @@ import java.io.IOException; import java.lang.reflect.Method; import java.util.UUID; -import info.nightscout.core.utils.extensions.BluetoothAdapterExtensionKt; +import app.aaps.core.utils.extensions.BluetoothAdapterExtensionKt; public class ConnectionEstablisher extends Thread { diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/APSResultObject.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/APSResultObject.kt index 02515bc6b3..057cf65077 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/APSResultObject.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/APSResultObject.kt @@ -1,8 +1,6 @@ package info.nightscout.plugins.aps import android.text.Spanned -import app.aaps.core.main.extensions.convertedToAbsolute -import app.aaps.core.main.extensions.convertedToPercent import app.aaps.core.interfaces.aps.APSResult import app.aaps.core.interfaces.constraints.Constraint import app.aaps.core.interfaces.constraints.ConstraintsChecker @@ -17,9 +15,11 @@ import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter -import dagger.android.HasAndroidInjector +import app.aaps.core.main.extensions.convertedToAbsolute +import app.aaps.core.main.extensions.convertedToPercent import app.aaps.core.ui.R -import info.nightscout.core.utils.HtmlHelper +import app.aaps.core.utils.HtmlHelper +import dagger.android.HasAndroidInjector import info.nightscout.database.entities.GlucoseValue import org.json.JSONException import org.json.JSONObject diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopFragment.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopFragment.kt index 56f6fa2f2e..564551b77e 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopFragment.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopFragment.kt @@ -12,9 +12,6 @@ import android.view.ViewGroup import androidx.core.view.MenuCompat import androidx.core.view.MenuProvider import androidx.lifecycle.Lifecycle -import app.aaps.core.main.constraints.ConstraintObject -import app.aaps.core.main.pump.toHtml -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.aps.Loop import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.resources.ResourceHelper @@ -24,9 +21,12 @@ import app.aaps.core.interfaces.rx.events.EventLoopUpdateGui import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.main.constraints.ConstraintObject +import app.aaps.core.main.pump.toHtml +import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.utils.HtmlHelper import dagger.android.HasAndroidInjector import dagger.android.support.DaggerFragment -import info.nightscout.core.utils.HtmlHelper import info.nightscout.plugins.aps.R import info.nightscout.plugins.aps.databinding.LoopFragmentBinding import info.nightscout.plugins.aps.loop.events.EventLoopSetLastRunGui diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt index cbb6ac602e..492a591c20 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt @@ -2,9 +2,6 @@ package info.nightscout.plugins.aps.openAPSAMA import android.content.Context import app.aaps.annotations.OpenForTesting -import app.aaps.core.main.constraints.ConstraintObject -import app.aaps.core.main.extensions.target -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.aps.APS import app.aaps.core.interfaces.aps.AutosensResult import app.aaps.core.interfaces.aps.DetermineBasalAdapter @@ -28,8 +25,11 @@ import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.HardLimits import app.aaps.core.interfaces.utils.Round +import app.aaps.core.main.constraints.ConstraintObject +import app.aaps.core.main.extensions.target +import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.utils.MidnightUtils import dagger.android.HasAndroidInjector -import info.nightscout.core.utils.MidnightUtils import info.nightscout.database.ValueWrapper import info.nightscout.database.impl.AppRepository import info.nightscout.plugins.aps.OpenAPSFragment diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.kt index d1757342ab..d2b544ad66 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.kt @@ -3,8 +3,6 @@ package info.nightscout.plugins.aps.openAPSSMB import android.content.Context import androidx.preference.PreferenceFragmentCompat import androidx.preference.SwitchPreference -import app.aaps.core.main.constraints.ConstraintObject -import app.aaps.core.main.extensions.target import app.aaps.core.interfaces.aps.APS import app.aaps.core.interfaces.aps.AutosensResult import app.aaps.core.interfaces.aps.DetermineBasalAdapter @@ -31,8 +29,10 @@ import app.aaps.core.interfaces.stats.TddCalculator import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.HardLimits import app.aaps.core.interfaces.utils.Round +import app.aaps.core.main.constraints.ConstraintObject +import app.aaps.core.main.extensions.target +import app.aaps.core.utils.MidnightUtils import dagger.android.HasAndroidInjector -import info.nightscout.core.utils.MidnightUtils import info.nightscout.database.ValueWrapper import info.nightscout.database.impl.AppRepository import info.nightscout.plugins.aps.R diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/utils/JSONFormatter.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/utils/JSONFormatter.kt index 4b4f5c36d5..ffaa890a3d 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/utils/JSONFormatter.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/utils/JSONFormatter.kt @@ -2,7 +2,7 @@ package info.nightscout.plugins.aps.utils import android.text.Spanned import app.aaps.core.interfaces.logging.AAPSLogger -import info.nightscout.core.utils.HtmlHelper +import app.aaps.core.utils.HtmlHelper import org.json.JSONArray import org.json.JSONException import org.json.JSONObject diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneCore.kt b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneCore.kt index 5ec25bf513..dd0b4c2937 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneCore.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneCore.kt @@ -2,7 +2,7 @@ package info.nightscout.plugins.general.autotune import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.Round -import info.nightscout.core.utils.Percentile +import app.aaps.core.utils.Percentile import info.nightscout.plugins.general.autotune.data.ATProfile import info.nightscout.plugins.general.autotune.data.LocalInsulin import info.nightscout.plugins.general.autotune.data.PreppedGlucose diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneIob.kt b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneIob.kt index 077145f6f5..4f2836dc14 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneIob.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneIob.kt @@ -1,10 +1,5 @@ package info.nightscout.plugins.general.autotune -import app.aaps.core.main.extensions.convertedToAbsolute -import app.aaps.core.main.extensions.durationInMinutes -import app.aaps.core.main.extensions.toJson -import app.aaps.core.main.extensions.toTemporaryBasal -import app.aaps.core.main.iob.round import app.aaps.core.interfaces.configuration.Constants import app.aaps.core.interfaces.iob.Iob import app.aaps.core.interfaces.iob.IobTotal @@ -16,7 +11,12 @@ import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.Round import app.aaps.core.interfaces.utils.T -import info.nightscout.core.utils.MidnightUtils +import app.aaps.core.main.extensions.convertedToAbsolute +import app.aaps.core.main.extensions.durationInMinutes +import app.aaps.core.main.extensions.toJson +import app.aaps.core.main.extensions.toTemporaryBasal +import app.aaps.core.main.iob.round +import app.aaps.core.utils.MidnightUtils import info.nightscout.database.entities.Bolus import info.nightscout.database.entities.Carbs import info.nightscout.database.entities.ExtendedBolus diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotunePlugin.kt b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotunePlugin.kt index df88bb120c..02324e0f88 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotunePlugin.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotunePlugin.kt @@ -3,8 +3,6 @@ package info.nightscout.plugins.general.autotune import android.view.View -import app.aaps.core.main.extensions.pureProfileFromJson -import app.aaps.core.main.profile.ProfileSealed import app.aaps.core.interfaces.autotune.Autotune import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.insulin.Insulin @@ -25,9 +23,11 @@ import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.MidnightTime import app.aaps.core.interfaces.utils.T -import dagger.android.HasAndroidInjector +import app.aaps.core.main.extensions.pureProfileFromJson +import app.aaps.core.main.profile.ProfileSealed import app.aaps.core.ui.elements.WeekDay -import info.nightscout.core.utils.JsonHelper +import app.aaps.core.utils.JsonHelper +import dagger.android.HasAndroidInjector import info.nightscout.database.entities.UserEntry import info.nightscout.database.entities.ValueWithUnit import info.nightscout.plugins.aps.R diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/data/ATProfile.kt b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/data/ATProfile.kt index aa027333c7..a929ce73cb 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/data/ATProfile.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/data/ATProfile.kt @@ -1,8 +1,5 @@ package info.nightscout.plugins.general.autotune.data -import app.aaps.core.main.extensions.blockValueBySeconds -import app.aaps.core.main.extensions.pureProfileFromJson -import app.aaps.core.main.profile.ProfileSealed import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.db.GlucoseUnit import app.aaps.core.interfaces.insulin.Insulin @@ -21,8 +18,11 @@ import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.Round import app.aaps.core.interfaces.utils.SafeParse import app.aaps.core.interfaces.utils.T +import app.aaps.core.main.extensions.blockValueBySeconds +import app.aaps.core.main.extensions.pureProfileFromJson +import app.aaps.core.main.profile.ProfileSealed +import app.aaps.core.utils.MidnightUtils import dagger.android.HasAndroidInjector -import info.nightscout.core.utils.MidnightUtils import info.nightscout.database.entities.data.Block import org.json.JSONArray import org.json.JSONException diff --git a/plugins/aps/src/test/java/info/nightscout/plugins/general/autotune/AutotuneCoreTest.kt b/plugins/aps/src/test/java/info/nightscout/plugins/general/autotune/AutotuneCoreTest.kt index 6eac239ed1..a8855e6364 100644 --- a/plugins/aps/src/test/java/info/nightscout/plugins/general/autotune/AutotuneCoreTest.kt +++ b/plugins/aps/src/test/java/info/nightscout/plugins/general/autotune/AutotuneCoreTest.kt @@ -1,13 +1,13 @@ package info.nightscout.plugins.general.autotune -import app.aaps.core.main.profile.ProfileSealed import app.aaps.core.interfaces.db.GlucoseUnit import app.aaps.core.interfaces.profile.PureProfile import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T +import app.aaps.core.main.profile.ProfileSealed +import app.aaps.core.utils.JsonHelper import app.aaps.shared.tests.TestBaseWithProfile import com.google.common.truth.Truth.assertThat -import info.nightscout.core.utils.JsonHelper import info.nightscout.database.entities.data.Block import info.nightscout.database.entities.data.TargetBlock import info.nightscout.plugins.general.autotune.data.ATProfile diff --git a/plugins/aps/src/test/java/info/nightscout/plugins/general/autotune/AutotunePrepTest.kt b/plugins/aps/src/test/java/info/nightscout/plugins/general/autotune/AutotunePrepTest.kt index da14009915..3bf5eda939 100644 --- a/plugins/aps/src/test/java/info/nightscout/plugins/general/autotune/AutotunePrepTest.kt +++ b/plugins/aps/src/test/java/info/nightscout/plugins/general/autotune/AutotunePrepTest.kt @@ -1,7 +1,5 @@ package info.nightscout.plugins.general.autotune -import app.aaps.core.main.extensions.shiftBlock -import app.aaps.core.main.profile.ProfileSealed import app.aaps.core.interfaces.db.GlucoseUnit import app.aaps.core.interfaces.iob.IobTotal import app.aaps.core.interfaces.logging.AAPSLogger @@ -10,9 +8,11 @@ import app.aaps.core.interfaces.profile.PureProfile import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T +import app.aaps.core.main.extensions.shiftBlock +import app.aaps.core.main.profile.ProfileSealed +import app.aaps.core.utils.JsonHelper import app.aaps.shared.tests.TestBaseWithProfile import com.google.common.truth.Truth.assertThat -import info.nightscout.core.utils.JsonHelper import info.nightscout.database.entities.Bolus import info.nightscout.database.entities.Carbs import info.nightscout.database.entities.GlucoseValue diff --git a/plugins/automation/src/main/java/info/nightscout/automation/AutomationFragment.kt b/plugins/automation/src/main/java/info/nightscout/automation/AutomationFragment.kt index 263bba3282..069d36ca8c 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/AutomationFragment.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/AutomationFragment.kt @@ -22,13 +22,18 @@ import androidx.lifecycle.Lifecycle import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import app.aaps.core.main.utils.ActionModeHelper -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.extensions.toVisibility import app.aaps.core.interfaces.logging.UserEntryLogger import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.rx.AapsSchedulers import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.main.utils.ActionModeHelper +import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.ui.dialogs.OKDialog +import app.aaps.core.ui.dragHelpers.ItemTouchHelperAdapter +import app.aaps.core.ui.dragHelpers.OnStartDragListener +import app.aaps.core.ui.dragHelpers.SimpleItemTouchHelperCallback +import app.aaps.core.utils.HtmlHelper import dagger.android.HasAndroidInjector import dagger.android.support.DaggerFragment import info.nightscout.automation.databinding.AutomationEventItemBinding @@ -37,11 +42,6 @@ import info.nightscout.automation.dialogs.EditEventDialog import info.nightscout.automation.events.EventAutomationDataChanged import info.nightscout.automation.events.EventAutomationUpdateGui import info.nightscout.automation.triggers.TriggerConnector -import app.aaps.core.ui.dialogs.OKDialog -import app.aaps.core.ui.dragHelpers.ItemTouchHelperAdapter -import app.aaps.core.ui.dragHelpers.OnStartDragListener -import app.aaps.core.ui.dragHelpers.SimpleItemTouchHelperCallback -import info.nightscout.core.utils.HtmlHelper import info.nightscout.database.entities.UserEntry.Action import info.nightscout.database.entities.UserEntry.Sources import io.reactivex.rxjava3.disposables.CompositeDisposable diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionAlarm.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionAlarm.kt index 53b2d8d1c0..0149e24193 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionAlarm.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionAlarm.kt @@ -8,13 +8,13 @@ import app.aaps.core.interfaces.pump.PumpEnactResult import app.aaps.core.interfaces.queue.Callback import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.utils.JsonHelper import dagger.android.HasAndroidInjector import info.nightscout.automation.R import info.nightscout.automation.elements.InputString import info.nightscout.automation.elements.LabelWithElement import info.nightscout.automation.elements.LayoutBuilder import info.nightscout.automation.ui.TimerUtil -import info.nightscout.core.utils.JsonHelper import org.json.JSONObject import javax.inject.Inject diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionCarePortalEvent.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionCarePortalEvent.kt index ce4a6072b9..17b28ecec0 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionCarePortalEvent.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionCarePortalEvent.kt @@ -2,7 +2,6 @@ package info.nightscout.automation.actions import android.widget.LinearLayout import androidx.annotation.DrawableRes -import app.aaps.core.main.extensions.fromConstant import app.aaps.core.interfaces.iob.GlucoseStatusProvider import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.logging.UserEntryLogger @@ -11,13 +10,14 @@ import app.aaps.core.interfaces.queue.Callback import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T +import app.aaps.core.main.extensions.fromConstant +import app.aaps.core.utils.JsonHelper import dagger.android.HasAndroidInjector import info.nightscout.automation.elements.InputCarePortalMenu import info.nightscout.automation.elements.InputDuration import info.nightscout.automation.elements.InputString import info.nightscout.automation.elements.LabelWithElement import info.nightscout.automation.elements.LayoutBuilder -import info.nightscout.core.utils.JsonHelper import info.nightscout.database.entities.TherapyEvent import info.nightscout.database.entities.UserEntry import info.nightscout.database.entities.ValueWithUnit diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopSuspend.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopSuspend.kt index 4f2d292d4a..fe4de6d8f5 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopSuspend.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopSuspend.kt @@ -8,12 +8,12 @@ import app.aaps.core.interfaces.pump.PumpEnactResult import app.aaps.core.interfaces.queue.Callback import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.events.EventRefreshOverview +import app.aaps.core.utils.JsonHelper import dagger.android.HasAndroidInjector import info.nightscout.automation.R import info.nightscout.automation.elements.InputDuration import info.nightscout.automation.elements.LabelWithElement import info.nightscout.automation.elements.LayoutBuilder -import info.nightscout.core.utils.JsonHelper import info.nightscout.database.entities.UserEntry import info.nightscout.database.entities.UserEntry.Sources import info.nightscout.database.entities.ValueWithUnit diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionNotification.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionNotification.kt index ca8e61f619..c75bea5bf0 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionNotification.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionNotification.kt @@ -2,18 +2,18 @@ package info.nightscout.automation.actions import android.widget.LinearLayout import androidx.annotation.DrawableRes -import app.aaps.core.main.events.EventNewNotification import app.aaps.core.interfaces.notifications.NotificationUserMessage import app.aaps.core.interfaces.pump.PumpEnactResult import app.aaps.core.interfaces.queue.Callback import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.events.EventRefreshOverview +import app.aaps.core.main.events.EventNewNotification +import app.aaps.core.utils.JsonHelper import dagger.android.HasAndroidInjector import info.nightscout.automation.R import info.nightscout.automation.elements.InputString import info.nightscout.automation.elements.LabelWithElement import info.nightscout.automation.elements.LayoutBuilder -import info.nightscout.core.utils.JsonHelper import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.transactions.InsertTherapyEventAnnouncementTransaction import io.reactivex.rxjava3.disposables.CompositeDisposable diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionProfileSwitch.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionProfileSwitch.kt index 017df8c0da..6383ef0eb7 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionProfileSwitch.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionProfileSwitch.kt @@ -9,12 +9,12 @@ import app.aaps.core.interfaces.profile.ProfileFunction import app.aaps.core.interfaces.pump.PumpEnactResult import app.aaps.core.interfaces.queue.Callback import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.utils.JsonHelper import dagger.android.HasAndroidInjector import info.nightscout.automation.R import info.nightscout.automation.elements.InputProfileName import info.nightscout.automation.elements.LabelWithElement import info.nightscout.automation.elements.LayoutBuilder -import info.nightscout.core.utils.JsonHelper import info.nightscout.database.entities.UserEntry import info.nightscout.database.entities.UserEntry.Sources import info.nightscout.database.entities.ValueWithUnit diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionProfileSwitchPercent.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionProfileSwitchPercent.kt index 5c007f3bef..61357b3326 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionProfileSwitchPercent.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionProfileSwitchPercent.kt @@ -7,6 +7,7 @@ import app.aaps.core.interfaces.logging.UserEntryLogger import app.aaps.core.interfaces.profile.ProfileFunction import app.aaps.core.interfaces.pump.PumpEnactResult import app.aaps.core.interfaces.queue.Callback +import app.aaps.core.utils.JsonHelper import dagger.android.HasAndroidInjector import info.nightscout.automation.R import info.nightscout.automation.elements.Comparator @@ -15,7 +16,6 @@ import info.nightscout.automation.elements.InputPercent import info.nightscout.automation.elements.LabelWithElement import info.nightscout.automation.elements.LayoutBuilder import info.nightscout.automation.triggers.TriggerProfilePercent -import info.nightscout.core.utils.JsonHelper import info.nightscout.database.entities.UserEntry import info.nightscout.database.entities.UserEntry.Sources import info.nightscout.database.entities.ValueWithUnit diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionRunAutotune.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionRunAutotune.kt index 2744b72f21..88b533204e 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionRunAutotune.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionRunAutotune.kt @@ -10,14 +10,14 @@ import app.aaps.core.interfaces.pump.PumpEnactResult import app.aaps.core.interfaces.queue.Callback import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.ui.elements.WeekDay +import app.aaps.core.utils.JsonHelper import dagger.android.HasAndroidInjector import info.nightscout.automation.elements.InputDuration import info.nightscout.automation.elements.InputProfileName import info.nightscout.automation.elements.InputWeekDay import info.nightscout.automation.elements.LabelWithElement import info.nightscout.automation.elements.LayoutBuilder -import app.aaps.core.ui.elements.WeekDay -import info.nightscout.core.utils.JsonHelper import org.json.JSONObject import javax.inject.Inject diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionSendSMS.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionSendSMS.kt index 119344132a..b739a900d0 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionSendSMS.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionSendSMS.kt @@ -4,12 +4,12 @@ import android.widget.LinearLayout import app.aaps.core.interfaces.pump.PumpEnactResult import app.aaps.core.interfaces.queue.Callback import app.aaps.core.interfaces.smsCommunicator.SmsCommunicator +import app.aaps.core.utils.JsonHelper import dagger.android.HasAndroidInjector import info.nightscout.automation.R import info.nightscout.automation.elements.InputString import info.nightscout.automation.elements.LabelWithElement import info.nightscout.automation.elements.LayoutBuilder -import info.nightscout.core.utils.JsonHelper import org.json.JSONObject import javax.inject.Inject diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionStartTempTarget.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionStartTempTarget.kt index ead5ec8f66..0d86a1468e 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionStartTempTarget.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionStartTempTarget.kt @@ -2,7 +2,6 @@ package info.nightscout.automation.actions import android.widget.LinearLayout import androidx.annotation.DrawableRes -import app.aaps.core.main.extensions.friendlyDescription import app.aaps.core.interfaces.configuration.Constants import app.aaps.core.interfaces.db.GlucoseUnit import app.aaps.core.interfaces.logging.LTag @@ -13,6 +12,9 @@ import app.aaps.core.interfaces.profile.ProfileUtil import app.aaps.core.interfaces.pump.PumpEnactResult import app.aaps.core.interfaces.queue.Callback import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.main.extensions.friendlyDescription +import app.aaps.core.utils.JsonHelper +import app.aaps.core.utils.JsonHelper.safeGetDouble import dagger.android.HasAndroidInjector import info.nightscout.automation.R import info.nightscout.automation.elements.ComparatorExists @@ -21,8 +23,6 @@ import info.nightscout.automation.elements.InputTempTarget import info.nightscout.automation.elements.LabelWithElement import info.nightscout.automation.elements.LayoutBuilder import info.nightscout.automation.triggers.TriggerTempTarget -import info.nightscout.core.utils.JsonHelper -import info.nightscout.core.utils.JsonHelper.safeGetDouble import info.nightscout.database.entities.TemporaryTarget import info.nightscout.database.entities.UserEntry import info.nightscout.database.entities.UserEntry.Sources diff --git a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputTime.kt b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputTime.kt index 30d79bfa96..56555e3702 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputTime.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputTime.kt @@ -12,10 +12,10 @@ import androidx.fragment.app.FragmentManager import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.MidnightTime +import app.aaps.core.utils.MidnightUtils import com.google.android.material.timepicker.MaterialTimePicker import com.google.android.material.timepicker.TimeFormat import info.nightscout.automation.R -import info.nightscout.core.utils.MidnightUtils import java.util.Calendar class InputTime(private val rh: ResourceHelper, private val dateUtil: DateUtil) : Element { diff --git a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputTimeRange.kt b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputTimeRange.kt index 72e8938cd5..710abfd84d 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputTimeRange.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputTimeRange.kt @@ -13,10 +13,10 @@ import androidx.fragment.app.FragmentManager import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.MidnightTime +import app.aaps.core.utils.MidnightUtils import com.google.android.material.timepicker.MaterialTimePicker import com.google.android.material.timepicker.TimeFormat import info.nightscout.automation.R -import info.nightscout.core.utils.MidnightUtils import java.util.Calendar class InputTimeRange(private val rh: ResourceHelper, private val dateUtil: DateUtil) : Element { diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerAutosensValue.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerAutosensValue.kt index 6de6e9455d..7ba02c9d1e 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerAutosensValue.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerAutosensValue.kt @@ -2,6 +2,8 @@ package info.nightscout.automation.triggers import android.widget.LinearLayout import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.utils.JsonHelper.safeGetDouble +import app.aaps.core.utils.JsonHelper.safeGetString import com.google.common.base.Optional import dagger.android.HasAndroidInjector import info.nightscout.automation.R @@ -10,8 +12,6 @@ import info.nightscout.automation.elements.InputDouble import info.nightscout.automation.elements.LabelWithElement import info.nightscout.automation.elements.LayoutBuilder import info.nightscout.automation.elements.StaticLabel -import info.nightscout.core.utils.JsonHelper.safeGetDouble -import info.nightscout.core.utils.JsonHelper.safeGetString import org.json.JSONObject import java.text.DecimalFormat diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBTDevice.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBTDevice.kt index 4835e22c62..865b634382 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBTDevice.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBTDevice.kt @@ -9,6 +9,8 @@ import android.widget.LinearLayout import androidx.core.app.ActivityCompat import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.rx.events.EventBTChange +import app.aaps.core.ui.toast.ToastUtils +import app.aaps.core.utils.JsonHelper import com.google.common.base.Optional import dagger.android.HasAndroidInjector import info.nightscout.automation.AutomationPlugin @@ -17,8 +19,6 @@ import info.nightscout.automation.elements.ComparatorConnect import info.nightscout.automation.elements.InputDropdownMenu import info.nightscout.automation.elements.LayoutBuilder import info.nightscout.automation.elements.StaticLabel -import app.aaps.core.ui.toast.ToastUtils -import info.nightscout.core.utils.JsonHelper import org.json.JSONObject import javax.inject.Inject diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBg.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBg.kt index 18d8595ae4..3aa211ffdb 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBg.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBg.kt @@ -3,6 +3,7 @@ package info.nightscout.automation.triggers import android.widget.LinearLayout import app.aaps.core.interfaces.db.GlucoseUnit import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.utils.JsonHelper import com.google.common.base.Optional import dagger.android.HasAndroidInjector import info.nightscout.automation.R @@ -11,7 +12,6 @@ import info.nightscout.automation.elements.InputBg import info.nightscout.automation.elements.LabelWithElement import info.nightscout.automation.elements.LayoutBuilder import info.nightscout.automation.elements.StaticLabel -import info.nightscout.core.utils.JsonHelper import org.json.JSONObject class TriggerBg(injector: HasAndroidInjector) : Trigger(injector) { diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBolusAgo.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBolusAgo.kt index 08e5753528..5431c86565 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBolusAgo.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBolusAgo.kt @@ -2,6 +2,8 @@ package info.nightscout.automation.triggers import android.widget.LinearLayout import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.utils.JsonHelper +import app.aaps.core.utils.JsonHelper.safeGetString import com.google.common.base.Optional import dagger.android.HasAndroidInjector import info.nightscout.automation.R @@ -10,8 +12,6 @@ import info.nightscout.automation.elements.InputDuration import info.nightscout.automation.elements.LabelWithElement import info.nightscout.automation.elements.LayoutBuilder import info.nightscout.automation.elements.StaticLabel -import info.nightscout.core.utils.JsonHelper -import info.nightscout.core.utils.JsonHelper.safeGetString import info.nightscout.database.ValueWrapper import info.nightscout.database.entities.Bolus import org.json.JSONObject diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerCOB.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerCOB.kt index da5bd7330b..3d95afad9a 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerCOB.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerCOB.kt @@ -2,6 +2,8 @@ package info.nightscout.automation.triggers import android.widget.LinearLayout import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.utils.JsonHelper +import app.aaps.core.utils.JsonHelper.safeGetDouble import com.google.common.base.Optional import dagger.android.HasAndroidInjector import info.nightscout.automation.R @@ -10,8 +12,6 @@ import info.nightscout.automation.elements.InputDouble import info.nightscout.automation.elements.LabelWithElement import info.nightscout.automation.elements.LayoutBuilder import info.nightscout.automation.elements.StaticLabel -import info.nightscout.core.utils.JsonHelper -import info.nightscout.core.utils.JsonHelper.safeGetDouble import org.json.JSONObject import java.text.DecimalFormat diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerConnector.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerConnector.kt index 36083466ad..3a4652b651 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerConnector.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerConnector.kt @@ -9,12 +9,12 @@ import android.widget.TextView import androidx.annotation.StringRes import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.ui.elements.VerticalTextView +import app.aaps.core.utils.JsonHelper.safeGetString import com.google.common.base.Optional import dagger.android.HasAndroidInjector import info.nightscout.automation.R import info.nightscout.automation.dialogs.ChooseOperationDialog -import app.aaps.core.ui.elements.VerticalTextView -import info.nightscout.core.utils.JsonHelper.safeGetString import org.json.JSONArray import org.json.JSONObject diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerDelta.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerDelta.kt index e1e935dd3f..a53e87b431 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerDelta.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerDelta.kt @@ -3,6 +3,7 @@ package info.nightscout.automation.triggers import android.widget.LinearLayout import app.aaps.core.interfaces.db.GlucoseUnit import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.utils.JsonHelper import com.google.common.base.Optional import dagger.android.HasAndroidInjector import info.nightscout.automation.R @@ -12,7 +13,6 @@ import info.nightscout.automation.elements.InputDelta.DeltaType import info.nightscout.automation.elements.LabelWithElement import info.nightscout.automation.elements.LayoutBuilder import info.nightscout.automation.elements.StaticLabel -import info.nightscout.core.utils.JsonHelper import org.json.JSONObject import java.text.DecimalFormat diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerHeartRate.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerHeartRate.kt index 0b8977ffd2..68438e9068 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerHeartRate.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerHeartRate.kt @@ -3,6 +3,7 @@ package info.nightscout.automation.triggers import android.widget.LinearLayout import androidx.annotation.VisibleForTesting import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.utils.JsonHelper import com.google.common.base.Optional import dagger.android.HasAndroidInjector import info.nightscout.automation.R @@ -11,7 +12,6 @@ import info.nightscout.automation.elements.InputDouble import info.nightscout.automation.elements.LabelWithElement import info.nightscout.automation.elements.LayoutBuilder import info.nightscout.automation.elements.StaticLabel -import info.nightscout.core.utils.JsonHelper import org.json.JSONObject import java.text.DecimalFormat diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerIob.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerIob.kt index bd2ec8809a..122f2ea599 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerIob.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerIob.kt @@ -2,6 +2,7 @@ package info.nightscout.automation.triggers import android.widget.LinearLayout import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.utils.JsonHelper import com.google.common.base.Optional import dagger.android.HasAndroidInjector import info.nightscout.automation.R @@ -10,7 +11,6 @@ import info.nightscout.automation.elements.InputInsulin import info.nightscout.automation.elements.LabelWithElement import info.nightscout.automation.elements.LayoutBuilder import info.nightscout.automation.elements.StaticLabel -import info.nightscout.core.utils.JsonHelper import org.json.JSONObject class TriggerIob(injector: HasAndroidInjector) : Trigger(injector) { diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerLocation.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerLocation.kt index 76985acddd..204375a4e7 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerLocation.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerLocation.kt @@ -3,6 +3,7 @@ package info.nightscout.automation.triggers import android.location.Location import android.widget.LinearLayout import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.utils.JsonHelper import com.google.common.base.Optional import dagger.android.HasAndroidInjector import info.nightscout.automation.R @@ -13,7 +14,6 @@ import info.nightscout.automation.elements.InputString import info.nightscout.automation.elements.LabelWithElement import info.nightscout.automation.elements.LayoutBuilder import info.nightscout.automation.elements.StaticLabel -import info.nightscout.core.utils.JsonHelper import org.json.JSONObject import java.text.DecimalFormat diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerProfilePercent.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerProfilePercent.kt index 6ad9676e3b..8bc6bb0489 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerProfilePercent.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerProfilePercent.kt @@ -1,8 +1,9 @@ package info.nightscout.automation.triggers import android.widget.LinearLayout -import app.aaps.core.main.profile.ProfileSealed import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.main.profile.ProfileSealed +import app.aaps.core.utils.JsonHelper import com.google.common.base.Optional import dagger.android.HasAndroidInjector import info.nightscout.automation.R @@ -11,7 +12,6 @@ import info.nightscout.automation.elements.InputPercent import info.nightscout.automation.elements.LabelWithElement import info.nightscout.automation.elements.LayoutBuilder import info.nightscout.automation.elements.StaticLabel -import info.nightscout.core.utils.JsonHelper import org.json.JSONObject class TriggerProfilePercent(injector: HasAndroidInjector) : Trigger(injector) { diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerPumpLastConnection.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerPumpLastConnection.kt index 16f9555c39..ed859a4f81 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerPumpLastConnection.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerPumpLastConnection.kt @@ -2,6 +2,8 @@ package info.nightscout.automation.triggers import android.widget.LinearLayout import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.utils.JsonHelper.safeGetInt +import app.aaps.core.utils.JsonHelper.safeGetString import com.google.common.base.Optional import dagger.android.HasAndroidInjector import info.nightscout.automation.R @@ -10,8 +12,6 @@ import info.nightscout.automation.elements.InputDuration import info.nightscout.automation.elements.LabelWithElement import info.nightscout.automation.elements.LayoutBuilder import info.nightscout.automation.elements.StaticLabel -import info.nightscout.core.utils.JsonHelper.safeGetInt -import info.nightscout.core.utils.JsonHelper.safeGetString import org.json.JSONObject class TriggerPumpLastConnection(injector: HasAndroidInjector) : Trigger(injector) { diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerRecurringTime.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerRecurringTime.kt index 9a55a50caa..d7de4ab8b7 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerRecurringTime.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerRecurringTime.kt @@ -3,6 +3,9 @@ package info.nightscout.automation.triggers import android.widget.LinearLayout import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.utils.MidnightTime +import app.aaps.core.ui.elements.WeekDay +import app.aaps.core.utils.JsonHelper +import app.aaps.core.utils.MidnightUtils import com.google.common.base.Optional import dagger.android.HasAndroidInjector import info.nightscout.automation.R @@ -10,9 +13,6 @@ import info.nightscout.automation.elements.InputTime import info.nightscout.automation.elements.InputWeekDay import info.nightscout.automation.elements.LayoutBuilder import info.nightscout.automation.elements.StaticLabel -import app.aaps.core.ui.elements.WeekDay -import info.nightscout.core.utils.JsonHelper -import info.nightscout.core.utils.MidnightUtils import org.json.JSONObject import java.util.Calendar import java.util.Objects diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTempTarget.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTempTarget.kt index da0158a593..0ee60d9f3e 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTempTarget.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTempTarget.kt @@ -2,13 +2,13 @@ package info.nightscout.automation.triggers import android.widget.LinearLayout import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.utils.JsonHelper import com.google.common.base.Optional import dagger.android.HasAndroidInjector import info.nightscout.automation.R import info.nightscout.automation.elements.ComparatorExists import info.nightscout.automation.elements.LayoutBuilder import info.nightscout.automation.elements.StaticLabel -import info.nightscout.core.utils.JsonHelper import info.nightscout.database.ValueWrapper import org.json.JSONObject diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTempTargetValue.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTempTargetValue.kt index 11fa0f3b84..1de5632db2 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTempTargetValue.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTempTargetValue.kt @@ -3,6 +3,7 @@ package info.nightscout.automation.triggers import android.widget.LinearLayout import app.aaps.core.interfaces.db.GlucoseUnit import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.utils.JsonHelper import com.google.common.base.Optional import dagger.android.HasAndroidInjector import info.nightscout.automation.R @@ -11,7 +12,6 @@ import info.nightscout.automation.elements.InputBg import info.nightscout.automation.elements.LabelWithElement import info.nightscout.automation.elements.LayoutBuilder import info.nightscout.automation.elements.StaticLabel -import info.nightscout.core.utils.JsonHelper import info.nightscout.database.ValueWrapper import org.json.JSONObject diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTime.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTime.kt index 0f27408e09..4bd196bfcc 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTime.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTime.kt @@ -3,13 +3,13 @@ package info.nightscout.automation.triggers import android.widget.LinearLayout import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.utils.T +import app.aaps.core.utils.JsonHelper import com.google.common.base.Optional import dagger.android.HasAndroidInjector import info.nightscout.automation.R import info.nightscout.automation.elements.InputDateTime import info.nightscout.automation.elements.LayoutBuilder import info.nightscout.automation.elements.StaticLabel -import info.nightscout.core.utils.JsonHelper import org.json.JSONObject class TriggerTime(injector: HasAndroidInjector) : Trigger(injector) { diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTimeRange.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTimeRange.kt index cb998cb8d1..8df60ca761 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTimeRange.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTimeRange.kt @@ -3,14 +3,14 @@ package info.nightscout.automation.triggers import android.widget.LinearLayout import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.utils.MidnightTime +import app.aaps.core.utils.JsonHelper.safeGetInt +import app.aaps.core.utils.MidnightUtils import com.google.common.base.Optional import dagger.android.HasAndroidInjector import info.nightscout.automation.R import info.nightscout.automation.elements.InputTimeRange import info.nightscout.automation.elements.LayoutBuilder import info.nightscout.automation.elements.StaticLabel -import info.nightscout.core.utils.JsonHelper.safeGetInt -import info.nightscout.core.utils.MidnightUtils import org.json.JSONObject // Trigger for time range ( from 10:00AM till 13:00PM ) 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 a5a9bc23e2..df7730dd7a 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,6 +3,7 @@ package info.nightscout.automation.triggers import android.widget.LinearLayout import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.receivers.ReceiverStatusStore +import app.aaps.core.utils.JsonHelper import com.google.common.base.Optional import dagger.android.HasAndroidInjector import info.nightscout.automation.R @@ -11,7 +12,6 @@ import info.nightscout.automation.elements.InputString import info.nightscout.automation.elements.LabelWithElement import info.nightscout.automation.elements.LayoutBuilder import info.nightscout.automation.elements.StaticLabel -import info.nightscout.core.utils.JsonHelper import org.json.JSONObject import javax.inject.Inject diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/MaintenanceFragment.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/MaintenanceFragment.kt index 1eea59411d..ab762e9bc2 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/MaintenanceFragment.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/MaintenanceFragment.kt @@ -9,8 +9,6 @@ import androidx.core.text.toSpanned import app.aaps.configuration.R import app.aaps.configuration.databinding.MaintenanceFragmentBinding import app.aaps.configuration.maintenance.activities.LogSettingActivity -import app.aaps.core.main.graph.OverviewData -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.db.PersistenceLayer import app.aaps.core.interfaces.extensions.runOnUiThread import app.aaps.core.interfaces.extensions.toVisibility @@ -30,9 +28,11 @@ import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.events.EventPreferenceChange import app.aaps.core.interfaces.sync.DataSyncSelectorXdrip import app.aaps.core.interfaces.ui.UiInteraction -import dagger.android.support.DaggerFragment +import app.aaps.core.main.graph.OverviewData +import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.ui.dialogs.OKDialog -import info.nightscout.core.utils.HtmlHelper +import app.aaps.core.utils.HtmlHelper +import dagger.android.support.DaggerFragment import info.nightscout.database.entities.UserEntry.Action import info.nightscout.database.entities.UserEntry.Sources import io.reactivex.rxjava3.core.Completable diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/PrefsFileContract.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/PrefsFileContract.kt index 3c75c31fd3..7875727f92 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/PrefsFileContract.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/PrefsFileContract.kt @@ -6,7 +6,7 @@ import androidx.activity.result.contract.ActivityResultContract import androidx.fragment.app.FragmentActivity import app.aaps.configuration.maintenance.activities.PrefImportListActivity import app.aaps.core.interfaces.maintenance.PrefsFile -import info.nightscout.core.utils.extensions.safeGetParcelableExtra +import app.aaps.core.utils.extensions.safeGetParcelableExtra class PrefsFileContract : ActivityResultContract() { diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/formats/EncryptedPrefsFormat.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/formats/EncryptedPrefsFormat.kt index 02838af979..349c66851e 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/formats/EncryptedPrefsFormat.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/formats/EncryptedPrefsFormat.kt @@ -9,14 +9,14 @@ import app.aaps.configuration.maintenance.data.PrefMetadataMap import app.aaps.configuration.maintenance.data.Prefs import app.aaps.configuration.maintenance.data.PrefsFormat import app.aaps.configuration.maintenance.data.PrefsStatusImpl -import app.aaps.core.main.utils.CryptoUtil import app.aaps.core.interfaces.maintenance.PrefMetadata import app.aaps.core.interfaces.maintenance.PrefsMetadataKey import app.aaps.core.interfaces.maintenance.PrefsStatus import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.storage.Storage -import info.nightscout.core.utils.hexStringToByteArray -import info.nightscout.core.utils.toHex +import app.aaps.core.main.utils.CryptoUtil +import app.aaps.core.utils.hexStringToByteArray +import app.aaps.core.utils.toHex import org.json.JSONException import org.json.JSONObject import java.io.File diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/SWDefinition.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/SWDefinition.kt index 4274566236..30a527c051 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/SWDefinition.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/SWDefinition.kt @@ -20,8 +20,6 @@ import app.aaps.configuration.setupwizard.elements.SWInfoText import app.aaps.configuration.setupwizard.elements.SWPlugin import app.aaps.configuration.setupwizard.elements.SWPreference import app.aaps.configuration.setupwizard.elements.SWRadioButton -import app.aaps.core.main.profile.ProfileSealed -import app.aaps.core.main.utils.CryptoUtil import app.aaps.core.interfaces.androidPermissions.AndroidPermission import app.aaps.core.interfaces.aps.Loop import app.aaps.core.interfaces.configuration.Config @@ -46,8 +44,10 @@ import app.aaps.core.interfaces.rx.events.EventSWUpdate import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.HardLimits +import app.aaps.core.main.profile.ProfileSealed +import app.aaps.core.main.utils.CryptoUtil +import app.aaps.core.utils.isRunningTest import dagger.android.HasAndroidInjector -import info.nightscout.core.utils.isRunningTest import javax.inject.Inject import javax.inject.Singleton diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesFragment.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesFragment.kt index 6935bfbb07..8832e63116 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesFragment.kt +++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesFragment.kt @@ -16,7 +16,6 @@ import androidx.appcompat.app.AppCompatActivity import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearSmoothScroller import androidx.recyclerview.widget.RecyclerView -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.UserEntryLogger import app.aaps.core.interfaces.receivers.ReceiverStatusStore @@ -27,9 +26,10 @@ import app.aaps.core.interfaces.rx.events.EventNtpStatus import app.aaps.core.interfaces.rx.events.EventSWUpdate import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.DateUtil -import dagger.android.support.DaggerFragment +import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.ui.dialogs.OKDialog -import info.nightscout.core.utils.HtmlHelper +import app.aaps.core.utils.HtmlHelper +import dagger.android.support.DaggerFragment import info.nightscout.database.entities.UserEntry.Action import info.nightscout.database.entities.UserEntry.Sources import info.nightscout.database.entities.ValueWithUnit diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewFragment.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewFragment.kt index 349a7055ce..9586511d95 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewFragment.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewFragment.kt @@ -24,13 +24,6 @@ import android.widget.RelativeLayout import android.widget.TextView import androidx.core.text.toSpanned import androidx.recyclerview.widget.LinearLayoutManager -import app.aaps.core.main.constraints.ConstraintObject -import app.aaps.core.main.extensions.directionToIcon -import app.aaps.core.main.graph.OverviewData -import app.aaps.core.main.iob.displayText -import app.aaps.core.main.profile.ProfileSealed -import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.core.main.wizard.QuickWizard import app.aaps.core.interfaces.aps.Loop import app.aaps.core.interfaces.aps.VariableSensitivityResult import app.aaps.core.interfaces.automation.Automation @@ -83,14 +76,21 @@ import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.TrendCalculator -import com.jjoe64.graphview.GraphView -import dagger.android.HasAndroidInjector -import dagger.android.support.DaggerFragment +import app.aaps.core.main.constraints.ConstraintObject +import app.aaps.core.main.extensions.directionToIcon +import app.aaps.core.main.graph.OverviewData +import app.aaps.core.main.iob.displayText +import app.aaps.core.main.profile.ProfileSealed +import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.main.wizard.QuickWizard import app.aaps.core.ui.UIRunnable import app.aaps.core.ui.dialogs.OKDialog import app.aaps.core.ui.elements.SingleClickButton import app.aaps.core.ui.toast.ToastUtils -import info.nightscout.core.utils.JsonHelper +import app.aaps.core.utils.JsonHelper +import com.jjoe64.graphview.GraphView +import dagger.android.HasAndroidInjector +import dagger.android.support.DaggerFragment import info.nightscout.database.entities.UserEntry.Action import info.nightscout.database.entities.UserEntry.Sources import info.nightscout.database.entities.interfaces.end diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorFragment.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorFragment.kt index 9ddeaadf8c..78725b5c57 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorFragment.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorFragment.kt @@ -4,14 +4,14 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.rx.AapsSchedulers import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.smsCommunicator.Sms import app.aaps.core.interfaces.smsCommunicator.SmsCommunicator import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.utils.HtmlHelper import dagger.android.support.DaggerFragment -import info.nightscout.core.utils.HtmlHelper import info.nightscout.plugins.databinding.SmscommunicatorFragmentBinding import info.nightscout.plugins.general.smsCommunicator.events.EventSmsCommunicatorUpdateGui import io.reactivex.rxjava3.disposables.CompositeDisposable 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 8194d67478..13625c1862 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 @@ -10,12 +10,6 @@ import androidx.preference.PreferenceFragmentCompat import androidx.work.WorkerParameters import androidx.work.workDataOf import app.aaps.annotations.OpenForTesting -import app.aaps.core.main.constraints.ConstraintObject -import app.aaps.core.main.events.EventNewNotification -import app.aaps.core.main.iob.generateCOBString -import app.aaps.core.main.iob.round -import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.core.main.utils.worker.LoggingWorker import app.aaps.core.interfaces.aps.ApsMode import app.aaps.core.interfaces.aps.Loop import app.aaps.core.interfaces.configuration.Config @@ -52,8 +46,14 @@ import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.SafeParse import app.aaps.core.interfaces.utils.T +import app.aaps.core.main.constraints.ConstraintObject +import app.aaps.core.main.events.EventNewNotification +import app.aaps.core.main.iob.generateCOBString +import app.aaps.core.main.iob.round +import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.main.utils.worker.LoggingWorker +import app.aaps.core.utils.receivers.DataWorkerStorage import dagger.android.HasAndroidInjector -import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.core.validators.ValidatingEditTextPreference import info.nightscout.database.entities.OfflineEvent import info.nightscout.database.entities.TemporaryTarget 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 56618be07a..3001e76bad 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 @@ -2,9 +2,6 @@ package info.nightscout.plugins.profile import androidx.fragment.app.FragmentActivity import app.aaps.annotations.OpenForTesting -import app.aaps.core.main.extensions.blockFromJsonArray -import app.aaps.core.main.extensions.pureProfileFromJson -import app.aaps.core.main.profile.ProfileSealed import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.configuration.Constants import app.aaps.core.interfaces.db.GlucoseUnit @@ -30,10 +27,13 @@ import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.HardLimits -import dagger.android.HasAndroidInjector +import app.aaps.core.main.extensions.blockFromJsonArray +import app.aaps.core.main.extensions.pureProfileFromJson +import app.aaps.core.main.profile.ProfileSealed import app.aaps.core.ui.dialogs.OKDialog import app.aaps.core.ui.toast.ToastUtils -import info.nightscout.core.utils.JsonHelper +import app.aaps.core.utils.JsonHelper +import dagger.android.HasAndroidInjector import info.nightscout.plugins.R import org.json.JSONArray import org.json.JSONException diff --git a/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityAAPSPlugin.kt b/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityAAPSPlugin.kt index caa3709692..b683c2bdaa 100644 --- a/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityAAPSPlugin.kt +++ b/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityAAPSPlugin.kt @@ -13,9 +13,9 @@ import app.aaps.core.interfaces.profile.ProfileFunction import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.utils.MidnightUtils +import app.aaps.core.utils.Percentile import dagger.android.HasAndroidInjector -import info.nightscout.core.utils.MidnightUtils -import info.nightscout.core.utils.Percentile import info.nightscout.database.entities.TherapyEvent import info.nightscout.database.impl.AppRepository import info.nightscout.sensitivity.extensions.isPSEvent5minBack diff --git a/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityOref1Plugin.kt b/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityOref1Plugin.kt index ac4d076a7a..53e5e66190 100644 --- a/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityOref1Plugin.kt +++ b/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityOref1Plugin.kt @@ -16,9 +16,9 @@ import app.aaps.core.interfaces.profile.ProfileFunction import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.utils.MidnightUtils +import app.aaps.core.utils.Percentile import dagger.android.HasAndroidInjector -import info.nightscout.core.utils.MidnightUtils -import info.nightscout.core.utils.Percentile import info.nightscout.database.entities.TherapyEvent import info.nightscout.database.impl.AppRepository import info.nightscout.sensitivity.extensions.isPSEvent5minBack diff --git a/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityWeightedAveragePlugin.kt b/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityWeightedAveragePlugin.kt index f275d58e6b..c5e1706617 100644 --- a/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityWeightedAveragePlugin.kt +++ b/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityWeightedAveragePlugin.kt @@ -14,8 +14,8 @@ import app.aaps.core.interfaces.profile.ProfileFunction import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.utils.MidnightUtils import dagger.android.HasAndroidInjector -import info.nightscout.core.utils.MidnightUtils import info.nightscout.database.entities.TherapyEvent import info.nightscout.database.impl.AppRepository import info.nightscout.sensitivity.extensions.isPSEvent5minBack diff --git a/plugins/source/src/main/java/info/nightscout/source/AidexPlugin.kt b/plugins/source/src/main/java/info/nightscout/source/AidexPlugin.kt index 13835d0dc2..9a60436d48 100644 --- a/plugins/source/src/main/java/info/nightscout/source/AidexPlugin.kt +++ b/plugins/source/src/main/java/info/nightscout/source/AidexPlugin.kt @@ -3,7 +3,6 @@ package info.nightscout.source import android.content.Context import androidx.work.WorkerParameters import androidx.work.workDataOf -import app.aaps.core.main.utils.worker.LoggingWorker import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.configuration.Constants import app.aaps.core.interfaces.logging.AAPSLogger @@ -14,8 +13,9 @@ import app.aaps.core.interfaces.plugin.PluginType import app.aaps.core.interfaces.receivers.Intents import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.source.BgSource +import app.aaps.core.main.utils.worker.LoggingWorker +import app.aaps.core.utils.receivers.DataWorkerStorage import dagger.android.HasAndroidInjector -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/source/src/main/java/info/nightscout/source/DexcomPlugin.kt b/plugins/source/src/main/java/info/nightscout/source/DexcomPlugin.kt index bc2d477a7d..1c17d2d400 100644 --- a/plugins/source/src/main/java/info/nightscout/source/DexcomPlugin.kt +++ b/plugins/source/src/main/java/info/nightscout/source/DexcomPlugin.kt @@ -6,8 +6,6 @@ import android.content.pm.PackageManager import androidx.core.content.ContextCompat import androidx.work.WorkerParameters import androidx.work.workDataOf -import app.aaps.core.main.extensions.fromConstant -import app.aaps.core.main.utils.worker.LoggingWorker import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag @@ -22,9 +20,11 @@ import app.aaps.core.interfaces.source.BgSource import app.aaps.core.interfaces.source.DexcomBoyda import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T +import app.aaps.core.main.extensions.fromConstant +import app.aaps.core.main.utils.worker.LoggingWorker +import app.aaps.core.utils.receivers.DataWorkerStorage import app.aaps.shared.impl.extensions.safeGetInstalledPackages import dagger.android.HasAndroidInjector -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/source/src/main/java/info/nightscout/source/EversensePlugin.kt b/plugins/source/src/main/java/info/nightscout/source/EversensePlugin.kt index a529fc5e7f..0c10879fe0 100644 --- a/plugins/source/src/main/java/info/nightscout/source/EversensePlugin.kt +++ b/plugins/source/src/main/java/info/nightscout/source/EversensePlugin.kt @@ -3,7 +3,6 @@ package info.nightscout.source import android.content.Context import androidx.work.WorkerParameters import androidx.work.workDataOf -import app.aaps.core.main.utils.worker.LoggingWorker import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.plugin.PluginBase @@ -12,8 +11,9 @@ import app.aaps.core.interfaces.plugin.PluginType import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.source.BgSource import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.main.utils.worker.LoggingWorker +import app.aaps.core.utils.receivers.DataWorkerStorage import dagger.android.HasAndroidInjector -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/source/src/main/java/info/nightscout/source/PoctechPlugin.kt b/plugins/source/src/main/java/info/nightscout/source/PoctechPlugin.kt index 0f71eeb49d..c582c5dfd6 100644 --- a/plugins/source/src/main/java/info/nightscout/source/PoctechPlugin.kt +++ b/plugins/source/src/main/java/info/nightscout/source/PoctechPlugin.kt @@ -3,7 +3,6 @@ package info.nightscout.source import android.content.Context import androidx.work.WorkerParameters import androidx.work.workDataOf -import app.aaps.core.main.utils.worker.LoggingWorker import app.aaps.core.interfaces.configuration.Constants import app.aaps.core.interfaces.db.GlucoseUnit import app.aaps.core.interfaces.logging.AAPSLogger @@ -13,8 +12,9 @@ import app.aaps.core.interfaces.plugin.PluginDescription import app.aaps.core.interfaces.plugin.PluginType import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.source.BgSource +import app.aaps.core.main.utils.worker.LoggingWorker +import app.aaps.core.utils.JsonHelper.safeGetString import dagger.android.HasAndroidInjector -import info.nightscout.core.utils.JsonHelper.safeGetString import info.nightscout.database.entities.GlucoseValue import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.transactions.CgmSourceTransaction diff --git a/plugins/source/src/main/java/info/nightscout/source/RandomBgPlugin.kt b/plugins/source/src/main/java/info/nightscout/source/RandomBgPlugin.kt index 088f225891..15873828ed 100644 --- a/plugins/source/src/main/java/info/nightscout/source/RandomBgPlugin.kt +++ b/plugins/source/src/main/java/info/nightscout/source/RandomBgPlugin.kt @@ -13,8 +13,8 @@ import app.aaps.core.interfaces.pump.VirtualPump import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.source.BgSource import app.aaps.core.interfaces.utils.T +import app.aaps.core.utils.isRunningTest import dagger.android.HasAndroidInjector -import info.nightscout.core.utils.isRunningTest import info.nightscout.database.entities.GlucoseValue import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.transactions.CgmSourceTransaction diff --git a/plugins/source/src/main/java/info/nightscout/source/XdripSourcePlugin.kt b/plugins/source/src/main/java/info/nightscout/source/XdripSourcePlugin.kt index b38481593e..e9bccf1e69 100644 --- a/plugins/source/src/main/java/info/nightscout/source/XdripSourcePlugin.kt +++ b/plugins/source/src/main/java/info/nightscout/source/XdripSourcePlugin.kt @@ -3,7 +3,6 @@ package info.nightscout.source import android.content.Context import androidx.work.WorkerParameters import androidx.work.workDataOf -import app.aaps.core.main.utils.worker.LoggingWorker import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.plugin.PluginBase @@ -13,8 +12,9 @@ import app.aaps.core.interfaces.receivers.Intents import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.source.BgSource import app.aaps.core.interfaces.source.XDripSource +import app.aaps.core.main.utils.worker.LoggingWorker +import app.aaps.core.utils.receivers.DataWorkerStorage import dagger.android.HasAndroidInjector -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/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NSAlarm.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NSAlarm.kt index 8ee5ddbe3f..d3b214d240 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NSAlarm.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NSAlarm.kt @@ -1,7 +1,7 @@ package info.nightscout.plugins.sync.nsShared import app.aaps.core.interfaces.nsclient.NSAlarm -import info.nightscout.core.utils.JsonHelper +import app.aaps.core.utils.JsonHelper import org.json.JSONObject class NSAlarmObject(private var data: JSONObject) : NSAlarm { diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NSClientFragment.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NSClientFragment.kt index c08b14d466..21a83fa2da 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NSClientFragment.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NSClientFragment.kt @@ -16,7 +16,6 @@ import androidx.core.view.MenuProvider import androidx.lifecycle.Lifecycle import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.db.PersistenceLayer import app.aaps.core.interfaces.logging.AAPSLogger @@ -31,9 +30,10 @@ import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.events.EventNSClientNewLog import app.aaps.core.interfaces.rx.events.EventNSClientRestart import app.aaps.core.interfaces.sharedPreferences.SP -import dagger.android.support.DaggerFragment +import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.ui.dialogs.OKDialog -import info.nightscout.core.utils.HtmlHelper +import app.aaps.core.utils.HtmlHelper +import dagger.android.support.DaggerFragment import info.nightscout.database.entities.UserEntry import info.nightscout.plugins.sync.R import info.nightscout.plugins.sync.databinding.NsClientFragmentBinding diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NSSgv.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NSSgv.kt index 6c33136fb5..15cef228eb 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NSSgv.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NSSgv.kt @@ -1,7 +1,7 @@ package info.nightscout.plugins.sync.nsShared import app.aaps.core.interfaces.nsclient.NSSgv -import info.nightscout.core.utils.JsonHelper +import app.aaps.core.utils.JsonHelper import org.json.JSONObject /** diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NsIncomingDataProcessor.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NsIncomingDataProcessor.kt index ff5f036f25..a5a77d7860 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NsIncomingDataProcessor.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NsIncomingDataProcessor.kt @@ -17,7 +17,20 @@ import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.source.NSClientSource import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T -import info.nightscout.core.utils.JsonHelper +import app.aaps.core.nssdk.localmodel.entry.NSSgvV3 +import app.aaps.core.nssdk.localmodel.food.NSFood +import app.aaps.core.nssdk.localmodel.treatment.NSBolus +import app.aaps.core.nssdk.localmodel.treatment.NSBolusWizard +import app.aaps.core.nssdk.localmodel.treatment.NSCarbs +import app.aaps.core.nssdk.localmodel.treatment.NSEffectiveProfileSwitch +import app.aaps.core.nssdk.localmodel.treatment.NSExtendedBolus +import app.aaps.core.nssdk.localmodel.treatment.NSOfflineEvent +import app.aaps.core.nssdk.localmodel.treatment.NSProfileSwitch +import app.aaps.core.nssdk.localmodel.treatment.NSTemporaryBasal +import app.aaps.core.nssdk.localmodel.treatment.NSTemporaryTarget +import app.aaps.core.nssdk.localmodel.treatment.NSTherapyEvent +import app.aaps.core.nssdk.localmodel.treatment.NSTreatment +import app.aaps.core.utils.JsonHelper import info.nightscout.database.entities.Food import info.nightscout.database.entities.GlucoseValue import info.nightscout.database.transactions.TransactionGlucoseValue @@ -35,19 +48,6 @@ import info.nightscout.plugins.sync.nsclientV3.extensions.toTemporaryBasal import info.nightscout.plugins.sync.nsclientV3.extensions.toTemporaryTarget import info.nightscout.plugins.sync.nsclientV3.extensions.toTherapyEvent import info.nightscout.plugins.sync.nsclientV3.extensions.toTransactionGlucoseValue -import app.aaps.core.nssdk.localmodel.entry.NSSgvV3 -import app.aaps.core.nssdk.localmodel.food.NSFood -import app.aaps.core.nssdk.localmodel.treatment.NSBolus -import app.aaps.core.nssdk.localmodel.treatment.NSBolusWizard -import app.aaps.core.nssdk.localmodel.treatment.NSCarbs -import app.aaps.core.nssdk.localmodel.treatment.NSEffectiveProfileSwitch -import app.aaps.core.nssdk.localmodel.treatment.NSExtendedBolus -import app.aaps.core.nssdk.localmodel.treatment.NSOfflineEvent -import app.aaps.core.nssdk.localmodel.treatment.NSProfileSwitch -import app.aaps.core.nssdk.localmodel.treatment.NSTemporaryBasal -import app.aaps.core.nssdk.localmodel.treatment.NSTemporaryTarget -import app.aaps.core.nssdk.localmodel.treatment.NSTherapyEvent -import app.aaps.core.nssdk.localmodel.treatment.NSTreatment import org.json.JSONArray import org.json.JSONObject import javax.inject.Inject diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/DataSyncSelectorV1.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/DataSyncSelectorV1.kt index e9d4b9f1fe..ee36211f0d 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/DataSyncSelectorV1.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/DataSyncSelectorV1.kt @@ -10,8 +10,8 @@ import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.source.NSClientSource import app.aaps.core.interfaces.sync.DataSyncSelector import app.aaps.core.interfaces.utils.DateUtil -import info.nightscout.core.utils.JsonHelper -import info.nightscout.core.utils.waitMillis +import app.aaps.core.utils.JsonHelper +import app.aaps.core.utils.waitMillis import info.nightscout.database.impl.AppRepository import info.nightscout.plugins.sync.R import info.nightscout.plugins.sync.nsShared.events.EventNSClientUpdateGuiQueue diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/acks/NSAddAck.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/acks/NSAddAck.kt index fa965089d7..deb9425dc2 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/acks/NSAddAck.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/acks/NSAddAck.kt @@ -7,7 +7,7 @@ import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.events.Event import app.aaps.core.interfaces.rx.events.EventNSClientRestart import app.aaps.core.interfaces.utils.DateUtil -import info.nightscout.core.utils.receivers.DataWorkerStorage +import app.aaps.core.utils.receivers.DataWorkerStorage import info.nightscout.plugins.sync.nsclient.services.NSClientService import info.nightscout.plugins.sync.nsclient.workers.NSClientAddAckWorker import io.socket.client.Ack diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/acks/NSUpdateAck.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/acks/NSUpdateAck.kt index c5d387a0dd..44991baaa4 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/acks/NSUpdateAck.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/acks/NSUpdateAck.kt @@ -6,7 +6,7 @@ import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.events.Event import app.aaps.core.interfaces.utils.DateUtil -import info.nightscout.core.utils.receivers.DataWorkerStorage +import app.aaps.core.utils.receivers.DataWorkerStorage import info.nightscout.plugins.sync.nsclient.services.NSClientService import info.nightscout.plugins.sync.nsclient.workers.NSClientUpdateRemoveAckWorker import io.socket.client.Ack diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSDeviceStatusHandler.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSDeviceStatusHandler.kt index e224611d92..358eee0d99 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSDeviceStatusHandler.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSDeviceStatusHandler.kt @@ -5,10 +5,10 @@ import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.nsclient.ProcessedDeviceStatusData import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.DateUtil -import info.nightscout.core.utils.HtmlHelper -import info.nightscout.core.utils.JsonHelper import app.aaps.core.nssdk.interfaces.RunningConfiguration import app.aaps.core.nssdk.localmodel.devicestatus.NSDeviceStatus +import app.aaps.core.utils.HtmlHelper +import app.aaps.core.utils.JsonHelper import javax.inject.Inject import javax.inject.Singleton diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSMbg.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSMbg.kt index 908c92925b..bbff33822f 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSMbg.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSMbg.kt @@ -1,6 +1,6 @@ package info.nightscout.plugins.sync.nsclient.data -import info.nightscout.core.utils.JsonHelper +import app.aaps.core.utils.JsonHelper import org.json.JSONObject class NSMbg(val json: JSONObject) { diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSSettingsStatusImpl.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSSettingsStatusImpl.kt index 7d9b802161..3c288262d9 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSSettingsStatusImpl.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSSettingsStatusImpl.kt @@ -17,7 +17,7 @@ import app.aaps.core.interfaces.rx.events.EventDismissNotification import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.ui.dialogs.OKDialog -import info.nightscout.core.utils.JsonHelper +import app.aaps.core.utils.JsonHelper import info.nightscout.database.entities.UserEntry import info.nightscout.database.entities.UserEntry.Action import info.nightscout.plugins.sync.R diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/ProcessedDeviceStatusDataImpl.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/ProcessedDeviceStatusDataImpl.kt index dd7dd270ad..df580a65b2 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/ProcessedDeviceStatusDataImpl.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/ProcessedDeviceStatusDataImpl.kt @@ -10,9 +10,9 @@ import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.Round import app.aaps.core.interfaces.utils.T +import app.aaps.core.utils.HtmlHelper +import app.aaps.core.utils.JsonHelper import dagger.android.HasAndroidInjector -import info.nightscout.core.utils.HtmlHelper -import info.nightscout.core.utils.JsonHelper import info.nightscout.plugins.sync.R import javax.inject.Inject import javax.inject.Singleton diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/BolusCalculatorResultExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/BolusCalculatorResultExtension.kt index f0914ab644..b367132df5 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/BolusCalculatorResultExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/BolusCalculatorResultExtension.kt @@ -2,9 +2,9 @@ package info.nightscout.plugins.sync.nsclient.extensions import app.aaps.core.interfaces.profile.ProfileUtil import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.utils.JsonHelper import com.google.gson.Gson import com.google.gson.JsonSyntaxException -import info.nightscout.core.utils.JsonHelper import info.nightscout.database.entities.BolusCalculatorResult import org.json.JSONObject diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/BolusExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/BolusExtension.kt index 20964d5651..9114a64488 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/BolusExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/BolusExtension.kt @@ -1,7 +1,7 @@ package info.nightscout.plugins.sync.nsclient.extensions import app.aaps.core.interfaces.utils.DateUtil -import info.nightscout.core.utils.JsonHelper +import app.aaps.core.utils.JsonHelper import info.nightscout.database.entities.Bolus import info.nightscout.database.entities.embedments.InterfaceIDs import org.json.JSONObject diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/CarbsExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/CarbsExtension.kt index 1d6e565481..70f5eaac7c 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/CarbsExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/CarbsExtension.kt @@ -1,7 +1,7 @@ package info.nightscout.plugins.sync.nsclient.extensions import app.aaps.core.interfaces.utils.DateUtil -import info.nightscout.core.utils.JsonHelper +import app.aaps.core.utils.JsonHelper import info.nightscout.database.entities.Carbs import info.nightscout.database.entities.TherapyEvent import info.nightscout.database.entities.embedments.InterfaceIDs diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/EffectiveProfileSwitchExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/EffectiveProfileSwitchExtension.kt index 85090c476c..a45dae1c88 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/EffectiveProfileSwitchExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/EffectiveProfileSwitchExtension.kt @@ -1,10 +1,10 @@ package info.nightscout.plugins.sync.nsclient.extensions -import app.aaps.core.main.extensions.pureProfileFromJson -import app.aaps.core.main.profile.ProfileSealed import app.aaps.core.interfaces.db.GlucoseUnit import app.aaps.core.interfaces.utils.DateUtil -import info.nightscout.core.utils.JsonHelper +import app.aaps.core.main.extensions.pureProfileFromJson +import app.aaps.core.main.profile.ProfileSealed +import app.aaps.core.utils.JsonHelper import info.nightscout.database.entities.EffectiveProfileSwitch import info.nightscout.database.entities.embedments.InterfaceIDs import org.json.JSONObject diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/ExtendedBolusExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/ExtendedBolusExtension.kt index c6536b6c9e..658acf231b 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/ExtendedBolusExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/ExtendedBolusExtension.kt @@ -1,10 +1,10 @@ package info.nightscout.plugins.sync.nsclient.extensions -import app.aaps.core.main.extensions.toTemporaryBasal import app.aaps.core.interfaces.profile.Profile import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T -import info.nightscout.core.utils.JsonHelper +import app.aaps.core.main.extensions.toTemporaryBasal +import app.aaps.core.utils.JsonHelper import info.nightscout.database.entities.ExtendedBolus import info.nightscout.database.entities.embedments.InterfaceIDs import org.json.JSONObject diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/FoodExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/FoodExtension.kt index c6d2c557da..0e28d86073 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/FoodExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/FoodExtension.kt @@ -1,6 +1,6 @@ package info.nightscout.plugins.sync.nsclient.extensions -import info.nightscout.core.utils.JsonHelper +import app.aaps.core.utils.JsonHelper import info.nightscout.database.entities.Food import org.json.JSONObject diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/OfflineEventExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/OfflineEventExtension.kt index 85ef1ecb0c..02294b9a47 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/OfflineEventExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/OfflineEventExtension.kt @@ -2,7 +2,7 @@ package info.nightscout.plugins.sync.nsclient.extensions import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T -import info.nightscout.core.utils.JsonHelper +import app.aaps.core.utils.JsonHelper import info.nightscout.database.entities.OfflineEvent import info.nightscout.database.entities.embedments.InterfaceIDs import org.json.JSONObject diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/ProfileSwitchExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/ProfileSwitchExtension.kt index 722737702a..b9e9987fc2 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/ProfileSwitchExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/ProfileSwitchExtension.kt @@ -1,14 +1,14 @@ package info.nightscout.plugins.sync.nsclient.extensions -import app.aaps.core.main.extensions.fromConstant -import app.aaps.core.main.extensions.getCustomizedName -import app.aaps.core.main.extensions.pureProfileFromJson -import app.aaps.core.main.profile.ProfileSealed import app.aaps.core.interfaces.plugin.ActivePlugin import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.T -import info.nightscout.core.utils.JsonHelper +import app.aaps.core.main.extensions.fromConstant +import app.aaps.core.main.extensions.getCustomizedName +import app.aaps.core.main.extensions.pureProfileFromJson +import app.aaps.core.main.profile.ProfileSealed +import app.aaps.core.utils.JsonHelper import info.nightscout.database.entities.ProfileSwitch import info.nightscout.database.entities.TherapyEvent import info.nightscout.database.entities.embedments.InterfaceIDs diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TemporaryBasalExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TemporaryBasalExtension.kt index 2a0b86982e..53d461770a 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TemporaryBasalExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TemporaryBasalExtension.kt @@ -1,10 +1,10 @@ package info.nightscout.plugins.sync.nsclient.extensions -import app.aaps.core.main.extensions.convertedToAbsolute import app.aaps.core.interfaces.profile.Profile import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T -import info.nightscout.core.utils.JsonHelper +import app.aaps.core.main.extensions.convertedToAbsolute +import app.aaps.core.utils.JsonHelper import info.nightscout.database.entities.TemporaryBasal import info.nightscout.database.entities.TemporaryBasal.Type.Companion.fromString import info.nightscout.database.entities.embedments.InterfaceIDs diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TemporaryTargetExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TemporaryTargetExtension.kt index d45eba196f..2986d346a7 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TemporaryTargetExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TemporaryTargetExtension.kt @@ -5,7 +5,7 @@ import app.aaps.core.interfaces.db.GlucoseUnit import app.aaps.core.interfaces.profile.ProfileUtil import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T -import info.nightscout.core.utils.JsonHelper +import app.aaps.core.utils.JsonHelper import info.nightscout.database.entities.TemporaryTarget import org.json.JSONObject diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TherapyEventExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TherapyEventExtension.kt index 47eb6dab33..3104f1f81e 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TherapyEventExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TherapyEventExtension.kt @@ -3,7 +3,7 @@ package info.nightscout.plugins.sync.nsclient.extensions import app.aaps.core.interfaces.db.GlucoseUnit import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T -import info.nightscout.core.utils.JsonHelper +import app.aaps.core.utils.JsonHelper import info.nightscout.database.entities.TherapyEvent import info.nightscout.plugins.sync.nsclient.data.NSMbg import org.json.JSONObject diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/services/NSClientService.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/services/NSClientService.kt index c7400c0efe..774870152a 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/services/NSClientService.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/services/NSClientService.kt @@ -10,8 +10,6 @@ import android.os.IBinder import android.os.PowerManager import android.os.SystemClock import androidx.work.OneTimeWorkRequest -import app.aaps.core.main.events.EventNewNotification -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag @@ -26,15 +24,18 @@ import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T.Companion.mins +import app.aaps.core.main.events.EventNewNotification +import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.nssdk.localmodel.devicestatus.NSDeviceStatus +import app.aaps.core.utils.JsonHelper.safeGetString +import app.aaps.core.utils.JsonHelper.safeGetStringAllowNull +import app.aaps.core.utils.receivers.DataWorkerStorage import com.google.common.base.Charsets import com.google.common.hash.Hashing import com.google.gson.GsonBuilder import com.google.gson.JsonDeserializer import dagger.android.DaggerService import dagger.android.HasAndroidInjector -import info.nightscout.core.utils.JsonHelper.safeGetString -import info.nightscout.core.utils.JsonHelper.safeGetStringAllowNull -import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.database.impl.AppRepository import info.nightscout.plugins.sync.R import info.nightscout.plugins.sync.nsShared.NSAlarmObject @@ -51,7 +52,6 @@ import info.nightscout.plugins.sync.nsclient.data.AlarmAck import info.nightscout.plugins.sync.nsclient.data.NSDeviceStatusHandler import info.nightscout.plugins.sync.nsclient.workers.NSClientAddUpdateWorker import info.nightscout.plugins.sync.nsclient.workers.NSClientMbgWorker -import app.aaps.core.nssdk.localmodel.devicestatus.NSDeviceStatus import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.kotlin.plusAssign import io.socket.client.IO diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddAckWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddAckWorker.kt index e6ff42aa06..ee54811609 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddAckWorker.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddAckWorker.kt @@ -4,7 +4,6 @@ import android.content.Context import android.os.SystemClock import androidx.work.WorkerParameters import androidx.work.workDataOf -import app.aaps.core.main.utils.worker.LoggingWorker import app.aaps.core.interfaces.nsclient.StoreDataForDb import app.aaps.core.interfaces.rx.AapsSchedulers import app.aaps.core.interfaces.rx.bus.RxBus @@ -24,8 +23,9 @@ import app.aaps.core.interfaces.sync.DataSyncSelector.PairProfileSwitch import app.aaps.core.interfaces.sync.DataSyncSelector.PairTemporaryBasal import app.aaps.core.interfaces.sync.DataSyncSelector.PairTemporaryTarget import app.aaps.core.interfaces.sync.DataSyncSelector.PairTherapyEvent -import info.nightscout.core.utils.notifyAll -import info.nightscout.core.utils.receivers.DataWorkerStorage +import app.aaps.core.main.utils.worker.LoggingWorker +import app.aaps.core.utils.notifyAll +import app.aaps.core.utils.receivers.DataWorkerStorage import info.nightscout.database.impl.AppRepository import info.nightscout.plugins.sync.R import info.nightscout.plugins.sync.nsclient.acks.NSAddAck diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddUpdateWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddUpdateWorker.kt index 417e68dc23..ee38f8934c 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddUpdateWorker.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddUpdateWorker.kt @@ -3,7 +3,6 @@ package info.nightscout.plugins.sync.nsclient.workers import android.content.Context import androidx.work.WorkerParameters import androidx.work.workDataOf -import app.aaps.core.main.utils.worker.LoggingWorker import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.nsclient.StoreDataForDb @@ -13,8 +12,9 @@ import app.aaps.core.interfaces.pump.VirtualPump import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.DateUtil -import info.nightscout.core.utils.JsonHelper -import info.nightscout.core.utils.receivers.DataWorkerStorage +import app.aaps.core.main.utils.worker.LoggingWorker +import app.aaps.core.utils.JsonHelper +import app.aaps.core.utils.receivers.DataWorkerStorage import info.nightscout.database.entities.Bolus import info.nightscout.database.entities.BolusCalculatorResult import info.nightscout.database.entities.Carbs diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientMbgWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientMbgWorker.kt index 9ad8d6cc35..448505d20b 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientMbgWorker.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientMbgWorker.kt @@ -3,11 +3,11 @@ package info.nightscout.plugins.sync.nsclient.workers import android.content.Context import androidx.work.WorkerParameters import androidx.work.workDataOf -import app.aaps.core.main.utils.worker.LoggingWorker import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.nsclient.StoreDataForDb import app.aaps.core.interfaces.sharedPreferences.SP -import info.nightscout.core.utils.receivers.DataWorkerStorage +import app.aaps.core.main.utils.worker.LoggingWorker +import app.aaps.core.utils.receivers.DataWorkerStorage import info.nightscout.plugins.sync.nsclient.data.NSMbg import info.nightscout.plugins.sync.nsclient.extensions.therapyEventFromNsMbg import kotlinx.coroutines.Dispatchers diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientUpdateRemoveAckWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientUpdateRemoveAckWorker.kt index eacdfa803a..8267bcd0e1 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientUpdateRemoveAckWorker.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientUpdateRemoveAckWorker.kt @@ -3,7 +3,6 @@ package info.nightscout.plugins.sync.nsclient.workers import android.content.Context import androidx.work.WorkerParameters import androidx.work.workDataOf -import app.aaps.core.main.utils.worker.LoggingWorker import app.aaps.core.interfaces.rx.AapsSchedulers import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.events.EventNSClientNewLog @@ -19,8 +18,9 @@ import app.aaps.core.interfaces.sync.DataSyncSelector.PairProfileSwitch import app.aaps.core.interfaces.sync.DataSyncSelector.PairTemporaryBasal import app.aaps.core.interfaces.sync.DataSyncSelector.PairTemporaryTarget import app.aaps.core.interfaces.sync.DataSyncSelector.PairTherapyEvent -import info.nightscout.core.utils.notifyAll -import info.nightscout.core.utils.receivers.DataWorkerStorage +import app.aaps.core.main.utils.worker.LoggingWorker +import app.aaps.core.utils.notifyAll +import app.aaps.core.utils.receivers.DataWorkerStorage import info.nightscout.database.impl.AppRepository import info.nightscout.plugins.sync.nsclient.acks.NSUpdateAck import kotlinx.coroutines.Dispatchers diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/DataSyncSelectorV3.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/DataSyncSelectorV3.kt index f29a7a7e3f..6ead37bac5 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/DataSyncSelectorV3.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/DataSyncSelectorV3.kt @@ -12,7 +12,7 @@ import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.source.NSClientSource import app.aaps.core.interfaces.sync.DataSyncSelector import app.aaps.core.interfaces.utils.DateUtil -import info.nightscout.core.utils.JsonHelper +import app.aaps.core.utils.JsonHelper import info.nightscout.database.impl.AppRepository import info.nightscout.plugins.sync.R import info.nightscout.plugins.sync.nsShared.events.EventNSClientUpdateGuiQueue diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadDeviceStatusWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadDeviceStatusWorker.kt index b83fa3d0e3..0eb2b6e13c 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadDeviceStatusWorker.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadDeviceStatusWorker.kt @@ -3,12 +3,12 @@ package info.nightscout.plugins.sync.nsclientV3.workers import android.content.Context import androidx.work.WorkerParameters import androidx.work.workDataOf -import app.aaps.core.main.utils.worker.LoggingWorker import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.events.EventNSClientNewLog import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T -import info.nightscout.core.utils.receivers.DataWorkerStorage +import app.aaps.core.main.utils.worker.LoggingWorker +import app.aaps.core.utils.receivers.DataWorkerStorage import info.nightscout.plugins.sync.nsclient.data.NSDeviceStatusHandler import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin import kotlinx.coroutines.Dispatchers diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadProfileStoreWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadProfileStoreWorker.kt index 9a62091922..59bfb4355b 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadProfileStoreWorker.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadProfileStoreWorker.kt @@ -3,17 +3,17 @@ package info.nightscout.plugins.sync.nsclientV3.workers import android.content.Context import androidx.work.WorkerParameters import androidx.work.workDataOf -import app.aaps.core.main.utils.worker.LoggingWorker import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.events.EventNSClientNewLog import app.aaps.core.interfaces.sync.NsClient import app.aaps.core.interfaces.utils.DateUtil -import info.nightscout.core.utils.JsonHelper -import info.nightscout.core.utils.receivers.DataWorkerStorage +import app.aaps.core.main.utils.worker.LoggingWorker +import app.aaps.core.nssdk.interfaces.NSAndroidClient +import app.aaps.core.utils.JsonHelper +import app.aaps.core.utils.receivers.DataWorkerStorage import info.nightscout.plugins.sync.nsShared.NsIncomingDataProcessor import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin -import app.aaps.core.nssdk.interfaces.NSAndroidClient import kotlinx.coroutines.Dispatchers import org.json.JSONObject import javax.inject.Inject diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolPlugin.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolPlugin.kt index aa9f70ba91..a6cf2de08c 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolPlugin.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolPlugin.kt @@ -4,7 +4,6 @@ import android.content.Context import android.text.Spanned import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.configuration.Constants import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag @@ -23,8 +22,9 @@ import app.aaps.core.interfaces.sync.Sync import app.aaps.core.interfaces.sync.Tidepool import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.T +import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.utils.HtmlHelper import dagger.android.HasAndroidInjector -import info.nightscout.core.utils.HtmlHelper import info.nightscout.plugins.sync.R import info.nightscout.plugins.sync.nsShared.events.EventConnectivityOptionChanged import info.nightscout.plugins.sync.nsclient.ReceiverDelegate diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/DataSyncSelectorXdripImpl.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/DataSyncSelectorXdripImpl.kt index 9f46a56ced..8beeb3c5f0 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/DataSyncSelectorXdripImpl.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/DataSyncSelectorXdripImpl.kt @@ -10,8 +10,8 @@ import app.aaps.core.interfaces.sync.DataSyncSelectorXdrip import app.aaps.core.interfaces.sync.XDripBroadcast import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T +import app.aaps.core.utils.JsonHelper import dagger.Lazy -import info.nightscout.core.utils.JsonHelper import info.nightscout.database.impl.AppRepository import info.nightscout.plugins.sync.R import javax.inject.Inject diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/XdripPlugin.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/XdripPlugin.kt index e73d07d326..2a72999611 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/XdripPlugin.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/XdripPlugin.kt @@ -10,10 +10,6 @@ import androidx.work.ExistingWorkPolicy import androidx.work.OneTimeWorkRequest import androidx.work.WorkInfo import androidx.work.WorkManager -import app.aaps.core.main.extensions.toStringShort -import app.aaps.core.main.iob.generateCOBString -import app.aaps.core.main.iob.round -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.aps.Loop import app.aaps.core.interfaces.configuration.Constants import app.aaps.core.interfaces.db.GlucoseUnit @@ -43,10 +39,14 @@ import app.aaps.core.interfaces.sync.XDripBroadcast import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.main.extensions.toStringShort +import app.aaps.core.main.iob.generateCOBString +import app.aaps.core.main.iob.round +import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.ui.toast.ToastUtils +import app.aaps.core.utils.HtmlHelper import app.aaps.shared.impl.extensions.safeQueryBroadcastReceivers import dagger.android.HasAndroidInjector -import app.aaps.core.ui.toast.ToastUtils -import info.nightscout.core.utils.HtmlHelper import info.nightscout.plugins.sync.R import info.nightscout.plugins.sync.nsclient.extensions.toJson import info.nightscout.plugins.sync.xdrip.events.EventXdripUpdateGUI diff --git a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorkerTest.kt b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorkerTest.kt index 7518bbd22a..a4af6599e8 100644 --- a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorkerTest.kt +++ b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorkerTest.kt @@ -18,11 +18,11 @@ import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.nssdk.interfaces.NSAndroidClient import app.aaps.core.nssdk.remotemodel.LastModified +import app.aaps.core.utils.receivers.DataWorkerStorage import app.aaps.shared.tests.TestBase import com.google.common.truth.Truth.assertThat import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector -import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.database.entities.GlucoseValue import info.nightscout.database.entities.embedments.InterfaceIDs import info.nightscout.database.impl.AppRepository @@ -33,7 +33,6 @@ import info.nightscout.plugins.sync.nsclient.data.NSDeviceStatusHandler import info.nightscout.plugins.sync.nsclientV3.DataSyncSelectorV3 import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin import info.nightscout.plugins.sync.nsclientV3.extensions.toNSSvgV3 -import kotlin.test.assertIs import kotlinx.coroutines.test.runTest import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test @@ -43,6 +42,7 @@ import org.mockito.ArgumentMatchers.anyLong import org.mockito.ArgumentMatchers.anyString import org.mockito.Mock import org.mockito.Mockito +import kotlin.test.assertIs internal class LoadBgWorkerTest : TestBase() { diff --git a/pump/combo/src/main/java/info/nightscout/pump/combo/ComboPlugin.java b/pump/combo/src/main/java/info/nightscout/pump/combo/ComboPlugin.java index 9a763828bf..79631d6152 100644 --- a/pump/combo/src/main/java/info/nightscout/pump/combo/ComboPlugin.java +++ b/pump/combo/src/main/java/info/nightscout/pump/combo/ComboPlugin.java @@ -47,8 +47,8 @@ import app.aaps.core.interfaces.sharedPreferences.SP; import app.aaps.core.interfaces.ui.UiInteraction; import app.aaps.core.interfaces.utils.DateUtil; import app.aaps.core.interfaces.utils.T; +import app.aaps.core.utils.fabric.InstanceId; import dagger.android.HasAndroidInjector; -import info.nightscout.core.utils.fabric.InstanceId; import info.nightscout.pump.combo.events.EventComboPumpUpdateGUI; import info.nightscout.pump.combo.ruffyscripter.BasalProfile; import info.nightscout.pump.combo.ruffyscripter.BolusProgressReporter; diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/activities/BLEScanActivity.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/activities/BLEScanActivity.kt index 6fe99d3a04..cff6b88ee8 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/activities/BLEScanActivity.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/activities/BLEScanActivity.kt @@ -26,7 +26,7 @@ import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import app.aaps.core.ui.toast.ToastUtils -import info.nightscout.core.utils.extensions.safeEnable +import app.aaps.core.utils.extensions.safeEnable import info.nightscout.pump.danars.R import info.nightscout.pump.danars.databinding.DanarsBlescannerActivityBinding import info.nightscout.pump.danars.events.EventDanaRSDeviceChange diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/activities/EnterPinActivity.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/activities/EnterPinActivity.kt index 085f96803c..b1038f8be6 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/activities/EnterPinActivity.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/activities/EnterPinActivity.kt @@ -2,15 +2,15 @@ package info.nightscout.pump.danars.activities import android.os.Bundle import android.util.Base64 -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.rx.AapsSchedulers import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import app.aaps.core.ui.dialogs.OKDialog -import info.nightscout.core.utils.hexStringToByteArray +import app.aaps.core.utils.hexStringToByteArray import info.nightscout.core.validators.DefaultEditTextValidator import info.nightscout.core.validators.EditTextValidator import info.nightscout.pump.danars.DanaRSPlugin diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/services/BLEComm.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/services/BLEComm.kt index b51cd5e5d7..8b26339037 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/services/BLEComm.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/services/BLEComm.kt @@ -30,11 +30,11 @@ import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T +import app.aaps.core.ui.toast.ToastUtils +import app.aaps.core.utils.notifyAll +import app.aaps.core.utils.waitMillis import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption -import app.aaps.core.ui.toast.ToastUtils -import info.nightscout.core.utils.notifyAll -import info.nightscout.core.utils.waitMillis import info.nightscout.pump.dana.DanaPump import info.nightscout.pump.dana.R import info.nightscout.pump.danars.activities.EnterPinActivity diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/activities/DiaconnG8BLEScanActivity.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/activities/DiaconnG8BLEScanActivity.kt index d86c4dc31e..a834b56da4 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/activities/DiaconnG8BLEScanActivity.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/activities/DiaconnG8BLEScanActivity.kt @@ -28,7 +28,7 @@ import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import app.aaps.core.ui.toast.ToastUtils -import info.nightscout.core.utils.extensions.safeEnable +import app.aaps.core.utils.extensions.safeEnable import info.nightscout.pump.diaconn.R import info.nightscout.pump.diaconn.databinding.DiaconnG8BlescannerActivityBinding import info.nightscout.pump.diaconn.events.EventDiaconnG8DeviceChange diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/service/BLECommonService.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/service/BLECommonService.kt index 88b7b4cdeb..438f9ceee1 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/service/BLECommonService.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/service/BLECommonService.kt @@ -22,10 +22,10 @@ import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged import app.aaps.core.interfaces.ui.UiInteraction -import dagger.android.HasAndroidInjector import app.aaps.core.ui.toast.ToastUtils -import info.nightscout.core.utils.notifyAll -import info.nightscout.core.utils.waitMillis +import app.aaps.core.utils.notifyAll +import app.aaps.core.utils.waitMillis +import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Pump import info.nightscout.pump.diaconn.R import info.nightscout.pump.diaconn.packet.BatteryWarningReportPacket diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/EopatchActivity.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/EopatchActivity.kt index b8754f74aa..fe79e56bec 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/EopatchActivity.kt +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/EopatchActivity.kt @@ -9,6 +9,7 @@ import android.view.MotionEvent import androidx.activity.OnBackPressedCallback import androidx.appcompat.app.AlertDialog import androidx.lifecycle.ViewModelProvider +import app.aaps.core.utils.extensions.safeGetSerializableExtra import info.nightscout.androidaps.plugins.pump.eopatch.R import info.nightscout.androidaps.plugins.pump.eopatch.code.EventType import info.nightscout.androidaps.plugins.pump.eopatch.code.PatchLifecycle @@ -18,7 +19,6 @@ import info.nightscout.androidaps.plugins.pump.eopatch.extension.replaceFragment import info.nightscout.androidaps.plugins.pump.eopatch.extension.takeOne import info.nightscout.androidaps.plugins.pump.eopatch.ui.dialogs.ProgressDialogHelper import info.nightscout.androidaps.plugins.pump.eopatch.ui.viewmodel.EopatchViewModel -import info.nightscout.core.utils.extensions.safeGetSerializableExtra class EopatchActivity : EoBaseActivity() { private var mPatchCommCheckDialog: Dialog? = null diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.kt index de3fa15986..615db4d16e 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.kt @@ -6,7 +6,6 @@ import android.content.ServiceConnection import android.os.IBinder import android.os.SystemClock import androidx.preference.Preference -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.notifications.Notification @@ -35,6 +34,8 @@ import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.TimeChangeType +import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.utils.DateTimeUtil import dagger.android.HasAndroidInjector import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst @@ -66,7 +67,6 @@ import info.nightscout.androidaps.plugins.pump.medtronic.service.RileyLinkMedtro import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicConst import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil.Companion.isSame -import info.nightscout.core.utils.DateTimeUtil import info.nightscout.pump.common.data.PumpStatus import info.nightscout.pump.common.defs.PumpDriverState import info.nightscout.pump.common.sync.PumpDbEntryTBR diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.kt index cbb35f6529..dbb4fad6b3 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.kt @@ -3,6 +3,7 @@ package info.nightscout.androidaps.plugins.pump.medtronic.comm import android.os.SystemClock import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.pump.defs.PumpType +import app.aaps.core.utils.DateTimeUtil 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 @@ -34,7 +35,6 @@ import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpSta import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil.Companion.createByteArray import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil.Companion.getByteArrayFromUnsignedShort -import info.nightscout.core.utils.DateTimeUtil import info.nightscout.pump.common.defs.PumpDeviceState import info.nightscout.pump.common.utils.ByteUtil import org.joda.time.LocalDateTime diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntry.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntry.kt index 5773e3954e..f7f3458a08 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntry.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntry.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.pump.medtronic.comm.history +import app.aaps.core.utils.DateTimeUtil import com.google.gson.annotations.Expose -import info.nightscout.core.utils.DateTimeUtil import info.nightscout.pump.common.utils.ByteUtil import info.nightscout.pump.common.utils.StringUtil diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/CGMSHistoryEntry.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/CGMSHistoryEntry.kt index ba97808df6..6db0c8a6ab 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/CGMSHistoryEntry.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/CGMSHistoryEntry.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.pump.medtronic.comm.history.cgms +import app.aaps.core.utils.DateTimeUtil import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.MedtronicHistoryEntry -import info.nightscout.core.utils.DateTimeUtil import info.nightscout.pump.common.utils.ByteUtil import org.apache.commons.lang3.StringUtils import org.joda.time.LocalDateTime diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/MedtronicCGMSHistoryDecoder.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/MedtronicCGMSHistoryDecoder.kt index 4ca8e4fca3..34f9d46124 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/MedtronicCGMSHistoryDecoder.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/MedtronicCGMSHistoryDecoder.kt @@ -2,11 +2,11 @@ package info.nightscout.androidaps.plugins.pump.medtronic.comm.history.cgms import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.utils.DateTimeUtil import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.MedtronicHistoryDecoder import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.RecordDecodeStatus import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.cgms.CGMSHistoryEntryType.Companion.getByCode import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil -import info.nightscout.core.utils.DateTimeUtil import org.joda.time.LocalDateTime import java.util.Arrays diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoder.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoder.kt index 2efd85cb9d..7ea2c36e19 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoder.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoder.kt @@ -2,6 +2,7 @@ package info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.utils.DateTimeUtil import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.MedtronicHistoryDecoder import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.RecordDecodeStatus import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntryType.Companion.getByCode @@ -13,7 +14,6 @@ import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.TempBasalPair import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicDeviceType import info.nightscout.androidaps.plugins.pump.medtronic.defs.PumpBolusType import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil -import info.nightscout.core.utils.DateTimeUtil import info.nightscout.pump.common.utils.ByteUtil import java.util.Locale import javax.inject.Inject diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryResult.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryResult.kt index eee75ce9aa..4d0024847d 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryResult.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryResult.kt @@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag -import info.nightscout.core.utils.DateTimeUtil +import app.aaps.core.utils.DateTimeUtil /** * History page contains data, sorted from newest to oldest (0=newest..n=oldest) diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.kt index 1562d13407..27d052bcca 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.kt @@ -11,6 +11,7 @@ import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.utils.DateTimeUtil import com.google.gson.Gson import com.google.gson.GsonBuilder import dagger.android.HasAndroidInjector @@ -31,7 +32,6 @@ import info.nightscout.androidaps.plugins.pump.medtronic.defs.PumpBolusType import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpStatus import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicConst import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil -import info.nightscout.core.utils.DateTimeUtil import info.nightscout.pump.common.sync.PumpDbEntry import info.nightscout.pump.common.sync.PumpDbEntryBolus import info.nightscout.pump.common.sync.PumpDbEntryCarbs diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BolusWizardDTO.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BolusWizardDTO.kt index 032457bf06..ba6f2209c9 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BolusWizardDTO.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BolusWizardDTO.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.plugins.pump.medtronic.data.dto -import info.nightscout.core.utils.DateTimeUtil +import app.aaps.core.utils.DateTimeUtil import java.util.Locale /** diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalProcessDTO.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalProcessDTO.kt index bac3452444..94f9c2d84d 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalProcessDTO.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalProcessDTO.kt @@ -1,9 +1,9 @@ package info.nightscout.androidaps.plugins.pump.medtronic.data.dto import app.aaps.core.interfaces.logging.AAPSLogger +import app.aaps.core.utils.DateTimeUtil import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntry import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntryType -import info.nightscout.core.utils.DateTimeUtil class TempBasalProcessDTO( var itemOne: PumpHistoryEntry, diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumActivity.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumActivity.kt index 455e168a3e..65bec84601 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumActivity.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumActivity.kt @@ -7,7 +7,7 @@ import android.os.Bundle import android.view.WindowManager import androidx.activity.OnBackPressedCallback import androidx.lifecycle.ViewModelProvider -import info.nightscout.core.utils.extensions.safeGetSerializableExtra +import app.aaps.core.utils.extensions.safeGetSerializableExtra import info.nightscout.pump.medtrum.R import info.nightscout.pump.medtrum.code.PatchStep import info.nightscout.pump.medtrum.comm.enums.MedtrumPumpState diff --git a/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/PodActivationWizardActivity.kt b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/PodActivationWizardActivity.kt index c314840347..2544a47c3c 100644 --- a/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/PodActivationWizardActivity.kt +++ b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/PodActivationWizardActivity.kt @@ -2,9 +2,9 @@ package info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activat import android.os.Bundle import androidx.annotation.IdRes +import app.aaps.core.utils.extensions.safeGetSerializableExtra import info.nightscout.androidaps.plugins.pump.omnipod.common.R import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.common.activity.OmnipodWizardActivityBase -import info.nightscout.core.utils.extensions.safeGetSerializableExtra abstract class PodActivationWizardActivity : OmnipodWizardActivityBase() { companion object { diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt index a32baed166..bc8c0493a2 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt @@ -3,7 +3,6 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash import android.os.Handler import android.os.HandlerThread import android.text.format.DateFormat -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.notifications.Notification @@ -42,6 +41,8 @@ import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.Round import app.aaps.core.interfaces.utils.T import app.aaps.core.interfaces.utils.TimeChangeType +import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.utils.DateTimeUtil import dagger.android.HasAndroidInjector import info.nightscout.androidaps.plugins.pump.omnipod.common.definition.OmnipodCommandType import info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command.CommandDeactivatePod @@ -73,7 +74,6 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.database.Das import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.OmnipodDashOverviewFragment import info.nightscout.androidaps.plugins.pump.omnipod.dash.util.Constants import info.nightscout.androidaps.plugins.pump.omnipod.dash.util.mapProfileToBasalProgram -import info.nightscout.core.utils.DateTimeUtil import io.reactivex.rxjava3.core.Completable import io.reactivex.rxjava3.core.Single import io.reactivex.rxjava3.disposables.CompositeDisposable diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/Id.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/Id.kt index b97aa83da6..641faa57ed 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/Id.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/Id.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm -import info.nightscout.core.utils.toHex +import app.aaps.core.utils.toHex import java.nio.ByteBuffer data class Id(val address: ByteArray) { diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManagerImpl.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManagerImpl.kt index e37b1703fb..b5382cf546 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManagerImpl.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManagerImpl.kt @@ -6,6 +6,7 @@ import android.content.Context import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.utils.toHex import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.BusyException import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.ConnectException import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.CouldNotSendCommandException @@ -31,7 +32,6 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.event.PodEven import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.Command import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.Response import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state.OmnipodDashPodStateManager -import info.nightscout.core.utils.toHex import io.reactivex.rxjava3.core.Observable import java.util.concurrent.CountDownLatch import java.util.concurrent.atomic.AtomicBoolean diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/callbacks/BleCommCallbacks.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/callbacks/BleCommCallbacks.kt index 92f0d14f9c..603b93c21e 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/callbacks/BleCommCallbacks.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/callbacks/BleCommCallbacks.kt @@ -7,10 +7,10 @@ import android.bluetooth.BluetoothGattDescriptor import android.bluetooth.BluetoothProfile import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.utils.toHex import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.io.CharacteristicType.Companion.byValue import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.io.IncomingPackets import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.session.DisconnectHandler -import info.nightscout.core.utils.toHex import java.util.UUID import java.util.concurrent.BlockingQueue import java.util.concurrent.CountDownLatch diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/command/BleCommand.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/command/BleCommand.kt index a8ae365c22..692bc9130f 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/command/BleCommand.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/command/BleCommand.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.command -import info.nightscout.core.utils.toHex +import app.aaps.core.utils.toHex import java.nio.ByteBuffer object BleCommandRTS : BleCommand(BleCommandType.RTS) diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/endecrypt/EnDecrypt.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/endecrypt/EnDecrypt.kt index 08e7f81707..1097e74b99 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/endecrypt/EnDecrypt.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/endecrypt/EnDecrypt.kt @@ -2,8 +2,8 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.endecry import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.utils.toHex import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message.MessagePacket -import info.nightscout.core.utils.toHex import org.spongycastle.crypto.engines.AESEngine import org.spongycastle.crypto.modes.CCMBlockCipher import org.spongycastle.crypto.params.AEADParameters diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotParseMessageException.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotParseMessageException.kt index 22f0529d84..3cbbf20558 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotParseMessageException.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotParseMessageException.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions -import info.nightscout.core.utils.toHex +import app.aaps.core.utils.toHex class CouldNotParseMessageException(val payload: ByteArray) : Exception("Could not parse message payload: ${payload.toHex()}") diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/BleIO.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/BleIO.kt index da41502c48..8b5066768f 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/BleIO.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/BleIO.kt @@ -7,12 +7,12 @@ import android.bluetooth.BluetoothGattCharacteristic import android.bluetooth.BluetoothGattDescriptor import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.utils.toHex import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.callbacks.BleCommCallbacks import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.callbacks.WriteConfirmationError import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.callbacks.WriteConfirmationSuccess import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.command.BleCommandRTS import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.ConnectException -import info.nightscout.core.utils.toHex import java.util.concurrent.BlockingQueue import java.util.concurrent.TimeUnit diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/CrcMismatchException.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/CrcMismatchException.kt index 367a78b5e2..0aadba3f01 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/CrcMismatchException.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/CrcMismatchException.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message -import info.nightscout.core.utils.toHex +import app.aaps.core.utils.toHex class CrcMismatchException(val expected: Long, val actual: Long, val payload: ByteArray) : Exception("CRC mismatch. Actual: $actual. Expected: $expected. Payload: ${payload.toHex()}") diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/IncorrectPacketException.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/IncorrectPacketException.kt index f5fef98783..4e0da525fe 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/IncorrectPacketException.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/IncorrectPacketException.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message -import info.nightscout.core.utils.toHex +import app.aaps.core.utils.toHex class IncorrectPacketException( val payload: ByteArray, diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessageIO.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessageIO.kt index 921bd5e302..1ff6520fc6 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessageIO.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessageIO.kt @@ -2,6 +2,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.utils.toHex import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.command.BleCommand import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.command.BleCommandAbort import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.command.BleCommandCTS @@ -21,7 +22,6 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.io.DataB import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.packet.BlePacket import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.packet.PayloadJoiner import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.packet.PayloadSplitter -import info.nightscout.core.utils.toHex sealed class MessageSendResult object MessageSendSuccess : MessageSendResult() diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/StringLengthPrefixEncoding.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/StringLengthPrefixEncoding.kt index eb79b538fb..6fdc6a8eaf 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/StringLengthPrefixEncoding.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/StringLengthPrefixEncoding.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message +import app.aaps.core.utils.toHex import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.MessageIOException -import info.nightscout.core.utils.toHex import java.nio.ByteBuffer /*** diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/KeyExchange.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/KeyExchange.kt index f19171df6e..ae35b1a863 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/KeyExchange.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/KeyExchange.kt @@ -3,10 +3,10 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.pair import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.utils.toHex import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.MessageIOException import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util.RandomByteGenerator import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util.X25519KeyGenerator -import info.nightscout.core.utils.toHex import org.spongycastle.crypto.engines.AESEngine import org.spongycastle.crypto.macs.CMac import org.spongycastle.crypto.params.KeyParameter diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/LTKExchanger.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/LTKExchanger.kt index ae6739517c..55e6d84802 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/LTKExchanger.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/LTKExchanger.kt @@ -3,6 +3,8 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.pair import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.utils.hexStringToByteArray +import app.aaps.core.utils.toHex import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.Ids import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.MessageIOException import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.PairingException @@ -12,8 +14,6 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message. import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message.StringLengthPrefixEncoding.Companion.parseKeys import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util.RandomByteGenerator import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util.X25519KeyGenerator -import info.nightscout.core.utils.hexStringToByteArray -import info.nightscout.core.utils.toHex internal class LTKExchanger( private val aapsLogger: AAPSLogger, diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/PairResult.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/PairResult.kt index 0e677f4027..0bbde0b42a 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/PairResult.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/PairResult.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.pair -import info.nightscout.core.utils.toHex +import app.aaps.core.utils.toHex data class PairResult(val ltk: ByteArray, val msgSeq: Byte) { init { diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Connection.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Connection.kt index 94b933afb2..5677b8d943 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Connection.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Connection.kt @@ -10,6 +10,7 @@ import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.configuration.Constants import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.utils.toHex import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.Ids import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.ServiceDiscoverer import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.callbacks.BleCommCallbacks @@ -22,7 +23,6 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.io.DataB import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.io.IncomingPackets import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message.MessageIO import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state.OmnipodDashPodStateManager -import info.nightscout.core.utils.toHex import java.util.concurrent.CountDownLatch sealed class ConnectionState diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapAkaAttribute.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapAkaAttribute.kt index 4707ae3ac5..e76b7a9b78 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapAkaAttribute.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapAkaAttribute.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.session +import app.aaps.core.utils.toHex import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.MessageIOException -import info.nightscout.core.utils.toHex import java.util.LinkedList enum class EapAkaAttributeType(val type: Byte) { diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapMessage.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapMessage.kt index 08b0d4ccc3..c23d8458d3 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapMessage.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapMessage.kt @@ -2,8 +2,8 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.session import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.utils.toHex import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.MessageIOException -import info.nightscout.core.utils.toHex import java.nio.ByteBuffer @Suppress("unused") diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Milenage.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Milenage.kt index 8865598ca8..4f2b962ce3 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Milenage.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Milenage.kt @@ -4,7 +4,7 @@ import android.annotation.SuppressLint import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag -import info.nightscout.core.utils.toHex +import app.aaps.core.utils.toHex import org.spongycastle.util.encoders.Hex import java.security.SecureRandom import javax.crypto.Cipher diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Session.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Session.kt index 374afe28e4..d991de1599 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Session.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Session.kt @@ -2,6 +2,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.session import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.utils.toHex import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.Ids import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.endecrypt.EnDecrypt import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.CouldNotParseResponseException @@ -15,7 +16,6 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message. import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message.StringLengthPrefixEncoding.Companion.parseKeys import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.Command import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.Response -import info.nightscout.core.utils.toHex sealed class CommandSendResult object CommandSendSuccess : CommandSendResult() diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/SessionEstablisher.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/SessionEstablisher.kt index 8d6074d7d4..d4a741132a 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/SessionEstablisher.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/SessionEstablisher.kt @@ -3,6 +3,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.session import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.utils.toHex import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.Ids import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.endecrypt.Nonce import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.SessionEstablishmentException @@ -10,7 +11,6 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message. import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message.MessagePacket import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message.MessageSendSuccess import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message.MessageType -import info.nightscout.core.utils.toHex import java.security.SecureRandom class SessionEstablisher( diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodHistoryActivity.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodHistoryActivity.kt index aee75d4179..8c8142184e 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodHistoryActivity.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodHistoryActivity.kt @@ -16,6 +16,8 @@ import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.pump.defs.PumpType import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.rx.AapsSchedulers +import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity +import app.aaps.core.utils.DateTimeUtil import info.nightscout.androidaps.plugins.pump.omnipod.common.definition.OmnipodCommandType import info.nightscout.androidaps.plugins.pump.omnipod.dash.R import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.DashHistory @@ -25,8 +27,6 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.History import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.InitialResult import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.ResolvedResult import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.TempBasalRecord -import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity -import info.nightscout.core.utils.DateTimeUtil import info.nightscout.pump.common.defs.PumpHistoryEntryGroup import info.nightscout.pump.common.utils.ProfileUtil import java.util.Calendar diff --git a/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/endecrypt/EnDecryptTest.kt b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/endecrypt/EnDecryptTest.kt index fd26a0c76c..fac539d635 100644 --- a/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/endecrypt/EnDecryptTest.kt +++ b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/endecrypt/EnDecryptTest.kt @@ -1,8 +1,8 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.endecrypt +import app.aaps.core.utils.toHex import app.aaps.shared.tests.AAPSLoggerTest import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message.MessagePacket -import info.nightscout.core.utils.toHex import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Test import org.spongycastle.util.encoders.Hex diff --git a/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessagePacketTest.kt b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessagePacketTest.kt index e52854ebae..51a93579db 100644 --- a/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessagePacketTest.kt +++ b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessagePacketTest.kt @@ -1,8 +1,8 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message +import app.aaps.core.utils.toHex import com.google.crypto.tink.subtle.Hex import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.Id -import info.nightscout.core.utils.toHex import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Test diff --git a/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadJoinerTest.kt b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadJoinerTest.kt index bc4ee53a2e..983cfdb72f 100644 --- a/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadJoinerTest.kt +++ b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadJoinerTest.kt @@ -1,8 +1,8 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message +import app.aaps.core.utils.toHex import com.google.crypto.tink.subtle.Hex import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.packet.PayloadJoiner -import info.nightscout.core.utils.toHex import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Test diff --git a/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadSplitJoinTest.kt b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadSplitJoinTest.kt index 0241aa3bbd..e37800a571 100644 --- a/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadSplitJoinTest.kt +++ b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadSplitJoinTest.kt @@ -1,8 +1,8 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message +import app.aaps.core.utils.toHex import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.packet.PayloadJoiner import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.packet.PayloadSplitter -import info.nightscout.core.utils.toHex import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Test import java.util.Random diff --git a/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadSplitterTest.kt b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadSplitterTest.kt index ed049b88bc..cbe06539ae 100644 --- a/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadSplitterTest.kt +++ b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadSplitterTest.kt @@ -1,9 +1,9 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message +import app.aaps.core.utils.toHex import com.google.common.truth.Truth.assertThat import com.google.crypto.tink.subtle.Hex import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.packet.PayloadSplitter -import info.nightscout.core.utils.toHex import org.junit.jupiter.api.Test class PayloadSplitterTest { diff --git a/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/StringLengthPrefixEncodingTest.kt b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/StringLengthPrefixEncodingTest.kt index fd015d75aa..6379eaa702 100644 --- a/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/StringLengthPrefixEncodingTest.kt +++ b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/StringLengthPrefixEncodingTest.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message +import app.aaps.core.utils.toHex import com.google.crypto.tink.subtle.Hex -import info.nightscout.core.utils.toHex import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Test diff --git a/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/KeyExchangeTest.kt b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/KeyExchangeTest.kt index e54016f79a..e8a36c089c 100644 --- a/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/KeyExchangeTest.kt +++ b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/KeyExchangeTest.kt @@ -1,11 +1,11 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.pair import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.utils.toHex import app.aaps.shared.tests.AAPSLoggerTest import app.aaps.shared.tests.TestBase import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util.RandomByteGenerator import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util.X25519KeyGenerator -import info.nightscout.core.utils.toHex import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Test import org.mockito.ArgumentMatchers.anyInt diff --git a/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapMessageTest.kt b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapMessageTest.kt index 0151ca5bc5..a17c03a276 100644 --- a/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapMessageTest.kt +++ b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapMessageTest.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.session +import app.aaps.core.utils.toHex import app.aaps.shared.tests.AAPSLoggerTest -import info.nightscout.core.utils.toHex import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Test import org.spongycastle.util.encoders.Hex diff --git a/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/MilenageTest.kt b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/MilenageTest.kt index 55629fc0c3..65152a5f36 100644 --- a/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/MilenageTest.kt +++ b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/MilenageTest.kt @@ -1,9 +1,9 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.session import app.aaps.core.interfaces.configuration.Config +import app.aaps.core.utils.toHex import app.aaps.shared.tests.AAPSLoggerTest import app.aaps.shared.tests.TestBase -import info.nightscout.core.utils.toHex import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Test import org.mockito.Mock diff --git a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPlugin.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPlugin.java index 1dbf640fcd..86d7c7aa81 100644 --- a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPlugin.java +++ b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPlugin.java @@ -30,7 +30,6 @@ import java.util.function.Supplier; import javax.inject.Inject; import javax.inject.Singleton; -import app.aaps.core.main.utils.fabric.FabricPrivacy; import app.aaps.core.interfaces.logging.AAPSLogger; import app.aaps.core.interfaces.logging.LTag; import app.aaps.core.interfaces.notifications.Notification; @@ -68,6 +67,8 @@ import app.aaps.core.interfaces.utils.DecimalFormatter; import app.aaps.core.interfaces.utils.Round; import app.aaps.core.interfaces.utils.T; import app.aaps.core.interfaces.utils.TimeChangeType; +import app.aaps.core.main.utils.fabric.FabricPrivacy; +import app.aaps.core.utils.DateTimeUtil; import dagger.android.HasAndroidInjector; import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst; @@ -109,7 +110,6 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.service.Ri import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.OmnipodErosOverviewFragment; import info.nightscout.androidaps.plugins.pump.omnipod.eros.util.AapsOmnipodUtil; import info.nightscout.androidaps.plugins.pump.omnipod.eros.util.OmnipodAlertUtil; -import info.nightscout.core.utils.DateTimeUtil; import info.nightscout.pump.common.defs.TempBasalPair; import io.reactivex.rxjava3.disposables.CompositeDisposable; diff --git a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/database/ErosHistoryRecordEntity.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/database/ErosHistoryRecordEntity.java index c190e1a631..34c9f93e8d 100644 --- a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/database/ErosHistoryRecordEntity.java +++ b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/database/ErosHistoryRecordEntity.java @@ -4,7 +4,7 @@ import androidx.room.Entity; import androidx.room.Index; import androidx.room.PrimaryKey; -import info.nightscout.core.utils.DateTimeUtil; +import app.aaps.core.utils.DateTimeUtil; /** * Created by andy on 30.11.2019. diff --git a/pump/pump-common/src/main/java/info/nightscout/pump/common/ble/BondStateReceiver.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/ble/BondStateReceiver.kt index f130bfb76d..6f969573cb 100644 --- a/pump/pump-common/src/main/java/info/nightscout/pump/common/ble/BondStateReceiver.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/ble/BondStateReceiver.kt @@ -9,9 +9,9 @@ import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.utils.extensions.safeGetParcelableExtra import com.google.gson.Gson import dagger.android.DaggerBroadcastReceiver -import info.nightscout.core.utils.extensions.safeGetParcelableExtra import info.nightscout.pump.common.events.EventPumpConnectionParametersChanged import javax.inject.Inject diff --git a/pump/virtual/src/main/java/info/nightscout/pump/virtual/VirtualPumpPlugin.kt b/pump/virtual/src/main/java/info/nightscout/pump/virtual/VirtualPumpPlugin.kt index 1b40a5cbdb..c85058413e 100644 --- a/pump/virtual/src/main/java/info/nightscout/pump/virtual/VirtualPumpPlugin.kt +++ b/pump/virtual/src/main/java/info/nightscout/pump/virtual/VirtualPumpPlugin.kt @@ -3,10 +3,6 @@ package info.nightscout.pump.virtual import android.os.SystemClock import androidx.preference.PreferenceFragmentCompat import androidx.preference.SwitchPreference -import app.aaps.core.main.events.EventNewNotification -import app.aaps.core.main.extensions.convertedToAbsolute -import app.aaps.core.main.extensions.plannedRemainingMinutes -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.db.PersistenceLayer import app.aaps.core.interfaces.iob.IobCobCalculator @@ -38,8 +34,12 @@ import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T import app.aaps.core.interfaces.utils.TimeChangeType +import app.aaps.core.main.events.EventNewNotification +import app.aaps.core.main.extensions.convertedToAbsolute +import app.aaps.core.main.extensions.plannedRemainingMinutes +import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.utils.fabric.InstanceId import dagger.android.HasAndroidInjector -import info.nightscout.core.utils.fabric.InstanceId import info.nightscout.pump.virtual.events.EventVirtualPumpUpdateGui import info.nightscout.pump.virtual.extensions.toText import io.reactivex.rxjava3.disposables.CompositeDisposable diff --git a/ui/src/main/java/info/nightscout/ui/activities/SurveyActivity.kt b/ui/src/main/java/info/nightscout/ui/activities/SurveyActivity.kt index fd86adcd21..88b81219b0 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/SurveyActivity.kt +++ b/ui/src/main/java/info/nightscout/ui/activities/SurveyActivity.kt @@ -9,7 +9,7 @@ import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.SafeParse import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import app.aaps.core.ui.toast.ToastUtils -import info.nightscout.core.utils.fabric.InstanceId +import app.aaps.core.utils.fabric.InstanceId import info.nightscout.ui.R import info.nightscout.ui.databinding.ActivitySurveyBinding import info.nightscout.ui.defaultProfile.DefaultProfile diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/CalibrationDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/CalibrationDialog.kt index 38f3712422..241a63d268 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/CalibrationDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/CalibrationDialog.kt @@ -10,10 +10,10 @@ import app.aaps.core.interfaces.logging.UserEntryLogger import app.aaps.core.interfaces.profile.ProfileUtil import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.sync.XDripBroadcast +import app.aaps.core.ui.dialogs.OKDialog +import app.aaps.core.utils.HtmlHelper import com.google.common.base.Joiner import dagger.android.HasAndroidInjector -import app.aaps.core.ui.dialogs.OKDialog -import info.nightscout.core.utils.HtmlHelper import info.nightscout.database.entities.UserEntry.Action import info.nightscout.database.entities.UserEntry.Sources import info.nightscout.database.entities.ValueWithUnit diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/CarbsDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/CarbsDialog.kt index babbdfb01a..7622da623d 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/CarbsDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/CarbsDialog.kt @@ -7,8 +7,6 @@ import android.text.TextWatcher import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import app.aaps.core.main.constraints.ConstraintObject -import app.aaps.core.main.utils.extensions.formatColor import app.aaps.core.interfaces.automation.Automation import app.aaps.core.interfaces.configuration.Constants.CARBS_FAV1_DEFAULT import app.aaps.core.interfaces.configuration.Constants.CARBS_FAV2_DEFAULT @@ -30,11 +28,13 @@ import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.T -import com.google.common.base.Joiner -import dagger.android.HasAndroidInjector +import app.aaps.core.main.constraints.ConstraintObject +import app.aaps.core.main.utils.extensions.formatColor import app.aaps.core.ui.dialogs.OKDialog import app.aaps.core.ui.toast.ToastUtils -import info.nightscout.core.utils.HtmlHelper +import app.aaps.core.utils.HtmlHelper +import com.google.common.base.Joiner +import dagger.android.HasAndroidInjector import info.nightscout.database.entities.TemporaryTarget import info.nightscout.database.entities.UserEntry.Action import info.nightscout.database.entities.UserEntry.Sources diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/CareDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/CareDialog.kt index bc4da61f4f..08bc6be8a3 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/CareDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/CareDialog.kt @@ -8,7 +8,6 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.annotation.StringRes -import app.aaps.core.main.extensions.fromConstant import app.aaps.core.interfaces.configuration.Constants import app.aaps.core.interfaces.db.GlucoseUnit import app.aaps.core.interfaces.iob.GlucoseStatusProvider @@ -20,10 +19,11 @@ import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.T import app.aaps.core.interfaces.utils.Translator +import app.aaps.core.main.extensions.fromConstant +import app.aaps.core.ui.dialogs.OKDialog +import app.aaps.core.utils.HtmlHelper import com.google.common.base.Joiner import dagger.android.HasAndroidInjector -import app.aaps.core.ui.dialogs.OKDialog -import info.nightscout.core.utils.HtmlHelper import info.nightscout.database.entities.TherapyEvent import info.nightscout.database.entities.UserEntry import info.nightscout.database.entities.ValueWithUnit diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/ExtendedBolusDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/ExtendedBolusDialog.kt index 9b4e7da2f1..0f95785baa 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/ExtendedBolusDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/ExtendedBolusDialog.kt @@ -5,8 +5,6 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import app.aaps.core.main.constraints.ConstraintObject -import app.aaps.core.main.utils.extensions.formatColor import app.aaps.core.interfaces.constraints.ConstraintsChecker import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.logging.UserEntryLogger @@ -17,11 +15,13 @@ import app.aaps.core.interfaces.queue.CommandQueue import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.SafeParse -import com.google.common.base.Joiner -import dagger.android.HasAndroidInjector +import app.aaps.core.main.constraints.ConstraintObject +import app.aaps.core.main.utils.extensions.formatColor import app.aaps.core.ui.dialogs.OKDialog import app.aaps.core.ui.toast.ToastUtils -import info.nightscout.core.utils.HtmlHelper +import app.aaps.core.utils.HtmlHelper +import com.google.common.base.Joiner +import dagger.android.HasAndroidInjector import info.nightscout.database.entities.UserEntry import info.nightscout.database.entities.ValueWithUnit import info.nightscout.ui.R diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/FillDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/FillDialog.kt index fd43421117..1987beb112 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/FillDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/FillDialog.kt @@ -5,8 +5,6 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import app.aaps.core.main.constraints.ConstraintObject -import app.aaps.core.main.utils.extensions.formatColor import app.aaps.core.interfaces.constraints.ConstraintsChecker import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.logging.UserEntryLogger @@ -19,11 +17,13 @@ import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.SafeParse -import com.google.common.base.Joiner -import dagger.android.HasAndroidInjector +import app.aaps.core.main.constraints.ConstraintObject +import app.aaps.core.main.utils.extensions.formatColor import app.aaps.core.ui.dialogs.OKDialog import app.aaps.core.ui.toast.ToastUtils -import info.nightscout.core.utils.HtmlHelper +import app.aaps.core.utils.HtmlHelper +import com.google.common.base.Joiner +import dagger.android.HasAndroidInjector import info.nightscout.database.entities.TherapyEvent import info.nightscout.database.entities.UserEntry import info.nightscout.database.entities.ValueWithUnit diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/InsulinDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/InsulinDialog.kt index 673ece2ca0..aff4586db5 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/InsulinDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/InsulinDialog.kt @@ -7,8 +7,6 @@ import android.text.TextWatcher import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import app.aaps.core.main.constraints.ConstraintObject -import app.aaps.core.main.utils.extensions.formatColor import app.aaps.core.interfaces.automation.Automation import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.configuration.Constants.INSULIN_PLUS1_DEFAULT @@ -33,11 +31,13 @@ import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.SafeParse import app.aaps.core.interfaces.utils.T -import com.google.common.base.Joiner -import dagger.android.HasAndroidInjector +import app.aaps.core.main.constraints.ConstraintObject +import app.aaps.core.main.utils.extensions.formatColor import app.aaps.core.ui.dialogs.OKDialog import app.aaps.core.ui.toast.ToastUtils -import info.nightscout.core.utils.HtmlHelper +import app.aaps.core.utils.HtmlHelper +import com.google.common.base.Joiner +import dagger.android.HasAndroidInjector import info.nightscout.database.entities.TemporaryTarget import info.nightscout.database.entities.UserEntry import info.nightscout.database.entities.ValueWithUnit diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/ProfileSwitchDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/ProfileSwitchDialog.kt index ddcf4f977d..3a8d8ead93 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/ProfileSwitchDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/ProfileSwitchDialog.kt @@ -8,7 +8,6 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.ArrayAdapter -import app.aaps.core.main.profile.ProfileSealed import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.configuration.Constants import app.aaps.core.interfaces.extensions.toVisibility @@ -23,10 +22,11 @@ import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.utils.HardLimits import app.aaps.core.interfaces.utils.T -import com.google.common.base.Joiner +import app.aaps.core.main.profile.ProfileSealed import app.aaps.core.ui.dialogs.OKDialog import app.aaps.core.ui.toast.ToastUtils -import info.nightscout.core.utils.HtmlHelper +import app.aaps.core.utils.HtmlHelper +import com.google.common.base.Joiner import info.nightscout.database.entities.TemporaryTarget import info.nightscout.database.entities.UserEntry import info.nightscout.database.entities.ValueWithUnit diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/ProfileViewerDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/ProfileViewerDialog.kt index 75a9803ccd..500c393b5b 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/ProfileViewerDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/ProfileViewerDialog.kt @@ -7,10 +7,6 @@ import android.view.View import android.view.ViewGroup import android.view.Window import android.view.WindowManager -import app.aaps.core.main.R -import app.aaps.core.main.extensions.getCustomizedName -import app.aaps.core.main.extensions.pureProfileFromJson -import app.aaps.core.main.profile.ProfileSealed import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.extensions.toVisibility import app.aaps.core.interfaces.plugin.ActivePlugin @@ -23,9 +19,13 @@ import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.HardLimits +import app.aaps.core.main.R +import app.aaps.core.main.extensions.getCustomizedName +import app.aaps.core.main.extensions.pureProfileFromJson +import app.aaps.core.main.profile.ProfileSealed +import app.aaps.core.utils.HtmlHelper import dagger.android.HasAndroidInjector import dagger.android.support.DaggerDialogFragment -import info.nightscout.core.utils.HtmlHelper import info.nightscout.database.ValueWrapper import info.nightscout.database.impl.AppRepository import info.nightscout.ui.databinding.DialogProfileviewerBinding diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/TempBasalDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/TempBasalDialog.kt index de60a2abdf..a22b0ccb5d 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/TempBasalDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/TempBasalDialog.kt @@ -5,8 +5,6 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import app.aaps.core.main.constraints.ConstraintObject -import app.aaps.core.main.utils.extensions.formatColor import app.aaps.core.interfaces.constraints.ConstraintsChecker import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.logging.UserEntryLogger @@ -20,11 +18,13 @@ import app.aaps.core.interfaces.queue.CommandQueue import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.SafeParse -import com.google.common.base.Joiner -import dagger.android.HasAndroidInjector +import app.aaps.core.main.constraints.ConstraintObject +import app.aaps.core.main.utils.extensions.formatColor import app.aaps.core.ui.dialogs.OKDialog import app.aaps.core.ui.toast.ToastUtils -import info.nightscout.core.utils.HtmlHelper +import app.aaps.core.utils.HtmlHelper +import com.google.common.base.Joiner +import dagger.android.HasAndroidInjector import info.nightscout.database.entities.UserEntry import info.nightscout.database.entities.ValueWithUnit import info.nightscout.ui.R diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/TempTargetDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/TempTargetDialog.kt index 099f323a01..863275febc 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/TempTargetDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/TempTargetDialog.kt @@ -16,11 +16,11 @@ import app.aaps.core.interfaces.profile.ProfileFunction import app.aaps.core.interfaces.profile.ProfileUtil import app.aaps.core.interfaces.protection.ProtectionCheck import app.aaps.core.interfaces.resources.ResourceHelper -import com.google.common.base.Joiner -import com.google.common.collect.Lists import app.aaps.core.ui.dialogs.OKDialog import app.aaps.core.ui.toast.ToastUtils -import info.nightscout.core.utils.HtmlHelper +import app.aaps.core.utils.HtmlHelper +import com.google.common.base.Joiner +import com.google.common.collect.Lists import info.nightscout.database.ValueWrapper import info.nightscout.database.entities.TemporaryTarget import info.nightscout.database.entities.UserEntry diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/TreatmentDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/TreatmentDialog.kt index 692d4ca27d..af75666e83 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/TreatmentDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/TreatmentDialog.kt @@ -7,8 +7,6 @@ import android.text.TextWatcher import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import app.aaps.core.main.constraints.ConstraintObject -import app.aaps.core.main.utils.extensions.formatColor import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.constraints.ConstraintsChecker import app.aaps.core.interfaces.db.PersistenceLayer @@ -23,11 +21,13 @@ import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.SafeParse -import com.google.common.base.Joiner -import dagger.android.HasAndroidInjector +import app.aaps.core.main.constraints.ConstraintObject +import app.aaps.core.main.utils.extensions.formatColor import app.aaps.core.ui.dialogs.OKDialog import app.aaps.core.ui.toast.ToastUtils -import info.nightscout.core.utils.HtmlHelper +import app.aaps.core.utils.HtmlHelper +import com.google.common.base.Joiner +import dagger.android.HasAndroidInjector import info.nightscout.database.entities.UserEntry import info.nightscout.database.entities.ValueWithUnit import info.nightscout.database.impl.AppRepository diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/WizardDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/WizardDialog.kt index 574af384f7..810d5e1621 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/WizardDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/WizardDialog.kt @@ -16,13 +16,6 @@ import android.widget.AdapterView import android.widget.ArrayAdapter import android.widget.CompoundButton import androidx.fragment.app.FragmentManager -import app.aaps.core.main.constraints.ConstraintObject -import app.aaps.core.main.extensions.valueToUnits -import app.aaps.core.main.iob.round -import app.aaps.core.main.profile.ProfileSealed -import app.aaps.core.main.utils.extensions.formatColor -import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.core.main.wizard.BolusWizard import app.aaps.core.interfaces.configuration.Constants import app.aaps.core.interfaces.constraints.ConstraintsChecker import app.aaps.core.interfaces.db.GlucoseUnit @@ -46,10 +39,17 @@ import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.Round import app.aaps.core.interfaces.utils.SafeParse import app.aaps.core.interfaces.utils.T +import app.aaps.core.main.constraints.ConstraintObject +import app.aaps.core.main.extensions.valueToUnits +import app.aaps.core.main.iob.round +import app.aaps.core.main.profile.ProfileSealed +import app.aaps.core.main.utils.extensions.formatColor +import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.main.wizard.BolusWizard +import app.aaps.core.ui.toast.ToastUtils +import app.aaps.core.utils.HtmlHelper import dagger.android.HasAndroidInjector import dagger.android.support.DaggerDialogFragment -import app.aaps.core.ui.toast.ToastUtils -import info.nightscout.core.utils.HtmlHelper import info.nightscout.database.ValueWrapper import info.nightscout.database.impl.AppRepository import info.nightscout.ui.R diff --git a/workflow/src/main/java/info/nightscout/workflow/InvokeLoopWorker.kt b/workflow/src/main/java/info/nightscout/workflow/InvokeLoopWorker.kt index e407e4aa70..6ed5fd1f19 100644 --- a/workflow/src/main/java/info/nightscout/workflow/InvokeLoopWorker.kt +++ b/workflow/src/main/java/info/nightscout/workflow/InvokeLoopWorker.kt @@ -3,12 +3,12 @@ package info.nightscout.workflow import android.content.Context import androidx.work.WorkerParameters import androidx.work.workDataOf -import app.aaps.core.main.utils.worker.LoggingWorker import app.aaps.core.interfaces.aps.Loop import app.aaps.core.interfaces.iob.IobCobCalculator import app.aaps.core.interfaces.rx.events.Event import app.aaps.core.interfaces.rx.events.EventNewBG -import info.nightscout.core.utils.receivers.DataWorkerStorage +import app.aaps.core.main.utils.worker.LoggingWorker +import app.aaps.core.utils.receivers.DataWorkerStorage import kotlinx.coroutines.Dispatchers import javax.inject.Inject diff --git a/workflow/src/main/java/info/nightscout/workflow/LoadBgDataWorker.kt b/workflow/src/main/java/info/nightscout/workflow/LoadBgDataWorker.kt index 843b926712..0d8b7b1202 100644 --- a/workflow/src/main/java/info/nightscout/workflow/LoadBgDataWorker.kt +++ b/workflow/src/main/java/info/nightscout/workflow/LoadBgDataWorker.kt @@ -3,7 +3,6 @@ package info.nightscout.workflow import android.content.Context import androidx.work.WorkerParameters import androidx.work.workDataOf -import app.aaps.core.main.utils.worker.LoggingWorker import app.aaps.core.interfaces.aps.AutosensDataStore import app.aaps.core.interfaces.iob.IobCobCalculator import app.aaps.core.interfaces.logging.AAPSLogger @@ -13,7 +12,8 @@ import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.events.EventBucketedDataCreated import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T -import info.nightscout.core.utils.receivers.DataWorkerStorage +import app.aaps.core.main.utils.worker.LoggingWorker +import app.aaps.core.utils.receivers.DataWorkerStorage import info.nightscout.database.impl.AppRepository import kotlinx.coroutines.Dispatchers import javax.inject.Inject diff --git a/workflow/src/main/java/info/nightscout/workflow/PrepareBasalDataWorker.kt b/workflow/src/main/java/info/nightscout/workflow/PrepareBasalDataWorker.kt index 2630d8162b..c779783801 100644 --- a/workflow/src/main/java/info/nightscout/workflow/PrepareBasalDataWorker.kt +++ b/workflow/src/main/java/info/nightscout/workflow/PrepareBasalDataWorker.kt @@ -5,17 +5,17 @@ import android.graphics.DashPathEffect import android.graphics.Paint import androidx.work.WorkerParameters import androidx.work.workDataOf +import app.aaps.core.interfaces.iob.IobCobCalculator +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.main.events.EventIobCalculationProgress import app.aaps.core.main.graph.OverviewData import app.aaps.core.main.graph.data.ScaledDataPoint import app.aaps.core.main.utils.worker.LoggingWorker import app.aaps.core.main.workflow.CalculationWorkflow -import app.aaps.core.interfaces.iob.IobCobCalculator -import app.aaps.core.interfaces.profile.ProfileFunction -import app.aaps.core.interfaces.resources.ResourceHelper -import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.utils.receivers.DataWorkerStorage import com.jjoe64.graphview.series.LineGraphSeries -import info.nightscout.core.utils.receivers.DataWorkerStorage import kotlinx.coroutines.Dispatchers import javax.inject.Inject diff --git a/workflow/src/main/java/info/nightscout/workflow/PrepareBgDataWorker.kt b/workflow/src/main/java/info/nightscout/workflow/PrepareBgDataWorker.kt index 4c99915f38..6a5044f6f4 100644 --- a/workflow/src/main/java/info/nightscout/workflow/PrepareBgDataWorker.kt +++ b/workflow/src/main/java/info/nightscout/workflow/PrepareBgDataWorker.kt @@ -3,18 +3,18 @@ package info.nightscout.workflow import android.content.Context import androidx.work.WorkerParameters import androidx.work.workDataOf -import app.aaps.core.main.graph.OverviewData -import app.aaps.core.main.graph.data.DataPointWithLabelInterface -import app.aaps.core.main.graph.data.GlucoseValueDataPoint -import app.aaps.core.main.graph.data.PointsWithLabelGraphSeries -import app.aaps.core.main.utils.worker.LoggingWorker import app.aaps.core.interfaces.db.GlucoseUnit import app.aaps.core.interfaces.iob.IobCobCalculator import app.aaps.core.interfaces.profile.DefaultValueHelper import app.aaps.core.interfaces.profile.ProfileUtil import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.utils.Round -import info.nightscout.core.utils.receivers.DataWorkerStorage +import app.aaps.core.main.graph.OverviewData +import app.aaps.core.main.graph.data.DataPointWithLabelInterface +import app.aaps.core.main.graph.data.GlucoseValueDataPoint +import app.aaps.core.main.graph.data.PointsWithLabelGraphSeries +import app.aaps.core.main.utils.worker.LoggingWorker +import app.aaps.core.utils.receivers.DataWorkerStorage import info.nightscout.database.impl.AppRepository import kotlinx.coroutines.Dispatchers import javax.inject.Inject diff --git a/workflow/src/main/java/info/nightscout/workflow/PrepareBucketedDataWorker.kt b/workflow/src/main/java/info/nightscout/workflow/PrepareBucketedDataWorker.kt index 8903b29b06..e07f832bbe 100644 --- a/workflow/src/main/java/info/nightscout/workflow/PrepareBucketedDataWorker.kt +++ b/workflow/src/main/java/info/nightscout/workflow/PrepareBucketedDataWorker.kt @@ -3,16 +3,16 @@ package info.nightscout.workflow import android.content.Context import androidx.work.WorkerParameters import androidx.work.workDataOf +import app.aaps.core.interfaces.iob.IobCobCalculator +import app.aaps.core.interfaces.profile.DefaultValueHelper +import app.aaps.core.interfaces.profile.ProfileFunction +import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.main.graph.OverviewData import app.aaps.core.main.graph.data.DataPointWithLabelInterface import app.aaps.core.main.graph.data.InMemoryGlucoseValueDataPoint import app.aaps.core.main.graph.data.PointsWithLabelGraphSeries import app.aaps.core.main.utils.worker.LoggingWorker -import app.aaps.core.interfaces.iob.IobCobCalculator -import app.aaps.core.interfaces.profile.DefaultValueHelper -import app.aaps.core.interfaces.profile.ProfileFunction -import app.aaps.core.interfaces.resources.ResourceHelper -import info.nightscout.core.utils.receivers.DataWorkerStorage +import app.aaps.core.utils.receivers.DataWorkerStorage import kotlinx.coroutines.Dispatchers import javax.inject.Inject diff --git a/workflow/src/main/java/info/nightscout/workflow/PrepareIobAutosensGraphDataWorker.kt b/workflow/src/main/java/info/nightscout/workflow/PrepareIobAutosensGraphDataWorker.kt index 7be8954d4b..99593c6218 100644 --- a/workflow/src/main/java/info/nightscout/workflow/PrepareIobAutosensGraphDataWorker.kt +++ b/workflow/src/main/java/info/nightscout/workflow/PrepareIobAutosensGraphDataWorker.kt @@ -5,18 +5,6 @@ import android.graphics.DashPathEffect import android.graphics.Paint import androidx.work.WorkerParameters import androidx.work.workDataOf -import app.aaps.core.main.events.EventIobCalculationProgress -import app.aaps.core.main.graph.OverviewData -import app.aaps.core.main.graph.data.DataPointWithLabelInterface -import app.aaps.core.main.graph.data.DeviationDataPoint -import app.aaps.core.main.graph.data.FixedLineGraphSeries -import app.aaps.core.main.graph.data.PointsWithLabelGraphSeries -import app.aaps.core.main.graph.data.Scale -import app.aaps.core.main.graph.data.ScaledDataPoint -import app.aaps.core.main.iob.combine -import app.aaps.core.main.iob.copy -import app.aaps.core.main.utils.worker.LoggingWorker -import app.aaps.core.main.workflow.CalculationWorkflow import app.aaps.core.interfaces.aps.AutosensData import app.aaps.core.interfaces.aps.AutosensResult import app.aaps.core.interfaces.aps.SMBDefaults @@ -29,9 +17,21 @@ import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.main.events.EventIobCalculationProgress +import app.aaps.core.main.graph.OverviewData +import app.aaps.core.main.graph.data.DataPointWithLabelInterface +import app.aaps.core.main.graph.data.DeviationDataPoint +import app.aaps.core.main.graph.data.FixedLineGraphSeries +import app.aaps.core.main.graph.data.PointsWithLabelGraphSeries +import app.aaps.core.main.graph.data.Scale +import app.aaps.core.main.graph.data.ScaledDataPoint +import app.aaps.core.main.iob.combine +import app.aaps.core.main.iob.copy +import app.aaps.core.main.utils.worker.LoggingWorker +import app.aaps.core.main.workflow.CalculationWorkflow +import app.aaps.core.utils.receivers.DataWorkerStorage import com.jjoe64.graphview.series.BarGraphSeries import com.jjoe64.graphview.series.LineGraphSeries -import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.database.ValueWrapper import info.nightscout.database.impl.AppRepository import kotlinx.coroutines.Dispatchers diff --git a/workflow/src/main/java/info/nightscout/workflow/PreparePredictionsWorker.kt b/workflow/src/main/java/info/nightscout/workflow/PreparePredictionsWorker.kt index 9379db54bb..72f3689eae 100644 --- a/workflow/src/main/java/info/nightscout/workflow/PreparePredictionsWorker.kt +++ b/workflow/src/main/java/info/nightscout/workflow/PreparePredictionsWorker.kt @@ -3,11 +3,6 @@ package info.nightscout.workflow import android.content.Context import androidx.work.WorkerParameters import androidx.work.workDataOf -import app.aaps.core.main.graph.OverviewData -import app.aaps.core.main.graph.data.DataPointWithLabelInterface -import app.aaps.core.main.graph.data.GlucoseValueDataPoint -import app.aaps.core.main.graph.data.PointsWithLabelGraphSeries -import app.aaps.core.main.utils.worker.LoggingWorker import app.aaps.core.interfaces.aps.Loop import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.nsclient.ProcessedDeviceStatusData @@ -16,8 +11,13 @@ import app.aaps.core.interfaces.profile.ProfileUtil import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.utils.T +import app.aaps.core.main.graph.OverviewData +import app.aaps.core.main.graph.data.DataPointWithLabelInterface +import app.aaps.core.main.graph.data.GlucoseValueDataPoint +import app.aaps.core.main.graph.data.PointsWithLabelGraphSeries +import app.aaps.core.main.utils.worker.LoggingWorker +import app.aaps.core.utils.receivers.DataWorkerStorage import dagger.android.HasAndroidInjector -import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.database.impl.AppRepository import kotlinx.coroutines.Dispatchers import java.util.Calendar diff --git a/workflow/src/main/java/info/nightscout/workflow/PrepareTemporaryTargetDataWorker.kt b/workflow/src/main/java/info/nightscout/workflow/PrepareTemporaryTargetDataWorker.kt index a68f2c957e..644a781cc9 100644 --- a/workflow/src/main/java/info/nightscout/workflow/PrepareTemporaryTargetDataWorker.kt +++ b/workflow/src/main/java/info/nightscout/workflow/PrepareTemporaryTargetDataWorker.kt @@ -3,19 +3,19 @@ package info.nightscout.workflow import android.content.Context import androidx.work.WorkerParameters import androidx.work.workDataOf -import app.aaps.core.main.events.EventIobCalculationProgress -import app.aaps.core.main.extensions.target -import app.aaps.core.main.graph.OverviewData -import app.aaps.core.main.utils.worker.LoggingWorker -import app.aaps.core.main.workflow.CalculationWorkflow import app.aaps.core.interfaces.aps.Loop import app.aaps.core.interfaces.profile.ProfileFunction import app.aaps.core.interfaces.profile.ProfileUtil import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.main.events.EventIobCalculationProgress +import app.aaps.core.main.extensions.target +import app.aaps.core.main.graph.OverviewData +import app.aaps.core.main.utils.worker.LoggingWorker +import app.aaps.core.main.workflow.CalculationWorkflow +import app.aaps.core.utils.receivers.DataWorkerStorage import com.jjoe64.graphview.series.DataPoint import com.jjoe64.graphview.series.LineGraphSeries -import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.database.ValueWrapper import info.nightscout.database.impl.AppRepository import kotlinx.coroutines.Dispatchers diff --git a/workflow/src/main/java/info/nightscout/workflow/PrepareTreatmentsDataWorker.kt b/workflow/src/main/java/info/nightscout/workflow/PrepareTreatmentsDataWorker.kt index bef591c481..46a09f55a5 100644 --- a/workflow/src/main/java/info/nightscout/workflow/PrepareTreatmentsDataWorker.kt +++ b/workflow/src/main/java/info/nightscout/workflow/PrepareTreatmentsDataWorker.kt @@ -3,6 +3,16 @@ package info.nightscout.workflow import android.content.Context import androidx.work.WorkerParameters import androidx.work.workDataOf +import app.aaps.core.interfaces.db.GlucoseUnit +import app.aaps.core.interfaces.plugin.ActivePlugin +import app.aaps.core.interfaces.profile.DefaultValueHelper +import app.aaps.core.interfaces.profile.ProfileUtil +import app.aaps.core.interfaces.resources.ResourceHelper +import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.Round +import app.aaps.core.interfaces.utils.T +import app.aaps.core.interfaces.utils.Translator import app.aaps.core.main.events.EventIobCalculationProgress import app.aaps.core.main.graph.OverviewData import app.aaps.core.main.graph.data.BolusDataPoint @@ -15,17 +25,7 @@ import app.aaps.core.main.graph.data.PointsWithLabelGraphSeries import app.aaps.core.main.graph.data.TherapyEventDataPoint import app.aaps.core.main.utils.worker.LoggingWorker import app.aaps.core.main.workflow.CalculationWorkflow -import app.aaps.core.interfaces.db.GlucoseUnit -import app.aaps.core.interfaces.plugin.ActivePlugin -import app.aaps.core.interfaces.profile.DefaultValueHelper -import app.aaps.core.interfaces.profile.ProfileUtil -import app.aaps.core.interfaces.resources.ResourceHelper -import app.aaps.core.interfaces.rx.bus.RxBus -import app.aaps.core.interfaces.utils.DecimalFormatter -import app.aaps.core.interfaces.utils.Round -import app.aaps.core.interfaces.utils.T -import app.aaps.core.interfaces.utils.Translator -import info.nightscout.core.utils.receivers.DataWorkerStorage +import app.aaps.core.utils.receivers.DataWorkerStorage import info.nightscout.database.entities.Bolus import info.nightscout.database.entities.TherapyEvent import info.nightscout.database.impl.AppRepository diff --git a/workflow/src/main/java/info/nightscout/workflow/iob/IobCobOref1Worker.kt b/workflow/src/main/java/info/nightscout/workflow/iob/IobCobOref1Worker.kt index 42ce4fb040..282a99b2de 100644 --- a/workflow/src/main/java/info/nightscout/workflow/iob/IobCobOref1Worker.kt +++ b/workflow/src/main/java/info/nightscout/workflow/iob/IobCobOref1Worker.kt @@ -4,10 +4,6 @@ import android.content.Context import android.os.SystemClock import androidx.work.WorkerParameters import androidx.work.workDataOf -import app.aaps.core.main.events.EventIobCalculationProgress -import app.aaps.core.main.extensions.target -import app.aaps.core.main.utils.worker.LoggingWorker -import app.aaps.core.main.workflow.CalculationWorkflow import app.aaps.core.interfaces.aps.AutosensData import app.aaps.core.interfaces.aps.SMBDefaults import app.aaps.core.interfaces.configuration.Config @@ -26,8 +22,12 @@ import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.T +import app.aaps.core.main.events.EventIobCalculationProgress +import app.aaps.core.main.extensions.target +import app.aaps.core.main.utils.worker.LoggingWorker +import app.aaps.core.main.workflow.CalculationWorkflow +import app.aaps.core.utils.receivers.DataWorkerStorage import dagger.android.HasAndroidInjector -import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.database.ValueWrapper import info.nightscout.database.impl.AppRepository import kotlinx.coroutines.Dispatchers diff --git a/workflow/src/main/java/info/nightscout/workflow/iob/IobCobOrefWorker.kt b/workflow/src/main/java/info/nightscout/workflow/iob/IobCobOrefWorker.kt index 3b4534fdf5..c00cdf5bd4 100644 --- a/workflow/src/main/java/info/nightscout/workflow/iob/IobCobOrefWorker.kt +++ b/workflow/src/main/java/info/nightscout/workflow/iob/IobCobOrefWorker.kt @@ -4,9 +4,6 @@ import android.content.Context import android.os.SystemClock import androidx.work.WorkerParameters import androidx.work.workDataOf -import app.aaps.core.main.events.EventIobCalculationProgress -import app.aaps.core.main.utils.worker.LoggingWorker -import app.aaps.core.main.workflow.CalculationWorkflow import app.aaps.core.interfaces.aps.AutosensData import app.aaps.core.interfaces.aps.SMBDefaults import app.aaps.core.interfaces.configuration.Config @@ -25,8 +22,11 @@ import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.T +import app.aaps.core.main.events.EventIobCalculationProgress +import app.aaps.core.main.utils.worker.LoggingWorker +import app.aaps.core.main.workflow.CalculationWorkflow +import app.aaps.core.utils.receivers.DataWorkerStorage import dagger.android.HasAndroidInjector -import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.database.impl.AppRepository import kotlinx.coroutines.Dispatchers import javax.inject.Inject