move more code

app-wear-shared/shared-impl/src/main/java/info/nightscout/shared/impl/di/SharedImplModule.kt

@@ -6,6 +6,7 @@ import dagger.Module
 import dagger.Provides
 import info.nightscout.rx.interfaces.L
 import info.nightscout.shared.impl.logging.LImpl
+import info.nightscout.shared.impl.sharedPreferences.SPImplementation
 import info.nightscout.shared.sharedPreferences.SP
 import javax.inject.Singleton
 
@@ -17,7 +18,7 @@ open class SharedImplModule {
 
     @Provides
     @Singleton
-    fun provideSharedPreferences(context: Context): SP = info.nightscout.shared.impl.sharedPreferences.SPImplementation(PreferenceManager.getDefaultSharedPreferences(context), context)
+    fun provideSharedPreferences(context: Context): SP = SPImplementation(PreferenceManager.getDefaultSharedPreferences(context), context)
 
     @Provides
     @Singleton

app/src/main/java/info/nightscout/androidaps/MainActivity.kt

@@ -37,13 +37,13 @@ import info.nightscout.androidaps.activities.SingleFragmentActivity
 import info.nightscout.androidaps.databinding.ActivityMainBinding
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.constraints.versionChecker.VersionCheckerUtils
-import info.nightscout.androidaps.utils.extensions.isRunningRealPumpTest
 import info.nightscout.androidaps.utils.protection.PasswordCheck
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import info.nightscout.configuration.setupwizard.SetupWizardActivity
-import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.core.ui.UIRunnable
 import info.nightscout.core.ui.dialogs.OKDialog
+import info.nightscout.core.utils.fabric.FabricPrivacy
+import info.nightscout.core.utils.isRunningRealPumpTest
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
 import info.nightscout.interfaces.AndroidPermission

app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt

@@ -19,7 +19,7 @@ import info.nightscout.androidaps.plugins.general.overview.graphData.GraphData
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventIobCalculationProgress
 import info.nightscout.androidaps.utils.DefaultValueHelper
 import info.nightscout.androidaps.workflow.CalculationWorkflow
-import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.rx.AapsSchedulers

app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowserData.kt

@@ -5,7 +5,7 @@ import info.nightscout.androidaps.plugins.general.overview.OverviewData
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.utils.DefaultValueHelper
 import info.nightscout.androidaps.workflow.CalculationWorkflow
-import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.interfaces.profile.ProfileFunction

app/src/main/java/info/nightscout/androidaps/di/AppModule.kt

@@ -8,16 +8,13 @@ import dagger.Provides
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.implementations.ActivityNamesImpl
-import info.nightscout.androidaps.interfaces.stats.DexcomTirCalculator
+import info.nightscout.androidaps.implementations.ConfigImpl
-import info.nightscout.androidaps.interfaces.stats.TddCalculator
-import info.nightscout.androidaps.interfaces.stats.TirCalculator
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
 import info.nightscout.androidaps.plugins.configBuilder.PluginStore
 import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctionImpl
 import info.nightscout.androidaps.plugins.general.maintenance.ImportExportPrefsImpl
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
-import info.nightscout.androidaps.implementations.ConfigImpl
+import info.nightscout.core.utils.fabric.FabricPrivacy
-import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.implementation.AndroidPermissionImpl
 import info.nightscout.implementation.BolusTimerImpl
@@ -52,6 +49,9 @@ import info.nightscout.interfaces.profile.ProfileFunction
 import info.nightscout.interfaces.pump.PumpSync
 import info.nightscout.interfaces.queue.CommandQueue
 import info.nightscout.interfaces.smsCommunicator.SmsCommunicator
+import info.nightscout.interfaces.stats.DexcomTirCalculator
+import info.nightscout.interfaces.stats.TddCalculator
+import info.nightscout.interfaces.stats.TirCalculator
 import info.nightscout.interfaces.storage.FileStorage
 import info.nightscout.interfaces.storage.Storage
 import info.nightscout.interfaces.sync.DataSyncSelector

app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderFragment.kt

@@ -22,7 +22,7 @@ import info.nightscout.androidaps.databinding.ConfigbuilderFragmentBinding
 import info.nightscout.androidaps.plugins.configBuilder.events.EventConfigBuilderUpdateGui
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import info.nightscout.androidaps.utils.protection.ProtectionCheck.Protection.PREFERENCES
-import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.interfaces.plugin.PluginBase

app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImpl.kt

@@ -3,8 +3,8 @@ package info.nightscout.androidaps.plugins.configBuilder
 import info.nightscout.androidaps.data.ProfileSealed
 import info.nightscout.androidaps.events.EventEffectiveProfileSwitchChanged
 import info.nightscout.androidaps.extensions.fromConstant
-import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.core.main.R
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.entities.ProfileSwitch
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.database.impl.ValueWrapper

app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.kt

@@ -20,8 +20,8 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.database.Das
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.history.database.ErosHistoryDatabase
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import info.nightscout.androidaps.utils.protection.ProtectionCheck.Protection.PREFERENCES
-import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.core.ui.dialogs.OKDialog
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
 import info.nightscout.database.impl.AppRepository

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

@@ -45,7 +45,6 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.OmnipodErosPumpPlugi
 import info.nightscout.androidaps.utils.DefaultValueHelper
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import info.nightscout.automation.AutomationPlugin
-import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.core.iob.displayText
 import info.nightscout.core.profile.toSignedUnitsString
 import info.nightscout.core.profile.toTargetRangeString
@@ -54,6 +53,7 @@ import info.nightscout.core.ui.UIRunnable
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.elements.SingleClickButton
 import info.nightscout.core.ui.toast.ToastUtils
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.core.wizard.QuickWizard
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources

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

@@ -12,7 +12,7 @@ import androidx.annotation.StringRes
 import androidx.appcompat.widget.PopupMenu
 import com.google.gson.Gson
 import info.nightscout.androidaps.R
-import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.aps.Loop
 import info.nightscout.rx.bus.RxBus

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

@@ -16,8 +16,8 @@ import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNo
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventUpdateOverviewCalcProgress
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventIobCalculationProgress
-import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.core.ui.dialogs.OKDialog
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.Overview
 import info.nightscout.interfaces.plugin.PluginBase

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

@@ -21,8 +21,8 @@ import info.nightscout.androidaps.databinding.OverviewQuickwizardlistItemBinding
 import info.nightscout.androidaps.plugins.general.overview.dialogs.EditQuickWizardDialog
 import info.nightscout.androidaps.plugins.general.overview.events.EventQuickWizardChange
 import info.nightscout.androidaps.utils.ActionModeHelper
-import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.core.ui.dialogs.OKDialog
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.core.wizard.QuickWizard
 import info.nightscout.core.wizard.QuickWizardEntry
 import info.nightscout.interfaces.dragHelpers.ItemTouchHelperAdapter

app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.kt

@@ -6,7 +6,7 @@ import android.content.Intent
 import android.os.Binder
 import android.os.IBinder
 import dagger.android.DaggerService
-import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.interfaces.NotificationHolder
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus

app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.kt

@@ -12,10 +12,10 @@ import info.nightscout.androidaps.extensions.toStringShort
 import info.nightscout.androidaps.extensions.valueToUnitsString
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.androidaps.utils.DecimalFormatter
-import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.core.iob.generateCOBString
 import info.nightscout.core.iob.round
 import info.nightscout.core.profile.toSignedUnitsString
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.interfaces.Constants
 import info.nightscout.interfaces.NotificationHolder
 import info.nightscout.interfaces.iob.IobCobCalculator

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

@@ -6,7 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.databinding.WearFragmentBinding
-import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.plugins.sync.nsShared.events.EventNSClientUpdateGUI
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus

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

@@ -3,14 +3,14 @@ package info.nightscout.androidaps.plugins.general.wear
 import android.content.Context
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.plugins.aps.loop.events.EventLoopUpdateGui
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissBolusProgressIfRunning
 import info.nightscout.androidaps.plugins.general.wear.wearintegration.DataHandlerMobile
 import info.nightscout.androidaps.plugins.general.wear.wearintegration.DataLayerListenerServiceMobileHelper
-import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.interfaces.plugin.PluginDescription
 import info.nightscout.interfaces.plugin.PluginType
+import info.nightscout.plugins.aps.loop.events.EventLoopUpdateGui
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.EventAutosensCalculationFinished

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

@@ -16,13 +16,13 @@ import info.nightscout.androidaps.receivers.ReceiverStatusStore
 import info.nightscout.androidaps.services.AlarmSoundServiceHelper
 import info.nightscout.androidaps.utils.DecimalFormatter
 import info.nightscout.androidaps.utils.DefaultValueHelper
-import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.core.iob.generateCOBString
 import info.nightscout.core.iob.round
 import info.nightscout.core.profile.fromMgdlToUnits
 import info.nightscout.core.profile.toMgdl
 import info.nightscout.core.profile.toTargetRangeString
 import info.nightscout.core.ui.toast.ToastUtils
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.core.wizard.BolusWizard
 import info.nightscout.core.wizard.QuickWizard
 import info.nightscout.core.wizard.QuickWizardEntry

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

@@ -20,7 +20,7 @@ import info.nightscout.androidaps.plugins.general.wear.WearPlugin
 import info.nightscout.androidaps.plugins.general.wear.events.EventWearUpdateGui
 import info.nightscout.androidaps.receivers.ReceiverStatusStore
 import info.nightscout.androidaps.utils.DefaultValueHelper
-import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.aps.Loop

app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt

@@ -13,12 +13,12 @@ import info.nightscout.androidaps.extensions.toTemporaryBasal
 import info.nightscout.androidaps.plugins.general.overview.OverviewData
 import info.nightscout.androidaps.utils.DecimalFormatter
 import info.nightscout.androidaps.workflow.CalculationWorkflow
-import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.core.iob.combine
 import info.nightscout.core.iob.copy
 import info.nightscout.core.iob.determineBasalJson
 import info.nightscout.core.iob.plus
 import info.nightscout.core.iob.round
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.entities.Bolus
 import info.nightscout.database.entities.ExtendedBolus
 import info.nightscout.database.entities.TemporaryBasal

app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Worker.kt

@@ -11,12 +11,10 @@ import info.nightscout.androidaps.extensions.target
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.data.AutosensDataObject
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventIobCalculationProgress
-import info.nightscout.sensitivity.SensitivityAAPSPlugin
-import info.nightscout.sensitivity.SensitivityWeightedAveragePlugin
 import info.nightscout.androidaps.receivers.DataWorkerStorage
 import info.nightscout.androidaps.utils.DecimalFormatter
 import info.nightscout.androidaps.workflow.CalculationWorkflow
-import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.database.impl.ValueWrapper
 import info.nightscout.interfaces.Config
@@ -33,6 +31,8 @@ import info.nightscout.rx.events.Event
 import info.nightscout.rx.events.EventAutosensCalculationFinished
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
+import info.nightscout.sensitivity.SensitivityAAPSPlugin
+import info.nightscout.sensitivity.SensitivityWeightedAveragePlugin
 import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
 import info.nightscout.shared.utils.DateUtil

app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOrefWorker.kt

@@ -10,12 +10,10 @@ import info.nightscout.androidaps.R
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.data.AutosensDataObject
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventIobCalculationProgress
-import info.nightscout.sensitivity.SensitivityAAPSPlugin
-import info.nightscout.sensitivity.SensitivityWeightedAveragePlugin
 import info.nightscout.androidaps.receivers.DataWorkerStorage
 import info.nightscout.androidaps.utils.DecimalFormatter
 import info.nightscout.androidaps.workflow.CalculationWorkflow
-import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.Constants
@@ -31,6 +29,8 @@ import info.nightscout.rx.events.Event
 import info.nightscout.rx.events.EventAutosensCalculationFinished
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
+import info.nightscout.sensitivity.SensitivityAAPSPlugin
+import info.nightscout.sensitivity.SensitivityWeightedAveragePlugin
 import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
 import info.nightscout.shared.utils.DateUtil

app/src/main/java/info/nightscout/androidaps/receivers/BTReceiver.kt

@@ -4,7 +4,7 @@ import android.bluetooth.BluetoothDevice
 import android.content.Context
 import android.content.Intent
 import dagger.android.DaggerBroadcastReceiver
-import info.nightscout.androidaps.extensions.safeGetParcelableExtra
+import info.nightscout.core.utils.extensions.safeGetParcelableExtra
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.EventBTChange
 import javax.inject.Inject

app/src/main/java/info/nightscout/androidaps/receivers/DataReceiver.kt

@@ -6,6 +6,11 @@ import android.provider.Telephony
 import androidx.work.Data
 import androidx.work.OneTimeWorkRequest
 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.interfaces.receivers.Intents
+import info.nightscout.plugins.general.smsCommunicator.SmsCommunicatorPlugin
 import info.nightscout.plugins.source.AidexPlugin
 import info.nightscout.plugins.source.DexcomPlugin
 import info.nightscout.plugins.source.EversensePlugin
@@ -14,11 +19,6 @@ import info.nightscout.plugins.source.MM640gPlugin
 import info.nightscout.plugins.source.PoctechPlugin
 import info.nightscout.plugins.source.TomatoPlugin
 import info.nightscout.plugins.source.XdripPlugin
-import info.nightscout.androidaps.utils.extensions.copyDouble
-import info.nightscout.androidaps.utils.extensions.copyLong
-import info.nightscout.androidaps.utils.extensions.copyString
-import info.nightscout.interfaces.receivers.Intents
-import info.nightscout.plugins.general.smsCommunicator.SmsCommunicatorPlugin
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.BundleLogger
 import info.nightscout.rx.logging.LTag

app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveWorker.kt

@@ -16,7 +16,7 @@ import info.nightscout.androidaps.BuildConfig
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.ProfileSealed
 import info.nightscout.androidaps.plugins.general.maintenance.MaintenancePlugin
-import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.LocalAlertUtils

app/src/main/java/info/nightscout/androidaps/workflow/CalculationWorkflow.kt

@@ -15,9 +15,8 @@ import info.nightscout.androidaps.plugins.general.overview.OverviewData
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobOref1Worker
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobOrefWorker
-import info.nightscout.sensitivity.SensitivityOref1Plugin
 import info.nightscout.androidaps.receivers.DataWorkerStorage
-import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.interfaces.iob.IobCobCalculator
 import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.rx.AapsSchedulers
@@ -29,6 +28,7 @@ import info.nightscout.rx.events.EventPreferenceChange
 import info.nightscout.rx.events.EventTherapyEventChange
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
+import info.nightscout.sensitivity.SensitivityOref1Plugin
 import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.utils.DateUtil
 import io.reactivex.rxjava3.disposables.CompositeDisposable

app/src/main/java/info/nightscout/androidaps/workflow/LoadBgDataWorker.kt

@@ -6,12 +6,12 @@ import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.receivers.DataWorkerStorage
+import info.nightscout.core.aps.loadBgData
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.interfaces.iob.IobCobCalculator
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.shared.utils.DateUtil
-import loadBgData
 import javax.inject.Inject
 
 class LoadBgDataWorker(

app/src/main/res/values/strings.xml

@@ -30,7 +30,6 @@
     <string name="tr_lang" translatable="false">Turkish</string>
     <string name="key_smscommunicator_settings" translatable="false">smscommunicator</string>
     <string name="key_protection_settings" translatable="false">protection</string>
-    <string name="key_absorption_category_settings" translatable="false">absorption_category_settings</string>
     <string name="key_last_cleanup_run" translatable="false">last_cleanup_run</string>
     <string name="nav_preferences_plugin">%1$s Preferences</string>
     <string name="nav_preferences">Preferences</string>
@@ -114,13 +113,8 @@
     <string name="ns_announcements">Create notifications from NS announcements</string>
     <string name="ns_alarm_stale_data_value_label">Stale data threshold [min]</string>
     <string name="ns_alarm_urgent_stale_data_value_label">Urgent stale data threshold [min]</string>
-    <string name="openapsama_autosens_period">Interval for autosens [h]</string>
-    <string name="openapsama_autosens_period_summary">Amount of hours in the past for sensitivity detection (carbs absorption time is excluded)</string>
     <string name="openaps">OpenAPS</string>
     <string name="uploader">Uploader</string>
-    <string name="absorptionsettings_title">Absorption settings</string>
-    <string name="absorption_maxtime_title">Meal max absorption time [h]</string>
-    <string name="absorption_maxtime_summary">Time in hours where is expected all carbs from meal will be absorbed</string>
     <string name="keep_screen_on_title">Keep screen on</string>
     <string name="keep_screen_on_summary">Prevent Android to turn screen off. It will consume lot of energy when not plugged to power outlet.</string>
     <string name="sensitivity_warning">By turning on Autosense feature remember to enter all eated carbs. Otherwise carbs deviations will be identified wrong as sensitivity change !!</string>
@@ -181,8 +175,6 @@
     <string name="overview_show_basals">Basals</string>
     <string name="engineering_mode_enabled">Engineering mode enabled</string>
     <string name="iobcobcalculator" translatable="false">IobCobCalculator</string>
-    <string name="absorption_cutoff_title">Meal max absorption time [h]</string>
-    <string name="absorption_cutoff_summary">Time at which any meal is considered absorbed. Remaining carbs will be cut off.</string>
     <string name="overview_show_notes_field_in_dialogs_title">Show notes field in treatment dialogs</string>
     <string name="firstinsulinincrement">First insulin increment</string>
     <string name="secondinsulinincrement">Second insulin increment</string>
@@ -191,8 +183,6 @@
     <string name="secondcarbsincrement">Second carbs increment</string>
     <string name="thirdcarbsincrement">Third carbs increment</string>
     <string name="cgm">CGM</string>
-    <string name="openapsama_autosens_max">Max autosens ratio</string>
-    <string name="openapsama_autosens_min">Min autosens ratio</string>
     <string name="key_wearwizard_bg" translatable="false">wearwizard_bg</string>
     <string name="key_wearwizard_tt" translatable="false">wearwizard_tt</string>
     <string name="key_wearwizard_trend" translatable="false">wearwizard_trend</string>

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

@@ -5,8 +5,8 @@ import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.data.ProfileSealed
 import info.nightscout.androidaps.extensions.pureProfileFromJson
-import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.core.profile.ProfileStoreObject
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.entities.EffectiveProfileSwitch
 import info.nightscout.database.entities.embedments.InsulinConfiguration
 import info.nightscout.interfaces.Config

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

@@ -8,7 +8,7 @@ import info.nightscout.androidaps.R
 import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.receivers.ReceiverStatusStore
-import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.constraints.Constraints

core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/PrefsFileContract.kt

@@ -4,8 +4,8 @@ import android.content.Context
 import android.content.Intent
 import androidx.activity.result.contract.ActivityResultContract
 import androidx.fragment.app.FragmentActivity
-import info.nightscout.androidaps.extensions.safeGetParcelableExtra
 import info.nightscout.androidaps.plugins.general.maintenance.activities.PrefImportListActivity
+import info.nightscout.core.utils.extensions.safeGetParcelableExtra
 import info.nightscout.interfaces.maintenance.PrefsFile
 
 class PrefsFileContract : ActivityResultContract<Void?, PrefsFile?>() {

core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats/EncryptedPrefsFormat.kt

@@ -1,9 +1,9 @@
 package info.nightscout.androidaps.plugins.general.maintenance.formats
 
-import info.nightscout.androidaps.extensions.hexStringToByteArray
-import info.nightscout.androidaps.extensions.toHex
 import info.nightscout.androidaps.utils.CryptoUtil
 import info.nightscout.core.main.R
+import info.nightscout.core.utils.hexStringToByteArray
+import info.nightscout.core.utils.toHex
 import info.nightscout.interfaces.maintenance.PrefFileNotFoundError
 import info.nightscout.interfaces.maintenance.PrefFormatError
 import info.nightscout.interfaces.maintenance.PrefIOError

core/core-main/src/main/java/info/nightscout/androidaps/plugins/pump/common/ble/BlePreCheck.kt

@@ -11,9 +11,9 @@ import android.provider.Settings
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
-import info.nightscout.androidaps.extensions.safeEnable
 import info.nightscout.core.main.R
 import info.nightscout.core.ui.dialogs.OKDialog
+import info.nightscout.core.utils.extensions.safeEnable
 import info.nightscout.shared.interfaces.ResourceHelper
 import javax.inject.Inject
 import javax.inject.Singleton

core/core-main/src/main/java/info/nightscout/androidaps/utils/CryptoUtil.kt

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.utils
 
-import info.nightscout.androidaps.extensions.toHex
+import info.nightscout.core.utils.toHex
 import info.nightscout.rx.logging.AAPSLogger
 import org.spongycastle.util.encoders.Base64
 import java.nio.ByteBuffer

core/core-main/src/main/java/info/nightscout/core/aps/AutosensDataStoreExtension.kt

@@ -1,7 +1,9 @@
-import info.nightscout.rx.events.EventBucketedDataCreated
+package info.nightscout.core.aps
+
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.interfaces.aps.AutosensDataStore
 import info.nightscout.rx.bus.RxBus
+import info.nightscout.rx.events.EventBucketedDataCreated
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
 import info.nightscout.shared.utils.DateUtil

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

@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.extensions
+package info.nightscout.core.pump
 
 import info.nightscout.androidaps.utils.DecimalFormatter
 import info.nightscout.interfaces.profile.Profile

core/core-main/src/main/java/info/nightscout/core/wizard/BolusWizard.kt

@@ -4,7 +4,6 @@ import android.content.Context
 import android.text.Spanned
 import com.google.common.base.Joiner
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.extensions.formatColor
 import info.nightscout.androidaps.extensions.highValueToUnitsToString
 import info.nightscout.androidaps.extensions.lowValueToUnitsToString
 import info.nightscout.androidaps.logging.UserEntryLogger
@@ -14,6 +13,7 @@ import info.nightscout.core.main.R
 import info.nightscout.core.profile.fromMgdlToUnits
 import info.nightscout.core.profile.toMgdl
 import info.nightscout.core.ui.dialogs.OKDialog
+import info.nightscout.core.utils.extensions.formatColor
 import info.nightscout.database.entities.BolusCalculatorResult
 import info.nightscout.database.entities.OfflineEvent
 import info.nightscout.database.entities.TemporaryTarget

core/core-main/src/test/java/info/nightscout/androidaps/pump/common/utils/DateTimeUtilUTest.java

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.pump.common.utils;
 import org.junit.Assert;
 import org.junit.Test;
 
-import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil;
+import info.nightscout.core.utils.DateTimeUtil;
 
 public class DateTimeUtilUTest {
 
@@ -13,7 +13,7 @@ public class DateTimeUtilUTest {
         long dt1 = 20191001182301L;
         long dt2 = 20191001192805L;
 
-        int aTechDateDifferenceAsMinutes = DateTimeUtil.getATechDateDiferenceAsMinutes(dt1, dt2);
+        int aTechDateDifferenceAsMinutes = DateTimeUtil.getATechDateDifferenceAsMinutes(dt1, dt2);
 
         Assert.assertEquals(65, aTechDateDifferenceAsMinutes);
 

core/utils/build.gradle

@@ -30,4 +30,7 @@ dependencies {
     //    api "com.google.firebase:firebase-messaging-ktx"
     //    api 'com.google.firebase:firebase-auth-ktx'
     //    api 'com.google.firebase:firebase-database-ktx'
+
+    //WorkManager
+    api "androidx.work:work-runtime:$work_version" // DataWorkerStorage
 }

core/utils/src/main/java/info/nightscout/core/utils/Concurrency.kt

@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.extensions
+package info.nightscout.core.utils
 
 @Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN", "NOTHING_TO_INLINE")
 inline fun Any.wait() = (this as Object).wait()

core/utils/src/main/java/info/nightscout/core/utils/DateTimeUtil.java

@@ -1,6 +1,6 @@
-package info.nightscout.androidaps.plugins.pump.common.utils;
+package info.nightscout.core.utils;
 
-/**
+/*
  * Created by andy on 10/25/18.
  */
 
@@ -119,7 +119,7 @@ public class DateTimeUtil {
         return toATechDate(gc);
     }
 
-
+/*
     public static boolean isSameDay(LocalDateTime ldt1, LocalDateTime ldt2) {
 
         return (ldt1.getYear() == ldt2.getYear() && //
@@ -127,7 +127,7 @@ public class DateTimeUtil {
                 ldt1.getDayOfMonth() == ldt2.getDayOfMonth());
 
     }
-
+*/
 
     public static boolean isSameDay(long ldt1, long ldt2) {
 
@@ -226,6 +226,7 @@ public class DateTimeUtil {
     }
 
 
+/*
     public static boolean isSameDayATDAndMillis(long atechDateTime, long timeInMillis) {
 
         GregorianCalendar dt = new GregorianCalendar();
@@ -235,6 +236,7 @@ public class DateTimeUtil {
 
         return (isSameDay(atechDateTime, entryDate));
     }
+*/
 
 
     public static long toMillisFromATD(long atechDateTime) {
@@ -245,13 +247,13 @@ public class DateTimeUtil {
     }
 
 
-    public static int getATechDateDiferenceAsMinutes(Long date1, Long date2) {
+    public static int getATechDateDifferenceAsMinutes(Long date1, Long date2) {
         Minutes minutes = Minutes.minutesBetween(toLocalDateTime(date1), toLocalDateTime(date2));
         return minutes.getMinutes();
     }
 
 
-    public static int getATechDateDiferenceAsSeconds(Long date1, Long date2) {
+    public static int getATechDateDifferenceAsSeconds(Long date1, Long date2) {
         Seconds seconds = Seconds.secondsBetween(toLocalDateTime(date1), toLocalDateTime(date2));
         return seconds.getSeconds();
     }
@@ -273,12 +275,14 @@ public class DateTimeUtil {
     }
 
 
+/*
     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);
@@ -286,9 +290,11 @@ public class DateTimeUtil {
         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);

core/utils/src/main/java/info/nightscout/core/utils/EspressoTestHelper.kt

@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.utils.extensions
+package info.nightscout.core.utils
 
 @Synchronized
 fun isRunningTest(): Boolean {

core/utils/src/main/java/info/nightscout/core/utils/HexByteArrayConversion.kt

@@ -1,6 +1,6 @@
-package info.nightscout.androidaps.extensions
+package info.nightscout.core.utils
 
-import java.util.*
+import java.util.Locale
 
 private val HEX_CHARS = "0123456789abcdef".toCharArray()
 

core/utils/src/main/java/info/nightscout/core/utils/extensions/BluetoothAdapterExtension.kt

@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.extensions
+package info.nightscout.core.utils.extensions
 
 import android.bluetooth.BluetoothAdapter
 import android.os.SystemClock

core/utils/src/main/java/info/nightscout/core/utils/extensions/HtmlString.kt

@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.extensions
+package info.nightscout.core.utils.extensions
 
 import android.content.Context
 import androidx.annotation.AttrRes

core/utils/src/main/java/info/nightscout/core/utils/extensions/IntentExtension.kt

@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.extensions
+package info.nightscout.core.utils.extensions
 
 import android.content.Intent
 import java.io.Serializable

core/utils/src/main/java/info/nightscout/core/utils/extensions/WorkerDataBuilder.kt

@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.utils.extensions
+package info.nightscout.core.utils.extensions
 
 import android.os.Bundle
 import androidx.work.Data

core/utils/src/main/java/info/nightscout/core/utils/fabric/FabricPrivacy.kt

@@ -1,4 +1,4 @@
-package info.nightscout.core.fabric
+package info.nightscout.core.utils.fabric
 
 import android.os.Bundle
 import com.google.firebase.analytics.FirebaseAnalytics
@@ -36,6 +36,7 @@ class FabricPrivacy @Inject constructor(
     }
 
     // Analytics logCustom
+    @Suppress("unused")
     fun logCustom(name: String, event: Bundle) {
         try {
             if (fabricEnabled()) {
@@ -51,6 +52,7 @@ class FabricPrivacy @Inject constructor(
     }
 
     // Analytics logCustom
+    @Suppress("unused")
     fun logCustom(event: Bundle) {
         try {
             if (fabricEnabled()) {

core/utils/src/main/java/info/nightscout/core/utils/fabric/InstanceId.kt

@@ -1,4 +1,4 @@
-package info.nightscout.core.fabric
+package info.nightscout.core.utils.fabric
 
 import com.google.firebase.installations.FirebaseInstallations
 

implementation/src/main/java/info/nightscout/implementation/di/ImplementationModule.kt

@@ -4,7 +4,7 @@ import android.content.Context
 import dagger.Module
 import dagger.Provides
 import info.nightscout.androidaps.plugins.general.maintenance.PrefFileListProvider
-import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.implementation.HardLimitsImpl
 import info.nightscout.implementation.logging.LoggerUtilsImpl

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

@@ -15,8 +15,8 @@ import info.nightscout.androidaps.extensions.getCustomizedName
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissBolusProgressIfRunning
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
-import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.core.pump.insertCarbsTransaction
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.entities.EffectiveProfileSwitch
 import info.nightscout.database.entities.ProfileSwitch
 import info.nightscout.database.entities.interfaces.end

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

@@ -5,9 +5,9 @@ import android.content.Context
 import android.os.Build
 import android.os.PowerManager
 import android.os.SystemClock
-import info.nightscout.androidaps.extensions.safeDisable
-import info.nightscout.androidaps.extensions.safeEnable
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissBolusProgressIfRunning
+import info.nightscout.core.utils.extensions.safeDisable
+import info.nightscout.core.utils.extensions.safeEnable
 import info.nightscout.implementation.R
 import info.nightscout.interfaces.AndroidPermission
 import info.nightscout.interfaces.Config

implementation/src/main/java/info/nightscout/implementation/resources/ResourceHelperImpl.kt

@@ -18,9 +18,9 @@ import androidx.annotation.StringRes
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.appcompat.view.ContextThemeWrapper
 import androidx.core.content.ContextCompat
-import info.nightscout.core.ui.getThemeColor
-import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.core.main.R
+import info.nightscout.core.ui.getThemeColor
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.shared.interfaces.ResourceHelper
 import java.util.Locale
 import javax.inject.Inject

implementation/src/main/java/info/nightscout/implementation/stats/DexcomTirCalculatorImpl.kt

@@ -4,10 +4,10 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.view.ViewGroup
 import android.widget.TableLayout
-import info.nightscout.androidaps.interfaces.stats.DexcomTIR
-import info.nightscout.androidaps.interfaces.stats.DexcomTirCalculator
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.interfaces.profile.ProfileFunction
+import info.nightscout.interfaces.stats.DexcomTIR
+import info.nightscout.interfaces.stats.DexcomTirCalculator
 import info.nightscout.interfaces.utils.MidnightTime
 import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.utils.DateUtil

implementation/src/main/java/info/nightscout/implementation/stats/DexcomTirImpl.kt

@@ -6,13 +6,13 @@ import android.graphics.Typeface
 import android.view.Gravity
 import android.widget.TableRow
 import android.widget.TextView
-import info.nightscout.androidaps.interfaces.stats.DexcomTIR
 import info.nightscout.core.profile.toCurrentUnitsString
 import info.nightscout.core.profile.toUnitsString
 import info.nightscout.implementation.R
 import info.nightscout.interfaces.Constants
 import info.nightscout.interfaces.profile.Profile
 import info.nightscout.interfaces.profile.ProfileFunction
+import info.nightscout.interfaces.stats.DexcomTIR
 import java.util.Calendar
 import kotlin.math.pow
 import kotlin.math.roundToInt

implementation/src/main/java/info/nightscout/implementation/stats/TddCalculatorImpl.kt

@@ -10,7 +10,6 @@ import android.widget.TableRow
 import android.widget.TextView
 import info.nightscout.androidaps.extensions.toTableRow
 import info.nightscout.androidaps.extensions.toTableRowHeader
-import info.nightscout.androidaps.interfaces.stats.TddCalculator
 import info.nightscout.database.entities.Bolus
 import info.nightscout.database.entities.TotalDailyDose
 import info.nightscout.database.entities.embedments.InterfaceIDs
@@ -20,6 +19,7 @@ import info.nightscout.implementation.R
 import info.nightscout.interfaces.iob.IobCobCalculator
 import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.interfaces.profile.ProfileFunction
+import info.nightscout.interfaces.stats.TddCalculator
 import info.nightscout.interfaces.utils.MidnightTime
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag

implementation/src/main/java/info/nightscout/implementation/stats/TirCalculatorImpl.kt

@@ -8,14 +8,14 @@ import android.view.Gravity
 import android.view.ViewGroup
 import android.widget.TableLayout
 import android.widget.TextView
-import info.nightscout.androidaps.interfaces.stats.TIR
-import info.nightscout.androidaps.interfaces.stats.TirCalculator
 import info.nightscout.core.profile.toCurrentUnitsString
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.implementation.R
 import info.nightscout.interfaces.Constants
 import info.nightscout.interfaces.profile.Profile
 import info.nightscout.interfaces.profile.ProfileFunction
+import info.nightscout.interfaces.stats.TIR
+import info.nightscout.interfaces.stats.TirCalculator
 import info.nightscout.interfaces.utils.MidnightTime
 import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.utils.DateUtil

implementation/src/main/java/info/nightscout/implementation/stats/TirImpl.kt

@@ -5,10 +5,10 @@ import android.content.Context
 import android.view.Gravity
 import android.widget.TableRow
 import android.widget.TextView
-import info.nightscout.shared.interfaces.ResourceHelper
-import info.nightscout.androidaps.interfaces.stats.TIR
-import info.nightscout.shared.utils.DateUtil
 import info.nightscout.implementation.R
+import info.nightscout.interfaces.stats.TIR
+import info.nightscout.shared.interfaces.ResourceHelper
+import info.nightscout.shared.utils.DateUtil
 
 class TirImpl(override val date: Long, override val lowThreshold: Double, override val highThreshold: Double) : TIR {
 

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

@@ -5,8 +5,8 @@ import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.data.ProfileSealed
 import info.nightscout.androidaps.extensions.pureProfileFromJson
-import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.core.profile.ProfileStoreObject
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.entities.EffectiveProfileSwitch
 import info.nightscout.database.entities.embedments.InsulinConfiguration
 import info.nightscout.interfaces.Config

implementation/src/test/java/info/nightscout/implementation/BolusTimerImplTest.kt

@@ -7,7 +7,7 @@ import info.nightscout.androidaps.TestBase
 import info.nightscout.automation.AutomationPlugin
 import info.nightscout.automation.services.LocationServiceHelper
 import info.nightscout.automation.triggers.Trigger
-import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.GlucoseUnit
 import info.nightscout.interfaces.aps.Loop

implementation/src/test/java/info/nightscout/implementation/CarbTimerImplTest.kt

@@ -7,7 +7,7 @@ import info.nightscout.androidaps.TestBase
 import info.nightscout.automation.AutomationPlugin
 import info.nightscout.automation.services.LocationServiceHelper
 import info.nightscout.automation.triggers.Trigger
-import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.GlucoseUnit
 import info.nightscout.interfaces.aps.Loop

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

@@ -7,7 +7,7 @@ import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBaseWithProfile
 import info.nightscout.androidaps.TestPumpPlugin
-import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.entities.Bolus
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.database.impl.ValueWrapper

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

@@ -30,7 +30,7 @@ import info.nightscout.androidaps.plugins.pump.insight.descriptors.InsightState;
 import info.nightscout.androidaps.plugins.pump.insight.descriptors.TotalDailyDose;
 import info.nightscout.androidaps.plugins.pump.insight.events.EventLocalInsightUpdateGUI;
 import info.nightscout.androidaps.utils.DecimalFormatter;
-import info.nightscout.core.fabric.FabricPrivacy;
+import info.nightscout.core.utils.fabric.FabricPrivacy;
 import info.nightscout.interfaces.queue.Callback;
 import info.nightscout.interfaces.queue.CommandQueue;
 import info.nightscout.rx.AapsSchedulers;

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

@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.insight;
 
-import static info.nightscout.androidaps.extensions.PumpStateExtensionKt.convertedToAbsolute;
+import static info.nightscout.core.pump.PumpStateExtensionKt.convertedToAbsolute;
-import static info.nightscout.androidaps.extensions.PumpStateExtensionKt.getPlannedRemainingMinutes;
+import static info.nightscout.core.pump.PumpStateExtensionKt.getPlannedRemainingMinutes;
 
 import android.app.NotificationChannel;
 import android.app.NotificationManager;

insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingActivity.java

@@ -33,13 +33,13 @@ import java.util.List;
 import javax.inject.Inject;
 
 import info.nightscout.androidaps.activities.NoSplashAppCompatActivity;
-import info.nightscout.androidaps.extensions.BluetoothAdapterExtensionKt;
-import info.nightscout.androidaps.extensions.IntentExtensionKt;
 import info.nightscout.androidaps.insight.R;
 import info.nightscout.androidaps.plugins.pump.common.ble.BlePreCheck;
 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;
 import info.nightscout.interfaces.pump.PumpSync;
 
 public class InsightPairingActivity extends NoSplashAppCompatActivity implements InsightConnectionService.StateCallback, View.OnClickListener, InsightConnectionService.ExceptionCallback {

insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ConnectionEstablisher.java

@@ -8,7 +8,8 @@ import java.io.IOException;
 import java.lang.reflect.Method;
 import java.util.UUID;
 
-import info.nightscout.androidaps.extensions.BluetoothAdapterExtensionKt;
+import info.nightscout.core.utils.extensions.BluetoothAdapterExtensionKt;
+
 public class ConnectionEstablisher extends Thread {
 
     private final Callback callback;

interfaces/src/main/java/info/nightscout/interfaces/stats/DexcomTIR.kt

@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.interfaces.stats
+package info.nightscout.interfaces.stats
 
 import android.content.Context
 import android.widget.TableRow

interfaces/src/main/java/info/nightscout/interfaces/stats/DexcomTirCalculator.kt

@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.interfaces.stats
+package info.nightscout.interfaces.stats
 
 import android.content.Context
 import android.widget.TableLayout

interfaces/src/main/java/info/nightscout/interfaces/stats/TIR.kt

@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.interfaces.stats
+package info.nightscout.interfaces.stats
 
 import android.content.Context
 import android.widget.TableRow

interfaces/src/main/java/info/nightscout/interfaces/stats/TddCalculator.kt

@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.interfaces.stats
+package info.nightscout.interfaces.stats
 
 import android.content.Context
 import android.util.LongSparseArray

interfaces/src/main/java/info/nightscout/interfaces/stats/TirCalculator.kt

@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.interfaces.stats
+package info.nightscout.interfaces.stats
 
 import android.content.Context
 import android.util.LongSparseArray

plugins/aps/src/main/java/info/nightscout/plugins/aps/OpenAPSFragment.kt

@@ -13,7 +13,7 @@ import android.view.ViewGroup
 import androidx.core.view.MenuProvider
 import androidx.lifecycle.Lifecycle
 import dagger.android.support.DaggerFragment
-import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.plugins.aps.databinding.OpenapsFragmentBinding
 import info.nightscout.plugins.aps.events.EventOpenAPSUpdateGui

plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt

@@ -5,8 +5,8 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.annotations.OpenForTesting
 import info.nightscout.androidaps.extensions.target
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
-import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.core.utils.MidnightUtils
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.database.impl.ValueWrapper
 import info.nightscout.interfaces.aps.APS

plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMBDynamicISF/DetermineBasalAdapterSMBDynamicISFJS.kt

@@ -4,7 +4,6 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.extensions.convertedToAbsolute
 import info.nightscout.androidaps.extensions.getPassedDurationToTimeInMinutes
 import info.nightscout.androidaps.extensions.plannedRemainingMinutes
-import info.nightscout.androidaps.interfaces.stats.TddCalculator
 import info.nightscout.core.profile.toMgdl
 import info.nightscout.interfaces.GlucoseUnit
 import info.nightscout.interfaces.aps.DetermineBasalAdapter
@@ -16,6 +15,7 @@ import info.nightscout.interfaces.iob.MealData
 import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.interfaces.profile.Profile
 import info.nightscout.interfaces.profile.ProfileFunction
+import info.nightscout.interfaces.stats.TddCalculator
 import info.nightscout.interfaces.utils.Round
 import info.nightscout.plugins.aps.R
 import info.nightscout.plugins.aps.logger.LoggerCallback

plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneFragment.kt

@@ -21,10 +21,10 @@ import dagger.android.HasAndroidInjector
 import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.data.ProfileSealed
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.core.profile.ProfileStoreObject
 import info.nightscout.core.profile.fromMgdlToUnits
 import info.nightscout.core.ui.dialogs.OKDialog
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.ValueWithUnit
 import info.nightscout.interfaces.Constants

plugins/aps/src/main/res/values/strings.xml

@@ -109,8 +109,6 @@
     <string name="carbs_req_threshold_summary">Minimum grams of carbs to display a carbs suggestion alert. Carbs suggestions below this number will not trigger a notification.</string>
     <string name="lgs_threshold_summary">BG value below which insulin is suspended. Default value uses standard target model. User can set value between 60mg/dl (3.3mmol/l) and 100mg/dl(5.5mmol/l). Values below 65/3.6 result in use of default model</string>
     <string name="lgs_threshold_title">BG level below which low glucose suspend occurs</string>
-    <string name="openapsama_autosens_max_summary">Default value: 1.2\nThis is a multiplier cap for autosens (and soon autotune) to set a 20%% max limit on how high the autosens ratio can be, which in turn determines how high autosens can adjust basals, how low it can adjust ISF, and how low it can set the BG target.</string>
-    <string name="openapsama_autosens_min_summary">Default value: 0.7\nThe other side of the autosens safety limits, putting a cap on how low autosens can adjust basals, and how high it can adjust ISF and BG targets.</string>
 
     <string name="increasing_max_basal">Increasing max basal value because setting is lower than your max basal in profile</string>
     <string name="max_basal_multiplier">max basal multiplier</string>

plugins/aps/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt

@@ -5,8 +5,8 @@ import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.data.ProfileSealed
 import info.nightscout.androidaps.extensions.pureProfileFromJson
-import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.core.profile.ProfileStoreObject
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.entities.EffectiveProfileSwitch
 import info.nightscout.database.entities.embedments.InsulinConfiguration
 import info.nightscout.interfaces.Config

plugins/automation/src/main/java/info/nightscout/automation/AutomationFragment.kt

@@ -31,8 +31,8 @@ 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 info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.core.ui.dialogs.OKDialog
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
 import info.nightscout.interfaces.dragHelpers.ItemTouchHelperAdapter

plugins/automation/src/main/java/info/nightscout/automation/AutomationPlugin.kt

@@ -39,7 +39,7 @@ import info.nightscout.automation.triggers.TriggerTempTargetValue
 import info.nightscout.automation.triggers.TriggerTime
 import info.nightscout.automation.triggers.TriggerTimeRange
 import info.nightscout.automation.triggers.TriggerWifiSsid
-import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.aps.Loop
 import info.nightscout.interfaces.constraints.Constraints

plugins/automation/src/main/java/info/nightscout/automation/dialogs/EditEventDialog.kt

@@ -21,8 +21,8 @@ import info.nightscout.automation.events.EventAutomationDataChanged
 import info.nightscout.automation.events.EventAutomationUpdateAction
 import info.nightscout.automation.events.EventAutomationUpdateGui
 import info.nightscout.automation.events.EventAutomationUpdateTrigger
-import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.core.ui.toast.ToastUtils
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.shared.extensions.toVisibility

plugins/automation/src/main/java/info/nightscout/automation/dialogs/EditTriggerDialog.kt

@@ -14,7 +14,7 @@ import info.nightscout.automation.events.EventTriggerRemove
 import info.nightscout.automation.triggers.Trigger
 import info.nightscout.automation.triggers.TriggerConnector
 import info.nightscout.automation.triggers.TriggerDummy
-import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
 import io.reactivex.rxjava3.disposables.CompositeDisposable

plugins/automation/src/main/java/info/nightscout/automation/services/LocationService.kt

@@ -18,7 +18,7 @@ import com.google.android.gms.location.LocationServices
 import dagger.android.DaggerService
 import info.nightscout.automation.R
 import info.nightscout.automation.events.EventLocationChange
-import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.interfaces.NotificationHolder
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus

plugins/automation/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt

@@ -5,8 +5,8 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.data.ProfileSealed
 import info.nightscout.androidaps.extensions.pureProfileFromJson
 import info.nightscout.androidaps.utils.DefaultValueHelper
-import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.core.profile.ProfileStoreObject
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.plugin.ActivePlugin

plugins/configuration/src/main/java/info/nightscout/configuration/setupwizard/SWDefinition.kt

@@ -9,7 +9,6 @@ import androidx.appcompat.app.AppCompatActivity
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.data.ProfileSealed
 import info.nightscout.androidaps.utils.CryptoUtil
-import info.nightscout.androidaps.utils.extensions.isRunningTest
 import info.nightscout.configuration.R
 import info.nightscout.configuration.setupwizard.elements.SWBreak
 import info.nightscout.configuration.setupwizard.elements.SWButton
@@ -24,6 +23,7 @@ import info.nightscout.configuration.setupwizard.elements.SWInfoText
 import info.nightscout.configuration.setupwizard.elements.SWPlugin
 import info.nightscout.configuration.setupwizard.elements.SWPreference
 import info.nightscout.configuration.setupwizard.elements.SWRadioButton
+import info.nightscout.core.utils.isRunningTest
 import info.nightscout.interfaces.AndroidPermission
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.ConfigBuilder

plugins/configuration/src/main/java/info/nightscout/configuration/setupwizard/SetupWizardActivity.kt

@@ -9,8 +9,8 @@ import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
 import info.nightscout.configuration.R
 import info.nightscout.configuration.databinding.ActivitySetupwizardBinding
 import info.nightscout.configuration.setupwizard.elements.SWItem
-import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.core.ui.dialogs.OKDialog
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.interfaces.locale.LocaleHelper.update
 import info.nightscout.interfaces.ui.ActivityNames
 import info.nightscout.rx.AapsSchedulers

plugins/main/src/main/java/info/nightscout/plugins/aps/loop/LoopFragment.kt

@@ -12,8 +12,8 @@ import android.view.ViewGroup
 import androidx.core.view.MenuProvider
 import androidx.lifecycle.Lifecycle
 import dagger.android.support.DaggerFragment
-import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.core.pump.toHtml
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.interfaces.aps.Loop
 import info.nightscout.interfaces.constraints.Constraint
 import info.nightscout.interfaces.utils.HtmlHelper

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

@@ -20,7 +20,7 @@ import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.receivers.ReceiverStatusStore
-import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.entities.OfflineEvent
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources

plugins/main/src/main/java/info/nightscout/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt

@@ -1,7 +1,7 @@
 package info.nightscout.plugins.constraints.bgQualityCheck
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.interfaces.constraints.Constraint
 import info.nightscout.interfaces.constraints.Constraints
 import info.nightscout.interfaces.iob.IobCobCalculator

plugins/main/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesFragment.kt

@@ -18,8 +18,8 @@ import androidx.recyclerview.widget.RecyclerView
 import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.receivers.ReceiverStatusStore
-import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.core.ui.dialogs.OKDialog
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
 import info.nightscout.database.entities.ValueWithUnit

plugins/main/src/main/java/info/nightscout/plugins/constraints/objectives/dialogs/NtpProgressDialog.kt

@@ -6,9 +6,9 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import dagger.android.support.DaggerDialogFragment
-import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.core.main.R
 import info.nightscout.core.main.databinding.DialogBolusprogressBinding
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.EventNtpStatus

plugins/main/src/main/java/info/nightscout/plugins/general/actions/ActionsFragment.kt

@@ -14,10 +14,10 @@ import info.nightscout.androidaps.extensions.toStringMedium
 import info.nightscout.androidaps.extensions.toStringShort
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
-import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.core.ui.UIRunnable
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.elements.SingleClickButton
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
 import info.nightscout.database.impl.AppRepository

plugins/main/src/main/java/info/nightscout/plugins/general/dataBroadcaster/DataBroadcastPlugin.kt

@@ -10,8 +10,8 @@ import info.nightscout.androidaps.extensions.toStringFull
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.androidaps.receivers.ReceiverStatusStore
 import info.nightscout.androidaps.utils.DefaultValueHelper
-import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.core.iob.round
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.aps.Loop
 import info.nightscout.interfaces.iob.IobCobCalculator

plugins/main/src/main/java/info/nightscout/plugins/general/food/FoodFragment.kt

@@ -15,8 +15,8 @@ import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import info.nightscout.core.ui.UIRunnable
-import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.core.ui.dialogs.OKDialog
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.entities.Food
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources

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

@@ -5,7 +5,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import dagger.android.support.DaggerFragment
-import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.interfaces.smsCommunicator.Sms
 import info.nightscout.interfaces.smsCommunicator.SmsCommunicator
 import info.nightscout.interfaces.utils.HtmlHelper

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

@@ -19,12 +19,12 @@ import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProv
 import info.nightscout.androidaps.receivers.DataWorkerStorage
 import info.nightscout.androidaps.utils.DecimalFormatter
 import info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
-import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.core.iob.generateCOBString
 import info.nightscout.core.iob.round
 import info.nightscout.core.profile.toCurrentUnits
 import info.nightscout.core.profile.toMgdl
 import info.nightscout.core.profile.toUnitsString
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.entities.OfflineEvent
 import info.nightscout.database.entities.TemporaryTarget
 import info.nightscout.database.entities.UserEntry.Action

plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/activities/SmsCommunicatorOtpActivity.kt

@@ -14,9 +14,9 @@ import com.google.common.primitives.Ints.min
 import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel
 import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
 import info.nightscout.interfaces.smsCommunicator.SmsCommunicator

plugins/main/src/main/java/info/nightscout/plugins/general/xdripStatusline/StatusLinePlugin.kt

@@ -6,10 +6,10 @@ import android.os.Bundle
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.extensions.toStringShort
 import info.nightscout.androidaps.utils.DecimalFormatter
-import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.core.iob.generateCOBString
 import info.nightscout.core.iob.round
 import info.nightscout.core.profile.fromMgdlToUnits
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.interfaces.aps.Loop
 import info.nightscout.interfaces.iob.IobCobCalculator
 import info.nightscout.interfaces.plugin.PluginBase

plugins/main/src/main/java/info/nightscout/plugins/profile/ProfileFragment.kt

@@ -14,9 +14,9 @@ import info.nightscout.androidaps.data.ProfileSealed
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.utils.DecimalFormatter
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
-import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.core.profile.fromMgdlToUnits
 import info.nightscout.core.ui.dialogs.OKDialog
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.ValueWithUnit
 import info.nightscout.interfaces.Constants

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

@@ -8,7 +8,7 @@ import android.view.View
 import android.view.ViewGroup
 import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.extensions.toStringFull
-import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.interfaces.iob.IobCobCalculator
 import info.nightscout.interfaces.profile.ProfileFunction
 import info.nightscout.plugins.R

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

@@ -8,7 +8,8 @@ import info.nightscout.androidaps.dialogs.BolusProgressDialog
 import info.nightscout.androidaps.extensions.convertedToAbsolute
 import info.nightscout.androidaps.extensions.plannedRemainingMinutes
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
-import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.utils.fabric.FabricPrivacy
+import info.nightscout.core.utils.fabric.InstanceId
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.iob.IobCobCalculator
 import info.nightscout.interfaces.notifications.Notification
@@ -383,7 +384,7 @@ open class VirtualPumpPlugin @Inject constructor(
 
     override fun model(): PumpType = pumpDescription.pumpType
 
-    override fun serialNumber(): String = info.nightscout.core.fabric.InstanceId.instanceId
+    override fun serialNumber(): String = InstanceId.instanceId
 
     override fun shortStatus(veryShort: Boolean): String = "Virtual Pump"
 

plugins/main/src/main/java/info/nightscout/plugins/source/BGSourceFragment.kt

@@ -19,8 +19,8 @@ import info.nightscout.androidaps.extensions.directionToIcon
 import info.nightscout.androidaps.extensions.valueToUnitsString
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.utils.ActionModeHelper
-import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.core.ui.dialogs.OKDialog
+import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.entities.GlucoseValue
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources