Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev

app-wear-shared/rx/build.gradle

@@ -1,14 +1,15 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-kapt'
-apply plugin: 'kotlin-allopen'
-apply plugin: 'com.hiya.jacoco-android'
-apply plugin: 'kotlinx-serialization'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-kapt'
+    id 'kotlin-allopen'
+    id 'com.hiya.jacoco-android'
+    id 'kotlinx-serialization'
+}
 
-apply from: "${project.rootDir}/core/android_dependencies.gradle"
-apply from: "${project.rootDir}/core/android_module_dependencies.gradle"
-apply from: "${project.rootDir}/core/test_dependencies.gradle"
-apply from: "${project.rootDir}/core/jacoco_global.gradle"
+apply from: "${project.rootDir}/core/core-main/android_dependencies.gradle"
+apply from: "${project.rootDir}/core/core-main/android_module_dependencies.gradle"
+apply from: "${project.rootDir}/core/core-main/jacoco_global.gradle"
 
 android {
 

app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventRefreshButtonState.kt

@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.common.events
+package info.nightscout.rx.events
 
 import info.nightscout.rx.events.Event
 

app-wear-shared/shared-impl/build.gradle

@@ -1,14 +1,14 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-kapt'
-apply plugin: 'kotlin-allopen'
-apply plugin: 'com.hiya.jacoco-android'
-apply plugin: 'kotlinx-serialization'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-kapt'
+    id 'kotlin-allopen'
+    id 'com.hiya.jacoco-android'
+    id 'kotlinx-serialization'
+}
 
-apply from: "${project.rootDir}/core/android_dependencies.gradle"
-apply from: "${project.rootDir}/core/android_module_dependencies.gradle"
-//apply from: "${project.rootDir}/core/test_dependencies.gradle"
-//apply from: "${project.rootDir}/core/jacoco_global.gradle"
+apply from: "${project.rootDir}/core/core-main/android_dependencies.gradle"
+apply from: "${project.rootDir}/core/core-main/android_module_dependencies.gradle"
 
 android {
 

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

@@ -1,5 +1,7 @@
-package info.nightscout.rx.di
+package info.nightcout.shared.impl.di
 
+import android.content.Context
+import androidx.preference.PreferenceManager
 import dagger.Module
 import dagger.Provides
 import info.nightcout.shared.impl.logging.LImpl
@@ -13,6 +15,10 @@ import javax.inject.Singleton
 )
 open class SharedImplModule {
 
+    @Provides
+    @Singleton
+    fun provideSharedPreferences(context: Context): SP = info.nightcout.shared.impl.sharedPreferences.SPImplementation(PreferenceManager.getDefaultSharedPreferences(context), context)
+
     @Provides
     @Singleton
     fun provideL(sp: SP): L = LImpl(sp)

app-wear-shared/shared-impl/src/main/java/info/nightcout/shared/impl/sharedPreferences/Delegates.kt

@@ -1,5 +1,6 @@
-package info.nightscout.shared.sharedPreferences
+package info.nightcout.shared.impl.sharedPreferences
 
+import info.nightscout.shared.sharedPreferences.SP
 import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty
 

app-wear-shared/shared-impl/src/main/java/info/nightcout/shared/impl/sharedPreferences/SPImplementation.kt

@@ -1,10 +1,11 @@
-package info.nightscout.shared.sharedPreferences
+package info.nightcout.shared.impl.sharedPreferences
 
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.SharedPreferences
 import androidx.annotation.StringRes
 import info.nightscout.shared.SafeParse
+import info.nightscout.shared.sharedPreferences.SP
 import javax.inject.Inject
 import javax.inject.Singleton
 

app-wear-shared/shared/build.gradle

@@ -1,14 +1,17 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-kapt'
-apply plugin: 'kotlin-allopen'
-apply plugin: 'com.hiya.jacoco-android'
-apply plugin: 'kotlinx-serialization'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-kapt'
+    id 'kotlinx-serialization'
+    id 'kotlin-allopen'
+    id 'com.hiya.jacoco-android'
+}
 
-apply from: "${project.rootDir}/core/android_dependencies.gradle"
-apply from: "${project.rootDir}/core/android_module_dependencies.gradle"
-apply from: "${project.rootDir}/core/test_dependencies.gradle"
-apply from: "${project.rootDir}/core/jacoco_global.gradle"
+apply from: "${project.rootDir}/core/core-main/android_dependencies.gradle"
+apply from: "${project.rootDir}/core/core-main/android_module_dependencies.gradle"
+apply from: "${project.rootDir}/core/core-main/allopen_dependencies.gradle"
+apply from: "${project.rootDir}/core/core-main/test_dependencies.gradle"
+apply from: "${project.rootDir}/core/core-main/jacoco_global.gradle"
 
 android {
 
@@ -31,7 +34,7 @@ dependencies {
     api 'org.slf4j:slf4j-api:1.7.36' // 2.0.x breaks logging. Code change needed
     api 'com.github.tony19:logback-android:2.0.0'
 
-    api "org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1"
+    api "org.jetbrains.kotlinx:kotlinx-serialization-json:$serialization_version"
     api "org.apache.commons:commons-lang3:$commonslang3_version"
 
     //RxBus

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

@@ -1,20 +1,10 @@
 package info.nightscout.shared.di
 
-import android.content.Context
-import androidx.preference.PreferenceManager
 import dagger.Module
-import dagger.Provides
-import info.nightscout.shared.sharedPreferences.SP
-import info.nightscout.shared.sharedPreferences.SPImplementation
-import javax.inject.Singleton
 
 @Module(
     includes = [
     ]
 )
 open class SharedModule {
-
-    @Provides
-    @Singleton
-    fun provideSharedPreferences(context: Context): SP = SPImplementation(PreferenceManager.getDefaultSharedPreferences(context), context)
 }

app-wear-shared/shared/src/main/java/info/nightscout/shared/extensions/PackageManagerExtension.kt

@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.extensions
+package info.nightscout.shared.extensions
 
 import android.content.Intent
 import android.content.pm.PackageInfo

app-wear-shared/shared/src/main/java/info/nightscout/shared/extensions/UIUtils.kt

@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.extensions
+package info.nightscout.shared.extensions
 
 import android.os.Handler
 import android.os.Looper

app-wear-shared/shared/src/main/java/info/nightscout/shared/interfaces/ResourceHelper.kt

@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.interfaces
+package info.nightscout.shared.interfaces
 
 import android.content.Context
 import android.content.res.AssetFileDescriptor

app-wear-shared/shared/src/main/java/info/nightscout/shared/utils/DateUtil.kt

@@ -1,11 +1,11 @@
-package info.nightscout.androidaps.utils
+package info.nightscout.shared.utils
 
 import android.content.Context
 import android.os.Build
 import androidx.annotation.RequiresApi
 import androidx.collection.LongSparseArray
 import info.nightscout.androidaps.annotations.OpenForTesting
-import info.nightscout.androidaps.interfaces.ResourceHelper
+import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.R
 import info.nightscout.shared.SafeParse
 import org.apache.commons.lang3.time.DateUtils.isSameDay
@@ -119,10 +119,10 @@ class DateUtil @Inject constructor(private val context: Context) {
         val beginOfToday = beginOfDay(now())
         return if (mills < now()) // Past
             when {
-                mills > beginOfToday -> rh.gs(R.string.today)
+                mills > beginOfToday                     -> rh.gs(R.string.today)
                 mills > beginOfToday - T.days(1).msecs() -> rh.gs(R.string.yesterday)
                 mills > beginOfToday - T.days(7).msecs() -> dayAgo(mills, rh, true)
-                else -> day
+                else                                     -> day
             }
         else // Future
             when {

app-wear-shared/shared/src/main/java/info/nightscout/shared/utils/T.kt

@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.utils
+package info.nightscout.shared.utils
 
 @Suppress("SpellCheckingInspection")
 class T(val time: Long = 0L) {

app/build.gradle

@@ -1,13 +1,16 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-kapt'
-apply plugin: 'kotlin-allopen'
-apply plugin: 'com.google.gms.google-services'
-apply plugin: 'com.hiya.jacoco-android'
-apply plugin: 'com.google.firebase.crashlytics'
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+    id 'kotlin-kapt'
+    id 'kotlin-allopen'
+    id 'com.hiya.jacoco-android'
+    id 'kotlinx-serialization'
+    id 'com.google.gms.google-services'
+    id 'com.google.firebase.crashlytics'
+}
 
-apply from: "${project.rootDir}/core/android_dependencies.gradle"
-apply from: "${project.rootDir}/core/jacoco_global.gradle"
+apply from: "${project.rootDir}/core/core-main/android_dependencies.gradle"
+apply from: "${project.rootDir}/core/core-main/jacoco_global.gradle"
 
 repositories {
     mavenCentral()
@@ -105,7 +108,7 @@ android {
     defaultConfig {
         multiDexEnabled true
         versionCode 1500
-        version "3.1.0.3-dev-c"
+        version "3.1.0.3-dev-c-nscv3"
         buildConfigField "String", "VERSION", '"' + version + '"'
         buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"'
         buildConfigField "String", "REMOTE", '"' + generateGitRemote() + '"'
@@ -178,15 +181,19 @@ dependencies {
     // https://github.com/nightscout/iconify.git
     implementation project(':graphview')
     implementation project(':libraries')
+    implementation project(':ns-sdk')
     implementation project(':app-wear-shared:rx')
     implementation project(':app-wear-shared:shared')
     implementation project(':app-wear-shared:shared-impl')
-    implementation project(':core')
+    implementation project(':core:core-main')
+    implementation project(':core:fabric')
     implementation project(':interfaces')
     implementation project(':ui')
     implementation project(':plugins')
     implementation project(':implementation')
-    implementation project(':database')
+    implementation project(':database:entities')
+    implementation project(':database:entities')
+    implementation project(':database:impl')
     implementation project(':pump:combo')
     implementation project(':pump:dana')
     implementation project(':pump:danars')
@@ -196,6 +203,7 @@ dependencies {
     implementation project(':insight')
     implementation project(':pump:medtronic')
     implementation project(':pump:pump-common')
+    implementation project(':pump:pump-core')
     implementation project(':pump:rileylink')
     implementation project(':pump:omnipod-common')
     implementation project(':pump:omnipod-eros')
@@ -208,15 +216,21 @@ dependencies {
     /* Dagger2 - We are going to use dagger.android which includes
      * support for Activity and fragment injection so we need to include
      * the following dependencies */
-    annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version"
-    annotationProcessor "com.google.dagger:dagger-android-processor:$dagger_version"
     kapt "com.google.dagger:dagger-android-processor:$dagger_version"
-
-    /* Dagger2 - default dependency */
     kapt "com.google.dagger:dagger-compiler:$dagger_version"
+
+    // MainApp
+    api "com.uber.rxdogtag2:rxdogtag:2.0.1"
+
+    // Overview
+    api 'com.google.android.flexbox:flexbox:3.0.0'
+
+    // APS
+    api 'org.mozilla:rhino:1.7.14'
+
 }
 
-apply from: "${project.rootDir}/core/test_dependencies.gradle"
+apply from: "${project.rootDir}/core/core-main/test_dependencies.gradle"
 
 
 /*

app/src/androidTest/java/info/nightscout/androidaps/RealPumpTest.kt

@@ -77,7 +77,7 @@ class RealPumpTest {
         configBuilderPlugin.performPluginSwitch(loopPlugin, true, PluginType.LOOP)
 
         // Enable common
-        configBuilderPlugin.performPluginSwitch(actionsPlugin, true, PluginType.GENERAL)
+        configBuilderPlugin.performPluginSwitch(actionsPlugin, true, )
 
         // Disable unneeded
         MainApp.getPluginsList().remove(objectivesPlugin)

app/src/androidTest/java/info/nightscout/androidaps/SetupWizardActivityTest.kt

@@ -169,7 +169,7 @@ adb shell settings put global animator_duration_scale 0 &
         Assert.assertEquals(1.1, p.getBasalTimeFromMidnight(0), 0.0001)
         Assert.assertEquals(6.0 * Constants.MMOLL_TO_MGDL, p.targetLowMgdl, 0.0001)
         Assert.assertTrue(VirtualPumpPlugin.getPlugin().isEnabled(PluginType.PUMP))
-        Assert.assertTrue(OpenAPSSMBPlugin.getPlugin().isEnabled(PluginType.APS))
+        Assert.assertTrue(OpenAPSSMBPlugin.getPlugin().isEnabled())
         Assert.assertTrue(LoopPlugin.getPlugin().isEnabled(PluginType.LOOP))
         Assert.assertTrue(SensitivityOref1Plugin.getPlugin().isEnabled(PluginType.SENSITIVITY))
         Assert.assertTrue(ObjectivesPlugin.objectives[0].isStarted)

app/src/main/AndroidManifest.xml

@@ -171,16 +171,12 @@
                     android:scheme="wear" />
             </intent-filter>
         </service>
-        <service
-            android:name=".plugins.general.nsclient.services.NSClientService"
-            android:enabled="true"
-            android:exported="true" />
         <service
             android:name=".services.AlarmSoundService"
             android:enabled="true"
             android:exported="true" />
         <service
-            android:name=".plugins.general.overview.notifications.DismissNotificationService"
+            android:name="info.nightscout.plugins.general.overview.notifications.DismissNotificationService"
             android:exported="false" />
 
         <service android:name=".plugins.general.persistentNotification.DummyService" />

app/src/main/assets/OpenAPSSMBDynamicISF/determine-basal.js

@@ -208,7 +208,7 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
     //*********************************************************************************
 
     console.error("---------------------------------------------------------");
-    console.error( " Dynamic ISF version Beta 1.6.5 ");
+    console.error( " Dynamic ISF version Beta 2.0 ");
     console.error("---------------------------------------------------------");
 
     var variable_sens = profile.variable_sens;
@@ -579,9 +579,14 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
             // for IOBpredBGs, predicted deviation impact drops linearly from current deviation down to zero
             // over 60 minutes (data points every 5m)
             var predDev = ci * ( 1 - Math.min(1,IOBpredBGs.length/(60/5)) );
-            IOBpredBG = IOBpredBGs[IOBpredBGs.length-1] + predBGI + predDev;
+            //IOBpredBG = IOBpredBGs[IOBpredBGs.length-1] + predBGI + predDev;
+             IOBpredBG = IOBpredBGs[IOBpredBGs.length-1] + (round(( -iobTick.activity * (1800 / ( TDD * (Math.log((Math.max( IOBpredBGs[IOBpredBGs.length-1],39) / insulinDivisor ) + 1 ) ) ))
+             * 5 ),2)) + predDev;
+
             // calculate predBGs with long zero temp without deviations
-            var ZTpredBG = ZTpredBGs[ZTpredBGs.length-1] + predZTBGI;
+            //var ZTpredBG = ZTpredBGs[ZTpredBGs.length-1] + predZTBGI;
+            var ZTpredBG = ZTpredBGs[ZTpredBGs.length-1] + (round(( -iobTick.iobWithZeroTemp.activity * (1800 / ( TDD * (Math.log(( Math.max(ZTpredBGs[ZTpredBGs.length-1],39) /
+            insulinDivisor ) + 1 ) ) )) * 5 ), 2));
             // for COBpredBGs, predicted carb impact drops linearly from current carb impact down to zero
             // eventually accounting for all carbs (if they can be absorbed over DIA)
             var predCI = Math.max(0, Math.max(0,ci) * ( 1 - COBpredBGs.length/Math.max(cid*2,1) ) );
@@ -610,7 +615,9 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
                 //console.error(UAMpredBGs.length,slopeFromDeviations, predUCI);
                 UAMduration=round((UAMpredBGs.length+1)*5/60,1);
             }
-            UAMpredBG = UAMpredBGs[UAMpredBGs.length-1] + predBGI + Math.min(0, predDev) + predUCI;
+            //UAMpredBG = UAMpredBGs[UAMpredBGs.length-1] + predBGI + Math.min(0, predDev) + predUCI;
+            UAMpredBG = UAMpredBGs[UAMpredBGs.length-1] + (round(( -iobTick.activity * (1800 / ( TDD
+             * (Math.log(( Math.max(UAMpredBGs[UAMpredBGs.length-1],39) / insulinDivisor ) + 1 ) ) )) * 5 ),2)) + Math.min(0, predDev) + predUCI;
             //console.error(predBGI, predCI, predUCI);
             // truncate all BG predictions at 4 hours
             if ( IOBpredBGs.length < 48) { IOBpredBGs.push(IOBpredBG); }

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

@@ -35,33 +35,33 @@ import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
 import info.nightscout.androidaps.activities.PreferencesActivity
 import info.nightscout.androidaps.activities.ProfileHelperActivity
 import info.nightscout.androidaps.activities.SingleFragmentActivity
-import info.nightscout.androidaps.database.entities.UserEntry.Action
-import info.nightscout.androidaps.database.entities.UserEntry.Sources
 import info.nightscout.androidaps.databinding.ActivityMainBinding
 import info.nightscout.androidaps.events.EventPreferenceChange
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.interfaces.AndroidPermission
-import info.nightscout.interfaces.BuildHelper
-import info.nightscout.interfaces.Config
 import info.nightscout.androidaps.interfaces.Constraints
-import info.nightscout.androidaps.interfaces.IconsProvider
 import info.nightscout.androidaps.interfaces.Loop
-import info.nightscout.androidaps.interfaces.PluginBase
 import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.interfaces.SmsCommunicator
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.constraints.versionChecker.VersionCheckerUtils
-import info.nightscout.androidaps.plugins.general.nsclient.data.NSSettingsStatus
 import info.nightscout.androidaps.setupwizard.SetupWizardActivity
-import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.extensions.isRunningRealPumpTest
-import info.nightscout.interfaces.locale.LocaleHelper
 import info.nightscout.androidaps.utils.protection.PasswordCheck
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import info.nightscout.androidaps.utils.tabs.TabPageAdapter
 import info.nightscout.androidaps.utils.ui.UIRunnable
+import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.database.entities.UserEntry.Action
+import info.nightscout.database.entities.UserEntry.Sources
+import info.nightscout.interfaces.AndroidPermission
+import info.nightscout.interfaces.BuildHelper
+import info.nightscout.interfaces.Config
+import info.nightscout.interfaces.locale.LocaleHelper
+import info.nightscout.interfaces.plugin.PluginBase
+import info.nightscout.interfaces.smsCommunicator.SmsCommunicator
+import info.nightscout.interfaces.ui.IconsProvider
 import info.nightscout.plugins.constraints.signatureVerifier.SignatureVerifierPlugin
+import info.nightscout.plugins.sync.nsclient.data.NSSettingsStatus
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.events.EventAppExit
 import info.nightscout.rx.events.EventInitializationChanged

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

@@ -15,38 +15,38 @@ import androidx.work.PeriodicWorkRequest
 import androidx.work.WorkManager
 import dagger.android.AndroidInjector
 import dagger.android.DaggerApplication
-import info.nightscout.androidaps.database.AppRepository
-import info.nightscout.androidaps.database.entities.TherapyEvent
-import info.nightscout.androidaps.database.entities.UserEntry
-import info.nightscout.androidaps.database.transactions.InsertIfNewByTimestampTherapyEventTransaction
-import info.nightscout.androidaps.database.transactions.VersionChangeTransaction
 import info.nightscout.androidaps.db.CompatDBHelper
 import info.nightscout.androidaps.di.DaggerAppComponent
 import info.nightscout.androidaps.di.StaticInjector
-import info.nightscout.interfaces.BuildHelper
-import info.nightscout.interfaces.Config
-import info.nightscout.androidaps.interfaces.ConfigBuilder
-import info.nightscout.interfaces.LocalAlertUtils
-import info.nightscout.androidaps.interfaces.PluginBase
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.configBuilder.PluginStore
 import info.nightscout.androidaps.plugins.constraints.versionChecker.VersionCheckerUtils
-import info.nightscout.interfaces.notifications.Notification
-import info.nightscout.androidaps.plugins.general.overview.notifications.NotificationStore
 import info.nightscout.androidaps.receivers.BTReceiver
 import info.nightscout.androidaps.receivers.ChargingStateReceiver
 import info.nightscout.androidaps.receivers.KeepAliveWorker
 import info.nightscout.androidaps.receivers.NetworkChangeReceiver
 import info.nightscout.androidaps.receivers.TimeDateOrTZChangeReceiver
 import info.nightscout.androidaps.services.AlarmSoundServiceHelper
-import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.ProcessLifecycleListener
+import info.nightscout.database.entities.TherapyEvent
+import info.nightscout.database.entities.UserEntry
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.database.impl.transactions.InsertIfNewByTimestampTherapyEventTransaction
+import info.nightscout.database.impl.transactions.VersionChangeTransaction
+import info.nightscout.interfaces.BuildHelper
+import info.nightscout.interfaces.Config
+import info.nightscout.interfaces.ConfigBuilder
+import info.nightscout.interfaces.LocalAlertUtils
 import info.nightscout.interfaces.locale.LocaleHelper
+import info.nightscout.interfaces.notifications.Notification
+import info.nightscout.interfaces.plugin.PluginBase
+import info.nightscout.plugins.general.overview.notifications.NotificationStore
 import info.nightscout.plugins.general.themes.ThemeSwitcherPlugin
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
+import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
+import info.nightscout.shared.utils.DateUtil
 import info.nightscout.ui.utils.ActivityMonitor
 import info.nightscout.ui.widget.Widget
 import io.reactivex.rxjava3.disposables.CompositeDisposable
@@ -124,13 +124,13 @@ class MainApp : DaggerApplication() {
                 // log version
                 disposable += repository.runTransaction(VersionChangeTransaction(BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE, gitRemote, commitHash)).subscribe()
                 // log app start
-                if (sp.getBoolean(R.string.key_ns_logappstartedevent, config.APS))
+                if (sp.getBoolean(R.string.key_ns_log_app_started_event, config.APS))
                     disposable += repository
                         .runTransaction(
                             InsertIfNewByTimestampTherapyEventTransaction(
                                 timestamp = dateUtil.now(),
                                 type = TherapyEvent.Type.NOTE,
-                                note = rh.get().gs(info.nightscout.androidaps.core.R.string.androidaps_start) + " - " + Build.MANUFACTURER + " " + Build.MODEL,
+                                note = rh.get().gs(info.nightscout.core.main.R.string.androidaps_start) + " - " + Build.MANUFACTURER + " " + Build.MODEL,
                                 glucoseUnit = TherapyEvent.GlucoseUnit.MGDL
                             )
                         )
@@ -214,6 +214,8 @@ class MainApp : DaggerApplication() {
             }
             sp.remove("ns_charginonly")
         }
+        if (!sp.contains(R.string.key_ns_log_app_started_event))
+            sp.putBoolean(R.string.key_ns_log_app_started_event, config.APS)
     }
 
     override fun applicationInjector(): AndroidInjector<out DaggerApplication> {

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

@@ -13,25 +13,25 @@ import com.jjoe64.graphview.GraphView
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.databinding.ActivityHistorybrowseBinding
-import info.nightscout.androidaps.extensions.toVisibility
-import info.nightscout.androidaps.extensions.toVisibilityKeepSpace
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.interfaces.BuildHelper
 import info.nightscout.androidaps.plugins.general.overview.OverviewMenus
 import info.nightscout.androidaps.plugins.general.overview.events.EventUpdateOverviewGraph
 import info.nightscout.androidaps.plugins.general.overview.graphData.GraphData
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventIobCalculationProgress
-import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DefaultValueHelper
-import info.nightscout.androidaps.utils.FabricPrivacy
-import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.workflow.CalculationWorkflow
+import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.interfaces.BuildHelper
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.events.EventAutosensCalculationFinished
 import info.nightscout.rx.events.EventCustomCalculationFinished
 import info.nightscout.rx.events.EventRefreshOverview
 import info.nightscout.rx.events.EventScale
 import info.nightscout.rx.logging.LTag
+import info.nightscout.shared.extensions.toVisibility
+import info.nightscout.shared.extensions.toVisibilityKeepSpace
+import info.nightscout.shared.utils.DateUtil
+import info.nightscout.shared.utils.T
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import java.util.Calendar

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

@@ -1,20 +1,20 @@
 package info.nightscout.androidaps.activities
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.database.AppRepository
+import info.nightscout.database.impl.AppRepository
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.plugins.general.overview.OverviewData
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
-import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DefaultValueHelper
-import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.workflow.CalculationWorkflow
+import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.logging.AAPSLogger
+import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
+import info.nightscout.shared.utils.DateUtil
 import javax.inject.Inject
 import javax.inject.Singleton
 

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

@@ -23,11 +23,7 @@ import info.nightscout.androidaps.danar.DanaRPlugin
 import info.nightscout.androidaps.danars.DanaRSPlugin
 import info.nightscout.androidaps.diaconn.DiaconnG8Plugin
 import info.nightscout.androidaps.events.EventPreferenceChange
-import info.nightscout.interfaces.Config
-import info.nightscout.androidaps.interfaces.PluginBase
-import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.plugin.general.openhumans.OpenHumansUploader
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
 import info.nightscout.androidaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
@@ -36,15 +32,11 @@ import info.nightscout.androidaps.plugins.aps.openAPSSMBDynamicISF.OpenAPSSMBDyn
 import info.nightscout.androidaps.plugins.configBuilder.PluginStore
 import info.nightscout.androidaps.plugins.constraints.safety.SafetyPlugin
 import info.nightscout.androidaps.plugins.general.maintenance.MaintenancePlugin
-import info.nightscout.androidaps.plugins.general.nsclient.NSClientPlugin
-import info.nightscout.androidaps.plugins.general.nsclient.data.NSSettingsStatus
-import info.nightscout.androidaps.plugins.general.tidepool.TidepoolPlugin
 import info.nightscout.androidaps.plugins.general.wear.WearPlugin
 import info.nightscout.androidaps.plugins.pump.combo.ComboPlugin
 import info.nightscout.androidaps.plugins.pump.eopatch.EopatchPumpPlugin
 import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
 import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin
-import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityWeightedAveragePlugin
@@ -63,13 +55,23 @@ import info.nightscout.androidaps.utils.protection.ProtectionCheck.ProtectionTyp
 import info.nightscout.androidaps.utils.protection.ProtectionCheck.ProtectionType.CUSTOM_PIN
 import info.nightscout.androidaps.utils.protection.ProtectionCheck.ProtectionType.NONE
 import info.nightscout.automation.AutomationPlugin
+import info.nightscout.core.profile.toCurrentUnits
+import info.nightscout.interfaces.Config
+import info.nightscout.interfaces.plugin.PluginBase
+import info.nightscout.interfaces.profile.Profile
 import info.nightscout.plugins.general.autotune.AutotunePlugin
 import info.nightscout.plugins.general.smsCommunicator.SmsCommunicatorPlugin
 import info.nightscout.plugins.general.xdripStatusline.StatusLinePlugin
 import info.nightscout.plugins.insulin.InsulinOrefFreePeakPlugin
+import info.nightscout.plugins.pump.virtual.VirtualPumpPlugin
+import info.nightscout.plugins.sync.nsclient.NSClientPlugin
+import info.nightscout.plugins.sync.nsclient.data.NSSettingsStatus
+import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin
+import info.nightscout.plugins.sync.tidepool.TidepoolPlugin
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.EventRebuildTabs
 import info.nightscout.shared.SafeParse
+import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
 import javax.inject.Inject
 
@@ -97,6 +99,7 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
     @Inject lateinit var localInsightPlugin: LocalInsightPlugin
     @Inject lateinit var medtronicPumpPlugin: MedtronicPumpPlugin
     @Inject lateinit var nsClientPlugin: NSClientPlugin
+    @Inject lateinit var nsClientV3Plugin: NSClientV3Plugin
     @Inject lateinit var openAPSAMAPlugin: OpenAPSAMAPlugin
     @Inject lateinit var openAPSSMBPlugin: OpenAPSSMBPlugin
     @Inject lateinit var openAPSSMBDynamicISFPlugin: OpenAPSSMBDynamicISFPlugin
@@ -212,6 +215,7 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
             addPreferencesFromResourceIfEnabled(virtualPumpPlugin, rootKey)
             addPreferencesFromResourceIfEnabled(insulinOrefFreePeakPlugin, rootKey)
             addPreferencesFromResourceIfEnabled(nsClientPlugin, rootKey)
+            addPreferencesFromResourceIfEnabled(nsClientV3Plugin, rootKey)
             addPreferencesFromResourceIfEnabled(tidepoolPlugin, rootKey)
             addPreferencesFromResourceIfEnabled(smsCommunicatorPlugin, rootKey)
             addPreferencesFromResourceIfEnabled(automationPlugin, rootKey)
@@ -328,13 +332,11 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
         var visible = false
 
         if (p is PreferenceGroup) {
-            for (i in 0 until p.preferenceCount) {
+            for (i in 0 until p.preferenceCount)
                 visible = updateFilterVisibility(filter, p.getPreference(i)) || visible
-            }
-            if (visible && p is PreferenceCategory) {
-                p.initialExpandedChildrenCount = Int.MAX_VALUE
-            }
+            if (visible && p is PreferenceCategory) p.initialExpandedChildrenCount = Int.MAX_VALUE
         } else {
+            @Suppress("KotlinConstantConditions")
             visible = visible || p.key?.contains(filter, true) == true
             visible = visible || p.title?.contains(filter, true) == true
             visible = visible || p.summary?.contains(filter, true) == true

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

@@ -10,23 +10,23 @@ import com.google.android.material.tabs.TabLayout
 import com.google.common.collect.Lists
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.ProfileSealed
-import info.nightscout.androidaps.data.PureProfile
-import info.nightscout.androidaps.database.AppRepository
-import info.nightscout.androidaps.database.entities.EffectiveProfileSwitch
 import info.nightscout.androidaps.databinding.ActivityProfilehelperBinding
 import info.nightscout.androidaps.dialogs.ProfileViewerDialog
-import info.nightscout.androidaps.extensions.toVisibility
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.interfaces.stats.TddCalculator
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.FabricPrivacy
-import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.ToastUtils
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
+import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.database.entities.EffectiveProfileSwitch
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.interfaces.profile.PureProfile
 import info.nightscout.plugins.profile.ProfilePlugin
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.events.EventLocalProfileChanged
+import info.nightscout.shared.extensions.toVisibility
+import info.nightscout.shared.utils.DateUtil
+import info.nightscout.shared.utils.T
 import info.nightscout.ui.defaultProfile.DefaultProfile
 import info.nightscout.ui.defaultProfile.DefaultProfileDPV
 import io.reactivex.rxjava3.core.Single

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

@@ -6,10 +6,10 @@ import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.interfaces.PluginBase
 import info.nightscout.androidaps.plugins.configBuilder.PluginStore
-import info.nightscout.interfaces.locale.LocaleHelper
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
+import info.nightscout.interfaces.locale.LocaleHelper
+import info.nightscout.interfaces.plugin.PluginBase
 import javax.inject.Inject
 
 class SingleFragmentActivity : DaggerAppCompatActivityWithResult() {

app/src/main/java/info/nightscout/androidaps/db/CompatDBHelper.kt

@@ -1,21 +1,21 @@
 package info.nightscout.androidaps.db
 
 import android.content.Context
-import info.nightscout.androidaps.database.AppRepository
-import info.nightscout.androidaps.database.entities.Bolus
-import info.nightscout.androidaps.database.entities.Carbs
-import info.nightscout.androidaps.database.entities.EffectiveProfileSwitch
-import info.nightscout.androidaps.database.entities.ExtendedBolus
-import info.nightscout.androidaps.database.entities.Food
-import info.nightscout.androidaps.database.entities.GlucoseValue
-import info.nightscout.androidaps.database.entities.OfflineEvent
-import info.nightscout.androidaps.database.entities.ProfileSwitch
-import info.nightscout.androidaps.database.entities.TemporaryBasal
-import info.nightscout.androidaps.database.entities.TemporaryTarget
-import info.nightscout.androidaps.database.entities.TherapyEvent
+import info.nightscout.database.impl.AppRepository
 import info.nightscout.androidaps.events.EventEffectiveProfileSwitchChanged
 import info.nightscout.androidaps.events.EventNewBG
 import info.nightscout.androidaps.events.EventNewHistoryData
+import info.nightscout.database.entities.Bolus
+import info.nightscout.database.entities.Carbs
+import info.nightscout.database.entities.EffectiveProfileSwitch
+import info.nightscout.database.entities.ExtendedBolus
+import info.nightscout.database.entities.Food
+import info.nightscout.database.entities.GlucoseValue
+import info.nightscout.database.entities.OfflineEvent
+import info.nightscout.database.entities.ProfileSwitch
+import info.nightscout.database.entities.TemporaryBasal
+import info.nightscout.database.entities.TemporaryTarget
+import info.nightscout.database.entities.TherapyEvent
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.EventExtendedBolusChange
 import info.nightscout.rx.events.EventFoodDatabaseChanged

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

@@ -4,13 +4,13 @@ import dagger.BindsInstance
 import dagger.Component
 import dagger.android.AndroidInjectionModule
 import dagger.android.AndroidInjector
+import info.nightcout.shared.impl.di.SharedImplModule
 import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.combo.di.ComboModule
 import info.nightscout.androidaps.dana.di.DanaHistoryModule
 import info.nightscout.androidaps.dana.di.DanaModule
 import info.nightscout.androidaps.danar.di.DanaRModule
 import info.nightscout.androidaps.danars.di.DanaRSModule
-import info.nightscout.androidaps.database.DatabaseModule
 import info.nightscout.androidaps.diaconn.di.DiaconnG8Module
 import info.nightscout.androidaps.insight.di.InsightDatabaseModule
 import info.nightscout.androidaps.insight.di.InsightModule
@@ -22,10 +22,10 @@ import info.nightscout.androidaps.plugins.pump.medtronic.di.MedtronicModule
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.di.OmnipodDashModule
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.di.OmnipodErosModule
 import info.nightscout.automation.di.AutomationModule
+import info.nightscout.database.impl.DatabaseModule
 import info.nightscout.implementation.di.ImplementationModule
 import info.nightscout.plugins.di.PluginsModule
 import info.nightscout.rx.di.RxModule
-import info.nightscout.rx.di.SharedImplModule
 import info.nightscout.shared.di.SharedModule
 import info.nightscout.ui.di.UiModule
 import javax.inject.Singleton

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

@@ -7,31 +7,14 @@ import dagger.Module
 import dagger.Provides
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.MainApp
-import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.implementations.ActivityNamesImpl
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.interfaces.ActivityNames
-import info.nightscout.interfaces.AndroidPermission
-import info.nightscout.interfaces.Autotune
-import info.nightscout.interfaces.BolusTimer
-import info.nightscout.interfaces.BuildHelper
-import info.nightscout.interfaces.CarbTimer
 import info.nightscout.androidaps.interfaces.CommandQueue
-import info.nightscout.interfaces.Config
-import info.nightscout.androidaps.interfaces.ConfigBuilder
 import info.nightscout.androidaps.interfaces.Constraints
 import info.nightscout.androidaps.interfaces.DataSyncSelector
-import info.nightscout.androidaps.interfaces.IconsProvider
-import info.nightscout.androidaps.interfaces.ImportExportPrefs
 import info.nightscout.androidaps.interfaces.IobCobCalculator
-import info.nightscout.interfaces.LocalAlertUtils
 import info.nightscout.androidaps.interfaces.Loop
-import info.nightscout.interfaces.NotificationHolder
-import info.nightscout.androidaps.interfaces.PluginBase
 import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.interfaces.PumpSync
-import info.nightscout.androidaps.interfaces.ResourceHelper
-import info.nightscout.interfaces.SmsCommunicator
 import info.nightscout.androidaps.interfaces.TrendCalculator
 import info.nightscout.androidaps.interfaces.XDripBroadcast
 import info.nightscout.androidaps.interfaces.stats.DexcomTirCalculator
@@ -43,19 +26,13 @@ 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.general.maintenance.PrefFileListProvider
-import info.nightscout.androidaps.plugins.general.nsclient.DataSyncSelectorImplementation
-import info.nightscout.androidaps.plugins.general.nsclient.data.DeviceStatusData
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
-import info.nightscout.androidaps.plugins.pump.PumpSyncImplementation
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.FabricPrivacy
-import info.nightscout.androidaps.utils.HardLimits
 import info.nightscout.androidaps.utils.androidNotification.NotificationHolderImpl
 import info.nightscout.androidaps.utils.buildHelper.BuildHelperImpl
 import info.nightscout.androidaps.utils.buildHelper.ConfigImpl
 import info.nightscout.androidaps.utils.resources.IconsProviderImplementation
-import info.nightscout.interfaces.storage.FileStorage
-import info.nightscout.interfaces.storage.Storage
+import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.database.impl.AppRepository
 import info.nightscout.implementation.AndroidPermissionImpl
 import info.nightscout.implementation.BolusTimerImpl
 import info.nightscout.implementation.CarbTimerImpl
@@ -63,16 +40,39 @@ import info.nightscout.implementation.LocalAlertUtilsImpl
 import info.nightscout.implementation.TrendCalculatorImpl
 import info.nightscout.implementation.XDripBroadcastImpl
 import info.nightscout.implementation.constraints.ConstraintsImpl
+import info.nightscout.implementation.pump.PumpSyncImplementation
 import info.nightscout.implementation.queue.CommandQueueImplementation
 import info.nightscout.implementation.stats.DexcomTirCalculatorImpl
 import info.nightscout.implementation.stats.TddCalculatorImpl
 import info.nightscout.implementation.stats.TirCalculatorImpl
+import info.nightscout.interfaces.AndroidPermission
+import info.nightscout.interfaces.BolusTimer
+import info.nightscout.interfaces.BuildHelper
+import info.nightscout.interfaces.CarbTimer
+import info.nightscout.interfaces.Config
+import info.nightscout.interfaces.ConfigBuilder
+import info.nightscout.interfaces.LocalAlertUtils
+import info.nightscout.interfaces.NotificationHolder
+import info.nightscout.interfaces.autotune.Autotune
+import info.nightscout.interfaces.maintenance.ImportExportPrefs
+import info.nightscout.interfaces.plugin.PluginBase
+import info.nightscout.interfaces.pump.PumpSync
+import info.nightscout.interfaces.smsCommunicator.SmsCommunicator
+import info.nightscout.interfaces.storage.FileStorage
+import info.nightscout.interfaces.storage.Storage
+import info.nightscout.interfaces.ui.ActivityNames
+import info.nightscout.interfaces.ui.IconsProvider
+import info.nightscout.interfaces.utils.HardLimits
 import info.nightscout.plugins.general.autotune.AutotunePlugin
 import info.nightscout.plugins.general.smsCommunicator.SmsCommunicatorPlugin
+import info.nightscout.plugins.sync.nsclient.DataSyncSelectorImplementation
+import info.nightscout.plugins.sync.nsclient.data.ProcessedDeviceStatusData
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.logging.AAPSLogger
+import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
+import info.nightscout.shared.utils.DateUtil
 import javax.inject.Singleton
 
 @Suppress("unused")
@@ -115,11 +115,11 @@ open class AppModule {
         aapsLogger: AAPSLogger, sp: SP, rxBus: RxBus, rh:
         ResourceHelper, activePlugin:
         ActivePlugin, repository: AppRepository, dateUtil: DateUtil, config: Config, hardLimits: HardLimits,
-        aapsSchedulers: AapsSchedulers, fabricPrivacy: FabricPrivacy, deviceStatusData: DeviceStatusData
+        aapsSchedulers: AapsSchedulers, fabricPrivacy: FabricPrivacy, processedDeviceStatusData: ProcessedDeviceStatusData
     ): ProfileFunction =
         ProfileFunctionImpl(
             aapsLogger, sp, rxBus, rh, activePlugin, repository, dateUtil,
-            config, hardLimits, aapsSchedulers, fabricPrivacy, deviceStatusData
+            config, hardLimits, aapsSchedulers, fabricPrivacy, processedDeviceStatusData
         )
 
     @Provides

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

@@ -20,15 +20,10 @@ import info.nightscout.androidaps.plugins.constraints.objectives.ObjectivesFragm
 import info.nightscout.androidaps.plugins.constraints.objectives.activities.ObjectivesExamDialog
 import info.nightscout.androidaps.plugins.general.actions.ActionsFragment
 import info.nightscout.androidaps.plugins.general.maintenance.MaintenanceFragment
-import info.nightscout.androidaps.plugins.general.nsclient.NSClientFragment
 import info.nightscout.androidaps.plugins.general.overview.OverviewFragment
 import info.nightscout.androidaps.plugins.general.overview.dialogs.EditQuickWizardDialog
-import info.nightscout.androidaps.plugins.general.tidepool.TidepoolFragment
 import info.nightscout.androidaps.plugins.general.wear.WearFragment
-import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpFragment
-import info.nightscout.androidaps.plugins.source.BGSourceFragment
 import info.nightscout.androidaps.utils.protection.PasswordCheck
-import info.nightscout.plugins.general.autotune.AutotuneFragment
 
 @Module
 @Suppress("unused")
@@ -37,21 +32,14 @@ abstract class FragmentsModule {
     @ContributesAndroidInjector abstract fun contributesPreferencesFragment(): MyPreferenceFragment
 
     @ContributesAndroidInjector abstract fun contributesActionsFragment(): ActionsFragment
-    @ContributesAndroidInjector abstract fun contributesAutotuneFragment(): AutotuneFragment
-    @ContributesAndroidInjector abstract fun contributesBGSourceFragment(): BGSourceFragment
     @ContributesAndroidInjector abstract fun contributesConfigBuilderFragment(): ConfigBuilderFragment
     @ContributesAndroidInjector abstract fun contributesObjectivesFragment(): ObjectivesFragment
     @ContributesAndroidInjector abstract fun contributesOpenAPSFragment(): OpenAPSFragment
     @ContributesAndroidInjector abstract fun contributesOverviewFragment(): OverviewFragment
     @ContributesAndroidInjector abstract fun contributesLoopFragment(): LoopFragment
     @ContributesAndroidInjector abstract fun contributesMaintenanceFragment(): MaintenanceFragment
-    @ContributesAndroidInjector abstract fun contributesNSClientFragment(): NSClientFragment
     @ContributesAndroidInjector abstract fun contributesWearFragment(): WearFragment
 
-    @ContributesAndroidInjector abstract fun contributesTidepoolFragment(): TidepoolFragment
-
-    @ContributesAndroidInjector abstract fun contributesVirtualPumpFragment(): VirtualPumpFragment
-
     @ContributesAndroidInjector abstract fun contributesEditQuickWizardDialog(): EditQuickWizardDialog
 
     @ContributesAndroidInjector abstract fun contributesExtendedBolusDialog(): ExtendedBolusDialog

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

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.di
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 import info.nightscout.androidaps.plugins.general.overview.graphData.GraphData
-import info.nightscout.androidaps.plugins.general.overview.notifications.NotificationWithAction
+import info.nightscout.plugins.general.overview.notifications.NotificationWithAction
 
 @Module
 @Suppress("unused")

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

@@ -9,7 +9,6 @@ import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.danar.DanaRPlugin
 import info.nightscout.androidaps.danars.DanaRSPlugin
 import info.nightscout.androidaps.diaconn.DiaconnG8Plugin
-import info.nightscout.androidaps.interfaces.PluginBase
 import info.nightscout.androidaps.plugin.general.openhumans.OpenHumansUploader
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
 import info.nightscout.androidaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
@@ -21,10 +20,8 @@ import info.nightscout.androidaps.plugins.constraints.safety.SafetyPlugin
 import info.nightscout.androidaps.plugins.general.actions.ActionsPlugin
 import info.nightscout.androidaps.plugins.general.dataBroadcaster.DataBroadcastPlugin
 import info.nightscout.androidaps.plugins.general.maintenance.MaintenancePlugin
-import info.nightscout.androidaps.plugins.general.nsclient.NSClientPlugin
 import info.nightscout.androidaps.plugins.general.overview.OverviewPlugin
 import info.nightscout.androidaps.plugins.general.persistentNotification.PersistentNotificationPlugin
-import info.nightscout.androidaps.plugins.general.tidepool.TidepoolPlugin
 import info.nightscout.androidaps.plugins.general.wear.WearPlugin
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.plugins.pump.combo.ComboPlugin
@@ -33,7 +30,6 @@ import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
 import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.OmnipodDashPumpPlugin
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.OmnipodErosPumpPlugin
-import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityWeightedAveragePlugin
@@ -43,12 +39,12 @@ import info.nightscout.androidaps.plugins.source.GlimpPlugin
 import info.nightscout.androidaps.plugins.source.GlunovoPlugin
 import info.nightscout.androidaps.plugins.source.IntelligoPlugin
 import info.nightscout.androidaps.plugins.source.MM640gPlugin
-import info.nightscout.androidaps.plugins.source.NSClientSourcePlugin
 import info.nightscout.androidaps.plugins.source.PoctechPlugin
 import info.nightscout.androidaps.plugins.source.RandomBgPlugin
 import info.nightscout.androidaps.plugins.source.TomatoPlugin
 import info.nightscout.androidaps.plugins.source.XdripPlugin
 import info.nightscout.automation.AutomationPlugin
+import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.plugins.constraints.bgQualityCheck.BgQualityCheckPlugin
 import info.nightscout.plugins.constraints.dstHelper.DstHelperPlugin
 import info.nightscout.plugins.constraints.signatureVerifier.SignatureVerifierPlugin
@@ -64,6 +60,11 @@ import info.nightscout.plugins.insulin.InsulinOrefFreePeakPlugin
 import info.nightscout.plugins.insulin.InsulinOrefRapidActingPlugin
 import info.nightscout.plugins.insulin.InsulinOrefUltraRapidActingPlugin
 import info.nightscout.plugins.profile.ProfilePlugin
+import info.nightscout.plugins.pump.virtual.VirtualPumpPlugin
+import info.nightscout.plugins.source.NSClientSourcePlugin
+import info.nightscout.plugins.sync.nsclient.NSClientPlugin
+import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin
+import info.nightscout.plugins.sync.tidepool.TidepoolPlugin
 import javax.inject.Qualifier
 
 @Suppress("unused")
@@ -316,6 +317,12 @@ abstract class PluginsListModule {
     @IntKey(368)
     abstract fun bindTidepoolPlugin(plugin: TidepoolPlugin): PluginBase
 
+    @Binds
+    @Unfinished
+    @IntoMap
+    @IntKey(362)
+    abstract fun bindNSClientV3Plugin(plugin: NSClientV3Plugin): PluginBase
+
     @Binds
     @AllConfigs
     @IntoMap

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

@@ -2,12 +2,11 @@ package info.nightscout.androidaps.di
 
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
-import info.nightscout.androidaps.plugins.general.nsclient.services.NSClientService
-import info.nightscout.androidaps.plugins.general.overview.notifications.DismissNotificationService
 import info.nightscout.androidaps.plugins.general.persistentNotification.DummyService
 import info.nightscout.androidaps.plugins.general.wear.wearintegration.DataLayerListenerServiceMobile
 import info.nightscout.androidaps.services.AlarmSoundService
 import info.nightscout.automation.services.LocationService
+import info.nightscout.plugins.general.overview.notifications.DismissNotificationService
 
 @Module
 @Suppress("unused")
@@ -17,6 +16,5 @@ abstract class ServicesModule {
     @ContributesAndroidInjector abstract fun contributesDismissNotificationService(): DismissNotificationService
     @ContributesAndroidInjector abstract fun contributesDummyService(): DummyService
     @ContributesAndroidInjector abstract fun contributesLocationService(): LocationService
-    @ContributesAndroidInjector abstract fun contributesNSClientService(): NSClientService
     @ContributesAndroidInjector abstract fun contributesWatchUpdaterService(): DataLayerListenerServiceMobile
 }

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

@@ -3,20 +3,15 @@ package info.nightscout.androidaps.di
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 import info.nightscout.androidaps.plugins.general.maintenance.ImportExportPrefsImpl
-import info.nightscout.androidaps.plugins.general.nsclient.NSClientAddAckWorker
-import info.nightscout.androidaps.plugins.general.nsclient.NSClientAddUpdateWorker
-import info.nightscout.androidaps.plugins.general.nsclient.NSClientMbgWorker
-import info.nightscout.androidaps.plugins.general.nsclient.NSClientUpdateRemoveAckWorker
-import info.nightscout.plugins.profile.ProfilePlugin
 import info.nightscout.androidaps.plugins.source.AidexPlugin
 import info.nightscout.androidaps.plugins.source.DexcomPlugin
 import info.nightscout.androidaps.plugins.source.EversensePlugin
 import info.nightscout.androidaps.plugins.source.GlimpPlugin
 import info.nightscout.androidaps.plugins.source.MM640gPlugin
-import info.nightscout.androidaps.plugins.source.NSClientSourcePlugin
 import info.nightscout.androidaps.plugins.source.PoctechPlugin
 import info.nightscout.androidaps.plugins.source.TomatoPlugin
 import info.nightscout.androidaps.plugins.source.XdripPlugin
+import info.nightscout.plugins.profile.ProfilePlugin
 
 @Module
 @Suppress("unused")
@@ -29,12 +24,7 @@ abstract class WorkersModule {
     @ContributesAndroidInjector abstract fun contributesPoctechWorker(): PoctechPlugin.PoctechWorker
     @ContributesAndroidInjector abstract fun contributesTomatoWorker(): TomatoPlugin.TomatoWorker
     @ContributesAndroidInjector abstract fun contributesEversenseWorker(): EversensePlugin.EversenseWorker
-    @ContributesAndroidInjector abstract fun contributesNSClientSourceWorker(): NSClientSourcePlugin.NSClientSourceWorker
     @ContributesAndroidInjector abstract fun contributesNSProfileWorker(): ProfilePlugin.NSProfileWorker
-    @ContributesAndroidInjector abstract fun contributesNSClientWorker(): NSClientAddUpdateWorker
-    @ContributesAndroidInjector abstract fun contributesNSClientAddAckWorker(): NSClientAddAckWorker
-    @ContributesAndroidInjector abstract fun contributesNSClientUpdateRemoveAckWorker(): NSClientUpdateRemoveAckWorker
-    @ContributesAndroidInjector abstract fun contributesNSClientMbgWorker(): NSClientMbgWorker
     @ContributesAndroidInjector abstract fun contributesCsvExportWorker(): ImportExportPrefsImpl.CsvExportWorker
     @ContributesAndroidInjector abstract fun contributesAidexWorker(): AidexPlugin.AidexWorker
 }

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

@@ -7,26 +7,26 @@ import android.view.View
 import android.view.ViewGroup
 import com.google.common.base.Joiner
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.database.entities.UserEntry.Action
-import info.nightscout.androidaps.database.entities.UserEntry.Sources
-import info.nightscout.androidaps.database.entities.ValueWithUnit
 import info.nightscout.androidaps.databinding.DialogExtendedbolusBinding
 import info.nightscout.androidaps.extensions.formatColor
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.interfaces.ActivityNames
 import info.nightscout.androidaps.interfaces.CommandQueue
-import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.Constraints
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.interfaces.queue.Callback
-import info.nightscout.interfaces.utils.HtmlHelper
 import info.nightscout.androidaps.utils.ToastUtils
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import info.nightscout.androidaps.utils.protection.ProtectionCheck.Protection.BOLUS
+import info.nightscout.database.entities.UserEntry.Action
+import info.nightscout.database.entities.UserEntry.Sources
+import info.nightscout.database.entities.ValueWithUnit
+import info.nightscout.interfaces.constraints.Constraint
+import info.nightscout.interfaces.queue.Callback
+import info.nightscout.interfaces.ui.ActivityNames
+import info.nightscout.interfaces.utils.HtmlHelper
 import info.nightscout.rx.logging.LTag
 import info.nightscout.shared.SafeParse
+import info.nightscout.shared.interfaces.ResourceHelper
 import java.text.DecimalFormat
 import java.util.LinkedList
 import javax.inject.Inject

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

@@ -7,31 +7,31 @@ import android.view.View
 import android.view.ViewGroup
 import com.google.common.base.Joiner
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.data.DetailedBolusInfo
-import info.nightscout.androidaps.database.AppRepository
-import info.nightscout.androidaps.database.entities.TherapyEvent
-import info.nightscout.androidaps.database.entities.UserEntry.Action
-import info.nightscout.androidaps.database.entities.UserEntry.Sources
-import info.nightscout.androidaps.database.entities.ValueWithUnit
-import info.nightscout.androidaps.database.transactions.InsertIfNewByTimestampTherapyEventTransaction
 import info.nightscout.androidaps.databinding.DialogFillBinding
 import info.nightscout.androidaps.extensions.formatColor
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.interfaces.ActivityNames
 import info.nightscout.androidaps.interfaces.CommandQueue
-import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.Constraints
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.interfaces.queue.Callback
 import info.nightscout.androidaps.utils.DecimalFormatter
-import info.nightscout.interfaces.utils.HtmlHelper
 import info.nightscout.androidaps.utils.ToastUtils
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import info.nightscout.androidaps.utils.protection.ProtectionCheck.Protection.BOLUS
+import info.nightscout.database.entities.TherapyEvent
+import info.nightscout.database.entities.UserEntry.Action
+import info.nightscout.database.entities.UserEntry.Sources
+import info.nightscout.database.entities.ValueWithUnit
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.database.impl.transactions.InsertIfNewByTimestampTherapyEventTransaction
+import info.nightscout.interfaces.constraints.Constraint
+import info.nightscout.interfaces.pump.DetailedBolusInfo
+import info.nightscout.interfaces.queue.Callback
+import info.nightscout.interfaces.ui.ActivityNames
+import info.nightscout.interfaces.utils.HtmlHelper
 import info.nightscout.rx.logging.LTag
 import info.nightscout.shared.SafeParse
+import info.nightscout.shared.interfaces.ResourceHelper
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import java.util.LinkedList

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

@@ -9,40 +9,42 @@ import android.view.View
 import android.view.ViewGroup
 import com.google.common.base.Joiner
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.data.DetailedBolusInfo
-import info.nightscout.androidaps.database.AppRepository
-import info.nightscout.androidaps.database.entities.TemporaryTarget
-import info.nightscout.androidaps.database.entities.UserEntry.Action
-import info.nightscout.androidaps.database.entities.UserEntry.Sources
-import info.nightscout.androidaps.database.entities.ValueWithUnit
-import info.nightscout.androidaps.database.transactions.InsertAndCancelCurrentTemporaryTargetTransaction
 import info.nightscout.androidaps.databinding.DialogInsulinBinding
 import info.nightscout.androidaps.extensions.formatColor
-import info.nightscout.androidaps.extensions.toVisibility
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.interfaces.ActivityNames
-import info.nightscout.interfaces.BolusTimer
 import info.nightscout.androidaps.interfaces.CommandQueue
-import info.nightscout.interfaces.Config
-import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.Constraints
-import info.nightscout.androidaps.interfaces.GlucoseUnit
-import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.interfaces.queue.Callback
 import info.nightscout.androidaps.utils.DecimalFormatter
 import info.nightscout.androidaps.utils.DefaultValueHelper
-import info.nightscout.interfaces.utils.HtmlHelper
-import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.ToastUtils
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.extensions.toSignedString
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import info.nightscout.androidaps.utils.protection.ProtectionCheck.Protection.BOLUS
+import info.nightscout.core.profile.toMgdl
+import info.nightscout.core.pumpExtensions.insertBolusTransaction
+import info.nightscout.database.entities.TemporaryTarget
+import info.nightscout.database.entities.UserEntry.Action
+import info.nightscout.database.entities.UserEntry.Sources
+import info.nightscout.database.entities.ValueWithUnit
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.database.impl.transactions.InsertAndCancelCurrentTemporaryTargetTransaction
+import info.nightscout.interfaces.BolusTimer
+import info.nightscout.interfaces.Config
+import info.nightscout.interfaces.GlucoseUnit
+import info.nightscout.interfaces.constraints.Constraint
+import info.nightscout.interfaces.profile.Profile
+import info.nightscout.interfaces.pump.DetailedBolusInfo
+import info.nightscout.interfaces.queue.Callback
+import info.nightscout.interfaces.ui.ActivityNames
+import info.nightscout.interfaces.utils.HtmlHelper
 import info.nightscout.rx.logging.LTag
 import info.nightscout.shared.SafeParse
+import info.nightscout.shared.extensions.toVisibility
+import info.nightscout.shared.interfaces.ResourceHelper
+import info.nightscout.shared.utils.T
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import java.text.DecimalFormat

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

@@ -12,44 +12,44 @@ import android.view.WindowManager
 import androidx.fragment.app.FragmentManager
 import dagger.android.support.DaggerDialogFragment
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.database.AppRepository
-import info.nightscout.androidaps.database.entities.OfflineEvent
-import info.nightscout.androidaps.database.entities.UserEntry.Action
-import info.nightscout.androidaps.database.entities.UserEntry.Sources
-import info.nightscout.androidaps.database.entities.ValueWithUnit
-import info.nightscout.androidaps.database.transactions.CancelCurrentOfflineEventIfAnyTransaction
-import info.nightscout.androidaps.database.transactions.InsertAndCancelCurrentOfflineEventTransaction
 import info.nightscout.androidaps.databinding.DialogLoopBinding
 import info.nightscout.androidaps.events.EventPreferenceChange
-import info.nightscout.androidaps.extensions.runOnUiThread
-import info.nightscout.androidaps.extensions.toVisibility
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.interfaces.ActivityNames
 import info.nightscout.androidaps.interfaces.CommandQueue
-import info.nightscout.androidaps.interfaces.ConfigBuilder
-import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.Constraints
 import info.nightscout.androidaps.interfaces.Loop
-import info.nightscout.androidaps.interfaces.PluginBase
-import info.nightscout.interfaces.PluginType
 import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.interfaces.PumpDescription
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.constraints.objectives.ObjectivesPlugin
-import info.nightscout.interfaces.queue.Callback
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.FabricPrivacy
-import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.ToastUtils
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import info.nightscout.androidaps.utils.protection.ProtectionCheck.Protection.BOLUS
+import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.database.entities.OfflineEvent
+import info.nightscout.database.entities.UserEntry.Action
+import info.nightscout.database.entities.UserEntry.Sources
+import info.nightscout.database.entities.ValueWithUnit
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.database.impl.transactions.CancelCurrentOfflineEventIfAnyTransaction
+import info.nightscout.database.impl.transactions.InsertAndCancelCurrentOfflineEventTransaction
+import info.nightscout.interfaces.ConfigBuilder
+import info.nightscout.interfaces.constraints.Constraint
+import info.nightscout.interfaces.plugin.PluginBase
+import info.nightscout.interfaces.plugin.PluginType
+import info.nightscout.interfaces.pump.defs.PumpDescription
+import info.nightscout.interfaces.queue.Callback
+import info.nightscout.interfaces.ui.ActivityNames
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.EventRefreshOverview
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
+import info.nightscout.shared.extensions.runOnUiThread
+import info.nightscout.shared.extensions.toVisibility
+import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
+import info.nightscout.shared.utils.DateUtil
+import info.nightscout.shared.utils.T
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import javax.inject.Inject
@@ -191,7 +191,7 @@ class LoopDialog : DaggerDialogFragment() {
                 binding.overviewReconnect.visibility = View.VISIBLE
             }
 
-            !(loop as PluginBase).isEnabled()                                -> {
+            !(loop as PluginBase).isEnabled() -> {
                 binding.overviewLoop.visibility = View.VISIBLE
                 binding.overviewEnable.visibility = View.VISIBLE
                 binding.overviewDisable.visibility = View.GONE

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

@@ -6,15 +6,15 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import dagger.android.support.DaggerDialogFragment
-import info.nightscout.androidaps.core.R
-import info.nightscout.androidaps.core.databinding.DialogBolusprogressBinding
-import info.nightscout.androidaps.interfaces.ResourceHelper
-import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.main.R
+import info.nightscout.core.main.databinding.DialogBolusprogressBinding
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.EventNtpStatus
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
+import info.nightscout.shared.interfaces.ResourceHelper
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import javax.inject.Inject

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

@@ -9,33 +9,34 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ArrayAdapter
 import com.google.common.base.Joiner
-import info.nightscout.interfaces.Constants
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.ProfileSealed
-import info.nightscout.androidaps.database.AppRepository
-import info.nightscout.androidaps.database.entities.TemporaryTarget
-import info.nightscout.androidaps.database.entities.UserEntry.Action
-import info.nightscout.androidaps.database.entities.UserEntry.Sources
-import info.nightscout.androidaps.database.entities.ValueWithUnit
-import info.nightscout.androidaps.database.transactions.InsertAndCancelCurrentTemporaryTargetTransaction
 import info.nightscout.androidaps.databinding.DialogProfileswitchBinding
-import info.nightscout.androidaps.extensions.toVisibility
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.interfaces.Config
-import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.utils.DefaultValueHelper
-import info.nightscout.androidaps.utils.HardLimits
-import info.nightscout.interfaces.utils.HtmlHelper
-import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.ToastUtils
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import info.nightscout.androidaps.utils.protection.ProtectionCheck.Protection.BOLUS
+import info.nightscout.core.profile.toMgdl
+import info.nightscout.database.entities.TemporaryTarget
+import info.nightscout.database.entities.UserEntry.Action
+import info.nightscout.database.entities.UserEntry.Sources
+import info.nightscout.database.entities.ValueWithUnit
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.database.impl.transactions.InsertAndCancelCurrentTemporaryTargetTransaction
+import info.nightscout.interfaces.Config
+import info.nightscout.interfaces.Constants
+import info.nightscout.interfaces.profile.Profile
+import info.nightscout.interfaces.utils.HardLimits
+import info.nightscout.interfaces.utils.HtmlHelper
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.logging.LTag
+import info.nightscout.shared.extensions.toVisibility
+import info.nightscout.shared.interfaces.ResourceHelper
+import info.nightscout.shared.utils.T
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import java.text.DecimalFormat

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

@@ -7,29 +7,29 @@ import android.view.View
 import android.view.ViewGroup
 import com.google.common.base.Joiner
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.database.entities.UserEntry.Action
-import info.nightscout.androidaps.database.entities.UserEntry.Sources
-import info.nightscout.androidaps.database.entities.ValueWithUnit
 import info.nightscout.androidaps.databinding.DialogTempbasalBinding
 import info.nightscout.androidaps.extensions.formatColor
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.interfaces.ActivityNames
 import info.nightscout.androidaps.interfaces.CommandQueue
-import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.Constraints
 import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.interfaces.PumpDescription
-import info.nightscout.androidaps.interfaces.PumpSync
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.interfaces.queue.Callback
-import info.nightscout.interfaces.utils.HtmlHelper
 import info.nightscout.androidaps.utils.ToastUtils
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import info.nightscout.androidaps.utils.protection.ProtectionCheck.Protection.BOLUS
+import info.nightscout.database.entities.UserEntry.Action
+import info.nightscout.database.entities.UserEntry.Sources
+import info.nightscout.database.entities.ValueWithUnit
+import info.nightscout.interfaces.constraints.Constraint
+import info.nightscout.interfaces.pump.PumpSync
+import info.nightscout.interfaces.pump.defs.PumpDescription
+import info.nightscout.interfaces.queue.Callback
+import info.nightscout.interfaces.ui.ActivityNames
+import info.nightscout.interfaces.utils.HtmlHelper
 import info.nightscout.rx.logging.LTag
 import info.nightscout.shared.SafeParse
+import info.nightscout.shared.interfaces.ResourceHelper
 import java.text.DecimalFormat
 import java.util.LinkedList
 import javax.inject.Inject
@@ -137,13 +137,13 @@ class TempBasalDialog : DialogFragmentWithDate() {
                 }
                 if (isPercentPump) {
                     uel.log(Action.TEMP_BASAL, Sources.TempBasalDialog,
-                        ValueWithUnit.Percent(percent),
-                        ValueWithUnit.Minute(durationInMinutes))
+                            ValueWithUnit.Percent(percent),
+                            ValueWithUnit.Minute(durationInMinutes))
                     commandQueue.tempBasalPercent(percent, durationInMinutes, true, profile, PumpSync.TemporaryBasalType.NORMAL, callback)
                 } else {
                     uel.log(Action.TEMP_BASAL, Sources.TempBasalDialog,
-                        ValueWithUnit.Insulin(absolute),
-                        ValueWithUnit.Minute(durationInMinutes))
+                            ValueWithUnit.Insulin(absolute),
+                            ValueWithUnit.Minute(durationInMinutes))
                     commandQueue.tempBasalAbsolute(absolute, durationInMinutes, true, profile, PumpSync.TemporaryBasalType.NORMAL, callback)
                 }
             })

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

@@ -8,31 +8,32 @@ import android.view.ViewGroup
 import android.widget.ArrayAdapter
 import com.google.common.base.Joiner
 import com.google.common.collect.Lists
-import info.nightscout.interfaces.Constants
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.database.AppRepository
-import info.nightscout.androidaps.database.ValueWrapper
-import info.nightscout.androidaps.database.entities.TemporaryTarget
-import info.nightscout.androidaps.database.entities.UserEntry.Action
-import info.nightscout.androidaps.database.entities.UserEntry.Sources
-import info.nightscout.androidaps.database.entities.ValueWithUnit
-import info.nightscout.androidaps.database.transactions.CancelCurrentTemporaryTargetIfAnyTransaction
-import info.nightscout.androidaps.database.transactions.InsertAndCancelCurrentTemporaryTargetTransaction
 import info.nightscout.androidaps.databinding.DialogTemptargetBinding
 import info.nightscout.androidaps.interfaces.Constraints
-import info.nightscout.androidaps.interfaces.GlucoseUnit
-import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.utils.DefaultValueHelper
-import info.nightscout.interfaces.utils.HtmlHelper
 import info.nightscout.androidaps.utils.ToastUtils
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import info.nightscout.androidaps.utils.protection.ProtectionCheck.Protection.BOLUS
+import info.nightscout.core.profile.toCurrentUnitsString
+import info.nightscout.core.profile.toMgdl
+import info.nightscout.database.entities.TemporaryTarget
+import info.nightscout.database.entities.UserEntry.Action
+import info.nightscout.database.entities.UserEntry.Sources
+import info.nightscout.database.entities.ValueWithUnit
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.database.impl.ValueWrapper
+import info.nightscout.database.impl.transactions.CancelCurrentTemporaryTargetIfAnyTransaction
+import info.nightscout.database.impl.transactions.InsertAndCancelCurrentTemporaryTargetTransaction
+import info.nightscout.interfaces.Constants
+import info.nightscout.interfaces.GlucoseUnit
+import info.nightscout.interfaces.profile.Profile
+import info.nightscout.interfaces.utils.HtmlHelper
 import info.nightscout.rx.logging.LTag
-
+import info.nightscout.shared.interfaces.ResourceHelper
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import java.text.DecimalFormat
@@ -184,10 +185,14 @@ class TempTargetDialog : DialogFragmentWithDate() {
             OKDialog.showConfirmation(activity, rh.gs(R.string.careportal_temporarytarget), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), {
                 val units = profileFunction.getUnits()
                 when(reason) {
-                    rh.gs(R.string.eatingsoon)      -> uel.log(Action.TT, Sources.TTDialog, ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged }, ValueWithUnit.TherapyEventTTReason(TemporaryTarget.Reason.EATING_SOON), ValueWithUnit.fromGlucoseUnit(target, units.asText), ValueWithUnit.Minute(duration))
-                    rh.gs(R.string.activity)        -> uel.log(Action.TT, Sources.TTDialog, ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged }, ValueWithUnit.TherapyEventTTReason(TemporaryTarget.Reason.ACTIVITY), ValueWithUnit.fromGlucoseUnit(target, units.asText), ValueWithUnit.Minute(duration))
-                    rh.gs(R.string.hypo)            -> uel.log(Action.TT, Sources.TTDialog, ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged }, ValueWithUnit.TherapyEventTTReason(TemporaryTarget.Reason.HYPOGLYCEMIA), ValueWithUnit.fromGlucoseUnit(target, units.asText), ValueWithUnit.Minute(duration))
-                    rh.gs(R.string.manual)          -> uel.log(Action.TT, Sources.TTDialog, ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged }, ValueWithUnit.TherapyEventTTReason(TemporaryTarget.Reason.CUSTOM), ValueWithUnit.fromGlucoseUnit(target, units.asText), ValueWithUnit.Minute(duration))
+                    rh.gs(R.string.eatingsoon)      -> uel.log(Action.TT, Sources.TTDialog, ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged }, ValueWithUnit.TherapyEventTTReason(
+                        TemporaryTarget.Reason.EATING_SOON), ValueWithUnit.fromGlucoseUnit(target, units.asText), ValueWithUnit.Minute(duration))
+                    rh.gs(R.string.activity)        -> uel.log(Action.TT, Sources.TTDialog, ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged }, ValueWithUnit.TherapyEventTTReason(
+                        TemporaryTarget.Reason.ACTIVITY), ValueWithUnit.fromGlucoseUnit(target, units.asText), ValueWithUnit.Minute(duration))
+                    rh.gs(R.string.hypo)            -> uel.log(Action.TT, Sources.TTDialog, ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged }, ValueWithUnit.TherapyEventTTReason(
+                        TemporaryTarget.Reason.HYPOGLYCEMIA), ValueWithUnit.fromGlucoseUnit(target, units.asText), ValueWithUnit.Minute(duration))
+                    rh.gs(R.string.manual)          -> uel.log(Action.TT, Sources.TTDialog, ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged }, ValueWithUnit.TherapyEventTTReason(
+                        TemporaryTarget.Reason.CUSTOM), ValueWithUnit.fromGlucoseUnit(target, units.asText), ValueWithUnit.Minute(duration))
                     rh.gs(R.string.stoptemptarget) -> uel.log(Action.CANCEL_TT, Sources.TTDialog, ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged })
                 }
                 if (target == 0.0 || duration == 0) {

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

@@ -9,30 +9,32 @@ import android.view.View
 import android.view.ViewGroup
 import com.google.common.base.Joiner
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.data.DetailedBolusInfo
-import info.nightscout.androidaps.database.AppRepository
-import info.nightscout.androidaps.database.entities.UserEntry.Action
-import info.nightscout.androidaps.database.entities.UserEntry.Sources
-import info.nightscout.androidaps.database.entities.ValueWithUnit
 import info.nightscout.androidaps.databinding.DialogTreatmentBinding
 import info.nightscout.androidaps.extensions.formatColor
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.interfaces.ActivityNames
 import info.nightscout.androidaps.interfaces.CommandQueue
-import info.nightscout.interfaces.Config
-import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.Constraints
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.interfaces.queue.Callback
 import info.nightscout.androidaps.utils.DecimalFormatter
-import info.nightscout.interfaces.utils.HtmlHelper
 import info.nightscout.androidaps.utils.ToastUtils
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import info.nightscout.androidaps.utils.protection.ProtectionCheck.Protection.BOLUS
+import info.nightscout.core.pumpExtensions.insertBolusTransaction
+import info.nightscout.core.pumpExtensions.insertCarbsTransaction
+import info.nightscout.database.entities.UserEntry.Action
+import info.nightscout.database.entities.UserEntry.Sources
+import info.nightscout.database.entities.ValueWithUnit
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.interfaces.Config
+import info.nightscout.interfaces.constraints.Constraint
+import info.nightscout.interfaces.pump.DetailedBolusInfo
+import info.nightscout.interfaces.queue.Callback
+import info.nightscout.interfaces.ui.ActivityNames
+import info.nightscout.interfaces.utils.HtmlHelper
 import info.nightscout.rx.logging.LTag
 import info.nightscout.shared.SafeParse
+import info.nightscout.shared.interfaces.ResourceHelper
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import java.text.DecimalFormat
@@ -156,10 +158,10 @@ class TreatmentDialog : DialogFragmentWithDate() {
                     detailedBolusInfo.context = context
                     if (recordOnlyChecked) {
                         uel.log(action, Sources.TreatmentDialog, if (insulinAfterConstraints != 0.0) rh.gs(R.string.record) else "",
-                            ValueWithUnit.Timestamp(detailedBolusInfo.timestamp).takeIf { eventTimeChanged },
-                            ValueWithUnit.SimpleString(rh.gsNotLocalised(R.string.record)).takeIf { insulinAfterConstraints != 0.0 },
-                            ValueWithUnit.Insulin(insulinAfterConstraints).takeIf { insulinAfterConstraints != 0.0 },
-                            ValueWithUnit.Gram(carbsAfterConstraints).takeIf { carbsAfterConstraints != 0 })
+                                ValueWithUnit.Timestamp(detailedBolusInfo.timestamp).takeIf { eventTimeChanged },
+                                ValueWithUnit.SimpleString(rh.gsNotLocalised(R.string.record)).takeIf { insulinAfterConstraints != 0.0 },
+                                ValueWithUnit.Insulin(insulinAfterConstraints).takeIf { insulinAfterConstraints != 0.0 },
+                                ValueWithUnit.Gram(carbsAfterConstraints).takeIf { carbsAfterConstraints != 0 })
                         if (detailedBolusInfo.insulin > 0)
                             disposable += repository.runTransactionForResult(detailedBolusInfo.insertBolusTransaction())
                                 .subscribe(
@@ -175,8 +177,8 @@ class TreatmentDialog : DialogFragmentWithDate() {
                     } else {
                         if (detailedBolusInfo.insulin > 0) {
                             uel.log(action, Sources.TreatmentDialog,
-                                ValueWithUnit.Insulin(insulinAfterConstraints),
-                                ValueWithUnit.Gram(carbsAfterConstraints).takeIf { carbsAfterConstraints != 0 })
+                                    ValueWithUnit.Insulin(insulinAfterConstraints),
+                                    ValueWithUnit.Gram(carbsAfterConstraints).takeIf { carbsAfterConstraints != 0 })
                             commandQueue.bolus(detailedBolusInfo, object : Callback() {
                                 override fun run() {
                                     if (!result.success) {

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

@@ -18,40 +18,43 @@ import android.widget.CompoundButton
 import androidx.fragment.app.FragmentManager
 import dagger.android.HasAndroidInjector
 import dagger.android.support.DaggerDialogFragment
-import info.nightscout.interfaces.Constants
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.ProfileSealed
-import info.nightscout.androidaps.database.AppRepository
-import info.nightscout.androidaps.database.ValueWrapper
 import info.nightscout.androidaps.databinding.DialogWizardBinding
 import info.nightscout.androidaps.extensions.formatColor
-import info.nightscout.androidaps.extensions.runOnUiThread
-import info.nightscout.androidaps.extensions.toVisibility
 import info.nightscout.androidaps.extensions.valueToUnits
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.Constraints
-import info.nightscout.androidaps.interfaces.GlucoseUnit
 import info.nightscout.androidaps.interfaces.IobCobCalculator
-import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.interfaces.ResourceHelper
-import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DecimalFormatter
-import info.nightscout.androidaps.utils.FabricPrivacy
-import info.nightscout.interfaces.utils.HtmlHelper
-import info.nightscout.interfaces.utils.Round
 import info.nightscout.androidaps.utils.ToastUtils
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import info.nightscout.androidaps.utils.protection.ProtectionCheck.Protection.BOLUS
 import info.nightscout.androidaps.utils.wizard.BolusWizard
+import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.iob.round
+import info.nightscout.core.profile.toMgdl
+import info.nightscout.core.profile.toUnitsString
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.database.impl.ValueWrapper
+import info.nightscout.interfaces.Constants
+import info.nightscout.interfaces.GlucoseUnit
+import info.nightscout.interfaces.constraints.Constraint
+import info.nightscout.interfaces.profile.Profile
+import info.nightscout.interfaces.utils.HtmlHelper
+import info.nightscout.interfaces.utils.Round
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.EventAutosensCalculationFinished
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
 import info.nightscout.shared.SafeParse
+import info.nightscout.shared.extensions.runOnUiThread
+import info.nightscout.shared.extensions.toVisibility
+import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
+import info.nightscout.shared.utils.DateUtil
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import java.text.DecimalFormat

app/src/main/java/info/nightscout/androidaps/implementations/ActivityNamesImpl.kt

@@ -9,8 +9,8 @@ import info.nightscout.androidaps.MainActivity
 import info.nightscout.androidaps.activities.SingleFragmentActivity
 import info.nightscout.androidaps.dialogs.ProfileSwitchDialog
 import info.nightscout.androidaps.dialogs.WizardDialog
-import info.nightscout.interfaces.ActivityNames
 import info.nightscout.androidaps.services.AlarmSoundService
+import info.nightscout.interfaces.ui.ActivityNames
 import info.nightscout.ui.activities.BolusProgressHelperActivity
 import info.nightscout.ui.activities.ErrorHelperActivity
 import info.nightscout.ui.activities.TDDStatsActivity

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

@@ -16,16 +16,16 @@ import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.databinding.OpenapsFragmentBinding
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.plugins.aps.events.EventOpenAPSUpdateGui
 import info.nightscout.androidaps.plugins.aps.events.EventOpenAPSUpdateResultGui
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.JSONFormatter
+import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
+import info.nightscout.shared.interfaces.ResourceHelper
+import info.nightscout.shared.utils.DateUtil
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import org.json.JSONArray

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

@@ -14,18 +14,18 @@ import androidx.lifecycle.Lifecycle
 import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.databinding.LoopFragmentBinding
-import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.Loop
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.plugins.aps.loop.events.EventLoopSetLastRunGui
 import info.nightscout.androidaps.plugins.aps.loop.events.EventLoopUpdateGui
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.interfaces.constraints.Constraint
 import info.nightscout.interfaces.utils.HtmlHelper
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.logging.AAPSLogger
+import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
+import info.nightscout.shared.utils.DateUtil
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import javax.inject.Inject

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

@@ -13,56 +13,53 @@ import android.os.SystemClock
 import androidx.core.app.NotificationCompat
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.BuildConfig
-import info.nightscout.interfaces.Constants
 import info.nightscout.androidaps.MainActivity
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.annotations.OpenForTesting
-import info.nightscout.androidaps.data.DetailedBolusInfo
 import info.nightscout.androidaps.data.PumpEnactResultImpl
-import info.nightscout.androidaps.database.AppRepository
-import info.nightscout.androidaps.database.ValueWrapper
-import info.nightscout.androidaps.database.entities.OfflineEvent
-import info.nightscout.androidaps.database.entities.UserEntry.Action
-import info.nightscout.androidaps.database.entities.UserEntry.Sources
-import info.nightscout.androidaps.database.entities.ValueWithUnit
-import info.nightscout.androidaps.database.transactions.InsertAndCancelCurrentOfflineEventTransaction
-import info.nightscout.androidaps.database.transactions.InsertTherapyEventAnnouncementTransaction
-import info.nightscout.androidaps.extensions.buildDeviceStatus
 import info.nightscout.androidaps.extensions.convertedToAbsolute
 import info.nightscout.androidaps.extensions.convertedToPercent
 import info.nightscout.androidaps.extensions.plannedRemainingMinutes
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.interfaces.ActivityNames
 import info.nightscout.androidaps.interfaces.CommandQueue
-import info.nightscout.interfaces.Config
-import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.Constraints
 import info.nightscout.androidaps.interfaces.IobCobCalculator
 import info.nightscout.androidaps.interfaces.Loop
 import info.nightscout.androidaps.interfaces.Loop.LastRun
-import info.nightscout.androidaps.interfaces.PluginBase
-import info.nightscout.interfaces.PluginDescription
-import info.nightscout.interfaces.PluginType
-import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.interfaces.PumpDescription
-import info.nightscout.androidaps.interfaces.PumpSync
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.aps.loop.events.EventLoopSetLastRunGui
 import info.nightscout.androidaps.plugins.aps.loop.events.EventLoopUpdateGui
 import info.nightscout.androidaps.plugins.aps.loop.events.EventNewOpenLoopNotification
-import info.nightscout.androidaps.plugins.configBuilder.RunningConfiguration
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
-import info.nightscout.interfaces.notifications.Notification
-import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
-import info.nightscout.interfaces.queue.Callback
 import info.nightscout.androidaps.receivers.ReceiverStatusStore
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.FabricPrivacy
-import info.nightscout.androidaps.utils.HardLimits
-import info.nightscout.androidaps.utils.T
+import info.nightscout.androidaps.utils.extensions.buildDeviceStatus
+import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.database.entities.OfflineEvent
+import info.nightscout.database.entities.UserEntry.Action
+import info.nightscout.database.entities.UserEntry.Sources
+import info.nightscout.database.entities.ValueWithUnit
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.database.impl.ValueWrapper
+import info.nightscout.database.impl.transactions.InsertAndCancelCurrentOfflineEventTransaction
+import info.nightscout.database.impl.transactions.InsertTherapyEventAnnouncementTransaction
+import info.nightscout.interfaces.Config
+import info.nightscout.interfaces.Constants
+import info.nightscout.interfaces.constraints.Constraint
+import info.nightscout.interfaces.notifications.Notification
+import info.nightscout.interfaces.plugin.PluginBase
+import info.nightscout.interfaces.plugin.PluginDescription
+import info.nightscout.interfaces.plugin.PluginType
+import info.nightscout.interfaces.profile.Profile
+import info.nightscout.interfaces.pump.DetailedBolusInfo
+import info.nightscout.interfaces.pump.PumpSync
+import info.nightscout.interfaces.pump.defs.PumpDescription
+import info.nightscout.interfaces.queue.Callback
+import info.nightscout.interfaces.ui.ActivityNames
+import info.nightscout.interfaces.utils.HardLimits
+import info.nightscout.plugins.configBuilder.RunningConfiguration
+import info.nightscout.plugins.pump.virtual.VirtualPumpPlugin
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.EventAcceptOpenLoopChange
@@ -71,7 +68,10 @@ import info.nightscout.rx.events.EventTempTargetChange
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
 import info.nightscout.rx.weardata.EventData
+import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
+import info.nightscout.shared.utils.DateUtil
+import info.nightscout.shared.utils.T
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import javax.inject.Inject

app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/DetermineBasalAdapterAMAJS.kt

@@ -2,22 +2,22 @@ package info.nightscout.androidaps.plugins.aps.openAPSAMA
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.data.IobTotal
-import info.nightscout.interfaces.data.MealData
 import info.nightscout.androidaps.extensions.convertedToAbsolute
 import info.nightscout.androidaps.extensions.getPassedDurationToTimeInMinutes
 import info.nightscout.androidaps.extensions.plannedRemainingMinutes
 import info.nightscout.androidaps.interfaces.Constraints
 import info.nightscout.androidaps.interfaces.DetermineBasalAdapterInterface
-import info.nightscout.androidaps.interfaces.GlucoseUnit
 import info.nightscout.androidaps.interfaces.IobCobCalculator
-import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.aps.logger.LoggerCallback
 import info.nightscout.androidaps.plugins.aps.loop.APSResult
 import info.nightscout.androidaps.plugins.aps.loop.ScriptReader
-import info.nightscout.interfaces.aps.SMBDefaults
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
+import info.nightscout.interfaces.GlucoseUnit
+import info.nightscout.interfaces.aps.SMBDefaults
+import info.nightscout.interfaces.iob.IobTotal
+import info.nightscout.interfaces.iob.MealData
+import info.nightscout.interfaces.profile.Profile
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
 import info.nightscout.shared.sharedPreferences.SP

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

@@ -4,35 +4,36 @@ import android.content.Context
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.annotations.OpenForTesting
-import info.nightscout.androidaps.database.AppRepository
-import info.nightscout.androidaps.database.ValueWrapper
 import info.nightscout.androidaps.extensions.target
 import info.nightscout.androidaps.interfaces.APS
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.Constraints
 import info.nightscout.androidaps.interfaces.DetermineBasalAdapterInterface
 import info.nightscout.androidaps.interfaces.IobCobCalculator
-import info.nightscout.androidaps.interfaces.PluginBase
-import info.nightscout.interfaces.PluginDescription
-import info.nightscout.interfaces.PluginType
-import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.plugins.aps.OpenAPSFragment
 import info.nightscout.androidaps.plugins.aps.events.EventOpenAPSUpdateGui
 import info.nightscout.androidaps.plugins.aps.events.EventOpenAPSUpdateResultGui
 import info.nightscout.androidaps.plugins.aps.loop.ScriptReader
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.FabricPrivacy
-import info.nightscout.androidaps.utils.HardLimits
 import info.nightscout.androidaps.utils.Profiler
+import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.profile.secondsFromMidnight
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.database.impl.ValueWrapper
+import info.nightscout.interfaces.constraints.Constraint
+import info.nightscout.interfaces.plugin.PluginBase
+import info.nightscout.interfaces.plugin.PluginDescription
+import info.nightscout.interfaces.plugin.PluginType
+import info.nightscout.interfaces.profile.Profile
+import info.nightscout.interfaces.utils.HardLimits
 import info.nightscout.interfaces.utils.Round
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
+import info.nightscout.shared.interfaces.ResourceHelper
+import info.nightscout.shared.utils.DateUtil
 import org.json.JSONException
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -100,7 +101,7 @@ class OpenAPSAMAPlugin @Inject constructor(
             aapsLogger.debug(LTag.APS, rh.gs(R.string.noprofileset))
             return
         }
-        if (!isEnabled(PluginType.APS)) {
+        if (!isEnabled()) {
             rxBus.send(EventOpenAPSUpdateResultGui(rh.gs(R.string.openapsma_disabled)))
             aapsLogger.debug(LTag.APS, rh.gs(R.string.openapsma_disabled))
             return

app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.kt

@@ -2,27 +2,27 @@ package info.nightscout.androidaps.plugins.aps.openAPSSMB
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.data.IobTotal
-import info.nightscout.interfaces.data.MealData
 import info.nightscout.androidaps.extensions.convertedToAbsolute
 import info.nightscout.androidaps.extensions.getPassedDurationToTimeInMinutes
 import info.nightscout.androidaps.extensions.plannedRemainingMinutes
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.Constraints
 import info.nightscout.androidaps.interfaces.DetermineBasalAdapterInterface
-import info.nightscout.androidaps.interfaces.GlucoseUnit
 import info.nightscout.androidaps.interfaces.IobCobCalculator
-import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.plugins.aps.logger.LoggerCallback
 import info.nightscout.androidaps.plugins.aps.loop.APSResult
 import info.nightscout.androidaps.plugins.aps.loop.ScriptReader
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
+import info.nightscout.interfaces.GlucoseUnit
 import info.nightscout.interfaces.aps.SMBDefaults
+import info.nightscout.interfaces.iob.IobTotal
+import info.nightscout.interfaces.iob.MealData
+import info.nightscout.interfaces.profile.Profile
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
 import info.nightscout.shared.SafeParse
+import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
 import org.json.JSONArray
 import org.json.JSONException

app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalResultSMB.kt

@@ -1,8 +1,8 @@
 package info.nightscout.androidaps.plugins.aps.openAPSSMB
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.interfaces.VariableSensitivityResult
 import info.nightscout.androidaps.plugins.aps.loop.APSResult
+import info.nightscout.interfaces.aps.VariableSensitivityResult
 import info.nightscout.rx.logging.LTag
 import org.json.JSONException
 import org.json.JSONObject

app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.kt

@@ -6,36 +6,37 @@ import androidx.preference.SwitchPreference
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.annotations.OpenForTesting
-import info.nightscout.androidaps.database.AppRepository
-import info.nightscout.androidaps.database.ValueWrapper
 import info.nightscout.androidaps.extensions.target
 import info.nightscout.androidaps.interfaces.APS
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.Constraints
 import info.nightscout.androidaps.interfaces.DetermineBasalAdapterInterface
 import info.nightscout.androidaps.interfaces.IobCobCalculator
-import info.nightscout.androidaps.interfaces.PluginBase
-import info.nightscout.interfaces.PluginDescription
-import info.nightscout.interfaces.PluginType
-import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.plugins.aps.OpenAPSFragment
 import info.nightscout.androidaps.plugins.aps.events.EventOpenAPSUpdateGui
 import info.nightscout.androidaps.plugins.aps.events.EventOpenAPSUpdateResultGui
 import info.nightscout.androidaps.plugins.aps.loop.ScriptReader
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.HardLimits
 import info.nightscout.androidaps.utils.Profiler
+import info.nightscout.core.profile.secondsFromMidnight
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.database.impl.ValueWrapper
 import info.nightscout.interfaces.aps.SMBDefaults
+import info.nightscout.interfaces.constraints.Constraint
+import info.nightscout.interfaces.plugin.PluginBase
+import info.nightscout.interfaces.plugin.PluginDescription
+import info.nightscout.interfaces.plugin.PluginType
+import info.nightscout.interfaces.profile.Profile
+import info.nightscout.interfaces.utils.HardLimits
 import info.nightscout.interfaces.utils.Round
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
+import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
+import info.nightscout.shared.utils.DateUtil
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -109,7 +110,7 @@ class OpenAPSSMBPlugin @Inject constructor(
             aapsLogger.debug(LTag.APS, rh.gs(R.string.noprofileset))
             return
         }
-        if (!isEnabled(PluginType.APS)) {
+        if (!isEnabled()) {
             rxBus.send(EventOpenAPSUpdateResultGui(rh.gs(R.string.openapsma_disabled)))
             aapsLogger.debug(LTag.APS, rh.gs(R.string.openapsma_disabled))
             return

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

@@ -2,32 +2,33 @@ package info.nightscout.androidaps.plugins.aps.openAPSSMBDynamicISF
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.data.IobTotal
-import info.nightscout.interfaces.data.MealData
-import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.extensions.convertedToAbsolute
 import info.nightscout.androidaps.extensions.getPassedDurationToTimeInMinutes
 import info.nightscout.androidaps.extensions.plannedRemainingMinutes
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.Constraints
 import info.nightscout.androidaps.interfaces.DetermineBasalAdapterInterface
-import info.nightscout.androidaps.interfaces.GlucoseUnit
 import info.nightscout.androidaps.interfaces.IobCobCalculator
-import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.interfaces.stats.TddCalculator
 import info.nightscout.androidaps.plugins.aps.logger.LoggerCallback
 import info.nightscout.androidaps.plugins.aps.loop.ScriptReader
 import info.nightscout.androidaps.plugins.aps.openAPSSMB.DetermineBasalResultSMB
-import info.nightscout.interfaces.aps.SMBDefaults
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
-import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.core.profile.toMgdl
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.interfaces.GlucoseUnit
+import info.nightscout.interfaces.aps.SMBDefaults
+import info.nightscout.interfaces.iob.IobTotal
+import info.nightscout.interfaces.iob.MealData
+import info.nightscout.interfaces.profile.Profile
 import info.nightscout.interfaces.utils.Round
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
 import info.nightscout.shared.SafeParse
+import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
+import info.nightscout.shared.utils.DateUtil
 import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject

app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMBDynamicISF/OpenAPSSMBDynamicISFPlugin.kt

@@ -4,23 +4,23 @@ import android.content.Context
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.annotations.OpenForTesting
-import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.interfaces.BuildHelper
 import info.nightscout.androidaps.interfaces.Constraints
 import info.nightscout.androidaps.interfaces.DetermineBasalAdapterInterface
 import info.nightscout.androidaps.interfaces.IobCobCalculator
 import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.plugins.aps.loop.ScriptReader
 import info.nightscout.androidaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.HardLimits
 import info.nightscout.androidaps.utils.Profiler
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.interfaces.BuildHelper
+import info.nightscout.interfaces.utils.HardLimits
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.logging.AAPSLogger
+import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
+import info.nightscout.shared.utils.DateUtil
 import javax.inject.Inject
 import javax.inject.Singleton
 

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

@@ -19,20 +19,20 @@ import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.PreferencesActivity
 import info.nightscout.androidaps.activities.SingleFragmentActivity
 import info.nightscout.androidaps.databinding.ConfigbuilderFragmentBinding
-import info.nightscout.androidaps.extensions.toVisibility
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.interfaces.BuildHelper
-import info.nightscout.interfaces.Config
-import info.nightscout.androidaps.interfaces.PluginBase
-import info.nightscout.interfaces.PluginType
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.plugins.configBuilder.events.EventConfigBuilderUpdateGui
-import info.nightscout.androidaps.utils.FabricPrivacy
 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.interfaces.BuildHelper
+import info.nightscout.interfaces.Config
+import info.nightscout.interfaces.plugin.PluginBase
+import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.EventRebuildTabs
+import info.nightscout.shared.extensions.toVisibility
+import info.nightscout.shared.interfaces.ResourceHelper
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import javax.inject.Inject
@@ -114,6 +114,7 @@ class ConfigBuilderFragment : DaggerFragment() {
             createViewsForPlugins(R.string.configbuilder_loop, R.string.configbuilder_loop_description, PluginType.LOOP, activePlugin.getSpecificPluginsVisibleInList(PluginType.LOOP))
             createViewsForPlugins(R.string.constraints, R.string.configbuilder_constraints_description, PluginType.CONSTRAINTS, activePlugin.getSpecificPluginsVisibleInList(PluginType.CONSTRAINTS))
         }
+        createViewsForPlugins(R.string.configbuilder_sync, R.string.configbuilder_sync_description, PluginType.SYNC, activePlugin.getSpecificPluginsVisibleInList(PluginType.SYNC))
         createViewsForPlugins(R.string.configbuilder_general, R.string.configbuilder_general_description, PluginType.GENERAL, activePlugin.getSpecificPluginsVisibleInList(PluginType.GENERAL))
     }
 
@@ -134,7 +135,8 @@ class ConfigBuilderFragment : DaggerFragment() {
 
     inner class PluginViewHolder internal constructor(private val fragment: ConfigBuilderFragment,
                                                       private val pluginType: PluginType,
-                                                      private val plugin: PluginBase) {
+                                                      private val plugin: PluginBase
+    ) {
 
         @Suppress("InflateParams")
         val baseView: LinearLayout = fragment.layoutInflater.inflate(R.layout.configbuilder_single_plugin, null) as LinearLayout
@@ -208,7 +210,7 @@ class ConfigBuilderFragment : DaggerFragment() {
         }
 
         private fun areMultipleSelectionsAllowed(type: PluginType): Boolean {
-            return type == PluginType.GENERAL || type == PluginType.CONSTRAINTS || type == PluginType.LOOP
+            return type == PluginType.GENERAL || type == PluginType.CONSTRAINTS || type == PluginType.LOOP || type == PluginType.SYNC
         }
     }
 

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

@@ -3,31 +3,32 @@ package info.nightscout.androidaps.plugins.configBuilder
 import androidx.fragment.app.FragmentActivity
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.database.entities.UserEntry.Action
-import info.nightscout.androidaps.database.entities.UserEntry.Sources
-import info.nightscout.androidaps.database.entities.ValueWithUnit
 import info.nightscout.androidaps.interfaces.APS
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.BgSource
-import info.nightscout.androidaps.interfaces.ConfigBuilder
-import info.nightscout.androidaps.interfaces.Insulin
-import info.nightscout.androidaps.interfaces.PluginBase
-import info.nightscout.interfaces.PluginDescription
-import info.nightscout.interfaces.PluginType
-import info.nightscout.androidaps.interfaces.ProfileSource
-import info.nightscout.androidaps.interfaces.Pump
-import info.nightscout.androidaps.interfaces.PumpSync
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.interfaces.Sensitivity
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.configBuilder.events.EventConfigBuilderUpdateGui
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
+import info.nightscout.database.entities.UserEntry.Action
+import info.nightscout.database.entities.UserEntry.Sources
+import info.nightscout.database.entities.ValueWithUnit
+import info.nightscout.interfaces.ConfigBuilder
+import info.nightscout.interfaces.insulin.Insulin
+import info.nightscout.interfaces.plugin.PluginBase
+import info.nightscout.interfaces.plugin.PluginDescription
+import info.nightscout.interfaces.plugin.PluginType
+import info.nightscout.interfaces.profile.ProfileSource
+import info.nightscout.interfaces.pump.Pump
+import info.nightscout.interfaces.pump.PumpSync
+import info.nightscout.interfaces.sync.NsClient
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.EventAppInitialized
 import info.nightscout.rx.events.EventConfigBuilderChange
 import info.nightscout.rx.events.EventRebuildTabs
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
+import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -44,15 +45,15 @@ class ConfigBuilderPlugin @Inject constructor(
     private val pumpSync: PumpSync
 ) : PluginBase(
     PluginDescription()
-    .mainType(PluginType.GENERAL)
-    .fragmentClass(ConfigBuilderFragment::class.java.name)
-    .showInList(true)
-    .alwaysEnabled(true)
-    .alwaysVisible(false)
-    .pluginIcon(R.drawable.ic_cogs)
-    .pluginName(R.string.configbuilder)
-    .shortName(R.string.configbuilder_shortname)
-    .description(R.string.description_config_builder),
+        .mainType(PluginType.GENERAL)
+        .fragmentClass(ConfigBuilderFragment::class.java.name)
+        .showInList(true)
+        .alwaysEnabled(true)
+        .alwaysVisible(false)
+        .pluginIcon(R.drawable.ic_cogs)
+        .pluginName(R.string.configbuilder)
+        .shortName(R.string.configbuilder_shortname)
+        .description(R.string.description_config_builder),
     aapsLogger, rh, injector
 ), ConfigBuilder {
 
@@ -77,65 +78,67 @@ class ConfigBuilderPlugin @Inject constructor(
             val type = p.getType()
             if (p.pluginDescription.alwaysEnabled && p.pluginDescription.alwaysVisible) continue
             if (p.pluginDescription.alwaysEnabled && p.pluginDescription.neverVisible) continue
-            savePref(p, type, true)
+            savePref(p, type)
         }
     }
 
-    private fun savePref(p: PluginBase, type: PluginType, storeVisible: Boolean) {
+    private fun savePref(p: PluginBase, type: PluginType) {
         val settingEnabled = "ConfigBuilder_" + type.name + "_" + p.javaClass.simpleName + "_Enabled"
         sp.putBoolean(settingEnabled, p.isEnabled())
         aapsLogger.debug(LTag.CONFIGBUILDER, "Storing: " + settingEnabled + ":" + p.isEnabled())
-        if (storeVisible) {
-            val settingVisible = "ConfigBuilder_" + type.name + "_" + p.javaClass.simpleName + "_Visible"
-            sp.putBoolean(settingVisible, p.isFragmentVisible())
-            aapsLogger.debug(LTag.CONFIGBUILDER, "Storing: " + settingVisible + ":" + p.isFragmentVisible())
-        }
+        val settingVisible = "ConfigBuilder_" + type.name + "_" + p.javaClass.simpleName + "_Visible"
+        sp.putBoolean(settingVisible, p.isFragmentVisible())
+        aapsLogger.debug(LTag.CONFIGBUILDER, "Storing: " + settingVisible + ":" + p.isFragmentVisible())
     }
 
     private fun loadSettings() {
         aapsLogger.debug(LTag.CONFIGBUILDER, "Loading stored settings")
         for (p in activePlugin.getPluginsList()) {
             val type = p.getType()
-            loadPref(p, type, true)
+            loadPref(p, type)
         }
         activePlugin.verifySelectionInCategories()
     }
 
-    private fun loadPref(p: PluginBase, type: PluginType, loadVisible: Boolean) {
+    private fun loadPref(p: PluginBase, type: PluginType) {
         val settingEnabled = "ConfigBuilder_" + type.name + "_" + p.javaClass.simpleName + "_Enabled"
-        if (sp.contains(settingEnabled)) p.setPluginEnabled(type, sp.getBoolean(settingEnabled, false)) else if (p.getType() == type && (p.pluginDescription.enableByDefault || p.pluginDescription.alwaysEnabled)) {
+        if (sp.contains(settingEnabled)) p.setPluginEnabled(
+            type,
+            sp.getBoolean(settingEnabled, false)
+        ) else if (p.getType() == type && (p.pluginDescription.enableByDefault || p.pluginDescription.alwaysEnabled)) {
             p.setPluginEnabled(type, true)
         }
         aapsLogger.debug(LTag.CONFIGBUILDER, "Loaded: " + settingEnabled + ":" + p.isEnabled(type))
-        if (loadVisible) {
-            val settingVisible = "ConfigBuilder_" + type.name + "_" + p.javaClass.simpleName + "_Visible"
-            if (sp.contains(settingVisible)) p.setFragmentVisible(type, sp.getBoolean(settingVisible, false) && sp.getBoolean(settingEnabled, false)) else if (p.getType() == type && p.pluginDescription.visibleByDefault) {
-                p.setFragmentVisible(type, true)
-            }
-            aapsLogger.debug(LTag.CONFIGBUILDER, "Loaded: " + settingVisible + ":" + p.isFragmentVisible())
+        val settingVisible = "ConfigBuilder_" + type.name + "_" + p.javaClass.simpleName + "_Visible"
+        if (sp.contains(settingVisible)) p.setFragmentVisible(
+            type,
+            sp.getBoolean(settingVisible, false) && sp.getBoolean(settingEnabled, false)
+        ) else if (p.getType() == type && p.pluginDescription.visibleByDefault) {
+            p.setFragmentVisible(type, true)
         }
+        aapsLogger.debug(LTag.CONFIGBUILDER, "Loaded: " + settingVisible + ":" + p.isFragmentVisible())
     }
 
     fun logPluginStatus() {
         for (p in activePlugin.getPluginsList()) {
             aapsLogger.debug(
                 LTag.CONFIGBUILDER, p.name + ":" +
-                (if (p.isEnabled(PluginType.GENERAL)) " GENERAL" else "") +
-                (if (p.isEnabled(PluginType.SENSITIVITY)) " SENSITIVITY" else "") +
-                (if (p.isEnabled(PluginType.PROFILE)) " PROFILE" else "") +
-                (if (p.isEnabled(PluginType.APS)) " APS" else "") +
-                (if (p.isEnabled(PluginType.PUMP)) " PUMP" else "") +
-                (if (p.isEnabled(PluginType.CONSTRAINTS)) " CONSTRAINTS" else "") +
-                (if (p.isEnabled(PluginType.LOOP)) " LOOP" else "") +
-                (if (p.isEnabled(PluginType.BGSOURCE)) " BGSOURCE" else "") +
-                if (p.isEnabled(PluginType.INSULIN)) " INSULIN" else ""
+                    (if (p.isEnabled(PluginType.GENERAL)) " GENERAL" else "") +
+                    (if (p.isEnabled(PluginType.SENSITIVITY)) " SENSITIVITY" else "") +
+                    (if (p.isEnabled(PluginType.PROFILE)) " PROFILE" else "") +
+                    (if (p.isEnabled(PluginType.APS)) " APS" else "") +
+                    (if (p.isEnabled(PluginType.PUMP)) " PUMP" else "") +
+                    (if (p.isEnabled(PluginType.CONSTRAINTS)) " CONSTRAINTS" else "") +
+                    (if (p.isEnabled(PluginType.LOOP)) " LOOP" else "") +
+                    (if (p.isEnabled(PluginType.BGSOURCE)) " BGSOURCE" else "") +
+                    if (p.isEnabled(PluginType.INSULIN)) " INSULIN" else ""
             )
         }
     }
 
     // Ask when switching to physical pump plugin
     fun switchAllowed(changedPlugin: PluginBase, newState: Boolean, activity: FragmentActivity?, type: PluginType) {
-        if (changedPlugin.getType() == PluginType.PUMP && changedPlugin.name != rh.gs(R.string.virtualpump))
+        if (changedPlugin.getType() == PluginType.PUMP && changedPlugin.name != rh.gs(R.string.virtual_pump))
             confirmPumpPluginActivation(changedPlugin, newState, activity, type)
         else if (changedPlugin.getType() == PluginType.PUMP) {
             performPluginSwitch(changedPlugin, newState, type)
@@ -153,36 +156,41 @@ class ConfigBuilderPlugin @Inject constructor(
                 performPluginSwitch(changedPlugin, newState, type)
                 pumpSync.connectNewPump()
                 sp.putBoolean("allow_hardware_pump", true)
-                uel.log(Action.HW_PUMP_ALLOWED, Sources.ConfigBuilder, rh.gs(changedPlugin.pluginDescription.pluginName),
-                        ValueWithUnit.SimpleString(rh.gsNotLocalised(changedPlugin.pluginDescription.pluginName)))
+                uel.log(
+                    Action.HW_PUMP_ALLOWED, Sources.ConfigBuilder, rh.gs(changedPlugin.pluginDescription.pluginName),
+                    ValueWithUnit.SimpleString(rh.gsNotLocalised(changedPlugin.pluginDescription.pluginName))
+                )
                 aapsLogger.debug(LTag.PUMP, "First time HW pump allowed!")
             }, {
-                rxBus.send(EventConfigBuilderUpdateGui())
-                aapsLogger.debug(LTag.PUMP, "User does not allow switching to HW pump!")
-            })
+                                          rxBus.send(EventConfigBuilderUpdateGui())
+                                          aapsLogger.debug(LTag.PUMP, "User does not allow switching to HW pump!")
+                                      })
         }
     }
 
     override fun performPluginSwitch(changedPlugin: PluginBase, enabled: Boolean, type: PluginType) {
-        if(enabled && !changedPlugin.isEnabled()) {
-            uel.log(Action.PLUGIN_ENABLED, Sources.ConfigBuilder, rh.gs(changedPlugin.pluginDescription.pluginName),
-                    ValueWithUnit.SimpleString(rh.gsNotLocalised(changedPlugin.pluginDescription.pluginName)))
-        }
-        else if(!enabled) {
-            uel.log(Action.PLUGIN_DISABLED, Sources.ConfigBuilder, rh.gs(changedPlugin.pluginDescription.pluginName),
-                    ValueWithUnit.SimpleString(rh.gsNotLocalised(changedPlugin.pluginDescription.pluginName)))
+        if (enabled && !changedPlugin.isEnabled()) {
+            uel.log(
+                Action.PLUGIN_ENABLED, Sources.ConfigBuilder, rh.gs(changedPlugin.pluginDescription.pluginName),
+                ValueWithUnit.SimpleString(rh.gsNotLocalised(changedPlugin.pluginDescription.pluginName))
+            )
+        } else if (!enabled) {
+            uel.log(
+                Action.PLUGIN_DISABLED, Sources.ConfigBuilder, rh.gs(changedPlugin.pluginDescription.pluginName),
+                ValueWithUnit.SimpleString(rh.gsNotLocalised(changedPlugin.pluginDescription.pluginName))
+            )
         }
         changedPlugin.setPluginEnabled(type, enabled)
         changedPlugin.setFragmentVisible(type, enabled)
         processOnEnabledCategoryChanged(changedPlugin, type)
-        storeSettings("CheckedCheckboxEnabled")
+        storeSettings("RemoteConfiguration")
         rxBus.send(EventRebuildTabs())
         rxBus.send(EventConfigBuilderChange())
         rxBus.send(EventConfigBuilderUpdateGui())
         logPluginStatus()
     }
 
-    fun processOnEnabledCategoryChanged(changedPlugin: PluginBase, type: PluginType?) {
+    fun processOnEnabledCategoryChanged(changedPlugin: PluginBase, type: PluginType) {
         var pluginsInCategory: ArrayList<PluginBase>? = null
         when (type) {
             PluginType.INSULIN     -> pluginsInCategory = activePlugin.getSpecificPluginsListByInterface(Insulin::class.java)
@@ -191,12 +199,14 @@ class ConfigBuilderPlugin @Inject constructor(
             PluginType.PROFILE     -> pluginsInCategory = activePlugin.getSpecificPluginsListByInterface(ProfileSource::class.java)
             PluginType.BGSOURCE    -> pluginsInCategory = activePlugin.getSpecificPluginsListByInterface(BgSource::class.java)
             PluginType.PUMP        -> pluginsInCategory = activePlugin.getSpecificPluginsListByInterface(Pump::class.java)
+            // Process only NSClients
+            PluginType.SYNC        -> pluginsInCategory = activePlugin.getSpecificPluginsListByInterface(NsClient::class.java)
 
             else                   -> {
             }
         }
         if (pluginsInCategory != null) {
-            val newSelection = changedPlugin.isEnabled(type!!)
+            val newSelection = changedPlugin.isEnabled(type)
             if (newSelection) { // new plugin selected -> disable others
                 for (p in pluginsInCategory) {
                     if (p.name == changedPlugin.name) {
@@ -206,7 +216,9 @@ class ConfigBuilderPlugin @Inject constructor(
                         p.setFragmentVisible(type, false)
                     }
                 }
-            } else { // enable first plugin in list
+            } else if (type != PluginType.SYNC) {
+                // enable first plugin in list
+                // NSC must not be selected
                 pluginsInCategory[0].setPluginEnabled(type, true)
             }
         }

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

@@ -3,16 +3,18 @@ package info.nightscout.androidaps.plugins.configBuilder
 import info.nightscout.androidaps.interfaces.APS
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.BgSource
-import info.nightscout.interfaces.Config
-import info.nightscout.androidaps.interfaces.Insulin
 import info.nightscout.androidaps.interfaces.IobCobCalculator
-import info.nightscout.androidaps.interfaces.Overview
-import info.nightscout.androidaps.interfaces.PluginBase
-import info.nightscout.interfaces.PluginType
-import info.nightscout.androidaps.interfaces.ProfileSource
-import info.nightscout.androidaps.interfaces.Pump
-import info.nightscout.interfaces.Safety
 import info.nightscout.androidaps.interfaces.Sensitivity
+import info.nightscout.interfaces.Config
+import info.nightscout.interfaces.Overview
+import info.nightscout.interfaces.constraints.Safety
+import info.nightscout.interfaces.insulin.Insulin
+import info.nightscout.interfaces.plugin.PluginBase
+import info.nightscout.interfaces.plugin.PluginType
+import info.nightscout.interfaces.profile.ProfileSource
+import info.nightscout.interfaces.pump.Pump
+import info.nightscout.interfaces.sync.NsClient
+import info.nightscout.interfaces.sync.Sync
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
 import javax.inject.Inject
@@ -133,8 +135,9 @@ class PluginStore @Inject constructor(
         setFragmentVisibilities((activePumpStore as PluginBase).name, pluginsInCategory, PluginType.PUMP)
     }
 
-    private fun setFragmentVisibilities(activePluginName: String, pluginsInCategory: ArrayList<PluginBase>,
-                                        pluginType: PluginType
+    private fun setFragmentVisibilities(
+        activePluginName: String, pluginsInCategory: ArrayList<PluginBase>,
+        pluginType: PluginType
     ) {
         aapsLogger.debug(LTag.CONFIGBUILDER, "Selected interface: $activePluginName")
         for (p in pluginsInCategory)
@@ -185,6 +188,17 @@ class PluginStore @Inject constructor(
     override val activeIobCobCalculator: IobCobCalculator
         get() = getSpecificPluginsListByInterface(IobCobCalculator::class.java).first() as IobCobCalculator
 
+    override val activeNsClient: NsClient?
+        get() = getTheOneEnabledInArray(getSpecificPluginsListByInterface(NsClient::class.java), PluginType.SYNC) as NsClient?
+
+    @Suppress("UNCHECKED_CAST")
+    override val firstActiveSync: Sync?
+        get() = (getSpecificPluginsList(PluginType.SYNC) as ArrayList<Sync>).firstOrNull { it.connected }
+
+    @Suppress("UNCHECKED_CAST")
+    override val activeSyncs: ArrayList<Sync>
+        get() = getSpecificPluginsList(PluginType.SYNC) as ArrayList<Sync>
+
     override fun getPluginsList(): ArrayList<PluginBase> = ArrayList(plugins)
 
 }

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

@@ -1,31 +1,31 @@
 package info.nightscout.androidaps.plugins.configBuilder
 
-import info.nightscout.interfaces.Constants
-import info.nightscout.androidaps.core.R
 import info.nightscout.androidaps.data.ProfileSealed
-import info.nightscout.androidaps.database.AppRepository
-import info.nightscout.androidaps.database.ValueWrapper
-import info.nightscout.androidaps.database.entities.ProfileSwitch
-import info.nightscout.androidaps.database.transactions.InsertOrUpdateProfileSwitch
 import info.nightscout.androidaps.events.EventEffectiveProfileSwitchChanged
 import info.nightscout.androidaps.extensions.fromConstant
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.interfaces.Config
-import info.nightscout.androidaps.interfaces.GlucoseUnit
-import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.interfaces.ProfileStore
-import info.nightscout.androidaps.interfaces.ResourceHelper
-import info.nightscout.androidaps.plugins.general.nsclient.data.DeviceStatusData
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.FabricPrivacy
-import info.nightscout.androidaps.utils.HardLimits
-import info.nightscout.androidaps.utils.T
+import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.main.R
+import info.nightscout.database.entities.ProfileSwitch
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.database.impl.ValueWrapper
+import info.nightscout.database.impl.transactions.InsertOrUpdateProfileSwitch
+import info.nightscout.interfaces.Config
+import info.nightscout.interfaces.Constants
+import info.nightscout.interfaces.GlucoseUnit
+import info.nightscout.interfaces.profile.Profile
+import info.nightscout.interfaces.profile.ProfileStore
+import info.nightscout.interfaces.utils.HardLimits
+import info.nightscout.plugins.sync.nsclient.data.ProcessedDeviceStatusData
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
+import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
+import info.nightscout.shared.utils.DateUtil
+import info.nightscout.shared.utils.T
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import java.util.concurrent.ConcurrentHashMap
@@ -45,7 +45,7 @@ class ProfileFunctionImpl @Inject constructor(
     private val hardLimits: HardLimits,
     aapsSchedulers: AapsSchedulers,
     private val fabricPrivacy: FabricPrivacy,
-    private val deviceStatusData: DeviceStatusData
+    private val processedDeviceStatusData: ProcessedDeviceStatusData
 ) : ProfileFunction {
 
     private var cache = ConcurrentHashMap<Long, Profile?>()
@@ -117,7 +117,7 @@ class ProfileFunctionImpl @Inject constructor(
         // Try to get it from device status
         // Remove this code after switch to api v3
         if (config.NSCLIENT && ps is ValueWrapper.Absent) {
-            deviceStatusData.pumpData?.activeProfileName?.let { activeProfile ->
+            processedDeviceStatusData.pumpData?.activeProfileName?.let { activeProfile ->
                 activePlugin.activeProfileSource.profile?.getSpecificProfile(activeProfile)?.let { ap ->
                     val sealed = ProfileSealed.Pure(ap)
                     synchronized(cache) {
@@ -183,7 +183,7 @@ class ProfileFunctionImpl @Inject constructor(
         val profileStore = activePlugin.activeProfileSource.profile ?: return false
         val ps = buildProfileSwitch(profileStore, profile.profileName, durationInMinutes, percentage, 0, dateUtil.now()) ?: return false
         val validity = ProfileSealed.PS(ps).isValid(
-            rh.gs(info.nightscout.automation.R.string.careportal_profileswitch),
+            rh.gs(R.string.careportal_profileswitch),
             activePlugin.activePump,
             config,
             rh,

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

@@ -17,29 +17,29 @@ import androidx.recyclerview.widget.LinearSmoothScroller
 import androidx.recyclerview.widget.RecyclerView
 import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.database.entities.UserEntry.Action
-import info.nightscout.androidaps.database.entities.UserEntry.Sources
-import info.nightscout.androidaps.database.entities.ValueWithUnit
 import info.nightscout.androidaps.databinding.ObjectivesFragmentBinding
 import info.nightscout.androidaps.databinding.ObjectivesItemBinding
 import info.nightscout.androidaps.dialogs.NtpProgressDialog
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.constraints.objectives.activities.ObjectivesExamDialog
 import info.nightscout.androidaps.plugins.constraints.objectives.events.EventObjectivesUpdateGui
 import info.nightscout.androidaps.plugins.constraints.objectives.objectives.Objective.ExamTask
 import info.nightscout.androidaps.receivers.ReceiverStatusStore
 import info.nightscout.androidaps.setupwizard.events.EventSWUpdate
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.FabricPrivacy
-import info.nightscout.interfaces.utils.HtmlHelper
 import info.nightscout.androidaps.utils.SntpClient
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
+import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.database.entities.UserEntry.Action
+import info.nightscout.database.entities.UserEntry.Sources
+import info.nightscout.database.entities.ValueWithUnit
+import info.nightscout.interfaces.utils.HtmlHelper
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.EventNtpStatus
 import info.nightscout.rx.logging.AAPSLogger
+import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
+import info.nightscout.shared.utils.DateUtil
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import javax.inject.Inject

app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPlugin.kt

@@ -1,22 +1,9 @@
 package info.nightscout.androidaps.plugins.constraints.objectives
 
-import androidx.fragment.app.FragmentActivity
-import com.google.common.base.Charsets
-import com.google.common.hash.Hashing
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.BuildConfig
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.database.entities.UserEntry.Action
-import info.nightscout.androidaps.database.entities.UserEntry.Sources
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.interfaces.Config
-import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.Constraints
-import info.nightscout.androidaps.interfaces.PluginBase
-import info.nightscout.interfaces.PluginDescription
-import info.nightscout.interfaces.PluginType
-import info.nightscout.androidaps.interfaces.ResourceHelper
-import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.constraints.objectives.objectives.Objective
 import info.nightscout.androidaps.plugins.constraints.objectives.objectives.Objective0
 import info.nightscout.androidaps.plugins.constraints.objectives.objectives.Objective1
@@ -28,11 +15,14 @@ import info.nightscout.androidaps.plugins.constraints.objectives.objectives.Obje
 import info.nightscout.androidaps.plugins.constraints.objectives.objectives.Objective6
 import info.nightscout.androidaps.plugins.constraints.objectives.objectives.Objective7
 import info.nightscout.androidaps.plugins.constraints.objectives.objectives.Objective9
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
+import info.nightscout.interfaces.Config
+import info.nightscout.interfaces.constraints.Constraint
+import info.nightscout.interfaces.plugin.PluginBase
+import info.nightscout.interfaces.plugin.PluginDescription
+import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.rx.logging.AAPSLogger
+import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
-import java.util.Locale
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -43,19 +33,17 @@ class ObjectivesPlugin @Inject constructor(
     rh: ResourceHelper,
     private val activePlugin: ActivePlugin,
     private val sp: SP,
-    config: Config,
-    private val dateUtil: DateUtil,
-    private val uel: UserEntryLogger
+    config: Config
 ) : PluginBase(
     PluginDescription()
-    .mainType(PluginType.CONSTRAINTS)
-    .fragmentClass(ObjectivesFragment::class.qualifiedName)
-    .alwaysEnabled(config.APS)
-    .showInList(config.APS)
-    .pluginIcon(R.drawable.ic_graduation)
-    .pluginName(R.string.objectives)
-    .shortName(R.string.objectives_shortname)
-    .description(R.string.description_objectives),
+        .mainType(PluginType.CONSTRAINTS)
+        .fragmentClass(ObjectivesFragment::class.qualifiedName)
+        .alwaysEnabled(config.APS)
+        .showInList(config.APS)
+        .pluginIcon(R.drawable.ic_graduation)
+        .pluginName(R.string.objectives)
+        .shortName(R.string.objectives_shortname)
+        .description(R.string.description_objectives),
     aapsLogger, rh, injector
 ), Constraints {
 
@@ -103,8 +91,8 @@ class ObjectivesPlugin @Inject constructor(
             objective.startedOn = 0
             objective.accomplishedOn = 0
         }
-        sp.putBoolean(R.string.key_ObjectivesbgIsAvailableInNS, false)
-        sp.putBoolean(R.string.key_ObjectivespumpStatusIsAvailableInNS, false)
+        sp.putBoolean(R.string.key_objectives_bg_is_available_in_ns, false)
+        sp.putBoolean(R.string.key_objectives_pump_status_is_available_in_ns, false)
         sp.putInt(R.string.key_ObjectivesmanualEnacts, 0)
         sp.putBoolean(R.string.key_objectiveuseprofileswitch, false)
         sp.putBoolean(R.string.key_objectiveusedisconnect, false)
@@ -115,34 +103,6 @@ class ObjectivesPlugin @Inject constructor(
         sp.putBoolean(R.string.key_objectiveusescale, false)
     }
 
-    fun completeObjectives(activity: FragmentActivity, request: String) {
-        val requestCode = sp.getString(R.string.key_objectives_request_code, "")
-        var url = sp.getString(R.string.key_nsclientinternal_url, "").lowercase(Locale.getDefault())
-        if (!url.endsWith("/")) url = "$url/"
-        @Suppress("DEPRECATION", "UnstableApiUsage") val hashNS = Hashing.sha1().hashString(url + BuildConfig.APPLICATION_ID + "/" + requestCode, Charsets.UTF_8).toString()
-        if (request.equals(hashNS.substring(0, 10), ignoreCase = true)) {
-            sp.putLong("Objectives_" + "openloop" + "_started", dateUtil.now())
-            sp.putLong("Objectives_" + "openloop" + "_accomplished", dateUtil.now())
-            sp.putLong("Objectives_" + "maxbasal" + "_started", dateUtil.now())
-            sp.putLong("Objectives_" + "maxbasal" + "_accomplished", dateUtil.now())
-            sp.putLong("Objectives_" + "maxiobzero" + "_started", dateUtil.now())
-            sp.putLong("Objectives_" + "maxiobzero" + "_accomplished", dateUtil.now())
-            sp.putLong("Objectives_" + "maxiob" + "_started", dateUtil.now())
-            sp.putLong("Objectives_" + "maxiob" + "_accomplished", dateUtil.now())
-            sp.putLong("Objectives_" + "autosens" + "_started", dateUtil.now())
-            sp.putLong("Objectives_" + "autosens" + "_accomplished", dateUtil.now())
-            sp.putLong("Objectives_" + "smb" + "_started", dateUtil.now())
-            sp.putLong("Objectives_" + "smb" + "_accomplished", dateUtil.now())
-            sp.putLong("Objectives_" + "auto" + "_started", dateUtil.now())
-            sp.putLong("Objectives_" + "auto" + "_accomplished", dateUtil.now())
-            setupObjectives()
-            OKDialog.show(activity, rh.gs(R.string.objectives), rh.gs(R.string.codeaccepted))
-            uel.log(Action.OBJECTIVES_SKIPPED, Sources.Objectives)
-        } else {
-            OKDialog.show(activity, rh.gs(R.string.objectives), rh.gs(R.string.codeinvalid))
-        }
-    }
-
     fun allPriorAccomplished(position: Int): Boolean {
         var accomplished = true
         for (i in 0 until position) {

app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/activities/ObjectivesExamDialog.kt

@@ -7,13 +7,13 @@ import android.view.ViewGroup
 import dagger.android.support.DaggerDialogFragment
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.databinding.ObjectivesExamFragmentBinding
-import info.nightscout.androidaps.interfaces.ResourceHelper
+import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.androidaps.plugins.constraints.objectives.events.EventObjectivesUpdateGui
 import info.nightscout.androidaps.plugins.constraints.objectives.objectives.Objective
 import info.nightscout.androidaps.plugins.constraints.objectives.objectives.Objective.ExamTask
 import info.nightscout.androidaps.plugins.constraints.objectives.objectives.Objective.Option
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.T
+import info.nightscout.shared.utils.DateUtil
+import info.nightscout.shared.utils.T
 import info.nightscout.androidaps.utils.ToastUtils
 import info.nightscout.rx.bus.RxBus
 import javax.inject.Inject

app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective.kt

@@ -9,9 +9,9 @@ import androidx.annotation.StringRes
 import androidx.fragment.app.FragmentActivity
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.T
-import info.nightscout.androidaps.interfaces.ResourceHelper
+import info.nightscout.shared.utils.DateUtil
+import info.nightscout.shared.utils.T
+import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
 import java.util.*
 import javax.inject.Inject

app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective0.kt

@@ -2,14 +2,13 @@ package info.nightscout.androidaps.plugins.constraints.objectives.objectives
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.database.AppRepository
-import info.nightscout.androidaps.database.ValueWrapper
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.IobCobCalculator
 import info.nightscout.androidaps.interfaces.Loop
-import info.nightscout.androidaps.interfaces.PluginBase
-import info.nightscout.androidaps.plugins.general.nsclient.NSClientPlugin
-import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.database.impl.ValueWrapper
+import info.nightscout.interfaces.plugin.PluginBase
+import info.nightscout.plugins.pump.virtual.VirtualPumpPlugin
 import javax.inject.Inject
 
 class Objective0(injector: HasAndroidInjector) : Objective(injector, "config", R.string.objectives_0_objective, R.string.objectives_0_gate) {
@@ -18,23 +17,22 @@ class Objective0(injector: HasAndroidInjector) : Objective(injector, "config", R
     @Inject lateinit var virtualPumpPlugin: VirtualPumpPlugin
     @Inject lateinit var repository: AppRepository
     @Inject lateinit var loop: Loop
-    @Inject lateinit var nsClientPlugin: NSClientPlugin
     @Inject lateinit var iobCobCalculator: IobCobCalculator
 
     init {
         tasks.add(object : Task(this, R.string.objectives_bgavailableinns) {
             override fun isCompleted(): Boolean {
-                return sp.getBoolean(R.string.key_ObjectivesbgIsAvailableInNS, false)
+                return sp.getBoolean(R.string.key_objectives_bg_is_available_in_ns, false)
             }
         })
-        tasks.add(object : Task(this, R.string.nsclienthaswritepermission) {
+        tasks.add(object : Task(this, R.string.synchaswritepermission) {
             override fun isCompleted(): Boolean {
-                return nsClientPlugin.hasWritePermission()
+                return activePlugin.firstActiveSync?.hasWritePermission == true
             }
         })
         tasks.add(object : Task(this, R.string.virtualpump_uploadstatus_title) {
             override fun isCompleted(): Boolean {
-                return sp.getBoolean(R.string.key_virtualpump_uploadstatus, false)
+                return sp.getBoolean(R.string.key_virtual_pump_upload_status, false)
             }
 
             override fun shouldBeIgnored(): Boolean {
@@ -43,7 +41,7 @@ class Objective0(injector: HasAndroidInjector) : Objective(injector, "config", R
         })
         tasks.add(object : Task(this, R.string.objectives_pumpstatusavailableinns) {
             override fun isCompleted(): Boolean {
-                return sp.getBoolean(R.string.key_ObjectivespumpStatusIsAvailableInNS, false)
+                return sp.getBoolean(R.string.key_objectives_pump_status_is_available_in_ns, false)
             }
         })
         tasks.add(object : Task(this, R.string.hasbgdata) {

app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective10.kt

@@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.constraints.objectives.objectives
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.utils.T
+import info.nightscout.shared.utils.T
 
 class Objective10(injector: HasAndroidInjector) : Objective(injector, "auto", R.string.objectives_auto_objective, R.string.objectives_auto_gate) {
 

app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective3.kt

@@ -1,18 +1,15 @@
 package info.nightscout.androidaps.plugins.constraints.objectives.objectives
 
-import androidx.fragment.app.FragmentActivity
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.plugins.constraints.objectives.ObjectivesPlugin
-import info.nightscout.androidaps.plugins.general.nsclient.NSClientPlugin
-import info.nightscout.androidaps.utils.T
+import info.nightscout.androidaps.interfaces.ActivePlugin
+import info.nightscout.shared.utils.T
 import javax.inject.Inject
 
 @Suppress("SpellCheckingInspection")
 class Objective3 @Inject constructor(injector: HasAndroidInjector) : Objective(injector, "openloop", R.string.objectives_openloop_objective, R.string.objectives_openloop_gate) {
 
-    @Inject lateinit var objectivesPlugin: ObjectivesPlugin
-    @Inject lateinit var nsClientPlugin: NSClientPlugin
+    @Inject lateinit var activePlugin: ActivePlugin
 
     init {
         tasks.add(MinimumDurationTask(this, T.days(7).msecs()))
@@ -22,17 +19,11 @@ class Objective3 @Inject constructor(injector: HasAndroidInjector) : Objective(i
             }
 
             override val progress: String
-                get() = if (sp.getInt(R.string.key_ObjectivesmanualEnacts, 0) >= MANUAL_ENACTS_NEEDED) rh.gs(R.string.completed_well_done) else sp.getInt(R.string.key_ObjectivesmanualEnacts, 0).toString() + " / " + MANUAL_ENACTS_NEEDED
+                get() = if (sp.getInt(R.string.key_ObjectivesmanualEnacts, 0) >= MANUAL_ENACTS_NEEDED) rh.gs(R.string.completed_well_done) else sp.getInt(R.string.key_ObjectivesmanualEnacts, 0)
+                    .toString() + " / " + MANUAL_ENACTS_NEEDED
         })
     }
 
-    override fun specialActionEnabled(): Boolean =
-        nsClientPlugin.nsClientService?.isConnected == true && nsClientPlugin.nsClientService?.hasWriteAuth == true
-
-    override fun specialAction(activity: FragmentActivity, input: String) {
-        objectivesPlugin.completeObjectives(activity, input)
-    }
-
     companion object {
 
         private const val MANUAL_ENACTS_NEEDED = 20

app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective5.kt

@@ -2,9 +2,9 @@ package info.nightscout.androidaps.plugins.constraints.objectives.objectives
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.plugins.constraints.safety.SafetyPlugin
-import info.nightscout.androidaps.utils.T
+import info.nightscout.interfaces.constraints.Constraint
+import info.nightscout.shared.utils.T
 import javax.inject.Inject
 
 @Suppress("SpellCheckingInspection")

app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective6.kt

@@ -4,7 +4,7 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.interfaces.Constraints
 import info.nightscout.androidaps.plugins.constraints.safety.SafetyPlugin
-import info.nightscout.androidaps.utils.T
+import info.nightscout.shared.utils.T
 import javax.inject.Inject
 
 @Suppress("SpellCheckingInspection")

app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective7.kt

@@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.constraints.objectives.objectives
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.utils.T
+import info.nightscout.shared.utils.T
 
 class Objective7(injector: HasAndroidInjector) : Objective(injector, "autosens", R.string.objectives_autosens_objective, R.string.objectives_autosens_gate) {
 

app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective9.kt

@@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.constraints.objectives.objectives
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.utils.T
+import info.nightscout.shared.utils.T
 
 class Objective9(injector: HasAndroidInjector) : Objective(injector, "smb", R.string.objectives_smb_objective, R.string.objectives_smb_gate) {
 

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

@@ -9,31 +9,31 @@ import info.nightscout.androidaps.extensions.storeDouble
 import info.nightscout.androidaps.extensions.storeInt
 import info.nightscout.androidaps.extensions.storeString
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.interfaces.BuildHelper
-import info.nightscout.interfaces.Config
-import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.Constraints
 import info.nightscout.androidaps.interfaces.IobCobCalculator
-import info.nightscout.androidaps.interfaces.PluginBase
-import info.nightscout.interfaces.PluginDescription
-import info.nightscout.interfaces.PluginType
-import info.nightscout.androidaps.interfaces.Profile
-import info.nightscout.androidaps.interfaces.PumpDescription
-import info.nightscout.androidaps.interfaces.ResourceHelper
-import info.nightscout.interfaces.Safety
 import info.nightscout.androidaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
 import info.nightscout.androidaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
 import info.nightscout.androidaps.plugins.aps.openAPSSMBDynamicISF.OpenAPSSMBDynamicISFPlugin
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
-import info.nightscout.interfaces.notifications.Notification
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin
-import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DecimalFormatter
-import info.nightscout.androidaps.utils.HardLimits
+import info.nightscout.interfaces.BuildHelper
+import info.nightscout.interfaces.Config
+import info.nightscout.interfaces.constraints.Constraint
+import info.nightscout.interfaces.constraints.Safety
+import info.nightscout.interfaces.notifications.Notification
+import info.nightscout.interfaces.plugin.PluginBase
+import info.nightscout.interfaces.plugin.PluginDescription
+import info.nightscout.interfaces.plugin.PluginType
+import info.nightscout.interfaces.profile.Profile
+import info.nightscout.interfaces.pump.defs.PumpDescription
+import info.nightscout.interfaces.utils.HardLimits
 import info.nightscout.interfaces.utils.Round
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.logging.AAPSLogger
+import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
+import info.nightscout.shared.utils.DateUtil
 import org.json.JSONObject
 import javax.inject.Inject
 import javax.inject.Singleton

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

@@ -12,10 +12,6 @@ import androidx.core.content.ContextCompat
 import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.HistoryBrowseActivity
-import info.nightscout.androidaps.database.AppRepository
-import info.nightscout.androidaps.database.ValueWrapper
-import info.nightscout.androidaps.database.entities.UserEntry.Action
-import info.nightscout.androidaps.database.entities.UserEntry.Sources
 import info.nightscout.androidaps.databinding.ActionsFragmentBinding
 import info.nightscout.androidaps.dialogs.ExtendedBolusDialog
 import info.nightscout.androidaps.dialogs.FillDialog
@@ -24,27 +20,28 @@ import info.nightscout.androidaps.dialogs.TempBasalDialog
 import info.nightscout.androidaps.dialogs.TempTargetDialog
 import info.nightscout.androidaps.extensions.toStringMedium
 import info.nightscout.androidaps.extensions.toStringShort
-import info.nightscout.androidaps.extensions.toVisibility
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.interfaces.ActivityNames
-import info.nightscout.interfaces.BuildHelper
 import info.nightscout.androidaps.interfaces.CommandQueue
-import info.nightscout.interfaces.Config
 import info.nightscout.androidaps.interfaces.IobCobCalculator
 import info.nightscout.androidaps.interfaces.Loop
 import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.interfaces.pump.actions.CustomAction
 import info.nightscout.androidaps.plugins.general.overview.StatusLightHandler
-import info.nightscout.interfaces.queue.Callback
 import info.nightscout.androidaps.skins.SkinProvider
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import info.nightscout.androidaps.utils.ui.SingleClickButton
 import info.nightscout.androidaps.utils.ui.UIRunnable
+import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.database.entities.UserEntry.Action
+import info.nightscout.database.entities.UserEntry.Sources
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.database.impl.ValueWrapper
+import info.nightscout.interfaces.BuildHelper
+import info.nightscout.interfaces.Config
+import info.nightscout.interfaces.pump.actions.CustomAction
+import info.nightscout.interfaces.queue.Callback
+import info.nightscout.interfaces.ui.ActivityNames
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.EventCustomActionsChanged
@@ -53,7 +50,10 @@ import info.nightscout.rx.events.EventInitializationChanged
 import info.nightscout.rx.events.EventTempBasalChange
 import info.nightscout.rx.events.EventTherapyEventChange
 import info.nightscout.rx.logging.AAPSLogger
+import info.nightscout.shared.extensions.toVisibility
+import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
+import info.nightscout.shared.utils.DateUtil
 import info.nightscout.ui.activities.TDDStatsActivity
 import info.nightscout.ui.dialogs.CareDialog
 import io.reactivex.rxjava3.disposables.CompositeDisposable

app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsPlugin.kt

@@ -3,11 +3,11 @@ package info.nightscout.androidaps.plugins.general.actions
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.interfaces.Config
-import info.nightscout.androidaps.interfaces.PluginBase
-import info.nightscout.interfaces.PluginDescription
-import info.nightscout.interfaces.PluginType
-import info.nightscout.androidaps.interfaces.ResourceHelper
+import info.nightscout.interfaces.plugin.PluginBase
+import info.nightscout.interfaces.plugin.PluginDescription
+import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.rx.logging.AAPSLogger
+import info.nightscout.shared.interfaces.ResourceHelper
 import javax.inject.Inject
 import javax.inject.Singleton
 

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

@@ -7,33 +7,33 @@ import android.os.Bundle
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.extensions.durationInMinutes
-import info.nightscout.androidaps.extensions.safeQueryBroadcastReceivers
 import info.nightscout.androidaps.extensions.toStringFull
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.interfaces.Config
 import info.nightscout.androidaps.interfaces.IobCobCalculator
 import info.nightscout.androidaps.interfaces.Loop
-import info.nightscout.androidaps.interfaces.PluginBase
-import info.nightscout.interfaces.PluginDescription
-import info.nightscout.interfaces.PluginType
 import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.plugins.aps.events.EventOpenAPSUpdateGui
-import info.nightscout.androidaps.plugins.general.nsclient.data.DeviceStatusData
-import info.nightscout.androidaps.plugins.general.nsclient.data.NSDeviceStatus
-import info.nightscout.rx.events.EventOverviewBolusProgress
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.androidaps.receivers.Intents
 import info.nightscout.androidaps.receivers.ReceiverStatusStore
-import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DefaultValueHelper
-import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.iob.round
+import info.nightscout.interfaces.Config
+import info.nightscout.interfaces.plugin.PluginBase
+import info.nightscout.interfaces.plugin.PluginDescription
+import info.nightscout.interfaces.plugin.PluginType
+import info.nightscout.plugins.sync.nsclient.data.ProcessedDeviceStatusData
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.Event
 import info.nightscout.rx.events.EventAutosensCalculationFinished
+import info.nightscout.rx.events.EventOverviewBolusProgress
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
+import info.nightscout.shared.extensions.safeQueryBroadcastReceivers
+import info.nightscout.shared.interfaces.ResourceHelper
+import info.nightscout.shared.utils.DateUtil
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import javax.inject.Inject
@@ -52,14 +52,12 @@ class DataBroadcastPlugin @Inject constructor(
     private val iobCobCalculator: IobCobCalculator,
     private val profileFunction: ProfileFunction,
     private val defaultValueHelper: DefaultValueHelper,
-    private val nsDeviceStatus: NSDeviceStatus,
-    private val deviceStatusData: DeviceStatusData,
+    private val processedDeviceStatusData: ProcessedDeviceStatusData,
     private val loop: Loop,
     private val activePlugin: ActivePlugin,
     private var receiverStatusStore: ReceiverStatusStore,
     private val config: Config,
     private val glucoseStatusProvider: GlucoseStatusProvider
-
 ) : PluginBase(
     PluginDescription()
         .mainType(PluginType.GENERAL)
@@ -143,7 +141,7 @@ class DataBroadcastPlugin @Inject constructor(
     private fun loopStatus(bundle: Bundle) {
         //batteries
         bundle.putInt("phoneBattery", receiverStatusStore.batteryLevel)
-        bundle.putInt("rigBattery", nsDeviceStatus.uploaderStatus.replace("%", "").trim { it <= ' ' }.toInt())
+        bundle.putInt("rigBattery", processedDeviceStatusData.uploaderStatus.replace("%", "").trim { it <= ' ' }.toInt())
 
         if (config.APS && loop.lastRun?.lastTBREnact != 0L) { //we are AndroidAPS
             bundle.putLong("suggestedTimeStamp", loop.lastRun?.lastAPSRun ?: -1L)
@@ -156,7 +154,7 @@ class DataBroadcastPlugin @Inject constructor(
                 bundle.putString("enacted", loop.lastRun?.request?.json().toString())
             }
         } else { //NSClient or remote
-            val data = deviceStatusData.openAPSData
+            val data = processedDeviceStatusData.openAPSData
             if (data.clockSuggested != 0L && data.suggested != null) {
                 bundle.putLong("suggestedTimeStamp", data.clockSuggested)
                 bundle.putString("suggested", data.suggested.toString())

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

@@ -24,42 +24,42 @@ import info.nightscout.androidaps.BuildConfig
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.DaggerAppCompatActivityWithResult
 import info.nightscout.androidaps.activities.PreferencesActivity
-import info.nightscout.androidaps.database.AppRepository
-import info.nightscout.androidaps.database.entities.UserEntry
-import info.nightscout.androidaps.database.entities.UserEntry.Action
-import info.nightscout.androidaps.database.entities.UserEntry.Sources
 import info.nightscout.androidaps.diaconn.events.EventDiaconnG8PumpLogReset
-import info.nightscout.interfaces.AndroidPermission
-import info.nightscout.interfaces.BuildHelper
-import info.nightscout.interfaces.Config
-import info.nightscout.androidaps.interfaces.ImportExportPrefs
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.general.maintenance.formats.EncryptedPrefsFormat
-import info.nightscout.interfaces.data.maintenance.PrefFileNotFoundError
-import info.nightscout.interfaces.data.maintenance.PrefIOError
-import info.nightscout.interfaces.data.maintenance.PrefMetadata
-import info.nightscout.interfaces.data.maintenance.Prefs
-import info.nightscout.interfaces.data.maintenance.PrefsFormat
-import info.nightscout.interfaces.data.maintenance.PrefsMetadataKey
-import info.nightscout.interfaces.data.maintenance.PrefsStatus
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.interfaces.utils.MidnightTime
-import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.ToastUtils
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.alertDialogs.PrefImportSummaryDialog
 import info.nightscout.androidaps.utils.alertDialogs.TwoMessagesAlertDialog
 import info.nightscout.androidaps.utils.alertDialogs.WarningDialog
 import info.nightscout.androidaps.utils.protection.PasswordCheck
-import info.nightscout.interfaces.storage.Storage
 import info.nightscout.androidaps.utils.userEntry.UserEntryPresentationHelper
-import info.nightscout.interfaces.data.maintenance.PrefsFile
+import info.nightscout.database.entities.UserEntry
+import info.nightscout.database.entities.UserEntry.Action
+import info.nightscout.database.entities.UserEntry.Sources
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.interfaces.AndroidPermission
+import info.nightscout.interfaces.BuildHelper
+import info.nightscout.interfaces.Config
+import info.nightscout.interfaces.maintenance.ImportExportPrefs
+import info.nightscout.interfaces.maintenance.PrefFileNotFoundError
+import info.nightscout.interfaces.maintenance.PrefIOError
+import info.nightscout.interfaces.maintenance.PrefMetadata
+import info.nightscout.interfaces.maintenance.Prefs
+import info.nightscout.interfaces.maintenance.PrefsFile
+import info.nightscout.interfaces.maintenance.PrefsFormat
+import info.nightscout.interfaces.maintenance.PrefsMetadataKey
+import info.nightscout.interfaces.maintenance.PrefsStatus
+import info.nightscout.interfaces.storage.Storage
+import info.nightscout.interfaces.utils.MidnightTime
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.EventAppExit
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
+import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
+import info.nightscout.shared.utils.DateUtil
+import info.nightscout.shared.utils.T
 import java.io.File
 import java.io.FileNotFoundException
 import java.io.IOException

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

@@ -10,33 +10,33 @@ import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.SingleFragmentActivity
 import info.nightscout.androidaps.dana.database.DanaHistoryDatabase
-import info.nightscout.androidaps.database.AppRepository
-import info.nightscout.androidaps.database.entities.UserEntry.Action
-import info.nightscout.androidaps.database.entities.UserEntry.Sources
 import info.nightscout.androidaps.databinding.MaintenanceFragmentBinding
 import info.nightscout.androidaps.diaconn.database.DiaconnHistoryDatabase
 import info.nightscout.androidaps.events.EventPreferenceChange
-import info.nightscout.androidaps.extensions.toVisibility
 import info.nightscout.androidaps.insight.database.InsightDatabase
 import info.nightscout.androidaps.interfaces.DataSyncSelector
-import info.nightscout.androidaps.interfaces.ImportExportPrefs
 import info.nightscout.androidaps.interfaces.IobCobCalculator
-import info.nightscout.androidaps.interfaces.PumpSync
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.general.maintenance.activities.LogSettingActivity
 import info.nightscout.androidaps.plugins.general.overview.OverviewData
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.database.DashHistoryDatabase
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.history.database.ErosHistoryDatabase
-import info.nightscout.androidaps.utils.FabricPrivacy
-import info.nightscout.interfaces.utils.HtmlHelper
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 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.database.entities.UserEntry.Action
+import info.nightscout.database.entities.UserEntry.Sources
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.interfaces.maintenance.ImportExportPrefs
+import info.nightscout.interfaces.pump.PumpSync
+import info.nightscout.interfaces.utils.HtmlHelper
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
+import info.nightscout.shared.extensions.toVisibility
+import info.nightscout.shared.interfaces.ResourceHelper
 import io.reactivex.rxjava3.core.Completable
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign

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

@@ -9,13 +9,13 @@ import info.nightscout.androidaps.BuildConfig
 import info.nightscout.androidaps.R
 import info.nightscout.interfaces.BuildHelper
 import info.nightscout.interfaces.Config
-import info.nightscout.androidaps.interfaces.PluginBase
-import info.nightscout.interfaces.PluginDescription
-import info.nightscout.interfaces.PluginType
-import info.nightscout.androidaps.interfaces.ResourceHelper
-import info.nightscout.androidaps.plugins.general.nsclient.data.NSSettingsStatus
+import info.nightscout.interfaces.plugin.PluginBase
+import info.nightscout.interfaces.plugin.PluginDescription
+import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.plugins.general.maintenance.LoggerUtils
+import info.nightscout.plugins.sync.nsclient.data.NSSettingsStatus
 import info.nightscout.rx.logging.AAPSLogger
+import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
 import java.io.BufferedInputStream
 import java.io.BufferedOutputStream

app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt

@@ -1,539 +0,0 @@
-package info.nightscout.androidaps.plugins.general.nsclient
-
-import android.content.Context
-import androidx.work.Worker
-import androidx.work.WorkerParameters
-import androidx.work.workDataOf
-import dagger.android.HasAndroidInjector
-import info.nightscout.interfaces.Constants
-import info.nightscout.androidaps.R
-import info.nightscout.androidaps.database.AppRepository
-import info.nightscout.androidaps.database.entities.TherapyEvent
-import info.nightscout.androidaps.database.entities.UserEntry.Action
-import info.nightscout.androidaps.database.entities.UserEntry.Sources
-import info.nightscout.androidaps.database.entities.ValueWithUnit
-import info.nightscout.androidaps.database.transactions.SyncNsBolusCalculatorResultTransaction
-import info.nightscout.androidaps.database.transactions.SyncNsBolusTransaction
-import info.nightscout.androidaps.database.transactions.SyncNsCarbsTransaction
-import info.nightscout.androidaps.database.transactions.SyncNsEffectiveProfileSwitchTransaction
-import info.nightscout.androidaps.database.transactions.SyncNsExtendedBolusTransaction
-import info.nightscout.androidaps.database.transactions.SyncNsOfflineEventTransaction
-import info.nightscout.androidaps.database.transactions.SyncNsProfileSwitchTransaction
-import info.nightscout.androidaps.database.transactions.SyncNsTemporaryBasalTransaction
-import info.nightscout.androidaps.database.transactions.SyncNsTemporaryTargetTransaction
-import info.nightscout.androidaps.database.transactions.SyncNsTherapyEventTransaction
-import info.nightscout.androidaps.extensions.bolusCalculatorResultFromJson
-import info.nightscout.androidaps.extensions.bolusFromJson
-import info.nightscout.androidaps.extensions.carbsFromJson
-import info.nightscout.androidaps.extensions.effectiveProfileSwitchFromJson
-import info.nightscout.androidaps.extensions.extendedBolusFromJson
-import info.nightscout.androidaps.extensions.isEffectiveProfileSwitch
-import info.nightscout.androidaps.extensions.offlineEventFromJson
-import info.nightscout.androidaps.extensions.profileSwitchFromJson
-import info.nightscout.androidaps.extensions.temporaryBasalFromJson
-import info.nightscout.androidaps.extensions.temporaryTargetFromJson
-import info.nightscout.androidaps.extensions.therapyEventFromJson
-import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.interfaces.BuildHelper
-import info.nightscout.interfaces.Config
-import info.nightscout.androidaps.interfaces.XDripBroadcast
-import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
-import info.nightscout.interfaces.notifications.Notification
-import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
-import info.nightscout.androidaps.receivers.DataWorkerStorage
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.interfaces.utils.JsonHelper
-import info.nightscout.interfaces.utils.JsonHelper.safeGetLong
-import info.nightscout.rx.bus.RxBus
-import info.nightscout.rx.logging.AAPSLogger
-import info.nightscout.rx.logging.LTag
-import info.nightscout.shared.sharedPreferences.SP
-import java.util.concurrent.TimeUnit
-import javax.inject.Inject
-
-class NSClientAddUpdateWorker(
-    context: Context,
-    params: WorkerParameters
-) : Worker(context, params) {
-
-    @Inject lateinit var nsClientPlugin: NSClientPlugin
-    @Inject lateinit var dataWorkerStorage: DataWorkerStorage
-    @Inject lateinit var aapsLogger: AAPSLogger
-    @Inject lateinit var buildHelper: BuildHelper
-    @Inject lateinit var sp: SP
-    @Inject lateinit var dateUtil: DateUtil
-    @Inject lateinit var config: Config
-    @Inject lateinit var repository: AppRepository
-    @Inject lateinit var activePlugin: ActivePlugin
-    @Inject lateinit var rxBus: RxBus
-    @Inject lateinit var uel: UserEntryLogger
-    @Inject lateinit var virtualPumpPlugin: VirtualPumpPlugin
-    @Inject lateinit var xDripBroadcast: XDripBroadcast
-
-    override fun doWork(): Result {
-        val treatments = dataWorkerStorage.pickupJSONArray(inputData.getLong(DataWorkerStorage.STORE_KEY, -1))
-            ?: return Result.failure(workDataOf("Error" to "missing input data"))
-
-        var ret = Result.success()
-        var latestDateInReceivedData = 0L
-
-        for (i in 0 until treatments.length()) {
-            var json = treatments.getJSONObject(i)
-            aapsLogger.debug(LTag.DATABASE, "Received NS treatment: $json")
-
-            val insulin = JsonHelper.safeGetDouble(json, "insulin")
-            val carbs = JsonHelper.safeGetDouble(json, "carbs")
-            var eventType = JsonHelper.safeGetString(json, "eventType")
-            if (eventType == null) {
-                aapsLogger.debug(LTag.NSCLIENT, "Wrong treatment. Ignoring : $json")
-                continue
-            }
-
-            //Find latest date in treatment
-            val mills = safeGetLong(json, "mills")
-            if (mills != 0L && mills < dateUtil.now())
-                if (mills > latestDateInReceivedData) latestDateInReceivedData = mills
-
-            if (insulin > 0) {
-                if (sp.getBoolean(R.string.key_ns_receive_insulin, false) || config.NSCLIENT) {
-                    bolusFromJson(json)?.let { bolus ->
-                        repository.runTransactionForResult(SyncNsBolusTransaction(bolus))
-                            .doOnError {
-                                aapsLogger.error(LTag.DATABASE, "Error while saving bolus", it)
-                                ret = Result.failure(workDataOf("Error" to it.toString()))
-                            }
-                            .blockingGet()
-                            .also { result ->
-                                result.inserted.forEach {
-                                    uel.log(
-                                        Action.BOLUS, Sources.NSClient, it.notes,
-                                        ValueWithUnit.Timestamp(it.timestamp),
-                                        ValueWithUnit.Insulin(it.amount)
-                                    )
-                                    aapsLogger.debug(LTag.DATABASE, "Inserted bolus $it")
-                                }
-                                result.invalidated.forEach {
-                                    uel.log(
-                                        Action.BOLUS_REMOVED, Sources.NSClient,
-                                        ValueWithUnit.Timestamp(it.timestamp),
-                                        ValueWithUnit.Insulin(it.amount)
-                                    )
-                                    aapsLogger.debug(LTag.DATABASE, "Invalidated bolus $it")
-                                }
-                                result.updatedNsId.forEach {
-                                    aapsLogger.debug(LTag.DATABASE, "Updated nsId of bolus $it")
-                                }
-                                result.updated.forEach {
-                                    aapsLogger.debug(LTag.DATABASE, "Updated amount of bolus $it")
-                                }
-                            }
-                    } ?: aapsLogger.error("Error parsing bolus json $json")
-                }
-            }
-            if (carbs > 0) {
-                if (sp.getBoolean(R.string.key_ns_receive_carbs, false) || config.NSCLIENT) {
-                    carbsFromJson(json)?.let { carb ->
-                        repository.runTransactionForResult(SyncNsCarbsTransaction(carb))
-                            .doOnError {
-                                aapsLogger.error(LTag.DATABASE, "Error while saving carbs", it)
-                                ret = Result.failure(workDataOf("Error" to it.toString()))
-                            }
-                            .blockingGet()
-                            .also { result ->
-                                result.inserted.forEach {
-                                    uel.log(
-                                        Action.CARBS, Sources.NSClient, it.notes,
-                                        ValueWithUnit.Timestamp(it.timestamp),
-                                        ValueWithUnit.Gram(it.amount.toInt())
-                                    )
-                                    aapsLogger.debug(LTag.DATABASE, "Inserted carbs $it")
-                                }
-                                result.invalidated.forEach {
-                                    uel.log(
-                                        Action.CARBS_REMOVED, Sources.NSClient,
-                                        ValueWithUnit.Timestamp(it.timestamp),
-                                        ValueWithUnit.Gram(it.amount.toInt())
-                                    )
-                                    aapsLogger.debug(LTag.DATABASE, "Invalidated carbs $it")
-                                }
-                                result.updated.forEach {
-                                    uel.log(
-                                        Action.CARBS, Sources.NSClient, it.notes,
-                                        ValueWithUnit.Timestamp(it.timestamp),
-                                        ValueWithUnit.Gram(it.amount.toInt())
-                                    )
-                                    aapsLogger.debug(LTag.DATABASE, "Updated carbs $it")
-                                }
-                                result.updatedNsId.forEach {
-                                    aapsLogger.debug(LTag.DATABASE, "Updated nsId carbs $it")
-                                }
-                            }
-                    } ?: aapsLogger.error("Error parsing bolus json $json")
-                }
-            }
-            // Convert back emulated TBR -> EB
-            if (eventType == TherapyEvent.Type.TEMPORARY_BASAL.text && json.has("extendedEmulated")) {
-                val ebJson = json.getJSONObject("extendedEmulated")
-                ebJson.put("_id", json.getString("_id"))
-                ebJson.put("isValid", json.getBoolean("isValid"))
-                ebJson.put("mills", mills)
-                json = ebJson
-                eventType = JsonHelper.safeGetString(json, "eventType")
-                virtualPumpPlugin.fakeDataDetected = true
-            }
-            when {
-                insulin > 0 || carbs > 0                                                    -> Any()
-                eventType == TherapyEvent.Type.TEMPORARY_TARGET.text                        ->
-                    if (sp.getBoolean(R.string.key_ns_receive_temp_target, false) || config.NSCLIENT) {
-                        temporaryTargetFromJson(json)?.let { temporaryTarget ->
-                            repository.runTransactionForResult(SyncNsTemporaryTargetTransaction(temporaryTarget))
-                                .doOnError {
-                                    aapsLogger.error(LTag.DATABASE, "Error while saving temporary target", it)
-                                    ret = Result.failure(workDataOf("Error" to it.toString()))
-                                }
-                                .blockingGet()
-                                .also { result ->
-                                    result.inserted.forEach { tt ->
-                                        uel.log(
-                                            Action.TT, Sources.NSClient,
-                                            ValueWithUnit.TherapyEventTTReason(tt.reason),
-                                            ValueWithUnit.fromGlucoseUnit(tt.lowTarget, Constants.MGDL),
-                                            ValueWithUnit.fromGlucoseUnit(tt.highTarget, Constants.MGDL).takeIf { tt.lowTarget != tt.highTarget },
-                                            ValueWithUnit.Minute(TimeUnit.MILLISECONDS.toMinutes(tt.duration).toInt())
-                                        )
-                                        aapsLogger.debug(LTag.DATABASE, "Inserted TemporaryTarget $tt")
-                                    }
-                                    result.invalidated.forEach { tt ->
-                                        uel.log(
-                                            Action.TT_REMOVED, Sources.NSClient,
-                                            ValueWithUnit.TherapyEventTTReason(tt.reason),
-                                            ValueWithUnit.Mgdl(tt.lowTarget),
-                                            ValueWithUnit.Mgdl(tt.highTarget).takeIf { tt.lowTarget != tt.highTarget },
-                                            ValueWithUnit.Minute(TimeUnit.MILLISECONDS.toMinutes(tt.duration).toInt())
-                                        )
-                                        aapsLogger.debug(LTag.DATABASE, "Invalidated TemporaryTarget $tt")
-                                    }
-                                    result.ended.forEach { tt ->
-                                        uel.log(
-                                            Action.CANCEL_TT, Sources.NSClient,
-                                            ValueWithUnit.TherapyEventTTReason(tt.reason),
-                                            ValueWithUnit.Mgdl(tt.lowTarget),
-                                            ValueWithUnit.Mgdl(tt.highTarget).takeIf { tt.lowTarget != tt.highTarget },
-                                            ValueWithUnit.Minute(TimeUnit.MILLISECONDS.toMinutes(tt.duration).toInt())
-                                        )
-                                        aapsLogger.debug(LTag.DATABASE, "Updated TemporaryTarget $tt")
-                                    }
-                                    result.updatedNsId.forEach {
-                                        aapsLogger.debug(LTag.DATABASE, "Updated nsId TemporaryTarget $it")
-                                    }
-                                    result.updatedDuration.forEach {
-                                        aapsLogger.debug(LTag.DATABASE, "Updated duration TemporaryTarget $it")
-                                    }
-                                }
-                        } ?: aapsLogger.error("Error parsing TT json $json")
-                    }
-                eventType == TherapyEvent.Type.NOTE.text && json.isEffectiveProfileSwitch() -> // replace this by new Type when available in NS
-                    if (sp.getBoolean(R.string.key_ns_receive_profile_switch, false) || config.NSCLIENT) {
-                        effectiveProfileSwitchFromJson(json, dateUtil)?.let { effectiveProfileSwitch ->
-                            repository.runTransactionForResult(SyncNsEffectiveProfileSwitchTransaction(effectiveProfileSwitch))
-                                .doOnError {
-                                    aapsLogger.error(LTag.DATABASE, "Error while saving EffectiveProfileSwitch", it)
-                                    ret = Result.failure(workDataOf("Error" to it.toString()))
-                                }
-                                .blockingGet()
-                                .also { result ->
-                                    result.inserted.forEach {
-                                        uel.log(
-                                            Action.PROFILE_SWITCH, Sources.NSClient,
-                                            ValueWithUnit.Timestamp(it.timestamp)
-                                        )
-                                        aapsLogger.debug(LTag.DATABASE, "Inserted EffectiveProfileSwitch $it")
-                                    }
-                                    result.invalidated.forEach {
-                                        uel.log(
-                                            Action.PROFILE_SWITCH_REMOVED, Sources.NSClient,
-                                            ValueWithUnit.Timestamp(it.timestamp)
-                                        )
-                                        aapsLogger.debug(LTag.DATABASE, "Invalidated EffectiveProfileSwitch $it")
-                                    }
-                                    result.updatedNsId.forEach {
-                                        aapsLogger.debug(LTag.DATABASE, "Updated nsId EffectiveProfileSwitch $it")
-                                    }
-                                }
-                        } ?: aapsLogger.error("Error parsing EffectiveProfileSwitch json $json")
-                    }
-                eventType == TherapyEvent.Type.BOLUS_WIZARD.text                            ->
-                    bolusCalculatorResultFromJson(json)?.let { bolusCalculatorResult ->
-                        repository.runTransactionForResult(SyncNsBolusCalculatorResultTransaction(bolusCalculatorResult))
-                            .doOnError {
-                                aapsLogger.error(LTag.DATABASE, "Error while saving BolusCalculatorResult", it)
-                                ret = Result.failure(workDataOf("Error" to it.toString()))
-                            }
-                            .blockingGet()
-                            .also { result ->
-                                result.inserted.forEach {
-                                    uel.log(
-                                        Action.BOLUS_CALCULATOR_RESULT, Sources.NSClient,
-                                        ValueWithUnit.Timestamp(it.timestamp),
-                                    )
-                                    aapsLogger.debug(LTag.DATABASE, "Inserted BolusCalculatorResult $it")
-                                }
-                                result.invalidated.forEach {
-                                    uel.log(
-                                        Action.BOLUS_CALCULATOR_RESULT_REMOVED, Sources.NSClient,
-                                        ValueWithUnit.Timestamp(it.timestamp),
-                                    )
-                                    aapsLogger.debug(LTag.DATABASE, "Invalidated BolusCalculatorResult $it")
-                                }
-                                result.updatedNsId.forEach {
-                                    aapsLogger.debug(LTag.DATABASE, "Updated nsId BolusCalculatorResult $it")
-                                }
-                            }
-                    } ?: aapsLogger.error("Error parsing BolusCalculatorResult json $json")
-                eventType == TherapyEvent.Type.CANNULA_CHANGE.text ||
-                    eventType == TherapyEvent.Type.INSULIN_CHANGE.text ||
-                    eventType == TherapyEvent.Type.SENSOR_CHANGE.text ||
-                    eventType == TherapyEvent.Type.FINGER_STICK_BG_VALUE.text ||
-                    eventType == TherapyEvent.Type.NONE.text ||
-                    eventType == TherapyEvent.Type.ANNOUNCEMENT.text ||
-                    eventType == TherapyEvent.Type.QUESTION.text ||
-                    eventType == TherapyEvent.Type.EXERCISE.text ||
-                    eventType == TherapyEvent.Type.NOTE.text ||
-                    eventType == TherapyEvent.Type.PUMP_BATTERY_CHANGE.text                 ->
-                    if (sp.getBoolean(R.string.key_ns_receive_therapy_events, false) || config.NSCLIENT) {
-                        therapyEventFromJson(json)?.let { therapyEvent ->
-                            repository.runTransactionForResult(SyncNsTherapyEventTransaction(therapyEvent))
-                                .doOnError {
-                                    aapsLogger.error(LTag.DATABASE, "Error while saving therapy event", it)
-                                    ret = Result.failure(workDataOf("Error" to it.toString()))
-                                }
-                                .blockingGet()
-                                .also { result ->
-                                    val action = when (eventType) {
-                                        TherapyEvent.Type.CANNULA_CHANGE.text -> Action.SITE_CHANGE
-                                        TherapyEvent.Type.INSULIN_CHANGE.text -> Action.RESERVOIR_CHANGE
-                                        else                                  -> Action.CAREPORTAL
-                                    }
-                                    result.inserted.forEach { therapyEvent ->
-                                        uel.log(action, Sources.NSClient,
-                                                therapyEvent.note ?: "",
-                                                ValueWithUnit.Timestamp(therapyEvent.timestamp),
-                                                ValueWithUnit.TherapyEventType(therapyEvent.type),
-                                                ValueWithUnit.fromGlucoseUnit(therapyEvent.glucose ?: 0.0, therapyEvent.glucoseUnit.toString).takeIf { therapyEvent.glucose != null }
-                                        )
-                                        aapsLogger.debug(LTag.DATABASE, "Inserted TherapyEvent $therapyEvent")
-                                    }
-                                    result.invalidated.forEach { therapyEvent ->
-                                        uel.log(Action.CAREPORTAL_REMOVED, Sources.NSClient,
-                                                therapyEvent.note ?: "",
-                                                ValueWithUnit.Timestamp(therapyEvent.timestamp),
-                                                ValueWithUnit.TherapyEventType(therapyEvent.type),
-                                                ValueWithUnit.fromGlucoseUnit(therapyEvent.glucose ?: 0.0, therapyEvent.glucoseUnit.toString).takeIf { therapyEvent.glucose != null }
-                                        )
-                                        aapsLogger.debug(LTag.DATABASE, "Invalidated TherapyEvent $therapyEvent")
-                                    }
-                                    result.updatedNsId.forEach {
-                                        aapsLogger.debug(LTag.DATABASE, "Updated nsId TherapyEvent $it")
-                                    }
-                                    result.updatedDuration.forEach {
-                                        aapsLogger.debug(LTag.DATABASE, "Updated nsId TherapyEvent $it")
-                                    }
-                                }
-                        } ?: aapsLogger.error("Error parsing TherapyEvent json $json")
-                    }
-                eventType == TherapyEvent.Type.COMBO_BOLUS.text                             ->
-                    if (buildHelper.isEngineeringMode() && sp.getBoolean(R.string.key_ns_receive_tbr_eb, false) || config.NSCLIENT) {
-                        extendedBolusFromJson(json)?.let { extendedBolus ->
-                            repository.runTransactionForResult(SyncNsExtendedBolusTransaction(extendedBolus))
-                                .doOnError {
-                                    aapsLogger.error(LTag.DATABASE, "Error while saving extended bolus", it)
-                                    ret = Result.failure(workDataOf("Error" to it.toString()))
-                                }
-                                .blockingGet()
-                                .also { result ->
-                                    result.inserted.forEach {
-                                        uel.log(
-                                            Action.EXTENDED_BOLUS, Sources.NSClient,
-                                            ValueWithUnit.Timestamp(it.timestamp),
-                                            ValueWithUnit.Insulin(it.amount),
-                                            ValueWithUnit.UnitPerHour(it.rate),
-                                            ValueWithUnit.Minute(TimeUnit.MILLISECONDS.toMinutes(it.duration).toInt())
-                                        )
-                                        aapsLogger.debug(LTag.DATABASE, "Inserted ExtendedBolus $it")
-                                    }
-                                    result.invalidated.forEach {
-                                        uel.log(
-                                            Action.EXTENDED_BOLUS_REMOVED, Sources.NSClient,
-                                            ValueWithUnit.Timestamp(it.timestamp),
-                                            ValueWithUnit.Insulin(it.amount),
-                                            ValueWithUnit.UnitPerHour(it.rate),
-                                            ValueWithUnit.Minute(TimeUnit.MILLISECONDS.toMinutes(it.duration).toInt())
-                                        )
-                                        aapsLogger.debug(LTag.DATABASE, "Invalidated ExtendedBolus $it")
-                                    }
-                                    result.ended.forEach {
-                                        uel.log(
-                                            Action.CANCEL_EXTENDED_BOLUS, Sources.NSClient,
-                                            ValueWithUnit.Timestamp(it.timestamp),
-                                            ValueWithUnit.Insulin(it.amount),
-                                            ValueWithUnit.UnitPerHour(it.rate),
-                                            ValueWithUnit.Minute(TimeUnit.MILLISECONDS.toMinutes(it.duration).toInt())
-                                        )
-                                        aapsLogger.debug(LTag.DATABASE, "Updated ExtendedBolus $it")
-                                    }
-                                    result.updatedNsId.forEach {
-                                        aapsLogger.debug(LTag.DATABASE, "Updated nsId ExtendedBolus $it")
-                                    }
-                                    result.updatedDuration.forEach {
-                                        aapsLogger.debug(LTag.DATABASE, "Updated duration ExtendedBolus $it")
-                                    }
-                                }
-                        } ?: aapsLogger.error("Error parsing ExtendedBolus json $json")
-                    }
-                eventType == TherapyEvent.Type.TEMPORARY_BASAL.text                         ->
-                    if (buildHelper.isEngineeringMode() && sp.getBoolean(R.string.key_ns_receive_tbr_eb, false) || config.NSCLIENT) {
-                        temporaryBasalFromJson(json)?.let { temporaryBasal ->
-                            repository.runTransactionForResult(SyncNsTemporaryBasalTransaction(temporaryBasal))
-                                .doOnError {
-                                    aapsLogger.error(LTag.DATABASE, "Error while saving temporary basal", it)
-                                    ret = Result.failure(workDataOf("Error" to it.toString()))
-                                }
-                                .blockingGet()
-                                .also { result ->
-                                    result.inserted.forEach {
-                                        uel.log(
-                                            Action.TEMP_BASAL, Sources.NSClient,
-                                            ValueWithUnit.Timestamp(it.timestamp),
-                                            if (it.isAbsolute) ValueWithUnit.UnitPerHour(it.rate) else ValueWithUnit.Percent(it.rate.toInt()),
-                                            ValueWithUnit.Minute(TimeUnit.MILLISECONDS.toMinutes(it.duration).toInt())
-                                        )
-                                        aapsLogger.debug(LTag.DATABASE, "Inserted TemporaryBasal $it")
-                                    }
-                                    result.invalidated.forEach {
-                                        uel.log(
-                                            Action.TEMP_BASAL_REMOVED, Sources.NSClient,
-                                            ValueWithUnit.Timestamp(it.timestamp),
-                                            if (it.isAbsolute) ValueWithUnit.UnitPerHour(it.rate) else ValueWithUnit.Percent(it.rate.toInt()),
-                                            ValueWithUnit.Minute(TimeUnit.MILLISECONDS.toMinutes(it.duration).toInt())
-                                        )
-                                        aapsLogger.debug(LTag.DATABASE, "Invalidated TemporaryBasal $it")
-                                    }
-                                    result.ended.forEach {
-                                        uel.log(
-                                            Action.CANCEL_TEMP_BASAL, Sources.NSClient,
-                                            ValueWithUnit.Timestamp(it.timestamp),
-                                            if (it.isAbsolute) ValueWithUnit.UnitPerHour(it.rate) else ValueWithUnit.Percent(it.rate.toInt()),
-                                            ValueWithUnit.Minute(TimeUnit.MILLISECONDS.toMinutes(it.duration).toInt())
-                                        )
-                                        aapsLogger.debug(LTag.DATABASE, "Ended TemporaryBasal $it")
-                                    }
-                                    result.updatedNsId.forEach {
-                                        aapsLogger.debug(LTag.DATABASE, "Updated nsId TemporaryBasal $it")
-                                    }
-                                    result.updatedDuration.forEach {
-                                        aapsLogger.debug(LTag.DATABASE, "Updated duration TemporaryBasal $it")
-                                    }
-                                }
-                        } ?: aapsLogger.error("Error parsing TemporaryBasal json $json")
-                    }
-                eventType == TherapyEvent.Type.PROFILE_SWITCH.text                          ->
-                    if (sp.getBoolean(R.string.key_ns_receive_profile_switch, false) || config.NSCLIENT) {
-                        profileSwitchFromJson(json, dateUtil, activePlugin)?.let { profileSwitch ->
-                            repository.runTransactionForResult(SyncNsProfileSwitchTransaction(profileSwitch))
-                                .doOnError {
-                                    aapsLogger.error(LTag.DATABASE, "Error while saving ProfileSwitch", it)
-                                    ret = Result.failure(workDataOf("Error" to it.toString()))
-                                }
-                                .blockingGet()
-                                .also { result ->
-                                    result.inserted.forEach {
-                                        uel.log(
-                                            Action.PROFILE_SWITCH, Sources.NSClient,
-                                            ValueWithUnit.Timestamp(it.timestamp)
-                                        )
-                                        aapsLogger.debug(LTag.DATABASE, "Inserted ProfileSwitch $it")
-                                    }
-                                    result.invalidated.forEach {
-                                        uel.log(
-                                            Action.PROFILE_SWITCH_REMOVED, Sources.NSClient,
-                                            ValueWithUnit.Timestamp(it.timestamp)
-                                        )
-                                        aapsLogger.debug(LTag.DATABASE, "Invalidated ProfileSwitch $it")
-                                    }
-                                    result.updatedNsId.forEach {
-                                        aapsLogger.debug(LTag.DATABASE, "Updated nsId ProfileSwitch $it")
-                                    }
-                                }
-                        } ?: aapsLogger.error("Error parsing ProfileSwitch json $json")
-                    }
-                eventType == TherapyEvent.Type.APS_OFFLINE.text                             ->
-                    if (sp.getBoolean(R.string.key_ns_receive_offline_event, false) && buildHelper.isEngineeringMode() || config.NSCLIENT) {
-                        offlineEventFromJson(json)?.let { offlineEvent ->
-                            repository.runTransactionForResult(SyncNsOfflineEventTransaction(offlineEvent))
-                                .doOnError {
-                                    aapsLogger.error(LTag.DATABASE, "Error while saving OfflineEvent", it)
-                                    ret = Result.failure(workDataOf("Error" to it.toString()))
-                                }
-                                .blockingGet()
-                                .also { result ->
-                                    result.inserted.forEach { oe ->
-                                        uel.log(
-                                            Action.LOOP_CHANGE, Sources.NSClient,
-                                            ValueWithUnit.OfflineEventReason(oe.reason),
-                                            ValueWithUnit.Minute(TimeUnit.MILLISECONDS.toMinutes(oe.duration).toInt())
-                                        )
-                                        aapsLogger.debug(LTag.DATABASE, "Inserted OfflineEvent $oe")
-                                    }
-                                    result.invalidated.forEach { oe ->
-                                        uel.log(
-                                            Action.LOOP_REMOVED, Sources.NSClient,
-                                            ValueWithUnit.OfflineEventReason(oe.reason),
-                                            ValueWithUnit.Minute(TimeUnit.MILLISECONDS.toMinutes(oe.duration).toInt())
-                                        )
-                                        aapsLogger.debug(LTag.DATABASE, "Invalidated OfflineEvent $oe")
-                                    }
-                                    result.ended.forEach { oe ->
-                                        uel.log(
-                                            Action.LOOP_CHANGE, Sources.NSClient,
-                                            ValueWithUnit.OfflineEventReason(oe.reason),
-                                            ValueWithUnit.Minute(TimeUnit.MILLISECONDS.toMinutes(oe.duration).toInt())
-                                        )
-                                        aapsLogger.debug(LTag.DATABASE, "Updated OfflineEvent $oe")
-                                    }
-                                    result.updatedNsId.forEach {
-                                        aapsLogger.debug(LTag.DATABASE, "Updated nsId OfflineEvent $it")
-                                    }
-                                    result.updatedDuration.forEach {
-                                        aapsLogger.debug(LTag.DATABASE, "Updated duration OfflineEvent $it")
-                                    }
-                                }
-                        } ?: aapsLogger.error("Error parsing OfflineEvent json $json")
-                    }
-            }
-            if (sp.getBoolean(R.string.key_ns_receive_therapy_events, false) || config.NSCLIENT)
-                if (eventType == TherapyEvent.Type.ANNOUNCEMENT.text) {
-                    val date = safeGetLong(json, "mills")
-                    val now = System.currentTimeMillis()
-                    val enteredBy = JsonHelper.safeGetString(json, "enteredBy", "")
-                    val notes = JsonHelper.safeGetString(json, "notes", "")
-                    if (date > now - 15 * 60 * 1000L && notes.isNotEmpty()
-                        && enteredBy != sp.getString("careportal_enteredby", "AndroidAPS")
-                    ) {
-                        val defaultVal = config.NSCLIENT
-                        if (sp.getBoolean(R.string.key_ns_announcements, defaultVal)) {
-                            val announcement = Notification(Notification.NS_ANNOUNCEMENT, notes, Notification.ANNOUNCEMENT, 60)
-                            rxBus.send(EventNewNotification(announcement))
-                        }
-                    }
-                }
-        }
-        nsClientPlugin.updateLatestDateReceivedIfNewer(latestDateInReceivedData)
-        xDripBroadcast.sendTreatments(treatments)
-        return ret
-    }
-
-    init {
-        (context.applicationContext as HasAndroidInjector).androidInjector().inject(this)
-    }
-}

app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/DeviceStatusData.kt

@@ -1,42 +0,0 @@
-package info.nightscout.androidaps.plugins.general.nsclient.data
-
-import android.text.Spanned
-import org.json.JSONObject
-import java.util.HashMap
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class DeviceStatusData @Inject constructor() {
-
-    class PumpData {
-        var clock = 0L
-        var isPercent = false
-        var percent = 0
-        var voltage = 0.0
-        var status = "N/A"
-        var reservoir = 0.0
-        var reservoirDisplayOverride = ""
-        var extended: Spanned? = null
-        var activeProfileName: String? = null
-    }
-
-    var pumpData: PumpData? = null
-
-    class Uploader {
-        var clock = 0L
-        var battery = 0
-    }
-
-    val uploaderMap = HashMap<String, Uploader>()
-
-    class OpenAPSData {
-        var clockSuggested = 0L
-        var clockEnacted = 0L
-        var suggested: JSONObject? = null
-        var enacted: JSONObject? = null
-    }
-
-    var openAPSData = OpenAPSData()
-}
-

app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSDeviceStatus.kt

@@ -1,375 +0,0 @@
-package info.nightscout.androidaps.plugins.general.nsclient.data
-
-import android.text.Spanned
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.R
-import info.nightscout.interfaces.Config
-import info.nightscout.androidaps.interfaces.ResourceHelper
-import info.nightscout.androidaps.plugins.aps.loop.APSResult
-import info.nightscout.androidaps.plugins.configBuilder.RunningConfiguration
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.interfaces.utils.HtmlHelper.fromHtml
-import info.nightscout.interfaces.utils.JsonHelper
-import info.nightscout.interfaces.utils.Round
-import info.nightscout.androidaps.utils.T
-import info.nightscout.rx.logging.AAPSLogger
-import info.nightscout.rx.logging.LTag
-import info.nightscout.shared.sharedPreferences.SP
-import org.json.JSONArray
-import org.json.JSONException
-import org.json.JSONObject
-import javax.inject.Inject
-import javax.inject.Singleton
-
-/*
-{
-    "_id": "594fdcec327b83c81b6b8c0f",
-    "device": "openaps://Sony D5803",
-    "pump": {
-        "battery": {
-            "percent": 100
-        },
-        "status": {
-            "status": "normal",
-            "timestamp": "2017-06-25T15:50:14Z"
-        },
-        "extended": {
-            "Version": "1.5-ac98852-2017.06.25",
-            "PumpIOB": 1.13,
-            "LastBolus": "25. 6. 2017 17:25:00",
-            "LastBolusAmount": 0.3,
-            "BaseBasalRate": 0.4,
-            "ActiveProfile": "2016 +30%"
-        },
-        "reservoir": 109,
-        "clock": "2017-06-25T15:55:10Z"
-    },
-    "openaps": {
-        "suggested": {
-            "temp": "absolute",
-            "bg": 115.9,
-            "tick": "+5",
-            "eventualBG": 105,
-            "snoozeBG": 105,
-            "predBGs": {
-                "IOB": [116, 114, 112, 110, 109, 107, 106, 105, 105, 104, 104, 104, 104, 104, 104, 104, 104, 105, 105, 105, 105, 105, 106, 106, 106, 106, 106, 107]
-            },
-            "sensitivityRatio": 0.81,
-            "variable_sens": 137.3,
-            "COB": 0,
-            "IOB": -0.035,
-            "reason": "COB: 0, Dev: -18, BGI: 0.43, ISF: 216, Target: 99; Eventual BG 105 > 99 but Min. Delta -2.60 < Exp. Delta 0.1; setting current basal of 0.4 as temp. Suggested rate is same as profile rate, no temp basal is active, doing nothing",
-            "timestamp": "2017-06-25T15:55:10Z"
-        },
-        "iob": {
-            "iob": -0.035,
-            "basaliob": -0.035,
-            "activity": -0.0004,
-            "time": "2017-06-25T15:55:10Z"
-        }
-    },
-    "uploaderBattery": 93,
-    "created_at": "2017-06-25T15:55:10Z",
-    "NSCLIENT_ID": 1498406118857
-}
- */
-@Suppress("SpellCheckingInspection")
-@Singleton
-class NSDeviceStatus @Inject constructor(
-    private val aapsLogger: AAPSLogger,
-    private val sp: SP,
-    private val rh: ResourceHelper,
-    private val nsSettingsStatus: NSSettingsStatus,
-    private val config: Config,
-    private val dateUtil: DateUtil,
-    private val runningConfiguration: RunningConfiguration,
-    private val deviceStatusData: DeviceStatusData
-) {
-
-    private var data: JSONObject? = null
-    fun handleNewData(deviceStatuses: JSONArray) {
-        aapsLogger.debug(LTag.NSCLIENT, "Got NS deviceStatus: \$deviceStatuses")
-        try {
-            for (i in deviceStatuses.length() - 1 downTo 0) {
-                val devicestatusJson = deviceStatuses.getJSONObject(i)
-                if (devicestatusJson != null) {
-                    setData(devicestatusJson)
-                    if (devicestatusJson.has("pump")) {
-                        // Objectives 0
-                        sp.putBoolean(R.string.key_ObjectivespumpStatusIsAvailableInNS, true)
-                    }
-                    if (devicestatusJson.has("configuration") && config.NSCLIENT) {
-                        // copy configuration of Insulin and Sensitivity from main AAPS
-                        runningConfiguration.apply(devicestatusJson.getJSONObject("configuration"))
-                        break
-                    }
-                }
-            }
-        } catch (jsonException: JSONException) {
-            jsonException.printStackTrace()
-        }
-    }
-
-    private fun setData(obj: JSONObject): NSDeviceStatus {
-        data = obj
-        updatePumpData()
-        updateOpenApsData(obj)
-        updateUploaderData(obj)
-        return this
-    }
-
-    val device: String
-        get() {
-            try {
-                if (data!!.has("device")) {
-                    var device = data!!.getString("device")
-                    if (device.startsWith("openaps://")) {
-                        device = device.substring(10)
-                        return device
-                    }
-                }
-            } catch (e: JSONException) {
-                aapsLogger.error("Unhandled exception", e)
-            }
-            return ""
-        }
-
-    enum class Levels(val level: Int) {
-
-        URGENT(2),
-        WARN(1),
-        INFO(0);
-
-        fun toColor(): String =
-            when (level) {
-                INFO.level   -> "white"
-                WARN.level   -> "yellow"
-                URGENT.level -> "red"
-                else         -> "white"
-            }
-    }
-
-    val extendedPumpStatus: Spanned
-        get() = deviceStatusData.pumpData?.extended ?: fromHtml("")
-
-    val pumpStatus: Spanned
-        // test warning level // color
-        get() {
-            val pumpData = deviceStatusData.pumpData ?: return fromHtml("")
-
-            //String[] ALL_STATUS_FIELDS = {"reservoir", "battery", "clock", "status", "device"};
-            val string = StringBuilder()
-                .append("<span style=\"color:${rh.gac(R.attr.nsTitleColor)}\">")
-                .append(rh.gs(R.string.pump))
-                .append(": </span>")
-
-            // test warning level
-            val level = when {
-                pumpData.clock + nsSettingsStatus.extendedPumpSettings("urgentClock") * 60 * 1000L < dateUtil.now() -> Levels.URGENT
-                pumpData.reservoir < nsSettingsStatus.extendedPumpSettings("urgentRes")                             -> Levels.URGENT
-                pumpData.isPercent && pumpData.percent < nsSettingsStatus.extendedPumpSettings("urgentBattP")       -> Levels.URGENT
-                !pumpData.isPercent && pumpData.voltage > 0 && pumpData.voltage < nsSettingsStatus.extendedPumpSettings("urgentBattV")      -> Levels.URGENT
-                pumpData.clock + nsSettingsStatus.extendedPumpSettings("warnClock") * 60 * 1000L < dateUtil.now()   -> Levels.WARN
-                pumpData.reservoir < nsSettingsStatus.extendedPumpSettings("warnRes")                               -> Levels.WARN
-                pumpData.isPercent && pumpData.percent < nsSettingsStatus.extendedPumpSettings("warnBattP")         -> Levels.WARN
-                !pumpData.isPercent && pumpData.voltage > 0 && pumpData.voltage < nsSettingsStatus.extendedPumpSettings("warnBattV")        -> Levels.WARN
-                else                                                                                                -> Levels.INFO
-            }
-            string.append("<span style=\"color:${level.toColor()}\">")
-            val insulinUnit = rh.gs(R.string.insulin_unit_shortname)
-            val fields = nsSettingsStatus.pumpExtendedSettingsFields()
-            if (pumpData.reservoirDisplayOverride != "") {
-                string.append(pumpData.reservoirDisplayOverride).append("$insulinUnit ")
-            }
-            else if (fields.contains("reservoir")) string.append(pumpData.reservoir.toInt()).append("$insulinUnit ")
-            if (fields.contains("battery") && pumpData.isPercent) string.append(pumpData.percent).append("% ")
-            if (fields.contains("battery") && !pumpData.isPercent) string.append(Round.roundTo(pumpData.voltage, 0.001)).append(" ")
-            if (fields.contains("clock")) string.append(dateUtil.minAgo(rh, pumpData.clock)).append(" ")
-            if (fields.contains("status")) string.append(pumpData.status).append(" ")
-            if (fields.contains("device")) string.append(device).append(" ")
-            string.append("</span>") // color
-            return fromHtml(string.toString())
-        }
-
-    private fun updatePumpData() {
-        try {
-            val data = this.data ?: return
-            val pump = if (data.has("pump")) data.getJSONObject("pump") else JSONObject()
-            val clock = if (pump.has("clock")) dateUtil.fromISODateString(pump.getString("clock")) else 0L
-            // check if this is new data
-            if (clock == 0L || deviceStatusData.pumpData != null && clock < deviceStatusData.pumpData!!.clock) return
-
-            // create new status and process data
-            val deviceStatusPumpData = DeviceStatusData.PumpData()
-            deviceStatusPumpData.clock = clock
-            if (pump.has("status") && pump.getJSONObject("status").has("status")) deviceStatusPumpData.status = pump.getJSONObject("status").getString("status")
-            if (pump.has("reservoir")) deviceStatusPumpData.reservoir = pump.getDouble("reservoir")
-            if (pump.has("reservoir_display_override")) deviceStatusPumpData.reservoirDisplayOverride = pump.getString("reservoir_display_override")
-            if (pump.has("battery") && pump.getJSONObject("battery").has("percent")) {
-                deviceStatusPumpData.isPercent = true
-                deviceStatusPumpData.percent = pump.getJSONObject("battery").getInt("percent")
-            } else if (pump.has("battery") && pump.getJSONObject("battery").has("voltage")) {
-                deviceStatusPumpData.isPercent = false
-                deviceStatusPumpData.voltage = pump.getJSONObject("battery").getDouble("voltage")
-            }
-            if (pump.has("extended")) {
-                val extendedJson = pump.getJSONObject("extended")
-                val extended = StringBuilder()
-                val keys: Iterator<*> = extendedJson.keys()
-                while (keys.hasNext()) {
-                    val key = keys.next() as String
-                    val value = extendedJson.getString(key)
-                    extended.append("<b>").append(key).append(":</b> ").append(value).append("<br>")
-                }
-                deviceStatusPumpData.extended = fromHtml(extended.toString())
-                deviceStatusPumpData.activeProfileName = JsonHelper.safeGetStringAllowNull(extendedJson, "ActiveProfile", null)
-            }
-            deviceStatusData.pumpData = deviceStatusPumpData
-        } catch (e: Exception) {
-            aapsLogger.error("Unhandled exception", e)
-        }
-    }
-
-    private fun updateOpenApsData(jsonObject: JSONObject) {
-        try {
-            val openAps = if (jsonObject.has("openaps")) jsonObject.getJSONObject("openaps") else JSONObject()
-            val suggested = if (openAps.has("suggested")) openAps.getJSONObject("suggested") else JSONObject()
-            val enacted = if (openAps.has("enacted")) openAps.getJSONObject("enacted") else JSONObject()
-            var clock = if (suggested.has("timestamp")) dateUtil.fromISODateString(suggested.getString("timestamp")) else 0L
-            // check if this is new data
-            if (clock != 0L && clock > deviceStatusData.openAPSData.clockSuggested) {
-                deviceStatusData.openAPSData.suggested = suggested
-                deviceStatusData.openAPSData.clockSuggested = clock
-            }
-            clock = if (enacted.has("timestamp")) dateUtil.fromISODateString(enacted.getString("timestamp")) else 0L
-            // check if this is new data
-            if (clock != 0L && clock > deviceStatusData.openAPSData.clockEnacted) {
-                deviceStatusData.openAPSData.enacted = enacted
-                deviceStatusData.openAPSData.clockEnacted = clock
-            }
-        } catch (e: Exception) {
-            aapsLogger.error("Unhandled exception", e)
-        }
-    }
-
-    val openApsStatus: Spanned
-        get() {
-            val string = StringBuilder()
-                .append("<span style=\"color:${rh.gac(R.attr.nsTitleColor)}\">")
-                .append(rh.gs(R.string.openaps_short))
-                .append(": </span>")
-
-            // test warning level
-            val level = when {
-                deviceStatusData.openAPSData.clockSuggested + T.mins(sp.getLong(R.string.key_nsalarm_urgent_staledatavalue, 31)).msecs() < dateUtil.now() -> Levels.URGENT
-                deviceStatusData.openAPSData.clockSuggested + T.mins(sp.getLong(R.string.key_nsalarm_staledatavalue, 16)).msecs() < dateUtil.now()        -> Levels.WARN
-                else                                                                                                                                      -> Levels.INFO
-            }
-            string.append("<span style=\"color:${level.toColor()}\">")
-            if (deviceStatusData.openAPSData.clockSuggested != 0L) string.append(dateUtil.minAgo(rh, deviceStatusData.openAPSData.clockSuggested)).append(" ")
-            string.append("</span>") // color
-            return fromHtml(string.toString())
-        }
-
-    val extendedOpenApsStatus: Spanned
-        get() {
-            val string = StringBuilder()
-            try {
-                if (deviceStatusData.openAPSData.enacted != null && deviceStatusData.openAPSData.clockEnacted != deviceStatusData.openAPSData.clockSuggested) string.append("<b>")
-                    .append(dateUtil.minAgo(rh, deviceStatusData.openAPSData.clockEnacted)).append("</b> ").append(deviceStatusData.openAPSData.enacted!!.getString("reason")).append("<br>")
-                if (deviceStatusData.openAPSData.suggested != null) string.append("<b>").append(dateUtil.minAgo(rh, deviceStatusData.openAPSData.clockSuggested)).append("</b> ")
-                    .append(deviceStatusData.openAPSData.suggested!!.getString("reason")).append("<br>")
-                return fromHtml(string.toString())
-            } catch (e: JSONException) {
-                aapsLogger.error("Unhandled exception", e)
-            }
-            return fromHtml("")
-        }
-
-    private fun updateUploaderData(jsonObject: JSONObject) {
-        try {
-            val clock =
-                when {
-                    jsonObject.has("mills")      -> jsonObject.getLong("mills")
-                    jsonObject.has("created_at") -> dateUtil.fromISODateString(jsonObject.getString("created_at"))
-                    else                         -> 0L
-                }
-            val device = device
-            val battery: Int =
-                when {
-                    jsonObject.has("uploaderBattery")                                                 -> jsonObject.getInt("uploaderBattery")
-                    jsonObject.has("uploader") && jsonObject.getJSONObject("uploader").has("battery") -> jsonObject.getJSONObject("uploader").getInt("battery")
-                    else                                                                              -> 0
-                }
-
-            var uploader = deviceStatusData.uploaderMap[device]
-            // check if this is new data
-            if (clock != 0L && battery != 0 && (uploader == null || clock > uploader.clock)) {
-                if (uploader == null) uploader = DeviceStatusData.Uploader()
-                uploader.battery = battery
-                uploader.clock = clock
-                deviceStatusData.uploaderMap[device] = uploader
-            }
-        } catch (e: Exception) {
-            aapsLogger.error("Unhandled exception", e)
-        }
-    }
-
-    val uploaderStatus: String
-        get() {
-            val iterator: Iterator<*> = deviceStatusData.uploaderMap.entries.iterator()
-            var minBattery = 100
-            while (iterator.hasNext()) {
-                val pair = iterator.next() as Map.Entry<*, *>
-                val uploader = pair.value as DeviceStatusData.Uploader
-                if (minBattery > uploader.battery) minBattery = uploader.battery
-            }
-            return "$minBattery%"
-        }
-
-    val uploaderStatusSpanned: Spanned
-        get() {
-            val string = StringBuilder()
-            string.append("<span style=\"color:${rh.gac(R.attr.nsTitleColor)}\">")
-            string.append(rh.gs(R.string.uploader_short))
-            string.append(": </span>")
-            val iterator: Iterator<*> = deviceStatusData.uploaderMap.entries.iterator()
-            var minBattery = 100
-            while (iterator.hasNext()) {
-                val pair = iterator.next() as Map.Entry<*, *>
-                val uploader = pair.value as DeviceStatusData.Uploader
-                if (minBattery > uploader.battery) minBattery = uploader.battery
-            }
-            string.append(minBattery)
-            string.append("%")
-            return fromHtml(string.toString())
-        }
-
-    val extendedUploaderStatus: Spanned
-        get() {
-            val string = StringBuilder()
-            val iterator: Iterator<*> = deviceStatusData.uploaderMap.entries.iterator()
-            while (iterator.hasNext()) {
-                val pair = iterator.next() as Map.Entry<*, *>
-                val uploader = pair.value as DeviceStatusData.Uploader
-                val device = pair.key as String
-                string.append("<b>").append(device).append(":</b> ").append(uploader.battery).append("%<br>")
-            }
-            return fromHtml(string.toString())
-        }
-
-    val openApsTimestamp: Long
-        get() =
-            if (deviceStatusData.openAPSData.clockSuggested != 0L) {
-                deviceStatusData.openAPSData.clockSuggested
-            } else {
-                -1
-            }
-
-    fun getAPSResult(injector: HasAndroidInjector): APSResult {
-        val result = APSResult(injector)
-        result.json = deviceStatusData.openAPSData.suggested
-        result.date = deviceStatusData.openAPSData.clockSuggested
-        return result
-    }
-}

app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/events/EventNSClientStatus.kt

@@ -1,8 +0,0 @@
-package info.nightscout.androidaps.plugins.general.nsclient.events
-
-import info.nightscout.androidaps.events.EventStatus
-import info.nightscout.androidaps.interfaces.ResourceHelper
-
-class EventNSClientStatus(var text: String) : EventStatus() {
-    override fun getStatus(rh: ResourceHelper): String = text
-}

app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/events/EventNSClientUpdateGUI.kt

@@ -1,5 +0,0 @@
-package info.nightscout.androidaps.plugins.general.nsclient.events
-
-import info.nightscout.rx.events.EventUpdateGui
-
-class EventNSClientUpdateGUI : EventUpdateGui()

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

@@ -27,13 +27,8 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import com.jjoe64.graphview.GraphView
 import dagger.android.HasAndroidInjector
 import dagger.android.support.DaggerFragment
-import info.nightscout.interfaces.Constants
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.ProfileSealed
-import info.nightscout.androidaps.database.AppRepository
-import info.nightscout.androidaps.database.entities.UserEntry.Action
-import info.nightscout.androidaps.database.entities.UserEntry.Sources
-import info.nightscout.androidaps.database.interfaces.end
 import info.nightscout.androidaps.databinding.OverviewFragmentBinding
 import info.nightscout.androidaps.dialogs.InsulinDialog
 import info.nightscout.androidaps.dialogs.LoopDialog
@@ -47,45 +42,29 @@ import info.nightscout.androidaps.events.EventNewBG
 import info.nightscout.androidaps.events.EventPreferenceChange
 import info.nightscout.androidaps.events.EventPumpStatusChanged
 import info.nightscout.androidaps.extensions.directionToIcon
-import info.nightscout.androidaps.extensions.runOnUiThread
-import info.nightscout.androidaps.extensions.toVisibility
 import info.nightscout.androidaps.extensions.valueToUnitsString
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.interfaces.BuildHelper
 import info.nightscout.androidaps.interfaces.CommandQueue
-import info.nightscout.interfaces.Config
-import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.Constraints
-import info.nightscout.androidaps.interfaces.GlucoseUnit
 import info.nightscout.androidaps.interfaces.IobCobCalculator
 import info.nightscout.androidaps.interfaces.Loop
-import info.nightscout.androidaps.interfaces.PluginBase
-import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.interfaces.TrendCalculator
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.aps.loop.events.EventNewOpenLoopNotification
 import info.nightscout.androidaps.plugins.aps.openAPSSMB.DetermineBasalResultSMB
-import info.nightscout.androidaps.plugins.general.nsclient.data.NSDeviceStatus
 import info.nightscout.androidaps.plugins.general.overview.activities.QuickWizardListActivity
 import info.nightscout.androidaps.plugins.general.overview.events.EventUpdateOverviewCalcProgress
 import info.nightscout.androidaps.plugins.general.overview.events.EventUpdateOverviewGraph
 import info.nightscout.androidaps.plugins.general.overview.events.EventUpdateOverviewIobCob
-import info.nightscout.androidaps.plugins.general.overview.events.EventUpdateOverviewNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventUpdateOverviewSensitivity
 import info.nightscout.androidaps.plugins.general.overview.graphData.GraphData
-import info.nightscout.androidaps.plugins.general.overview.notifications.NotificationStore
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
-import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.OmnipodErosPumpPlugin
 import info.nightscout.androidaps.plugins.source.DexcomPlugin
 import info.nightscout.androidaps.plugins.source.XdripPlugin
 import info.nightscout.androidaps.skins.SkinProvider
-import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DefaultValueHelper
-import info.nightscout.androidaps.utils.FabricPrivacy
-import info.nightscout.interfaces.utils.JsonHelper
 import info.nightscout.androidaps.utils.ToastUtils
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
@@ -93,7 +72,28 @@ import info.nightscout.androidaps.utils.ui.SingleClickButton
 import info.nightscout.androidaps.utils.ui.UIRunnable
 import info.nightscout.androidaps.utils.wizard.QuickWizard
 import info.nightscout.automation.AutomationPlugin
+import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.profile.toSignedUnitsString
+import info.nightscout.core.profile.toTargetRangeString
+import info.nightscout.core.profile.toUnits
+import info.nightscout.database.entities.UserEntry.Action
+import info.nightscout.database.entities.UserEntry.Sources
+import info.nightscout.database.entities.interfaces.end
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.interfaces.BuildHelper
+import info.nightscout.interfaces.Config
+import info.nightscout.interfaces.Constants
+import info.nightscout.interfaces.GlucoseUnit
+import info.nightscout.interfaces.constraints.Constraint
+import info.nightscout.interfaces.plugin.PluginBase
+import info.nightscout.interfaces.profile.Profile
+import info.nightscout.interfaces.pump.defs.PumpType
+import info.nightscout.interfaces.utils.JsonHelper
 import info.nightscout.plugins.constraints.bgQualityCheck.BgQualityCheckPlugin
+import info.nightscout.plugins.general.overview.notifications.NotificationStore
+import info.nightscout.plugins.general.overview.notifications.events.EventUpdateOverviewNotification
+import info.nightscout.plugins.sync.nsclient.data.NSSettingsStatus
+import info.nightscout.plugins.sync.nsclient.data.ProcessedDeviceStatusData
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.EventAcceptOpenLoopChange
@@ -105,7 +105,11 @@ import info.nightscout.rx.events.EventTempBasalChange
 import info.nightscout.rx.events.EventTempTargetChange
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.weardata.EventData
+import info.nightscout.shared.extensions.runOnUiThread
+import info.nightscout.shared.extensions.toVisibility
+import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
+import info.nightscout.shared.utils.DateUtil
 import info.nightscout.ui.dialogs.CalibrationDialog
 import info.nightscout.ui.dialogs.CarbsDialog
 import io.reactivex.rxjava3.disposables.CompositeDisposable
@@ -128,7 +132,8 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var constraintChecker: Constraints
     @Inject lateinit var statusLightHandler: StatusLightHandler
-    @Inject lateinit var nsDeviceStatus: NSDeviceStatus
+    @Inject lateinit var processedDeviceStatusData: ProcessedDeviceStatusData
+    @Inject lateinit var nsSettingsStatus: NSSettingsStatus
     @Inject lateinit var loop: Loop
     @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var iobCobCalculator: IobCobCalculator
@@ -503,7 +508,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
 
             R.id.temp_target         -> v.performClick()
             R.id.active_profile      -> activity?.let { activity ->
-                if (loop.isDisconnected) OKDialog.show(activity, rh.gs(R.string.not_available_full), rh.gs(R.string.smscommunicator_pumpdisconnected))
+                if (loop.isDisconnected) OKDialog.show(activity, rh.gs(R.string.not_available_full), rh.gs(R.string.smscommunicator_pump_disconnected))
                 else
                     protectionCheck.queryProtection(
                         activity,
@@ -722,16 +727,16 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             }
 
             // pump status from ns
-            binding.pump.text = nsDeviceStatus.pumpStatus
-            binding.pump.setOnClickListener { activity?.let { OKDialog.show(it, rh.gs(R.string.pump), nsDeviceStatus.extendedPumpStatus) } }
+            binding.pump.text = processedDeviceStatusData.pumpStatus(nsSettingsStatus)
+            binding.pump.setOnClickListener { activity?.let { OKDialog.show(it, rh.gs(R.string.pump), processedDeviceStatusData.extendedPumpStatus) } }
 
             // OpenAPS status from ns
-            binding.openaps.text = nsDeviceStatus.openApsStatus
-            binding.openaps.setOnClickListener { activity?.let { OKDialog.show(it, rh.gs(R.string.openaps), nsDeviceStatus.extendedOpenApsStatus) } }
+            binding.openaps.text = processedDeviceStatusData.openApsStatus
+            binding.openaps.setOnClickListener { activity?.let { OKDialog.show(it, rh.gs(R.string.openaps), processedDeviceStatusData.extendedOpenApsStatus) } }
 
             // Uploader status from ns
-            binding.uploader.text = nsDeviceStatus.uploaderStatusSpanned
-            binding.uploader.setOnClickListener { activity?.let { OKDialog.show(it, rh.gs(R.string.uploader), nsDeviceStatus.extendedUploaderStatus) } }
+            binding.uploader.text = processedDeviceStatusData.uploaderStatusSpanned
+            binding.uploader.setOnClickListener { activity?.let { OKDialog.show(it, rh.gs(R.string.uploader), processedDeviceStatusData.extendedUploaderStatus) } }
         }
     }
 
@@ -1102,7 +1107,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
 
     private fun updateSensitivity() {
         _binding ?: return
-        if (constraintChecker.isAutosensModeEnabled().value()) {
+        if (constraintChecker.isAutosensModeEnabled().value() || !(config.NSCLIENT && overviewData.lastAutosensData(iobCobCalculator) == null)) {
             binding.infoLayout.sensitivityIcon.setImageResource(R.drawable.ic_swap_vert_black_48dp_green)
         } else {
             binding.infoLayout.sensitivityIcon.setImageResource(R.drawable.ic_x_swap_vert)
@@ -1118,7 +1123,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         val isfMgdl = profile?.getIsfMgdl()
         val variableSens =
             if (config.APS && request is DetermineBasalResultSMB) request.variableSens ?: 0.0
-            else if (config.NSCLIENT) JsonHelper.safeGetDouble(nsDeviceStatus.getAPSResult(injector).json, "variable_sens")
+            else if (config.NSCLIENT) JsonHelper.safeGetDouble(processedDeviceStatusData.getAPSResult(injector).json, "variable_sens")
             else 0.0
 
         if (variableSens != isfMgdl && variableSens != 0.0 && isfMgdl != null) {

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

@@ -12,15 +12,15 @@ import androidx.annotation.StringRes
 import androidx.appcompat.widget.PopupMenu
 import com.google.gson.Gson
 import info.nightscout.androidaps.R
+import info.nightscout.androidaps.interfaces.Loop
+import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.interfaces.BuildHelper
 import info.nightscout.interfaces.Config
-import info.nightscout.androidaps.interfaces.Loop
-import info.nightscout.androidaps.interfaces.ResourceHelper
-import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.EventRefreshOverview
 import info.nightscout.rx.events.EventScale
 import info.nightscout.rx.logging.AAPSLogger
+import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
 import javax.inject.Inject
 import javax.inject.Singleton

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

@@ -13,24 +13,24 @@ import info.nightscout.androidaps.extensions.putString
 import info.nightscout.androidaps.extensions.storeDouble
 import info.nightscout.androidaps.extensions.storeInt
 import info.nightscout.androidaps.extensions.storeString
-import info.nightscout.interfaces.Config
-import info.nightscout.androidaps.interfaces.Overview
-import info.nightscout.androidaps.interfaces.PluginBase
-import info.nightscout.interfaces.PluginDescription
-import info.nightscout.interfaces.PluginType
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventUpdateOverviewCalcProgress
-import info.nightscout.androidaps.plugins.general.overview.events.EventUpdateOverviewNotification
-import info.nightscout.androidaps.plugins.general.overview.notifications.NotificationStore
-import info.nightscout.androidaps.plugins.general.overview.notifications.NotificationWithAction
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventIobCalculationProgress
-import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
+import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.interfaces.Config
+import info.nightscout.interfaces.Overview
+import info.nightscout.interfaces.plugin.PluginBase
+import info.nightscout.interfaces.plugin.PluginDescription
+import info.nightscout.interfaces.plugin.PluginType
+import info.nightscout.plugins.general.overview.notifications.NotificationStore
+import info.nightscout.plugins.general.overview.notifications.NotificationWithAction
+import info.nightscout.plugins.general.overview.notifications.events.EventUpdateOverviewNotification
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.logging.AAPSLogger
+import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign

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

@@ -3,21 +3,19 @@ package info.nightscout.androidaps.plugins.general.overview
 import android.widget.TextView
 import androidx.annotation.StringRes
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.database.AppRepository
-import info.nightscout.androidaps.database.ValueWrapper
-import info.nightscout.androidaps.database.entities.TherapyEvent
-import info.nightscout.androidaps.extensions.age
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.database.impl.ValueWrapper
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.interfaces.Config
-import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.OmnipodErosPumpPlugin
-import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.OmnipodConstants
-import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DecimalFormatter
 import info.nightscout.androidaps.utils.WarnColors
-import info.nightscout.androidaps.interfaces.ResourceHelper
-import info.nightscout.androidaps.plugins.pump.eopatch.AppConstant
+import info.nightscout.database.entities.TherapyEvent
+import info.nightscout.interfaces.Config
+import info.nightscout.interfaces.pump.defs.PumpType
+import info.nightscout.plugins.sync.nsclient.extensions.age
+import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
+import info.nightscout.shared.utils.DateUtil
 import javax.inject.Inject
 import javax.inject.Singleton
 

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

@@ -18,21 +18,21 @@ import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.DaggerAppCompatActivityWithResult
 import info.nightscout.androidaps.databinding.OverviewQuickwizardlistActivityBinding
 import info.nightscout.androidaps.databinding.OverviewQuickwizardlistItemBinding
-import info.nightscout.androidaps.extensions.toVisibility
 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.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
+import info.nightscout.androidaps.utils.wizard.QuickWizard
+import info.nightscout.androidaps.utils.wizard.QuickWizardEntry
+import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.interfaces.dragHelpers.ItemTouchHelperAdapter
 import info.nightscout.interfaces.dragHelpers.OnStartDragListener
 import info.nightscout.interfaces.dragHelpers.SimpleItemTouchHelperCallback
-import info.nightscout.androidaps.utils.wizard.QuickWizard
-import info.nightscout.androidaps.utils.wizard.QuickWizardEntry
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
+import info.nightscout.shared.extensions.toVisibility
 import info.nightscout.shared.sharedPreferences.SP
+import info.nightscout.shared.utils.DateUtil
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import javax.inject.Inject

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

@@ -13,8 +13,8 @@ import dagger.android.support.DaggerDialogFragment
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.databinding.OverviewEditquickwizardDialogBinding
 import info.nightscout.androidaps.plugins.general.overview.events.EventQuickWizardChange
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.T
+import info.nightscout.shared.utils.DateUtil
+import info.nightscout.shared.utils.T
 import info.nightscout.androidaps.utils.extensions.selectedItemPosition
 import info.nightscout.androidaps.utils.extensions.setEnableForChildren
 import info.nightscout.androidaps.utils.extensions.setSelection

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

@@ -9,9 +9,9 @@ import com.jjoe64.graphview.series.LineGraphSeries
 import com.jjoe64.graphview.series.Series
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.interfaces.GlucoseUnit
+import info.nightscout.interfaces.GlucoseUnit
 import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.interfaces.ResourceHelper
+import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.androidaps.plugins.general.overview.OverviewData
 import info.nightscout.androidaps.plugins.general.overview.graphExtensions.AreaGraphSeries
 import info.nightscout.androidaps.plugins.general.overview.graphExtensions.BolusDataPoint

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

@@ -6,8 +6,8 @@ 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.interfaces.NotificationHolder
-import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.EventAppExit

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

@@ -7,30 +7,32 @@ import android.content.Intent
 import androidx.core.app.NotificationCompat
 import androidx.core.app.RemoteInput
 import dagger.android.HasAndroidInjector
-import info.nightscout.interfaces.Constants
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.events.EventPreferenceChange
 import info.nightscout.androidaps.extensions.toStringShort
 import info.nightscout.androidaps.extensions.valueToUnitsString
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.androidaps.interfaces.IconsProvider
 import info.nightscout.androidaps.interfaces.IobCobCalculator
-import info.nightscout.interfaces.NotificationHolder
-import info.nightscout.androidaps.interfaces.PluginBase
-import info.nightscout.interfaces.PluginDescription
-import info.nightscout.interfaces.PluginType
-import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.androidaps.utils.DecimalFormatter
-import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.iob.round
+import info.nightscout.core.profile.toSignedUnitsString
+import info.nightscout.interfaces.Constants
+import info.nightscout.interfaces.NotificationHolder
+import info.nightscout.interfaces.plugin.PluginBase
+import info.nightscout.interfaces.plugin.PluginDescription
+import info.nightscout.interfaces.plugin.PluginType
+import info.nightscout.interfaces.profile.Profile
+import info.nightscout.interfaces.ui.IconsProvider
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.EventAutosensCalculationFinished
 import info.nightscout.rx.events.EventInitializationChanged
 import info.nightscout.rx.events.EventRefreshOverview
 import info.nightscout.rx.logging.AAPSLogger
+import info.nightscout.shared.interfaces.ResourceHelper
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import javax.inject.Inject

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

@@ -6,13 +6,13 @@ import android.view.View
 import android.view.ViewGroup
 import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.databinding.WearFragmentBinding
-import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientUpdateGUI
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.plugins.sync.nsShared.events.EventNSClientUpdateGUI
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.EventMobileToWear
 import info.nightscout.rx.weardata.EventData
+import info.nightscout.shared.utils.DateUtil
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import javax.inject.Inject
@@ -65,7 +65,7 @@ class WearFragment : DaggerFragment() {
         _binding = null
     }
 
-    fun updateGui() {
+    private fun updateGui() {
         _binding ?: return
         binding.connectedDevice.text = wearPlugin.connectedDevice
     }

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

@@ -4,22 +4,22 @@ import android.content.Context
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.events.EventPreferenceChange
-import info.nightscout.androidaps.interfaces.PluginBase
-import info.nightscout.interfaces.PluginDescription
-import info.nightscout.interfaces.PluginType
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.plugins.aps.loop.events.EventLoopUpdateGui
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissBolusProgressIfRunning
-import info.nightscout.rx.events.EventOverviewBolusProgress
 import info.nightscout.androidaps.plugins.general.wear.wearintegration.DataHandlerMobile
 import info.nightscout.androidaps.plugins.general.wear.wearintegration.DataLayerListenerServiceMobileHelper
-import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.interfaces.plugin.PluginBase
+import info.nightscout.interfaces.plugin.PluginDescription
+import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.EventAutosensCalculationFinished
 import info.nightscout.rx.events.EventMobileToWear
+import info.nightscout.rx.events.EventOverviewBolusProgress
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.weardata.EventData
+import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign

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

@@ -3,47 +3,76 @@ package info.nightscout.androidaps.plugins.general.wear.wearintegration
 import android.app.NotificationManager
 import android.content.Context
 import dagger.android.HasAndroidInjector
-import info.nightscout.interfaces.Constants
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.data.DetailedBolusInfo
-import info.nightscout.androidaps.database.AppRepository
-import info.nightscout.androidaps.database.ValueWrapper
-import info.nightscout.androidaps.database.entities.*
-import info.nightscout.androidaps.database.interfaces.end
-import info.nightscout.androidaps.database.transactions.CancelCurrentTemporaryTargetIfAnyTransaction
-import info.nightscout.androidaps.database.transactions.InsertAndCancelCurrentTemporaryTargetTransaction
 import info.nightscout.androidaps.dialogs.InsulinDialog
 import info.nightscout.androidaps.extensions.convertedToAbsolute
 import info.nightscout.androidaps.extensions.toStringShort
 import info.nightscout.androidaps.extensions.total
 import info.nightscout.androidaps.extensions.valueToUnits
 import info.nightscout.androidaps.extensions.valueToUnitsString
-import info.nightscout.androidaps.interfaces.*
+import info.nightscout.androidaps.interfaces.ActivePlugin
+import info.nightscout.androidaps.interfaces.CommandQueue
+import info.nightscout.androidaps.interfaces.Constraints
+import info.nightscout.androidaps.interfaces.IobCobCalculator
+import info.nightscout.androidaps.interfaces.Loop
+import info.nightscout.androidaps.interfaces.ProfileFunction
+import info.nightscout.androidaps.interfaces.TrendCalculator
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.plugins.general.nsclient.data.NSDeviceStatus
 import info.nightscout.androidaps.plugins.general.overview.graphExtensions.GlucoseValueDataPoint
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
-import info.nightscout.interfaces.queue.Callback
 import info.nightscout.androidaps.receivers.ReceiverStatusStore
 import info.nightscout.androidaps.services.AlarmSoundServiceHelper
-import info.nightscout.androidaps.utils.*
+import info.nightscout.androidaps.utils.DecimalFormatter
+import info.nightscout.androidaps.utils.DefaultValueHelper
+import info.nightscout.androidaps.utils.ToastUtils
 import info.nightscout.androidaps.utils.wizard.BolusWizard
 import info.nightscout.androidaps.utils.wizard.QuickWizard
 import info.nightscout.androidaps.utils.wizard.QuickWizardEntry
+import info.nightscout.core.fabric.FabricPrivacy
+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.database.entities.Bolus
+import info.nightscout.database.entities.GlucoseValue
+import info.nightscout.database.entities.TemporaryBasal
+import info.nightscout.database.entities.TemporaryTarget
+import info.nightscout.database.entities.TotalDailyDose
+import info.nightscout.database.entities.UserEntry
+import info.nightscout.database.entities.ValueWithUnit
+import info.nightscout.database.entities.interfaces.end
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.database.impl.ValueWrapper
+import info.nightscout.database.impl.transactions.CancelCurrentTemporaryTargetIfAnyTransaction
+import info.nightscout.database.impl.transactions.InsertAndCancelCurrentTemporaryTargetTransaction
 import info.nightscout.interfaces.Config
+import info.nightscout.interfaces.Constants
+import info.nightscout.interfaces.GlucoseUnit
+import info.nightscout.interfaces.constraints.Constraint
+import info.nightscout.interfaces.plugin.PluginBase
+import info.nightscout.interfaces.profile.Profile
+import info.nightscout.interfaces.pump.DetailedBolusInfo
+import info.nightscout.interfaces.queue.Callback
+import info.nightscout.interfaces.utils.HardLimits
+import info.nightscout.plugins.sync.nsclient.data.ProcessedDeviceStatusData
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.EventMobileToWear
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
 import info.nightscout.rx.weardata.EventData
+import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
+import info.nightscout.shared.utils.DateUtil
+import info.nightscout.shared.utils.T
 import info.nightscout.ui.dialogs.CarbsDialog
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import java.text.DateFormat
 import java.text.SimpleDateFormat
-import java.util.*
+import java.util.Date
+import java.util.LinkedList
+import java.util.Locale
 import java.util.concurrent.TimeUnit
 import java.util.stream.Collectors
 import javax.inject.Inject
@@ -66,7 +95,7 @@ class DataHandlerMobile @Inject constructor(
     private val glucoseStatusProvider: GlucoseStatusProvider,
     private val profileFunction: ProfileFunction,
     private val loop: Loop,
-    private val nsDeviceStatus: NSDeviceStatus,
+    private val processedDeviceStatusData: ProcessedDeviceStatusData,
     private val receiverStatusStore: ReceiverStatusStore,
     private val quickWizard: QuickWizard,
     private val defaultValueHelper: DefaultValueHelper,
@@ -872,11 +901,11 @@ class DataHandlerMobile @Inject constructor(
 
         //batteries
         val phoneBattery = receiverStatusStore.batteryLevel
-        val rigBattery = nsDeviceStatus.uploaderStatus.trim { it <= ' ' }
+        val rigBattery = processedDeviceStatusData.uploaderStatus.trim { it <= ' ' }
         //OpenAPS status
         val openApsStatus =
             if (config.APS) loop.lastRun?.let { if (it.lastTBREnact != 0L) it.lastTBREnact else -1 } ?: -1
-            else nsDeviceStatus.openApsTimestamp
+            else processedDeviceStatusData.openApsTimestamp
 
         rxBus.send(
             EventMobileToWear(

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

@@ -16,24 +16,24 @@ import com.google.android.gms.wearable.Wearable
 import com.google.android.gms.wearable.WearableListenerService
 import dagger.android.AndroidInjection
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.database.AppRepository
+import info.nightscout.database.impl.AppRepository
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.interfaces.Config
 import info.nightscout.androidaps.interfaces.IobCobCalculator
 import info.nightscout.androidaps.interfaces.Loop
 import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.interfaces.ResourceHelper
 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.androidaps.utils.FabricPrivacy
+import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.interfaces.Config
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.EventMobileToWear
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
 import info.nightscout.rx.weardata.EventData
+import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign

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

@@ -2,17 +2,8 @@ package info.nightscout.androidaps.plugins.iob.iobCobCalculator
 
 import androidx.collection.LongSparseArray
 import dagger.android.HasAndroidInjector
-import info.nightscout.interfaces.Constants
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.annotations.OpenForTesting
-import info.nightscout.androidaps.data.IobTotal
-import info.nightscout.interfaces.data.MealData
-import info.nightscout.androidaps.database.AppRepository
-import info.nightscout.androidaps.database.ValueWrapper
-import info.nightscout.androidaps.database.entities.Bolus
-import info.nightscout.androidaps.database.entities.ExtendedBolus
-import info.nightscout.androidaps.database.entities.TemporaryBasal
-import info.nightscout.androidaps.database.interfaces.end
 import info.nightscout.androidaps.events.EventEffectiveProfileSwitchChanged
 import info.nightscout.androidaps.events.EventNewBG
 import info.nightscout.androidaps.events.EventNewHistoryData
@@ -22,27 +13,41 @@ import info.nightscout.androidaps.extensions.iobCalc
 import info.nightscout.androidaps.extensions.toTemporaryBasal
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.IobCobCalculator
-import info.nightscout.androidaps.interfaces.PluginBase
-import info.nightscout.interfaces.PluginDescription
-import info.nightscout.interfaces.PluginType
-import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.plugins.general.overview.OverviewData
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.data.AutosensData
-import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DecimalFormatter
-import info.nightscout.androidaps.utils.FabricPrivacy
-import info.nightscout.interfaces.utils.MidnightTime
-import info.nightscout.androidaps.utils.T
 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.database.entities.Bolus
+import info.nightscout.database.entities.ExtendedBolus
+import info.nightscout.database.entities.TemporaryBasal
+import info.nightscout.database.entities.interfaces.end
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.database.impl.ValueWrapper
+import info.nightscout.interfaces.Constants
+import info.nightscout.interfaces.iob.IobTotal
+import info.nightscout.interfaces.iob.MealData
+import info.nightscout.interfaces.plugin.PluginBase
+import info.nightscout.interfaces.plugin.PluginDescription
+import info.nightscout.interfaces.plugin.PluginType
+import info.nightscout.interfaces.profile.Profile
+import info.nightscout.interfaces.utils.MidnightTime
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.Event
 import info.nightscout.rx.events.EventConfigBuilderChange
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
+import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
+import info.nightscout.shared.utils.DateUtil
+import info.nightscout.shared.utils.T
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import org.json.JSONArray

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

@@ -6,36 +6,36 @@ import androidx.work.Worker
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import dagger.android.HasAndroidInjector
-import info.nightscout.interfaces.Constants
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.database.AppRepository
-import info.nightscout.androidaps.database.ValueWrapper
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.database.impl.ValueWrapper
 import info.nightscout.androidaps.extensions.target
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.interfaces.BuildHelper
 import info.nightscout.androidaps.interfaces.IobCobCalculator
 import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.interfaces.ResourceHelper
-import info.nightscout.interfaces.aps.SMBDefaults
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
-import info.nightscout.interfaces.notifications.Notification
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.data.AutosensData
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventIobCalculationProgress
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityWeightedAveragePlugin
 import info.nightscout.androidaps.receivers.DataWorkerStorage
-import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DecimalFormatter
-import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.Profiler
-import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.workflow.CalculationWorkflow
+import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.interfaces.BuildHelper
+import info.nightscout.interfaces.Constants
+import info.nightscout.interfaces.aps.SMBDefaults
+import info.nightscout.interfaces.notifications.Notification
 import info.nightscout.rx.bus.RxBus
 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.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
+import info.nightscout.shared.utils.DateUtil
+import info.nightscout.shared.utils.T
 import java.util.Calendar
 import java.util.GregorianCalendar
 import javax.inject.Inject

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

@@ -6,34 +6,34 @@ import androidx.work.Worker
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import dagger.android.HasAndroidInjector
-import info.nightscout.interfaces.Constants
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.database.AppRepository
+import info.nightscout.database.impl.AppRepository
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.interfaces.BuildHelper
 import info.nightscout.androidaps.interfaces.IobCobCalculator
 import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.interfaces.ResourceHelper
-import info.nightscout.interfaces.aps.SMBDefaults
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
-import info.nightscout.interfaces.notifications.Notification
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.data.AutosensData
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventIobCalculationProgress
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityWeightedAveragePlugin
 import info.nightscout.androidaps.receivers.DataWorkerStorage
-import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DecimalFormatter
-import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.Profiler
-import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.workflow.CalculationWorkflow
+import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.interfaces.BuildHelper
+import info.nightscout.interfaces.Constants
+import info.nightscout.interfaces.aps.SMBDefaults
+import info.nightscout.interfaces.notifications.Notification
 import info.nightscout.rx.bus.RxBus
 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.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
+import info.nightscout.shared.utils.DateUtil
+import info.nightscout.shared.utils.T
 import javax.inject.Inject
 import kotlin.math.abs
 import kotlin.math.max

app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPlugin.kt

@@ -2,16 +2,16 @@ package info.nightscout.androidaps.plugins.sensitivity
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.interfaces.PluginBase
-import info.nightscout.interfaces.PluginDescription
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.interfaces.Sensitivity
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensDataStore
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult
+import info.nightscout.interfaces.plugin.PluginBase
+import info.nightscout.interfaces.plugin.PluginDescription
 import info.nightscout.interfaces.utils.Round
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
 import info.nightscout.shared.SafeParse
+import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
 import kotlin.math.max
 import kotlin.math.min

app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityAAPSPlugin.kt

@@ -1,27 +1,27 @@
 package info.nightscout.androidaps.plugins.sensitivity
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.interfaces.Constants
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.annotations.OpenForTesting
-import info.nightscout.androidaps.database.AppRepository
-import info.nightscout.androidaps.database.entities.TherapyEvent
 import info.nightscout.androidaps.extensions.isPSEvent5minBack
-import info.nightscout.androidaps.extensions.isTherapyEventEvent5minBack
-import info.nightscout.interfaces.PluginDescription
-import info.nightscout.interfaces.PluginType
-import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.interfaces.Sensitivity.SensitivityType
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensDataStore
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult
-import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.core.profile.secondsFromMidnight
+import info.nightscout.database.entities.TherapyEvent
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.interfaces.Constants
+import info.nightscout.interfaces.plugin.PluginDescription
+import info.nightscout.interfaces.plugin.PluginType
+import info.nightscout.interfaces.profile.Profile
+import info.nightscout.plugins.sync.nsclient.extensions.isTherapyEventEvent5minBack
 import info.nightscout.plugins.utils.Percentile
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
-
+import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
+import info.nightscout.shared.utils.DateUtil
 import org.json.JSONException
 import org.json.JSONObject
 import java.util.Arrays

app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref1Plugin.kt

@@ -1,28 +1,28 @@
 package info.nightscout.androidaps.plugins.sensitivity
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.interfaces.Constants
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.annotations.OpenForTesting
-import info.nightscout.androidaps.database.AppRepository
-import info.nightscout.androidaps.database.entities.TherapyEvent
 import info.nightscout.androidaps.extensions.isPSEvent5minBack
-import info.nightscout.androidaps.extensions.isTherapyEventEvent5minBack
-import info.nightscout.interfaces.PluginDescription
-import info.nightscout.interfaces.PluginType
-import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.interfaces.Sensitivity.SensitivityType
-import info.nightscout.interfaces.aps.SMBDefaults
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensDataStore
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult
-import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.core.profile.secondsFromMidnight
+import info.nightscout.database.entities.TherapyEvent
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.interfaces.Constants
+import info.nightscout.interfaces.aps.SMBDefaults
+import info.nightscout.interfaces.plugin.PluginDescription
+import info.nightscout.interfaces.plugin.PluginType
+import info.nightscout.interfaces.profile.Profile
+import info.nightscout.plugins.sync.nsclient.extensions.isTherapyEventEvent5minBack
 import info.nightscout.plugins.utils.Percentile
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
-
+import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
+import info.nightscout.shared.utils.DateUtil
 import org.json.JSONException
 import org.json.JSONObject
 import java.util.Arrays