Merge pull request #522 from nightscout/dev2_dana_combo_insight_only

Dev2 dana combo insight only

.idea/dictionaries/project_dictionary.xml

@@ -2,19 +2,24 @@
   <dictionary name="project-dictionary">
     <words>
       <w>aaps</w>
+      <w>acked</w>
       <w>actionstring</w>
       <w>allowednumbers</w>
       <w>androidaps</w>
       <w>autosens</w>
       <w>autosensdata</w>
+      <w>autosense</w>
       <w>bage</w>
+      <w>basaliob</w>
       <w>basals</w>
       <w>bgcheck</w>
+      <w>bgsource</w>
       <w>bolusing</w>
       <w>carb</w>
       <w>carbs</w>
       <w>carbsreq</w>
       <w>careportal</w>
+      <w>cellnovo</w>
       <w>crashlytics</w>
       <w>danar</w>
       <w>danars</w>
@@ -23,6 +28,7 @@
       <w>dexcom</w>
       <w>dexdrip</w>
       <w>enteredby</w>
+      <w>enteredinsulin</w>
       <w>eveningoutpost</w>
       <w>eversense</w>
       <w>extendedbolus</w>
@@ -32,12 +38,15 @@
       <w>gson</w>
       <w>hmac</w>
       <w>iage</w>
+      <w>insulet</w>
       <w>iobtotal</w>
+      <w>libre</w>
       <w>listdelimiter</w>
       <w>localprofile</w>
       <w>medtronic</w>
       <w>mgdl</w>
       <w>mmol</w>
+      <w>multiwave</w>
       <w>netinsulin</w>
       <w>netratio</w>
       <w>nightscout</w>
@@ -45,6 +54,7 @@
       <w>nsclient</w>
       <w>okcancel</w>
       <w>omnipod</w>
+      <w>openaps</w>
       <w>oref</w>
       <w>passcode</w>
       <w>poctech</w>
@@ -56,7 +66,9 @@
       <w>refresheventsfromnightscout</w>
       <w>rileylink</w>
       <w>roboelectric</w>
+      <w>sitechange</w>
       <w>smscommunicator</w>
+      <w>sooil</w>
       <w>soundid</w>
       <w>splitted</w>
       <w>superbolus</w>
@@ -73,6 +85,9 @@
       <w>uart</w>
       <w>wizzardpage</w>
       <w>xdrip</w>
+      <w>ypso</w>
+      <w>ypsomed</w>
+      <w>ypsopump</w>
     </words>
   </dictionary>
 </component>

.travis.yml

@@ -1,5 +1,5 @@
 language: android
-jdk: oraclejdk8
+jdk: openjdk11
 dist: trusty
 env:
   matrix:

app/build.gradle

@@ -111,7 +111,7 @@ android {
     defaultConfig {
         multiDexEnabled true
         versionCode 1500
-        version "2.8.2.1-dev-e"
+        version "2.8.2.1-dev-e4"
         buildConfigField "String", "VERSION", '"' + version + '"'
         buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"'
         buildConfigField "String", "REMOTE", '"' + generateGitRemote() + '"'

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

@@ -1,35 +1,8 @@
 package info.nightscout.androidaps
 
-import android.os.SystemClock
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
-import androidx.test.rule.ActivityTestRule
-import androidx.test.rule.GrantPermissionRule
-import info.nightscout.androidaps.data.Profile
-import info.nightscout.androidaps.interfaces.PluginBase
-import info.nightscout.androidaps.interfaces.PluginType
-import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
-import info.nightscout.androidaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
-import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.plugins.constraints.objectives.ObjectivesPlugin
-import info.nightscout.androidaps.plugins.general.actions.ActionsPlugin
-import info.nightscout.androidaps.plugins.insulin.InsulinOrefUltraRapidActingPlugin
-import info.nightscout.androidaps.plugins.profile.local.LocalProfilePlugin
-import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
-import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin
-import info.nightscout.androidaps.plugins.source.RandomBgPlugin
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.extensions.isRunningTest
-import info.nightscout.androidaps.utils.sharedPreferences.SP
-import org.json.JSONObject
-import org.junit.Assert
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
 import org.junit.runner.RunWith
-import javax.inject.Inject
 
 @LargeTest
 @RunWith(AndroidJUnit4::class)
@@ -89,7 +62,7 @@ class RealPumpTest {
         localProfilePlugin.numOfProfiles = 0
         val singleProfile = LocalProfilePlugin.SingleProfile().copyFrom(localProfilePlugin.rawProfile, profile, "TestProfile")
         localProfilePlugin.addProfile(singleProfile)
-        val profileSwitch = profileFunction.prepareProfileSwitch(localProfilePlugin.createProfileStore(), "TestProfile", 0, 100, 0, DateUtil.now())
+        val profileSwitch = profileFunction.prepareProfileSwitch(localProfilePlugin.createProfileStore(), "TestProfile", 0, 100, 0, dateUtil._now())
         treatmentsPlugin.addToHistoryProfileSwitch(profileSwitch)
         // Insulin
         configBuilderPlugin.performPluginSwitch(insulinOrefUltraRapidActingPlugin, true, PluginType.INSULIN)

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

@@ -32,15 +32,20 @@ import info.nightscout.androidaps.activities.PreferencesActivity
 import info.nightscout.androidaps.activities.ProfileHelperActivity
 import info.nightscout.androidaps.activities.SingleFragmentActivity
 import info.nightscout.androidaps.activities.StatsActivity
+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.EventAppExit
 import info.nightscout.androidaps.events.EventPreferenceChange
 import info.nightscout.androidaps.events.EventRebuildTabs
 import info.nightscout.androidaps.historyBrowser.HistoryBrowseActivity
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.ActivePlugin
+import info.nightscout.androidaps.interfaces.Config
+import info.nightscout.androidaps.interfaces.IconsProvider
 import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
@@ -56,7 +61,6 @@ import info.nightscout.androidaps.utils.buildHelper.BuildHelper
 import info.nightscout.androidaps.utils.extensions.isRunningRealPumpTest
 import info.nightscout.androidaps.utils.locale.LocaleHelper
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
-import info.nightscout.androidaps.utils.resources.IconsProvider
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import info.nightscout.androidaps.utils.tabs.TabPageAdapter
@@ -80,13 +84,14 @@ class MainActivity : NoSplashAppCompatActivity() {
     @Inject lateinit var loopPlugin: LoopPlugin
     @Inject lateinit var nsSettingsStatus: NSSettingsStatus
     @Inject lateinit var buildHelper: BuildHelper
-    @Inject lateinit var activePlugin: ActivePluginProvider
+    @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var protectionCheck: ProtectionCheck
     @Inject lateinit var iconsProvider: IconsProvider
     @Inject lateinit var constraintChecker: ConstraintChecker
     @Inject lateinit var signatureVerifierPlugin: SignatureVerifierPlugin
     @Inject lateinit var config: Config
+    @Inject lateinit var uel: UserEntryLogger
 
     private lateinit var actionBarDrawerToggle: ActionBarDrawerToggle
     private var pluginPreferencesMenuItem: MenuItem? = null
@@ -316,6 +321,7 @@ class MainActivity : NoSplashAppCompatActivity() {
 
             R.id.nav_exit -> {
                 aapsLogger.debug(LTag.CORE, "Exiting")
+                uel.log(Action.EXIT_AAPS, Sources.Aaps)
                 rxBus.send(EventAppExit())
                 finish()
                 System.runFinalization()
@@ -375,7 +381,7 @@ class MainActivity : NoSplashAppCompatActivity() {
         if (!config.NSCLIENT && !config.PUMPCONTROL)
             activePlugin.activeAPS.let { fabricPrivacy.firebaseAnalytics.setUserProperty("Aps", it::class.java.simpleName) }
         activePlugin.activeBgSource.let { fabricPrivacy.firebaseAnalytics.setUserProperty("BgSource", it::class.java.simpleName) }
-        fabricPrivacy.firebaseAnalytics.setUserProperty("Profile", activePlugin.activeProfileInterface.javaClass.simpleName)
+        fabricPrivacy.firebaseAnalytics.setUserProperty("Profile", activePlugin.activeProfileSource.javaClass.simpleName)
         activePlugin.activeSensitivity.let { fabricPrivacy.firebaseAnalytics.setUserProperty("Sensitivity", it::class.java.simpleName) }
         activePlugin.activeInsulin.let { fabricPrivacy.firebaseAnalytics.setUserProperty("Insulin", it::class.java.simpleName) }
         // Add to crash log too

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

@@ -5,31 +5,38 @@ import android.content.Intent
 import android.content.IntentFilter
 import android.net.ConnectivityManager
 import android.net.wifi.WifiManager
+import android.os.Build
 import com.j256.ormlite.android.apptools.OpenHelperManager
 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.db.DatabaseHelper
 import info.nightscout.androidaps.db.StaticInjector
 import info.nightscout.androidaps.dependencyInjection.DaggerAppComponent
+import info.nightscout.androidaps.interfaces.ConfigBuilder
+import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.interfaces.PluginBase
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
+import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.configBuilder.PluginStore
 import info.nightscout.androidaps.plugins.constraints.versionChecker.VersionCheckerUtils
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.receivers.BTReceiver
 import info.nightscout.androidaps.receivers.ChargingStateReceiver
 import info.nightscout.androidaps.receivers.KeepAliveReceiver.KeepAliveManager
 import info.nightscout.androidaps.receivers.NetworkChangeReceiver
 import info.nightscout.androidaps.receivers.TimeDateOrTZChangeReceiver
 import info.nightscout.androidaps.utils.ActivityMonitor
+import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.locale.LocaleHelper.update
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxkotlin.plusAssign
 import net.danlew.android.joda.JodaTimeAndroid
 import javax.inject.Inject
 
@@ -42,14 +49,15 @@ class MainApp : DaggerApplication() {
     @Inject lateinit var activityMonitor: ActivityMonitor
     @Inject lateinit var versionCheckersUtils: VersionCheckerUtils
     @Inject lateinit var sp: SP
-    @Inject lateinit var nsUpload: NSUpload
     @Inject lateinit var config: Config
-    @Inject lateinit var configBuilderPlugin: ConfigBuilderPlugin
+    @Inject lateinit var configBuilder: ConfigBuilder
     @Inject lateinit var keepAliveManager: KeepAliveManager
     @Inject lateinit var plugins: List<@JvmSuppressWildcards PluginBase>
     @Inject lateinit var compatDBHelper: CompatDBHelper
     @Inject lateinit var repository: AppRepository
+    @Inject lateinit var dateUtil: DateUtil
     @Inject lateinit var staticInjector: StaticInjector// TODO avoid , here fake only to initialize
+    @Inject lateinit var uel: UserEntryLogger
 
     override fun onCreate() {
         super.onCreate()
@@ -63,8 +71,9 @@ class MainApp : DaggerApplication() {
             gitRemote = null
             commitHash = null
         }
-        disposable.add(repository.runTransaction(VersionChangeTransaction(BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE, gitRemote, commitHash)).subscribe())
-        disposable.add(compatDBHelper.dbChangeDisposable())
+        disposable += repository.runTransaction(VersionChangeTransaction(BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE, gitRemote, commitHash)).subscribe()
+        disposable += repository.runTransaction(InsertIfNewByTimestampTherapyEventTransaction(timestamp = dateUtil.now(), type = TherapyEvent.Type.NOTE, note = getString(info.nightscout.androidaps.core.R.string.androidaps_start).toString() + " - " + Build.MANUFACTURER + " " + Build.MODEL, glucoseUnit = TherapyEvent.GlucoseUnit.MGDL)).subscribe()
+        disposable += compatDBHelper.dbChangeDisposable()
         registerActivityLifecycleCallbacks(activityMonitor)
         JodaTimeAndroid.init(this)
         aapsLogger.debug("Version: " + BuildConfig.VERSION_NAME)
@@ -77,10 +86,10 @@ class MainApp : DaggerApplication() {
 
         // Register all tabs in app here
         pluginStore.plugins = plugins
-        configBuilderPlugin.initialize()
-        nsUpload.uploadAppStart()
-        Thread { keepAliveManager.setAlarm(this) }.start()
+        configBuilder.initialize()
+        keepAliveManager.setAlarm(this)
         doMigrations()
+        uel.log(UserEntry.Action.START_AAPS, UserEntry.Sources.Aaps)
     }
 
     private fun doMigrations() {

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

@@ -8,13 +8,13 @@ import android.os.Bundle
 import androidx.annotation.XmlRes
 import androidx.preference.*
 import dagger.android.support.AndroidSupportInjection
-import info.nightscout.androidaps.Config
+import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
 import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.danar.DanaRPlugin
 import info.nightscout.androidaps.danars.DanaRSPlugin
-import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.events.EventPreferenceChange
 import info.nightscout.androidaps.events.EventRebuildTabs
 import info.nightscout.androidaps.interfaces.PluginBase

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

@@ -7,14 +7,16 @@ import android.text.TextWatcher
 import android.view.Menu
 import android.widget.PopupMenu
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.data.ProfileSealed
+import info.nightscout.androidaps.data.PureProfile
 import info.nightscout.androidaps.data.defaultProfile.DefaultProfile
 import info.nightscout.androidaps.data.defaultProfile.DefaultProfileDPV
+import info.nightscout.androidaps.database.AppRepository
+import info.nightscout.androidaps.database.entities.EffectiveProfileSwitch
 import info.nightscout.androidaps.databinding.ActivityProfilehelperBinding
-import info.nightscout.androidaps.db.ProfileSwitch
 import info.nightscout.androidaps.dialogs.ProfileViewerDialog
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
+import info.nightscout.androidaps.extensions.toVisibility
+import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
@@ -24,7 +26,6 @@ import info.nightscout.androidaps.utils.DateUtil
 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.toVisibility
 import info.nightscout.androidaps.utils.stats.TddCalculator
 import java.text.DecimalFormat
 import javax.inject.Inject
@@ -39,8 +40,8 @@ class ProfileHelperActivity : NoSplashAppCompatActivity() {
     @Inject lateinit var localProfilePlugin: LocalProfilePlugin
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var dateUtil: DateUtil
-    @Inject lateinit var activePlugin: ActivePluginProvider
-    @Inject lateinit var databaseHelper: DatabaseHelperInterface
+    @Inject lateinit var activePlugin: ActivePlugin
+    @Inject lateinit var repository: AppRepository
 
     enum class ProfileType {
         MOTOL_DEFAULT,
@@ -61,7 +62,7 @@ class ProfileHelperActivity : NoSplashAppCompatActivity() {
     private lateinit var profileList: ArrayList<CharSequence>
     private val profileUsed = arrayOf(0, 0)
 
-    private lateinit var profileSwitch: List<ProfileSwitch>
+    private lateinit var profileSwitch: List<EffectiveProfileSwitch>
     private val profileSwitchUsed = arrayOf(0, 0)
 
     private lateinit var binding: ActivityProfilehelperBinding
@@ -85,10 +86,10 @@ class ProfileHelperActivity : NoSplashAppCompatActivity() {
                 setOnMenuItemClickListener { item ->
                     binding.profiletype.setText(item.title)
                     when (item.itemId) {
-                        R.id.menu_default -> switchTab(tabSelected, ProfileType.MOTOL_DEFAULT)
-                        R.id.menu_default_dpv -> switchTab(tabSelected, ProfileType.DPV_DEFAULT)
-                        R.id.menu_current -> switchTab(tabSelected, ProfileType.CURRENT)
-                        R.id.menu_available -> switchTab(tabSelected, ProfileType.AVAILABLE_PROFILE)
+                        R.id.menu_default       -> switchTab(tabSelected, ProfileType.MOTOL_DEFAULT)
+                        R.id.menu_default_dpv   -> switchTab(tabSelected, ProfileType.DPV_DEFAULT)
+                        R.id.menu_current       -> switchTab(tabSelected, ProfileType.CURRENT)
+                        R.id.menu_available     -> switchTab(tabSelected, ProfileType.AVAILABLE_PROFILE)
                         R.id.menu_profileswitch -> switchTab(tabSelected, ProfileType.PROFILE_SWITCH)
                     }
                     true
@@ -98,7 +99,7 @@ class ProfileHelperActivity : NoSplashAppCompatActivity() {
         }
 
         // Active profile
-        profileList = activePlugin.activeProfileInterface.profile?.getProfileList() ?: ArrayList()
+        profileList = activePlugin.activeProfileSource.profile?.getProfileList() ?: ArrayList()
 
         binding.availableProfileList.setOnClickListener {
             PopupMenu(this, binding.availableProfileList).apply {
@@ -114,12 +115,12 @@ class ProfileHelperActivity : NoSplashAppCompatActivity() {
         }
 
         // Profile switch
-        profileSwitch = databaseHelper.getProfileSwitchData(dateUtil._now() - T.months(2).msecs(), true)
+        profileSwitch = repository.getEffectiveProfileSwitchDataFromTime(dateUtil.now() - T.months(2).msecs(), true).blockingGet()
 
         binding.profileswitchList.setOnClickListener {
             PopupMenu(this, binding.profileswitchList).apply {
                 var order = 0
-                for (name in profileSwitch) menu.add(Menu.NONE, order, order++, name.customizedName)
+                for (name in profileSwitch) menu.add(Menu.NONE, order, order++, name.originalCustomizedName)
                 setOnMenuItemClickListener { item ->
                     binding.profileswitchList.setText(item.title)
                     profileSwitchUsed[tabSelected] = item.itemId
@@ -141,7 +142,7 @@ class ProfileHelperActivity : NoSplashAppCompatActivity() {
             profile?.let {
                 OKDialog.showConfirmation(this, resourceHelper.gs(R.string.careportal_profileswitch), resourceHelper.gs(R.string.copytolocalprofile), Runnable {
                     localProfilePlugin.addProfile(localProfilePlugin.copyFrom(it, "DefaultProfile " +
-                        dateUtil.dateAndTimeAndSecondsString(dateUtil._now())
+                        dateUtil.dateAndTimeAndSecondsString(dateUtil.now())
                             .replace(".", "/")
                     ))
                     rxBus.send(EventLocalProfileChanged())
@@ -210,11 +211,10 @@ class ProfileHelperActivity : NoSplashAppCompatActivity() {
                 getProfile(ageUsed[1], tddUsed[1], weightUsed[1], pctUsed[1] / 100.0, 1)?.let { profile1 ->
                     ProfileViewerDialog().also { pvd ->
                         pvd.arguments = Bundle().also {
-                            it.putLong("time", DateUtil.now())
+                            it.putLong("time", dateUtil.now())
                             it.putInt("mode", ProfileViewerDialog.Mode.PROFILE_COMPARE.ordinal)
-                            it.putString("customProfile", profile0.data.toString())
-                            it.putString("customProfile2", profile1.data.toString())
-                            it.putString("customProfileUnits", profileFunction.getUnits())
+                            it.putString("customProfile", profile0.jsonObject.toString())
+                            it.putString("customProfile2", profile1.jsonObject.toString())
                             it.putString("customProfileName", getProfileName(ageUsed[0], tddUsed[0], weightUsed[0], pctUsed[0] / 100.0, 0) + "\n" + getProfileName(ageUsed[1], tddUsed[1], weightUsed[1], pctUsed[1] / 100.0, 1))
                         }
                     }.show(supportFragmentManager, "ProfileViewDialog")
@@ -227,14 +227,14 @@ class ProfileHelperActivity : NoSplashAppCompatActivity() {
         switchTab(0, typeSelected[0], false)
     }
 
-    private fun getProfile(age: Double, tdd: Double, weight: Double, basalPct: Double, tab: Int): Profile? =
+    private fun getProfile(age: Double, tdd: Double, weight: Double, basalPct: Double, tab: Int): PureProfile? =
         try { // profile must not exist
             when (typeSelected[tab]) {
-                ProfileType.MOTOL_DEFAULT -> defaultProfile.profile(age, tdd, weight, profileFunction.getUnits())
-                ProfileType.DPV_DEFAULT -> defaultProfileDPV.profile(age, tdd, basalPct, profileFunction.getUnits())
-                ProfileType.CURRENT -> profileFunction.getProfile()?.convertToNonCustomizedProfile()
-                ProfileType.AVAILABLE_PROFILE -> activePlugin.activeProfileInterface.profile?.getSpecificProfile(profileList[profileUsed[tab]].toString())
-                ProfileType.PROFILE_SWITCH -> profileSwitch[profileSwitchUsed[tab]].profileObject?.convertToNonCustomizedProfile()
+                ProfileType.MOTOL_DEFAULT     -> defaultProfile.profile(age, tdd, weight, profileFunction.getUnits())
+                ProfileType.DPV_DEFAULT       -> defaultProfileDPV.profile(age, tdd, basalPct, profileFunction.getUnits())
+                ProfileType.CURRENT           -> profileFunction.getProfile()?.convertToNonCustomizedProfile(dateUtil)
+                ProfileType.AVAILABLE_PROFILE -> activePlugin.activeProfileSource.profile?.getSpecificProfile(profileList[profileUsed[tab]].toString())
+                ProfileType.PROFILE_SWITCH    -> ProfileSealed.EPS(profileSwitch[profileSwitchUsed[tab]]).convertToNonCustomizedProfile(dateUtil)
             }
         } catch (e: Exception) {
             null
@@ -242,11 +242,11 @@ class ProfileHelperActivity : NoSplashAppCompatActivity() {
 
     private fun getProfileName(age: Double, tdd: Double, weight: Double, basalSumPct: Double, tab: Int): String =
         when (typeSelected[tab]) {
-            ProfileType.MOTOL_DEFAULT -> if (tdd > 0) resourceHelper.gs(R.string.formatwithtdd, age, tdd) else resourceHelper.gs(R.string.formatwithweight, age, weight)
-            ProfileType.DPV_DEFAULT -> resourceHelper.gs(R.string.formatwittddandpct, age, tdd, (basalSumPct * 100).toInt())
-            ProfileType.CURRENT -> profileFunction.getProfileName()
+            ProfileType.MOTOL_DEFAULT     -> if (tdd > 0) resourceHelper.gs(R.string.formatwithtdd, age, tdd) else resourceHelper.gs(R.string.formatwithweight, age, weight)
+            ProfileType.DPV_DEFAULT       -> resourceHelper.gs(R.string.formatwittddandpct, age, tdd, (basalSumPct * 100).toInt())
+            ProfileType.CURRENT           -> profileFunction.getProfileName()
             ProfileType.AVAILABLE_PROFILE -> profileList[profileUsed[tab]].toString()
-            ProfileType.PROFILE_SWITCH -> profileSwitch[profileSwitchUsed[tab]].customizedName
+            ProfileType.PROFILE_SWITCH    -> profileSwitch[profileSwitchUsed[tab]].originalCustomizedName
         }
 
     private fun storeValues() {
@@ -289,7 +289,7 @@ class ProfileHelperActivity : NoSplashAppCompatActivity() {
         if (profileList.isNotEmpty())
             binding.availableProfileList.setText(profileList[profileUsed[tabSelected]].toString())
         if (profileSwitch.isNotEmpty())
-            binding.profileswitchList.setText(profileSwitch[profileSwitchUsed[tabSelected]].customizedName)
+            binding.profileswitchList.setText(profileSwitch[profileSwitchUsed[tabSelected]].originalCustomizedName)
     }
 
     private fun setBackgroundColorOnSelected(tab: Int) {

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

@@ -2,7 +2,8 @@ package info.nightscout.androidaps.activities
 
 import android.os.Bundle
 import info.nightscout.androidaps.R
-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.databinding.ActivityStatsBinding
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.utils.ActivityMonitor
@@ -32,7 +33,7 @@ class StatsActivity : NoSplashAppCompatActivity() {
         binding.ok.setOnClickListener { finish() }
         binding.reset.setOnClickListener {
             OKDialog.showConfirmation(this, resourceHelper.gs(R.string.doyouwantresetstats)) {
-                uel.log(Action.STAT_RESET)
+                uel.log(Action.STAT_RESET, Sources.Stats)
                 activityMonitor.reset()
                 recreate()
             }

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

@@ -8,7 +8,7 @@ import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.defaultProfile.DefaultProfile
 import info.nightscout.androidaps.databinding.ActivitySurveyBinding
 import info.nightscout.androidaps.dialogs.ProfileViewerDialog
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -24,12 +24,13 @@ import javax.inject.Inject
 class SurveyActivity : NoSplashAppCompatActivity() {
 
     @Inject lateinit var aapsLogger: AAPSLogger
-    @Inject lateinit var activePlugin: ActivePluginProvider
+    @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var tddCalculator: TddCalculator
     @Inject lateinit var tirCalculator: TirCalculator
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var activityMonitor: ActivityMonitor
     @Inject lateinit var defaultProfile: DefaultProfile
+    @Inject lateinit var dateUtil: DateUtil
 
     private lateinit var binding: ActivitySurveyBinding
 
@@ -40,7 +41,7 @@ class SurveyActivity : NoSplashAppCompatActivity() {
 
         binding.id.text = InstanceId.instanceId()
 
-        val profileStore = activePlugin.activeProfileInterface.profile
+        val profileStore = activePlugin.activeProfileSource.profile
         val profileList = profileStore?.getProfileList() ?: return
         binding.spinner.adapter = ArrayAdapter(this, R.layout.spinner_centered, profileList)
 
@@ -68,11 +69,10 @@ class SurveyActivity : NoSplashAppCompatActivity() {
                 defaultProfile.profile(age, tdd, weight, profileFunction.getUnits())?.let { profile ->
                     ProfileViewerDialog().also { pvd ->
                         pvd.arguments = Bundle().also {
-                            it.putLong("time", DateUtil.now())
+                            it.putLong("time", dateUtil.now())
                             it.putInt("mode", ProfileViewerDialog.Mode.PROFILE_COMPARE.ordinal)
-                            it.putString("customProfile", runningProfile.data.toString())
-                            it.putString("customProfile2", profile.data.toString())
-                            it.putString("customProfileUnits", profile.units)
+                            it.putString("customProfile", runningProfile.toPureNsJson(dateUtil).toString())
+                            it.putString("customProfile2",  profile.jsonObject.toString())
                             it.putString("customProfileName", "Age: $age TDD: $tdd Weight: $weight")
                         }
                     }.show(supportFragmentManager, "ProfileViewDialog")

app/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt

@@ -1,7 +1,10 @@
 package info.nightscout.androidaps.data.defaultProfile
 
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.data.PureProfile
+import info.nightscout.androidaps.extensions.pureProfileFromJson
+import info.nightscout.androidaps.interfaces.GlucoseUnit
+import info.nightscout.androidaps.interfaces.Profile
+import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.Round
 import org.json.JSONArray
 import org.json.JSONObject
@@ -10,14 +13,14 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class DefaultProfile @Inject constructor(val injector: HasAndroidInjector) {
+class DefaultProfile @Inject constructor(val dateUtil: DateUtil) {
 
     var oneToFive: TreeMap<Double, Array<Double>> = TreeMap()
     var sixToEleven: TreeMap<Double, Array<Double>> = TreeMap()
     var twelveToSeventeen: TreeMap<Double, Array<Double>> = TreeMap()
-    var eighteenToTwentyfor: TreeMap<Double, Array<Double>> = TreeMap()
+    var eighteenToTwentyFour: TreeMap<Double, Array<Double>> = TreeMap()
 
-    fun profile(age: Double, tdd: Double, weight: Double, units: String): Profile? {
+    fun profile(age: Double, tdd: Double, weight: Double, units: GlucoseUnit): PureProfile? {
         val profile = JSONObject()
         if (age >= 1 && age < 6) {
             val _tdd = if (tdd == 0.0) 0.6 * weight else tdd
@@ -49,8 +52,8 @@ class DefaultProfile @Inject constructor(val injector: HasAndroidInjector) {
         profile.put("timezone", TimeZone.getDefault().id)
         profile.put("target_high", JSONArray().put(JSONObject().put("time", "00:00").put("value", Profile.fromMgdlToUnits(108.0, units))))
         profile.put("target_low", JSONArray().put(JSONObject().put("time", "00:00").put("value", Profile.fromMgdlToUnits(108.0, units))))
-        profile.put("units", units)
-        return Profile(injector, profile, units)
+        profile.put("units", units.asText)
+        return pureProfileFromJson(profile, dateUtil)
     }
 
     init {
@@ -148,7 +151,7 @@ class DefaultProfile @Inject constructor(val injector: HasAndroidInjector) {
         return array
     }
 
-    private fun singleValueArrayFromMmolToUnits(value: Double, sample: Array<Double>, units: String): JSONArray {
+    private fun singleValueArrayFromMmolToUnits(value: Double, sample: Array<Double>, units: GlucoseUnit): JSONArray {
         val array = JSONArray()
         array.put(JSONObject().put("time", "00:00").put("value", Profile.fromMmolToUnits(value + sample[0],units)).put("timeAsSeconds", 0 * 3600))
         array.put(JSONObject().put("time", "06:00").put("value", Profile.fromMmolToUnits(value + sample[1],units)).put("timeAsSeconds", 6 * 3600))

app/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfileDPV.kt

@@ -1,8 +1,11 @@
 package info.nightscout.androidaps.data.defaultProfile
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.data.Profile
-import info.nightscout.androidaps.utils.Round
+import info.nightscout.androidaps.data.PureProfile
+import info.nightscout.androidaps.extensions.pureProfileFromJson
+import info.nightscout.androidaps.interfaces.GlucoseUnit
+import info.nightscout.androidaps.interfaces.Profile
+import info.nightscout.androidaps.utils.DateUtil
 import org.json.JSONArray
 import org.json.JSONObject
 import java.util.*
@@ -10,13 +13,13 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class DefaultProfileDPV @Inject constructor(val injector: HasAndroidInjector) {
+class DefaultProfileDPV @Inject constructor(val injector: HasAndroidInjector, val dateUtil: DateUtil) {
 
     var oneToFive = arrayOf(3.97, 3.61, 3.46, 3.70, 3.76, 3.87, 4.18, 4.01, 3.76, 3.54, 3.15, 2.80, 2.86, 3.21, 3.61, 3.97, 4.43, 4.96, 5.10, 5.50, 5.81, 6.14, 5.52, 5.10)
     var sixToEleven = arrayOf(4.20, 4.27, 4.41, 4.62, 4.92, 5.09, 5.01, 4.47, 3.89, 3.33, 3.10, 2.91, 2.97, 3.08, 3.36, 3.93, 4.52, 4.76, 4.69, 4.63, 4.63, 4.47, 4.47, 4.31)
     var twelveToEighteen = arrayOf(3.47, 3.80, 4.31, 4.95, 5.59, 6.11, 5.89, 5.11, 4.31, 3.78, 3.55, 3.39, 3.35, 3.39, 3.64, 3.97, 4.53, 4.59, 4.50, 4.00, 3.69, 3.39, 3.35, 3.35)
 
-    fun profile(age: Double, tdd: Double, basalSumPct: Double, units: String): Profile? {
+    fun profile(age: Double, tdd: Double, basalSumPct: Double, units: GlucoseUnit): PureProfile? {
         val basalSum = tdd * basalSumPct
         val profile = JSONObject()
         if (age >= 1 && age < 6) {
@@ -40,8 +43,8 @@ class DefaultProfileDPV @Inject constructor(val injector: HasAndroidInjector) {
         profile.put("timezone", TimeZone.getDefault().id)
         profile.put("target_high", JSONArray().put(JSONObject().put("time", "00:00").put("value", Profile.fromMgdlToUnits(108.0, units))))
         profile.put("target_low", JSONArray().put(JSONObject().put("time", "00:00").put("value", Profile.fromMgdlToUnits(108.0, units))))
-        profile.put("units", units)
-        return Profile(injector, profile, units)
+        profile.put("units", units.asText)
+        return pureProfileFromJson(profile, dateUtil)
     }
 
     private fun arrayToJson(b: Array<Double>, basalSum: Double): JSONArray {
@@ -59,7 +62,7 @@ class DefaultProfileDPV @Inject constructor(val injector: HasAndroidInjector) {
         return array
     }
 
-    private fun singleValueArrayFromMmolToUnits(value: Double, units: String): JSONArray {
+    private fun singleValueArrayFromMmolToUnits(value: Double, units: GlucoseUnit): JSONArray {
         val array = JSONArray()
         array.put(JSONObject().put("time", "00:00").put("value", Profile.fromMmolToUnits(value, units)).put("timeAsSeconds", 0 * 3600))
         return array

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

@@ -1,14 +1,10 @@
 package info.nightscout.androidaps.db
 
 import info.nightscout.androidaps.database.AppRepository
-import info.nightscout.androidaps.database.entities.Food
-import info.nightscout.androidaps.database.entities.GlucoseValue
-import info.nightscout.androidaps.database.entities.TemporaryTarget
-import info.nightscout.androidaps.database.entities.TherapyEvent
-import info.nightscout.androidaps.events.EventFoodDatabaseChanged
-import info.nightscout.androidaps.events.EventNewBG
-import info.nightscout.androidaps.events.EventTempTargetChange
-import info.nightscout.androidaps.events.EventTherapyEventChange
+import info.nightscout.androidaps.database.entities.*
+import info.nightscout.androidaps.database.entities.ExtendedBolus
+import info.nightscout.androidaps.database.entities.TemporaryBasal
+import info.nightscout.androidaps.events.*
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
@@ -30,13 +26,41 @@ class CompatDBHelper @Inject constructor(
             rxBus.send(EventNewBG(null))
         }
         .subscribe {
-            it.filterIsInstance<GlucoseValue>().firstOrNull()?.let {
-                aapsLogger.debug(LTag.DATABASE, "Firing EventNewHistoryData")
-                rxBus.send(EventNewHistoryData(it.timestamp))
-            }
-            it.filterIsInstance<GlucoseValue>().lastOrNull()?.let {
+            /**
+             * GlucoseValues can come in batch
+             * oldest one should be used for invalidation, newest one for for triggering Loop.
+             * Thus we need to collect both
+             *
+             */
+            var newestGlucoseValue: GlucoseValue? = null
+            it.filterIsInstance<GlucoseValue>().lastOrNull()?.let { gv ->
                 aapsLogger.debug(LTag.DATABASE, "Firing EventNewBg")
-                rxBus.send(EventNewBG(it))
+                rxBus.send(EventNewBG(gv))
+                newestGlucoseValue = gv
+            }
+            it.filterIsInstance<GlucoseValue>().map { gv -> gv.timestamp }.minOrNull()?.let { timestamp ->
+                aapsLogger.debug(LTag.DATABASE, "Firing EventNewHistoryData")
+                rxBus.send(EventNewHistoryData(timestamp, true, newestGlucoseValue))
+            }
+            it.filterIsInstance<Carbs>().map { t -> t.timestamp }.minOrNull()?.let { timestamp ->
+                aapsLogger.debug(LTag.DATABASE, "Firing EventTreatmentChange")
+                rxBus.send(EventTreatmentChange())
+                rxBus.send(EventNewHistoryData(timestamp, false))
+            }
+            it.filterIsInstance<Bolus>().map { t -> t.timestamp }.minOrNull()?.let { timestamp ->
+                aapsLogger.debug(LTag.DATABASE, "Firing EventTreatmentChange")
+                rxBus.send(EventTreatmentChange())
+                rxBus.send(EventNewHistoryData(timestamp, false))
+            }
+            it.filterIsInstance<TemporaryBasal>().map { t -> t.timestamp }.minOrNull()?.let { timestamp ->
+                aapsLogger.debug(LTag.DATABASE, "Firing EventTempBasalChange")
+                rxBus.send(EventTempBasalChange())
+                rxBus.send(EventNewHistoryData(timestamp, false))
+            }
+            it.filterIsInstance<ExtendedBolus>().map { t -> t.timestamp }.minOrNull()?.let { timestamp ->
+                aapsLogger.debug(LTag.DATABASE, "Firing EventExtendedBolusChange")
+                rxBus.send(EventExtendedBolusChange())
+                rxBus.send(EventNewHistoryData(timestamp, false))
             }
             it.filterIsInstance<TemporaryTarget>().firstOrNull()?.let {
                 aapsLogger.debug(LTag.DATABASE, "Firing EventTempTargetChange")
@@ -50,5 +74,13 @@ class CompatDBHelper @Inject constructor(
                 aapsLogger.debug(LTag.DATABASE, "Firing EventFoodDatabaseChanged")
                 rxBus.send(EventFoodDatabaseChanged())
             }
+            it.filterIsInstance<ProfileSwitch>().firstOrNull()?.let {
+                aapsLogger.debug(LTag.DATABASE, "Firing EventProfileSwitchChanged")
+                rxBus.send(EventProfileSwitchChanged())
+            }
+            it.filterIsInstance<EffectiveProfileSwitch>().firstOrNull()?.let {
+                aapsLogger.debug(LTag.DATABASE, "Firing EventProfileSwitchChanged")
+                rxBus.send(EventProfileSwitchChanged())
+            }
         }
 }

app/src/main/java/info/nightscout/androidaps/db/DatabaseHelperProvider.java

@@ -1,12 +1,10 @@
 package info.nightscout.androidaps.db;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.j256.ormlite.dao.CloseableIterator;
 
-import org.jetbrains.annotations.Nullable;
-import org.json.JSONObject;
-
 import java.sql.SQLException;
 import java.util.List;
 
@@ -16,74 +14,31 @@ import javax.inject.Singleton;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.interfaces.DatabaseHelperInterface;
 
+@Deprecated
 @Singleton
 public class DatabaseHelperProvider implements DatabaseHelperInterface {
 
     @Inject DatabaseHelperProvider() {
     }
 
-    @Override public void createOrUpdate(@NonNull DanaRHistoryRecord record) {
-        MainApp.Companion.getDbHelper().createOrUpdate(record);
-    }
-
     @Override public void createOrUpdate(@NonNull OmnipodHistoryRecord record) {
         MainApp.Companion.getDbHelper().createOrUpdate(record);
     }
 
-    @NonNull @Override public List<DanaRHistoryRecord> getDanaRHistoryRecordsByType(byte type) {
-        return MainApp.Companion.getDbHelper().getDanaRHistoryRecordsByType(type);
-    }
-
-    @NonNull @Override public List<TDD> getTDDs() {
-        return MainApp.Companion.getDbHelper().getTDDs();
-    }
-
-    @Override public long size(@NonNull String table) {
-        return MainApp.Companion.getDbHelper().size(table);
-    }
-
-    @Override public void create(@NonNull DbRequest record) {
-        try {
-            MainApp.Companion.getDbHelper().create(record);
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Override public void deleteAllDbRequests() {
-        MainApp.Companion.getDbHelper().deleteAllDbRequests();
-    }
-
-    @Override public int deleteDbRequest(@NonNull String id) {
-        return MainApp.Companion.getDbHelper().deleteDbRequest(id);
-    }
-
-    @Override public void deleteDbRequestbyMongoId(@NonNull String action, @NonNull String _id) {
-        MainApp.Companion.getDbHelper().deleteDbRequestbyMongoId(action, _id);
-    }
-
-    @NonNull @Override public CloseableIterator<DbRequest> getDbRequestIterator() {
-        return MainApp.Companion.getDbHelper().getDbRequestIterator();
-    }
-
-    @Override public long roundDateToSec(long date) {
-        return MainApp.Companion.getDbHelper().roundDateToSec(date);
-    }
-
-    @Override public void createOrUpdateTDD(@NonNull TDD record) {
-        MainApp.Companion.getDbHelper().createOrUpdateTDD(record);
-    }
-
     @Override public boolean createOrUpdate(@NonNull TemporaryBasal tempBasal) {
-        return MainApp.Companion.getDbHelper().createOrUpdate(tempBasal);
+//        return MainApp.Companion.getDbHelper().createOrUpdate(tempBasal);
+        return false;
     }
 
-    @NonNull @Override public TemporaryBasal findTempBasalByPumpId(long id) {
-        return MainApp.Companion.getDbHelper().findTempBasalByPumpId(id);
+    @Nullable @Override public TemporaryBasal findTempBasalByPumpId(long id) {
+//        return MainApp.Companion.getDbHelper().findTempBasalByPumpId(id);
+        return null;
     }
 
+    @Deprecated
     @NonNull @Override public List<TemporaryBasal> getTemporaryBasalsDataFromTime(long mills, boolean ascending) {
-        return MainApp.Companion.getDbHelper().getTemporaryBasalsDataFromTime(mills, ascending);
+//        return MainApp.Companion.getDbHelper().getTemporaryBasalsDataFromTime(mills, ascending);
+        return null;
     }
 
     @NonNull @Override public List<OmnipodHistoryRecord> getAllOmnipodHistoryRecordsFromTimestamp(long timestamp, boolean ascending) {
@@ -94,84 +49,13 @@ public class DatabaseHelperProvider implements DatabaseHelperInterface {
         return MainApp.Companion.getDbHelper().findOmnipodHistoryRecordByPumpId(pumpId);
     }
 
-    @NonNull @Override public List<TDD> getTDDsForLastXDays(int days) {
-        return MainApp.Companion.getDbHelper().getTDDsForLastXDays(days);
-    }
-
-    @NonNull @Override public List<ProfileSwitch> getProfileSwitchData(long from, boolean ascending) {
-        return MainApp.Companion.getDbHelper().getProfileSwitchData(from, ascending);
-    }
-
-    @Override public void createOrUpdate(@NonNull InsightBolusID record) {
-        MainApp.Companion.getDbHelper().createOrUpdate(record);
-    }
-
-    @Override public void createOrUpdate(@NonNull InsightPumpID record) {
-        MainApp.Companion.getDbHelper().createOrUpdate(record);
-    }
-
-    @Override public void createOrUpdate(@NonNull InsightHistoryOffset record) {
-        MainApp.Companion.getDbHelper().createOrUpdate(record);
-    }
-
     @Override public void delete(@NonNull ExtendedBolus extendedBolus) {
-        MainApp.Companion.getDbHelper().delete(extendedBolus);
+//        MainApp.Companion.getDbHelper().delete(extendedBolus);
     }
 
     @Nullable @Override public ExtendedBolus getExtendedBolusByPumpId(long pumpId) {
-        return MainApp.Companion.getDbHelper().getExtendedBolusByPumpId(pumpId);
-    }
-
-    @Nullable @Override public InsightBolusID getInsightBolusID(@NonNull String pumpSerial, int bolusID, long timestamp) {
-        return MainApp.Companion.getDbHelper().getInsightBolusID(pumpSerial, bolusID, timestamp);
-    }
-
-    @Nullable @Override public InsightHistoryOffset getInsightHistoryOffset(@NonNull String pumpSerial) {
-        return MainApp.Companion.getDbHelper().getInsightHistoryOffset(pumpSerial);
-    }
-
-    @Nullable @Override public InsightPumpID getPumpStoppedEvent(@NonNull String pumpSerial, long before) {
-        return MainApp.Companion.getDbHelper().getPumpStoppedEvent(pumpSerial, before);
-    }
-
-    @Override public boolean createOrUpdate(@NonNull ExtendedBolus extendedBolus) {
-        return MainApp.Companion.getDbHelper().createOrUpdate(extendedBolus);
-    }
-
-    @Override public void createOrUpdate(@NonNull ProfileSwitch profileSwitch) {
-        MainApp.Companion.getDbHelper().createOrUpdate(profileSwitch);
-    }
-
-    @Override public void delete(@NonNull TemporaryBasal tempBasal) {
-        MainApp.Companion.getDbHelper().delete(tempBasal);
-    }
-
-    @NonNull @Override public List<ExtendedBolus> getExtendedBolusDataFromTime(long mills, boolean ascending) {
-        return MainApp.Companion.getDbHelper().getExtendedBolusDataFromTime(mills, ascending);
-    }
-
-    @Override public void deleteTempBasalById(@NonNull String _id) {
-        MainApp.Companion.getDbHelper().deleteTempBasalById(_id);
-    }
-
-    @Override public void deleteExtendedBolusById(@NonNull String _id) {
-        MainApp.Companion.getDbHelper().deleteExtendedBolusById(_id);
-    }
-
-    @Override public void deleteProfileSwitchById(@NonNull String _id) {
-        MainApp.Companion.getDbHelper().deleteProfileSwitchById(_id);
-    }
-
-    @Override public void createTempBasalFromJsonIfNotExists(@NonNull JSONObject json) {
-        MainApp.Companion.getDbHelper().createTempBasalFromJsonIfNotExists(json);
-    }
-
-    @Override public void createExtendedBolusFromJsonIfNotExists(@NonNull JSONObject json) {
-        MainApp.Companion.getDbHelper().createExtendedBolusFromJsonIfNotExists(json);
-    }
-
-    @Override public void createProfileSwitchFromJsonIfNotExists(@NonNull JSONObject trJson) {
-        MainApp.Companion.getDbHelper().createProfileSwitchFromJsonIfNotExists(trJson);
+//        return MainApp.Companion.getDbHelper().getExtendedBolusByPumpId(pumpId);
+        return null;
     }
 
     @Override public void resetDatabases() {
@@ -182,42 +66,10 @@ public class DatabaseHelperProvider implements DatabaseHelperInterface {
         MainApp.Companion.getDbHelper().createOrUpdate(record);
     }
 
-    @Override public void delete(@NonNull ProfileSwitch profileSwitch) {
-        MainApp.Companion.getDbHelper().delete(profileSwitch);
-    }
-
-    @NonNull @Override public List<ProfileSwitch> getProfileSwitchEventsFromTime(long from, long to, boolean ascending) {
-        return MainApp.Companion.getDbHelper().getProfileSwitchEventsFromTime(from, to, ascending);
-    }
-
-    @NonNull @Override public List<ProfileSwitch> getProfileSwitchEventsFromTime(long mills, boolean ascending) {
-        return MainApp.Companion.getDbHelper().getProfileSwitchEventsFromTime(mills, ascending);
-    }
-
-    @NonNull @Override public List<ExtendedBolus> getAllExtendedBoluses() {
-        return MainApp.Companion.getDbHelper().getAllExtendedBoluses();
-    }
-
-    @NonNull @Override public List<ProfileSwitch> getAllProfileSwitches() {
-        return MainApp.Companion.getDbHelper().getAllProfileSwitches();
-    }
-
-    @NonNull @Override public List<TDD> getAllTDDs() {
-        return MainApp.Companion.getDbHelper().getAllTDDs();
-    }
-
-    @NonNull @Override public List<TemporaryBasal> getAllTemporaryBasals() {
-        return MainApp.Companion.getDbHelper().getAllTemporaryBasals();
-    }
-
     @NonNull @Override public List<OHQueueItem> getAllOHQueueItems(long maxEntries) {
         return MainApp.Companion.getDbHelper().getAllOHQueueItems(maxEntries);
     }
 
-    @Override public void resetProfileSwitch() {
-        MainApp.Companion.getDbHelper().resetProfileSwitch();
-    }
-
     @Override public long getOHQueueSize() {
         return MainApp.Companion.getDbHelper().getOHQueueSize();
     }
@@ -226,10 +78,6 @@ public class DatabaseHelperProvider implements DatabaseHelperInterface {
         MainApp.Companion.getDbHelper().clearOpenHumansQueue();
     }
 
-    @Override public long getCountOfAllRows() {
-        return MainApp.Companion.getDbHelper().getCountOfAllRows();
-    }
-
     @Override public void removeAllOHQueueItemsWithIdSmallerThan(long id) {
         MainApp.Companion.getDbHelper().removeAllOHQueueItemsWithIdSmallerThan(id);
     }

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

@@ -7,12 +7,14 @@ import dagger.android.AndroidInjector
 import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.automation.di.AutomationModule
 import info.nightscout.androidaps.combo.di.ComboModule
-import info.nightscout.androidaps.core.di.CoreModule
+import info.nightscout.androidaps.dana.di.DanaHistoryModule
+import info.nightscout.androidaps.di.CoreModule
 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.danars.di.InsightModule
 import info.nightscout.androidaps.database.DatabaseModule
+import info.nightscout.androidaps.insight.di.InsightDatabaseModule
+import info.nightscout.androidaps.insight.di.InsightModule
 import info.nightscout.androidaps.plugins.pump.common.di.RileyLinkModule
 import info.nightscout.androidaps.plugins.pump.medtronic.di.MedtronicModule
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.dagger.OmnipodErosModule
@@ -45,10 +47,12 @@ import javax.inject.Singleton
         UIModule::class,
         CoreModule::class,
         DanaModule::class,
+        DanaHistoryModule::class,
         DanaRModule::class,
         DanaRSModule::class,
         ComboModule::class,
         InsightModule::class,
+        InsightDatabaseModule::class,
         WorkersModule::class,
         OHUploaderModule::class
     ]

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

@@ -6,45 +6,51 @@ import dagger.Lazy
 import dagger.Module
 import dagger.Provides
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.Config
 import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.db.DatabaseHelperProvider
 import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
 import info.nightscout.androidaps.plugins.configBuilder.PluginStore
-import info.nightscout.androidaps.plugins.general.maintenance.ImportExportPrefs
-import info.nightscout.androidaps.plugins.general.nsclient.UploadQueue
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctionImplementation
+import info.nightscout.androidaps.plugins.general.maintenance.ImportExportPrefsImpl
+import info.nightscout.androidaps.plugins.general.nsclient.DataSyncSelectorImplementation
 import info.nightscout.androidaps.plugins.general.smsCommunicator.SmsCommunicatorPlugin
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
+import info.nightscout.androidaps.plugins.pump.PumpSyncImplementation
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.queue.CommandQueue
-import info.nightscout.androidaps.utils.androidNotification.NotificationHolder
-import info.nightscout.androidaps.utils.resources.IconsProvider
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.androidNotification.NotificationHolderImpl
+import info.nightscout.androidaps.utils.buildHelper.ConfigImpl
+import info.nightscout.androidaps.utils.resources.IconsProviderImplementation
+import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.androidaps.utils.rx.DefaultAapsSchedulers
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import info.nightscout.androidaps.utils.storage.FileStorage
 import info.nightscout.androidaps.utils.storage.Storage
 import javax.inject.Singleton
+
+@Suppress("unused")
 @Module(includes = [
     AppModule.AppBindings::class
 ])
 open class AppModule {
 
     @Provides
-    fun providesPlugins(configInterface: ConfigInterface,
+    fun providesPlugins(config: Config,
                         @PluginsModule.AllConfigs allConfigs: Map<@JvmSuppressWildcards Int, @JvmSuppressWildcards PluginBase>,
                         @PluginsModule.PumpDriver pumpDrivers: Lazy<Map<@JvmSuppressWildcards Int, @JvmSuppressWildcards PluginBase>>,
                         @PluginsModule.NotNSClient notNsClient: Lazy<Map<@JvmSuppressWildcards Int, @JvmSuppressWildcards PluginBase>>,
                         @PluginsModule.APS aps: Lazy<Map<@JvmSuppressWildcards Int, @JvmSuppressWildcards PluginBase>>)
         : List<@JvmSuppressWildcards PluginBase> {
         val plugins = allConfigs.toMutableMap()
-        if (configInterface.PUMPDRIVERS) plugins += pumpDrivers.get()
-        if (configInterface.APS) plugins += aps.get()
-        if (!configInterface.NSCLIENT) plugins += notNsClient.get()
+        if (config.PUMPDRIVERS) plugins += pumpDrivers.get()
+        if (config.APS) plugins += aps.get()
+        if (!config.NSCLIENT) plugins += notNsClient.get()
         return plugins.toList().sortedBy { it.first }.map { it.second }
     }
 
@@ -60,31 +66,29 @@ open class AppModule {
 
     @Provides
     @Singleton
-    fun providesUploadQueue(
-        aapsLogger: AAPSLogger,
-        databaseHelper: DatabaseHelperInterface,
-        context: Context,
-        sp: SP,
-        rxBus: RxBusWrapper
-    ): UploadQueueAdminInterface = UploadQueue(aapsLogger, databaseHelper, context, sp, rxBus)
+    fun provideProfileFunction(aapsLogger: AAPSLogger, sp: SP, resourceHelper: ResourceHelper, activePlugin: ActivePlugin, repository: AppRepository, dateUtil: DateUtil): ProfileFunction {
+        return ProfileFunctionImplementation(aapsLogger, sp, resourceHelper, activePlugin, repository, dateUtil)
+    }
 
     @Module
     interface AppBindings {
         @Binds fun bindContext(mainApp: MainApp): Context
         @Binds fun bindInjector(mainApp: MainApp): HasAndroidInjector
-        @Binds fun bindActivePluginProvider(pluginStore: PluginStore): ActivePluginProvider
+        @Binds fun bindActivePluginProvider(pluginStore: PluginStore): ActivePlugin
         @Binds fun bindCommandQueueProvider(commandQueue: CommandQueue): CommandQueueProvider
-        @Binds fun bindConfigInterface(config: Config): ConfigInterface
-        @Binds fun bindConfigBuilderInterface(configBuilderPlugin: ConfigBuilderPlugin): ConfigBuilderInterface
-        @Binds fun bindTreatmentInterface(treatmentsPlugin: TreatmentsPlugin): TreatmentsInterface
+        @Binds fun bindConfigInterface(config: ConfigImpl): Config
+        @Binds fun bindConfigBuilderInterface(configBuilderPlugin: ConfigBuilderPlugin): ConfigBuilder
+        @Binds fun bindTreatmentsInterface(treatmentsPlugin: TreatmentsPlugin): TreatmentsInterface
         @Binds fun bindDatabaseHelperInterface(databaseHelperProvider: DatabaseHelperProvider): DatabaseHelperInterface
-        @Binds fun bindNotificationHolderInterface(notificationHolder: NotificationHolder): NotificationHolderInterface
-        @Binds fun bindImportExportPrefsInterface(importExportPrefs: ImportExportPrefs): ImportExportPrefsInterface
-        @Binds fun bindIconsProviderInterface(iconsProvider: IconsProvider): IconsProviderInterface
+        @Binds fun bindNotificationHolderInterface(notificationHolder: NotificationHolderImpl): NotificationHolder
+        @Binds fun bindImportExportPrefsInterface(importExportPrefs: ImportExportPrefsImpl): ImportExportPrefs
+        @Binds fun bindIconsProviderInterface(iconsProvider: IconsProviderImplementation): IconsProvider
         @Binds fun bindLoopInterface(loopPlugin: LoopPlugin): LoopInterface
-        @Binds fun bindIobCobCalculatorInterface(iobCobCalculatorPlugin: IobCobCalculatorPlugin): IobCobCalculatorInterface
-        @Binds fun bindSmsCommunicatorInterface(smsCommunicatorPlugin: SmsCommunicatorPlugin): SmsCommunicatorInterface
-        @Binds fun bindUploadQueueAdminInterfaceToUploadQueue(uploadQueueAdminInterface: UploadQueueAdminInterface) : UploadQueueInterface
+        @Binds fun bindIobCobCalculatorInterface(iobCobCalculatorPlugin: IobCobCalculatorPlugin): IobCobCalculator
+        @Binds fun bindSmsCommunicatorInterface(smsCommunicatorPlugin: SmsCommunicatorPlugin): SmsCommunicator
+        @Binds fun bindDataSyncSelector(dataSyncSelectorImplementation: DataSyncSelectorImplementation): DataSyncSelector
+        @Binds fun bindPumpSync(pumpSyncImplementation: PumpSyncImplementation): PumpSync
+
     }
 }
 

app/src/main/java/info/nightscout/androidaps/dependencyInjection/DataClassesModule.kt

@@ -14,7 +14,7 @@ abstract class DataClassesModule {
 
     @ContributesAndroidInjector abstract fun glucoseStatusInjector(): GlucoseStatus
 
-    @ContributesAndroidInjector abstract fun DatabaseHelperInjector(): DatabaseHelper
+    @ContributesAndroidInjector abstract fun databaseHelperInjector(): DatabaseHelper
     @ContributesAndroidInjector abstract fun treatmentServiceInjector(): TreatmentService
 
     @ContributesAndroidInjector abstract fun bolusWizardInjector(): BolusWizard

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

@@ -29,7 +29,6 @@ import info.nightscout.androidaps.plugins.general.tidepool.TidepoolFragment
 import info.nightscout.androidaps.plugins.general.wear.WearFragment
 import info.nightscout.androidaps.plugins.insulin.InsulinFragment
 import info.nightscout.androidaps.plugins.profile.local.LocalProfileFragment
-import info.nightscout.androidaps.plugins.profile.ns.NSProfileFragment
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpFragment
 import info.nightscout.androidaps.plugins.source.BGSourceFragment
 import info.nightscout.androidaps.plugins.treatments.TreatmentsFragment
@@ -46,8 +45,7 @@ abstract class FragmentsModule {
     @ContributesAndroidInjector abstract fun contributesAutomationFragment(): AutomationFragment
     @ContributesAndroidInjector abstract fun contributesBGSourceFragment(): BGSourceFragment
 
-    @ContributesAndroidInjector
-    abstract fun contributesConfigBuilderFragment(): ConfigBuilderFragment
+    @ContributesAndroidInjector abstract fun contributesConfigBuilderFragment(): ConfigBuilderFragment
 
     @ContributesAndroidInjector abstract fun contributesFoodFragment(): FoodFragment
     @ContributesAndroidInjector abstract fun contributesInsulinFragment(): InsulinFragment
@@ -58,15 +56,13 @@ abstract class FragmentsModule {
     @ContributesAndroidInjector abstract fun contributesOverviewFragment(): OverviewFragment
     @ContributesAndroidInjector abstract fun contributesLoopFragment(): LoopFragment
     @ContributesAndroidInjector abstract fun contributesMaintenanceFragment(): MaintenanceFragment
-    @ContributesAndroidInjector abstract fun contributesNSProfileFragment(): NSProfileFragment
     @ContributesAndroidInjector abstract fun contributesNSClientFragment(): NSClientFragment
-    @ContributesAndroidInjector
-    abstract fun contributesSmsCommunicatorFragment(): SmsCommunicatorFragment
+    @ContributesAndroidInjector abstract fun contributesSmsCommunicatorFragment(): SmsCommunicatorFragment
     @ContributesAndroidInjector abstract fun contributesWearFragment(): WearFragment
 
     @ContributesAndroidInjector abstract fun contributesTidepoolFragment(): TidepoolFragment
     @ContributesAndroidInjector abstract fun contributesTreatmentsFragment(): TreatmentsFragment
-    @ContributesAndroidInjector abstract fun contributesTreatmentsBolusFragment(): TreatmentsBolusFragment
+    @ContributesAndroidInjector abstract fun contributesTreatmentsBolusFragment(): TreatmentsBolusCarbsFragment
     @ContributesAndroidInjector abstract fun contributesTreatmentsTemporaryBasalsFragment(): TreatmentsTemporaryBasalsFragment
     @ContributesAndroidInjector abstract fun contributesTreatmentsTempTargetFragment(): TreatmentsTempTargetFragment
     @ContributesAndroidInjector abstract fun contributesTreatmentsExtendedBolusesFragment(): TreatmentsExtendedBolusesFragment
@@ -85,8 +81,7 @@ abstract class FragmentsModule {
     @ContributesAndroidInjector abstract fun contributesEditEventDialog(): EditEventDialog
     @ContributesAndroidInjector abstract fun contributesEditTriggerDialog(): EditTriggerDialog
 
-    @ContributesAndroidInjector
-    abstract fun contributesEditQuickWizardDialog(): EditQuickWizardDialog
+    @ContributesAndroidInjector abstract fun contributesEditQuickWizardDialog(): EditQuickWizardDialog
 
     @ContributesAndroidInjector abstract fun contributesExtendedBolusDialog(): ExtendedBolusDialog
     @ContributesAndroidInjector abstract fun contributesFillDialog(): FillDialog
@@ -102,8 +97,7 @@ abstract class FragmentsModule {
     @ContributesAndroidInjector abstract fun contributesWizardDialog(): WizardDialog
     @ContributesAndroidInjector abstract fun contributesWizardInfoDialog(): WizardInfoDialog
 
-    @ContributesAndroidInjector
-    abstract fun contributesExchangeAuthTokenDialot(): OpenHumansLoginActivity.ExchangeAuthTokenDialog
+    @ContributesAndroidInjector abstract fun contributesExchangeAuthTokenDialog(): OpenHumansLoginActivity.ExchangeAuthTokenDialog
 
     @ContributesAndroidInjector abstract fun contributesPasswordCheck(): PasswordCheck
 }

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

@@ -3,6 +3,8 @@ package info.nightscout.androidaps.dependencyInjection
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 import info.nightscout.androidaps.plugins.general.overview.graphData.GraphData
+import info.nightscout.androidaps.plugins.general.overview.graphExtensions.GlucoseValueDataPoint
+import info.nightscout.androidaps.plugins.general.overview.graphExtensions.TherapyEventDataPoint
 import info.nightscout.androidaps.plugins.general.overview.notifications.NotificationWithAction
 
 @Module

app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt

@@ -37,7 +37,6 @@ import info.nightscout.androidaps.plugins.insulin.InsulinOrefRapidActingPlugin
 import info.nightscout.androidaps.plugins.insulin.InsulinOrefUltraRapidActingPlugin
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.plugins.profile.local.LocalProfilePlugin
-import info.nightscout.androidaps.plugins.profile.ns.NSProfilePlugin
 import info.nightscout.androidaps.plugins.pump.combo.ComboPlugin
 import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
 import info.nightscout.androidaps.plugins.pump.mdi.MDIPlugin
@@ -150,17 +149,17 @@ abstract class PluginsModule {
     @IntKey(140)
     abstract fun bindComboPlugin(plugin: ComboPlugin): PluginBase
 
-    @Binds
-    @PumpDriver
-    @IntoMap
-    @IntKey(150)
-    abstract fun bindMedtronicPumpPlugin(plugin: MedtronicPumpPlugin): PluginBase
+    // @Binds
+    // @PumpDriver
+    // @IntoMap
+    // @IntKey(150)
+    // abstract fun bindMedtronicPumpPlugin(plugin: MedtronicPumpPlugin): PluginBase
 
-    @Binds
-    @PumpDriver
-    @IntoMap
-    @IntKey(155)
-    abstract fun bindOmnipodPumpPlugin(plugin: OmnipodErosPumpPlugin): PluginBase
+    // @Binds
+    // @PumpDriver
+    // @IntoMap
+    // @IntKey(155)
+    // abstract fun bindOmnipodPumpPlugin(plugin: OmnipodErosPumpPlugin): PluginBase
 
     @Binds
     @NotNSClient
@@ -195,12 +194,6 @@ abstract class PluginsModule {
     @Binds
     @AllConfigs
     @IntoMap
-    @IntKey(230)
-    abstract fun bindNSProfilePlugin(plugin: NSProfilePlugin): PluginBase
-
-    @Binds
-    @NotNSClient
-    @IntoMap
     @IntKey(240)
     abstract fun bindLocalProfilePlugin(plugin: LocalProfilePlugin): PluginBase
 
@@ -348,11 +341,11 @@ abstract class PluginsModule {
     @IntKey(470)
     abstract fun bindRandomBgPlugin(plugin: RandomBgPlugin): PluginBase
 
-    @Binds
-    @NotNSClient
-    @IntoMap
-    @IntKey(480)
-    abstract fun bindOpenHumansPlugin(plugin: OpenHumansUploader): PluginBase
+    // @Binds
+    // @NotNSClient
+    // @IntoMap
+    // @IntKey(480)
+    // abstract fun bindOpenHumansPlugin(plugin: OpenHumansUploader): PluginBase
 
     @Binds
     @AllConfigs

app/src/main/java/info/nightscout/androidaps/dependencyInjection/ReceiversModule.kt

@@ -17,6 +17,7 @@ abstract class ReceiversModule {
     @ContributesAndroidInjector abstract fun contributesChargingStateReceiver(): ChargingStateReceiver
     @ContributesAndroidInjector abstract fun contributesDataReceiver(): DataReceiver
     @ContributesAndroidInjector abstract fun contributesKeepAliveReceiver(): KeepAliveReceiver
+    @ContributesAndroidInjector abstract fun contributesKeepAliveWorker(): KeepAliveReceiver.KeepAliveWorker
     @ContributesAndroidInjector abstract fun contributesRileyLinkBluetoothStateReceiver(): RileyLinkBluetoothStateReceiver
     @ContributesAndroidInjector abstract fun contributesSmsReceiver(): SmsReceiver
     @ContributesAndroidInjector abstract fun contributesTimeDateOrTZChangeReceiver(): TimeDateOrTZChangeReceiver

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

@@ -3,11 +3,13 @@ package info.nightscout.androidaps.dependencyInjection
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 import info.nightscout.androidaps.plugins.general.food.FoodPlugin
+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.NSClientRemoveWorker
+import info.nightscout.androidaps.plugins.general.nsclient.NSClientUpdateRemoveAckWorker
 import info.nightscout.androidaps.plugins.general.smsCommunicator.SmsCommunicatorPlugin
-import info.nightscout.androidaps.plugins.profile.ns.NSProfilePlugin
+import info.nightscout.androidaps.plugins.profile.local.LocalProfilePlugin
 import info.nightscout.androidaps.plugins.source.*
 
 @Module
@@ -22,9 +24,11 @@ abstract class WorkersModule {
     @ContributesAndroidInjector abstract fun contributesTomatoWorker(): TomatoPlugin.TomatoWorker
     @ContributesAndroidInjector abstract fun contributesEversenseWorker(): EversensePlugin.EversenseWorker
     @ContributesAndroidInjector abstract fun contributesNSClientSourceWorker(): NSClientSourcePlugin.NSClientSourceWorker
-    @ContributesAndroidInjector abstract fun contributesNSProfileWorker(): NSProfilePlugin.NSProfileWorker
+    @ContributesAndroidInjector abstract fun contributesNSProfileWorker(): LocalProfilePlugin.NSProfileWorker
     @ContributesAndroidInjector abstract fun contributesSmsCommunicatorWorker(): SmsCommunicatorPlugin.SmsCommunicatorWorker
     @ContributesAndroidInjector abstract fun contributesNSClientWorker(): NSClientAddUpdateWorker
+    @ContributesAndroidInjector abstract fun contributesNSClientAddAckWorker(): NSClientAddAckWorker
+    @ContributesAndroidInjector abstract fun contributesNSClientUpdateRemoveAckWorker(): NSClientUpdateRemoveAckWorker
     @ContributesAndroidInjector abstract fun contributesNSClientRemoveWorker(): NSClientRemoveWorker
     @ContributesAndroidInjector abstract fun contributesNSClientMbgWorker(): NSClientMbgWorker
     @ContributesAndroidInjector abstract fun contributesFoodWorker(): FoodPlugin.FoodWorker

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

@@ -6,11 +6,13 @@ import android.view.View
 import android.view.ViewGroup
 import com.google.common.base.Joiner
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.data.Profile
-import info.nightscout.androidaps.database.entities.UserEntry.*
+import info.nightscout.androidaps.interfaces.Profile
+import info.nightscout.androidaps.database.entities.ValueWithUnit
+import info.nightscout.androidaps.database.entities.UserEntry.Action
+import info.nightscout.androidaps.database.entities.UserEntry.Sources
 import info.nightscout.androidaps.databinding.DialogCalibrationBinding
+import info.nightscout.androidaps.interfaces.GlucoseUnit
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
@@ -55,13 +57,13 @@ class CalibrationDialog : DialogFragmentWithDate() {
         val units = profileFunction.getUnits()
         val bg = Profile.fromMgdlToUnits(glucoseStatusProvider.glucoseStatusData?.glucose
             ?: 0.0, units)
-        if (units == Constants.MMOL)
+        if (units == GlucoseUnit.MMOL)
             binding.bg.setParams(savedInstanceState?.getDouble("bg")
                 ?: bg, 2.0, 30.0, 0.1, DecimalFormat("0.0"), false, binding.okcancel.ok)
         else
             binding.bg.setParams(savedInstanceState?.getDouble("bg")
                 ?: bg, 36.0, 500.0, 1.0, DecimalFormat("0"), false, binding.okcancel.ok)
-        binding.units.text = if (units == Constants.MMOL) resourceHelper.gs(R.string.mmol) else resourceHelper.gs(R.string.mgdl)
+        binding.units.text = if (units == GlucoseUnit.MMOL) resourceHelper.gs(R.string.mmol) else resourceHelper.gs(R.string.mgdl)
     }
 
     override fun onDestroyView() {
@@ -72,14 +74,14 @@ class CalibrationDialog : DialogFragmentWithDate() {
     override fun submit(): Boolean {
         if (_binding == null) return false
         val units = profileFunction.getUnits()
-        val unitLabel = if (units == Constants.MMOL) resourceHelper.gs(R.string.mmol) else resourceHelper.gs(R.string.mgdl)
+        val unitLabel = if (units == GlucoseUnit.MMOL) resourceHelper.gs(R.string.mmol) else resourceHelper.gs(R.string.mgdl)
         val actions: LinkedList<String?> = LinkedList()
         val bg = binding.bg.value ?: return false
         actions.add(resourceHelper.gs(R.string.treatments_wizard_bg_label) + ": " + Profile.toCurrentUnitsString(profileFunction, bg) + " " + unitLabel)
         if (bg > 0) {
             activity?.let { activity ->
                 OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.overview_calibration), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), {
-                    uel.log(Action.CALIBRATION, ValueWithUnit(bg, units))
+                    uel.log(Action.CALIBRATION, Sources.CalibrationDialog, ValueWithUnit.fromGlucoseUnit(bg, units.asText))
                     xdripCalibrations.sendIntent(bg)
                 })
             }

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

@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.dialogs
 
+import android.content.Context
 import android.os.Bundle
 import android.text.Editable
 import android.text.TextWatcher
@@ -7,28 +8,30 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.google.common.base.Joiner
-import info.nightscout.androidaps.Constants
-import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.activities.ErrorHelperActivity
+import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.database.entities.TemporaryTarget
-import info.nightscout.androidaps.database.entities.TherapyEvent
-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.database.entities.ValueWithUnit
 import info.nightscout.androidaps.database.transactions.InsertTemporaryTargetAndCancelCurrentTransaction
 import info.nightscout.androidaps.databinding.DialogCarbsBinding
+import info.nightscout.androidaps.extensions.formatColor
 import info.nightscout.androidaps.interfaces.Constraint
+import info.nightscout.androidaps.interfaces.GlucoseUnit
+import info.nightscout.androidaps.interfaces.IobCobCalculator
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
-import info.nightscout.androidaps.plugins.treatments.CarbsGenerator
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.queue.Callback
+import info.nightscout.androidaps.queue.CommandQueue
 import info.nightscout.androidaps.utils.*
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
-import info.nightscout.androidaps.utils.extensions.formatColor
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.rxkotlin.plusAssign
@@ -40,17 +43,16 @@ import kotlin.math.max
 
 class CarbsDialog : DialogFragmentWithDate() {
 
-    @Inject lateinit var mainApp: MainApp
+    @Inject lateinit var ctx: Context
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var constraintChecker: ConstraintChecker
     @Inject lateinit var defaultValueHelper: DefaultValueHelper
     @Inject lateinit var treatmentsPlugin: TreatmentsPlugin
     @Inject lateinit var profileFunction: ProfileFunction
-    @Inject lateinit var iobCobCalculatorPlugin: IobCobCalculatorPlugin
-    @Inject lateinit var nsUpload: NSUpload
-    @Inject lateinit var carbsGenerator: CarbsGenerator
+    @Inject lateinit var iobCobCalculator: IobCobCalculator
     @Inject lateinit var uel: UserEntryLogger
     @Inject lateinit var carbTimer: CarbTimer
+    @Inject lateinit var commandQueue: CommandQueue
     @Inject lateinit var repository: AppRepository
 
     companion object {
@@ -76,15 +78,15 @@ class CarbsDialog : DialogFragmentWithDate() {
         val time = binding.time.value.toInt()
         if (time > 12 * 60 || time < -12 * 60) {
             binding.time.value = 0.0
-            ToastUtils.showToastInUiThread(mainApp, resourceHelper.gs(R.string.constraintapllied))
+            ToastUtils.showToastInUiThread(ctx, resourceHelper.gs(R.string.constraintapllied))
         }
         if (binding.duration.value > 10) {
             binding.duration.value = 0.0
-            ToastUtils.showToastInUiThread(mainApp, resourceHelper.gs(R.string.constraintapllied))
+            ToastUtils.showToastInUiThread(ctx, resourceHelper.gs(R.string.constraintapllied))
         }
         if (binding.carbs.value.toInt() > maxCarbs) {
             binding.carbs.value = 0.0
-            ToastUtils.showToastInUiThread(mainApp, resourceHelper.gs(R.string.carbsconstraintapplied))
+            ToastUtils.showToastInUiThread(ctx, resourceHelper.gs(R.string.carbsconstraintapplied))
         }
     }
 
@@ -142,7 +144,7 @@ class CarbsDialog : DialogFragmentWithDate() {
             validateInputs()
         }
 
-        iobCobCalculatorPlugin.actualBg()?.let { bgReading ->
+        iobCobCalculator.ads.actualBg()?.let { bgReading ->
             if (bgReading.value < 72)
                 binding.hypoTt.isChecked = true
         }
@@ -182,7 +184,7 @@ class CarbsDialog : DialogFragmentWithDate() {
         val hypoTTDuration = defaultValueHelper.determineHypoTTDuration()
         val hypoTT = defaultValueHelper.determineHypoTT()
         val actions: LinkedList<String?> = LinkedList()
-        val unitLabel = if (units == Constants.MMOL) resourceHelper.gs(R.string.mmol) else resourceHelper.gs(R.string.mgdl)
+        val unitLabel = if (units == GlucoseUnit.MMOL) resourceHelper.gs(R.string.mmol) else resourceHelper.gs(R.string.mgdl)
         val useAlarm = binding.alarmCheckBox.isChecked
 
         val activitySelected = binding.activityTt.isChecked
@@ -222,7 +224,10 @@ class CarbsDialog : DialogFragmentWithDate() {
                 OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.carbs), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), {
                     when {
                         activitySelected   -> {
-                            uel.log(Action.TT, ValueWithUnit(TemporaryTarget.Reason.ACTIVITY.text, Units.TherapyEvent), ValueWithUnit(activityTT, units) , ValueWithUnit(activityTTDuration, Units.M))
+                            uel.log(Action.TT, Sources.CarbDialog,
+                                ValueWithUnit.TherapyEventTTReason(TemporaryTarget.Reason.ACTIVITY),
+                                ValueWithUnit.fromGlucoseUnit(activityTT, units.asText),
+                                ValueWithUnit.Minute(activityTTDuration))
                             disposable += repository.runTransactionForResult(InsertTemporaryTargetAndCancelCurrentTransaction(
                                 timestamp = System.currentTimeMillis(),
                                 duration = TimeUnit.MINUTES.toMillis(activityTTDuration.toLong()),
@@ -230,15 +235,18 @@ class CarbsDialog : DialogFragmentWithDate() {
                                 lowTarget = Profile.toMgdl(activityTT, profileFunction.getUnits()),
                                 highTarget = Profile.toMgdl(activityTT, profileFunction.getUnits())
                             )).subscribe({ result ->
-                                result.inserted.forEach { nsUpload.uploadTempTarget(it) }
-                                result.updated.forEach { nsUpload.updateTempTarget(it) }
+                                result.inserted.forEach { aapsLogger.debug(LTag.DATABASE, "Inserted temp target $it") }
+                                result.updated.forEach { aapsLogger.debug(LTag.DATABASE, "Updated temp target $it") }
                             }, {
-                                aapsLogger.error(LTag.BGSOURCE, "Error while saving temporary target", it)
+                                aapsLogger.error(LTag.DATABASE, "Error while saving temporary target", it)
                             })
                         }
 
                         eatingSoonSelected -> {
-                            uel.log(Action.TT, ValueWithUnit(TemporaryTarget.Reason.EATING_SOON.text, Units.TherapyEvent), ValueWithUnit(eatingSoonTT, units) , ValueWithUnit(eatingSoonTTDuration, Units.M))
+                            uel.log(Action.TT, Sources.CarbDialog,
+                                ValueWithUnit.TherapyEventTTReason(TemporaryTarget.Reason.EATING_SOON),
+                                ValueWithUnit.fromGlucoseUnit(eatingSoonTT, units.asText),
+                                ValueWithUnit.Minute(eatingSoonTTDuration))
                             disposable += repository.runTransactionForResult(InsertTemporaryTargetAndCancelCurrentTransaction(
                                 timestamp = System.currentTimeMillis(),
                                 duration = TimeUnit.MINUTES.toMillis(eatingSoonTTDuration.toLong()),
@@ -246,15 +254,18 @@ class CarbsDialog : DialogFragmentWithDate() {
                                 lowTarget = Profile.toMgdl(eatingSoonTT, profileFunction.getUnits()),
                                 highTarget = Profile.toMgdl(eatingSoonTT, profileFunction.getUnits())
                             )).subscribe({ result ->
-                                result.inserted.forEach { nsUpload.uploadTempTarget(it) }
-                                result.updated.forEach { nsUpload.updateTempTarget(it) }
+                                result.inserted.forEach { aapsLogger.debug(LTag.DATABASE, "Inserted temp target $it") }
+                                result.updated.forEach { aapsLogger.debug(LTag.DATABASE, "Updated temp target $it") }
                             }, {
-                                aapsLogger.error(LTag.BGSOURCE, "Error while saving temporary target", it)
+                                aapsLogger.error(LTag.DATABASE, "Error while saving temporary target", it)
                             })
                         }
 
                         hypoSelected       -> {
-                            uel.log(Action.TT, ValueWithUnit(TemporaryTarget.Reason.HYPOGLYCEMIA.text, Units.TherapyEvent), ValueWithUnit(hypoTT, units) , ValueWithUnit(hypoTTDuration, Units.M))
+                            uel.log(Action.TT, Sources.CarbDialog,
+                                ValueWithUnit.TherapyEventTTReason(TemporaryTarget.Reason.HYPOGLYCEMIA),
+                                ValueWithUnit.fromGlucoseUnit(hypoTT, units.asText),
+                                ValueWithUnit.Minute(hypoTTDuration))
                             disposable += repository.runTransactionForResult(InsertTemporaryTargetAndCancelCurrentTransaction(
                                 timestamp = System.currentTimeMillis(),
                                 duration = TimeUnit.MINUTES.toMillis(hypoTTDuration.toLong()),
@@ -262,24 +273,37 @@ class CarbsDialog : DialogFragmentWithDate() {
                                 lowTarget = Profile.toMgdl(hypoTT, profileFunction.getUnits()),
                                 highTarget = Profile.toMgdl(hypoTT, profileFunction.getUnits())
                             )).subscribe({ result ->
-                                result.inserted.forEach { nsUpload.uploadTempTarget(it) }
-                                result.updated.forEach { nsUpload.updateTempTarget(it) }
+                                result.inserted.forEach { aapsLogger.debug(LTag.DATABASE, "Inserted temp target $it") }
+                                result.updated.forEach { aapsLogger.debug(LTag.DATABASE, "Updated temp target $it") }
                             }, {
-                                aapsLogger.error(LTag.BGSOURCE, "Error while saving temporary target", it)
+                                aapsLogger.error(LTag.DATABASE, "Error while saving temporary target", it)
                             })
                         }
                     }
                     if (carbsAfterConstraints > 0) {
-                        if (duration == 0) {
-                            carbsGenerator.createCarb(carbsAfterConstraints, time, TherapyEvent.Type.CARBS_CORRECTION.text, notes)
-                        } else {
-                            carbsGenerator.generateCarbs(carbsAfterConstraints, time, duration, notes)
-                            nsUpload.uploadEvent(TherapyEvent.Type.NOTE.text, DateUtil.now() - 2000, resourceHelper.gs(R.string.generated_ecarbs_note, carbsAfterConstraints, duration, timeOffset))
-                        }
-                        uel.log(Action.CARBS, notes, ValueWithUnit(eventTime, Units.Timestamp, eventTimeChanged), ValueWithUnit(carbsAfterConstraints, Units.G), ValueWithUnit(timeOffset, Units.M, timeOffset != 0), ValueWithUnit(duration, Units.H, duration != 0))
+                        val detailedBolusInfo = DetailedBolusInfo()
+                        detailedBolusInfo.eventType = DetailedBolusInfo.EventType.CORRECTION_BOLUS
+                        detailedBolusInfo.carbs = carbsAfterConstraints.toDouble()
+                        detailedBolusInfo.context = context
+                        detailedBolusInfo.notes = notes
+                        detailedBolusInfo.carbsDuration = T.hours(duration.toLong()).msecs()
+                        detailedBolusInfo.carbsTimestamp = time
+                        uel.log(if (duration == 0) Action.CARBS else Action.EXTENDED_CARBS, Sources.CarbDialog,
+                            notes,
+                            ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged },
+                            ValueWithUnit.Gram(carbsAfterConstraints),
+                            ValueWithUnit.Minute(timeOffset).takeIf { timeOffset != 0 },
+                            ValueWithUnit.Hour(duration).takeIf { duration != 0 })
+                        commandQueue.bolus(detailedBolusInfo, object : Callback() {
+                            override fun run() {
+                                if (!result.success) {
+                                    ErrorHelperActivity.runAlarm(ctx, result.comment, resourceHelper.gs(R.string.treatmentdeliveryerror), R.raw.boluserror)
+                                }
+                            }
+                        })
                     }
                     if (useAlarm && carbs > 0 && timeOffset > 0) {
-                        carbTimer.scheduleReminder(dateUtil._now() + T.mins(timeOffset.toLong()).msecs())
+                        carbTimer.scheduleReminder(dateUtil.now() + T.mins(timeOffset.toLong()).msecs())
                     }
                 }, null)
             }

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

@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.dialogs
 
+import android.content.Context
 import android.os.Bundle
 import android.text.Editable
 import android.text.TextWatcher
@@ -10,24 +11,25 @@ import androidx.annotation.StringRes
 import com.google.common.base.Joiner
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Constants
-import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.database.AppRepository
+import info.nightscout.androidaps.database.entities.ValueWithUnit
 import info.nightscout.androidaps.database.entities.TherapyEvent
-import info.nightscout.androidaps.database.transactions.InsertTherapyEventIfNewTransaction
-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.database.transactions.InsertIfNewByTimestampTherapyEventTransaction
 import info.nightscout.androidaps.databinding.DialogCareBinding
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.androidaps.utils.HtmlHelper
 import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.Translator
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
-import info.nightscout.androidaps.utils.extensions.fromConstant
+import info.nightscout.androidaps.extensions.fromConstant
+import info.nightscout.androidaps.interfaces.GlucoseUnit
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.rxkotlin.plusAssign
@@ -38,10 +40,9 @@ import javax.inject.Inject
 class CareDialog : DialogFragmentWithDate() {
 
     @Inject lateinit var injector: HasAndroidInjector
-    @Inject lateinit var mainApp: MainApp
+    @Inject lateinit var ctx: Context
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var profileFunction: ProfileFunction
-    @Inject lateinit var nsUpload: NSUpload
     @Inject lateinit var translator: Translator
     @Inject lateinit var uel: UserEntryLogger
     @Inject lateinit var repository: AppRepository
@@ -60,7 +61,8 @@ class CareDialog : DialogFragmentWithDate() {
     }
 
     private var options: EventType = EventType.BGCHECK
-    private var valuesWithUnit = mutableListOf<ValueWithUnit>()
+    //private var valuesWithUnit = mutableListOf<XXXValueWithUnit?>()
+    private var valuesWithUnit = mutableListOf<ValueWithUnit?>()
 
     @StringRes
     private var event: Int = R.string.none
@@ -150,7 +152,7 @@ class CareDialog : DialogFragmentWithDate() {
             }
         }
 
-        if (profileFunction.getUnits() == Constants.MMOL) {
+        if (profileFunction.getUnits() == GlucoseUnit.MMOL) {
             binding.bgunits.text = resourceHelper.gs(R.string.mmol)
             binding.bg.setParams(savedInstanceState?.getDouble("bg")
                 ?: bg, 2.0, 30.0, 0.1, DecimalFormat("0.0"), false, binding.okcancel.ok, bgTextWatcher)
@@ -172,7 +174,7 @@ class CareDialog : DialogFragmentWithDate() {
 
     override fun submit(): Boolean {
         val enteredBy = sp.getString("careportal_enteredby", "AndroidAPS")
-        val unitResId = if (profileFunction.getUnits() == Constants.MGDL) R.string.mgdl else R.string.mmol
+        val unitResId = if (profileFunction.getUnits() == GlucoseUnit.MGDL) R.string.mgdl else R.string.mmol
 
         eventTime -= eventTime % 1000
 
@@ -198,17 +200,17 @@ class CareDialog : DialogFragmentWithDate() {
                     binding.sensor.isChecked -> TherapyEvent.MeterType.SENSOR
                     else                     -> TherapyEvent.MeterType.MANUAL
                 }
-            actions.add(resourceHelper.gs(R.string.careportal_newnstreatment_glucosetype) + ": " + translator.translate(meterType.text))
+            actions.add(resourceHelper.gs(R.string.careportal_newnstreatment_glucosetype) + ": " + translator.translate(meterType))
             actions.add(resourceHelper.gs(R.string.treatments_wizard_bg_label) + ": " + Profile.toCurrentUnitsString(profileFunction, binding.bg.value) + " " + resourceHelper.gs(unitResId))
             therapyEvent.glucoseType = meterType
             therapyEvent.glucose = binding.bg.value
-            valuesWithUnit.add(ValueWithUnit(binding.bg.value.toDouble(), profileFunction.getUnits()))
-            valuesWithUnit.add(ValueWithUnit(meterType.text, Units.TherapyEvent))
+            valuesWithUnit.add(ValueWithUnit.fromGlucoseUnit(binding.bg.value.toDouble(), profileFunction.getUnits().asText))
+            valuesWithUnit.add(ValueWithUnit.TherapyEventMeterType(meterType))
         }
         if (options == EventType.NOTE || options == EventType.EXERCISE) {
             actions.add(resourceHelper.gs(R.string.careportal_newnstreatment_duration_label) + ": " + resourceHelper.gs(R.string.format_mins, binding.duration.value.toInt()))
             therapyEvent.duration = T.mins(binding.duration.value.toLong()).msecs()
-            valuesWithUnit.add(ValueWithUnit(binding.duration.value.toInt(), Units.M, !binding.duration.value.equals(0.0)))
+            valuesWithUnit.add(ValueWithUnit.Minute(binding.duration.value.toInt()).takeIf { !binding.duration.value.equals(0.0) } )
         }
         val notes = binding.notesLayout.notes.text.toString()
         if (notes.isNotEmpty()) {
@@ -220,16 +222,26 @@ class CareDialog : DialogFragmentWithDate() {
 
         therapyEvent.enteredBy = enteredBy
 
+        var source = when  (options) {
+            EventType.BGCHECK        -> Sources.BgCheck
+            EventType.SENSOR_INSERT  -> Sources.SensorInsert
+            EventType.BATTERY_CHANGE -> Sources.BatteryChange
+            EventType.NOTE           -> Sources.Note
+            EventType.EXERCISE       -> Sources.Exercise
+            EventType.QUESTION       -> Sources.Question
+            EventType.ANNOUNCEMENT   -> Sources.Announcement
+        }
+
         activity?.let { activity ->
             OKDialog.showConfirmation(activity, resourceHelper.gs(event), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), {
-                disposable += repository.runTransactionForResult(InsertTherapyEventIfNewTransaction(therapyEvent)).subscribe({ result ->
-                    result.inserted.forEach { nsUpload.uploadEvent(it) }
-                }, {
-                    aapsLogger.error(LTag.BGSOURCE, "Error while saving therapy event", it)
-                })
-                valuesWithUnit.add(0, ValueWithUnit(eventTime, Units.Timestamp, eventTimeChanged))
-                valuesWithUnit.add(1, ValueWithUnit(therapyEvent.type.text, Units.TherapyEvent))
-                uel.log(Action.CAREPORTAL, notes, valuesWithUnit)
+                disposable += repository.runTransactionForResult(InsertIfNewByTimestampTherapyEventTransaction(therapyEvent))
+                    .subscribe(
+                        { result -> result.inserted.forEach { aapsLogger.debug(LTag.DATABASE, "Inserted therapy event $it") } },
+                        { aapsLogger.error(LTag.DATABASE, "Error while saving therapy event", it) }
+                    )
+                valuesWithUnit.add(0, ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged })
+                valuesWithUnit.add(1, ValueWithUnit.TherapyEventType(therapyEvent.type))
+                uel.log(Action.CAREPORTAL, source, notes, valuesWithUnit)
             }, null)
         }
         return true

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

@@ -8,9 +8,11 @@ import android.view.ViewGroup
 import com.google.common.base.Joiner
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.ErrorHelperActivity
-import info.nightscout.androidaps.database.entities.UserEntry.*
+import info.nightscout.androidaps.database.entities.ValueWithUnit
+import info.nightscout.androidaps.database.entities.UserEntry.Action
+import info.nightscout.androidaps.database.entities.UserEntry.Sources
 import info.nightscout.androidaps.databinding.DialogExtendedbolusBinding
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.logging.UserEntryLogger
@@ -19,7 +21,7 @@ import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.HtmlHelper
 import info.nightscout.androidaps.utils.SafeParse
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
-import info.nightscout.androidaps.utils.extensions.formatColor
+import info.nightscout.androidaps.extensions.formatColor
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import java.text.DecimalFormat
 import java.util.*
@@ -32,7 +34,7 @@ class ExtendedBolusDialog : DialogFragmentWithDate() {
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var constraintChecker: ConstraintChecker
     @Inject lateinit var commandQueue: CommandQueueProvider
-    @Inject lateinit var activePlugin: ActivePluginProvider
+    @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var uel: UserEntryLogger
 
     private var _binding: DialogExtendedbolusBinding? = null
@@ -88,7 +90,9 @@ class ExtendedBolusDialog : DialogFragmentWithDate() {
 
         activity?.let { activity ->
             OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.extended_bolus), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), {
-                uel.log(Action.EXTENDED_BOLUS, ValueWithUnit(insulinAfterConstraint, Units.U), ValueWithUnit(durationInMinutes, Units.M))
+                uel.log(Action.EXTENDED_BOLUS, Sources.ExtendedBolusDialog,
+                    ValueWithUnit.Insulin(insulinAfterConstraint),
+                    ValueWithUnit.Minute(durationInMinutes))
                 commandQueue.extendedBolus(insulinAfterConstraint, durationInMinutes, object : Callback() {
                     override fun run() {
                         if (!result.success) {

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

@@ -10,24 +10,24 @@ import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.ErrorHelperActivity
 import info.nightscout.androidaps.data.DetailedBolusInfo
 import info.nightscout.androidaps.database.AppRepository
+import info.nightscout.androidaps.database.entities.ValueWithUnit
 import info.nightscout.androidaps.database.entities.TherapyEvent
-import info.nightscout.androidaps.database.transactions.InsertTherapyEventIfNewTransaction
-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.database.transactions.InsertIfNewByTimestampTherapyEventTransaction
 import info.nightscout.androidaps.databinding.DialogFillBinding
-import info.nightscout.androidaps.db.Source
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.DecimalFormatter
 import info.nightscout.androidaps.utils.HtmlHelper
 import info.nightscout.androidaps.utils.SafeParse
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
-import info.nightscout.androidaps.utils.extensions.formatColor
+import info.nightscout.androidaps.extensions.formatColor
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.rxkotlin.plusAssign
@@ -40,9 +40,8 @@ class FillDialog : DialogFragmentWithDate() {
     @Inject lateinit var constraintChecker: ConstraintChecker
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var ctx: Context
-    @Inject lateinit var nsUpload: NSUpload
     @Inject lateinit var commandQueue: CommandQueueProvider
-    @Inject lateinit var activePlugin: ActivePluginProvider
+    @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var uel: UserEntryLogger
     @Inject lateinit var repository: AppRepository
 
@@ -124,7 +123,7 @@ class FillDialog : DialogFragmentWithDate() {
         val insulinChange = binding.fillCartridgeChange.isChecked
         if (insulinChange)
             actions.add(resourceHelper.gs(R.string.record_insulin_cartridge_change).formatColor(resourceHelper, R.color.actionsConfirm))
-        val notes = binding.notesLayout.notes.text.toString()
+        val notes: String = binding.notesLayout.notes.text.toString()
         if (notes.isNotEmpty())
             actions.add(resourceHelper.gs(R.string.notes_label) + ": " + notes)
         eventTime -= eventTime % 1000
@@ -136,35 +135,41 @@ class FillDialog : DialogFragmentWithDate() {
             activity?.let { activity ->
                 OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.primefill), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), {
                     if (insulinAfterConstraints > 0) {
-                        uel.log(Action.PRIME_BOLUS, notes, ValueWithUnit(insulinAfterConstraints, Units.U, insulinAfterConstraints != 0.0))
+                        uel.log(Action.PRIME_BOLUS, Sources.FillDialog,
+                            notes,
+                            ValueWithUnit.Insulin(insulinAfterConstraints).takeIf { insulinAfterConstraints != 0.0 })
                         requestPrimeBolus(insulinAfterConstraints, notes)
                     }
                     if (siteChange) {
-                        uel.log(Action.CAREPORTAL, notes, ValueWithUnit(TherapyEvent.Type.CANNULA_CHANGE.text, Units.TherapyEvent))
-                        disposable += repository.runTransactionForResult(InsertTherapyEventIfNewTransaction(
+                        uel.log(Action.SITE_CHANGE, Sources.FillDialog,
+                            notes,
+                            ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged },
+                            ValueWithUnit.TherapyEventType(TherapyEvent.Type.CANNULA_CHANGE))
+                        disposable += repository.runTransactionForResult(InsertIfNewByTimestampTherapyEventTransaction(
                             timestamp = eventTime,
                             type = TherapyEvent.Type.CANNULA_CHANGE,
                             note = notes,
                             glucoseUnit = TherapyEvent.GlucoseUnit.MGDL
-                        )).subscribe({ result ->
-                            result.inserted.forEach { nsUpload.uploadEvent(it) }
-                        }, {
-                            aapsLogger.error(LTag.BGSOURCE, "Error while saving therapy event", it)
-                        })
+                        )).subscribe(
+                            { result -> result.inserted.forEach { aapsLogger.debug(LTag.DATABASE, "Inserted therapy event $it") } },
+                            { aapsLogger.error(LTag.DATABASE, "Error while saving therapy event", it) }
+                        )
                     }
                     if (insulinChange) {
                         // add a second for case of both checked
-                        uel.log(Action.CAREPORTAL, notes, ValueWithUnit(TherapyEvent.Type.INSULIN_CHANGE.text, Units.TherapyEvent))
-                        disposable += repository.runTransactionForResult(InsertTherapyEventIfNewTransaction(
+                        uel.log(Action.RESERVOIR_CHANGE, Sources.FillDialog,
+                            notes,
+                            ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged },
+                            ValueWithUnit.TherapyEventType(TherapyEvent.Type.INSULIN_CHANGE))
+                        disposable += repository.runTransactionForResult(InsertIfNewByTimestampTherapyEventTransaction(
                             timestamp = eventTime + 1000,
                             type = TherapyEvent.Type.INSULIN_CHANGE,
                             note = notes,
                             glucoseUnit = TherapyEvent.GlucoseUnit.MGDL
-                        )).subscribe({ result ->
-                            result.inserted.forEach { nsUpload.uploadEvent(it) }
-                        }, {
-                            aapsLogger.error(LTag.BGSOURCE, "Error while saving therapy event", it)
-                        })
+                        )).subscribe(
+                            { result -> result.inserted.forEach { aapsLogger.debug(LTag.DATABASE, "Inserted therapy event $it") } },
+                            { aapsLogger.error(LTag.DATABASE, "Error while saving therapy event", it) }
+                        )
                     }
                 }, null)
             }
@@ -181,8 +186,7 @@ class FillDialog : DialogFragmentWithDate() {
         val detailedBolusInfo = DetailedBolusInfo()
         detailedBolusInfo.insulin = insulin
         detailedBolusInfo.context = context
-        detailedBolusInfo.source = Source.USER
-        detailedBolusInfo.isValid = false // do not count it in IOB (for pump history)
+        detailedBolusInfo.bolusType = DetailedBolusInfo.BolusType.PRIMING
         detailedBolusInfo.notes = notes
         commandQueue.bolus(detailedBolusInfo, object : Callback() {
             override fun run() {

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

@@ -8,33 +8,26 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.google.common.base.Joiner
-import info.nightscout.androidaps.Config
-import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.ErrorHelperActivity
 import info.nightscout.androidaps.data.DetailedBolusInfo
-import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.database.AppRepository
+import info.nightscout.androidaps.database.entities.ValueWithUnit
 import info.nightscout.androidaps.database.entities.TemporaryTarget
-import info.nightscout.androidaps.database.entities.TherapyEvent
-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.database.transactions.InsertTemporaryTargetAndCancelCurrentTransaction
 import info.nightscout.androidaps.databinding.DialogInsulinBinding
-import info.nightscout.androidaps.db.Source
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
-import info.nightscout.androidaps.interfaces.Constraint
-import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.*
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
-import info.nightscout.androidaps.utils.extensions.formatColor
+import info.nightscout.androidaps.extensions.formatColor
 import info.nightscout.androidaps.utils.extensions.toSignedString
-import info.nightscout.androidaps.utils.extensions.toVisibility
+import info.nightscout.androidaps.extensions.toVisibility
+import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.rxkotlin.plusAssign
@@ -52,12 +45,11 @@ class InsulinDialog : DialogFragmentWithDate() {
     @Inject lateinit var defaultValueHelper: DefaultValueHelper
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var commandQueue: CommandQueueProvider
-    @Inject lateinit var activePlugin: ActivePluginProvider
+    @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var ctx: Context
     @Inject lateinit var repository: AppRepository
     @Inject lateinit var config: Config
     @Inject lateinit var uel: UserEntryLogger
-    @Inject lateinit var nsUpload: NSUpload
 
     companion object {
 
@@ -160,7 +152,7 @@ class InsulinDialog : DialogFragmentWithDate() {
         val insulinAfterConstraints = constraintChecker.applyBolusConstraints(Constraint(insulin)).value()
         val actions: LinkedList<String?> = LinkedList()
         val units = profileFunction.getUnits()
-        val unitLabel = if (units == Constants.MMOL) resourceHelper.gs(R.string.mmol) else resourceHelper.gs(R.string.mgdl)
+        val unitLabel = if (units == GlucoseUnit.MMOL) resourceHelper.gs(R.string.mmol) else resourceHelper.gs(R.string.mgdl)
         val recordOnlyChecked = binding.recordOnly.isChecked
         val eatingSoonChecked = binding.startEatingSoonTt.isChecked
 
@@ -177,7 +169,7 @@ class InsulinDialog : DialogFragmentWithDate() {
             actions.add(resourceHelper.gs(R.string.temptargetshort) + ": " + (DecimalFormatter.to1Decimal(eatingSoonTT) + " " + unitLabel + " (" + resourceHelper.gs(R.string.format_mins, eatingSoonTTDuration) + ")").formatColor(resourceHelper, R.color.tempTargetConfirmation))
 
         val timeOffset = binding.time.value.toInt()
-        val time = DateUtil.now() + T.mins(timeOffset.toLong()).msecs()
+        val time = dateUtil.now() + T.mins(timeOffset.toLong()).msecs()
         if (timeOffset != 0)
             actions.add(resourceHelper.gs(R.string.time) + ": " + dateUtil.dateAndTimeString(time))
 
@@ -189,7 +181,11 @@ class InsulinDialog : DialogFragmentWithDate() {
             activity?.let { activity ->
                 OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.bolus), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), {
                     if (eatingSoonChecked) {
-                        uel.log(Action.TT, notes, ValueWithUnit(TemporaryTarget.Reason.EATING_SOON.text, Units.TherapyEvent), ValueWithUnit(eatingSoonTT, units), ValueWithUnit(eatingSoonTTDuration, Units.M))
+                        uel.log(Action.TT, Sources.InsulinDialog,
+                            notes,
+                            ValueWithUnit.TherapyEventTTReason(TemporaryTarget.Reason.EATING_SOON),
+                            ValueWithUnit.fromGlucoseUnit(eatingSoonTT, units.asText),
+                            ValueWithUnit.Minute(eatingSoonTTDuration))
                         disposable += repository.runTransactionForResult(InsertTemporaryTargetAndCancelCurrentTransaction(
                             timestamp = System.currentTimeMillis(),
                             duration = TimeUnit.MINUTES.toMillis(eatingSoonTTDuration.toLong()),
@@ -197,26 +193,34 @@ class InsulinDialog : DialogFragmentWithDate() {
                             lowTarget = Profile.toMgdl(eatingSoonTT, profileFunction.getUnits()),
                             highTarget = Profile.toMgdl(eatingSoonTT, profileFunction.getUnits())
                         )).subscribe({ result ->
-                            result.inserted.forEach { nsUpload.uploadTempTarget(it) }
-                            result.updated.forEach { nsUpload.updateTempTarget(it) }
+                            result.inserted.forEach { aapsLogger.debug(LTag.DATABASE, "Inserted temp target $it") }
+                            result.updated.forEach { aapsLogger.debug(LTag.DATABASE, "Updated temp target $it") }
                         }, {
-                            aapsLogger.error(LTag.BGSOURCE, "Error while saving temporary target", it)
+                            aapsLogger.error(LTag.DATABASE, "Error while saving temporary target", it)
                         })
                     }
                     if (insulinAfterConstraints > 0) {
                         val detailedBolusInfo = DetailedBolusInfo()
-                        detailedBolusInfo.eventType = TherapyEvent.Type.CORRECTION_BOLUS.text
+                        detailedBolusInfo.eventType = DetailedBolusInfo.EventType.CORRECTION_BOLUS
                         detailedBolusInfo.insulin = insulinAfterConstraints
                         detailedBolusInfo.context = context
-                        detailedBolusInfo.source = Source.USER
                         detailedBolusInfo.notes = notes
+                        detailedBolusInfo.timestamp = time
                         if (recordOnlyChecked) {
-                            uel.log(Action.BOLUS_RECORD, notes, ValueWithUnit(insulinAfterConstraints, Units.U), ValueWithUnit(timeOffset, Units.M, timeOffset!= 0))
-                            detailedBolusInfo.date = time
-                            activePlugin.activeTreatments.addToHistoryTreatment(detailedBolusInfo, false)
+                            uel.log(Action.BOLUS, Sources.InsulinDialog,
+                                resourceHelper.gs(R.string.record) + if (notes.isNotEmpty()) ": " + notes else "",
+                                ValueWithUnit.SimpleString(resourceHelper.gsNotLocalised(R.string.record)),
+                                ValueWithUnit.Insulin(insulinAfterConstraints),
+                                ValueWithUnit.Minute(timeOffset).takeIf { timeOffset!= 0 })
+                            disposable += repository.runTransactionForResult(detailedBolusInfo.insertBolusTransaction())
+                                .subscribe(
+                                    { result -> result.inserted.forEach { aapsLogger.debug(LTag.DATABASE, "Inserted bolus $it") } },
+                                    { aapsLogger.error(LTag.DATABASE, "Error while saving bolus", it) }
+                                )
                         } else {
-                            uel.log(Action.BOLUS, notes, ValueWithUnit(insulinAfterConstraints, Units.U))
-                            detailedBolusInfo.date = DateUtil.now()
+                            uel.log(Action.BOLUS, Sources.InsulinDialog,
+                                notes,
+                                ValueWithUnit.Insulin(insulinAfterConstraints))
                             commandQueue.bolus(detailedBolusInfo, object : Callback() {
                                 override fun run() {
                                     if (!result.success) {

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

@@ -12,7 +12,9 @@ import androidx.fragment.app.FragmentManager
 import dagger.android.support.DaggerDialogFragment
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.ErrorHelperActivity
-import info.nightscout.androidaps.database.entities.UserEntry.*
+import info.nightscout.androidaps.database.entities.ValueWithUnit
+import info.nightscout.androidaps.database.entities.UserEntry.Action
+import info.nightscout.androidaps.database.entities.UserEntry.Sources
 import info.nightscout.androidaps.databinding.DialogLoopBinding
 import info.nightscout.androidaps.events.EventPreferenceChange
 import info.nightscout.androidaps.events.EventRefreshOverview
@@ -21,13 +23,12 @@ import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.ToastUtils
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
-import info.nightscout.androidaps.utils.extensions.toVisibility
+import info.nightscout.androidaps.extensions.toVisibility
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import javax.inject.Inject
@@ -42,10 +43,10 @@ class LoopDialog : DaggerDialogFragment() {
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var loopPlugin: LoopPlugin
-    @Inject lateinit var activePlugin: ActivePluginProvider
+    @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var constraintChecker: ConstraintChecker
     @Inject lateinit var commandQueue: CommandQueueProvider
-    @Inject lateinit var configBuilderPlugin: ConfigBuilderPlugin
+    @Inject lateinit var configBuilder: ConfigBuilder
     @Inject lateinit var uel: UserEntryLogger
 
     private var showOkCancel: Boolean = true
@@ -195,9 +196,10 @@ class LoopDialog : DaggerDialogFragment() {
                 binding.overviewDisconnectButtons.visibility = View.GONE
                 binding.overviewReconnect.visibility = View.VISIBLE
             }
+            binding.overviewLoop.visibility = (!loopPlugin.isSuspended && !loopPlugin.isDisconnected).toVisibility()
         }
         val profile = profileFunction.getProfile()
-        val profileStore = activePlugin.activeProfileInterface.profile
+        val profileStore = activePlugin.activeProfileSource.profile
 
         if (profile == null || profileStore == null) {
             ToastUtils.showToastInUiThread(ctx, resourceHelper.gs(R.string.noprofile))
@@ -239,31 +241,31 @@ class LoopDialog : DaggerDialogFragment() {
         val profile = profileFunction.getProfile() ?: return true
         when (v.id) {
             R.id.overview_closeloop -> {
-                uel.log(Action.CLOSED_LOOP_MODE)
+                uel.log(Action.CLOSED_LOOP_MODE, Sources.LoopDialog)
                 sp.putString(R.string.key_aps_mode, "closed")
                 rxBus.send(EventPreferenceChange(resourceHelper.gs(R.string.closedloop)))
                 return true
             }
 
             R.id.overview_lgsloop -> {
-                uel.log(Action.LGS_LOOP_MODE)
+                uel.log(Action.LGS_LOOP_MODE, Sources.LoopDialog)
                 sp.putString(R.string.key_aps_mode, "lgs")
                 rxBus.send(EventPreferenceChange(resourceHelper.gs(R.string.lowglucosesuspend)))
                 return true
             }
 
             R.id.overview_openloop -> {
-                uel.log(Action.OPEN_LOOP_MODE)
+                uel.log(Action.OPEN_LOOP_MODE, Sources.LoopDialog)
                 sp.putString(R.string.key_aps_mode, "open")
                 rxBus.send(EventPreferenceChange(resourceHelper.gs(R.string.lowglucosesuspend)))
                 return true
             }
 
             R.id.overview_disable -> {
-                uel.log(Action.LOOP_DISABLED)
+                uel.log(Action.LOOP_DISABLED, Sources.LoopDialog)
                 loopPlugin.setPluginEnabled(PluginType.LOOP, false)
                 loopPlugin.setFragmentVisible(PluginType.LOOP, false)
-                configBuilderPlugin.storeSettings("DisablingLoop")
+                configBuilder.storeSettings("DisablingLoop")
                 rxBus.send(EventRefreshOverview("suspendmenu"))
                 commandQueue.cancelTempBasal(true, object : Callback() {
                     override fun run() {
@@ -277,17 +279,17 @@ class LoopDialog : DaggerDialogFragment() {
             }
 
             R.id.overview_enable -> {
-                uel.log(Action.LOOP_ENABLED)
+                uel.log(Action.LOOP_ENABLED, Sources.LoopDialog)
                 loopPlugin.setPluginEnabled(PluginType.LOOP, true)
                 loopPlugin.setFragmentVisible(PluginType.LOOP, true)
-                configBuilderPlugin.storeSettings("EnablingLoop")
+                configBuilder.storeSettings("EnablingLoop")
                 rxBus.send(EventRefreshOverview("suspendmenu"))
                 loopPlugin.createOfflineEvent(0)
                 return true
             }
 
             R.id.overview_resume, R.id.overview_reconnect -> {
-                uel.log(if (v.id==R.id.overview_resume) Action.RESUME else Action.RECONNECT )
+                uel.log(if (v.id==R.id.overview_resume) Action.RESUME else Action.RECONNECT, Sources.LoopDialog)
                 loopPlugin.suspendTo(0L)
                 rxBus.send(EventRefreshOverview("suspendmenu"))
                 commandQueue.cancelTempBasal(true, object : Callback() {
@@ -303,49 +305,49 @@ class LoopDialog : DaggerDialogFragment() {
             }
 
             R.id.overview_suspend_1h -> {
-                uel.log(Action.SUSPEND, ValueWithUnit(1, Units.H))
+                uel.log(Action.SUSPEND, Sources.LoopDialog, ValueWithUnit.Hour(1))
                 loopPlugin.suspendLoop(60)
                 rxBus.send(EventRefreshOverview("suspendmenu"))
                 return true
             }
 
             R.id.overview_suspend_2h -> {
-                uel.log(Action.SUSPEND, ValueWithUnit(2, Units.H))
+                uel.log(Action.SUSPEND, Sources.LoopDialog, ValueWithUnit.Hour(2))
                 loopPlugin.suspendLoop(120)
                 rxBus.send(EventRefreshOverview("suspendmenu"))
                 return true
             }
 
             R.id.overview_suspend_3h -> {
-                uel.log(Action.SUSPEND, ValueWithUnit(3, Units.H))
+                uel.log(Action.SUSPEND, Sources.LoopDialog, ValueWithUnit.Hour(3))
                 loopPlugin.suspendLoop(180)
                 rxBus.send(EventRefreshOverview("suspendmenu"))
                 return true
             }
 
             R.id.overview_suspend_10h -> {
-                uel.log(Action.SUSPEND, ValueWithUnit(10, Units.H))
+                uel.log(Action.SUSPEND, Sources.LoopDialog, ValueWithUnit.Hour(10))
                 loopPlugin.suspendLoop(600)
                 rxBus.send(EventRefreshOverview("suspendmenu"))
                 return true
             }
 
             R.id.overview_disconnect_15m -> {
-                uel.log(Action.DISCONNECT, ValueWithUnit(15, Units.M))
+                uel.log(Action.DISCONNECT, Sources.LoopDialog, ValueWithUnit.Minute(15))
                 loopPlugin.disconnectPump(15, profile)
                 rxBus.send(EventRefreshOverview("suspendmenu"))
                 return true
             }
 
             R.id.overview_disconnect_30m -> {
-                uel.log(Action.DISCONNECT, ValueWithUnit(30, Units.M))
+                uel.log(Action.DISCONNECT, Sources.LoopDialog, ValueWithUnit.Minute(30))
                 loopPlugin.disconnectPump(30, profile)
                 rxBus.send(EventRefreshOverview("suspendmenu"))
                 return true
             }
 
             R.id.overview_disconnect_1h -> {
-                uel.log(Action.DISCONNECT, ValueWithUnit(1, Units.H))
+                uel.log(Action.DISCONNECT, Sources.LoopDialog, ValueWithUnit.Hour(1))
                 loopPlugin.disconnectPump(60, profile)
                 sp.putBoolean(R.string.key_objectiveusedisconnect, true)
                 rxBus.send(EventRefreshOverview("suspendmenu"))
@@ -353,14 +355,14 @@ class LoopDialog : DaggerDialogFragment() {
             }
 
             R.id.overview_disconnect_2h -> {
-                uel.log(Action.DISCONNECT, ValueWithUnit(2, Units.H))
+                uel.log(Action.DISCONNECT, Sources.LoopDialog, ValueWithUnit.Hour(2))
                 loopPlugin.disconnectPump(120, profile)
                 rxBus.send(EventRefreshOverview("suspendmenu"))
                 return true
             }
 
             R.id.overview_disconnect_3h -> {
-                uel.log(Action.DISCONNECT, ValueWithUnit(3, Units.H))
+                uel.log(Action.DISCONNECT, Sources.LoopDialog, ValueWithUnit.Hour(3))
                 loopPlugin.disconnectPump(180, profile)
                 rxBus.send(EventRefreshOverview("suspendmenu"))
                 return true

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

@@ -8,16 +8,18 @@ import android.widget.ArrayAdapter
 import com.google.common.base.Joiner
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.database.entities.UserEntry.*
+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.DialogProfileswitchBinding
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
-import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.HtmlHelper
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.resources.ResourceHelper
+import io.reactivex.disposables.CompositeDisposable
 import java.text.DecimalFormat
 import java.util.*
 import javax.inject.Inject
@@ -26,12 +28,14 @@ class ProfileSwitchDialog : DialogFragmentWithDate() {
 
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var profileFunction: ProfileFunction
-    @Inject lateinit var treatmentsPlugin: TreatmentsPlugin
-    @Inject lateinit var activePlugin: ActivePluginProvider
+    @Inject lateinit var activePlugin: ActivePlugin
+    @Inject lateinit var repository: AppRepository
     @Inject lateinit var uel: UserEntryLogger
 
     private var profileIndex: Int? = null
 
+    private val disposable = CompositeDisposable()
+
     private var _binding: DialogProfileswitchBinding? = null
 
     // This property is only valid between onCreateView and
@@ -67,7 +71,7 @@ class ProfileSwitchDialog : DialogFragmentWithDate() {
 
         // profile
         context?.let { context ->
-            val profileStore = activePlugin.activeProfileInterface.profile
+            val profileStore = activePlugin.activeProfileSource.profile
                 ?: return
             val profileList = profileStore.getProfileList()
             val adapter = ArrayAdapter(context, R.layout.spinner_centered, profileList)
@@ -77,17 +81,17 @@ class ProfileSwitchDialog : DialogFragmentWithDate() {
                 binding.profile.setSelection(profileIndex as Int)
             else
                 for (p in profileList.indices)
-                    if (profileList[p] == profileFunction.getProfileName(false))
+                    if (profileList[p] == profileFunction.getOriginalProfileName())
                         binding.profile.setSelection(p)
         } ?: return
 
-        treatmentsPlugin.getProfileSwitchFromHistory(DateUtil.now())?.let { ps ->
-            if (ps.isCPP) {
+        profileFunction.getProfile()?.let { profile ->
+            if (profile.percentage != 100 || profile.timeshift != 0) {
                 binding.reuselayout.visibility = View.VISIBLE
-                binding.reusebutton.text = resourceHelper.gs(R.string.reuse_profile_pct_hours, ps.percentage, ps.timeshift)
+                binding.reusebutton.text = resourceHelper.gs(R.string.reuse_profile_pct_hours, profile.percentage, profile.timeshift)
                 binding.reusebutton.setOnClickListener {
-                    binding.percentage.value = ps.percentage.toDouble()
-                    binding.timeshift.value = ps.timeshift.toDouble()
+                    binding.percentage.value = profile.percentage.toDouble()
+                    binding.timeshift.value = profile.timeshift.toDouble()
                 }
             } else {
                 binding.reuselayout.visibility = View.GONE
@@ -97,20 +101,21 @@ class ProfileSwitchDialog : DialogFragmentWithDate() {
 
     override fun onDestroyView() {
         super.onDestroyView()
+        disposable.clear()
         _binding = null
     }
 
     override fun submit(): Boolean {
         if (_binding == null) return false
-        val profileStore = activePlugin.activeProfileInterface.profile
+        val profileStore = activePlugin.activeProfileSource.profile
             ?: return false
 
         val actions: LinkedList<String> = LinkedList()
         val duration = binding.duration.value?.toInt() ?: return false
-        if (duration > 0)
+        if (duration > 0L)
             actions.add(resourceHelper.gs(R.string.duration) + ": " + resourceHelper.gs(R.string.format_mins, duration))
-        val profile = binding.profile.selectedItem.toString()
-        actions.add(resourceHelper.gs(R.string.profile) + ": " + profile)
+        val profileName = binding.profile.selectedItem.toString()
+        actions.add(resourceHelper.gs(R.string.profile) + ": " + profileName)
         val percent = binding.percentage.value.toInt()
         if (percent != 100)
             actions.add(resourceHelper.gs(R.string.percent) + ": " + percent + "%")
@@ -125,8 +130,20 @@ class ProfileSwitchDialog : DialogFragmentWithDate() {
 
         activity?.let { activity ->
             OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.careportal_profileswitch), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), {
-                uel.log(Action.PROFILE_SWITCH, notes, ValueWithUnit(eventTime, Units.Timestamp, eventTimeChanged), ValueWithUnit(profile, Units.None), ValueWithUnit(percent, Units.Percent), ValueWithUnit(timeShift, Units.H, timeShift != 0), ValueWithUnit(duration, Units.M, duration != 0))
-                treatmentsPlugin.doProfileSwitch(profileStore, profile, duration, percent, timeShift, eventTime)
+                profileFunction.createProfileSwitch(profileStore,
+                    profileName = profileName,
+                    durationInMinutes = duration,
+                    percentage = percent,
+                    timeShiftInHours = timeShift,
+                    timestamp = eventTime)
+                uel.log(Action.PROFILE_SWITCH,
+                    Sources.ProfileSwitchDialog,
+                    notes,
+                    ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged },
+                    ValueWithUnit.SimpleString(profileName),
+                    ValueWithUnit.Percent(percent),
+                    ValueWithUnit.Hour(timeShift).takeIf { timeShift != 0 },
+                    ValueWithUnit.Minute(duration).takeIf { duration != 0 })
             })
         }
         return true

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

@@ -8,20 +8,18 @@ import android.view.ViewGroup
 import com.google.common.base.Joiner
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.ErrorHelperActivity
-import info.nightscout.androidaps.database.entities.UserEntry.*
+import info.nightscout.androidaps.database.entities.ValueWithUnit
+import info.nightscout.androidaps.database.entities.UserEntry.Action
+import info.nightscout.androidaps.database.entities.UserEntry.Sources
 import info.nightscout.androidaps.databinding.DialogTempbasalBinding
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
-import info.nightscout.androidaps.interfaces.Constraint
-import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.interfaces.PumpDescription
+import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.HtmlHelper
 import info.nightscout.androidaps.utils.SafeParse
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
-import info.nightscout.androidaps.utils.extensions.formatColor
+import info.nightscout.androidaps.extensions.formatColor
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import java.text.DecimalFormat
 import java.util.*
@@ -33,7 +31,7 @@ class TempBasalDialog : DialogFragmentWithDate() {
     @Inject lateinit var constraintChecker: ConstraintChecker
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var profileFunction: ProfileFunction
-    @Inject lateinit var activePlugin: ActivePluginProvider
+    @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var commandQueue: CommandQueueProvider
     @Inject lateinit var ctx: Context
     @Inject lateinit var uel: UserEntryLogger
@@ -73,7 +71,7 @@ class TempBasalDialog : DialogFragmentWithDate() {
             ?: 100.0, 0.0, maxTempPercent, tempPercentStep, DecimalFormat("0"), true, binding.okcancel.ok)
 
         binding.basalabsoluteinput.setParams(savedInstanceState?.getDouble("basalabsoluteinput")
-            ?: profile.basal, 0.0, pumpDescription.maxTempAbsolute, pumpDescription.tempAbsoluteStep, DecimalFormat("0.00"), true, binding.okcancel.ok)
+            ?: profile.getBasal(), 0.0, pumpDescription.maxTempAbsolute, pumpDescription.tempAbsoluteStep, DecimalFormat("0.00"), true, binding.okcancel.ok)
 
         val tempDurationStep = pumpDescription.tempDurationStep.toDouble()
         val tempMaxDuration = pumpDescription.tempMaxDuration.toDouble()
@@ -126,11 +124,15 @@ class TempBasalDialog : DialogFragmentWithDate() {
                     }
                 }
                 if (isPercentPump) {
-                    uel.log(Action.TEMP_BASAL, ValueWithUnit(percent, Units.Percent), ValueWithUnit(durationInMinutes, Units.M))
-                    commandQueue.tempBasalPercent(percent, durationInMinutes, true, profile, callback)
+                    uel.log(Action.TEMP_BASAL, Sources.TempBasalDialog,
+                        ValueWithUnit.Percent(percent),
+                        ValueWithUnit.Minute(durationInMinutes))
+                    commandQueue.tempBasalPercent(percent, durationInMinutes, true, profile, PumpSync.TemporaryBasalType.NORMAL, callback)
                 } else {
-                    uel.log(Action.TEMP_BASAL, ValueWithUnit(absolute, Units.U), ValueWithUnit(durationInMinutes, Units.M))
-                    commandQueue.tempBasalAbsolute(absolute, durationInMinutes, true, profile, callback)
+                    uel.log(Action.TEMP_BASAL, Sources.TempBasalDialog,
+                        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

@@ -9,19 +9,21 @@ import com.google.common.base.Joiner
 import com.google.common.collect.Lists
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.database.ValueWrapper
+import info.nightscout.androidaps.database.entities.ValueWithUnit
 import info.nightscout.androidaps.database.entities.TemporaryTarget
-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.database.transactions.CancelCurrentTemporaryTargetIfAnyTransaction
 import info.nightscout.androidaps.database.transactions.InsertTemporaryTargetAndCancelCurrentTransaction
 import info.nightscout.androidaps.databinding.DialogTemptargetBinding
+import info.nightscout.androidaps.interfaces.GlucoseUnit
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.utils.DefaultValueHelper
 import info.nightscout.androidaps.utils.HtmlHelper
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
@@ -41,7 +43,6 @@ class TempTargetDialog : DialogFragmentWithDate() {
     @Inject lateinit var defaultValueHelper: DefaultValueHelper
     @Inject lateinit var uel: UserEntryLogger
     @Inject lateinit var repository: AppRepository
-    @Inject lateinit var nsUpload: NSUpload
 
     private lateinit var reasonList: List<String>
 
@@ -72,7 +73,7 @@ class TempTargetDialog : DialogFragmentWithDate() {
         binding.duration.setParams(savedInstanceState?.getDouble("duration")
             ?: 0.0, 0.0, Constants.MAX_PROFILE_SWITCH_DURATION, 10.0, DecimalFormat("0"), false, binding.okcancel.ok)
 
-        if (profileFunction.getUnits() == Constants.MMOL)
+        if (profileFunction.getUnits() == GlucoseUnit.MMOL)
             binding.temptarget.setParams(
                 savedInstanceState?.getDouble("tempTarget")
                     ?: 8.0,
@@ -84,11 +85,11 @@ class TempTargetDialog : DialogFragmentWithDate() {
                 Constants.MIN_TT_MGDL, Constants.MAX_TT_MGDL, 1.0, DecimalFormat("0"), false, binding.okcancel.ok)
 
         val units = profileFunction.getUnits()
-        binding.units.text = if (units == Constants.MMOL) resourceHelper.gs(R.string.mmol) else resourceHelper.gs(R.string.mgdl)
+        binding.units.text = if (units == GlucoseUnit.MMOL) resourceHelper.gs(R.string.mmol) else resourceHelper.gs(R.string.mgdl)
 
         // temp target
         context?.let { context ->
-            if (repository.getTemporaryTargetActiveAt(dateUtil._now()).blockingGet() is ValueWrapper.Existing)
+            if (repository.getTemporaryTargetActiveAt(dateUtil.now()).blockingGet() is ValueWrapper.Existing)
                 binding.targetCancel.visibility = View.VISIBLE
             else
                 binding.targetCancel.visibility = View.GONE
@@ -135,19 +136,19 @@ class TempTargetDialog : DialogFragmentWithDate() {
                 binding.reason.setSelection(reasonList.indexOf(resourceHelper.gs(R.string.eatingsoon)))
             }
 
-            R.id.activity -> {
+            R.id.activity    -> {
                 binding.temptarget.value = defaultValueHelper.determineActivityTT()
                 binding.duration.value = defaultValueHelper.determineActivityTTDuration().toDouble()
                 binding.reason.setSelection(reasonList.indexOf(resourceHelper.gs(R.string.activity)))
             }
 
-            R.id.hypo -> {
+            R.id.hypo        -> {
                 binding.temptarget.value = defaultValueHelper.determineHypoTT()
                 binding.duration.value = defaultValueHelper.determineHypoTTDuration().toDouble()
                 binding.reason.setSelection(reasonList.indexOf(resourceHelper.gs(R.string.hypo)))
             }
 
-            R.id.cancel -> {
+            R.id.cancel      -> {
                 binding.duration.value = 0.0
             }
         }
@@ -163,7 +164,7 @@ class TempTargetDialog : DialogFragmentWithDate() {
         if (_binding == null) return false
         val actions: LinkedList<String> = LinkedList()
         var reason = binding.reason.selectedItem?.toString() ?: return false
-        val unitResId = if (profileFunction.getUnits() == Constants.MGDL) R.string.mgdl else R.string.mmol
+        val unitResId = if (profileFunction.getUnits() == GlucoseUnit.MGDL) R.string.mgdl else R.string.mmol
         val target = binding.temptarget.value
         val duration = binding.duration.value.toInt()
         if (target != 0.0 && duration != 0) {
@@ -181,18 +182,18 @@ class TempTargetDialog : DialogFragmentWithDate() {
             OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.careportal_temporarytarget), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), {
                 val units = profileFunction.getUnits()
                 when(reason) {
-                    resourceHelper.gs(R.string.eatingsoon) -> uel.log(Action.TT, ValueWithUnit(eventTime, Units.Timestamp, eventTimeChanged), ValueWithUnit(TemporaryTarget.Reason.EATING_SOON.text, Units.TherapyEvent), ValueWithUnit(target, units), ValueWithUnit(duration, Units.M))
-                    resourceHelper.gs(R.string.activity) -> uel.log(Action.TT, ValueWithUnit(eventTime, Units.Timestamp, eventTimeChanged), ValueWithUnit(TemporaryTarget.Reason.ACTIVITY.text, Units.TherapyEvent), ValueWithUnit(target, units), ValueWithUnit(duration, Units.M))
-                    resourceHelper.gs(R.string.hypo) -> uel.log(Action.TT, ValueWithUnit(eventTime, Units.Timestamp, eventTimeChanged), ValueWithUnit(TemporaryTarget.Reason.HYPOGLYCEMIA.text, Units.TherapyEvent), ValueWithUnit(target, units), ValueWithUnit(duration, Units.M))
-                    resourceHelper.gs(R.string.manual) -> uel.log(Action.TT, ValueWithUnit(eventTime, Units.Timestamp, eventTimeChanged), ValueWithUnit(TemporaryTarget.Reason.CUSTOM.text, Units.TherapyEvent), ValueWithUnit(target, units), ValueWithUnit(duration, Units.M))
-                    resourceHelper.gs(R.string.stoptemptarget) -> uel.log(Action.CANCEL_TT, ValueWithUnit(eventTime, Units.Timestamp, eventTimeChanged))
+                    resourceHelper.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))
+                    resourceHelper.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))
+                    resourceHelper.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))
+                    resourceHelper.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))
+                    resourceHelper.gs(R.string.stoptemptarget) -> uel.log(Action.CANCEL_TT, Sources.TTDialog, ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged })
                 }
                 if (target == 0.0 || duration == 0) {
                     disposable += repository.runTransactionForResult(CancelCurrentTemporaryTargetIfAnyTransaction(eventTime))
                         .subscribe({ result ->
-                            result.updated.forEach { nsUpload.updateTempTarget(it) }
+                            result.updated.forEach { aapsLogger.debug(LTag.DATABASE, "Updated temp target $it") }
                         }, {
-                            aapsLogger.error(LTag.BGSOURCE, "Error while saving temporary target", it)
+                            aapsLogger.error(LTag.DATABASE, "Error while saving temporary target", it)
                         })
                 } else {
                     disposable += repository.runTransactionForResult(InsertTemporaryTargetAndCancelCurrentTransaction(
@@ -200,17 +201,17 @@ class TempTargetDialog : DialogFragmentWithDate() {
                         duration = TimeUnit.MINUTES.toMillis(duration.toLong()),
                         reason = when (reason) {
                             resourceHelper.gs(R.string.eatingsoon) -> TemporaryTarget.Reason.EATING_SOON
-                            resourceHelper.gs(R.string.activity)    -> TemporaryTarget.Reason.ACTIVITY
-                            resourceHelper.gs(R.string.hypo)        -> TemporaryTarget.Reason.HYPOGLYCEMIA
-                            else                             -> TemporaryTarget.Reason.CUSTOM
+                            resourceHelper.gs(R.string.activity)   -> TemporaryTarget.Reason.ACTIVITY
+                            resourceHelper.gs(R.string.hypo)       -> TemporaryTarget.Reason.HYPOGLYCEMIA
+                            else                            -> TemporaryTarget.Reason.CUSTOM
                         },
                         lowTarget = Profile.toMgdl(target, profileFunction.getUnits()),
                         highTarget = Profile.toMgdl(target, profileFunction.getUnits())
                     )).subscribe({ result ->
-                        result.inserted.forEach { nsUpload.uploadTempTarget(it) }
-                        result.updated.forEach { nsUpload.updateTempTarget(it) }
+                        result.inserted.forEach { aapsLogger.debug(LTag.DATABASE, "Inserted temp target $it") }
+                        result.updated.forEach { aapsLogger.debug(LTag.DATABASE, "Updated temp target $it") }
                     }, {
-                        aapsLogger.error(LTag.BGSOURCE, "Error while saving temporary target", it)
+                        aapsLogger.error(LTag.DATABASE, "Error while saving temporary target", it)
                     })
                 }
 

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

@@ -8,17 +8,19 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.google.common.base.Joiner
-import info.nightscout.androidaps.Config
+import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.ErrorHelperActivity
 import info.nightscout.androidaps.data.DetailedBolusInfo
-import info.nightscout.androidaps.database.entities.TherapyEvent
-import info.nightscout.androidaps.database.entities.UserEntry.*
+import info.nightscout.androidaps.database.AppRepository
+import info.nightscout.androidaps.database.entities.ValueWithUnit
+import info.nightscout.androidaps.database.entities.UserEntry.Action
+import info.nightscout.androidaps.database.entities.UserEntry.Sources
 import info.nightscout.androidaps.databinding.DialogTreatmentBinding
-import info.nightscout.androidaps.db.Source
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.Constraint
+import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.queue.Callback
@@ -27,8 +29,10 @@ import info.nightscout.androidaps.utils.HtmlHelper
 import info.nightscout.androidaps.utils.SafeParse
 import info.nightscout.androidaps.utils.ToastUtils
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
-import info.nightscout.androidaps.utils.extensions.formatColor
+import info.nightscout.androidaps.extensions.formatColor
 import info.nightscout.androidaps.utils.resources.ResourceHelper
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxkotlin.plusAssign
 import java.text.DecimalFormat
 import java.util.*
 import javax.inject.Inject
@@ -38,11 +42,14 @@ class TreatmentDialog : DialogFragmentWithDate() {
 
     @Inject lateinit var constraintChecker: ConstraintChecker
     @Inject lateinit var resourceHelper: ResourceHelper
-    @Inject lateinit var activePlugin: ActivePluginProvider
+    @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var commandQueue: CommandQueueProvider
     @Inject lateinit var ctx: Context
     @Inject lateinit var config: Config
     @Inject lateinit var uel: UserEntryLogger
+    @Inject lateinit var repository: AppRepository
+
+    private val disposable = CompositeDisposable()
 
     private val textWatcher: TextWatcher = object : TextWatcher {
         override fun afterTextChanged(s: Editable) {}
@@ -130,24 +137,51 @@ class TreatmentDialog : DialogFragmentWithDate() {
         if (insulinAfterConstraints > 0 || carbsAfterConstraints > 0) {
             activity?.let { activity ->
                 OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.overview_treatment_label), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), {
-                    uel.log(Action.TREATMENT, ValueWithUnit(insulin, Units.U, insulin != 0.0), ValueWithUnit(carbs, Units.G, carbs != 0))
+                    val action = when {
+                        insulinAfterConstraints.equals(0.0) -> Action.CARBS
+                        carbsAfterConstraints.equals(0)     -> Action.BOLUS
+                        else                                -> Action.TREATMENT
+                    }
                     val detailedBolusInfo = DetailedBolusInfo()
-                    if (insulinAfterConstraints == 0.0) detailedBolusInfo.eventType = TherapyEvent.Type.CARBS_CORRECTION.text
-                    if (carbsAfterConstraints == 0) detailedBolusInfo.eventType = TherapyEvent.Type.CORRECTION_BOLUS.text
+                    if (insulinAfterConstraints == 0.0) detailedBolusInfo.eventType = DetailedBolusInfo.EventType.CARBS_CORRECTION
+                    if (carbsAfterConstraints == 0) detailedBolusInfo.eventType = DetailedBolusInfo.EventType.CORRECTION_BOLUS
                     detailedBolusInfo.insulin = insulinAfterConstraints
                     detailedBolusInfo.carbs = carbsAfterConstraints.toDouble()
                     detailedBolusInfo.context = context
-                    detailedBolusInfo.source = Source.USER
-                    if (!(recordOnlyChecked && (detailedBolusInfo.insulin > 0 || pumpDescription.storesCarbInfo))) {
-                        commandQueue.bolus(detailedBolusInfo, object : Callback() {
-                            override fun run() {
-                                if (!result.success) {
-                                    ErrorHelperActivity.runAlarm(ctx, result.comment, resourceHelper.gs(R.string.treatmentdeliveryerror), info.nightscout.androidaps.dana.R.raw.boluserror)
+                    if (recordOnlyChecked) {
+                        uel.log(action, Sources.TreatmentDialog, if (insulinAfterConstraints != 0.0) resourceHelper.gs(R.string.record) else "",
+                            ValueWithUnit.Timestamp(detailedBolusInfo.timestamp).takeIf { eventTimeChanged },
+                            ValueWithUnit.SimpleString(resourceHelper.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(
+                                    { result -> result.inserted.forEach { aapsLogger.debug(LTag.DATABASE, "Inserted bolus $it") } },
+                                    { aapsLogger.error(LTag.DATABASE, "Error while saving bolus", it) }
+                                )
+                        if (detailedBolusInfo.carbs > 0)
+                            disposable += repository.runTransactionForResult(detailedBolusInfo.insertCarbsTransaction())
+                                .subscribe(
+                                    { result -> result.inserted.forEach { aapsLogger.debug(LTag.DATABASE, "Inserted carbs $it") } },
+                                    { aapsLogger.error(LTag.DATABASE, "Error while saving carbs", it) }
+                                )
+                    } else {
+                        if (detailedBolusInfo.insulin > 0) {
+                            uel.log(action, Sources.TreatmentDialog,
+                                ValueWithUnit.Insulin(insulinAfterConstraints),
+                                ValueWithUnit.Gram(carbsAfterConstraints).takeIf { carbsAfterConstraints != 0 })
+                            commandQueue.bolus(detailedBolusInfo, object : Callback() {
+                                override fun run() {
+                                    if (!result.success) {
+                                        ErrorHelperActivity.runAlarm(ctx, result.comment, resourceHelper.gs(R.string.treatmentdeliveryerror), info.nightscout.androidaps.dana.R.raw.boluserror)
+                                    }
                                 }
-                            }
-                        })
-                    } else
-                        activePlugin.activeTreatments.addToHistoryTreatment(detailedBolusInfo, false)
+                            })
+                        } else
+                            uel.log(action, Sources.TreatmentDialog,
+                                ValueWithUnit.Gram(carbsAfterConstraints).takeIf { carbs != 0 })
+                    }
                 })
             }
         } else

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

@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.dialogs
 
+import android.content.Context
 import android.os.Bundle
 import android.text.Editable
 import android.text.TextWatcher
@@ -16,25 +17,24 @@ import androidx.fragment.app.FragmentManager
 import dagger.android.HasAndroidInjector
 import dagger.android.support.DaggerDialogFragment
 import info.nightscout.androidaps.Constants
-import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.data.Profile
+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.events.EventAutosensCalculationFinished
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
-import info.nightscout.androidaps.interfaces.Constraint
-import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.interfaces.TreatmentsInterface
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
-import info.nightscout.androidaps.utils.*
-import info.nightscout.androidaps.utils.extensions.toVisibility
-import info.nightscout.androidaps.utils.extensions.valueToUnits
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.DecimalFormatter
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.SafeParse
+import info.nightscout.androidaps.utils.ToastUtils
+import info.nightscout.androidaps.extensions.toVisibility
+import info.nightscout.androidaps.extensions.valueToUnits
+import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.androidaps.utils.sharedPreferences.SP
@@ -51,16 +51,15 @@ class WizardDialog : DaggerDialogFragment() {
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var aapsSchedulers: AapsSchedulers
     @Inject lateinit var constraintChecker: ConstraintChecker
-    @Inject lateinit var mainApp: MainApp
+    @Inject lateinit var ctx: Context
     @Inject lateinit var sp: SP
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var profileFunction: ProfileFunction
-    @Inject lateinit var activePlugin: ActivePluginProvider
-    @Inject lateinit var iobCobCalculatorPlugin: IobCobCalculatorPlugin
+    @Inject lateinit var activePlugin: ActivePlugin
+    @Inject lateinit var iobCobCalculator: IobCobCalculator
     @Inject lateinit var repository: AppRepository
-    @Inject lateinit var treatmentsPlugin: TreatmentsInterface
     @Inject lateinit var dateUtil: DateUtil
 
     private var wizard: BolusWizard? = null
@@ -126,7 +125,7 @@ class WizardDialog : DaggerDialogFragment() {
         val maxCarbs = constraintChecker.getMaxCarbsAllowed().value()
         val maxCorrection = constraintChecker.getMaxBolusAllowed().value()
 
-        if (profileFunction.getUnits() == Constants.MGDL)
+        if (profileFunction.getUnits() == GlucoseUnit.MGDL)
             binding.bgInput.setParams(savedInstanceState?.getDouble("bg_input")
                 ?: 0.0, 0.0, 500.0, 1.0, DecimalFormat("0"), false, binding.ok, timeTextWatcher)
         else
@@ -180,7 +179,7 @@ class WizardDialog : DaggerDialogFragment() {
         // profile spinner
         binding.profile.onItemSelectedListener = object : OnItemSelectedListener {
             override fun onNothingSelected(parent: AdapterView<*>?) {
-                ToastUtils.showToastInUiThread(mainApp, resourceHelper.gs(R.string.noprofileselected))
+                ToastUtils.showToastInUiThread(ctx, resourceHelper.gs(R.string.noprofileselected))
                 binding.ok.visibility = View.GONE
             }
 
@@ -208,7 +207,7 @@ class WizardDialog : DaggerDialogFragment() {
 
     private fun onCheckedChanged(buttonView: CompoundButton, @Suppress("UNUSED_PARAMETER") state: Boolean) {
         saveCheckedStates()
-        binding.ttcheckbox.isEnabled = binding.bgcheckbox.isChecked && repository.getTemporaryTargetActiveAt(dateUtil._now()).blockingGet() is ValueWrapper.Existing
+        binding.ttcheckbox.isEnabled = binding.bgcheckbox.isChecked && repository.getTemporaryTargetActiveAt(dateUtil.now()).blockingGet() is ValueWrapper.Existing
         if (buttonView.id == binding.cobcheckbox.id)
             processCobCheckBox()
         calculateInsulin()
@@ -242,10 +241,10 @@ class WizardDialog : DaggerDialogFragment() {
 
     private fun initDialog() {
         val profile = profileFunction.getProfile()
-        val profileStore = activePlugin.activeProfileInterface.profile
+        val profileStore = activePlugin.activeProfileSource.profile
 
         if (profile == null || profileStore == null) {
-            ToastUtils.showToastInUiThread(mainApp, resourceHelper.gs(R.string.noprofile))
+            ToastUtils.showToastInUiThread(ctx, resourceHelper.gs(R.string.noprofile))
             dismiss()
             return
         }
@@ -258,27 +257,19 @@ class WizardDialog : DaggerDialogFragment() {
         } ?: return
 
         val units = profileFunction.getUnits()
-        binding.bgunits.text = units
-        if (units == Constants.MGDL)
+        binding.bgunits.text = units.asText
+        if (units == GlucoseUnit.MGDL)
             binding.bgInput.setStep(1.0)
         else
             binding.bgInput.setStep(0.1)
 
         // Set BG if not old
-        val lastBg = iobCobCalculatorPlugin.actualBg()
-
-        if (lastBg != null) {
-            binding.bgInput.value = lastBg.valueToUnits(units)
-        } else {
-            binding.bgInput.value = 0.0
-        }
-        binding.ttcheckbox.isEnabled = repository.getTemporaryTargetActiveAt(dateUtil._now()).blockingGet() is ValueWrapper.Existing
+        binding.bgInput.value = iobCobCalculator.ads.actualBg()?.valueToUnits(units) ?: 0.0
+        binding.ttcheckbox.isEnabled = repository.getTemporaryTargetActiveAt(dateUtil.now()).blockingGet() is ValueWrapper.Existing
 
         // IOB calculation
-        treatmentsPlugin.updateTotalIOBTreatments()
-        val bolusIob = treatmentsPlugin.lastCalculationTreatments.round()
-        treatmentsPlugin.updateTotalIOBTempBasals()
-        val basalIob = treatmentsPlugin.lastCalculationTempBasals.round()
+        val bolusIob = iobCobCalculator.calculateIobFromBolus().round()
+        val basalIob = iobCobCalculator.calculateIobFromTempBasalsIncludingConvertedExtended().round()
 
         binding.bolusiobinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, -bolusIob.iob)
         binding.basaliobinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, -basalIob.basaliob)
@@ -289,7 +280,7 @@ class WizardDialog : DaggerDialogFragment() {
     }
 
     private fun calculateInsulin() {
-        val profileStore = activePlugin.activeProfileInterface.profile
+        val profileStore = activePlugin.activeProfileSource.profile
         if (binding.profile.selectedItem == null || profileStore == null)
             return  // not initialized yet
         var profileName = binding.profile.selectedItem.toString()
@@ -298,7 +289,7 @@ class WizardDialog : DaggerDialogFragment() {
             specificProfile = profileFunction.getProfile()
             profileName = profileFunction.getProfileName()
         } else
-            specificProfile = profileStore.getSpecificProfile(profileName)
+            specificProfile = profileStore.getSpecificProfile(profileName)?.let { ProfileSealed.Pure(it) }
 
         if (specificProfile == null) return
 
@@ -309,25 +300,25 @@ class WizardDialog : DaggerDialogFragment() {
         val carbsAfterConstraint = constraintChecker.applyCarbsConstraints(Constraint(carbs)).value()
         if (abs(carbs - carbsAfterConstraint) > 0.01) {
             binding.carbsInput.value = 0.0
-            ToastUtils.showToastInUiThread(mainApp, resourceHelper.gs(R.string.carbsconstraintapplied))
+            ToastUtils.showToastInUiThread(ctx, resourceHelper.gs(R.string.carbsconstraintapplied))
             return
         }
 
         bg = if (binding.bgcheckbox.isChecked) bg else 0.0
-        val dbRecord = repository.getTemporaryTargetActiveAt(dateUtil._now()).blockingGet()
+        val dbRecord = repository.getTemporaryTargetActiveAt(dateUtil.now()).blockingGet()
         val tempTarget = if (binding.ttcheckbox.isChecked && dbRecord is ValueWrapper.Existing) dbRecord.value else null
 
         // COB
         var cob = 0.0
         if (binding.cobcheckbox.isChecked) {
-            val cobInfo = iobCobCalculatorPlugin.getCobInfo(false, "Wizard COB")
+            val cobInfo = iobCobCalculator.getCobInfo(false, "Wizard COB")
             cobInfo.displayCob?.let { cob = it }
         }
 
         val carbTime = SafeParse.stringToInt(binding.carbTimeInput.text)
 
-        wizard = BolusWizard(mainApp).doCalc(specificProfile, profileName, tempTarget, carbsAfterConstraint, cob, bg, correction,
-            sp.getInt(R.string.key_boluswizard_percentage, 100).toDouble(),
+        wizard = BolusWizard(injector).doCalc(specificProfile, profileName, tempTarget, carbsAfterConstraint, cob, bg, correction,
+            sp.getInt(R.string.key_boluswizard_percentage, 100),
             binding.bgcheckbox.isChecked,
             binding.cobcheckbox.isChecked,
             binding.bolusiobcheckbox.isChecked,
@@ -339,7 +330,7 @@ class WizardDialog : DaggerDialogFragment() {
             binding.notes.text.toString(), carbTime)
 
         wizard?.let { wizard ->
-            binding.bg.text = String.format(resourceHelper.gs(R.string.format_bg_isf), valueToUnitsToString(Profile.toMgdl(bg, profileFunction.getUnits()), profileFunction.getUnits()), wizard.sens)
+            binding.bg.text = String.format(resourceHelper.gs(R.string.format_bg_isf), valueToUnitsToString(Profile.toMgdl(bg, profileFunction.getUnits()), profileFunction.getUnits().asText), wizard.sens)
             binding.bginsulin.text = resourceHelper.gs(R.string.formatinsulinunits, wizard.insulinFromBG)
 
             binding.carbs.text = String.format(resourceHelper.gs(R.string.format_carbs_ic), carbs.toDouble(), wizard.ic)

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

@@ -9,12 +9,12 @@ import android.view.WindowManager
 import dagger.android.support.DaggerDialogFragment
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
+import info.nightscout.androidaps.interfaces.Profile
+import info.nightscout.androidaps.database.entities.BolusCalculatorResult
 import info.nightscout.androidaps.databinding.DialogWizardinfoBinding
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.utils.DecimalFormatter
-import info.nightscout.androidaps.utils.JsonHelper
 import info.nightscout.androidaps.utils.resources.ResourceHelper
-import org.json.JSONObject
 import javax.inject.Inject
 
 class WizardInfoDialog : DaggerDialogFragment() {
@@ -22,10 +22,10 @@ class WizardInfoDialog : DaggerDialogFragment() {
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var profileFunction: ProfileFunction
 
-    private var json: JSONObject? = null
+    private lateinit var data: BolusCalculatorResult
 
-    fun setData(json: JSONObject) {
-        this.json = json
+    fun setData(bolusCalculatorResult: BolusCalculatorResult) {
+        this.data = bolusCalculatorResult
     }
 
     private var _binding: DialogWizardinfoBinding? = null
@@ -49,44 +49,42 @@ class WizardInfoDialog : DaggerDialogFragment() {
 
         binding.close.setOnClickListener { dismiss() }
         val units = profileFunction.getUnits()
-        val bgString =
-            if (units == Constants.MGDL) DecimalFormatter.to0Decimal(JsonHelper.safeGetDouble(json, "bg"))
-            else DecimalFormatter.to1Decimal(JsonHelper.safeGetDouble(json, "bg"))
+        val bgString = Profile.toUnitsString(data.glucoseValue, data.glucoseValue * Constants.MGDL_TO_MMOLL, units)
         // BG
-        binding.bg.text = resourceHelper.gs(R.string.format_bg_isf, bgString, JsonHelper.safeGetDouble(json, "isf"))
-        binding.bginsulin.text = resourceHelper.gs(R.string.formatinsulinunits, JsonHelper.safeGetDouble(json, "insulinbg"))
-        binding.bgcheckbox.isChecked = JsonHelper.safeGetBoolean(json, "insulinbgused")
-        binding.ttcheckbox.isChecked = JsonHelper.safeGetBoolean(json, "ttused")
+        binding.bg.text = resourceHelper.gs(R.string.format_bg_isf, bgString, data.isf)
+        binding.bginsulin.text = resourceHelper.gs(R.string.formatinsulinunits, data.glucoseInsulin)
+        binding.bgcheckbox.isChecked = data.wasGlucoseUsed
+        binding.ttcheckbox.isChecked = data.wasTempTargetUsed
         // Trend
-        binding.bgtrend.text = JsonHelper.safeGetString(json, "trend")
-        binding.bgtrendinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, JsonHelper.safeGetDouble(json, "insulintrend"))
-        binding.bgtrendcheckbox.isChecked = JsonHelper.safeGetBoolean(json, "trendused")
+        binding.bgtrend.text = DecimalFormatter.to1Decimal(data.glucoseTrend)
+        binding.bgtrendinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, data.trendInsulin)
+        binding.bgtrendcheckbox.isChecked = data.wasTrendUsed
         // COB
-        binding.cob.text = resourceHelper.gs(R.string.format_cob_ic, JsonHelper.safeGetDouble(json, "cob"), JsonHelper.safeGetDouble(json, "ic"))
-        binding.cobinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, JsonHelper.safeGetDouble(json, "insulincob"))
-        binding.cobcheckbox.isChecked = JsonHelper.safeGetBoolean(json, "cobused")
+        binding.cob.text = resourceHelper.gs(R.string.format_cob_ic, data.cob, data.ic)
+        binding.cobinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, data.cobInsulin)
+        binding.cobcheckbox.isChecked = data.wasCOBUsed
         // Bolus IOB
-        binding.bolusiobinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, JsonHelper.safeGetDouble(json, "bolusiob"))
-        binding.bolusiobcheckbox.isChecked = JsonHelper.safeGetBoolean(json, "bolusiobused")
+        binding.bolusiobinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, data.bolusIOB)
+        binding.bolusiobcheckbox.isChecked = data.wasBolusIOBUsed
         // Basal IOB
-        binding.basaliobinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, JsonHelper.safeGetDouble(json, "basaliob"))
-        binding.basaliobcheckbox.isChecked = JsonHelper.safeGetBoolean(json, "basaliobused")
+        binding.basaliobinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, data.basalIOB)
+        binding.basaliobcheckbox.isChecked = data.wasBasalIOBUsed
         // Superbolus
-        binding.sbinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, JsonHelper.safeGetDouble(json, "insulinsuperbolus"))
-        binding.sbcheckbox.isChecked = JsonHelper.safeGetBoolean(json, "superbolusused")
+        binding.sbinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, data.superbolusInsulin)
+        binding.sbcheckbox.isChecked = data.wasSuperbolusUsed
         // Carbs
-        binding.carbs.text = resourceHelper.gs(R.string.format_carbs_ic, JsonHelper.safeGetDouble(json, "carbs"), JsonHelper.safeGetDouble(json, "ic"))
-        binding.carbsinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, JsonHelper.safeGetDouble(json, "insulincarbs"))
+        binding.carbs.text = resourceHelper.gs(R.string.format_carbs_ic, data.carbs, data.ic)
+        binding.carbsinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, data.carbsInsulin)
         // Correction
-        binding.correctioninsulin.text = resourceHelper.gs(R.string.formatinsulinunits, JsonHelper.safeGetDouble(json, "othercorrection"))
+        binding.correctioninsulin.text = resourceHelper.gs(R.string.formatinsulinunits, data.otherCorrection)
         // Profile
-        binding.profile.text = JsonHelper.safeGetString(json, "profile")
+        binding.profile.text = data.profileName
         // Notes
-        binding.notes.text = JsonHelper.safeGetString(json, "notes")
+        binding.notes.text = data.note
         // Percentage
-        binding.percentUsed.text = resourceHelper.gs(R.string.format_percent, (JsonHelper.safeGetInt(json, "percentageCorrection", 100)))
+        binding.percentUsed.text = resourceHelper.gs(R.string.format_percent, data.percentageCorrection)
         // Total
-        binding.totalinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, JsonHelper.safeGetDouble(json, "insulin"))
+        binding.totalinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, data.totalInsulin)
     }
 
     override fun onStart() {

app/src/main/java/info/nightscout/androidaps/events/EventNsTreatment.kt

@@ -1,21 +0,0 @@
-package info.nightscout.androidaps.events
-
-import org.json.JSONObject
-
-
-/**
- * Event which is published with data fetched from NightScout specific for the
- * Treatment-class.
- *
- *
- * Payload is the from NS retrieved JSON-String which should be handled by all
- * subscriber.
- */
-
-class EventNsTreatment(val mode: Int, val payload: JSONObject) : Event() {
-    companion object {
-        val ADD = 0
-        val UPDATE = 1
-        val REMOVE = 2
-    }
-}

app/src/main/java/info/nightscout/androidaps/events/EventReloadTempBasalData.kt

@@ -1,3 +0,0 @@
-package info.nightscout.androidaps.events
-
-class EventReloadTempBasalData : Event()

app/src/main/java/info/nightscout/androidaps/events/EventReloadTreatmentData.kt

@@ -1,3 +0,0 @@
-package info.nightscout.androidaps.events
-
-class EventReloadTreatmentData(var next: Event) : Event()

app/src/main/java/info/nightscout/androidaps/events/EventTreatmentChange.kt

@@ -1,5 +1,3 @@
 package info.nightscout.androidaps.events
 
-import info.nightscout.androidaps.db.Treatment
-
-class EventTreatmentChange(val treatment: Treatment?) : EventLoop()
+class EventTreatmentChange : EventLoop()

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

@@ -14,24 +14,23 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
 import info.nightscout.androidaps.databinding.ActivityHistorybrowseBinding
+import info.nightscout.androidaps.events.EventAutosensCalculationFinished
 import info.nightscout.androidaps.events.EventCustomCalculationFinished
 import info.nightscout.androidaps.events.EventRefreshOverview
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.extensions.toVisibility
+import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.OverviewMenus
 import info.nightscout.androidaps.plugins.general.overview.graphData.GraphData
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensBgLoaded
-import info.nightscout.androidaps.events.EventAutosensCalculationFinished
 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.utils.buildHelper.BuildHelper
-import info.nightscout.androidaps.utils.extensions.toVisibility
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import io.reactivex.disposables.CompositeDisposable
@@ -51,8 +50,7 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var defaultValueHelper: DefaultValueHelper
     @Inject lateinit var iobCobCalculatorPluginHistory: IobCobCalculatorPluginHistory
-    @Inject lateinit var treatmentsPluginHistory: TreatmentsPluginHistory
-    @Inject lateinit var activePlugin: ActivePluginProvider
+    @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var buildHelper: BuildHelper
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var overviewMenus: OverviewMenus
@@ -181,16 +179,6 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
                 }
             }, fabricPrivacy::logException)
         )
-        disposable.add(rxBus
-            .toObservable(EventAutosensBgLoaded::class.java)
-            .observeOn(aapsSchedulers.io)
-            .subscribe({
-                // catch only events from iobCobCalculatorPluginHistory
-                if (it.cause is EventCustomCalculationFinished) {
-                    updateGUI("EventAutosensCalculationFinished", bgOnly = true)
-                }
-            }, fabricPrivacy::logException)
-        )
         disposable.add(rxBus
             .toObservable(EventIobCalculationProgress::class.java)
             .observeOn(aapsSchedulers.main)
@@ -266,7 +254,6 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
 
     private fun runCalculation(from: String) {
         lifecycleScope.launch(Dispatchers.Default) {
-            treatmentsPluginHistory.initializeData(start - T.hours(8).msecs())
             val end = start + T.hours(rangeToDisplay.toLong()).msecs()
             iobCobCalculatorPluginHistory.stopCalculation(from)
             iobCobCalculatorPluginHistory.clearCache()
@@ -292,7 +279,7 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
             if (destroyed) return@launch
             binding.date.text = dateUtil.dateAndTimeString(start)
             binding.zoom.text = rangeToDisplay.toString()
-            val graphData = GraphData(injector, binding.bggraph, iobCobCalculatorPluginHistory, treatmentsPluginHistory)
+            val graphData = GraphData(injector, binding.bggraph)
             val secondaryGraphsData: ArrayList<GraphData> = ArrayList()
 
             // do preparation in different thread
@@ -306,28 +293,29 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
                 graphData.addInRangeArea(fromTime, toTime, lowLine, highLine)
 
                 // **** BG ****
-                graphData.addBgReadings(fromTime, toTime, lowLine, highLine, null)
+//                graphData.addBgReadings(fromTime, toTime, highLine, null)
+//                if (buildHelper.isDev()) graphData.addBucketedData(fromTime, toTime)
 
                 // add target line
-                graphData.addTargetLine(fromTime, toTime, profile, null)
+//                graphData.addTargetLine(fromTime, toTime, profile, null)
 
                 // **** NOW line ****
                 graphData.addNowLine(pointer)
 
                 if (!bgOnly) {
                     // Treatments
-                    graphData.addTreatments(fromTime, toTime)
+//                    graphData.addTreatments(fromTime, toTime)
                     if (menuChartSettings[0][OverviewMenus.CharType.ACT.ordinal])
-                        graphData.addActivity(fromTime, toTime, false, 0.8)
+//                        graphData.addActivity(fromTime, toTime, false, 0.8)
 
                     // add basal data
                     if (pump.pumpDescription.isTempBasalCapable && menuChartSettings[0][OverviewMenus.CharType.BAS.ordinal]) {
-                        graphData.addBasals(fromTime, toTime, lowLine / graphData.maxY / 1.2)
+//                        graphData.addBasals(fromTime, toTime, lowLine / graphData.maxY / 1.2)
                     }
                     // ------------------ 2nd graph
                     synchronized(graphLock) {
                         for (g in 0 until secondaryGraphs.size) {
-                            val secondGraphData = GraphData(injector, secondaryGraphs[g], iobCobCalculatorPluginHistory, treatmentsPluginHistory)
+                            val secondGraphData = GraphData(injector, secondaryGraphs[g])
                             var useIobForScale = false
                             var useCobForScale = false
                             var useDevForScale = false
@@ -348,13 +336,13 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
                             val alignIobScale = menuChartSettings[g + 1][OverviewMenus.CharType.ABS.ordinal] && menuChartSettings[g + 1][OverviewMenus.CharType.IOB.ordinal]
                             val alignDevBgiScale = menuChartSettings[g + 1][OverviewMenus.CharType.DEV.ordinal] && menuChartSettings[g + 1][OverviewMenus.CharType.BGI.ordinal]
 
-                            if (menuChartSettings[g + 1][OverviewMenus.CharType.ABS.ordinal]) secondGraphData.addAbsIob(fromTime, toTime, useABSForScale, 1.0)
-                            if (menuChartSettings[g + 1][OverviewMenus.CharType.IOB.ordinal]) secondGraphData.addIob(fromTime, toTime, useIobForScale, 1.0, menuChartSettings[g + 1][OverviewMenus.CharType.PRE.ordinal], alignIobScale)
-                            if (menuChartSettings[g + 1][OverviewMenus.CharType.COB.ordinal]) secondGraphData.addCob(fromTime, toTime, useCobForScale, if (useCobForScale) 1.0 else 0.5)
-                            if (menuChartSettings[g + 1][OverviewMenus.CharType.DEV.ordinal]) secondGraphData.addDeviations(fromTime, toTime, useDevForScale, 1.0, alignDevBgiScale)
-                            if (menuChartSettings[g + 1][OverviewMenus.CharType.SEN.ordinal]) secondGraphData.addRatio(fromTime, toTime, useRatioForScale, 1.0)
-                            if (menuChartSettings[g + 1][OverviewMenus.CharType.BGI.ordinal]) secondGraphData.addMinusBGI(fromTime, toTime, useBGIForScale, if (alignDevBgiScale) 1.0 else 0.8, alignDevBgiScale)
-                            if (menuChartSettings[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal] && buildHelper.isDev()) secondGraphData.addDeviationSlope(fromTime, toTime, useDSForScale, 1.0)
+//                            if (menuChartSettings[g + 1][OverviewMenus.CharType.ABS.ordinal]) secondGraphData.addAbsIob(fromTime, toTime, useABSForScale, 1.0)
+//                            if (menuChartSettings[g + 1][OverviewMenus.CharType.IOB.ordinal]) secondGraphData.addIob(fromTime, toTime, useIobForScale, 1.0, menuChartSettings[g + 1][OverviewMenus.CharType.PRE.ordinal], alignIobScale)
+//                            if (menuChartSettings[g + 1][OverviewMenus.CharType.COB.ordinal]) secondGraphData.addCob(fromTime, toTime, useCobForScale, if (useCobForScale) 1.0 else 0.5)
+//                            if (menuChartSettings[g + 1][OverviewMenus.CharType.DEV.ordinal]) secondGraphData.addDeviations(fromTime, toTime, useDevForScale, 1.0, alignDevBgiScale)
+//                            if (menuChartSettings[g + 1][OverviewMenus.CharType.SEN.ordinal]) secondGraphData.addRatio(fromTime, toTime, useRatioForScale, 1.0)
+//                            if (menuChartSettings[g + 1][OverviewMenus.CharType.BGI.ordinal]) secondGraphData.addMinusBGI(fromTime, toTime, useBGIForScale, if (alignDevBgiScale) 1.0 else 0.8, alignDevBgiScale)
+//                            if (menuChartSettings[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal] && buildHelper.isDev()) secondGraphData.addDeviationSlope(fromTime, toTime, useDSForScale, 1.0)
 
                             // set manual x bounds to have nice steps
                             secondGraphData.formatAxis(fromTime, toTime)

app/src/main/java/info/nightscout/androidaps/historyBrowser/IobCobCalculatorPluginHistory.kt

@@ -2,7 +2,7 @@ package info.nightscout.androidaps.historyBrowser
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.database.AppRepository
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
@@ -27,8 +27,7 @@ class IobCobCalculatorPluginHistory @Inject constructor(
     sp: SP,
     resourceHelper: ResourceHelper,
     profileFunction: ProfileFunction,
-    activePlugin: ActivePluginProvider,
-    treatmentsPluginHistory: TreatmentsPluginHistory,
+    activePlugin: ActivePlugin,
     sensitivityOref1Plugin: SensitivityOref1Plugin,
     sensitivityAAPSPlugin: SensitivityAAPSPlugin,
     sensitivityWeightedAveragePlugin: SensitivityWeightedAveragePlugin,
@@ -36,7 +35,7 @@ class IobCobCalculatorPluginHistory @Inject constructor(
     dateUtil: DateUtil,
     repository: AppRepository
 ) : IobCobCalculatorPlugin(injector, aapsLogger, aapsSchedulers, rxBus, sp, resourceHelper, profileFunction,
-    activePlugin, treatmentsPluginHistory, sensitivityOref1Plugin, sensitivityAAPSPlugin, sensitivityWeightedAveragePlugin, fabricPrivacy, dateUtil, repository) {
+    activePlugin, sensitivityOref1Plugin, sensitivityAAPSPlugin, sensitivityWeightedAveragePlugin, fabricPrivacy, dateUtil, repository) {
 
     override fun onStart() { // do not attach to rxbus
     }

app/src/main/java/info/nightscout/androidaps/historyBrowser/TreatmentsPluginHistory.kt

@@ -1,50 +0,0 @@
-package info.nightscout.androidaps.historyBrowser
-
-import android.content.Context
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.database.AppRepository
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
-import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.interfaces.UploadQueueInterface
-import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
-import info.nightscout.androidaps.plugins.treatments.TreatmentService
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.FabricPrivacy
-import info.nightscout.androidaps.utils.resources.ResourceHelper
-import info.nightscout.androidaps.utils.rx.AapsSchedulers
-import info.nightscout.androidaps.utils.sharedPreferences.SP
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class TreatmentsPluginHistory @Inject constructor(
-    injector: HasAndroidInjector,
-    aapsLogger: AAPSLogger,
-    aapsSchedulers: AapsSchedulers,
-    rxBus: RxBusWrapper,
-    resourceHelper: ResourceHelper,
-    context: Context,
-    sp: SP,
-    profileFunction: ProfileFunction,
-    activePlugin: ActivePluginProvider,
-    nsUpload: NSUpload,
-    fabricPrivacy: FabricPrivacy,
-    dateUtil: DateUtil,
-    uploadQueue: UploadQueueInterface,
-    databaseHelper: DatabaseHelperInterface,
-    repository: AppRepository
-) : TreatmentsPlugin(injector, aapsLogger, rxBus, aapsSchedulers, resourceHelper, context, sp, profileFunction, activePlugin, nsUpload, fabricPrivacy, dateUtil, uploadQueue, databaseHelper, repository) {
-
-    init {
-        onStart()
-    }
-
-    override fun onStart() {
-        service = TreatmentService(injector)
-        initializeData(range())
-    }
-}

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

@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.plugins.aps.events
+
+import info.nightscout.androidaps.events.Event
+
+class EventLoopInvoked : Event()

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

@@ -98,7 +98,6 @@ class LoopFragment : DaggerFragment() {
             binding.constraintsprocessed.text = it.constraintsProcessed?.toSpanned() ?: ""
             binding.source.text = it.source ?: ""
             binding.lastrun.text = dateUtil.dateAndTimeString(it.lastAPSRun)
-                ?: ""
             binding.smbrequestTime.text = dateUtil.dateAndTimeAndSecondsString(it.lastSMBRequest)
             binding.smbexecutionTime.text = dateUtil.dateAndTimeAndSecondsString(it.lastSMBEnact)
             binding.tbrrequestTime.text = dateUtil.dateAndTimeAndSecondsString(it.lastTBRRequest)

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

@@ -13,12 +13,15 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.*
 import info.nightscout.androidaps.activities.ErrorHelperActivity
 import info.nightscout.androidaps.data.DetailedBolusInfo
-import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.data.PumpEnactResult
 import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.database.entities.TherapyEvent
-import info.nightscout.androidaps.database.transactions.InsertTherapyEventIfNewTransaction
-import info.nightscout.androidaps.db.Source
+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.database.transactions.InsertTherapyEventAnnouncementTransaction
 import info.nightscout.androidaps.events.EventAcceptOpenLoopChange
 import info.nightscout.androidaps.events.EventAutosensCalculationFinished
 import info.nightscout.androidaps.events.EventNewBG
@@ -27,20 +30,19 @@ import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.interfaces.LoopInterface.LastRun
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
+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.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
+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.androidaps.plugins.general.overview.notifications.Notification
 import info.nightscout.androidaps.plugins.general.wear.events.EventWearConfirmAction
 import info.nightscout.androidaps.plugins.general.wear.events.EventWearInitiateAction
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.queue.commands.Command
 import info.nightscout.androidaps.receivers.ReceiverStatusStore
@@ -48,6 +50,11 @@ 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.extensions.buildDeviceStatus
+import info.nightscout.androidaps.extensions.convertedToAbsolute
+import info.nightscout.androidaps.extensions.convertedToPercent
+import info.nightscout.androidaps.extensions.plannedRemainingMinutes
+import info.nightscout.androidaps.plugins.aps.events.EventLoopInvoked
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.androidaps.utils.sharedPreferences.SP
@@ -70,15 +77,15 @@ open class LoopPlugin @Inject constructor(
     private val profileFunction: ProfileFunction,
     private val context: Context,
     private val commandQueue: CommandQueueProvider,
-    private val activePlugin: ActivePluginProvider,
-    private val treatmentsPlugin: TreatmentsPlugin,
+    private val activePlugin: ActivePlugin,
     private val virtualPumpPlugin: VirtualPumpPlugin,
-    private val iobCobCalculatorPlugin: IobCobCalculatorPlugin,
+    private val iobCobCalculator: IobCobCalculator,
     private val receiverStatusStore: ReceiverStatusStore,
     private val fabricPrivacy: FabricPrivacy,
-    private val nsUpload: NSUpload,
     private val dateUtil: DateUtil,
-    private val repository: AppRepository
+    private val uel: UserEntryLogger,
+    private val repository: AppRepository,
+    private val runningConfiguration: RunningConfiguration
 ) : PluginBase(PluginDescription()
     .mainType(PluginType.LOOP)
     .fragmentClass(LoopFragment::class.java.name)
@@ -96,6 +103,7 @@ open class LoopPlugin @Inject constructor(
     private var carbsSuggestionsSuspendedUntil: Long = 0
     private var prevCarbsreq = 0
     override var lastRun: LastRun? = null
+
     override fun onStart() {
         createNotificationChannel()
         super.onStart()
@@ -117,7 +125,7 @@ open class LoopPlugin @Inject constructor(
             .subscribe({ event: EventAutosensCalculationFinished ->
                 // Autosens calculation not triggered by a new BG
                 if (event.cause !is EventNewBG) return@subscribe
-                val glucoseValue = iobCobCalculatorPlugin.actualBg() ?: return@subscribe
+                val glucoseValue = iobCobCalculator.ads.actualBg() ?: return@subscribe
                 // BG outdated
                 // already looped with that value
                 if (glucoseValue.timestamp <= lastBgTriggeredRun) return@subscribe
@@ -233,7 +241,9 @@ open class LoopPlugin @Inject constructor(
     private fun treatmentTimeThreshold(durationMinutes: Int): Boolean {
         val threshold = System.currentTimeMillis() + durationMinutes * 60 * 1000
         var bool = false
-        if (treatmentsPlugin.lastBolusTime > threshold || treatmentsPlugin.lastCarbTime > threshold) bool = true
+        val lastBolusTime = repository.getLastBolusRecord()?.timestamp ?: 0L
+        val lastCarbsTime = repository.getLastCarbsRecord()?.timestamp ?: 0L
+        if (lastBolusTime > threshold || lastCarbsTime > threshold) bool = true
         return bool
     }
 
@@ -277,13 +287,13 @@ open class LoopPlugin @Inject constructor(
             if (apsResult == null) {
                 rxBus.send(EventLoopSetLastRunGui(resourceHelper.gs(R.string.noapsselected)))
                 return
-            }
+            } else rxBus.send(EventLoopInvoked())
 
             // Prepare for pumps using % basals
             if (pump.pumpDescription.tempBasalStyle == PumpDescription.PERCENT && allowPercentage()) {
                 apsResult.usePercent = true
             }
-            apsResult.percent = (apsResult.rate / profile.basal * 100).toInt()
+            apsResult.percent = (apsResult.rate / profile.getBasal() * 100).toInt()
 
             // check rate for constraints
             val resultAfterConstraints = apsResult.newAndClone(injector)
@@ -295,155 +305,162 @@ open class LoopPlugin @Inject constructor(
             resultAfterConstraints.smb = constraintChecker.applyBolusConstraints(resultAfterConstraints.smbConstraint!!).value()
 
             // safety check for multiple SMBs
-            val lastBolusTime = treatmentsPlugin.lastBolusTime
+            val lastBolusTime = repository.getLastBolusRecord()?.timestamp ?: 0L
             if (lastBolusTime != 0L && lastBolusTime + T.mins(3).msecs() > System.currentTimeMillis()) {
                 aapsLogger.debug(LTag.APS, "SMB requested but still in 3 min interval")
                 resultAfterConstraints.smb = 0.0
             }
-            if (lastRun != null && lastRun!!.constraintsProcessed != null) {
-                prevCarbsreq = lastRun!!.constraintsProcessed!!.carbsReq
-            }
-            if (lastRun == null) lastRun = LastRun()
-            lastRun!!.request = apsResult
-            lastRun!!.constraintsProcessed = resultAfterConstraints
-            lastRun!!.lastAPSRun = DateUtil.now()
-            lastRun!!.source = (usedAPS as PluginBase).name
-            lastRun!!.tbrSetByPump = null
-            lastRun!!.smbSetByPump = null
-            lastRun!!.lastTBREnact = 0
-            lastRun!!.lastTBRRequest = 0
-            lastRun!!.lastSMBEnact = 0
-            lastRun!!.lastSMBRequest = 0
-            nsUpload.uploadDeviceStatus(this, iobCobCalculatorPlugin, profileFunction, activePlugin.activePump, receiverStatusStore, BuildConfig.VERSION_NAME + "-" + BuildConfig.BUILDVERSION)
-            if (isSuspended) {
-                aapsLogger.debug(LTag.APS, resourceHelper.gs(R.string.loopsuspended))
-                rxBus.send(EventLoopSetLastRunGui(resourceHelper.gs(R.string.loopsuspended)))
-                return
-            }
-            if (pump.isSuspended()) {
-                aapsLogger.debug(LTag.APS, resourceHelper.gs(R.string.pumpsuspended))
-                rxBus.send(EventLoopSetLastRunGui(resourceHelper.gs(R.string.pumpsuspended)))
-                return
-            }
-            val closedLoopEnabled = constraintChecker.isClosedLoopAllowed()
-            if (closedLoopEnabled.value()) {
-                if (allowNotification) {
-                    if (resultAfterConstraints.isCarbsRequired
-                        && resultAfterConstraints.carbsReq >= sp.getInt(R.string.key_smb_enable_carbs_suggestions_threshold, 0) && carbsSuggestionsSuspendedUntil < System.currentTimeMillis() && !treatmentTimeThreshold(-15)) {
-                        if (sp.getBoolean(R.string.key_enable_carbs_required_alert_local, true) && !sp.getBoolean(R.string.key_raise_notifications_as_android_notifications, true)) {
-                            val carbReqLocal = Notification(Notification.CARBS_REQUIRED, resultAfterConstraints.carbsRequiredText, Notification.NORMAL)
-                            rxBus.send(EventNewNotification(carbReqLocal))
-                        }
-                        if (sp.getBoolean(R.string.key_ns_create_announcements_from_carbs_req, false)) {
-                            nsUpload.uploadError(resultAfterConstraints.carbsRequiredText)
-                        }
-                        if (sp.getBoolean(R.string.key_enable_carbs_required_alert_local, true) && sp.getBoolean(R.string.key_raise_notifications_as_android_notifications, true)) {
-                            val intentAction5m = Intent(context, CarbSuggestionReceiver::class.java)
-                            intentAction5m.putExtra("ignoreDuration", 5)
-                            val pendingIntent5m = PendingIntent.getBroadcast(context, 1, intentAction5m, PendingIntent.FLAG_UPDATE_CURRENT)
-                            val actionIgnore5m = NotificationCompat.Action(R.drawable.ic_notif_aaps, resourceHelper.gs(R.string.ignore5m, "Ignore 5m"), pendingIntent5m)
-                            val intentAction15m = Intent(context, CarbSuggestionReceiver::class.java)
-                            intentAction15m.putExtra("ignoreDuration", 15)
-                            val pendingIntent15m = PendingIntent.getBroadcast(context, 1, intentAction15m, PendingIntent.FLAG_UPDATE_CURRENT)
-                            val actionIgnore15m = NotificationCompat.Action(R.drawable.ic_notif_aaps, resourceHelper.gs(R.string.ignore15m, "Ignore 15m"), pendingIntent15m)
-                            val intentAction30m = Intent(context, CarbSuggestionReceiver::class.java)
-                            intentAction30m.putExtra("ignoreDuration", 30)
-                            val pendingIntent30m = PendingIntent.getBroadcast(context, 1, intentAction30m, PendingIntent.FLAG_UPDATE_CURRENT)
-                            val actionIgnore30m = NotificationCompat.Action(R.drawable.ic_notif_aaps, resourceHelper.gs(R.string.ignore30m, "Ignore 30m"), pendingIntent30m)
-                            val builder = NotificationCompat.Builder(context, CHANNEL_ID)
-                            builder.setSmallIcon(R.drawable.notif_icon)
-                                .setContentTitle(resourceHelper.gs(R.string.carbssuggestion))
-                                .setContentText(resultAfterConstraints.carbsRequiredText)
-                                .setAutoCancel(true)
-                                .setPriority(Notification.IMPORTANCE_HIGH)
-                                .setCategory(Notification.CATEGORY_ALARM)
-                                .addAction(actionIgnore5m)
-                                .addAction(actionIgnore15m)
-                                .addAction(actionIgnore30m)
-                                .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-                                .setVibrate(longArrayOf(1000, 1000, 1000, 1000, 1000))
-                            val mNotificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+            prevCarbsreq = lastRun?.constraintsProcessed?.carbsReq ?: prevCarbsreq
+            lastRun = (lastRun ?: LastRun()).also { lastRun ->
+                lastRun.request = apsResult
+                lastRun.constraintsProcessed = resultAfterConstraints
+                lastRun.lastAPSRun = dateUtil.now()
+                lastRun.source = (usedAPS as PluginBase).name
+                lastRun.tbrSetByPump = null
+                lastRun.smbSetByPump = null
+                lastRun.lastTBREnact = 0
+                lastRun.lastTBRRequest = 0
+                lastRun.lastSMBEnact = 0
+                lastRun.lastSMBRequest = 0
+                buildDeviceStatus(dateUtil, this, iobCobCalculator, profileFunction,
+                    activePlugin.activePump, receiverStatusStore, runningConfiguration,
+                    BuildConfig.VERSION_NAME + "-" + BuildConfig.BUILDVERSION)?.also {
+                    repository.insert(it)
+                }
 
-                            // mId allows you to update the notification later on.
-                            mNotificationManager.notify(Constants.notificationID, builder.build())
-                            rxBus.send(EventNewOpenLoopNotification())
+                if (isSuspended) {
+                    aapsLogger.debug(LTag.APS, resourceHelper.gs(R.string.loopsuspended))
+                    rxBus.send(EventLoopSetLastRunGui(resourceHelper.gs(R.string.loopsuspended)))
+                    return
+                }
+                if (pump.isSuspended()) {
+                    aapsLogger.debug(LTag.APS, resourceHelper.gs(R.string.pumpsuspended))
+                    rxBus.send(EventLoopSetLastRunGui(resourceHelper.gs(R.string.pumpsuspended)))
+                    return
+                }
+                val closedLoopEnabled = constraintChecker.isClosedLoopAllowed()
+                if (closedLoopEnabled.value()) {
+                    if (allowNotification) {
+                        if (resultAfterConstraints.isCarbsRequired
+                            && resultAfterConstraints.carbsReq >= sp.getInt(R.string.key_smb_enable_carbs_suggestions_threshold, 0) && carbsSuggestionsSuspendedUntil < System.currentTimeMillis() && !treatmentTimeThreshold(-15)) {
+                            if (sp.getBoolean(R.string.key_enable_carbs_required_alert_local, true) && !sp.getBoolean(R.string.key_raise_notifications_as_android_notifications, true)) {
+                                val carbReqLocal = Notification(Notification.CARBS_REQUIRED, resultAfterConstraints.carbsRequiredText, Notification.NORMAL)
+                                rxBus.send(EventNewNotification(carbReqLocal))
+                            }
+                            if (sp.getBoolean(R.string.key_ns_create_announcements_from_carbs_req, false)) {
+                                disposable += repository.runTransaction(InsertTherapyEventAnnouncementTransaction(resultAfterConstraints.carbsRequiredText)).subscribe()
+                            }
+                            if (sp.getBoolean(R.string.key_enable_carbs_required_alert_local, true) && sp.getBoolean(R.string.key_raise_notifications_as_android_notifications, true)) {
+                                val intentAction5m = Intent(context, CarbSuggestionReceiver::class.java)
+                                intentAction5m.putExtra("ignoreDuration", 5)
+                                val pendingIntent5m = PendingIntent.getBroadcast(context, 1, intentAction5m, PendingIntent.FLAG_UPDATE_CURRENT)
+                                val actionIgnore5m = NotificationCompat.Action(R.drawable.ic_notif_aaps, resourceHelper.gs(R.string.ignore5m, "Ignore 5m"), pendingIntent5m)
+                                val intentAction15m = Intent(context, CarbSuggestionReceiver::class.java)
+                                intentAction15m.putExtra("ignoreDuration", 15)
+                                val pendingIntent15m = PendingIntent.getBroadcast(context, 1, intentAction15m, PendingIntent.FLAG_UPDATE_CURRENT)
+                                val actionIgnore15m = NotificationCompat.Action(R.drawable.ic_notif_aaps, resourceHelper.gs(R.string.ignore15m, "Ignore 15m"), pendingIntent15m)
+                                val intentAction30m = Intent(context, CarbSuggestionReceiver::class.java)
+                                intentAction30m.putExtra("ignoreDuration", 30)
+                                val pendingIntent30m = PendingIntent.getBroadcast(context, 1, intentAction30m, PendingIntent.FLAG_UPDATE_CURRENT)
+                                val actionIgnore30m = NotificationCompat.Action(R.drawable.ic_notif_aaps, resourceHelper.gs(R.string.ignore30m, "Ignore 30m"), pendingIntent30m)
+                                val builder = NotificationCompat.Builder(context, CHANNEL_ID)
+                                builder.setSmallIcon(R.drawable.notif_icon)
+                                    .setContentTitle(resourceHelper.gs(R.string.carbssuggestion))
+                                    .setContentText(resultAfterConstraints.carbsRequiredText)
+                                    .setAutoCancel(true)
+                                    .setPriority(Notification.IMPORTANCE_HIGH)
+                                    .setCategory(Notification.CATEGORY_ALARM)
+                                    .addAction(actionIgnore5m)
+                                    .addAction(actionIgnore15m)
+                                    .addAction(actionIgnore30m)
+                                    .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+                                    .setVibrate(longArrayOf(1000, 1000, 1000, 1000, 1000))
+                                val mNotificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
 
-                            //only send to wear if Native notifications are turned off
-                            if (!sp.getBoolean(R.string.key_raise_notifications_as_android_notifications, true)) {
-                                // Send to Wear
-                                rxBus.send(EventWearInitiateAction("changeRequest"))
+                                // mId allows you to update the notification later on.
+                                mNotificationManager.notify(Constants.notificationID, builder.build())
+                                uel.log(Action.CAREPORTAL, Sources.Loop, resourceHelper.gs(R.string.carbsreq, resultAfterConstraints.carbsReq, resultAfterConstraints.carbsReqWithin),
+                                    ValueWithUnit.Gram(resultAfterConstraints.carbsReq),
+                                    ValueWithUnit.Minute(resultAfterConstraints.carbsReqWithin))
+                                rxBus.send(EventNewOpenLoopNotification())
+
+                                //only send to wear if Native notifications are turned off
+                                if (!sp.getBoolean(R.string.key_raise_notifications_as_android_notifications, true)) {
+                                    // Send to Wear
+                                    rxBus.send(EventWearInitiateAction("changeRequest"))
+                                }
+                            }
+                        } else {
+                            //If carbs were required previously, but are no longer needed, dismiss notifications
+                            if (prevCarbsreq > 0) {
+                                dismissSuggestion()
+                                rxBus.send(EventDismissNotification(Notification.CARBS_REQUIRED))
                             }
                         }
-                    } else {
-                        //If carbs were required previously, but are no longer needed, dismiss notifications
-                        if (prevCarbsreq > 0) {
-                            dismissSuggestion()
-                            rxBus.send(EventDismissNotification(Notification.CARBS_REQUIRED))
-                        }
                     }
-                }
-                if (resultAfterConstraints.isChangeRequested
-                    && !commandQueue.bolusInQueue()
-                    && !commandQueue.isRunning(Command.CommandType.BOLUS)) {
-                    val waiting = PumpEnactResult(injector)
-                    waiting.queued = true
-                    if (resultAfterConstraints.tempBasalRequested) lastRun!!.tbrSetByPump = waiting
-                    if (resultAfterConstraints.bolusRequested) lastRun!!.smbSetByPump = waiting
-                    rxBus.send(EventLoopUpdateGui())
-                    fabricPrivacy.logCustom("APSRequest")
-                    applyTBRRequest(resultAfterConstraints, profile, object : Callback() {
-                        override fun run() {
-                            if (result.enacted || result.success) {
-                                lastRun!!.tbrSetByPump = result
-                                lastRun!!.lastTBRRequest = lastRun!!.lastAPSRun
-                                lastRun!!.lastTBREnact = DateUtil.now()
-                                rxBus.send(EventLoopUpdateGui())
-                                applySMBRequest(resultAfterConstraints, object : Callback() {
-                                    override fun run() {
-                                        // Callback is only called if a bolus was actually requested
-                                        if (result.enacted || result.success) {
-                                            lastRun!!.smbSetByPump = result
-                                            lastRun!!.lastSMBRequest = lastRun!!.lastAPSRun
-                                            lastRun!!.lastSMBEnact = DateUtil.now()
-                                        } else {
-                                            Thread {
-                                                SystemClock.sleep(1000)
-                                                invoke("tempBasalFallback", allowNotification, true)
-                                            }.start()
+                    if (resultAfterConstraints.isChangeRequested
+                        && !commandQueue.bolusInQueue()
+                        && !commandQueue.isRunning(Command.CommandType.BOLUS)) {
+                        val waiting = PumpEnactResult(injector)
+                        waiting.queued = true
+                        if (resultAfterConstraints.tempBasalRequested) lastRun.tbrSetByPump = waiting
+                        if (resultAfterConstraints.bolusRequested()) lastRun.smbSetByPump = waiting
+                        rxBus.send(EventLoopUpdateGui())
+                        fabricPrivacy.logCustom("APSRequest")
+                        applyTBRRequest(resultAfterConstraints, profile, object : Callback() {
+                            override fun run() {
+                                if (result.enacted || result.success) {
+                                    lastRun.tbrSetByPump = result
+                                    lastRun.lastTBRRequest = lastRun.lastAPSRun
+                                    lastRun.lastTBREnact = dateUtil.now()
+                                    rxBus.send(EventLoopUpdateGui())
+                                    applySMBRequest(resultAfterConstraints, object : Callback() {
+                                        override fun run() {
+                                            // Callback is only called if a bolus was actually requested
+                                            if (result.enacted || result.success) {
+                                                lastRun.smbSetByPump = result
+                                                lastRun.lastSMBRequest = lastRun.lastAPSRun
+                                                lastRun.lastSMBEnact = dateUtil.now()
+                                            } else {
+                                                Thread {
+                                                    SystemClock.sleep(1000)
+                                                    invoke("tempBasalFallback", allowNotification, true)
+                                                }.start()
+                                            }
+                                            rxBus.send(EventLoopUpdateGui())
                                         }
-                                        rxBus.send(EventLoopUpdateGui())
-                                    }
-                                })
-                            } else {
-                                lastRun!!.tbrSetByPump = result
-                                lastRun!!.lastTBRRequest = lastRun!!.lastAPSRun
+                                    })
+                                } else {
+                                    lastRun.tbrSetByPump = result
+                                    lastRun.lastTBRRequest = lastRun.lastAPSRun
+                                }
+                                rxBus.send(EventLoopUpdateGui())
                             }
-                            rxBus.send(EventLoopUpdateGui())
-                        }
-                    })
-                } else {
-                    lastRun!!.tbrSetByPump = null
-                    lastRun!!.smbSetByPump = null
-                }
-            } else {
-                if (resultAfterConstraints.isChangeRequested && allowNotification) {
-                    val builder = NotificationCompat.Builder(context, CHANNEL_ID)
-                    builder.setSmallIcon(R.drawable.notif_icon)
-                        .setContentTitle(resourceHelper.gs(R.string.openloop_newsuggestion))
-                        .setContentText(resultAfterConstraints.toString())
-                        .setAutoCancel(true)
-                        .setPriority(Notification.IMPORTANCE_HIGH)
-                        .setCategory(Notification.CATEGORY_ALARM)
-                        .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-                    if (sp.getBoolean(R.string.key_wear_control, false)) {
-                        builder.setLocalOnly(true)
+                        })
+                    } else {
+                        lastRun.tbrSetByPump = null
+                        lastRun.smbSetByPump = null
+                    }
+                } else {
+                    if (resultAfterConstraints.isChangeRequested && allowNotification) {
+                        val builder = NotificationCompat.Builder(context, CHANNEL_ID)
+                        builder.setSmallIcon(R.drawable.notif_icon)
+                            .setContentTitle(resourceHelper.gs(R.string.openloop_newsuggestion))
+                            .setContentText(resultAfterConstraints.toString())
+                            .setAutoCancel(true)
+                            .setPriority(Notification.IMPORTANCE_HIGH)
+                            .setCategory(Notification.CATEGORY_ALARM)
+                            .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+                        if (sp.getBoolean(R.string.key_wear_control, false)) {
+                            builder.setLocalOnly(true)
+                        }
+                        presentSuggestion(builder)
+                    } else if (allowNotification) {
+                        dismissSuggestion()
                     }
-                    presentSuggestion(builder)
-                } else if (allowNotification) {
-                    dismissSuggestion()
                 }
+                rxBus.send(EventLoopUpdateGui())
             }
-            rxBus.send(EventLoopUpdateGui())
         } finally {
             aapsLogger.debug(LTag.APS, "invoke end")
         }
@@ -486,21 +503,28 @@ open class LoopPlugin @Inject constructor(
     }
 
     fun acceptChangeRequest() {
-        val profile = profileFunction.getProfile()
-        val lp = this
-        applyTBRRequest(lastRun!!.constraintsProcessed, profile, object : Callback() {
-            override fun run() {
-                if (result.enacted) {
-                    lastRun!!.tbrSetByPump = result
-                    lastRun!!.lastTBRRequest = lastRun!!.lastAPSRun
-                    lastRun!!.lastTBREnact = DateUtil.now()
-                    lastRun!!.lastOpenModeAccept = DateUtil.now()
-                    nsUpload.uploadDeviceStatus(lp, iobCobCalculatorPlugin, profileFunction, activePlugin.activePump, receiverStatusStore, BuildConfig.VERSION_NAME + "-" + BuildConfig.BUILDVERSION)
-                    sp.incInt(R.string.key_ObjectivesmanualEnacts)
-                }
-                rxBus.send(EventAcceptOpenLoopChange())
+        val profile = profileFunction.getProfile() ?: return
+        lastRun?.let { lastRun ->
+            lastRun.constraintsProcessed?.let { constraintsProcessed ->
+                applyTBRRequest(constraintsProcessed, profile, object : Callback() {
+                    override fun run() {
+                        if (result.enacted) {
+                            lastRun.tbrSetByPump = result
+                            lastRun.lastTBRRequest = lastRun.lastAPSRun
+                            lastRun.lastTBREnact = dateUtil.now()
+                            lastRun.lastOpenModeAccept = dateUtil.now()
+                            buildDeviceStatus(dateUtil, this@LoopPlugin, iobCobCalculator, profileFunction,
+                                activePlugin.activePump, receiverStatusStore, runningConfiguration,
+                                BuildConfig.VERSION_NAME + "-" + BuildConfig.BUILDVERSION)?.also {
+                                repository.insert(it)
+                            }
+                            sp.incInt(R.string.key_ObjectivesmanualEnacts)
+                        }
+                        rxBus.send(EventAcceptOpenLoopChange())
+                    }
+                })
             }
-        })
+        }
         fabricPrivacy.logCustom("AcceptTemp")
     }
 
@@ -508,8 +532,8 @@ open class LoopPlugin @Inject constructor(
      * expect absolute request and allow both absolute and percent response based on pump capabilities
      * TODO: update pump drivers to support APS request in %
      */
-    private fun applyTBRRequest(request: APSResult?, profile: Profile?, callback: Callback?) {
-        if (!request!!.tempBasalRequested) {
+    private fun applyTBRRequest(request: APSResult, profile: Profile, callback: Callback?) {
+        if (!request.tempBasalRequested) {
             callback?.result(PumpEnactResult(injector).enacted(false).success(true).comment(R.string.nochangerequested))?.run()
             return
         }
@@ -526,54 +550,62 @@ open class LoopPlugin @Inject constructor(
         }
         aapsLogger.debug(LTag.APS, "applyAPSRequest: $request")
         val now = System.currentTimeMillis()
-        val activeTemp = treatmentsPlugin.getTempBasalFromHistory(now)
+        val activeTemp = iobCobCalculator.getTempBasalIncludingConvertedExtended(now)
         if (request.usePercent && allowPercentage()) {
             if (request.percent == 100 && request.duration == 0) {
                 if (activeTemp != null) {
                     aapsLogger.debug(LTag.APS, "applyAPSRequest: cancelTempBasal()")
+                    uel.log(Action.CANCEL_TEMP_BASAL, Sources.Loop)
                     commandQueue.cancelTempBasal(false, callback)
                 } else {
                     aapsLogger.debug(LTag.APS, "applyAPSRequest: Basal set correctly")
                     callback?.result(PumpEnactResult(injector).percent(request.percent).duration(0)
                         .enacted(false).success(true).comment(R.string.basal_set_correctly))?.run()
                 }
-            } else if (activeTemp != null && activeTemp.plannedRemainingMinutes > 5 && request.duration - activeTemp.plannedRemainingMinutes < 30 && request.percent == activeTemp.percentRate) {
+            } else if (activeTemp != null && activeTemp.plannedRemainingMinutes > 5 && request.duration - activeTemp.plannedRemainingMinutes < 30 && request.percent == activeTemp.convertedToPercent(now, profile)) {
                 aapsLogger.debug(LTag.APS, "applyAPSRequest: Temp basal set correctly")
                 callback?.result(PumpEnactResult(injector).percent(request.percent)
                     .enacted(false).success(true).duration(activeTemp.plannedRemainingMinutes)
                     .comment(R.string.let_temp_basal_run))?.run()
             } else {
                 aapsLogger.debug(LTag.APS, "applyAPSRequest: tempBasalPercent()")
-                commandQueue.tempBasalPercent(request.percent, request.duration, false, profile!!, callback)
+                uel.log(Action.TEMP_BASAL, Sources.Loop,
+                    ValueWithUnit.Percent(request.percent),
+                    ValueWithUnit.Minute(request.duration))
+                commandQueue.tempBasalPercent(request.percent, request.duration, false, profile, PumpSync.TemporaryBasalType.NORMAL, callback)
             }
         } else {
             if (request.rate == 0.0 && request.duration == 0 || abs(request.rate - pump.baseBasalRate) < pump.pumpDescription.basalStep) {
                 if (activeTemp != null) {
                     aapsLogger.debug(LTag.APS, "applyAPSRequest: cancelTempBasal()")
+                    uel.log(Action.CANCEL_TEMP_BASAL, Sources.Loop)
                     commandQueue.cancelTempBasal(false, callback)
                 } else {
                     aapsLogger.debug(LTag.APS, "applyAPSRequest: Basal set correctly")
                     callback?.result(PumpEnactResult(injector).absolute(request.rate).duration(0)
                         .enacted(false).success(true).comment(R.string.basal_set_correctly))?.run()
                 }
-            } else if (activeTemp != null && activeTemp.plannedRemainingMinutes > 5 && request.duration - activeTemp.plannedRemainingMinutes < 30 && abs(request.rate - activeTemp.tempBasalConvertedToAbsolute(now, profile)) < pump.pumpDescription.basalStep) {
+            } else if (activeTemp != null && activeTemp.plannedRemainingMinutes > 5 && request.duration - activeTemp.plannedRemainingMinutes < 30 && abs(request.rate - activeTemp.convertedToAbsolute(now, profile)) < pump.pumpDescription.basalStep) {
                 aapsLogger.debug(LTag.APS, "applyAPSRequest: Temp basal set correctly")
-                callback?.result(PumpEnactResult(injector).absolute(activeTemp.tempBasalConvertedToAbsolute(now, profile))
+                callback?.result(PumpEnactResult(injector).absolute(activeTemp.convertedToAbsolute(now, profile))
                     .enacted(false).success(true).duration(activeTemp.plannedRemainingMinutes)
                     .comment(R.string.let_temp_basal_run))?.run()
             } else {
                 aapsLogger.debug(LTag.APS, "applyAPSRequest: setTempBasalAbsolute()")
-                commandQueue.tempBasalAbsolute(request.rate, request.duration, false, profile!!, callback)
+                uel.log(Action.TEMP_BASAL, Sources.Loop,
+                    ValueWithUnit.UnitPerHour(request.rate),
+                    ValueWithUnit.Minute(request.duration))
+                commandQueue.tempBasalAbsolute(request.rate, request.duration, false, profile, PumpSync.TemporaryBasalType.NORMAL, callback)
             }
         }
     }
 
     private fun applySMBRequest(request: APSResult, callback: Callback?) {
-        if (!request.bolusRequested) {
+        if (!request.bolusRequested()) {
             return
         }
         val pump = activePlugin.activePump
-        val lastBolusTime = treatmentsPlugin.lastBolusTime
+        val lastBolusTime = repository.getLastBolusRecord()?.timestamp ?: 0L
         if (lastBolusTime != 0L && lastBolusTime + 3 * 60 * 1000 > System.currentTimeMillis()) {
             aapsLogger.debug(LTag.APS, "SMB requested but still in 3 min interval")
             callback?.result(PumpEnactResult(injector)
@@ -595,13 +627,14 @@ open class LoopPlugin @Inject constructor(
 
         // deliver SMB
         val detailedBolusInfo = DetailedBolusInfo()
-        detailedBolusInfo.lastKnownBolusTime = treatmentsPlugin.lastBolusTime
-        detailedBolusInfo.eventType = TherapyEvent.Type.CORRECTION_BOLUS.text
+        detailedBolusInfo.lastKnownBolusTime = repository.getLastBolusRecord()?.timestamp ?: 0L
+        detailedBolusInfo.eventType = DetailedBolusInfo.EventType.CORRECTION_BOLUS
         detailedBolusInfo.insulin = request.smb
-        detailedBolusInfo.isSMB = true
-        detailedBolusInfo.source = Source.USER
-        detailedBolusInfo.deliverAt = request.deliverAt
+        detailedBolusInfo.bolusType = DetailedBolusInfo.BolusType.SMB
+        detailedBolusInfo.deliverAtTheLatest = request.deliverAt
         aapsLogger.debug(LTag.APS, "applyAPSRequest: bolus()")
+        if (request.smb > 0.0)
+            uel.log(Action.SMB, Sources.Loop, ValueWithUnit.Insulin(detailedBolusInfo.insulin))
         commandQueue.bolus(detailedBolusInfo, callback)
     }
 
@@ -613,7 +646,7 @@ open class LoopPlugin @Inject constructor(
         val pump = activePlugin.activePump
         disconnectTo(System.currentTimeMillis() + durationInMinutes * 60 * 1000L)
         if (pump.pumpDescription.tempBasalStyle == PumpDescription.ABSOLUTE) {
-            commandQueue.tempBasalAbsolute(0.0, durationInMinutes, true, profile!!, object : Callback() {
+            commandQueue.tempBasalAbsolute(0.0, durationInMinutes, true, profile!!, PumpSync.TemporaryBasalType.EMULATED_PUMP_SUSPEND, object : Callback() {
                 override fun run() {
                     if (!result.success) {
                         ErrorHelperActivity.runAlarm(context, result.comment, resourceHelper.gs(R.string.tempbasaldeliveryerror), info.nightscout.androidaps.dana.R.raw.boluserror)
@@ -621,7 +654,7 @@ open class LoopPlugin @Inject constructor(
                 }
             })
         } else {
-            commandQueue.tempBasalPercent(0, durationInMinutes, true, profile!!, object : Callback() {
+            commandQueue.tempBasalPercent(0, durationInMinutes, true, profile!!, PumpSync.TemporaryBasalType.EMULATED_PUMP_SUSPEND, object : Callback() {
                 override fun run() {
                     if (!result.success) {
                         ErrorHelperActivity.runAlarm(context, result.comment, resourceHelper.gs(R.string.tempbasaldeliveryerror), info.nightscout.androidaps.dana.R.raw.boluserror)
@@ -629,7 +662,7 @@ open class LoopPlugin @Inject constructor(
                 }
             })
         }
-        if (pump.pumpDescription.isExtendedBolusCapable && treatmentsPlugin.isInHistoryExtendedBolusInProgress) {
+        if (pump.pumpDescription.isExtendedBolusCapable && iobCobCalculator.getExtendedBolus(dateUtil.now()) != null) {
             commandQueue.cancelExtended(object : Callback() {
                 override fun run() {
                     if (!result.success) {
@@ -654,17 +687,16 @@ open class LoopPlugin @Inject constructor(
     }
 
     override fun createOfflineEvent(durationInMinutes: Int) {
-        disposable += repository.runTransactionForResult(InsertTherapyEventIfNewTransaction(
-            timestamp = dateUtil._now(),
+        disposable += repository.runTransactionForResult(InsertIfNewByTimestampTherapyEventTransaction(
+            timestamp = dateUtil.now(),
             type = TherapyEvent.Type.APS_OFFLINE,
             duration = T.mins(durationInMinutes.toLong()).msecs(),
             enteredBy = "openaps://" + "AndroidAPS",
             glucoseUnit = TherapyEvent.GlucoseUnit.MGDL
-        )).subscribe({ result ->
-            result.inserted.forEach { nsUpload.uploadEvent(it) }
-        }, {
-            aapsLogger.error(LTag.BGSOURCE, "Error while saving therapy event", it)
-        })
+        )).subscribe(
+            { result -> result.inserted.forEach { aapsLogger.debug(LTag.DATABASE, "Inserted therapy event $it") } },
+            { aapsLogger.error(LTag.DATABASE, "Error while saving therapy event", it) }
+        )
     }
 
     companion object {

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

@@ -1,11 +1,15 @@
 package info.nightscout.androidaps.plugins.aps.openAPSAMA
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.IobTotal
 import info.nightscout.androidaps.data.MealData
-import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.extensions.convertedToAbsolute
+import info.nightscout.androidaps.extensions.getPassedDurationToTimeInMinutes
+import info.nightscout.androidaps.extensions.plannedRemainingMinutes
+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.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -15,8 +19,6 @@ import info.nightscout.androidaps.plugins.aps.openAPSSMB.SMBDefaults
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.general.openhumans.OpenHumansUploader
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.json.JSONArray
 import org.json.JSONException
@@ -37,7 +39,7 @@ class DetermineBasalAdapterAMAJS internal constructor(scriptReader: ScriptReader
     @Inject lateinit var constraintChecker: ConstraintChecker
     @Inject lateinit var sp: SP
     @Inject lateinit var profileFunction: ProfileFunction
-    @Inject lateinit var treatmentsPlugin: TreatmentsPlugin
+    @Inject lateinit var iobCobCalculator: IobCobCalculator
     @Inject lateinit var openHumansUploader: OpenHumansUploader
 
     private val mScriptReader: ScriptReader
@@ -160,13 +162,13 @@ class DetermineBasalAdapterAMAJS internal constructor(scriptReader: ScriptReader
         this.profile.put("max_iob", maxIob)
         this.profile.put("dia", min(profile.dia, 3.0))
         this.profile.put("type", "current")
-        this.profile.put("max_daily_basal", profile.maxDailyBasal)
+        this.profile.put("max_daily_basal", profile.getMaxDailyBasal())
         this.profile.put("max_basal", maxBasal)
         this.profile.put("min_bg", minBg)
         this.profile.put("max_bg", maxBg)
         this.profile.put("target_bg", targetBg)
-        this.profile.put("carb_ratio", profile.ic)
-        this.profile.put("sens", profile.isfMgdl)
+        this.profile.put("carb_ratio", profile.getIc())
+        this.profile.put("sens", profile.getIsfMgdl())
         this.profile.put("max_daily_safety_multiplier", sp.getInt(R.string.key_openapsama_max_daily_safety_multiplier, 3))
         this.profile.put("current_basal_safety_multiplier", sp.getDouble(R.string.key_openapsama_current_basal_safety_multiplier, 4.0))
         this.profile.put("skip_neutral_temps", true)
@@ -179,22 +181,19 @@ class DetermineBasalAdapterAMAJS internal constructor(scriptReader: ScriptReader
         } else {
             this.profile.put("min_5m_carbimpact", sp.getDouble(R.string.key_openapsama_min_5m_carbimpact, SMBDefaults.min_5m_carbimpact))
         }
-        if (profileFunction.getUnits() == Constants.MMOL) {
+        if (profileFunction.getUnits() == GlucoseUnit.MMOL) {
             this.profile.put("out_units", "mmol/L")
         }
         val now = System.currentTimeMillis()
-        val tb = treatmentsPlugin.getTempBasalFromHistory(now)
+        val tb = iobCobCalculator.getTempBasalIncludingConvertedExtended(now)
         currentTemp = JSONObject()
         currentTemp.put("temp", "absolute")
         currentTemp.put("duration", tb?.plannedRemainingMinutes ?: 0)
-        currentTemp.put("rate", tb?.tempBasalConvertedToAbsolute(now, profile) ?: 0.0)
-
+        currentTemp.put("rate", tb?.convertedToAbsolute(now, profile) ?: 0.0)
         // as we have non default temps longer than 30 minutes
-        val tempBasal = treatmentsPlugin.getTempBasalFromHistory(System.currentTimeMillis())
-        if (tempBasal != null) {
-            currentTemp.put("minutesrunning", tempBasal.realDuration)
-        }
-        iobData = IobCobCalculatorPlugin.convertToJSONArray(iobArray)
+        if (tb != null) currentTemp.put("minutesrunning", tb.getPassedDurationToTimeInMinutes(now))
+
+        iobData = iobCobCalculator.convertToJSONArray(iobArray)
         this.glucoseStatus = JSONObject()
         this.glucoseStatus.put("glucose", glucoseStatus.glucose)
         if (sp.getBoolean(R.string.key_always_use_shortavg, false)) {
@@ -206,7 +205,6 @@ class DetermineBasalAdapterAMAJS internal constructor(scriptReader: ScriptReader
         this.glucoseStatus.put("long_avgdelta", glucoseStatus.longAvgDelta)
         this.mealData = JSONObject()
         this.mealData.put("carbs", mealData.carbs)
-        this.mealData.put("boluses", mealData.boluses)
         this.mealData.put("mealCOB", mealData.mealCOB)
         if (constraintChecker.isAutosensModeEnabled().value()) {
             autosensData.put("ratio", autosensDataRatio)

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

@@ -3,7 +3,6 @@ package info.nightscout.androidaps.plugins.aps.openAPSAMA
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.aps.loop.APSResult
-import info.nightscout.androidaps.utils.DateUtil
 import org.json.JSONException
 import org.json.JSONObject
 import org.mozilla.javascript.NativeObject
@@ -14,7 +13,7 @@ class DetermineBasalResultAMA private constructor(injector: HasAndroidInjector)
     private var snoozeBG = 0.0
 
     internal constructor(injector: HasAndroidInjector, result: NativeObject, j: JSONObject) : this(injector) {
-        date = DateUtil.now()
+        date = dateUtil.now()
         json = j
         if (result.containsKey("error")) {
             reason = result["error"].toString()
@@ -41,7 +40,6 @@ class DetermineBasalResultAMA private constructor(injector: HasAndroidInjector)
                 tempBasalRequested = false
             }
         }
-        bolusRequested = false
     }
 
     override fun newAndClone(injector: HasAndroidInjector): DetermineBasalResultAMA {

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

@@ -35,6 +35,7 @@ class OpenAPSAMAFragment : DaggerFragment() {
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var openAPSAMAPlugin: OpenAPSAMAPlugin
     @Inject lateinit var dateUtil: DateUtil
+    @Inject lateinit var jsonFormatter: JSONFormatter
 
     private var _binding: OpenapsamaFragmentBinding? = null
 
@@ -92,30 +93,30 @@ class OpenAPSAMAFragment : DaggerFragment() {
     private fun updateGUI() {
         if (_binding == null) return
         openAPSAMAPlugin.lastAPSResult?.let { lastAPSResult ->
-            binding.result.text = JSONFormatter.format(lastAPSResult.json)
+            binding.result.text = jsonFormatter.format(lastAPSResult.json)
             binding.request.text = lastAPSResult.toSpanned()
         }
         openAPSAMAPlugin.lastDetermineBasalAdapterAMAJS?.let { determineBasalAdapterAMAJS ->
-            binding.glucosestatus.text = JSONFormatter.format(determineBasalAdapterAMAJS.glucoseStatusParam)
-            binding.currenttemp.text = JSONFormatter.format(determineBasalAdapterAMAJS.currentTempParam)
+            binding.glucosestatus.text = jsonFormatter.format(determineBasalAdapterAMAJS.glucoseStatusParam)
+            binding.currenttemp.text = jsonFormatter.format(determineBasalAdapterAMAJS.currentTempParam)
             try {
                 val iobArray = JSONArray(determineBasalAdapterAMAJS.iobDataParam)
-                binding.iobdata.text = TextUtils.concat(resourceHelper.gs(R.string.array_of_elements, iobArray.length()) + "\n", JSONFormatter.format(iobArray.getString(0)))
+                binding.iobdata.text = TextUtils.concat(resourceHelper.gs(R.string.array_of_elements, iobArray.length()) + "\n", jsonFormatter.format(iobArray.getString(0)))
             } catch (e: JSONException) {
                 aapsLogger.error(LTag.APS, "Unhandled exception", e)
                 @Suppress("SetTextI18n")
                 binding.iobdata.text = "JSONException see log for details"
             }
 
-            binding.profile.text = JSONFormatter.format(determineBasalAdapterAMAJS.profileParam)
-            binding.mealdata.text = JSONFormatter.format(determineBasalAdapterAMAJS.mealDataParam)
+            binding.profile.text = jsonFormatter.format(determineBasalAdapterAMAJS.profileParam)
+            binding.mealdata.text = jsonFormatter.format(determineBasalAdapterAMAJS.mealDataParam)
             binding.scriptdebugdata.text = determineBasalAdapterAMAJS.scriptDebug
         }
         if (openAPSAMAPlugin.lastAPSRun != 0L) {
             binding.lastrun.text = dateUtil.dateAndTimeString(openAPSAMAPlugin.lastAPSRun)
         }
         openAPSAMAPlugin.lastAutosensResult.let {
-            binding.autosensdata.text = JSONFormatter.format(it.json())
+            binding.autosensdata.text = jsonFormatter.format(it.json())
         }
     }
 

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

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.aps.openAPSAMA
 import android.content.Context
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.database.ValueWrapper
 import info.nightscout.androidaps.interfaces.*
@@ -15,15 +15,13 @@ import info.nightscout.androidaps.plugins.aps.loop.ScriptReader
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 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.androidaps.utils.Round
-import info.nightscout.androidaps.utils.extensions.target
+import info.nightscout.androidaps.extensions.target
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.json.JSONException
 import javax.inject.Inject
@@ -38,9 +36,8 @@ open class OpenAPSAMAPlugin @Inject constructor(
     resourceHelper: ResourceHelper,
     private val profileFunction: ProfileFunction,
     private val context: Context,
-    private val activePlugin: ActivePluginProvider,
-    private val treatmentsPlugin: TreatmentsInterface,
-    private val iobCobCalculatorPlugin: IobCobCalculatorPlugin,
+    private val activePlugin: ActivePlugin,
+    private val iobCobCalculator: IobCobCalculator,
     private val hardLimits: HardLimits,
     private val profiler: Profiler,
     private val fabricPrivacy: FabricPrivacy,
@@ -56,7 +53,7 @@ open class OpenAPSAMAPlugin @Inject constructor(
     .preferencesId(R.xml.pref_openapsama)
     .description(R.string.description_ama),
     aapsLogger, resourceHelper, injector
-), APSInterface {
+), APS {
 
     // last values
     override var lastAPSRun: Long = 0
@@ -107,19 +104,19 @@ open class OpenAPSAMAPlugin @Inject constructor(
         }.value()
         var start = System.currentTimeMillis()
         var startPart = System.currentTimeMillis()
-        val iobArray = iobCobCalculatorPlugin.calculateIobArrayInDia(profile)
+        val iobArray = iobCobCalculator.calculateIobArrayInDia(profile)
         profiler.log(LTag.APS, "calculateIobArrayInDia()", startPart)
         startPart = System.currentTimeMillis()
-        val mealData = iobCobCalculatorPlugin.mealData
+        val mealData = iobCobCalculator.getMealDataWithWaitingForCalculationFinish()
         profiler.log(LTag.APS, "getMealData()", startPart)
         val maxIob = constraintChecker.getMaxIOBAllowed().also { maxIOBAllowedConstraint ->
             inputConstraints.copyReasons(maxIOBAllowedConstraint)
         }.value()
-        var minBg = hardLimits.verifyHardLimits(Round.roundTo(profile.targetLowMgdl, 0.1), R.string.profile_low_target, HardLimits.VERY_HARD_LIMIT_MIN_BG[0].toDouble(), HardLimits.VERY_HARD_LIMIT_MIN_BG[1].toDouble())
-        var maxBg = hardLimits.verifyHardLimits(Round.roundTo(profile.targetHighMgdl, 0.1), R.string.profile_high_target, HardLimits.VERY_HARD_LIMIT_MAX_BG[0].toDouble(), HardLimits.VERY_HARD_LIMIT_MAX_BG[1].toDouble())
-        var targetBg = hardLimits.verifyHardLimits(profile.targetMgdl, R.string.temp_target_value, HardLimits.VERY_HARD_LIMIT_TARGET_BG[0].toDouble(), HardLimits.VERY_HARD_LIMIT_TARGET_BG[1].toDouble())
+        var minBg = hardLimits.verifyHardLimits(Round.roundTo(profile.getTargetLowMgdl(), 0.1), R.string.profile_low_target, HardLimits.VERY_HARD_LIMIT_MIN_BG[0].toDouble(), HardLimits.VERY_HARD_LIMIT_MIN_BG[1].toDouble())
+        var maxBg = hardLimits.verifyHardLimits(Round.roundTo(profile.getTargetHighMgdl(), 0.1), R.string.profile_high_target, HardLimits.VERY_HARD_LIMIT_MAX_BG[0].toDouble(), HardLimits.VERY_HARD_LIMIT_MAX_BG[1].toDouble())
+        var targetBg = hardLimits.verifyHardLimits(profile.getTargetMgdl(), R.string.temp_target_value, HardLimits.VERY_HARD_LIMIT_TARGET_BG[0].toDouble(), HardLimits.VERY_HARD_LIMIT_TARGET_BG[1].toDouble())
         var isTempTarget = false
-        val tempTarget = repository.getTemporaryTargetActiveAt(dateUtil._now()).blockingGet()
+        val tempTarget = repository.getTemporaryTargetActiveAt(dateUtil.now()).blockingGet()
         if (tempTarget is ValueWrapper.Existing) {
             isTempTarget = true
             minBg = hardLimits.verifyHardLimits(tempTarget.value.lowTarget, R.string.temp_target_low_target, HardLimits.VERY_HARD_LIMIT_TEMP_MIN_BG[0].toDouble(), HardLimits.VERY_HARD_LIMIT_TEMP_MIN_BG[1].toDouble())
@@ -128,12 +125,12 @@ open class OpenAPSAMAPlugin @Inject constructor(
         }
         if (!hardLimits.checkOnlyHardLimits(profile.dia, R.string.profile_dia, hardLimits.minDia(), hardLimits.maxDia())) return
         if (!hardLimits.checkOnlyHardLimits(profile.getIcTimeFromMidnight(Profile.secondsFromMidnight()), R.string.profile_carbs_ratio_value, hardLimits.minIC(), hardLimits.maxIC())) return
-        if (!hardLimits.checkOnlyHardLimits(profile.isfMgdl, R.string.profile_sensitivity_value, HardLimits.MIN_ISF, HardLimits.MAX_ISF)) return
-        if (!hardLimits.checkOnlyHardLimits(profile.maxDailyBasal, R.string.profile_max_daily_basal_value, 0.02, hardLimits.maxBasal())) return
+        if (!hardLimits.checkOnlyHardLimits(profile.getIsfMgdl(), R.string.profile_sensitivity_value, HardLimits.MIN_ISF, HardLimits.MAX_ISF)) return
+        if (!hardLimits.checkOnlyHardLimits(profile.getMaxDailyBasal(), R.string.profile_max_daily_basal_value, 0.02, hardLimits.maxBasal())) return
         if (!hardLimits.checkOnlyHardLimits(pump.baseBasalRate, R.string.current_basal_value, 0.01, hardLimits.maxBasal())) return
         startPart = System.currentTimeMillis()
         if (constraintChecker.isAutosensModeEnabled().value()) {
-            val autosensData = iobCobCalculatorPlugin.getLastAutosensDataSynchronized("OpenAPSPlugin")
+            val autosensData = iobCobCalculator.getLastAutosensDataWithWaitForCalculationFinish("OpenAPSPlugin")
             if (autosensData == null) {
                 rxBus.send(EventOpenAPSUpdateResultGui(resourceHelper.gs(R.string.openaps_noasdata)))
                 return
@@ -163,10 +160,10 @@ open class OpenAPSAMAPlugin @Inject constructor(
             lastAPSResult = null
             lastAPSRun = 0
         } else {
-            if (determineBasalResultAMA.rate == 0.0 && determineBasalResultAMA.duration == 0 && !treatmentsPlugin.isTempBasalInProgress) determineBasalResultAMA.tempBasalRequested = false
+            if (determineBasalResultAMA.rate == 0.0 && determineBasalResultAMA.duration == 0 && iobCobCalculator.getTempBasalIncludingConvertedExtended(dateUtil.now()) == null) determineBasalResultAMA.tempBasalRequested = false
             determineBasalResultAMA.iob = iobArray[0]
             val now = System.currentTimeMillis()
-            determineBasalResultAMA.json?.put("timestamp", DateUtil.toISOString(now))
+            determineBasalResultAMA.json?.put("timestamp", dateUtil.toISOString(now))
             determineBasalResultAMA.inputConstraints = inputConstraints
             lastDetermineBasalAdapterAMAJS = determineBasalAdapterAMAJS
             lastAPSResult = determineBasalResultAMA

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

@@ -1,12 +1,16 @@
 package info.nightscout.androidaps.plugins.aps.openAPSSMB
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.IobTotal
 import info.nightscout.androidaps.data.MealData
-import info.nightscout.androidaps.data.Profile
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
+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.GlucoseUnit
+import info.nightscout.androidaps.interfaces.IobCobCalculator
+import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -15,8 +19,6 @@ import info.nightscout.androidaps.plugins.aps.loop.ScriptReader
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.general.openhumans.OpenHumansUploader
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.utils.SafeParse
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
@@ -37,8 +39,8 @@ class DetermineBasalAdapterSMBJS internal constructor(private val scriptReader:
     @Inject lateinit var sp: SP
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var profileFunction: ProfileFunction
-    @Inject lateinit var treatmentsPlugin: TreatmentsPlugin
-    @Inject lateinit var activePluginProvider: ActivePluginProvider
+    @Inject lateinit var iobCobCalculator: IobCobCalculator
+    @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var openHumansUploader: OpenHumansUploader
 
     private var profile = JSONObject()
@@ -173,18 +175,18 @@ class DetermineBasalAdapterSMBJS internal constructor(private val scriptReader:
                                                      advancedFiltering: Boolean,
                                                      isSaveCgmSource: Boolean
     ) {
-        val pump = activePluginProvider.activePump
+        val pump = activePlugin.activePump
         val pumpBolusStep = pump.pumpDescription.bolusStep
         this.profile.put("max_iob", maxIob)
         //mProfile.put("dia", profile.getDia());
         this.profile.put("type", "current")
-        this.profile.put("max_daily_basal", profile.maxDailyBasal)
+        this.profile.put("max_daily_basal", profile.getMaxDailyBasal())
         this.profile.put("max_basal", maxBasal)
         this.profile.put("min_bg", minBg)
         this.profile.put("max_bg", maxBg)
         this.profile.put("target_bg", targetBg)
-        this.profile.put("carb_ratio", profile.ic)
-        this.profile.put("sens", profile.isfMgdl)
+        this.profile.put("carb_ratio", profile.getIc())
+        this.profile.put("sens", profile.getIsfMgdl())
         this.profile.put("max_daily_safety_multiplier", sp.getInt(R.string.key_openapsama_max_daily_safety_multiplier, 3))
         this.profile.put("current_basal_safety_multiplier", sp.getDouble(R.string.key_openapsama_current_basal_safety_multiplier, 4.0))
 
@@ -223,21 +225,18 @@ class DetermineBasalAdapterSMBJS internal constructor(private val scriptReader:
         this.profile.put("current_basal", basalRate)
         this.profile.put("temptargetSet", tempTargetSet)
         this.profile.put("autosens_max", SafeParse.stringToDouble(sp.getString(R.string.key_openapsama_autosens_max, "1.2")))
-        if (profileFunction.getUnits() == Constants.MMOL) {
+        if (profileFunction.getUnits() == GlucoseUnit.MMOL) {
             this.profile.put("out_units", "mmol/L")
         }
         val now = System.currentTimeMillis()
-        val tb = treatmentsPlugin.getTempBasalFromHistory(now)
+        val tb = iobCobCalculator.getTempBasalIncludingConvertedExtended(now)
         currentTemp.put("temp", "absolute")
         currentTemp.put("duration", tb?.plannedRemainingMinutes ?: 0)
-        currentTemp.put("rate", tb?.tempBasalConvertedToAbsolute(now, profile) ?: 0.0)
-
+        currentTemp.put("rate", tb?.convertedToAbsolute(now, profile) ?: 0.0)
         // as we have non default temps longer than 30 mintues
-        val tempBasal = treatmentsPlugin.getTempBasalFromHistory(System.currentTimeMillis())
-        if (tempBasal != null) {
-            currentTemp.put("minutesrunning", tempBasal.realDuration)
-        }
-        iobData = IobCobCalculatorPlugin.convertToJSONArray(iobArray)
+        if (tb != null) currentTemp.put("minutesrunning", tb.getPassedDurationToTimeInMinutes(now))
+
+        iobData = iobCobCalculator.convertToJSONArray(iobArray)
         mGlucoseStatus.put("glucose", glucoseStatus.glucose)
         mGlucoseStatus.put("noise", glucoseStatus.noise)
         if (sp.getBoolean(R.string.key_always_use_shortavg, false)) {
@@ -249,7 +248,6 @@ class DetermineBasalAdapterSMBJS internal constructor(private val scriptReader:
         mGlucoseStatus.put("long_avgdelta", glucoseStatus.longAvgDelta)
         mGlucoseStatus.put("date", glucoseStatus.date)
         this.mealData.put("carbs", mealData.carbs)
-        this.mealData.put("boluses", mealData.boluses)
         this.mealData.put("mealCOB", mealData.mealCOB)
         this.mealData.put("slopeFromMaxDeviation", mealData.slopeFromMaxDeviation)
         this.mealData.put("slopeFromMinDeviation", mealData.slopeFromMinDeviation)

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

@@ -3,7 +3,6 @@ package info.nightscout.androidaps.plugins.aps.openAPSSMB
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.aps.loop.APSResult
-import info.nightscout.androidaps.utils.DateUtil
 import org.json.JSONException
 import org.json.JSONObject
 
@@ -13,7 +12,7 @@ class DetermineBasalResultSMB private constructor(injector: HasAndroidInjector)
     private var snoozeBG = 0.0
 
     internal constructor(injector: HasAndroidInjector, result: JSONObject) : this(injector) {
-        date = DateUtil.now()
+        date = dateUtil.now()
         json = result
         try {
             if (result.has("error")) {
@@ -36,7 +35,6 @@ class DetermineBasalResultSMB private constructor(injector: HasAndroidInjector)
                 duration = -1
             }
             if (result.has("units")) {
-                bolusRequested = true
                 smb = result.getDouble("units")
             } else {
                 smb = 0.0
@@ -47,7 +45,7 @@ class DetermineBasalResultSMB private constructor(injector: HasAndroidInjector)
             if (result.has("deliverAt")) {
                 val date = result.getString("deliverAt")
                 try {
-                    deliverAt = DateUtil.fromISODateString(date).time
+                    deliverAt = dateUtil.fromISODateString(date)
                 } catch (e: Exception) {
                     aapsLogger.error(LTag.APS, "Error parsing 'deliverAt' date: $date", e)
                 }

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

@@ -36,6 +36,7 @@ class OpenAPSSMBFragment : DaggerFragment() {
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var openAPSSMBPlugin: OpenAPSSMBPlugin
     @Inject lateinit var dateUtil: DateUtil
+    @Inject lateinit var jsonFormatter: JSONFormatter
 
     private var _binding: OpenapsamaFragmentBinding? = null
 
@@ -92,23 +93,23 @@ class OpenAPSSMBFragment : DaggerFragment() {
     fun updateGUI() {
         if (_binding == null) return
         openAPSSMBPlugin.lastAPSResult?.let { lastAPSResult ->
-            binding.result.text = JSONFormatter.format(lastAPSResult.json)
+            binding.result.text = jsonFormatter.format(lastAPSResult.json)
             binding.request.text = lastAPSResult.toSpanned()
         }
         openAPSSMBPlugin.lastDetermineBasalAdapterSMBJS?.let { determineBasalAdapterSMBJS ->
-            binding.glucosestatus.text = JSONFormatter.format(determineBasalAdapterSMBJS.glucoseStatusParam)
-            binding.currenttemp.text = JSONFormatter.format(determineBasalAdapterSMBJS.currentTempParam)
+            binding.glucosestatus.text = jsonFormatter.format(determineBasalAdapterSMBJS.glucoseStatusParam)
+            binding.currenttemp.text = jsonFormatter.format(determineBasalAdapterSMBJS.currentTempParam)
             try {
                 val iobArray = JSONArray(determineBasalAdapterSMBJS.iobDataParam)
-                binding.iobdata.text = TextUtils.concat(resourceHelper.gs(R.string.array_of_elements, iobArray.length()) + "\n", JSONFormatter.format(iobArray.getString(0)))
+                binding.iobdata.text = TextUtils.concat(resourceHelper.gs(R.string.array_of_elements, iobArray.length()) + "\n", jsonFormatter.format(iobArray.getString(0)))
             } catch (e: JSONException) {
                 aapsLogger.error(LTag.APS, "Unhandled exception", e)
                 @SuppressLint("SetTextI18n")
                 binding.iobdata.text = "JSONException see log for details"
             }
 
-            binding.profile.text = JSONFormatter.format(determineBasalAdapterSMBJS.profileParam)
-            binding.mealdata.text = JSONFormatter.format(determineBasalAdapterSMBJS.mealDataParam)
+            binding.profile.text = jsonFormatter.format(determineBasalAdapterSMBJS.profileParam)
+            binding.mealdata.text = jsonFormatter.format(determineBasalAdapterSMBJS.mealDataParam)
             binding.scriptdebugdata.text = determineBasalAdapterSMBJS.scriptDebug
             openAPSSMBPlugin.lastAPSResult?.inputConstraints?.let {
                 binding.constraints.text = it.getReasons(aapsLogger)
@@ -118,7 +119,7 @@ class OpenAPSSMBFragment : DaggerFragment() {
             binding.lastrun.text = dateUtil.dateAndTimeString(openAPSSMBPlugin.lastAPSRun)
         }
         openAPSSMBPlugin.lastAutosensResult.let {
-            binding.autosensdata.text = JSONFormatter.format(it.json())
+            binding.autosensdata.text = jsonFormatter.format(it.json())
         }
     }
 

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

@@ -5,9 +5,9 @@ import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.SwitchPreference
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.database.ValueWrapper
+import info.nightscout.androidaps.extensions.target
 import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -17,14 +17,11 @@ import info.nightscout.androidaps.plugins.aps.loop.ScriptReader
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.HardLimits
 import info.nightscout.androidaps.utils.Profiler
 import info.nightscout.androidaps.utils.Round
-import info.nightscout.androidaps.utils.extensions.target
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import javax.inject.Inject
@@ -39,9 +36,8 @@ open class OpenAPSSMBPlugin @Inject constructor(
     resourceHelper: ResourceHelper,
     private val profileFunction: ProfileFunction,
     private val context: Context,
-    private val activePlugin: ActivePluginProvider,
-    private val treatmentsPlugin: TreatmentsInterface,
-    private val iobCobCalculatorPlugin: IobCobCalculatorPlugin,
+    private val activePlugin: ActivePlugin,
+    private val iobCobCalculator: IobCobCalculator,
     private val hardLimits: HardLimits,
     private val profiler: Profiler,
     private val sp: SP,
@@ -58,7 +54,7 @@ open class OpenAPSSMBPlugin @Inject constructor(
     .description(R.string.description_smb)
     .setDefault(),
     aapsLogger, resourceHelper, injector
-), APSInterface, ConstraintsInterface {
+), APS, Constraints {
 
     // last values
     override var lastAPSRun: Long = 0
@@ -121,11 +117,11 @@ open class OpenAPSSMBPlugin @Inject constructor(
             inputConstraints.copyReasons(maxIOBAllowedConstraint)
         }.value()
 
-        var minBg = hardLimits.verifyHardLimits(Round.roundTo(profile.targetLowMgdl, 0.1), R.string.profile_low_target, HardLimits.VERY_HARD_LIMIT_MIN_BG[0].toDouble(), HardLimits.VERY_HARD_LIMIT_MIN_BG[1].toDouble())
-        var maxBg = hardLimits.verifyHardLimits(Round.roundTo(profile.targetHighMgdl, 0.1), R.string.profile_high_target, HardLimits.VERY_HARD_LIMIT_MAX_BG[0].toDouble(), HardLimits.VERY_HARD_LIMIT_MAX_BG[1].toDouble())
-        var targetBg = hardLimits.verifyHardLimits(profile.targetMgdl, R.string.temp_target_value, HardLimits.VERY_HARD_LIMIT_TARGET_BG[0].toDouble(), HardLimits.VERY_HARD_LIMIT_TARGET_BG[1].toDouble())
+        var minBg = hardLimits.verifyHardLimits(Round.roundTo(profile.getTargetLowMgdl(), 0.1), R.string.profile_low_target, HardLimits.VERY_HARD_LIMIT_MIN_BG[0].toDouble(), HardLimits.VERY_HARD_LIMIT_MIN_BG[1].toDouble())
+        var maxBg = hardLimits.verifyHardLimits(Round.roundTo(profile.getTargetHighMgdl(), 0.1), R.string.profile_high_target, HardLimits.VERY_HARD_LIMIT_MAX_BG[0].toDouble(), HardLimits.VERY_HARD_LIMIT_MAX_BG[1].toDouble())
+        var targetBg = hardLimits.verifyHardLimits(profile.getTargetMgdl(), R.string.temp_target_value, HardLimits.VERY_HARD_LIMIT_TARGET_BG[0].toDouble(), HardLimits.VERY_HARD_LIMIT_TARGET_BG[1].toDouble())
         var isTempTarget = false
-        val tempTarget = repository.getTemporaryTargetActiveAt(dateUtil._now()).blockingGet()
+        val tempTarget = repository.getTemporaryTargetActiveAt(dateUtil.now()).blockingGet()
         if (tempTarget is ValueWrapper.Existing) {
             isTempTarget = true
             minBg = hardLimits.verifyHardLimits(tempTarget.value.lowTarget, R.string.temp_target_low_target, HardLimits.VERY_HARD_LIMIT_TEMP_MIN_BG[0].toDouble(), HardLimits.VERY_HARD_LIMIT_TEMP_MIN_BG[1].toDouble())
@@ -134,12 +130,12 @@ open class OpenAPSSMBPlugin @Inject constructor(
         }
         if (!hardLimits.checkOnlyHardLimits(profile.dia, R.string.profile_dia, hardLimits.minDia(), hardLimits.maxDia())) return
         if (!hardLimits.checkOnlyHardLimits(profile.getIcTimeFromMidnight(Profile.secondsFromMidnight()), R.string.profile_carbs_ratio_value, hardLimits.minIC(), hardLimits.maxIC())) return
-        if (!hardLimits.checkOnlyHardLimits(profile.isfMgdl, R.string.profile_sensitivity_value, HardLimits.MIN_ISF, HardLimits.MAX_ISF)) return
-        if (!hardLimits.checkOnlyHardLimits(profile.maxDailyBasal, R.string.profile_max_daily_basal_value, 0.02, hardLimits.maxBasal())) return
+        if (!hardLimits.checkOnlyHardLimits(profile.getIsfMgdl(), R.string.profile_sensitivity_value, HardLimits.MIN_ISF, HardLimits.MAX_ISF)) return
+        if (!hardLimits.checkOnlyHardLimits(profile.getMaxDailyBasal(), R.string.profile_max_daily_basal_value, 0.02, hardLimits.maxBasal())) return
         if (!hardLimits.checkOnlyHardLimits(pump.baseBasalRate, R.string.current_basal_value, 0.01, hardLimits.maxBasal())) return
         startPart = System.currentTimeMillis()
         if (constraintChecker.isAutosensModeEnabled().value()) {
-            val autosensData = iobCobCalculatorPlugin.getLastAutosensDataSynchronized("OpenAPSPlugin")
+            val autosensData = iobCobCalculator.getLastAutosensDataWithWaitForCalculationFinish("OpenAPSPlugin")
             if (autosensData == null) {
                 rxBus.send(EventOpenAPSUpdateResultGui(resourceHelper.gs(R.string.openaps_noasdata)))
                 return
@@ -148,7 +144,7 @@ open class OpenAPSSMBPlugin @Inject constructor(
         } else {
             lastAutosensResult.sensResult = "autosens disabled"
         }
-        val iobArray = iobCobCalculatorPlugin.calculateIobArrayForSMB(lastAutosensResult, SMBDefaults.exercise_mode, SMBDefaults.half_basal_exercise_target, isTempTarget)
+        val iobArray = iobCobCalculator.calculateIobArrayForSMB(lastAutosensResult, SMBDefaults.exercise_mode, SMBDefaults.half_basal_exercise_target, isTempTarget)
         profiler.log(LTag.APS, "calculateIobArrayInDia()", startPart)
         startPart = System.currentTimeMillis()
         val smbAllowed = Constraint(!tempBasalFallback).also {
@@ -172,7 +168,7 @@ open class OpenAPSSMBPlugin @Inject constructor(
                 activePlugin.activePump.baseBasalRate,
                 iobArray,
                 glucoseStatus,
-                iobCobCalculatorPlugin.mealData,
+                iobCobCalculator.getMealDataWithWaitingForCalculationFinish(),
                 lastAutosensResult.ratio,
                 isTempTarget,
                 smbAllowed.value(),
@@ -190,9 +186,9 @@ open class OpenAPSSMBPlugin @Inject constructor(
             } else {
                 // TODO still needed with oref1?
                 // Fix bug determine basal
-                if (determineBasalResultSMB.rate == 0.0 && determineBasalResultSMB.duration == 0 && !treatmentsPlugin.isTempBasalInProgress) determineBasalResultSMB.tempBasalRequested = false
+                if (determineBasalResultSMB.rate == 0.0 && determineBasalResultSMB.duration == 0 && iobCobCalculator.getTempBasalIncludingConvertedExtended(dateUtil.now()) == null) determineBasalResultSMB.tempBasalRequested = false
                 determineBasalResultSMB.iob = iobArray[0]
-                determineBasalResultSMB.json?.put("timestamp", DateUtil.toISOString(now))
+                determineBasalResultSMB.json?.put("timestamp", dateUtil.toISOString(now))
                 determineBasalResultSMB.inputConstraints = inputConstraints
                 lastDetermineBasalAdapterSMBJS = determineBasalAdapterSMBJS
                 lastAPSResult = determineBasalResultSMB

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

@@ -9,7 +9,7 @@ import android.widget.*
 import androidx.annotation.StringRes
 import androidx.core.content.ContextCompat
 import dagger.android.support.DaggerFragment
-import info.nightscout.androidaps.Config
+import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.PreferencesActivity
 import info.nightscout.androidaps.databinding.ConfigbuilderFragmentBinding
@@ -19,7 +19,7 @@ import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.events.EventConfigBuilderUpdateGui
 import info.nightscout.androidaps.utils.FabricPrivacy
 import io.reactivex.rxkotlin.plusAssign
-import info.nightscout.androidaps.utils.extensions.toVisibility
+import info.nightscout.androidaps.extensions.toVisibility
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
@@ -34,7 +34,7 @@ class ConfigBuilderFragment : DaggerFragment() {
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var configBuilderPlugin: ConfigBuilderPlugin
     @Inject lateinit var fabricPrivacy: FabricPrivacy
-    @Inject lateinit var activePlugin: ActivePluginProvider
+    @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var protectionCheck: ProtectionCheck
     @Inject lateinit var config: Config
 
@@ -101,18 +101,18 @@ class ConfigBuilderFragment : DaggerFragment() {
     private fun updateGUI() {
         binding.categories.removeAllViews()
         if (!config.NSCLIENT) {
-            createViewsForPlugins(R.string.configbuilder_profile, R.string.configbuilder_profile_description, PluginType.PROFILE, activePlugin.getSpecificPluginsVisibleInListByInterface(ProfileInterface::class.java, PluginType.PROFILE))
+            createViewsForPlugins(R.string.configbuilder_profile, R.string.configbuilder_profile_description, PluginType.PROFILE, activePlugin.getSpecificPluginsVisibleInList(PluginType.PROFILE))
         }
-        createViewsForPlugins(R.string.configbuilder_insulin, R.string.configbuilder_insulin_description, PluginType.INSULIN, activePlugin.getSpecificPluginsVisibleInListByInterface(InsulinInterface::class.java, PluginType.INSULIN))
+        createViewsForPlugins(R.string.configbuilder_insulin, R.string.configbuilder_insulin_description, PluginType.INSULIN, activePlugin.getSpecificPluginsVisibleInList(PluginType.INSULIN))
         if (!config.NSCLIENT) {
-            createViewsForPlugins(R.string.configbuilder_bgsource, R.string.configbuilder_bgsource_description, PluginType.BGSOURCE, activePlugin.getSpecificPluginsVisibleInListByInterface(BgSourceInterface::class.java, PluginType.BGSOURCE))
+            createViewsForPlugins(R.string.configbuilder_bgsource, R.string.configbuilder_bgsource_description, PluginType.BGSOURCE, activePlugin.getSpecificPluginsVisibleInList(PluginType.BGSOURCE))
             createViewsForPlugins(R.string.configbuilder_pump, R.string.configbuilder_pump_description, PluginType.PUMP, activePlugin.getSpecificPluginsVisibleInList(PluginType.PUMP))
         }
-        createViewsForPlugins(R.string.configbuilder_sensitivity, R.string.configbuilder_sensitivity_description, PluginType.SENSITIVITY, activePlugin.getSpecificPluginsVisibleInListByInterface(SensitivityInterface::class.java, PluginType.SENSITIVITY))
+        createViewsForPlugins(R.string.configbuilder_sensitivity, R.string.configbuilder_sensitivity_description, PluginType.SENSITIVITY, activePlugin.getSpecificPluginsVisibleInList(PluginType.SENSITIVITY))
         if (config.APS) {
             createViewsForPlugins(R.string.configbuilder_aps, R.string.configbuilder_aps_description, PluginType.APS, activePlugin.getSpecificPluginsVisibleInList(PluginType.APS))
             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.getSpecificPluginsVisibleInListByInterface(ConstraintsInterface::class.java, PluginType.CONSTRAINTS))
+            createViewsForPlugins(R.string.constraints, R.string.configbuilder_constraints_description, PluginType.CONSTRAINTS, activePlugin.getSpecificPluginsVisibleInList(PluginType.CONSTRAINTS))
         }
         createViewsForPlugins(R.string.configbuilder_treatments, R.string.configbuilder_treatments_description, PluginType.TREATMENT, activePlugin.getSpecificPluginsVisibleInList(PluginType.TREATMENT))
         createViewsForPlugins(R.string.configbuilder_general, R.string.configbuilder_general_description, PluginType.GENERAL, activePlugin.getSpecificPluginsVisibleInList(PluginType.GENERAL))

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

@@ -3,7 +3,9 @@ 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.*
+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.events.EventAppInitialized
 import info.nightscout.androidaps.events.EventConfigBuilderChange
 import info.nightscout.androidaps.events.EventRebuildTabs
@@ -27,8 +29,9 @@ class ConfigBuilderPlugin @Inject constructor(
     resourceHelper: ResourceHelper,
     private val sp: SP,
     private val rxBus: RxBusWrapper,
-    private val activePlugin: ActivePluginProvider,
-    private val uel: UserEntryLogger
+    private val activePlugin: ActivePlugin,
+    private val uel: UserEntryLogger,
+    private val pumpSync: PumpSync
 ) : PluginBase(PluginDescription()
     .mainType(PluginType.GENERAL)
     .fragmentClass(ConfigBuilderFragment::class.java.name)
@@ -40,9 +43,9 @@ class ConfigBuilderPlugin @Inject constructor(
     .shortName(R.string.configbuilder_shortname)
     .description(R.string.description_config_builder),
     aapsLogger, resourceHelper, injector
-), ConfigBuilderInterface {
+), ConfigBuilder {
 
-    fun initialize() {
+    override fun initialize() {
         (activePlugin as PluginStore).loadDefaults()
         loadSettings()
         setAlwaysEnabledPluginsEnabled()
@@ -66,7 +69,7 @@ class ConfigBuilderPlugin @Inject constructor(
             if (p.pluginDescription.alwaysEnabled && p.pluginDescription.neverVisible) continue
             savePref(p, type, true)
             if (type == PluginType.PUMP) {
-                if (p is ProfileInterface) { // Store state of optional Profile interface
+                if (p is ProfileSource) { // Store state of optional Profile interface
                     savePref(p, PluginType.PROFILE, false)
                 }
             }
@@ -90,7 +93,7 @@ class ConfigBuilderPlugin @Inject constructor(
             val type = p.getType()
             loadPref(p, type, true)
             if (p.getType() == PluginType.PUMP) {
-                if (p is ProfileInterface) {
+                if (p is ProfileSource) {
                     loadPref(p, PluginType.PROFILE, false)
                 }
             }
@@ -139,13 +142,16 @@ class ConfigBuilderPlugin @Inject constructor(
         val allowHardwarePump = sp.getBoolean("allow_hardware_pump", false)
         if (allowHardwarePump || activity == null) {
             performPluginSwitch(changedPlugin, newState, type)
+            pumpSync.connectNewPump()
         } else {
-            OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.allow_hardware_pump_text), Runnable {
+            OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.allow_hardware_pump_text), {
                 performPluginSwitch(changedPlugin, newState, type)
+                pumpSync.connectNewPump()
                 sp.putBoolean("allow_hardware_pump", true)
-                uel.log(Action.HW_PUMP_ALLOWED)
+                uel.log(Action.HW_PUMP_ALLOWED, Sources.ConfigBuilder, resourceHelper.gs(changedPlugin.pluginDescription.pluginName),
+                    ValueWithUnit.SimpleString(resourceHelper.gsNotLocalised(changedPlugin.pluginDescription.pluginName)))
                 aapsLogger.debug(LTag.PUMP, "First time HW pump allowed!")
-            }, Runnable {
+            }, {
                 rxBus.send(EventConfigBuilderUpdateGui())
                 aapsLogger.debug(LTag.PUMP, "User does not allow switching to HW pump!")
             })
@@ -153,6 +159,14 @@ class ConfigBuilderPlugin @Inject constructor(
     }
 
     override fun performPluginSwitch(changedPlugin: PluginBase, enabled: Boolean, type: PluginType) {
+        if(enabled && !changedPlugin.isEnabled()) {
+            uel.log(Action.PLUGIN_ENABLED, Sources.ConfigBuilder, resourceHelper.gs(changedPlugin.pluginDescription.pluginName),
+                ValueWithUnit.SimpleString(resourceHelper.gsNotLocalised(changedPlugin.pluginDescription.pluginName)))
+        }
+        else if(!enabled) {
+            uel.log(Action.PLUGIN_DISABLED, Sources.ConfigBuilder, resourceHelper.gs(changedPlugin.pluginDescription.pluginName),
+                ValueWithUnit.SimpleString(resourceHelper.gsNotLocalised(changedPlugin.pluginDescription.pluginName)))
+        }
         changedPlugin.setPluginEnabled(type, enabled)
         changedPlugin.setFragmentVisible(type, enabled)
         processOnEnabledCategoryChanged(changedPlugin, type)
@@ -166,13 +180,13 @@ class ConfigBuilderPlugin @Inject constructor(
     fun processOnEnabledCategoryChanged(changedPlugin: PluginBase, type: PluginType?) {
         var pluginsInCategory: ArrayList<PluginBase>? = null
         when (type) {
-            PluginType.INSULIN     -> pluginsInCategory = activePlugin.getSpecificPluginsListByInterface(InsulinInterface::class.java)
-            PluginType.SENSITIVITY -> pluginsInCategory = activePlugin.getSpecificPluginsListByInterface(SensitivityInterface::class.java)
-            PluginType.APS         -> pluginsInCategory = activePlugin.getSpecificPluginsListByInterface(APSInterface::class.java)
-            PluginType.PROFILE     -> pluginsInCategory = activePlugin.getSpecificPluginsListByInterface(ProfileInterface::class.java)
-            PluginType.BGSOURCE    -> pluginsInCategory = activePlugin.getSpecificPluginsListByInterface(BgSourceInterface::class.java)
+            PluginType.INSULIN     -> pluginsInCategory = activePlugin.getSpecificPluginsListByInterface(Insulin::class.java)
+            PluginType.SENSITIVITY -> pluginsInCategory = activePlugin.getSpecificPluginsListByInterface(Sensitivity::class.java)
+            PluginType.APS         -> pluginsInCategory = activePlugin.getSpecificPluginsListByInterface(APS::class.java)
+            PluginType.PROFILE     -> pluginsInCategory = activePlugin.getSpecificPluginsListByInterface(ProfileSource::class.java)
+            PluginType.BGSOURCE    -> pluginsInCategory = activePlugin.getSpecificPluginsListByInterface(BgSource::class.java)
             PluginType.TREATMENT   -> pluginsInCategory = activePlugin.getSpecificPluginsListByInterface(TreatmentsInterface::class.java)
-            PluginType.PUMP        -> pluginsInCategory = activePlugin.getSpecificPluginsListByInterface(PumpInterface::class.java)
+            PluginType.PUMP        -> pluginsInCategory = activePlugin.getSpecificPluginsListByInterface(Pump::class.java)
 
             else                   -> {
             }

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

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.configBuilder
 
-import info.nightscout.androidaps.Config
+import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -11,23 +11,23 @@ import javax.inject.Singleton
 class PluginStore @Inject constructor(
     private val aapsLogger: AAPSLogger,
     private val config: Config
-) : ActivePluginProvider {
+) : ActivePlugin {
 
     lateinit var plugins: List<@JvmSuppressWildcards PluginBase>
 
-    private var activeBgSourceStore: BgSourceInterface? = null
-    private var activePumpStore: PumpInterface? = null
-    private var activeProfile: ProfileInterface? = null
-    private var activeAPSStore: APSInterface? = null
-    private var activeInsulinStore: InsulinInterface? = null
-    private var activeSensitivityStore: SensitivityInterface? = null
+    private var activeBgSourceStore: BgSource? = null
+    private var activePumpStore: Pump? = null
+    private var activeProfile: ProfileSource? = null
+    private var activeAPSStore: APS? = null
+    private var activeInsulinStore: Insulin? = null
+    private var activeSensitivityStore: Sensitivity? = null
     private var activeTreatmentsStore: TreatmentsInterface? = null
 
     fun loadDefaults() {
         verifySelectionInCategories()
     }
 
-    fun getDefaultPlugin(type: PluginType): PluginBase {
+    private fun getDefaultPlugin(type: PluginType): PluginBase {
         for (p in plugins)
             if (p.getType() == type && p.isDefault()) return p
         throw IllegalStateException("Default plugin not found")
@@ -41,14 +41,6 @@ class PluginStore @Inject constructor(
         return newList
     }
 
-    override fun getSpecificPluginsVisibleInList(type: PluginType): ArrayList<PluginBase> {
-        val newList = ArrayList<PluginBase>()
-        for (p in plugins) {
-            if (p.getType() == type) if (p.showInList(type)) newList.add(p)
-        }
-        return newList
-    }
-
     override fun getSpecificPluginsListByInterface(interfaceClass: Class<*>): ArrayList<PluginBase> {
         val newList = ArrayList<PluginBase>()
         for (p in plugins) {
@@ -57,10 +49,10 @@ class PluginStore @Inject constructor(
         return newList
     }
 
-    override fun getSpecificPluginsVisibleInListByInterface(interfaceClass: Class<*>, type: PluginType): ArrayList<PluginBase> {
+    override fun getSpecificPluginsVisibleInList(type: PluginType): ArrayList<PluginBase> {
         val newList = ArrayList<PluginBase>()
         for (p in plugins) {
-            if (p.javaClass != ConfigBuilderPlugin::class.java && interfaceClass.isAssignableFrom(p.javaClass)) if (p.showInList(type)) newList.add(p)
+            if (p.getType() == type) if (p.showInList(type)) newList.add(p)
         }
         return newList
     }
@@ -71,64 +63,64 @@ class PluginStore @Inject constructor(
         // PluginType.APS
         if (!config.NSCLIENT && !config.PUMPCONTROL) {
             pluginsInCategory = getSpecificPluginsList(PluginType.APS)
-            activeAPSStore = getTheOneEnabledInArray(pluginsInCategory, PluginType.APS) as APSInterface?
+            activeAPSStore = getTheOneEnabledInArray(pluginsInCategory, PluginType.APS) as APS?
             if (activeAPSStore == null) {
-                activeAPSStore = getDefaultPlugin(PluginType.APS) as APSInterface
+                activeAPSStore = getDefaultPlugin(PluginType.APS) as APS
                 (activeAPSStore as PluginBase).setPluginEnabled(PluginType.APS, true)
                 aapsLogger.debug(LTag.CONFIGBUILDER, "Defaulting APSInterface")
             }
-            setFragmentVisiblities((activeAPSStore as PluginBase).name, pluginsInCategory, PluginType.APS)
+            setFragmentVisibilities((activeAPSStore as PluginBase).name, pluginsInCategory, PluginType.APS)
         }
 
         // PluginType.INSULIN
         pluginsInCategory = getSpecificPluginsList(PluginType.INSULIN)
-        activeInsulinStore = getTheOneEnabledInArray(pluginsInCategory, PluginType.INSULIN) as InsulinInterface?
+        activeInsulinStore = getTheOneEnabledInArray(pluginsInCategory, PluginType.INSULIN) as Insulin?
         if (activeInsulinStore == null) {
-            activeInsulinStore = getDefaultPlugin(PluginType.INSULIN) as InsulinInterface
+            activeInsulinStore = getDefaultPlugin(PluginType.INSULIN) as Insulin
             (activeInsulinStore as PluginBase).setPluginEnabled(PluginType.INSULIN, true)
             aapsLogger.debug(LTag.CONFIGBUILDER, "Defaulting InsulinInterface")
         }
-        setFragmentVisiblities((activeInsulinStore as PluginBase).name, pluginsInCategory, PluginType.INSULIN)
+        setFragmentVisibilities((activeInsulinStore as PluginBase).name, pluginsInCategory, PluginType.INSULIN)
 
         // PluginType.SENSITIVITY
         pluginsInCategory = getSpecificPluginsList(PluginType.SENSITIVITY)
-        activeSensitivityStore = getTheOneEnabledInArray(pluginsInCategory, PluginType.SENSITIVITY) as SensitivityInterface?
+        activeSensitivityStore = getTheOneEnabledInArray(pluginsInCategory, PluginType.SENSITIVITY) as Sensitivity?
         if (activeSensitivityStore == null) {
-            activeSensitivityStore = getDefaultPlugin(PluginType.SENSITIVITY) as SensitivityInterface
+            activeSensitivityStore = getDefaultPlugin(PluginType.SENSITIVITY) as Sensitivity
             (activeSensitivityStore as PluginBase).setPluginEnabled(PluginType.SENSITIVITY, true)
             aapsLogger.debug(LTag.CONFIGBUILDER, "Defaulting SensitivityInterface")
         }
-        setFragmentVisiblities((activeSensitivityStore as PluginBase).name, pluginsInCategory, PluginType.SENSITIVITY)
+        setFragmentVisibilities((activeSensitivityStore as PluginBase).name, pluginsInCategory, PluginType.SENSITIVITY)
 
         // PluginType.PROFILE
         pluginsInCategory = getSpecificPluginsList(PluginType.PROFILE)
-        activeProfile = getTheOneEnabledInArray(pluginsInCategory, PluginType.PROFILE) as ProfileInterface?
+        activeProfile = getTheOneEnabledInArray(pluginsInCategory, PluginType.PROFILE) as ProfileSource?
         if (activeProfile == null) {
-            activeProfile = getDefaultPlugin(PluginType.PROFILE) as ProfileInterface
+            activeProfile = getDefaultPlugin(PluginType.PROFILE) as ProfileSource
             (activeProfile as PluginBase).setPluginEnabled(PluginType.PROFILE, true)
             aapsLogger.debug(LTag.CONFIGBUILDER, "Defaulting ProfileInterface")
         }
-        setFragmentVisiblities((activeProfile as PluginBase).name, pluginsInCategory, PluginType.PROFILE)
+        setFragmentVisibilities((activeProfile as PluginBase).name, pluginsInCategory, PluginType.PROFILE)
 
         // PluginType.BGSOURCE
         pluginsInCategory = getSpecificPluginsList(PluginType.BGSOURCE)
-        activeBgSourceStore = getTheOneEnabledInArray(pluginsInCategory, PluginType.BGSOURCE) as BgSourceInterface?
+        activeBgSourceStore = getTheOneEnabledInArray(pluginsInCategory, PluginType.BGSOURCE) as BgSource?
         if (activeBgSourceStore == null) {
-            activeBgSourceStore = getDefaultPlugin(PluginType.BGSOURCE) as BgSourceInterface
+            activeBgSourceStore = getDefaultPlugin(PluginType.BGSOURCE) as BgSource
             (activeBgSourceStore as PluginBase).setPluginEnabled(PluginType.BGSOURCE, true)
             aapsLogger.debug(LTag.CONFIGBUILDER, "Defaulting BgInterface")
         }
-        setFragmentVisiblities((activeBgSourceStore as PluginBase).name, pluginsInCategory, PluginType.BGSOURCE)
+        setFragmentVisibilities((activeBgSourceStore as PluginBase).name, pluginsInCategory, PluginType.BGSOURCE)
 
         // PluginType.PUMP
         pluginsInCategory = getSpecificPluginsList(PluginType.PUMP)
-        activePumpStore = getTheOneEnabledInArray(pluginsInCategory, PluginType.PUMP) as PumpInterface?
+        activePumpStore = getTheOneEnabledInArray(pluginsInCategory, PluginType.PUMP) as Pump?
         if (activePumpStore == null) {
-            activePumpStore = getDefaultPlugin(PluginType.PUMP) as PumpInterface
+            activePumpStore = getDefaultPlugin(PluginType.PUMP) as Pump
             (activePumpStore as PluginBase).setPluginEnabled(PluginType.PUMP, true)
             aapsLogger.debug(LTag.CONFIGBUILDER, "Defaulting PumpInterface")
         }
-        setFragmentVisiblities((activePumpStore as PluginBase).name, pluginsInCategory, PluginType.PUMP)
+        setFragmentVisibilities((activePumpStore as PluginBase).name, pluginsInCategory, PluginType.PUMP)
 
         // PluginType.TREATMENT
         pluginsInCategory = getSpecificPluginsList(PluginType.TREATMENT)
@@ -138,50 +130,11 @@ class PluginStore @Inject constructor(
             (activeTreatmentsStore as PluginBase).setPluginEnabled(PluginType.TREATMENT, true)
             aapsLogger.debug(LTag.CONFIGBUILDER, "Defaulting PumpInterface")
         }
-        setFragmentVisiblities((activeTreatmentsStore as PluginBase).name, pluginsInCategory, PluginType.TREATMENT)
+        setFragmentVisibilities((activeTreatmentsStore as PluginBase).name, pluginsInCategory, PluginType.TREATMENT)
     }
 
-    /**
-     * disables the visibility for all fragments of Plugins with the given PluginType
-     * which are not equally named to the Plugin implementing the given Plugin Interface.
-     *
-     * @param pluginInterface
-     * @param pluginType
-     * @param <T>
-     * @return
-    </T> */
-    private fun <T> determineActivePlugin(pluginInterface: Class<T>, pluginType: PluginType): T? {
-        val pluginsInCategory: ArrayList<PluginBase> = getSpecificPluginsListByInterface(pluginInterface)
-        return determineActivePlugin(pluginsInCategory, pluginType)
-    }
-
-    /**
-     * disables the visibility for all fragments of Plugins in the given pluginsInCategory
-     * with the given PluginType which are not equally named to the Plugin implementing the
-     * given Plugin Interface.
-     *
-     *
-     * TODO we are casting an interface to PluginBase, which seems to be rather odd, since
-     * TODO the interface is not implementing PluginBase (this is just avoiding errors through
-     * TODO conventions.
-     *
-     * @param pluginsInCategory
-     * @param pluginType
-     * @param <T>
-     * @return
-    </T> */
-    private fun <T> determineActivePlugin(pluginsInCategory: ArrayList<PluginBase>,
-                                          pluginType: PluginType): T? {
-        @Suppress("UNCHECKED_CAST")
-        val activePlugin = getTheOneEnabledInArray(pluginsInCategory, pluginType) as T?
-        if (activePlugin != null) {
-            setFragmentVisiblities((activePlugin as PluginBase).name, pluginsInCategory, pluginType)
-        }
-        return activePlugin
-    }
-
-    private fun setFragmentVisiblities(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)
             if (p.name != activePluginName)
@@ -203,22 +156,22 @@ class PluginStore @Inject constructor(
 
     // ***** Interface *****
 
-    override val activeBgSource: BgSourceInterface
+    override val activeBgSource: BgSource
         get() = activeBgSourceStore ?: checkNotNull(activeBgSourceStore) { "No bg source selected" }
 
-    override val activeProfileInterface: ProfileInterface
+    override val activeProfileSource: ProfileSource
         get() = activeProfile ?: checkNotNull(activeProfile) { "No profile selected" }
 
-    override val activeInsulin: InsulinInterface
+    override val activeInsulin: Insulin
         get() = activeInsulinStore ?: checkNotNull(activeInsulinStore) { "No insulin selected" }
 
-    override val activeAPS: APSInterface
+    override val activeAPS: APS
         get() = activeAPSStore ?: checkNotNull(activeAPSStore) { "No APS selected" }
 
-    override val activePump: PumpInterface
+    override val activePump: Pump
         get() = activePumpStore ?: checkNotNull(activePumpStore) { "No pump selected" }
 
-    override val activeSensitivity: SensitivityInterface
+    override val activeSensitivity: Sensitivity
         get() = activeSensitivityStore
             ?: checkNotNull(activeSensitivityStore) { "No sensitivity selected" }
 
@@ -226,8 +179,8 @@ class PluginStore @Inject constructor(
         get() = activeTreatmentsStore
             ?: checkNotNull(activeTreatmentsStore) { "No treatments selected" }
 
-    override val activeOverview: OverviewInterface
-        get() = getSpecificPluginsListByInterface(OverviewInterface::class.java).first() as OverviewInterface
+    override val activeOverview: Overview
+        get() = getSpecificPluginsListByInterface(Overview::class.java).first() as Overview
 
     override fun getPluginsList(): ArrayList<PluginBase> = ArrayList(plugins)
 

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

@@ -0,0 +1,123 @@
+package info.nightscout.androidaps.plugins.configBuilder
+
+import androidx.collection.LongSparseArray
+import info.nightscout.androidaps.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.extensions.fromConstant
+import info.nightscout.androidaps.interfaces.ActivePlugin
+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.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.T
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxkotlin.plusAssign
+import java.security.spec.InvalidParameterSpecException
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class ProfileFunctionImplementation @Inject constructor(
+    private val aapsLogger: AAPSLogger,
+    private val sp: SP,
+    private val resourceHelper: ResourceHelper,
+    private val activePlugin: ActivePlugin,
+    private val repository: AppRepository,
+    private val dateUtil: DateUtil
+) : ProfileFunction {
+
+    val cache = LongSparseArray<Profile>()
+
+    private val disposable = CompositeDisposable()
+
+    override fun getProfileName(): String =
+        getProfileName(System.currentTimeMillis(), customized = true, showRemainingTime = false)
+
+    override fun getOriginalProfileName(): String =
+        getProfileName(System.currentTimeMillis(), customized = false, showRemainingTime = false)
+
+    override fun getProfileNameWithRemainingTime(): String =
+        getProfileName(System.currentTimeMillis(), customized = true, showRemainingTime = true)
+
+    fun getProfileName(time: Long, customized: Boolean, showRemainingTime: Boolean): String {
+        var profileName = resourceHelper.gs(R.string.noprofileselected)
+
+        val profileSwitch = repository.getEffectiveProfileSwitchActiveAt(time).blockingGet()
+        if (profileSwitch is ValueWrapper.Existing) {
+            profileName = if (customized) profileSwitch.value.originalCustomizedName else profileSwitch.value.originalProfileName
+            if (showRemainingTime && profileSwitch.value.originalDuration != 0L) {
+                profileName += dateUtil.untilString(profileSwitch.value.originalEnd, resourceHelper)
+            }
+        }
+        return profileName
+    }
+
+    override fun isProfileValid(from: String): Boolean = getProfile() != null
+
+    override fun getProfile(): Profile? =
+        getProfile(dateUtil.now())
+
+    override fun getProfile(time: Long): Profile? {
+        val rounded = time - time % 1000
+        val cached = cache[rounded]
+        if (cached != null) {
+//            aapsLogger.debug("XXXXXXXXXXXXXXX HIT getProfile for $time $rounded")
+            return cached
+        }
+//        aapsLogger.debug("XXXXXXXXXXXXXXX getProfile called for $time")
+        val ps = repository.getEffectiveProfileSwitchActiveAt(time).blockingGet()
+        if (ps is ValueWrapper.Existing) {
+            val sealed = ProfileSealed.EPS(ps.value)
+            cache.put(rounded, sealed)
+            return sealed
+        }
+        return null
+    }
+
+    override fun getRequestedProfile(): ProfileSwitch? = repository.getActiveProfileSwitch(dateUtil.now())
+
+    override fun getUnits(): GlucoseUnit =
+        if (sp.getString(R.string.key_units, Constants.MGDL) == Constants.MGDL) GlucoseUnit.MGDL
+        else GlucoseUnit.MMOL
+
+    override fun createProfileSwitch(profileStore: ProfileStore, profileName: String, durationInMinutes: Int, percentage: Int, timeShiftInHours: Int, timestamp: Long) {
+        val pureProfile = profileStore.getSpecificProfile(profileName)
+            ?: throw InvalidParameterSpecException(profileName)
+        val ps = ProfileSwitch(
+            timestamp = timestamp,
+            basalBlocks = pureProfile.basalBlocks,
+            isfBlocks = pureProfile.isfBlocks,
+            icBlocks = pureProfile.icBlocks,
+            targetBlocks = pureProfile.targetBlocks,
+            glucoseUnit = ProfileSwitch.GlucoseUnit.fromConstant(pureProfile.glucoseUnit),
+            profileName = profileName,
+            timeshift = T.hours(timeShiftInHours.toLong()).msecs(),
+            percentage = percentage,
+            duration = T.mins(durationInMinutes.toLong()).msecs(),
+            insulinConfiguration = activePlugin.activeInsulin.insulinConfiguration)
+        disposable += repository.runTransactionForResult(InsertOrUpdateProfileSwitch(ps))
+            .subscribe({ result ->
+                result.inserted.forEach { aapsLogger.debug(LTag.DATABASE, "Inserted ProfileSwitch $it") }
+                result.updated.forEach { aapsLogger.debug(LTag.DATABASE, "Updated ProfileSwitch $it") }
+            }, {
+                aapsLogger.error(LTag.DATABASE, "Error while saving ProfileSwitch", it)
+            })
+    }
+
+    override fun createProfileSwitch(durationInMinutes: Int, percentage: Int, timeShiftInHours: Int) {
+        val profileStore = activePlugin.activeProfileSource.profile ?: return
+        val profileName = activePlugin.activeProfileSource.profile?.getDefaultProfileName()
+            ?: return
+        createProfileSwitch(profileStore, profileName, durationInMinutes, percentage, timeShiftInHours, dateUtil.now())
+    }
+}

app/src/main/java/info/nightscout/androidaps/plugins/constraints/dstHelper/DstHelperPlugin.kt

@@ -24,7 +24,7 @@ class DstHelperPlugin @Inject constructor(
     private var rxBus: RxBusWrapper,
     resourceHelper: ResourceHelper,
     private var sp: SP,
-    private var activePlugin: ActivePluginProvider,
+    private var activePlugin: ActivePlugin,
     private var loopPlugin: LoopPlugin
 ) : PluginBase(PluginDescription()
     .mainType(PluginType.CONSTRAINTS)
@@ -33,7 +33,7 @@ class DstHelperPlugin @Inject constructor(
     .showInList(false)
     .pluginName(R.string.dst_plugin_name),
     aapsLogger, resourceHelper, injector
-), ConstraintsInterface {
+), Constraints {
 
     companion object {
         private const val DISABLE_TIME_FRAME_HOURS = -3

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

@@ -17,7 +17,9 @@ 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.*
+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
@@ -235,7 +237,7 @@ class ObjectivesFragment : DaggerFragment() {
             holder.binding.verify.setOnClickListener {
                 receiverStatusStore.updateNetworkStatus()
                 if (binding.fake.isChecked) {
-                    objective.accomplishedOn = DateUtil.now()
+                    objective.accomplishedOn = dateUtil.now()
                     scrollToCurrentObjective()
                     startUpdateTimer()
                     rxBus.send(EventObjectivesUpdateGui())
@@ -247,7 +249,7 @@ class ObjectivesFragment : DaggerFragment() {
                         rxBus.send(EventNtpStatus(resourceHelper.gs(R.string.timedetection), 0))
                         sntpClient.ntpTime(object : SntpClient.Callback() {
                             override fun run() {
-                                aapsLogger.debug("NTP time: $time System time: ${DateUtil.now()}")
+                                aapsLogger.debug("NTP time: $time System time: ${dateUtil.now()}")
                                 SystemClock.sleep(300)
                                 if (!networkConnected) {
                                     rxBus.send(EventNtpStatus(resourceHelper.gs(R.string.notconnected), 99))
@@ -274,7 +276,7 @@ class ObjectivesFragment : DaggerFragment() {
             holder.binding.start.setOnClickListener {
                 receiverStatusStore.updateNetworkStatus()
                 if (binding.fake.isChecked) {
-                    objective.startedOn = DateUtil.now()
+                    objective.startedOn = dateUtil.now()
                     scrollToCurrentObjective()
                     startUpdateTimer()
                     rxBus.send(EventObjectivesUpdateGui())
@@ -286,7 +288,7 @@ class ObjectivesFragment : DaggerFragment() {
                         rxBus.send(EventNtpStatus(resourceHelper.gs(R.string.timedetection), 0))
                         sntpClient.ntpTime(object : SntpClient.Callback() {
                             override fun run() {
-                                aapsLogger.debug("NTP time: $time System time: ${DateUtil.now()}")
+                                aapsLogger.debug("NTP time: $time System time: ${dateUtil.now()}")
                                 SystemClock.sleep(300)
                                 if (!networkConnected) {
                                     rxBus.send(EventNtpStatus(resourceHelper.gs(R.string.notconnected), 99))
@@ -308,7 +310,8 @@ class ObjectivesFragment : DaggerFragment() {
             holder.binding.unstart.setOnClickListener {
                 activity?.let { activity ->
                     OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.objectives), resourceHelper.gs(R.string.doyouwantresetstart), Runnable {
-                        uel.log(Action.OBJECTIVE_UNSTARTED, ValueWithUnit(position + 1, Units.None))
+                        uel.log(Action.OBJECTIVE_UNSTARTED, Sources.Objectives,
+                            ValueWithUnit.SimpleInt(position + 1))
                         objective.startedOn = 0
                         scrollToCurrentObjective()
                         rxBus.send(EventObjectivesUpdateGui())

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

@@ -5,9 +5,9 @@ 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.Config
 import info.nightscout.androidaps.R
-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.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.UserEntryLogger
@@ -25,9 +25,10 @@ class ObjectivesPlugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
     resourceHelper: ResourceHelper,
-    private val activePlugin: ActivePluginProvider,
+    private val activePlugin: ActivePlugin,
     private val sp: SP,
     config: Config,
+    private val dateUtil: DateUtil,
     private val uel: UserEntryLogger
 ) : PluginBase(PluginDescription()
     .mainType(PluginType.CONSTRAINTS)
@@ -39,7 +40,7 @@ class ObjectivesPlugin @Inject constructor(
     .shortName(R.string.objectives_shortname)
     .description(R.string.description_objectives),
     aapsLogger, resourceHelper, injector
-), ConstraintsInterface {
+), Constraints {
 
     var objectives: MutableList<Objective> = ArrayList()
 
@@ -125,25 +126,25 @@ class ObjectivesPlugin @Inject constructor(
         if (!url.endsWith("/")) url = "$url/"
         @Suppress("DEPRECATION") 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_" + "ama" + "_started", DateUtil.now())
-            sp.putLong("Objectives_" + "ama" + "_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())
+            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_" + "ama" + "_started", dateUtil.now())
+            sp.putLong("Objectives_" + "ama" + "_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, resourceHelper.gs(R.string.objectives), resourceHelper.gs(R.string.codeaccepted))
-            uel.log(Action.OBJECTIVES_SKIPPED)
+            uel.log(Action.OBJECTIVES_SKIPPED, Sources.Objectives)
         } else {
             OKDialog.show(activity, resourceHelper.gs(R.string.objectives), resourceHelper.gs(R.string.codeinvalid))
         }

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

@@ -108,7 +108,7 @@ class ObjectivesExamDialog : DaggerDialogFragment() {
                 }
                 task.answered = result
                 if (!result) {
-                    task.disabledTo = DateUtil.now() + T.hours(1).msecs()
+                    task.disabledTo = dateUtil.now() + T.hours(1).msecs()
                     ToastUtils.showToastInUiThread(context, R.string.wronganswer)
                 } else task.disabledTo = 0
                 updateGui()

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

@@ -21,6 +21,7 @@ abstract class Objective(injector: HasAndroidInjector, spName: String, @StringRe
 
     @Inject lateinit var sp: SP
     @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var dateUtil: DateUtil
 
     private val spName: String
     @StringRes val objective: Int
@@ -55,7 +56,7 @@ abstract class Objective(injector: HasAndroidInjector, spName: String, @StringRe
         this.gate = gate
         startedOn = sp.getLong("Objectives_" + spName + "_started", 0L)
         accomplishedOn = sp.getLong("Objectives_" + spName + "_accomplished", 0L)
-        if (accomplishedOn - DateUtil.now() > T.hours(3).msecs() || startedOn - DateUtil.now() > T.hours(3).msecs()) { // more than 3 hours in the future
+        if (accomplishedOn - dateUtil.now() > T.hours(3).msecs() || startedOn - dateUtil.now() > T.hours(3).msecs()) { // more than 3 hours in the future
             startedOn = 0
             accomplishedOn = 0
         }
@@ -69,7 +70,7 @@ abstract class Objective(injector: HasAndroidInjector, spName: String, @StringRe
     }
 
     val isAccomplished: Boolean
-        get() = accomplishedOn != 0L && accomplishedOn < DateUtil.now()
+        get() = accomplishedOn != 0L && accomplishedOn < dateUtil.now()
     val isStarted: Boolean
         get() = startedOn != 0L
 
@@ -144,7 +145,7 @@ abstract class Objective(injector: HasAndroidInjector, spName: String, @StringRe
 
         override fun isCompleted(): Boolean = answered
 
-        fun isEnabledAnswer(): Boolean = disabledTo < DateUtil.now()
+        fun isEnabledAnswer(): Boolean = disabledTo < dateUtil.now()
 
         fun option(option: Option): ExamTask {
             options.add(option)

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

@@ -2,25 +2,25 @@ package info.nightscout.androidaps.plugins.constraints.objectives.objectives
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
+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.PluginBase
 import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
 import info.nightscout.androidaps.plugins.general.nsclient.NSClientPlugin
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
-import info.nightscout.androidaps.utils.DateUtil
 import javax.inject.Inject
 
 class Objective0(injector: HasAndroidInjector) : Objective(injector, "config", R.string.objectives_0_objective, R.string.objectives_0_gate) {
 
-    @Inject lateinit var activePlugin: ActivePluginProvider
+    @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var virtualPumpPlugin: VirtualPumpPlugin
-    @Inject lateinit var treatmentsPlugin: TreatmentsPlugin
+    @Inject lateinit var repository: AppRepository
     @Inject lateinit var loopPlugin: LoopPlugin
     @Inject lateinit var nsClientPlugin: NSClientPlugin
-    @Inject lateinit var iobCobCalculatorPlugin: IobCobCalculatorPlugin
+    @Inject lateinit var iobCobCalculator: IobCobCalculator
 
     init {
         tasks.add(object : Task(this, R.string.objectives_bgavailableinns) {
@@ -49,7 +49,7 @@ class Objective0(injector: HasAndroidInjector) : Objective(injector, "config", R
         })
         tasks.add(object : Task(this, R.string.hasbgdata) {
             override fun isCompleted(): Boolean {
-                return iobCobCalculatorPlugin.lastBg() != null
+                return iobCobCalculator.ads.lastBg() != null
             }
         })
         tasks.add(object : Task(this, R.string.loopenabled) {
@@ -65,7 +65,7 @@ class Objective0(injector: HasAndroidInjector) : Objective(injector, "config", R
         })
         tasks.add(object : Task(this, R.string.activate_profile) {
             override fun isCompleted(): Boolean {
-                return treatmentsPlugin.getProfileSwitchFromHistory(DateUtil.now()) != null
+                return repository.getEffectiveProfileSwitchActiveAt(dateUtil.now()).blockingGet() is ValueWrapper.Existing
             }
         })
     }

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

@@ -28,7 +28,7 @@ class Objective3 @Inject constructor(injector: HasAndroidInjector) : Objective(i
     }
 
     override fun specialActionEnabled(): Boolean =
-        NSClientService.isConnected && NSClientService.hasWriteAuth
+        nsClientPlugin.nsClientService?.isConnected == true && nsClientPlugin.nsClientService?.hasWriteAuth == true
 
     override fun specialAction(activity: FragmentActivity, input: String) {
         objectivesPlugin.completeObjectives(activity, input)

app/src/main/java/info/nightscout/androidaps/plugins/constraints/phoneChecker/PhoneCheckerPlugin.kt

@@ -5,7 +5,7 @@ import android.os.Build
 import com.scottyab.rootbeer.RootBeer
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.interfaces.ConstraintsInterface
+import info.nightscout.androidaps.interfaces.Constraints
 import info.nightscout.androidaps.interfaces.PluginBase
 import info.nightscout.androidaps.interfaces.PluginDescription
 import info.nightscout.androidaps.interfaces.PluginType
@@ -27,7 +27,7 @@ class PhoneCheckerPlugin @Inject constructor(
     .showInList(false)
     .pluginName(R.string.phonechecker),
     aapsLogger, resourceHelper, injector
-), ConstraintsInterface {
+), Constraints {
 
     var phoneRooted: Boolean = false
     var devMode: Boolean = false

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

@@ -1,9 +1,9 @@
 package info.nightscout.androidaps.plugins.constraints.safety
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.Config
+import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
@@ -13,6 +13,7 @@ import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.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.androidaps.utils.Round
@@ -34,11 +35,12 @@ class SafetyPlugin @Inject constructor(
     private val openAPSAMAPlugin: OpenAPSAMAPlugin,
     private val openAPSSMBPlugin: OpenAPSSMBPlugin,
     private val sensitivityOref1Plugin: SensitivityOref1Plugin,
-    private val activePlugin: ActivePluginProvider,
+    private val activePlugin: ActivePlugin,
     private val hardLimits: HardLimits,
     private val buildHelper: BuildHelper,
-    private val treatmentsPlugin: TreatmentsInterface,
-    private val config: Config
+    private val iobCobCalculator: IobCobCalculator,
+    private val config: Config,
+    private val dateUtil: DateUtil
 ) : PluginBase(PluginDescription()
     .mainType(PluginType.CONSTRAINTS)
     .neverVisible(true)
@@ -47,7 +49,7 @@ class SafetyPlugin @Inject constructor(
     .pluginName(R.string.safety)
     .preferencesId(R.xml.pref_safety),
     aapsLogger, resourceHelper, injector
-), ConstraintsInterface {
+), Constraints {
 
     /**
      * Constraints interface
@@ -68,7 +70,7 @@ class SafetyPlugin @Inject constructor(
             value[aapsLogger, false, resourceHelper.gs(R.string.closed_loop_disabled_on_dev_branch)] = this
         }
         val pump = activePlugin.activePump
-        if (!pump.isFakingTempsByExtendedBoluses && treatmentsPlugin.isInHistoryExtendedBolusInProgress) {
+        if (!pump.isFakingTempsByExtendedBoluses && iobCobCalculator.getExtendedBolus(dateUtil.now()) != null) {
             value[aapsLogger, false, resourceHelper.gs(R.string.closed_loop_disabled_with_eb)] = this
         }
         return value
@@ -106,25 +108,25 @@ class SafetyPlugin @Inject constructor(
         absoluteRate.setIfGreater(aapsLogger, 0.0, String.format(resourceHelper.gs(R.string.limitingbasalratio), 0.0, resourceHelper.gs(R.string.itmustbepositivevalue)), this)
         if (config.APS) {
             var maxBasal = sp.getDouble(R.string.key_openapsma_max_basal, 1.0)
-            if (maxBasal < profile.maxDailyBasal) {
-                maxBasal = profile.maxDailyBasal
+            if (maxBasal < profile.getMaxDailyBasal()) {
+                maxBasal = profile.getMaxDailyBasal()
                 absoluteRate.addReason(resourceHelper.gs(R.string.increasingmaxbasal), this)
             }
             absoluteRate.setIfSmaller(aapsLogger, maxBasal, String.format(resourceHelper.gs(R.string.limitingbasalratio), maxBasal, resourceHelper.gs(R.string.maxvalueinpreferences)), this)
 
             // Check percentRate but absolute rate too, because we know real current basal in pump
             val maxBasalMultiplier = sp.getDouble(R.string.key_openapsama_current_basal_safety_multiplier, 4.0)
-            val maxFromBasalMultiplier = floor(maxBasalMultiplier * profile.basal * 100) / 100
+            val maxFromBasalMultiplier = floor(maxBasalMultiplier * profile.getBasal() * 100) / 100
             absoluteRate.setIfSmaller(aapsLogger, maxFromBasalMultiplier, String.format(resourceHelper.gs(R.string.limitingbasalratio), maxFromBasalMultiplier, resourceHelper.gs(R.string.maxbasalmultiplier)), this)
             val maxBasalFromDaily = sp.getDouble(R.string.key_openapsama_max_daily_safety_multiplier, 3.0)
-            val maxFromDaily = floor(profile.maxDailyBasal * maxBasalFromDaily * 100) / 100
+            val maxFromDaily = floor(profile.getMaxDailyBasal() * maxBasalFromDaily * 100) / 100
             absoluteRate.setIfSmaller(aapsLogger, maxFromDaily, String.format(resourceHelper.gs(R.string.limitingbasalratio), maxFromDaily, resourceHelper.gs(R.string.maxdailybasalmultiplier)), this)
         }
         absoluteRate.setIfSmaller(aapsLogger, hardLimits.maxBasal(), String.format(resourceHelper.gs(R.string.limitingbasalratio), hardLimits.maxBasal(), resourceHelper.gs(R.string.hardlimit)), this)
         val pump = activePlugin.activePump
         // check for pump max
         if (pump.pumpDescription.tempBasalStyle == PumpDescription.ABSOLUTE) {
-            val pumpLimit = pump.pumpDescription.pumpType.tbrSettings.maxDose
+            val pumpLimit = pump.pumpDescription.pumpType.tbrSettings?.maxDose ?: 0.0
             absoluteRate.setIfSmaller(aapsLogger, pumpLimit, String.format(resourceHelper.gs(R.string.limitingbasalratio), pumpLimit, resourceHelper.gs(R.string.pumplimit)), this)
         }
 
@@ -136,7 +138,7 @@ class SafetyPlugin @Inject constructor(
     }
 
     override fun applyBasalPercentConstraints(percentRate: Constraint<Int>, profile: Profile): Constraint<Int> {
-        val currentBasal = profile.basal
+        val currentBasal = profile.getBasal()
         val absoluteRate = currentBasal * (percentRate.originalValue().toDouble() / 100)
         percentRate.addReason("Percent rate " + percentRate.originalValue() + "% recalculated to " + DecimalFormatter.to2Decimal(absoluteRate) + " U/h with current basal " + DecimalFormatter.to2Decimal(currentBasal) + " U/h", this)
         val absoluteConstraint = Constraint(absoluteRate)
@@ -147,7 +149,7 @@ class SafetyPlugin @Inject constructor(
         percentRateAfterConst = if (percentRateAfterConst < 100) Round.ceilTo(percentRateAfterConst.toDouble(), pump.pumpDescription.tempPercentStep.toDouble()).toInt() else Round.floorTo(percentRateAfterConst.toDouble(), pump.pumpDescription.tempPercentStep.toDouble()).toInt()
         percentRate[aapsLogger, percentRateAfterConst, String.format(resourceHelper.gs(R.string.limitingpercentrate), percentRateAfterConst, resourceHelper.gs(R.string.pumplimit))] = this
         if (pump.pumpDescription.tempBasalStyle == PumpDescription.PERCENT) {
-            val pumpLimit = pump.pumpDescription.pumpType.tbrSettings.maxDose
+            val pumpLimit = pump.pumpDescription.pumpType.tbrSettings?.maxDose ?: 0.0
             percentRate.setIfSmaller(aapsLogger, pumpLimit.toInt(), String.format(resourceHelper.gs(R.string.limitingbasalratio), pumpLimit, resourceHelper.gs(R.string.pumplimit)), this)
         }
         return percentRate

app/src/main/java/info/nightscout/androidaps/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.kt

@@ -5,7 +5,7 @@ import android.content.pm.PackageManager
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.interfaces.Constraint
-import info.nightscout.androidaps.interfaces.ConstraintsInterface
+import info.nightscout.androidaps.interfaces.Constraints
 import info.nightscout.androidaps.interfaces.PluginBase
 import info.nightscout.androidaps.interfaces.PluginDescription
 import info.nightscout.androidaps.interfaces.PluginType
@@ -46,7 +46,7 @@ class SignatureVerifierPlugin @Inject constructor(
     .showInList(false)
     .pluginName(R.string.signature_verifier),
     aapsLogger, resourceHelper, injector
-), ConstraintsInterface {
+), Constraints {
 
     private val REVOKED_CERTS_URL = "https://raw.githubusercontent.com/nightscout/AndroidAPS/master/app/src/main/assets/revoked_certs.txt"
     private val UPDATE_INTERVAL = TimeUnit.DAYS.toMillis(1)

app/src/main/java/info/nightscout/androidaps/plugins/constraints/storage/StorageConstraintPlugin.kt

@@ -6,7 +6,7 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.interfaces.Constraint
-import info.nightscout.androidaps.interfaces.ConstraintsInterface
+import info.nightscout.androidaps.interfaces.Constraints
 import info.nightscout.androidaps.interfaces.PluginBase
 import info.nightscout.androidaps.interfaces.PluginDescription
 import info.nightscout.androidaps.interfaces.PluginType
@@ -33,7 +33,7 @@ open class StorageConstraintPlugin @Inject constructor(
     .showInList(false)
     .pluginName(R.string.storage),
     aapsLogger, resourceHelper, injector
-), ConstraintsInterface {
+), Constraints {
 
     override fun isClosedLoopAllowed(value: Constraint<Boolean>): Constraint<Boolean> {
         val diskFree = availableInternalMemorySize()

app/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerPlugin.kt

@@ -4,7 +4,7 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.BuildConfig
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.interfaces.Constraint
-import info.nightscout.androidaps.interfaces.ConstraintsInterface
+import info.nightscout.androidaps.interfaces.Constraints
 import info.nightscout.androidaps.interfaces.PluginBase
 import info.nightscout.androidaps.interfaces.PluginDescription
 import info.nightscout.androidaps.interfaces.PluginType
@@ -35,7 +35,7 @@ class VersionCheckerPlugin @Inject constructor(
     .showInList(false)
     .pluginName(R.string.versionChecker),
     aapsLogger, resourceHelper, injector
-), ConstraintsInterface {
+), Constraints {
 
     enum class GracePeriod(val warning: Long, val old: Long, val veryOld: Long) {
         RELEASE(30, 60, 90),

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

@@ -11,17 +11,28 @@ import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import dagger.android.support.DaggerFragment
-import info.nightscout.androidaps.Config
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.ErrorHelperActivity
 import info.nightscout.androidaps.activities.TDDStatsActivity
-import info.nightscout.androidaps.database.entities.UserEntry.*
+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.dialogs.*
-import info.nightscout.androidaps.events.*
+import info.nightscout.androidaps.events.EventCustomActionsChanged
+import info.nightscout.androidaps.events.EventExtendedBolusChange
+import info.nightscout.androidaps.events.EventInitializationChanged
+import info.nightscout.androidaps.events.EventTempBasalChange
+import info.nightscout.androidaps.events.EventTherapyEventChange
+import info.nightscout.androidaps.extensions.toStringMedium
+import info.nightscout.androidaps.extensions.toStringShort
+import info.nightscout.androidaps.extensions.toVisibility
 import info.nightscout.androidaps.historyBrowser.HistoryBrowseActivity
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.Config
+import info.nightscout.androidaps.interfaces.IobCobCalculator
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.UserEntryLogger
@@ -31,10 +42,10 @@ import info.nightscout.androidaps.plugins.general.overview.StatusLightHandler
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.OmnipodErosPumpPlugin
 import info.nightscout.androidaps.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.buildHelper.BuildHelper
-import info.nightscout.androidaps.utils.extensions.toVisibility
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
@@ -52,18 +63,21 @@ class ActionsFragment : DaggerFragment() {
     @Inject lateinit var aapsSchedulers: AapsSchedulers
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var sp: SP
+    @Inject lateinit var dateUtil: DateUtil
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var ctx: Context
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var statusLightHandler: StatusLightHandler
     @Inject lateinit var fabricPrivacy: FabricPrivacy
-    @Inject lateinit var activePlugin: ActivePluginProvider
+    @Inject lateinit var activePlugin: ActivePlugin
+    @Inject lateinit var iobCobCalculator: IobCobCalculator
     @Inject lateinit var commandQueue: CommandQueueProvider
     @Inject lateinit var buildHelper: BuildHelper
     @Inject lateinit var protectionCheck: ProtectionCheck
     @Inject lateinit var skinProvider: SkinProvider
     @Inject lateinit var config: Config
     @Inject lateinit var uel: UserEntryLogger
+    @Inject lateinit var repository: AppRepository
 
     private var disposable: CompositeDisposable = CompositeDisposable()
 
@@ -154,8 +168,8 @@ class ActionsFragment : DaggerFragment() {
             }
         }
         extendedBolusCancel?.setOnClickListener {
-            if (activePlugin.activeTreatments.isInHistoryExtendedBolusInProgress) {
-                uel.log(Action.CANCEL_EXTENDED_BOLUS)
+            if (iobCobCalculator.getExtendedBolus(dateUtil.now()) != null) {
+                uel.log(Action.CANCEL_EXTENDED_BOLUS, Sources.Actions)
                 commandQueue.cancelExtended(object : Callback() {
                     override fun run() {
                         if (!result.success) {
@@ -169,8 +183,8 @@ class ActionsFragment : DaggerFragment() {
             TempBasalDialog().show(childFragmentManager, "Actions")
         }
         cancelTempBasal?.setOnClickListener {
-            if (activePlugin.activeTreatments.isTempBasalInProgress) {
-                uel.log(Action.CANCEL_TEMP_BASAL)
+            if (iobCobCalculator.getTempBasalIncludingConvertedExtended(dateUtil.now()) != null) {
+                uel.log(Action.CANCEL_TEMP_BASAL, Sources.Actions)
                 commandQueue.cancelTempBasal(true, object : Callback() {
                     override fun run() {
                         if (!result.success) {
@@ -219,10 +233,6 @@ class ActionsFragment : DaggerFragment() {
             .toObservable(EventInitializationChanged::class.java)
             .observeOn(aapsSchedulers.main)
             .subscribe({ updateGui() }, fabricPrivacy::logException)
-        disposable += rxBus
-            .toObservable(EventRefreshOverview::class.java)
-            .observeOn(aapsSchedulers.main)
-            .subscribe({ updateGui() }, fabricPrivacy::logException)
         disposable += rxBus
             .toObservable(EventExtendedBolusChange::class.java)
             .observeOn(aapsSchedulers.main)
@@ -255,7 +265,7 @@ class ActionsFragment : DaggerFragment() {
         val pump = activePlugin.activePump
 
         profileSwitch?.visibility = (
-            activePlugin.activeProfileInterface.profile != null &&
+            activePlugin.activeProfileSource.profile != null &&
                 pump.pumpDescription.isSetBasalProfileCapable &&
                 pump.isInitialized() &&
                 !pump.isSuspended()).toVisibility()
@@ -264,12 +274,12 @@ class ActionsFragment : DaggerFragment() {
             extendedBolus?.visibility = View.GONE
             extendedBolusCancel?.visibility = View.GONE
         } else {
-            val activeExtendedBolus = activePlugin.activeTreatments.getExtendedBolusFromHistory(System.currentTimeMillis())
-            if (activeExtendedBolus != null) {
+            val activeExtendedBolus = repository.getExtendedBolusActiveAt(dateUtil.now()).blockingGet()
+            if (activeExtendedBolus is ValueWrapper.Existing) {
                 extendedBolus?.visibility = View.GONE
                 extendedBolusCancel?.visibility = View.VISIBLE
                 @Suppress("SetTextI18n")
-                extendedBolusCancel?.text = resourceHelper.gs(R.string.cancel) + " " + activeExtendedBolus.toStringMedium()
+                extendedBolusCancel?.text = resourceHelper.gs(R.string.cancel) + " " + activeExtendedBolus.value.toStringMedium(dateUtil)
             } else {
                 extendedBolus?.visibility = View.VISIBLE
                 extendedBolusCancel?.visibility = View.GONE
@@ -280,7 +290,7 @@ class ActionsFragment : DaggerFragment() {
             setTempBasal?.visibility = View.GONE
             cancelTempBasal?.visibility = View.GONE
         } else {
-            val activeTemp = activePlugin.activeTreatments.getTempBasalFromHistory(System.currentTimeMillis())
+            val activeTemp = iobCobCalculator.getTempBasalIncludingConvertedExtended(System.currentTimeMillis())
             if (activeTemp != null) {
                 setTempBasal?.visibility = View.GONE
                 cancelTempBasal?.visibility = View.VISIBLE

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

@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.general.actions
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.Config
+import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.interfaces.PluginBase
 import info.nightscout.androidaps.interfaces.PluginDescription

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

@@ -5,15 +5,10 @@ import android.content.Intent
 import android.content.pm.ResolveInfo
 import android.os.Bundle
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.Config
+import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.data.IobTotal
 import info.nightscout.androidaps.events.*
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
-import info.nightscout.androidaps.interfaces.PluginBase
-import info.nightscout.androidaps.interfaces.PluginDescription
-import info.nightscout.androidaps.interfaces.PluginType
-import info.nightscout.androidaps.interfaces.ProfileFunction
+import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.aps.events.EventOpenAPSUpdateGui
@@ -22,11 +17,13 @@ import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.nsclient.data.NSDeviceStatus
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.receivers.ReceiverStatusStore
 import info.nightscout.androidaps.services.Intents
+import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DefaultValueHelper
 import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.extensions.durationInMinutes
+import info.nightscout.androidaps.extensions.toStringFull
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import io.reactivex.disposables.CompositeDisposable
@@ -40,14 +37,15 @@ class DataBroadcastPlugin @Inject constructor(
     resourceHelper: ResourceHelper,
     private val aapsSchedulers: AapsSchedulers,
     private val context: Context,
+    private val dateUtil: DateUtil,
     private val fabricPrivacy: FabricPrivacy,
     private val rxBus: RxBusWrapper,
-    private val iobCobCalculatorPlugin: IobCobCalculatorPlugin,
+    private val iobCobCalculator: IobCobCalculator,
     private val profileFunction: ProfileFunction,
     private val defaultValueHelper: DefaultValueHelper,
     private val nsDeviceStatus: NSDeviceStatus,
     private val loopPlugin: LoopPlugin,
-    private val activePlugin: ActivePluginProvider,
+    private val activePlugin: ActivePlugin,
     private var receiverStatusStore: ReceiverStatusStore,
     private val config: Config,
     private val glucoseStatusProvider: GlucoseStatusProvider
@@ -121,12 +119,12 @@ class DataBroadcastPlugin @Inject constructor(
     }
 
     private fun bgStatus(bundle: Bundle) {
-        val lastBG = iobCobCalculatorPlugin.lastBg() ?: return
+        val lastBG = iobCobCalculator.ads.lastBg() ?: return
         val glucoseStatus = glucoseStatusProvider.glucoseStatusData ?: return
 
         bundle.putDouble("glucoseMgdl", lastBG.value)   // last BG in mgdl
         bundle.putLong("glucoseTimeStamp", lastBG.timestamp) // timestamp
-        bundle.putString("units", profileFunction.getUnits()) // units used in AAPS "mg/dl" or "mmol"
+        bundle.putString("units", profileFunction.getUnits().asText) // units used in AAPS "mg/dl" or "mmol"
         bundle.putString("slopeArrow", lastBG.trendArrow.text) // direction arrow as string
         bundle.putDouble("deltaMgdl", glucoseStatus.delta) // bg delta in mgdl
         bundle.putDouble("avgDeltaMgdl", glucoseStatus.shortAvgDelta) // average bg delta
@@ -136,15 +134,13 @@ class DataBroadcastPlugin @Inject constructor(
 
     private fun iobCob(bundle: Bundle) {
         profileFunction.getProfile() ?: return
-        activePlugin.activeTreatments.updateTotalIOBTreatments()
-        val bolusIob: IobTotal = activePlugin.activeTreatments.lastCalculationTreatments.round()
-        activePlugin.activeTreatments.updateTotalIOBTempBasals()
-        val basalIob: IobTotal = activePlugin.activeTreatments.lastCalculationTempBasals.round()
+        val bolusIob = iobCobCalculator.calculateIobFromBolus().round()
+        val basalIob = iobCobCalculator.calculateIobFromTempBasalsIncludingConvertedExtended().round()
         bundle.putDouble("bolusIob", bolusIob.iob)
         bundle.putDouble("basalIob", basalIob.basaliob)
         bundle.putDouble("iob", bolusIob.iob + basalIob.basaliob) // total IOB
 
-        val cob = iobCobCalculatorPlugin.getCobInfo(false, "broadcast")
+        val cob = iobCobCalculator.getCobInfo(false, "broadcast")
         bundle.putDouble("cob", cob.displayCob ?: -1.0) // COB [g] or -1 if N/A
         bundle.putDouble("futureCarbs", cob.futureCarbs) // future scheduled carbs
     }
@@ -179,14 +175,14 @@ class DataBroadcastPlugin @Inject constructor(
         val now = System.currentTimeMillis()
         val profile = profileFunction.getProfile() ?: return
         bundle.putLong("basalTimeStamp", now)
-        bundle.putDouble("baseBasal", profile.basal)
+        bundle.putDouble("baseBasal", profile.getBasal())
         bundle.putString("profile", profileFunction.getProfileName())
-        activePlugin.activeTreatments.getTempBasalFromHistory(now)?.let {
-            bundle.putLong("tempBasalStart", it.date)
-            bundle.putInt("tempBasalDurationInMinutes", it.durationInMinutes)
-            if (it.isAbsolute) bundle.putDouble("tempBasalAbsolute", it.absoluteRate) // U/h for absolute TBR
-            else bundle.putInt("tempBasalPercent", it.percentRate) // % for percent type TBR
-            bundle.putString("tempBasalString", it.toStringFull()) // user friendly string
+        iobCobCalculator.getTempBasalIncludingConvertedExtended(now)?.let {
+            bundle.putLong("tempBasalStart", it.timestamp)
+            bundle.putLong("tempBasalDurationInMinutes", it.durationInMinutes)
+            if (it.isAbsolute) bundle.putDouble("tempBasalAbsolute", it.rate) // U/h for absolute TBR
+            else bundle.putInt("tempBasalPercent", it.rate.toInt()) // % for percent type TBR
+            bundle.putString("tempBasalString", it.toStringFull(profile, dateUtil)) // user friendly string
         }
     }
 

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

@@ -17,6 +17,8 @@ import info.nightscout.androidaps.R
 import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.database.entities.Food
 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.InvalidateFoodTransaction
 import info.nightscout.androidaps.databinding.FoodFragmentBinding
 import info.nightscout.androidaps.databinding.FoodItemBinding
@@ -25,11 +27,10 @@ import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
-import info.nightscout.androidaps.utils.extensions.toVisibility
+import info.nightscout.androidaps.extensions.toVisibility
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import io.reactivex.Completable
@@ -48,13 +49,12 @@ class FoodFragment : DaggerFragment() {
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var fabricPrivacy: FabricPrivacy
-    @Inject lateinit var nsUpload: NSUpload
     @Inject lateinit var repository: AppRepository
     @Inject lateinit var uel: UserEntryLogger
 
     private val disposable = CompositeDisposable()
-    private lateinit var unfiltered: List<Food>
-    private lateinit var filtered: MutableList<Food>
+    private var unfiltered: List<Food> = arrayListOf()
+    private var filtered: MutableList<Food> = arrayListOf()
 
     private var _binding: FoodFragmentBinding? = null
 
@@ -76,7 +76,8 @@ class FoodFragment : DaggerFragment() {
         binding.refreshFromNightscout.setOnClickListener {
             context?.let { context ->
                 OKDialog.showConfirmation(context, resourceHelper.gs(R.string.refresheventsfromnightscout) + " ?", {
-                    uel.log(Action.FOOD_FROM_NS)
+                    uel.log(Action.FOOD, Sources.Food, resourceHelper.gs(R.string.refresheventsfromnightscout),
+                        ValueWithUnit.SimpleString(resourceHelper.gsNotLocalised(R.string.refresheventsfromnightscout)))
                     disposable += Completable.fromAction { repository.deleteAllFoods() }
                         .subscribeOn(aapsSchedulers.io)
                         .observeOn(aapsSchedulers.main)
@@ -200,8 +201,10 @@ class FoodFragment : DaggerFragment() {
 
     private fun filterData() {
         val textFilter = binding.filter.text.toString()
-        val categoryFilter = binding.category.selectedItem?.toString() ?: resourceHelper.gs(R.string.none)
-        val subcategoryFilter = binding.subcategory.selectedItem?.toString() ?: resourceHelper.gs(R.string.none)
+        val categoryFilter = binding.category.selectedItem?.toString()
+            ?: resourceHelper.gs(R.string.none)
+        val subcategoryFilter = binding.subcategory.selectedItem?.toString()
+            ?: resourceHelper.gs(R.string.none)
         val newFiltered = ArrayList<Food>()
         for (f in unfiltered) {
             if (f.category == null || f.subCategory == null) continue
@@ -250,16 +253,12 @@ class FoodFragment : DaggerFragment() {
                     val food = v.tag as Food
                     activity?.let { activity ->
                         OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.removerecord) + "\n" + food.name, {
-                            uel.log(Action.FOOD_REMOVED, food.name)
+                            uel.log(Action.FOOD_REMOVED, Sources.Food, food.name)
                             disposable += repository.runTransactionForResult(InvalidateFoodTransaction(food.id))
-                                .subscribe({
-                                    val id = food.interfaceIDs.nightscoutId
-                                    if (NSUpload.isIdValid(id)) nsUpload.removeFoodFromNS(id)
-                                    // no create at the moment
-                                    // else uploadQueue.removeID("dbAdd", food.timestamp.toString())
-                                }, {
-                                    aapsLogger.error(LTag.BGSOURCE, "Error while invalidating food", it)
-                                })
+                                .subscribe(
+                                    { aapsLogger.error(LTag.DATABASE, "Invalidated food $it") },
+                                    { aapsLogger.error(LTag.DATABASE, "Error while invalidating food", it) }
+                                )
                         }, null)
                     }
                 }

app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodPlugin.kt

@@ -3,11 +3,13 @@ package info.nightscout.androidaps.plugins.general.food
 import android.content.Context
 import androidx.work.Worker
 import androidx.work.WorkerParameters
+import androidx.work.workDataOf
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.database.entities.Food
-import info.nightscout.androidaps.database.transactions.SyncFoodTransaction
+import info.nightscout.androidaps.database.transactions.SyncNsFoodTransaction
+import info.nightscout.androidaps.extensions.foodFromJson
 import info.nightscout.androidaps.interfaces.PluginBase
 import info.nightscout.androidaps.interfaces.PluginDescription
 import info.nightscout.androidaps.interfaces.PluginType
@@ -15,10 +17,8 @@ import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.receivers.DataWorker
 import info.nightscout.androidaps.utils.JsonHelper
-import info.nightscout.androidaps.utils.extensions.foodFromJson
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
-import org.json.JSONArray
 import org.json.JSONObject
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -56,8 +56,8 @@ class FoodPlugin @Inject constructor(
 
         override fun doWork(): Result {
             val foods = dataWorker.pickupJSONArray(inputData.getLong(DataWorker.STORE_KEY, -1))
-                ?: return Result.failure()
-            aapsLogger.debug(LTag.DATAFOOD, "Received Food Data: $foods")
+                ?: return Result.failure(workDataOf("Error" to "missing input data"))
+            aapsLogger.debug(LTag.DATABASE, "Received Food Data: $foods")
 
             var ret = Result.success()
 
@@ -75,34 +75,34 @@ class FoodPlugin @Inject constructor(
                             isValid = false
                         ).also { it.interfaceIDs.nightscoutId = JsonHelper.safeGetString(jsonFood, "_id") }
 
-                        repository.runTransactionForResult(SyncFoodTransaction(delFood))
+                        repository.runTransactionForResult(SyncNsFoodTransaction(delFood, true))
                             .doOnError {
-                                aapsLogger.error(LTag.DATAFOOD, "Error while removing food", it)
-                                ret = Result.failure()
+                                aapsLogger.error(LTag.DATABASE, "Error while removing food", it)
+                                ret = Result.failure(workDataOf("Error" to it.toString()))
                             }
                             .blockingGet()
                             .also {
-                                it.invalidated.forEach { f -> aapsLogger.debug(LTag.DATAFOOD, "Invalidated food ${f.interfaceIDs.nightscoutId}") }
+                                it.invalidated.forEach { f -> aapsLogger.debug(LTag.DATABASE, "Invalidated food ${f.interfaceIDs.nightscoutId}") }
                             }
                     }
 
                     else     -> {
                         val food = foodFromJson(jsonFood)
                         if (food != null) {
-                            repository.runTransactionForResult(SyncFoodTransaction(food))
+                            repository.runTransactionForResult(SyncNsFoodTransaction(food, false))
                                 .doOnError {
-                                    aapsLogger.error(LTag.DATAFOOD, "Error while adding/updating food", it)
-                                    ret = Result.failure()
+                                    aapsLogger.error(LTag.DATABASE, "Error while adding/updating food", it)
+                                    ret = Result.failure(workDataOf("Error" to it.toString()))
                                 }
                                 .blockingGet()
                                 .also { result ->
-                                    result.inserted.forEach { aapsLogger.debug(LTag.DATAFOOD, "Inserted food $it") }
-                                    result.updated.forEach { aapsLogger.debug(LTag.DATAFOOD, "Updated food $it") }
-                                    result.invalidated.forEach { aapsLogger.debug(LTag.DATAFOOD, "Invalidated food $it") }
+                                    result.inserted.forEach { aapsLogger.debug(LTag.DATABASE, "Inserted food $it") }
+                                    result.updated.forEach { aapsLogger.debug(LTag.DATABASE, "Updated food $it") }
+                                    result.invalidated.forEach { aapsLogger.debug(LTag.DATABASE, "Invalidated food $it") }
                                 }
                         } else {
-                            aapsLogger.error(LTag.DATAFOOD, "Error parsing food", jsonFood.toString())
-                            ret = Result.failure()
+                            aapsLogger.error(LTag.DATABASE, "Error parsing food", jsonFood.toString())
+                            ret = Result.failure(workDataOf("Error" to "Error parsing food"))
                         }
                     }
                 }

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

@@ -16,10 +16,11 @@ import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.DaggerAppCompatActivityWithResult
 import info.nightscout.androidaps.activities.PreferencesActivity
 import info.nightscout.androidaps.database.entities.UserEntry
-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.events.EventAppExit
-import info.nightscout.androidaps.interfaces.ConfigInterface
-import info.nightscout.androidaps.interfaces.ImportExportPrefsInterface
+import info.nightscout.androidaps.interfaces.Config
+import info.nightscout.androidaps.interfaces.ImportExportPrefs
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
@@ -40,7 +41,6 @@ import io.reactivex.Single
 import java.io.File
 import java.io.FileNotFoundException
 import java.io.IOException
-import java.util.*
 import javax.inject.Inject
 import javax.inject.Singleton
 import kotlin.system.exitProcess
@@ -50,20 +50,21 @@ import kotlin.system.exitProcess
  */
 
 @Singleton
-class ImportExportPrefs @Inject constructor(
+class ImportExportPrefsImpl @Inject constructor(
     private var log: AAPSLogger,
     private val resourceHelper: ResourceHelper,
     private val sp: SP,
     private val buildHelper: BuildHelper,
     private val rxBus: RxBusWrapper,
     private val passwordCheck: PasswordCheck,
-    private val config: ConfigInterface,
+    private val config: Config,
     private val androidPermission: AndroidPermission,
     private val classicPrefsFormat: ClassicPrefsFormat,
     private val encryptedPrefsFormat: EncryptedPrefsFormat,
     private val prefFileList: PrefFileListProvider,
-    private val uel: UserEntryLogger
-) : ImportExportPrefsInterface {
+    private val uel: UserEntryLogger,
+    private val dateUtil: DateUtil
+) : ImportExportPrefs {
 
     override fun prefsFileExists(): Boolean {
         return prefFileList.listPreferenceFiles().size > 0
@@ -94,7 +95,7 @@ class ImportExportPrefs @Inject constructor(
         val metadata: MutableMap<PrefsMetadataKey, PrefMetadata> = mutableMapOf()
 
         metadata[PrefsMetadataKey.DEVICE_NAME] = PrefMetadata(detectUserName(context), PrefsStatus.OK)
-        metadata[PrefsMetadataKey.CREATED_AT] = PrefMetadata(DateUtil.toISOString(Date()), PrefsStatus.OK)
+        metadata[PrefsMetadataKey.CREATED_AT] = PrefMetadata(dateUtil.toISOString(dateUtil.now()), PrefsStatus.OK)
         metadata[PrefsMetadataKey.AAPS_VERSION] = PrefMetadata(BuildConfig.VERSION_NAME, PrefsStatus.OK)
         metadata[PrefsMetadataKey.AAPS_FLAVOUR] = PrefMetadata(BuildConfig.FLAVOR, PrefsStatus.OK)
         metadata[PrefsMetadataKey.DEVICE_MODEL] = PrefMetadata(config.currentDeviceModelString, PrefsStatus.OK)
@@ -348,7 +349,7 @@ class ImportExportPrefs @Inject constructor(
     private fun restartAppAfterImport(context: Context) {
         sp.putBoolean(R.string.key_setupwizard_processed, true)
         OKDialog.show(context, resourceHelper.gs(R.string.setting_imported), resourceHelper.gs(R.string.restartingapp)) {
-            uel.log(Action.IMPORT_SETTINGS)
+            uel.log(Action.IMPORT_SETTINGS, Sources.Maintenance)
             log.debug(LTag.CORE, "Exiting")
             rxBus.send(EventAppExit())
             if (context is AppCompatActivity) {

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

@@ -7,17 +7,21 @@ import android.view.View
 import android.view.ViewGroup
 import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.R
+import info.nightscout.androidaps.dana.database.DanaHistoryDatabase
 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.databinding.MaintenanceFragmentBinding
 import info.nightscout.androidaps.events.EventNewBG
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
-import info.nightscout.androidaps.interfaces.ImportExportPrefsInterface
+import info.nightscout.androidaps.insight.database.InsightDatabase
+import info.nightscout.androidaps.interfaces.DataSyncSelector
+import info.nightscout.androidaps.interfaces.ImportExportPrefs
+import info.nightscout.androidaps.interfaces.PumpSync
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.maintenance.activities.LogSettingActivity
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventNewHistoryData
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
@@ -32,12 +36,14 @@ class MaintenanceFragment : DaggerFragment() {
     @Inject lateinit var maintenancePlugin: MaintenancePlugin
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var resourceHelper: ResourceHelper
-    @Inject lateinit var treatmentsPlugin: TreatmentsPlugin
-    @Inject lateinit var importExportPrefs: ImportExportPrefsInterface
+    @Inject lateinit var importExportPrefs: ImportExportPrefs
     @Inject lateinit var aapsSchedulers: AapsSchedulers
     @Inject lateinit var repository: AppRepository
-    @Inject lateinit var databaseHelper: DatabaseHelperInterface
+    @Inject lateinit var danaHistoryDatabase: DanaHistoryDatabase
+    @Inject lateinit var insightDatabase: InsightDatabase
     @Inject lateinit var uel: UserEntryLogger
+    @Inject lateinit var dataSyncSelector: DataSyncSelector
+    @Inject lateinit var pumpSync: PumpSync
 
     private val compositeDisposable = CompositeDisposable()
 
@@ -56,40 +62,43 @@ class MaintenanceFragment : DaggerFragment() {
         super.onViewCreated(view, savedInstanceState)
         binding.logSend.setOnClickListener { maintenancePlugin.sendLogs() }
         binding.logDelete.setOnClickListener {
-            uel.log(Action.DELETE_LOGS)
+            uel.log(Action.DELETE_LOGS, Sources.Maintenance)
             maintenancePlugin.deleteLogs()
         }
         binding.navResetdb.setOnClickListener {
             activity?.let { activity ->
                 OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.maintenance), resourceHelper.gs(R.string.reset_db_confirm), Runnable {
-                    uel.log(Action.RESET_DATABASES)
                     compositeDisposable.add(
                         fromAction {
-                            databaseHelper.resetDatabases()
-                            // should be handled by Plugin-Interface and
-                            // additional service interface and plugin registry
-                            treatmentsPlugin.service.resetTreatments()
                             repository.clearDatabases()
+                            danaHistoryDatabase.clearAllTables()
+                            insightDatabase.clearAllTables()
+                            dataSyncSelector.resetToNextFullSync()
+                            pumpSync.connectNewPump()
                         }
                             .subscribeOn(aapsSchedulers.io)
                             .observeOn(aapsSchedulers.main)
                             .subscribeBy(
                                 onError = { aapsLogger.error("Error clearing databases", it) },
-                                onComplete = { rxBus.send(EventNewBG(null)) }
+                                onComplete = {
+                                    rxBus.send(EventNewBG(null))
+                                    rxBus.send(EventNewHistoryData(0, true))
+                                }
                             )
                     )
+                    uel.log(Action.RESET_DATABASES, Sources.Maintenance)
                 })
             }
         }
         binding.navExport.setOnClickListener {
-            uel.log(Action.EXPORT_SETTINGS)
+            uel.log(Action.EXPORT_SETTINGS, Sources.Maintenance)
             // start activity for checking permissions...
             importExportPrefs.verifyStoragePermissions(this) {
                 importExportPrefs.exportSharedPreferences(this)
             }
         }
         binding.navImport.setOnClickListener {
-            uel.log(Action.IMPORT_SETTINGS)
+            uel.log(Action.IMPORT_SETTINGS, Sources.Maintenance)
             // start activity for checking permissions...
             importExportPrefs.verifyStoragePermissions(this) {
                 importExportPrefs.importSharedPreferences(this)
@@ -99,7 +108,7 @@ class MaintenanceFragment : DaggerFragment() {
         binding.exportCsv.setOnClickListener {
             activity?.let { activity ->
                 OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.ue_export_to_csv) + "?") {
-                    uel.log(Action.EXPORT_CSV)
+                    uel.log(Action.EXPORT_CSV, Sources.Maintenance)
                     importExportPrefs.exportUserEntriesCsv(activity, repository.getAllUserEntries())
                 }
             }

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

@@ -8,7 +8,7 @@ import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.SwitchPreference
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.BuildConfig
-import info.nightscout.androidaps.Config
+import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.interfaces.PluginBase
 import info.nightscout.androidaps.interfaces.PluginDescription

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

@@ -0,0 +1,569 @@
+package info.nightscout.androidaps.plugins.general.nsclient
+
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.database.AppRepository
+import info.nightscout.androidaps.database.ValueWrapper
+import info.nightscout.androidaps.database.entities.*
+import info.nightscout.androidaps.extensions.toJson
+import info.nightscout.androidaps.interfaces.ActivePlugin
+import info.nightscout.androidaps.interfaces.DataSyncSelector
+import info.nightscout.androidaps.interfaces.ProfileFunction
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.profile.local.LocalProfilePlugin
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import javax.inject.Inject
+
+class DataSyncSelectorImplementation @Inject constructor(
+    private val sp: SP,
+    private val aapsLogger: AAPSLogger,
+    private val dateUtil: DateUtil,
+    private val profileFunction: ProfileFunction,
+    private val nsClientPlugin: NSClientPlugin,
+    private val activePlugin: ActivePlugin,
+    private val appRepository: AppRepository,
+    private val localProfilePlugin: LocalProfilePlugin
+) : DataSyncSelector {
+
+    override fun doUpload() {
+        if (sp.getBoolean(R.string.key_ns_upload, true)) {
+            processChangedBolusesCompat()
+            processChangedCarbsCompat()
+            processChangedBolusCalculatorResultsCompat()
+            processChangedTemporaryBasalsCompat()
+            processChangedExtendedBolusesCompat()
+            processChangedProfileSwitchesCompat()
+            processChangedGlucoseValuesCompat()
+            processChangedTempTargetsCompat()
+            processChangedFoodsCompat()
+            processChangedTherapyEventsCompat()
+            processChangedDeviceStatusesCompat()
+            processChangedProfileStore()
+        }
+    }
+
+    override fun resetToNextFullSync() {
+        sp.remove(R.string.key_ns_temporary_target_last_synced_id)
+        sp.remove(R.string.key_ns_glucose_value_last_synced_id)
+        sp.remove(R.string.key_ns_food_last_synced_id)
+        sp.remove(R.string.key_ns_bolus_last_synced_id)
+        sp.remove(R.string.key_ns_carbs_last_synced_id)
+        sp.remove(R.string.key_ns_bolus_calculator_result_last_synced_id)
+        sp.remove(R.string.key_ns_device_status_last_synced_id)
+        sp.remove(R.string.key_ns_temporary_basal_last_synced_id)
+        sp.remove(R.string.key_ns_extended_bolus_last_synced_id)
+        sp.remove(R.string.key_ns_therapy_event_last_synced_id)
+        sp.remove(R.string.key_ns_profile_switch_last_synced_id)
+        sp.remove(R.string.key_ns_profile_store_last_synced_timestamp)
+    }
+
+    override fun confirmLastBolusIdIfGreater(lastSynced: Long) {
+        if (lastSynced > sp.getLong(R.string.key_ns_bolus_last_synced_id, 0)) {
+            aapsLogger.debug(LTag.NSCLIENT, "Setting Bolus data sync from $lastSynced")
+            sp.putLong(R.string.key_ns_bolus_last_synced_id, lastSynced)
+        }
+    }
+
+    // Prepared for v3 (returns all modified after)
+    override fun changedBoluses(): List<Bolus> {
+        val startId = sp.getLong(R.string.key_ns_bolus_last_synced_id, 0)
+        return appRepository.getModifiedBolusesDataFromId(startId)
+            .blockingGet()
+            .filter { it.type != Bolus.Type.PRIMING }
+            .also {
+                aapsLogger.debug(LTag.NSCLIENT, "Loading Bolus data for sync from $startId. Records ${it.size}")
+            }
+    }
+
+    private var lastBolusId = -1L
+    private var lastBolusTime = -1L
+    override fun processChangedBolusesCompat(): Boolean {
+        val lastDbIdWrapped = appRepository.getLastBolusIdWrapped().blockingGet()
+        val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
+        var startId = sp.getLong(R.string.key_ns_bolus_last_synced_id, 0)
+        if (startId > lastDbId) {
+            sp.putLong(R.string.key_ns_bolus_last_synced_id, 0)
+            startId = 0
+        }
+        if (startId == lastBolusId && dateUtil.now() - lastBolusTime < 5000) return false
+        lastBolusId = startId
+        lastBolusTime = dateUtil.now()
+        appRepository.getNextSyncElementBolus(startId).blockingGet()?.let { bolus ->
+            aapsLogger.info(LTag.DATABASE, "Loading Bolus data Start: $startId ID: ${bolus.first.id} HistoryID: ${bolus.second} ")
+            when {
+                // without nsId = create new
+                bolus.first.interfaceIDs.nightscoutId == null ->
+                    nsClientPlugin.nsClientService?.dbAdd("treatments", bolus.first.toJson(dateUtil), DataSyncSelector.PairBolus(bolus.first, bolus.second), "$startId/$lastDbId")
+                // with nsId = update
+                bolus.first.interfaceIDs.nightscoutId != null ->
+                    nsClientPlugin.nsClientService?.dbUpdate("treatments", bolus.first.interfaceIDs.nightscoutId, bolus.first.toJson(dateUtil), DataSyncSelector.PairBolus(bolus.first, bolus.second), "$startId/$lastDbId")
+            }
+            return true
+        }
+        return false
+    }
+
+    override fun confirmLastCarbsIdIfGreater(lastSynced: Long) {
+        if (lastSynced > sp.getLong(R.string.key_ns_carbs_last_synced_id, 0)) {
+            aapsLogger.debug(LTag.NSCLIENT, "Setting Carbs data sync from $lastSynced")
+            sp.putLong(R.string.key_ns_carbs_last_synced_id, lastSynced)
+        }
+    }
+
+    // Prepared for v3 (returns all modified after)
+    override fun changedCarbs(): List<Carbs> {
+        val startId = sp.getLong(R.string.key_ns_carbs_last_synced_id, 0)
+        return appRepository.getModifiedCarbsDataFromId(startId).blockingGet().also {
+            aapsLogger.debug(LTag.NSCLIENT, "Loading Carbs data for sync from $startId. Records ${it.size}")
+        }
+    }
+
+    private var lastCarbsId = -1L
+    private var lastCarbsTime = -1L
+    override fun processChangedCarbsCompat(): Boolean {
+        val lastDbIdWrapped = appRepository.getLastCarbsIdWrapped().blockingGet()
+        val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
+        var startId = sp.getLong(R.string.key_ns_carbs_last_synced_id, 0)
+        if (startId > lastDbId) {
+            sp.putLong(R.string.key_ns_carbs_last_synced_id, 0)
+            startId = 0
+        }
+        if (startId == lastCarbsId && dateUtil.now() - lastCarbsTime < 5000) return false
+        lastCarbsId = startId
+        lastCarbsTime = dateUtil.now()
+        appRepository.getNextSyncElementCarbs(startId).blockingGet()?.let { carb ->
+            aapsLogger.info(LTag.DATABASE, "Loading Carbs data Start: $startId ID: ${carb.first.id} HistoryID: ${carb.second} ")
+            when {
+                // without nsId = create new
+                carb.first.interfaceIDs.nightscoutId == null ->
+                    nsClientPlugin.nsClientService?.dbAdd("treatments", carb.first.toJson(dateUtil), DataSyncSelector.PairCarbs(carb.first, carb.second), "$startId/$lastDbId")
+                // with nsId = update
+                carb.first.interfaceIDs.nightscoutId != null ->
+                    nsClientPlugin.nsClientService?.dbUpdate("treatments", carb.first.interfaceIDs.nightscoutId, carb.first.toJson(dateUtil), DataSyncSelector.PairCarbs(carb.first, carb.second), "$startId/$lastDbId")
+            }
+            return true
+        }
+        return false
+    }
+
+    override fun confirmLastBolusCalculatorResultsIdIfGreater(lastSynced: Long) {
+        if (lastSynced > sp.getLong(R.string.key_ns_bolus_calculator_result_last_synced_id, 0)) {
+            aapsLogger.debug(LTag.NSCLIENT, "Setting BolusCalculatorResult data sync from $lastSynced")
+            sp.putLong(R.string.key_ns_bolus_calculator_result_last_synced_id, lastSynced)
+        }
+    }
+
+    // Prepared for v3 (returns all modified after)
+    override fun changedBolusCalculatorResults(): List<BolusCalculatorResult> {
+        val startId = sp.getLong(R.string.key_ns_bolus_calculator_result_last_synced_id, 0)
+        return appRepository.getModifiedBolusCalculatorResultsDataFromId(startId).blockingGet().also {
+            aapsLogger.debug(LTag.NSCLIENT, "Loading BolusCalculatorResult data for sync from $startId. Records ${it.size}")
+        }
+    }
+
+    private var lastBcrId = -1L
+    private var lastBcrTime = -1L
+    override fun processChangedBolusCalculatorResultsCompat(): Boolean {
+        val lastDbIdWrapped = appRepository.getLastBolusCalculatorResultIdWrapped().blockingGet()
+        val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
+        var startId = sp.getLong(R.string.key_ns_bolus_calculator_result_last_synced_id, 0)
+        if (startId > lastDbId) {
+            sp.putLong(R.string.key_ns_bolus_calculator_result_last_synced_id, 0)
+            startId = 0
+        }
+        if (startId == lastBcrId && dateUtil.now() - lastBcrTime < 5000) return false
+        lastBcrId = startId
+        lastBcrTime = dateUtil.now()
+        appRepository.getNextSyncElementBolusCalculatorResult(startId).blockingGet()?.let { bolusCalculatorResult ->
+            aapsLogger.info(LTag.DATABASE, "Loading BolusCalculatorResult data Start: $startId ID: ${bolusCalculatorResult.first.id} HistoryID: ${bolusCalculatorResult.second} ")
+            when {
+                // without nsId = create new
+                bolusCalculatorResult.first.interfaceIDs.nightscoutId == null ->
+                    nsClientPlugin.nsClientService?.dbAdd("treatments", bolusCalculatorResult.first.toJson(dateUtil), DataSyncSelector.PairBolusCalculatorResult(bolusCalculatorResult.first, bolusCalculatorResult.second), "$startId/$lastDbId")
+                // with nsId = update
+                bolusCalculatorResult.first.interfaceIDs.nightscoutId != null ->
+                    nsClientPlugin.nsClientService?.dbUpdate("treatments", bolusCalculatorResult.first.interfaceIDs.nightscoutId, bolusCalculatorResult.first.toJson(dateUtil), DataSyncSelector.PairBolusCalculatorResult(bolusCalculatorResult.first, bolusCalculatorResult.second), "$startId/$lastDbId")
+            }
+            return true
+        }
+        return false
+    }
+
+    override fun confirmLastTempTargetsIdIfGreater(lastSynced: Long) {
+        if (lastSynced > sp.getLong(R.string.key_ns_temporary_target_last_synced_id, 0)) {
+            aapsLogger.debug(LTag.NSCLIENT, "Setting TemporaryTarget data sync from $lastSynced")
+            sp.putLong(R.string.key_ns_temporary_target_last_synced_id, lastSynced)
+        }
+    }
+
+    // Prepared for v3 (returns all modified after)
+    override fun changedTempTargets(): List<TemporaryTarget> {
+        val startId = sp.getLong(R.string.key_ns_temporary_target_last_synced_id, 0)
+        return appRepository.getModifiedTemporaryTargetsDataFromId(startId).blockingGet().also {
+            aapsLogger.debug(LTag.NSCLIENT, "Loading TemporaryTarget data for sync from $startId. Records ${it.size}")
+        }
+    }
+
+    private var lastTtId = -1L
+    private var lastTtTime = -1L
+    override fun processChangedTempTargetsCompat(): Boolean {
+        val lastDbIdWrapped = appRepository.getLastTempTargetIdWrapped().blockingGet()
+        val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
+        var startId = sp.getLong(R.string.key_ns_temporary_target_last_synced_id, 0)
+        if (startId > lastDbId) {
+            sp.putLong(R.string.key_ns_temporary_target_last_synced_id, 0)
+            startId = 0
+        }
+        if (startId == lastTtId && dateUtil.now() - lastTtTime < 5000) return false
+        lastTtId = startId
+        lastTtTime = dateUtil.now()
+        appRepository.getNextSyncElementTemporaryTarget(startId).blockingGet()?.let { tt ->
+            aapsLogger.info(LTag.DATABASE, "Loading TemporaryTarget data Start: $startId ID: ${tt.first.id} HistoryID: ${tt.second} ")
+            when {
+                // without nsId = create new
+                tt.first.interfaceIDs.nightscoutId == null ->
+                    nsClientPlugin.nsClientService?.dbAdd("treatments", tt.first.toJson(profileFunction.getUnits(), dateUtil), DataSyncSelector.PairTemporaryTarget(tt.first, tt.second), "$startId/$lastDbId")
+                // existing with nsId = update
+                tt.first.interfaceIDs.nightscoutId != null ->
+                    nsClientPlugin.nsClientService?.dbUpdate("treatments", tt.first.interfaceIDs.nightscoutId, tt.first.toJson(profileFunction.getUnits(), dateUtil), DataSyncSelector.PairTemporaryTarget(tt.first, tt.second), "$startId/$lastDbId")
+            }
+            return true
+        }
+        return false
+    }
+
+    override fun confirmLastFoodIdIfGreater(lastSynced: Long) {
+        if (lastSynced > sp.getLong(R.string.key_ns_food_last_synced_id, 0)) {
+            aapsLogger.debug(LTag.NSCLIENT, "Setting Food data sync from $lastSynced")
+            sp.putLong(R.string.key_ns_food_last_synced_id, lastSynced)
+        }
+    }
+
+    // Prepared for v3 (returns all modified after)
+    override fun changedFoods(): List<Food> {
+        val startId = sp.getLong(R.string.key_ns_food_last_synced_id, 0)
+        return appRepository.getModifiedFoodDataFromId(startId).blockingGet().also {
+            aapsLogger.debug(LTag.NSCLIENT, "Loading Food data for sync from $startId. Records ${it.size}")
+        }
+    }
+
+    private var lastFoodId = -1L
+    private var lastFoodTime = -1L
+    override fun processChangedFoodsCompat(): Boolean {
+        val lastDbIdWrapped = appRepository.getLastFoodIdWrapped().blockingGet()
+        val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
+        var startId = sp.getLong(R.string.key_ns_food_last_synced_id, 0)
+        if (startId > lastDbId) {
+            sp.putLong(R.string.key_ns_food_last_synced_id, 0)
+            startId = 0
+        }
+        if (startId == lastFoodId && dateUtil.now() - lastFoodTime < 5000) return false
+        lastFoodId = startId
+        lastFoodTime = dateUtil.now()
+        appRepository.getNextSyncElementFood(startId).blockingGet()?.let { food ->
+            aapsLogger.info(LTag.DATABASE, "Loading Food data Start: $startId ID: ${food.first.id} HistoryID: ${food.second} ")
+            when {
+                // without nsId = create new
+                food.first.interfaceIDs.nightscoutId == null ->
+                    nsClientPlugin.nsClientService?.dbAdd("food", food.first.toJson(), DataSyncSelector.PairFood(food.first, food.second), "$startId/$lastDbId")
+                // with nsId = update
+                food.first.interfaceIDs.nightscoutId != null ->
+                    nsClientPlugin.nsClientService?.dbUpdate("food", food.first.interfaceIDs.nightscoutId, food.first.toJson(), DataSyncSelector.PairFood(food.first, food.second), "$startId/$lastDbId")
+            }
+            return true
+        }
+        return false
+    }
+
+    override fun confirmLastGlucoseValueIdIfGreater(lastSynced: Long) {
+        if (lastSynced > sp.getLong(R.string.key_ns_glucose_value_last_synced_id, 0)) {
+            aapsLogger.debug(LTag.NSCLIENT, "Setting GlucoseValue data sync from $lastSynced")
+            sp.putLong(R.string.key_ns_glucose_value_last_synced_id, lastSynced)
+        }
+    }
+
+    // Prepared for v3 (returns all modified after)
+    override fun changedGlucoseValues(): List<GlucoseValue> {
+        val startId = sp.getLong(R.string.key_ns_glucose_value_last_synced_id, 0)
+        return appRepository.getModifiedBgReadingsDataFromId(startId).blockingGet().also {
+            aapsLogger.debug(LTag.NSCLIENT, "Loading GlucoseValue data for sync from $startId . Records ${it.size}")
+        }
+    }
+
+    private var lastGvId = -1L
+    private var lastGvTime = -1L
+    override fun processChangedGlucoseValuesCompat(): Boolean {
+        val lastDbIdWrapped = appRepository.getLastGlucoseValueIdWrapped().blockingGet()
+        val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
+        var startId = sp.getLong(R.string.key_ns_glucose_value_last_synced_id, 0)
+        if (startId > lastDbId) {
+            sp.putLong(R.string.key_ns_glucose_value_last_synced_id, 0)
+            startId = 0
+        }
+        if (startId == lastGvId && dateUtil.now() - lastGvTime < 5000) return false
+        lastGvId = startId
+        lastGvTime = dateUtil.now()
+        appRepository.getNextSyncElementGlucoseValue(startId).blockingGet()?.let { gv ->
+            aapsLogger.info(LTag.DATABASE, "Loading GlucoseValue data Start: $startId ID: ${gv.first.id} HistoryID: ${gv.second} ")
+            if (activePlugin.activeBgSource.shouldUploadToNs(gv.first)) {
+                when {
+                    // without nsId = create new
+                    gv.first.interfaceIDs.nightscoutId == null ->
+                        nsClientPlugin.nsClientService?.dbAdd("entries", gv.first.toJson(dateUtil), DataSyncSelector.PairGlucoseValue(gv.first, gv.second), "$startId/$lastDbId")
+                    // with nsId = update
+                    gv.first.interfaceIDs.nightscoutId != null ->
+                        nsClientPlugin.nsClientService?.dbUpdate("entries", gv.first.interfaceIDs.nightscoutId, gv.first.toJson(dateUtil), DataSyncSelector.PairGlucoseValue(gv.first, gv.second), "$startId/$lastDbId")
+                }
+                return true
+            } else {
+                confirmLastGlucoseValueIdIfGreater(gv.second)
+                lastGvId = -1
+                processChangedGlucoseValuesCompat()
+            }
+        }
+        return false
+    }
+
+    override fun confirmLastTherapyEventIdIfGreater(lastSynced: Long) {
+        if (lastSynced > sp.getLong(R.string.key_ns_therapy_event_last_synced_id, 0)) {
+            aapsLogger.debug(LTag.NSCLIENT, "Setting TherapyEvents data sync from $lastSynced")
+            sp.putLong(R.string.key_ns_therapy_event_last_synced_id, lastSynced)
+        }
+    }
+
+    // Prepared for v3 (returns all modified after)
+    override fun changedTherapyEvents(): List<TherapyEvent> {
+        val startId = sp.getLong(R.string.key_ns_therapy_event_last_synced_id, 0)
+        return appRepository.getModifiedTherapyEventDataFromId(startId).blockingGet().also {
+            aapsLogger.debug(LTag.NSCLIENT, "Loading TherapyEvents data for sync from $startId. Records ${it.size}")
+        }
+    }
+
+    private var lastTeId = -1L
+    private var lastTeTime = -1L
+    override fun processChangedTherapyEventsCompat(): Boolean {
+        val lastDbIdWrapped = appRepository.getLastTherapyEventIdWrapped().blockingGet()
+        val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
+        var startId = sp.getLong(R.string.key_ns_therapy_event_last_synced_id, 0)
+        if (startId > lastDbId) {
+            sp.putLong(R.string.key_ns_therapy_event_last_synced_id, 0)
+            startId = 0
+        }
+        if (startId == lastTeId && dateUtil.now() - lastTeTime < 5000) return false
+        lastTeId = startId
+        lastTeTime = dateUtil.now()
+        appRepository.getNextSyncElementTherapyEvent(startId).blockingGet()?.let { te ->
+            aapsLogger.info(LTag.DATABASE, "Loading TherapyEvents data Start: $startId ID: ${te.first.id} HistoryID: ${te.second} ")
+            when {
+                // without nsId = create new
+                te.first.interfaceIDs.nightscoutId == null ->
+                    nsClientPlugin.nsClientService?.dbAdd("treatments", te.first.toJson(), DataSyncSelector.PairTherapyEvent(te.first, te.second), "$startId/$lastDbId")
+                // nsId = update
+                te.first.interfaceIDs.nightscoutId != null ->
+                    nsClientPlugin.nsClientService?.dbUpdate("treatments", te.first.interfaceIDs.nightscoutId, te.first.toJson(), DataSyncSelector.PairTherapyEvent(te.first, te.second), "$startId/$lastDbId")
+            }
+            return true
+        }
+        return false
+    }
+
+    override fun confirmLastDeviceStatusIdIfGreater(lastSynced: Long) {
+        if (lastSynced > sp.getLong(R.string.key_ns_device_status_last_synced_id, 0)) {
+            aapsLogger.debug(LTag.NSCLIENT, "Setting DeviceStatus data sync from $lastSynced")
+            sp.putLong(R.string.key_ns_device_status_last_synced_id, lastSynced)
+        }
+    }
+
+    override fun changedDeviceStatuses(): List<DeviceStatus> {
+        val startId = sp.getLong(R.string.key_ns_device_status_last_synced_id, 0)
+        return appRepository.getModifiedDeviceStatusDataFromId(startId).blockingGet().also {
+            aapsLogger.debug(LTag.NSCLIENT, "Loading DeviceStatus data for sync from $startId. Records ${it.size}")
+        }
+    }
+
+    private var lastDsId = -1L
+    private var lastDsTime = -1L
+    override fun processChangedDeviceStatusesCompat(): Boolean {
+        val lastDbIdWrapped = appRepository.getLastDeviceStatusIdWrapped().blockingGet()
+        val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
+        var startId = sp.getLong(R.string.key_ns_device_status_last_synced_id, 0)
+        if (startId > lastDbId) {
+            sp.putLong(R.string.key_ns_device_status_last_synced_id, 0)
+            startId = 0
+        }
+        if (startId == lastDsId && dateUtil.now() - lastDsTime < 5000) return false
+        lastDsId = startId
+        lastDsTime = dateUtil.now()
+        appRepository.getNextSyncElementDeviceStatus(startId).blockingGet()?.let { deviceStatus ->
+            aapsLogger.info(LTag.DATABASE, "Loading DeviceStatus data Start: $startId ID: ${deviceStatus.id}")
+            when {
+                // without nsId = create new
+                deviceStatus.interfaceIDs.nightscoutId == null ->
+                    nsClientPlugin.nsClientService?.dbAdd("devicestatus", deviceStatus.toJson(dateUtil), deviceStatus, "$startId/$lastDbId")
+                // with nsId = ignore
+                deviceStatus.interfaceIDs.nightscoutId != null -> Any()
+            }
+            return true
+        }
+        return false
+    }
+
+    override fun confirmLastTemporaryBasalIdIfGreater(lastSynced: Long) {
+        if (lastSynced > sp.getLong(R.string.key_ns_temporary_basal_last_synced_id, 0)) {
+            aapsLogger.debug(LTag.NSCLIENT, "Setting TemporaryBasal data sync from $lastSynced")
+            sp.putLong(R.string.key_ns_temporary_basal_last_synced_id, lastSynced)
+        }
+    }
+
+    // Prepared for v3 (returns all modified after)
+    override fun changedTemporaryBasals(): List<TemporaryBasal> {
+        val startId = sp.getLong(R.string.key_ns_temporary_basal_last_synced_id, 0)
+        return appRepository.getModifiedTemporaryBasalDataFromId(startId).blockingGet().also {
+            aapsLogger.debug(LTag.NSCLIENT, "Loading TemporaryBasal data for sync from $startId. Records ${it.size}")
+        }
+    }
+
+    private var lastTbrId = -1L
+    private var lastTbrTime = -1L
+    override fun processChangedTemporaryBasalsCompat(): Boolean {
+        val useAbsolute = sp.getBoolean(R.string.key_ns_sync_use_absolute, false)
+        val lastDbIdWrapped = appRepository.getLastTemporaryBasalIdWrapped().blockingGet()
+        val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
+        var startId = sp.getLong(R.string.key_ns_temporary_basal_last_synced_id, 0)
+        if (startId > lastDbId) {
+            sp.putLong(R.string.key_ns_temporary_basal_last_synced_id, 0)
+            startId = 0
+        }
+        if (startId == lastTbrId && dateUtil.now() - lastTbrTime < 5000) return false
+        lastTbrId = startId
+        lastTbrTime = dateUtil.now()
+        appRepository.getNextSyncElementTemporaryBasal(startId).blockingGet()?.let { tb ->
+            aapsLogger.info(LTag.DATABASE, "Loading TemporaryBasal data Start: $startId ID: ${tb.first.id} HistoryID: ${tb.second} ")
+            val profile = profileFunction.getProfile(tb.first.timestamp)
+            if (profile != null) {
+                when {
+                    // without nsId = create new
+                    tb.first.interfaceIDs.nightscoutId == null ->
+                        nsClientPlugin.nsClientService?.dbAdd("treatments", tb.first.toJson(profile, dateUtil, useAbsolute), DataSyncSelector.PairTemporaryBasal(tb.first, tb.second), "$startId/$lastDbId")
+                    // with nsId = update
+                    tb.first.interfaceIDs.nightscoutId != null ->
+                        nsClientPlugin.nsClientService?.dbUpdate("treatments", tb.first.interfaceIDs.nightscoutId, tb.first.toJson(profile, dateUtil, useAbsolute), DataSyncSelector.PairTemporaryBasal(tb.first, tb.second), "$startId/$lastDbId")
+                }
+                return true
+            } else {
+                confirmLastTemporaryBasalIdIfGreater(tb.second)
+                lastTbrId = -1
+                processChangedTemporaryBasalsCompat()
+            }
+        }
+        return false
+    }
+
+    override fun confirmLastExtendedBolusIdIfGreater(lastSynced: Long) {
+        if (lastSynced > sp.getLong(R.string.key_ns_extended_bolus_last_synced_id, 0)) {
+            aapsLogger.debug(LTag.NSCLIENT, "Setting ExtendedBolus data sync from $lastSynced")
+            sp.putLong(R.string.key_ns_extended_bolus_last_synced_id, lastSynced)
+        }
+    }
+
+    // Prepared for v3 (returns all modified after)
+    override fun changedExtendedBoluses(): List<ExtendedBolus> {
+        val startId = sp.getLong(R.string.key_ns_extended_bolus_last_synced_id, 0)
+        return appRepository.getModifiedExtendedBolusDataFromId(startId).blockingGet().also {
+            aapsLogger.debug(LTag.NSCLIENT, "Loading ExtendedBolus data for sync from $startId. Records ${it.size}")
+        }
+    }
+
+    private var lastEbId = -1L
+    private var lastEbTime = -1L
+    override fun processChangedExtendedBolusesCompat(): Boolean {
+        val useAbsolute = sp.getBoolean(R.string.key_ns_sync_use_absolute, false)
+        val lastDbIdWrapped = appRepository.getLastExtendedBolusIdWrapped().blockingGet()
+        val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
+        var startId = sp.getLong(R.string.key_ns_extended_bolus_last_synced_id, 0)
+        if (startId > lastDbId) {
+            sp.putLong(R.string.key_ns_extended_bolus_last_synced_id, 0)
+            startId = 0
+        }
+        if (startId == lastEbId && dateUtil.now() - lastEbTime < 5000) return false
+        lastEbId = startId
+        lastEbTime = dateUtil.now()
+        appRepository.getNextSyncElementExtendedBolus(startId).blockingGet()?.let { eb ->
+            aapsLogger.info(LTag.DATABASE, "Loading ExtendedBolus data Start: $startId ID: ${eb.first.id} HistoryID: ${eb.second} ")
+            val profile = profileFunction.getProfile(eb.first.timestamp)
+            if (profile != null) {
+                when {
+                    // without nsId = create new
+                    eb.first.interfaceIDs.nightscoutId == null ->
+                        nsClientPlugin.nsClientService?.dbAdd("treatments", eb.first.toJson(profile, dateUtil, useAbsolute), DataSyncSelector.PairExtendedBolus(eb.first, eb.second), "$startId/$lastDbId")
+                    // with nsId = update
+                    eb.first.interfaceIDs.nightscoutId != null ->
+                        nsClientPlugin.nsClientService?.dbUpdate("treatments", eb.first.interfaceIDs.nightscoutId, eb.first.toJson(profile, dateUtil, useAbsolute), DataSyncSelector.PairExtendedBolus(eb.first, eb.second), "$startId/$lastDbId")
+                }
+                return true
+            } else {
+                confirmLastExtendedBolusIdIfGreater(eb.second)
+                lastEbId = -1
+                processChangedExtendedBolusesCompat()
+            }
+        }
+        return false
+    }
+
+    override fun confirmLastProfileSwitchIdIfGreater(lastSynced: Long) {
+        if (lastSynced > sp.getLong(R.string.key_ns_profile_switch_last_synced_id, 0)) {
+            aapsLogger.debug(LTag.NSCLIENT, "Setting ProfileSwitch data sync from $lastSynced")
+            sp.putLong(R.string.key_ns_profile_switch_last_synced_id, lastSynced)
+        }
+    }
+
+    override fun changedProfileSwitch(): List<ProfileSwitch> {
+        val startId = sp.getLong(R.string.key_ns_profile_switch_last_synced_id, 0)
+        return appRepository.getModifiedProfileSwitchDataFromId(startId).blockingGet().also {
+            aapsLogger.debug(LTag.NSCLIENT, "Loading ProfileSwitch data for sync from $startId. Records ${it.size}")
+        }
+    }
+
+    private var lastPsId = -1L
+    private var lastPsTime = -1L
+    override fun processChangedProfileSwitchesCompat(): Boolean {
+        val lastDbIdWrapped = appRepository.getLastProfileSwitchIdWrapped().blockingGet()
+        val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
+        var startId = sp.getLong(R.string.key_ns_profile_switch_last_synced_id, 0)
+        if (startId > lastDbId) {
+            sp.putLong(R.string.key_ns_profile_switch_last_synced_id, 0)
+            startId = 0
+        }
+        if (startId == lastPsId && dateUtil.now() - lastPsTime < 5000) return false
+        lastPsId = startId
+        lastPsTime = dateUtil.now()
+        appRepository.getNextSyncElementProfileSwitch(startId).blockingGet()?.let { ps ->
+            aapsLogger.info(LTag.DATABASE, "Loading ProfileSwitch data Start: $startId ID: ${ps.first.id} HistoryID: ${ps.second} ")
+            when {
+                // without nsId = create new
+                ps.first.interfaceIDs.nightscoutId == null ->
+                    nsClientPlugin.nsClientService?.dbAdd("treatments", ps.first.toJson(dateUtil), DataSyncSelector.PairProfileSwitch(ps.first, ps.second), "$startId/$lastDbId")
+                // with nsId = update
+                ps.first.interfaceIDs.nightscoutId != null ->
+                    nsClientPlugin.nsClientService?.dbUpdate("treatments", ps.first.interfaceIDs.nightscoutId, ps.first.toJson(dateUtil), DataSyncSelector.PairProfileSwitch(ps.first, ps.second), "$startId/$lastDbId")
+            }
+            return true
+        }
+        return false
+    }
+
+    override fun confirmLastProfileStore(lastSynced: Long) {
+        sp.putLong(R.string.key_ns_profile_store_last_synced_timestamp, lastSynced)
+    }
+
+    override fun processChangedProfileStore() {
+        val lastSync = sp.getLong(R.string.key_ns_profile_store_last_synced_timestamp, 0)
+        val lastChange = sp.getLong(R.string.key_local_profile_last_change, 0)
+        if (lastChange == 0L) return
+        localProfilePlugin.createProfileStore()
+        val profileJson = localProfilePlugin.profile?.data ?: return
+        if (lastChange > lastSync)
+            nsClientPlugin.nsClientService?.dbAdd("profile", profileJson, DataSyncSelector.PairProfileStore(profileJson, dateUtil.now()), "")
+    }
+}

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

@@ -0,0 +1,261 @@
+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.androidaps.database.AppRepository
+import info.nightscout.androidaps.database.entities.DeviceStatus
+import info.nightscout.androidaps.database.transactions.*
+import info.nightscout.androidaps.interfaces.DataSyncSelector
+import info.nightscout.androidaps.interfaces.DataSyncSelector.*
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.nsclient.acks.NSAddAck
+import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientNewLog
+import info.nightscout.androidaps.receivers.DataWorker
+import info.nightscout.androidaps.utils.rx.AapsSchedulers
+import javax.inject.Inject
+
+class NSClientAddAckWorker(
+    context: Context,
+    params: WorkerParameters
+) : Worker(context, params) {
+
+    @Inject lateinit var dataWorker: DataWorker
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var repository: AppRepository
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var dataSyncSelector: DataSyncSelector
+    @Inject lateinit var aapsSchedulers: AapsSchedulers
+
+    override fun doWork(): Result {
+        var ret = Result.success()
+
+        val ack = dataWorker.pickupObject(inputData.getLong(DataWorker.STORE_KEY, -1)) as NSAddAck?
+            ?: return Result.failure(workDataOf("Error" to "missing input data"))
+
+        when (ack.originalObject) {
+            is PairTemporaryTarget       -> {
+                val pair = ack.originalObject
+                pair.value.interfaceIDs.nightscoutId = ack.id
+                repository.runTransactionForResult(UpdateNsIdTemporaryTargetTransaction(pair.value))
+                    .doOnError { error ->
+                        aapsLogger.error(LTag.DATABASE, "Updated ns id of TemporaryTarget failed", error)
+                        ret = Result.failure((workDataOf("Error" to error.toString())))
+                    }
+                    .doOnSuccess {
+                        ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
+                        aapsLogger.debug(LTag.DATABASE, "Updated ns id of TemporaryTarget " + pair.value)
+                        dataSyncSelector.confirmLastTempTargetsIdIfGreater(pair.updateRecordId)
+                    }
+                    .blockingGet()
+                rxBus.send(EventNSClientNewLog("DBADD", "Acked TemporaryTarget " + pair.value.interfaceIDs.nightscoutId))
+                // Send new if waiting
+                dataSyncSelector.processChangedTempTargetsCompat()
+            }
+
+            is PairGlucoseValue          -> {
+                val pair = ack.originalObject
+                pair.value.interfaceIDs.nightscoutId = ack.id
+                repository.runTransactionForResult(UpdateNsIdGlucoseValueTransaction(pair.value))
+                    .doOnError { error ->
+                        aapsLogger.error(LTag.DATABASE, "Updated ns id of GlucoseValue failed", error)
+                        ret = Result.failure((workDataOf("Error" to error.toString())))
+                    }
+                    .doOnSuccess {
+                        ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
+                        aapsLogger.debug(LTag.DATABASE, "Updated ns id of GlucoseValue " + pair.value)
+                        dataSyncSelector.confirmLastGlucoseValueIdIfGreater(pair.updateRecordId)
+                    }
+                    .blockingGet()
+                rxBus.send(EventNSClientNewLog("DBADD", "Acked GlucoseValue " + pair.value.interfaceIDs.nightscoutId))
+                // Send new if waiting
+                dataSyncSelector.processChangedGlucoseValuesCompat()
+            }
+
+            is PairFood                  -> {
+                val pair = ack.originalObject
+                pair.value.interfaceIDs.nightscoutId = ack.id
+                repository.runTransactionForResult(UpdateNsIdFoodTransaction(pair.value))
+                    .doOnError { error ->
+                        aapsLogger.error(LTag.DATABASE, "Updated ns id of Food failed", error)
+                        ret = Result.failure((workDataOf("Error" to error.toString())))
+                    }
+                    .doOnSuccess {
+                        ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
+                        aapsLogger.debug(LTag.DATABASE, "Updated ns id of Food " + pair.value)
+                        dataSyncSelector.confirmLastFoodIdIfGreater(pair.updateRecordId)
+                    }
+                    .blockingGet()
+                rxBus.send(EventNSClientNewLog("DBADD", "Acked Food " + pair.value.interfaceIDs.nightscoutId))
+                // Send new if waiting
+                dataSyncSelector.processChangedFoodsCompat()
+            }
+
+            is PairTherapyEvent          -> {
+                val pair = ack.originalObject
+                pair.value.interfaceIDs.nightscoutId = ack.id
+                repository.runTransactionForResult(UpdateNsIdTherapyEventTransaction(pair.value))
+                    .doOnError { error ->
+                        aapsLogger.error(LTag.DATABASE, "Updated ns id of TherapyEvent failed", error)
+                        ret = Result.failure((workDataOf("Error" to error.toString())))
+                    }
+                    .doOnSuccess {
+                        ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
+                        aapsLogger.debug(LTag.DATABASE, "Updated ns id of TherapyEvent " + pair.value)
+                        dataSyncSelector.confirmLastTherapyEventIdIfGreater(pair.updateRecordId)
+                    }
+                    .blockingGet()
+                rxBus.send(EventNSClientNewLog("DBADD", "Acked TherapyEvent " + pair.value.interfaceIDs.nightscoutId))
+                // Send new if waiting
+                dataSyncSelector.processChangedTherapyEventsCompat()
+            }
+
+            is PairBolus                 -> {
+                val pair = ack.originalObject
+                pair.value.interfaceIDs.nightscoutId = ack.id
+                repository.runTransactionForResult(UpdateNsIdBolusTransaction(pair.value))
+                    .doOnError { error ->
+                        aapsLogger.error(LTag.DATABASE, "Updated ns id of Bolus failed", error)
+                        ret = Result.failure((workDataOf("Error" to error.toString())))
+                    }
+                    .doOnSuccess {
+                        ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
+                        aapsLogger.debug(LTag.DATABASE, "Updated ns id of Bolus " + pair.value)
+                        dataSyncSelector.confirmLastBolusIdIfGreater(pair.updateRecordId)
+                    }
+                    .blockingGet()
+                rxBus.send(EventNSClientNewLog("DBADD", "Acked Bolus " + pair.value.interfaceIDs.nightscoutId))
+                // Send new if waiting
+                dataSyncSelector.processChangedBolusesCompat()
+            }
+
+            is PairCarbs                 -> {
+                val pair = ack.originalObject
+                pair.value.interfaceIDs.nightscoutId = ack.id
+                repository.runTransactionForResult(UpdateNsIdCarbsTransaction(pair.value))
+                    .doOnError { error ->
+                        aapsLogger.error(LTag.DATABASE, "Updated ns id of Carbs failed", error)
+                        ret = Result.failure((workDataOf("Error" to error.toString())))
+                    }
+                    .doOnSuccess {
+                        ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
+                        aapsLogger.debug(LTag.DATABASE, "Updated ns id of Carbs " + pair.value)
+                        dataSyncSelector.confirmLastCarbsIdIfGreater(pair.updateRecordId)
+                    }
+                    .blockingGet()
+                rxBus.send(EventNSClientNewLog("DBADD", "Acked Carbs " + pair.value.interfaceIDs.nightscoutId))
+                // Send new if waiting
+                dataSyncSelector.processChangedCarbsCompat()
+            }
+
+            is PairBolusCalculatorResult -> {
+                val pair = ack.originalObject
+                pair.value.interfaceIDs.nightscoutId = ack.id
+                repository.runTransactionForResult(UpdateNsIdBolusCalculatorResultTransaction(pair.value))
+                    .doOnError { error ->
+                        aapsLogger.error(LTag.DATABASE, "Updated ns id of BolusCalculatorResult failed", error)
+                        ret = Result.failure((workDataOf("Error" to error.toString())))
+                    }
+                    .doOnSuccess {
+                        ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
+                        aapsLogger.debug(LTag.DATABASE, "Updated ns id of BolusCalculatorResult " + pair.value)
+                        dataSyncSelector.confirmLastBolusCalculatorResultsIdIfGreater(pair.updateRecordId)
+                    }
+                    .blockingGet()
+                rxBus.send(EventNSClientNewLog("DBADD", "Acked BolusCalculatorResult " + pair.value.interfaceIDs.nightscoutId))
+                // Send new if waiting
+                dataSyncSelector.processChangedBolusCalculatorResultsCompat()
+            }
+
+            is PairTemporaryBasal        -> {
+                val pair = ack.originalObject
+                pair.value.interfaceIDs.nightscoutId = ack.id
+                repository.runTransactionForResult(UpdateNsIdTemporaryBasalTransaction(pair.value))
+                    .doOnError { error ->
+                        aapsLogger.error(LTag.DATABASE, "Updated ns id of TemporaryBasal failed", error)
+                        ret = Result.failure((workDataOf("Error" to error.toString())))
+                    }
+                    .doOnSuccess {
+                        ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
+                        aapsLogger.debug(LTag.DATABASE, "Updated ns id of TemporaryBasal " + pair.value)
+                        dataSyncSelector.confirmLastTemporaryBasalIdIfGreater(pair.updateRecordId)
+                    }
+                    .blockingGet()
+                rxBus.send(EventNSClientNewLog("DBADD", "Acked TemporaryBasal " + pair.value.interfaceIDs.nightscoutId))
+                // Send new if waiting
+                dataSyncSelector.processChangedTemporaryBasalsCompat()
+            }
+
+            is PairExtendedBolus         -> {
+                val pair = ack.originalObject
+                pair.value.interfaceIDs.nightscoutId = ack.id
+                repository.runTransactionForResult(UpdateNsIdExtendedBolusTransaction(pair.value))
+                    .doOnError { error ->
+                        aapsLogger.error(LTag.DATABASE, "Updated ns id of ExtendedBolus failed", error)
+                        ret = Result.failure((workDataOf("Error" to error.toString())))
+                    }
+                    .doOnSuccess {
+                        ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
+                        aapsLogger.debug(LTag.DATABASE, "Updated ns id of ExtendedBolus " + pair.value)
+                        dataSyncSelector.confirmLastExtendedBolusIdIfGreater(pair.updateRecordId)
+                    }
+                    .blockingGet()
+                rxBus.send(EventNSClientNewLog("DBADD", "Acked ExtendedBolus " + pair.value.interfaceIDs.nightscoutId))
+                // Send new if waiting
+                dataSyncSelector.processChangedExtendedBolusesCompat()
+            }
+
+            is PairProfileSwitch         -> {
+                val pair = ack.originalObject
+                pair.value.interfaceIDs.nightscoutId = ack.id
+                repository.runTransactionForResult(UpdateNsIdProfileSwitchTransaction(pair.value))
+                    .doOnError { error ->
+                        aapsLogger.error(LTag.DATABASE, "Updated ns id of ProfileSwitch failed", error)
+                        ret = Result.failure((workDataOf("Error" to error.toString())))
+                    }
+                    .doOnSuccess {
+                        ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
+                        aapsLogger.debug(LTag.DATABASE, "Updated ns id of ProfileSwitch " + pair.value)
+                        dataSyncSelector.confirmLastProfileSwitchIdIfGreater(pair.updateRecordId)
+                    }
+                    .blockingGet()
+                rxBus.send(EventNSClientNewLog("DBADD", "Acked ProfileSwitch " + pair.value.interfaceIDs.nightscoutId))
+                // Send new if waiting
+                dataSyncSelector.processChangedProfileSwitchesCompat()
+            }
+
+            is DeviceStatus              -> {
+                val deviceStatus = ack.originalObject
+                deviceStatus.interfaceIDs.nightscoutId = ack.id
+                repository.runTransactionForResult(UpdateNsIdDeviceStatusTransaction(deviceStatus))
+                    .doOnError { error ->
+                        aapsLogger.error(LTag.DATABASE, "Updated ns id of DeviceStatus failed", error)
+                        ret = Result.failure((workDataOf("Error" to error.toString())))
+                    }
+                    .doOnSuccess {
+                        ret = Result.success(workDataOf("ProcessedData" to deviceStatus.toString()))
+                        aapsLogger.debug(LTag.DATABASE, "Updated ns id of DeviceStatus $deviceStatus")
+                        dataSyncSelector.confirmLastDeviceStatusIdIfGreater(deviceStatus.id)
+                    }
+                    .blockingGet()
+                rxBus.send(EventNSClientNewLog("DBADD", "Acked DeviceStatus " + deviceStatus.interfaceIDs.nightscoutId))
+                // Send new if waiting
+                dataSyncSelector.processChangedDeviceStatusesCompat()
+            }
+
+            is PairProfileStore              -> {
+                dataSyncSelector.confirmLastProfileStore(ack.originalObject.timestampSync)
+                rxBus.send(EventNSClientNewLog("DBADD", "Acked ProfileStore " + ack.id))
+            }
+        }
+        return ret
+    }
+
+    init {
+        (context.applicationContext as HasAndroidInjector).androidInjector().inject(this)
+    }
+}

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

@@ -3,17 +3,19 @@ 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.androidaps.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
-import info.nightscout.androidaps.database.entities.UserEntry.ValueWithUnit
-import info.nightscout.androidaps.database.transactions.SyncTemporaryTargetTransaction
-import info.nightscout.androidaps.database.transactions.SyncTherapyEventTransaction
-import info.nightscout.androidaps.events.EventNsTreatment
-import info.nightscout.androidaps.interfaces.ConfigInterface
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
+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.*
+import info.nightscout.androidaps.extensions.*
+import info.nightscout.androidaps.interfaces.ActivePlugin
+import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
@@ -25,9 +27,8 @@ import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.JsonHelper
 import info.nightscout.androidaps.utils.JsonHelper.safeGetLong
 import info.nightscout.androidaps.utils.buildHelper.BuildHelper
-import info.nightscout.androidaps.utils.extensions.temporaryTargetFromJson
-import info.nightscout.androidaps.utils.extensions.therapyEventFromJson
 import info.nightscout.androidaps.utils.sharedPreferences.SP
+import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
 class NSClientAddUpdateWorker(
@@ -40,133 +41,321 @@ class NSClientAddUpdateWorker(
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var buildHelper: BuildHelper
     @Inject lateinit var sp: SP
-    @Inject lateinit var dateutil: DateUtil
-    @Inject lateinit var config: ConfigInterface
+    @Inject lateinit var dateUtil: DateUtil
+    @Inject lateinit var config: Config
     @Inject lateinit var repository: AppRepository
-    @Inject lateinit var databaseHelper: DatabaseHelperInterface
+    @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var uel: UserEntryLogger
 
     override fun doWork(): Result {
-        val acceptNSData = !sp.getBoolean(R.string.key_ns_upload_only, true) && buildHelper.isEngineeringMode() || config.NSCLIENT
-        if (!acceptNSData) return Result.failure()
-
         val treatments = dataWorker.pickupJSONArray(inputData.getLong(DataWorker.STORE_KEY, -1))
-            ?: return Result.failure()
+            ?: return Result.failure(workDataOf("Error" to "missing input data"))
 
         var ret = Result.success()
         var latestDateInReceivedData = 0L
 
         for (i in 0 until treatments.length()) {
-            val json = treatments.getJSONObject(i)
+            var json = treatments.getJSONObject(i)
             // new DB model
             val insulin = JsonHelper.safeGetDouble(json, "insulin")
             val carbs = JsonHelper.safeGetDouble(json, "carbs")
             val eventType = JsonHelper.safeGetString(json, "eventType")
             if (eventType == null) {
-                aapsLogger.debug(LTag.DATASERVICE, "Wrong treatment. Ignoring : $json")
+                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 != 0L && mills < dateUtil.now())
                 if (mills > latestDateInReceivedData) latestDateInReceivedData = mills
 
-            when {
-                insulin > 0 || carbs > 0                                    ->
-                    rxBus.send(EventNsTreatment(EventNsTreatment.ADD, json))
-                eventType == TherapyEvent.Type.TEMPORARY_TARGET.text        ->
-                    temporaryTargetFromJson(json)?.let { temporaryTarget ->
-                        repository.runTransactionForResult(SyncTemporaryTargetTransaction(temporaryTarget))
+            if (insulin > 0) {
+                if (sp.getBoolean(R.string.key_ns_receive_insulin, false) && buildHelper.isEngineeringMode() || config.NSCLIENT) {
+                    bolusFromJson(json)?.let { bolus ->
+                        repository.runTransactionForResult(SyncNsBolusTransaction(bolus, invalidateByNsOnly = false))
                             .doOnError {
-                                aapsLogger.error(LTag.DATABASE, "Error while saving temporary target", it)
-                                ret = Result.failure()
+                                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(UserEntry.Action.TT_FROM_NS,
-                                        ValueWithUnit(it.reason.text, UserEntry.Units.TherapyEvent),
-                                        ValueWithUnit(it.lowTarget, UserEntry.Units.Mg_Dl, true),
-                                        ValueWithUnit(it.highTarget, UserEntry.Units.Mg_Dl, it.lowTarget != it.highTarget),
-                                        ValueWithUnit(it.duration.toInt() / 60000, UserEntry.Units.M, true)
+                                    uel.log(Action.BOLUS, Sources.NSClient,
+                                        ValueWithUnit.Timestamp(it.timestamp),
+                                        ValueWithUnit.Insulin(it.amount)
                                     )
+                                    aapsLogger.debug(LTag.DATABASE, "Inserted bolus $it")
                                 }
                                 result.invalidated.forEach {
-                                    uel.log(UserEntry.Action.TT_DELETED_FROM_NS,
-                                        ValueWithUnit(it.reason.text, UserEntry.Units.TherapyEvent),
-                                        ValueWithUnit(it.lowTarget, UserEntry.Units.Mg_Dl, true),
-                                        ValueWithUnit(it.highTarget, UserEntry.Units.Mg_Dl, it.lowTarget != it.highTarget),
-                                        ValueWithUnit(it.duration.toInt() / 60000, UserEntry.Units.M, true)
+                                    uel.log(Action.BOLUS_REMOVED, Sources.NSClient,
+                                        ValueWithUnit.Timestamp(it.timestamp),
+                                        ValueWithUnit.Insulin(it.amount)
                                     )
+                                    aapsLogger.debug(LTag.DATABASE, "Invalidated bolus $it")
                                 }
-                                result.ended.forEach {
-                                    uel.log(UserEntry.Action.TT_CANCELED_FROM_NS,
-                                        ValueWithUnit(it.reason.text, UserEntry.Units.TherapyEvent),
-                                        ValueWithUnit(it.lowTarget, UserEntry.Units.Mg_Dl, true),
-                                        ValueWithUnit(it.highTarget, UserEntry.Units.Mg_Dl, it.lowTarget != it.highTarget),
-                                        ValueWithUnit(it.duration.toInt() / 60000, UserEntry.Units.M, true)
-                                    )
+                                result.updatedNsId.forEach {
+                                    aapsLogger.debug(LTag.DATABASE, "Updated nsId bolus $it")
                                 }
                             }
-                    } ?: aapsLogger.error("Error parsing TT json $json")
+                    } ?: aapsLogger.error("Error parsing bolus json $json")
+                }
+            }
+            if (carbs > 0) {
+                if (sp.getBoolean(R.string.key_ns_receive_carbs, false) && buildHelper.isEngineeringMode() || config.NSCLIENT) {
+                    carbsFromJson(json)?.let { carb ->
+                        repository.runTransactionForResult(SyncNsCarbsTransaction(carb, invalidateByNsOnly = false))
+                            .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,
+                                        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.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"))
+                json = ebJson
+            }
+            when {
+                insulin > 0 || carbs > 0                                    -> Any()
+                eventType == TherapyEvent.Type.TEMPORARY_TARGET.text        ->
+                    if (sp.getBoolean(R.string.key_ns_receive_temp_target, false) && buildHelper.isEngineeringMode() || config.NSCLIENT) {
+                        temporaryTargetFromJson(json)?.let { temporaryTarget ->
+                            repository.runTransactionForResult(SyncNsTemporaryTargetTransaction(temporaryTarget, invalidateByNsOnly = false))
+                                .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")
+                                    }
+                                }
+                        } ?: aapsLogger.error("Error parsing TT 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.NOTE.text ||
                     eventType == TherapyEvent.Type.NONE.text ||
                     eventType == TherapyEvent.Type.ANNOUNCEMENT.text ||
                     eventType == TherapyEvent.Type.QUESTION.text ||
                     eventType == TherapyEvent.Type.EXERCISE.text ||
                     eventType == TherapyEvent.Type.APS_OFFLINE.text ||
                     eventType == TherapyEvent.Type.PUMP_BATTERY_CHANGE.text ->
-                    therapyEventFromJson(json)?.let { therapyEvent ->
-                        repository.runTransactionForResult(SyncTherapyEventTransaction(therapyEvent))
-                            .doOnError {
-                                aapsLogger.error(LTag.DATABASE, "Error while saving therapy event", it)
-                                ret = Result.failure()
-                            }
-                            .blockingGet()
-                            .also { result ->
-                                result.inserted.forEach {
-                                    uel.log(UserEntry.Action.CAREPORTAL_FROM_NS,
-                                        it.note ?: "",
-                                        ValueWithUnit(it.timestamp, UserEntry.Units.Timestamp, true),
-                                        ValueWithUnit(it.type.text, UserEntry.Units.TherapyEvent)
-                                    )
+                    if (sp.getBoolean(R.string.key_ns_receive_therapy_events, false) || config.NSCLIENT) {
+                        therapyEventFromJson(json)?.let { therapyEvent ->
+                            repository.runTransactionForResult(SyncNsTherapyEventTransaction(therapyEvent, invalidateByNsOnly = false))
+                                .doOnError {
+                                    aapsLogger.error(LTag.DATABASE, "Error while saving therapy event", it)
+                                    ret = Result.failure(workDataOf("Error" to it.toString()))
                                 }
-                                result.invalidated.forEach {
-                                    uel.log(UserEntry.Action.CAREPORTAL_DELETED_FROM_NS,
-                                        it.note ?: "",
-                                        ValueWithUnit(it.timestamp, UserEntry.Units.Timestamp, true),
-                                        ValueWithUnit(it.type.text, UserEntry.Units.TherapyEvent)
-                                    )
+                                .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 {
+                                        uel.log(action, Sources.NSClient,
+                                            it.note ?: "",
+                                            ValueWithUnit.Timestamp(it.timestamp),
+                                            ValueWithUnit.TherapyEventType(it.type)
+                                        )
+                                        aapsLogger.debug(LTag.DATABASE, "Inserted TherapyEvent $it")
+                                    }
+                                    result.invalidated.forEach {
+                                        uel.log(Action.CAREPORTAL_REMOVED, Sources.NSClient,
+                                            it.note ?: "",
+                                            ValueWithUnit.Timestamp(it.timestamp),
+                                            ValueWithUnit.TherapyEventType(it.type)
+                                        )
+                                        aapsLogger.debug(LTag.DATABASE, "Invalidated TherapyEvent $it")
+                                    }
+                                    result.updatedNsId.forEach {
+                                        aapsLogger.debug(LTag.DATABASE, "Updated nsId TherapyEvent $it")
+                                    }
                                 }
-                            }
-                    } ?: aapsLogger.error("Error parsing TherapyEvent json $json")
-                eventType == TherapyEvent.Type.TEMPORARY_BASAL.text         ->
-                    databaseHelper.createTempBasalFromJsonIfNotExists(json)
+                        } ?: aapsLogger.error("Error parsing TherapyEvent json $json")
+                    }
                 eventType == TherapyEvent.Type.COMBO_BOLUS.text             ->
-                    databaseHelper.createExtendedBolusFromJsonIfNotExists(json)
+                    if (config.NSCLIENT) {
+                        extendedBolusFromJson(json)?.let { extendedBolus ->
+                            repository.runTransactionForResult(SyncNsExtendedBolusTransaction(extendedBolus, invalidateByNsOnly = false))
+                                .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")
+                                    }
+                                }
+                        } ?: aapsLogger.error("Error parsing ExtendedBolus json $json")
+                    }
+                eventType == TherapyEvent.Type.TEMPORARY_BASAL.text         ->
+                    if (config.NSCLIENT) {
+                        temporaryBasalFromJson(json)?.let { temporaryBasal ->
+                            repository.runTransactionForResult(SyncNsTemporaryBasalTransaction(temporaryBasal, invalidateByNsOnly = false))
+                                .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),
+                                            ValueWithUnit.UnitPerHour(it.rate),
+                                            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),
+                                            ValueWithUnit.UnitPerHour(it.rate),
+                                            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),
+                                            ValueWithUnit.UnitPerHour(it.rate),
+                                            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")
+                                    }
+                                }
+                        } ?: aapsLogger.error("Error parsing TemporaryBasal json $json")
+                    }
                 eventType == TherapyEvent.Type.PROFILE_SWITCH.text          ->
-                    databaseHelper.createProfileSwitchFromJsonIfNotExists(json)
+                    if (sp.getBoolean(R.string.key_ns_receive_profile_switch, false) && buildHelper.isEngineeringMode() || config.NSCLIENT) {
+                        profileSwitchFromJson(json, dateUtil, activePlugin)?.let { profileSwitch ->
+                            repository.runTransactionForResult(SyncNsProfileSwitchTransaction(profileSwitch, invalidateByNsOnly = false))
+                                .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")
+                    }
             }
-            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))
+            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)
         return ret

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

@@ -1,171 +0,0 @@
-package info.nightscout.androidaps.plugins.general.nsclient;
-
-
-import android.graphics.Paint;
-import android.os.Bundle;
-import android.text.Spanned;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
-import android.widget.ScrollView;
-import android.widget.TextView;
-
-import javax.inject.Inject;
-
-import dagger.android.support.DaggerFragment;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.interfaces.UploadQueueAdminInterface;
-import info.nightscout.androidaps.database.entities.UserEntry;
-import info.nightscout.androidaps.database.entities.UserEntry.*;
-import info.nightscout.androidaps.logging.UserEntryLogger;
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
-import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientNewLog;
-import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart;
-import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientUpdateGUI;
-import info.nightscout.androidaps.utils.FabricPrivacy;
-import info.nightscout.androidaps.utils.HtmlHelper;
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog;
-import info.nightscout.androidaps.utils.resources.ResourceHelper;
-import info.nightscout.androidaps.utils.rx.AapsSchedulers;
-import info.nightscout.androidaps.utils.sharedPreferences.SP;
-import io.reactivex.disposables.CompositeDisposable;
-
-public class NSClientFragment extends DaggerFragment implements View.OnClickListener, CompoundButton.OnCheckedChangeListener {
-    @Inject NSClientPlugin nsClientPlugin;
-    @Inject SP sp;
-    @Inject ResourceHelper resourceHelper;
-    @Inject RxBusWrapper rxBus;
-    @Inject UploadQueueAdminInterface uploadQueue;
-    @Inject FabricPrivacy fabricPrivacy;
-    @Inject AapsSchedulers aapsSchedulers;
-    @Inject UserEntryLogger uel;
-
-    private final CompositeDisposable disposable = new CompositeDisposable();
-
-    private TextView logTextView;
-    private TextView queueTextView;
-    private TextView urlTextView;
-    private TextView statusTextView;
-    private TextView clearlog;
-    private TextView restart;
-    private TextView delivernow;
-    private TextView clearqueue;
-    private TextView showqueue;
-    private ScrollView logScrollview;
-    private CheckBox autoscrollCheckbox;
-    private CheckBox pausedCheckbox;
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.nsclientinternal_fragment, container, false);
-
-        logScrollview = view.findViewById(R.id.nsclientinternal_logscrollview);
-        autoscrollCheckbox = view.findViewById(R.id.nsclientinternal_autoscroll);
-        autoscrollCheckbox.setChecked(nsClientPlugin.autoscroll);
-        autoscrollCheckbox.setOnCheckedChangeListener(this);
-        pausedCheckbox = view.findViewById(R.id.nsclientinternal_paused);
-        pausedCheckbox.setChecked(nsClientPlugin.paused);
-        pausedCheckbox.setOnCheckedChangeListener(this);
-        logTextView = view.findViewById(R.id.nsclientinternal_log);
-        queueTextView = view.findViewById(R.id.nsclientinternal_queue);
-        urlTextView = view.findViewById(R.id.nsclientinternal_url);
-        statusTextView = view.findViewById(R.id.nsclientinternal_status);
-
-        clearlog = view.findViewById(R.id.nsclientinternal_clearlog);
-        clearlog.setOnClickListener(this);
-        clearlog.setPaintFlags(clearlog.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
-        restart = view.findViewById(R.id.nsclientinternal_restart);
-        restart.setOnClickListener(this);
-        restart.setPaintFlags(restart.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
-        delivernow = view.findViewById(R.id.nsclientinternal_delivernow);
-        delivernow.setOnClickListener(this);
-        delivernow.setPaintFlags(delivernow.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
-        clearqueue = view.findViewById(R.id.nsclientinternal_clearqueue);
-        clearqueue.setOnClickListener(this);
-        clearqueue.setPaintFlags(clearqueue.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
-        showqueue = view.findViewById(R.id.nsclientinternal_showqueue);
-        showqueue.setOnClickListener(this);
-        showqueue.setPaintFlags(showqueue.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
-
-        return view;
-    }
-
-    @Override
-    public synchronized void onResume() {
-        super.onResume();
-        disposable.add(rxBus
-                .toObservable(EventNSClientUpdateGUI.class)
-                .observeOn(aapsSchedulers.getMain())
-                .subscribe(event -> updateGui(), fabricPrivacy::logException)
-        );
-        updateGui();
-    }
-
-    @Override
-    public synchronized void onPause() {
-        super.onPause();
-        disposable.clear();
-    }
-
-    @Override
-    public void onClick(View view) {
-        switch (view.getId()) {
-            case R.id.nsclientinternal_restart:
-                rxBus.send(new EventNSClientRestart());
-                fabricPrivacy.logCustom("NSClientRestart");
-                break;
-            case R.id.nsclientinternal_delivernow:
-                nsClientPlugin.resend("GUI");
-                fabricPrivacy.logCustom("NSClientDeliverNow");
-                break;
-            case R.id.nsclientinternal_clearlog:
-                nsClientPlugin.clearLog();
-                break;
-            case R.id.nsclientinternal_clearqueue:
-                OKDialog.showConfirmation(getContext(), resourceHelper.gs(R.string.nsclientinternal), resourceHelper.gs(R.string.clearqueueconfirm), () -> {
-                    uel.log(Action.NS_QUEUE_CLEARED);
-                    uploadQueue.clearQueue();
-                    updateGui();
-                    fabricPrivacy.logCustom("NSClientClearQueue");
-                });
-                break;
-            case R.id.nsclientinternal_showqueue:
-                rxBus.send(new EventNSClientNewLog("QUEUE", uploadQueue.textList()));
-                break;
-        }
-    }
-
-    @Override
-    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-        switch (buttonView.getId()) {
-            case R.id.nsclientinternal_paused:
-                uel.log(isChecked ? Action.NS_PAUSED : Action.NS_RESUME);
-                nsClientPlugin.pause(isChecked);
-                updateGui();
-                fabricPrivacy.logCustom("NSClientPause");
-                break;
-            case R.id.nsclientinternal_autoscroll:
-                sp.putBoolean(R.string.key_nsclientinternal_autoscroll, isChecked);
-                nsClientPlugin.autoscroll = isChecked;
-                updateGui();
-                break;
-        }
-    }
-
-    protected void updateGui() {
-        nsClientPlugin.updateLog();
-        pausedCheckbox.setChecked(sp.getBoolean(R.string.key_nsclientinternal_paused, false));
-        logTextView.setText(nsClientPlugin.textLog);
-        if (nsClientPlugin.autoscroll) {
-            logScrollview.fullScroll(ScrollView.FOCUS_DOWN);
-        }
-        urlTextView.setText(nsClientPlugin.url());
-        Spanned queuetext = HtmlHelper.INSTANCE.fromHtml(resourceHelper.gs(R.string.queue) + " <b>" + uploadQueue.size() + "</b>");
-        queueTextView.setText(queuetext);
-        statusTextView.setText(nsClientPlugin.status);
-    }
-
-}

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

@@ -0,0 +1,105 @@
+package info.nightscout.androidaps.plugins.general.nsclient
+
+import android.graphics.Paint
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ScrollView
+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.databinding.NsClientFragmentBinding
+import info.nightscout.androidaps.interfaces.DataSyncSelector
+import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart
+import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientUpdateGUI
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.alertDialogs.OKDialog
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.rx.AapsSchedulers
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import io.reactivex.disposables.CompositeDisposable
+import javax.inject.Inject
+
+class NSClientFragment : DaggerFragment() {
+
+    @Inject lateinit var nsClientPlugin: NSClientPlugin
+    @Inject lateinit var sp: SP
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var aapsSchedulers: AapsSchedulers
+    @Inject lateinit var dataSyncSelector: DataSyncSelector
+    @Inject lateinit var uel: UserEntryLogger
+
+    private val disposable = CompositeDisposable()
+
+    private var _binding: NsClientFragmentBinding? = null
+
+    // This property is only valid between onCreateView and
+    // onDestroyView.
+    private val binding get() = _binding!!
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View =
+        NsClientFragmentBinding.inflate(inflater, container, false).also { _binding = it }.root
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        binding.autoscroll.isChecked = nsClientPlugin.autoscroll
+        binding.autoscroll.setOnCheckedChangeListener { _, isChecked ->
+            sp.putBoolean(R.string.key_nsclientinternal_autoscroll, isChecked)
+            nsClientPlugin.autoscroll = isChecked
+            updateGui()
+        }
+
+        binding.paused.isChecked = nsClientPlugin.paused
+        binding.paused.setOnCheckedChangeListener { _, isChecked ->
+            uel.log(if (isChecked) Action.NS_PAUSED else Action.NS_RESUME, Sources.NSClient)
+            nsClientPlugin.pause(isChecked)
+            updateGui()
+        }
+        binding.clearLog.setOnClickListener { nsClientPlugin.clearLog() }
+        binding.clearLog.paintFlags = binding.clearLog.paintFlags or Paint.UNDERLINE_TEXT_FLAG
+        binding.restart.setOnClickListener { rxBus.send(EventNSClientRestart()) }
+        binding.restart.paintFlags = binding.restart.paintFlags or Paint.UNDERLINE_TEXT_FLAG
+        binding.deliverNow.setOnClickListener { nsClientPlugin.resend("GUI") }
+        binding.deliverNow.paintFlags = binding.deliverNow.paintFlags or Paint.UNDERLINE_TEXT_FLAG
+        binding.fullSync.setOnClickListener {
+            context?.let { context ->
+                OKDialog.showConfirmation(context, resourceHelper.gs(R.string.nsclientinternal), resourceHelper.gs(R.string.full_sync), Runnable {
+                    dataSyncSelector.resetToNextFullSync()
+                })
+            }
+        }
+        binding.fullSync.paintFlags = binding.fullSync.paintFlags or Paint.UNDERLINE_TEXT_FLAG
+    }
+
+    @Synchronized override fun onResume() {
+        super.onResume()
+        disposable.add(rxBus
+            .toObservable(EventNSClientUpdateGUI::class.java)
+            .observeOn(aapsSchedulers.main)
+            .subscribe({ updateGui() }, fabricPrivacy::logException)
+        )
+        updateGui()
+    }
+
+    @Synchronized override fun onPause() {
+        super.onPause()
+        disposable.clear()
+    }
+
+    private fun updateGui() {
+        if (_binding == null) return
+        nsClientPlugin.updateLog()
+        binding.paused.isChecked = sp.getBoolean(R.string.key_nsclientinternal_paused, false)
+        binding.log.text = nsClientPlugin.textLog
+        if (nsClientPlugin.autoscroll) binding.logScrollview.fullScroll(ScrollView.FOCUS_DOWN)
+        binding.url.text = nsClientPlugin.url()
+        binding.status.text = nsClientPlugin.status
+    }
+}

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

@@ -3,17 +3,18 @@ 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.androidaps.R
 import info.nightscout.androidaps.database.AppRepository
-import info.nightscout.androidaps.database.transactions.SyncTherapyEventTransaction
-import info.nightscout.androidaps.interfaces.ConfigInterface
+import info.nightscout.androidaps.database.transactions.SyncNsTherapyEventTransaction
+import info.nightscout.androidaps.extensions.therapyEventFromNsMbg
+import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.general.nsclient.data.NSMbg
 import info.nightscout.androidaps.receivers.DataWorker
 import info.nightscout.androidaps.utils.buildHelper.BuildHelper
-import info.nightscout.androidaps.utils.extensions.therapyEventFromNsMbg
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import javax.inject.Inject
 
@@ -27,23 +28,23 @@ class NSClientMbgWorker(
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var sp: SP
     @Inject lateinit var buildHelper: BuildHelper
-    @Inject lateinit var config: ConfigInterface
+    @Inject lateinit var config: Config
 
     override fun doWork(): Result {
         var ret = Result.success()
 
-        val acceptNSData = !sp.getBoolean(R.string.key_ns_upload_only, true) && buildHelper.isEngineeringMode() || config.NSCLIENT
+        val acceptNSData = sp.getBoolean(R.string.key_ns_receive_therapy_events, false) || config.NSCLIENT
         if (!acceptNSData) return ret
 
         val mbgArray = dataWorker.pickupJSONArray(inputData.getLong(DataWorker.STORE_KEY, -1))
-            ?: return Result.failure()
+            ?: return Result.failure(workDataOf("Error" to "missing input data"))
         for (i in 0 until mbgArray.length()) {
             val nsMbg = NSMbg(mbgArray.getJSONObject(i))
             if (!nsMbg.isValid()) continue
-            repository.runTransactionForResult(SyncTherapyEventTransaction(therapyEventFromNsMbg(nsMbg)))
+            repository.runTransactionForResult(SyncNsTherapyEventTransaction(therapyEventFromNsMbg(nsMbg), false))
                 .doOnError {
                     aapsLogger.error("Error while saving therapy event", it)
-                    ret = Result.failure()
+                    ret = Result.failure(workDataOf("Error" to it.toString()))
                 }
                 .blockingGet()
                 .also {

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

@@ -1,360 +0,0 @@
-package info.nightscout.androidaps.plugins.general.nsclient;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.os.IBinder;
-import android.text.Spanned;
-
-import androidx.annotation.NonNull;
-import androidx.preference.PreferenceFragmentCompat;
-import androidx.preference.SwitchPreference;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.Config;
-import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.database.AppRepository;
-import info.nightscout.androidaps.database.entities.TemporaryTarget;
-import info.nightscout.androidaps.database.entities.TherapyEvent;
-import info.nightscout.androidaps.database.entities.UserEntry.Action;
-import info.nightscout.androidaps.database.entities.UserEntry.Units;
-import info.nightscout.androidaps.database.entities.UserEntry.ValueWithUnit;
-import info.nightscout.androidaps.database.transactions.SyncTemporaryTargetTransaction;
-import info.nightscout.androidaps.database.transactions.SyncTherapyEventTransaction;
-import info.nightscout.androidaps.events.EventAppExit;
-import info.nightscout.androidaps.events.EventChargingState;
-import info.nightscout.androidaps.events.EventNetworkChange;
-import info.nightscout.androidaps.events.EventNsTreatment;
-import info.nightscout.androidaps.events.EventPreferenceChange;
-import info.nightscout.androidaps.interfaces.ActivePluginProvider;
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface;
-import info.nightscout.androidaps.interfaces.PluginBase;
-import info.nightscout.androidaps.interfaces.PluginDescription;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.logging.AAPSLogger;
-import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.logging.UserEntryLogger;
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
-import info.nightscout.androidaps.plugins.general.nsclient.data.AlarmAck;
-import info.nightscout.androidaps.plugins.general.nsclient.data.NSAlarm;
-import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientNewLog;
-import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientResend;
-import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientStatus;
-import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientUpdateGUI;
-import info.nightscout.androidaps.plugins.general.nsclient.services.NSClientService;
-import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
-import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
-import info.nightscout.androidaps.services.Intents;
-import info.nightscout.androidaps.utils.FabricPrivacy;
-import info.nightscout.androidaps.utils.HtmlHelper;
-import info.nightscout.androidaps.utils.JsonHelper;
-import info.nightscout.androidaps.utils.ToastUtils;
-import info.nightscout.androidaps.utils.buildHelper.BuildHelper;
-import info.nightscout.androidaps.utils.resources.ResourceHelper;
-import info.nightscout.androidaps.utils.rx.AapsSchedulers;
-import info.nightscout.androidaps.utils.sharedPreferences.SP;
-import io.reactivex.disposables.CompositeDisposable;
-
-import static info.nightscout.androidaps.utils.extensions.TemporaryTargetExtensionKt.temporaryTargetFromJson;
-import static info.nightscout.androidaps.utils.extensions.TemporaryTargetExtensionKt.temporaryTargetFromNsIdForInvalidating;
-import static info.nightscout.androidaps.utils.extensions.TherapyEventExtensionKt.therapyEventFromJson;
-import static info.nightscout.androidaps.utils.extensions.TherapyEventExtensionKt.therapyEventFromNsIdForInvalidating;
-
-@Singleton
-public class NSClientPlugin extends PluginBase {
-    private final CompositeDisposable disposable = new CompositeDisposable();
-
-    private final AAPSLogger aapsLogger;
-    private final RxBusWrapper rxBus;
-    private final ResourceHelper resourceHelper;
-    private final Context context;
-    private final AapsSchedulers aapsSchedulers;
-    private final FabricPrivacy fabricPrivacy;
-    private final SP sp;
-    private final Config config;
-    private final BuildHelper buildHelper;
-    private final ActivePluginProvider activePlugin;
-    private final NSUpload nsUpload;
-    private final AppRepository repository;
-    private final DatabaseHelperInterface databaseHelper;
-    private final UserEntryLogger uel;
-
-    public Handler handler;
-
-    private final List<EventNSClientNewLog> listLog = new ArrayList<>();
-    Spanned textLog = HtmlHelper.INSTANCE.fromHtml("");
-
-    public boolean paused;
-    boolean autoscroll;
-
-    public String status = "";
-
-    public NSClientService nsClientService = null;
-
-    private final NsClientReceiverDelegate nsClientReceiverDelegate;
-
-    @Inject
-    public NSClientPlugin(
-            HasAndroidInjector injector,
-            AAPSLogger aapsLogger,
-            AapsSchedulers aapsSchedulers,
-            RxBusWrapper rxBus,
-            ResourceHelper resourceHelper,
-            Context context,
-            FabricPrivacy fabricPrivacy,
-            SP sp,
-            NsClientReceiverDelegate nsClientReceiverDelegate,
-            Config config,
-            BuildHelper buildHelper,
-            ActivePluginProvider activePlugin,
-            NSUpload nsUpload,
-            DatabaseHelperInterface databaseHelper,
-            AppRepository repository,
-            UserEntryLogger uel
-    ) {
-        super(new PluginDescription()
-                        .mainType(PluginType.GENERAL)
-                        .fragmentClass(NSClientFragment.class.getName())
-                        .pluginIcon(R.drawable.ic_nightscout_syncs)
-                        .pluginName(R.string.nsclientinternal)
-                        .shortName(R.string.nsclientinternal_shortname)
-                        .preferencesId(R.xml.pref_nsclientinternal)
-                        .description(R.string.description_ns_client),
-                aapsLogger, resourceHelper, injector
-        );
-
-        this.aapsLogger = aapsLogger;
-        this.aapsSchedulers = aapsSchedulers;
-        this.rxBus = rxBus;
-        this.resourceHelper = resourceHelper;
-        this.context = context;
-        this.fabricPrivacy = fabricPrivacy;
-        this.sp = sp;
-        this.nsClientReceiverDelegate = nsClientReceiverDelegate;
-        this.config = config;
-        this.buildHelper = buildHelper;
-        this.activePlugin = activePlugin;
-        this.nsUpload = nsUpload;
-        this.databaseHelper = databaseHelper;
-        this.repository = repository;
-        this.uel = uel;
-
-        if (config.getNSCLIENT()) {
-            getPluginDescription().alwaysEnabled(true).visibleByDefault(true);
-        }
-        if (handler == null) {
-            HandlerThread handlerThread = new HandlerThread(NSClientPlugin.class.getSimpleName() + "Handler");
-            handlerThread.start();
-            handler = new Handler(handlerThread.getLooper());
-        }
-
-    }
-
-    public boolean isAllowed() {
-        return nsClientReceiverDelegate.allowed;
-    }
-
-
-    @Override
-    protected void onStart() {
-        paused = sp.getBoolean(R.string.key_nsclientinternal_paused, false);
-        autoscroll = sp.getBoolean(R.string.key_nsclientinternal_autoscroll, true);
-
-        Intent intent = new Intent(context, NSClientService.class);
-        context.bindService(intent, mConnection, Context.BIND_AUTO_CREATE);
-        super.onStart();
-
-        nsClientReceiverDelegate.grabReceiversState();
-        disposable.add(rxBus
-                .toObservable(EventNSClientStatus.class)
-                .observeOn(aapsSchedulers.getIo())
-                .subscribe(event -> {
-                    status = event.getStatus(resourceHelper);
-                    rxBus.send(new EventNSClientUpdateGUI());
-                }, fabricPrivacy::logException)
-        );
-        disposable.add(rxBus
-                .toObservable(EventNetworkChange.class)
-                .observeOn(aapsSchedulers.getIo())
-                .subscribe(nsClientReceiverDelegate::onStatusEvent, fabricPrivacy::logException)
-        );
-        disposable.add(rxBus
-                .toObservable(EventPreferenceChange.class)
-                .observeOn(aapsSchedulers.getIo())
-                .subscribe(nsClientReceiverDelegate::onStatusEvent, fabricPrivacy::logException)
-        );
-        disposable.add(rxBus
-                .toObservable(EventAppExit.class)
-                .observeOn(aapsSchedulers.getIo())
-                .subscribe(event -> {
-                    if (nsClientService != null) {
-                        context.unbindService(mConnection);
-                    }
-                }, fabricPrivacy::logException)
-        );
-        disposable.add(rxBus
-                .toObservable(EventNSClientNewLog.class)
-                .observeOn(aapsSchedulers.getIo())
-                .subscribe(event -> {
-                    addToLog(event);
-                    aapsLogger.debug(LTag.NSCLIENT, event.getAction() + " " + event.getLogText());
-                }, fabricPrivacy::logException)
-        );
-        disposable.add(rxBus
-                .toObservable(EventChargingState.class)
-                .observeOn(aapsSchedulers.getIo())
-                .subscribe(nsClientReceiverDelegate::onStatusEvent, fabricPrivacy::logException)
-        );
-        disposable.add(rxBus
-                .toObservable(EventNSClientResend.class)
-                .observeOn(aapsSchedulers.getIo())
-                .subscribe(event -> resend(event.getReason()), fabricPrivacy::logException)
-        );
-    }
-
-    @Override
-    protected void onStop() {
-        context.getApplicationContext().unbindService(mConnection);
-        disposable.clear();
-        super.onStop();
-    }
-
-    @Override
-    public void preprocessPreferences(@NonNull PreferenceFragmentCompat preferenceFragment) {
-        super.preprocessPreferences(preferenceFragment);
-
-        if (config.getNSCLIENT()) {
-            SwitchPreference key_ns_uploadlocalprofile = preferenceFragment.findPreference(resourceHelper.gs(R.string.key_ns_uploadlocalprofile));
-            if (key_ns_uploadlocalprofile != null) key_ns_uploadlocalprofile.setVisible(false);
-            SwitchPreference key_ns_autobackfill = preferenceFragment.findPreference(resourceHelper.gs(R.string.key_ns_autobackfill));
-            if (key_ns_autobackfill != null) key_ns_autobackfill.setVisible(false);
-            SwitchPreference key_ns_create_announcements_from_errors = preferenceFragment.findPreference(resourceHelper.gs(R.string.key_ns_create_announcements_from_errors));
-            if (key_ns_create_announcements_from_errors != null)
-                key_ns_create_announcements_from_errors.setVisible(false);
-            SwitchPreference key_ns_create_announcements_from_carbs_req = preferenceFragment.findPreference(resourceHelper.gs(R.string.key_ns_create_announcements_from_carbs_req));
-            if (key_ns_create_announcements_from_carbs_req != null)
-                key_ns_create_announcements_from_carbs_req.setVisible(false);
-            SwitchPreference key_ns_upload_only = preferenceFragment.findPreference(resourceHelper.gs(R.string.key_ns_upload_only));
-            if (key_ns_upload_only != null) {
-                key_ns_upload_only.setVisible(false);
-                key_ns_upload_only.setEnabled(false);
-            }
-            SwitchPreference key_ns_sync_use_absolute = preferenceFragment.findPreference(resourceHelper.gs(R.string.key_ns_sync_use_absolute));
-            if (key_ns_sync_use_absolute != null) key_ns_sync_use_absolute.setVisible(false);
-        } else {
-            // APS or pumpControl mode
-            SwitchPreference key_ns_upload_only = preferenceFragment.findPreference(resourceHelper.gs(R.string.key_ns_upload_only));
-            if (key_ns_upload_only != null)
-                key_ns_upload_only.setVisible(buildHelper.isEngineeringMode());
-        }
-    }
-
-    private final ServiceConnection mConnection = new ServiceConnection() {
-
-        public void onServiceDisconnected(ComponentName name) {
-            aapsLogger.debug(LTag.NSCLIENT, "Service is disconnected");
-            nsClientService = null;
-        }
-
-        public void onServiceConnected(ComponentName name, IBinder service) {
-            aapsLogger.debug(LTag.NSCLIENT, "Service is connected");
-            NSClientService.LocalBinder mLocalBinder = (NSClientService.LocalBinder) service;
-            if (mLocalBinder != null) // is null when running in roboelectric
-                nsClientService = mLocalBinder.getServiceInstance();
-        }
-    };
-
-    synchronized void clearLog() {
-        handler.post(() -> {
-            synchronized (listLog) {
-                listLog.clear();
-            }
-            rxBus.send(new EventNSClientUpdateGUI());
-        });
-    }
-
-    private synchronized void addToLog(final EventNSClientNewLog ev) {
-        handler.post(() -> {
-            synchronized (listLog) {
-                listLog.add(ev);
-                // remove the first line if log is too large
-                if (listLog.size() >= Constants.MAX_LOG_LINES) {
-                    listLog.remove(0);
-                }
-            }
-            rxBus.send(new EventNSClientUpdateGUI());
-        });
-    }
-
-    synchronized void updateLog() {
-        try {
-            StringBuilder newTextLog = new StringBuilder();
-            synchronized (listLog) {
-                for (EventNSClientNewLog log : listLog) {
-                    newTextLog.append(log.toPreparedHtml());
-                }
-            }
-            textLog = HtmlHelper.INSTANCE.fromHtml(newTextLog.toString());
-        } catch (OutOfMemoryError e) {
-            ToastUtils.showToastInUiThread(context, rxBus, "Out of memory!\nStop using this phone !!!", R.raw.error);
-        }
-    }
-
-    void resend(String reason) {
-        if (nsClientService != null)
-            nsClientService.resend(reason);
-    }
-
-    public void pause(boolean newState) {
-        sp.putBoolean(R.string.key_nsclientinternal_paused, newState);
-        paused = newState;
-        rxBus.send(new EventPreferenceChange(resourceHelper, R.string.key_nsclientinternal_paused));
-    }
-
-    public String url() {
-        return NSClientService.nsURL;
-    }
-
-    public boolean hasWritePermission() {
-        return NSClientService.hasWriteAuth;
-    }
-
-    public void handleClearAlarm(NSAlarm originalAlarm, long silenceTimeInMsec) {
-
-        if (!isEnabled(PluginType.GENERAL)) {
-            return;
-        }
-        if (sp.getBoolean(R.string.key_ns_noupload, false)) {
-            aapsLogger.debug(LTag.NSCLIENT, "Upload disabled. Message dropped");
-            return;
-        }
-
-        AlarmAck ack = new AlarmAck();
-        ack.level = originalAlarm.level();
-        ack.group = originalAlarm.group();
-        ack.silenceTime = silenceTimeInMsec;
-
-        if (nsClientService != null)
-            nsClientService.sendAlarmAck(ack);
-    }
-
-    public void updateLatestDateReceivedIfNewer(long latestReceived) {
-        if (latestReceived > nsClientService.latestDateInReceivedData)
-            nsClientService.latestDateInReceivedData = latestReceived;
-    }
-}

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

@@ -0,0 +1,243 @@
+package info.nightscout.androidaps.plugins.general.nsclient
+
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.content.ServiceConnection
+import android.os.Handler
+import android.os.HandlerThread
+import android.os.IBinder
+import androidx.preference.PreferenceFragmentCompat
+import androidx.preference.PreferenceScreen
+import androidx.preference.SwitchPreference
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.events.EventAppExit
+import info.nightscout.androidaps.events.EventChargingState
+import info.nightscout.androidaps.events.EventNetworkChange
+import info.nightscout.androidaps.events.EventPreferenceChange
+import info.nightscout.androidaps.interfaces.Config
+import info.nightscout.androidaps.interfaces.PluginBase
+import info.nightscout.androidaps.interfaces.PluginDescription
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.nsclient.data.AlarmAck
+import info.nightscout.androidaps.plugins.general.nsclient.data.NSAlarm
+import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientNewLog
+import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientResend
+import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientStatus
+import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientUpdateGUI
+import info.nightscout.androidaps.plugins.general.nsclient.services.NSClientService
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.HtmlHelper.fromHtml
+import info.nightscout.androidaps.utils.ToastUtils
+import info.nightscout.androidaps.utils.buildHelper.BuildHelper
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.rx.AapsSchedulers
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import io.reactivex.disposables.CompositeDisposable
+import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class NSClientPlugin @Inject constructor(
+    injector: HasAndroidInjector,
+    aapsLogger: AAPSLogger,
+    private val aapsSchedulers: AapsSchedulers,
+    private val rxBus: RxBusWrapper,
+    resourceHelper: ResourceHelper,
+    private val context: Context,
+    private val fabricPrivacy: FabricPrivacy,
+    private val sp: SP,
+    private val nsClientReceiverDelegate: NsClientReceiverDelegate,
+    private val config: Config,
+    private val buildHelper: BuildHelper
+) : PluginBase(PluginDescription()
+    .mainType(PluginType.GENERAL)
+    .fragmentClass(NSClientFragment::class.java.name)
+    .pluginIcon(R.drawable.ic_nightscout_syncs)
+    .pluginName(R.string.nsclientinternal)
+    .shortName(R.string.nsclientinternal_shortname)
+    .preferencesId(R.xml.pref_nsclientinternal)
+    .description(R.string.description_ns_client),
+    aapsLogger, resourceHelper, injector
+) {
+
+    private val disposable = CompositeDisposable()
+    var handler: Handler? = null
+    private val listLog: MutableList<EventNSClientNewLog> = ArrayList()
+    var textLog = fromHtml("")
+    var paused = false
+    var autoscroll = false
+    var status = ""
+    var nsClientService: NSClientService? = null
+    val isAllowed: Boolean
+        get() = nsClientReceiverDelegate.allowed
+
+    init {
+        if (config.NSCLIENT) {
+            pluginDescription.alwaysEnabled(true).visibleByDefault(true)
+        }
+        if (handler == null) {
+            val handlerThread = HandlerThread(NSClientPlugin::class.java.simpleName + "Handler")
+            handlerThread.start()
+            handler = Handler(handlerThread.looper)
+        }
+    }
+
+    override fun onStart() {
+        paused = sp.getBoolean(R.string.key_nsclientinternal_paused, false)
+        autoscroll = sp.getBoolean(R.string.key_nsclientinternal_autoscroll, true)
+        val intent = Intent(context, NSClientService::class.java)
+        context.bindService(intent, mConnection, Context.BIND_AUTO_CREATE)
+        super.onStart()
+        nsClientReceiverDelegate.grabReceiversState()
+        disposable.add(rxBus
+            .toObservable(EventNSClientStatus::class.java)
+            .observeOn(aapsSchedulers.io)
+            .subscribe({ event: EventNSClientStatus ->
+                status = event.getStatus(resourceHelper)
+                rxBus.send(EventNSClientUpdateGUI())
+            }, fabricPrivacy::logException)
+        )
+        disposable.add(rxBus
+            .toObservable(EventNetworkChange::class.java)
+            .observeOn(aapsSchedulers.io)
+            .subscribe({ ev -> nsClientReceiverDelegate.onStatusEvent(ev) }, fabricPrivacy::logException)
+        )
+        disposable.add(rxBus
+            .toObservable(EventPreferenceChange::class.java)
+            .observeOn(aapsSchedulers.io)
+            .subscribe({ ev -> nsClientReceiverDelegate.onStatusEvent(ev) }, fabricPrivacy::logException)
+        )
+        disposable.add(rxBus
+            .toObservable(EventAppExit::class.java)
+            .observeOn(aapsSchedulers.io)
+            .subscribe({ if (nsClientService != null) context.unbindService(mConnection) }, fabricPrivacy::logException)
+        )
+        disposable.add(rxBus
+            .toObservable(EventNSClientNewLog::class.java)
+            .observeOn(aapsSchedulers.io)
+            .subscribe({ event: EventNSClientNewLog ->
+                addToLog(event)
+                aapsLogger.debug(LTag.NSCLIENT, event.action + " " + event.logText)
+            }, fabricPrivacy::logException)
+        )
+        disposable.add(rxBus
+            .toObservable(EventChargingState::class.java)
+            .observeOn(aapsSchedulers.io)
+            .subscribe({ ev -> nsClientReceiverDelegate.onStatusEvent(ev) }, fabricPrivacy::logException)
+        )
+        disposable.add(rxBus
+            .toObservable(EventNSClientResend::class.java)
+            .observeOn(aapsSchedulers.io)
+            .subscribe({ event -> resend(event.reason) }, fabricPrivacy::logException)
+        )
+    }
+
+    override fun onStop() {
+        context.applicationContext.unbindService(mConnection)
+        disposable.clear()
+        super.onStop()
+    }
+
+    override fun preprocessPreferences(preferenceFragment: PreferenceFragmentCompat) {
+        super.preprocessPreferences(preferenceFragment)
+        if (config.NSCLIENT) {
+            preferenceFragment.findPreference<PreferenceScreen>(resourceHelper.gs(R.string.ns_sync_options))?.isVisible = false
+
+            preferenceFragment.findPreference<SwitchPreference>(resourceHelper.gs(R.string.key_ns_create_announcements_from_errors))?.isVisible = false
+            preferenceFragment.findPreference<SwitchPreference>(resourceHelper.gs(R.string.key_ns_create_announcements_from_carbs_req))?.isVisible = false
+            preferenceFragment.findPreference<SwitchPreference>(resourceHelper.gs(R.string.key_ns_sync_use_absolute))?.isVisible = false
+        } else {
+            // APS or pumpControl mode
+            preferenceFragment.findPreference<SwitchPreference>(resourceHelper.gs(R.string.key_ns_receive_profile_switch))?.isVisible = buildHelper.isEngineeringMode()
+            preferenceFragment.findPreference<SwitchPreference>(resourceHelper.gs(R.string.key_ns_receive_insulin))?.isVisible = buildHelper.isEngineeringMode()
+            preferenceFragment.findPreference<SwitchPreference>(resourceHelper.gs(R.string.key_ns_receive_carbs))?.isVisible = buildHelper.isEngineeringMode()
+            preferenceFragment.findPreference<SwitchPreference>(resourceHelper.gs(R.string.key_ns_receive_temp_target))?.isVisible = buildHelper.isEngineeringMode()
+        }
+    }
+
+    private val mConnection: ServiceConnection = object : ServiceConnection {
+        override fun onServiceDisconnected(name: ComponentName) {
+            aapsLogger.debug(LTag.NSCLIENT, "Service is disconnected")
+            nsClientService = null
+        }
+
+        override fun onServiceConnected(name: ComponentName, service: IBinder) {
+            aapsLogger.debug(LTag.NSCLIENT, "Service is connected")
+            val mLocalBinder = service as NSClientService.LocalBinder
+            @Suppress("UNNECESSARY_SAFE_CALL")
+            nsClientService = mLocalBinder?.serviceInstance // is null when running in roboelectric
+        }
+    }
+
+    @Synchronized fun clearLog() {
+        handler?.post {
+            synchronized(listLog) { listLog.clear() }
+            rxBus.send(EventNSClientUpdateGUI())
+        }
+    }
+
+    @Synchronized private fun addToLog(ev: EventNSClientNewLog) {
+        handler?.post {
+            synchronized(listLog) {
+                listLog.add(ev)
+                // remove the first line if log is too large
+                if (listLog.size >= Constants.MAX_LOG_LINES) {
+                    listLog.removeAt(0)
+                }
+            }
+            rxBus.send(EventNSClientUpdateGUI())
+        }
+    }
+
+    @Synchronized fun updateLog() {
+        try {
+            val newTextLog = StringBuilder()
+            synchronized(listLog) {
+                for (log in listLog) {
+                    newTextLog.append(log.toPreparedHtml())
+                }
+            }
+            textLog = fromHtml(newTextLog.toString())
+        } catch (e: OutOfMemoryError) {
+            ToastUtils.showToastInUiThread(context, rxBus, "Out of memory!\nStop using this phone !!!", R.raw.error)
+        }
+    }
+
+    fun resend(reason: String) {
+        nsClientService?.resend(reason)
+    }
+
+    fun pause(newState: Boolean) {
+        sp.putBoolean(R.string.key_nsclientinternal_paused, newState)
+        paused = newState
+        rxBus.send(EventPreferenceChange(resourceHelper, R.string.key_nsclientinternal_paused))
+    }
+
+    fun url(): String = nsClientService?.nsURL ?: ""
+    fun hasWritePermission(): Boolean = nsClientService?.hasWriteAuth ?: false
+
+    fun handleClearAlarm(originalAlarm: NSAlarm, silenceTimeInMilliseconds: Long) {
+        if (!isEnabled(PluginType.GENERAL)) return
+        if (!sp.getBoolean(R.string.key_ns_upload, false)) {
+            aapsLogger.debug(LTag.NSCLIENT, "Upload disabled. Message dropped")
+            return
+        }
+        nsClientService?.sendAlarmAck(
+            AlarmAck().also { ack ->
+                ack.level = originalAlarm.level()
+                ack.group = originalAlarm.group()
+                ack.silenceTime = silenceTimeInMilliseconds
+            })
+    }
+
+    fun updateLatestDateReceivedIfNewer(latestReceived: Long) {
+        nsClientService?.let { if (latestReceived > it.latestDateInReceivedData) it.latestDateInReceivedData = latestReceived }
+    }
+}

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

@@ -3,17 +3,16 @@ 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.androidaps.R
 import info.nightscout.androidaps.database.AppRepository
-import info.nightscout.androidaps.database.entities.UserEntry
-import info.nightscout.androidaps.database.entities.UserEntry.ValueWithUnit
-import info.nightscout.androidaps.database.transactions.SyncTemporaryTargetTransaction
-import info.nightscout.androidaps.database.transactions.SyncTherapyEventTransaction
-import info.nightscout.androidaps.events.EventNsTreatment
-import info.nightscout.androidaps.events.EventNsTreatment.Companion.REMOVE
-import info.nightscout.androidaps.interfaces.ConfigInterface
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
+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.*
+import info.nightscout.androidaps.extensions.*
+import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
@@ -21,9 +20,8 @@ import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.receivers.DataWorker
 import info.nightscout.androidaps.utils.JsonHelper
 import info.nightscout.androidaps.utils.buildHelper.BuildHelper
-import info.nightscout.androidaps.utils.extensions.temporaryTargetFromNsIdForInvalidating
-import info.nightscout.androidaps.utils.extensions.therapyEventFromNsIdForInvalidating
 import info.nightscout.androidaps.utils.sharedPreferences.SP
+import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
 // This will not be needed fpr NS v3
@@ -38,20 +36,20 @@ class NSClientRemoveWorker(
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var buildHelper: BuildHelper
     @Inject lateinit var sp: SP
-    @Inject lateinit var config: ConfigInterface
+    @Inject lateinit var config: Config
     @Inject lateinit var repository: AppRepository
-    @Inject lateinit var databaseHelper: DatabaseHelperInterface
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var uel: UserEntryLogger
 
     override fun doWork(): Result {
-        val acceptNSData = !sp.getBoolean(R.string.key_ns_upload_only, true) && buildHelper.isEngineeringMode() || config.NSCLIENT
-        if (!acceptNSData) return Result.failure()
+        // Do not accept removed data over WS. Only invalidated trough NSClient
+        @Suppress("ConstantConditionIf")
+        if (true) return Result.success()
 
         var ret = Result.success()
 
         val treatments = dataWorker.pickupJSONArray(inputData.getLong(DataWorker.STORE_KEY, -1))
-            ?: return Result.failure()
+            ?: return Result.failure(workDataOf("Error" to "missing input data"))
 
         for (i in 0 until treatments.length()) {
             val json = treatments.getJSONObject(i)
@@ -59,47 +57,120 @@ class NSClientRemoveWorker(
 
             // room  Temporary target
             val temporaryTarget = temporaryTargetFromNsIdForInvalidating(nsId)
-            repository.runTransactionForResult(SyncTemporaryTargetTransaction(temporaryTarget))
+            repository.runTransactionForResult(SyncNsTemporaryTargetTransaction(temporaryTarget, invalidateByNsOnly = true))
                 .doOnError {
-                    aapsLogger.error(LTag.DATABASE, "Error while removing temporary target", it)
-                    ret = Result.failure()
+                    aapsLogger.error(LTag.DATABASE, "Error while invalidating temporary target", it)
+                    ret = Result.failure(workDataOf("Error" to it.toString()))
                 }
                 .blockingGet()
                 .also { result ->
-                    result.invalidated.forEach {
+                    result.invalidated.forEach { tt ->
                         uel.log(
-                            UserEntry.Action.TT_DELETED_FROM_NS,
-                            ValueWithUnit(it.reason.text, UserEntry.Units.TherapyEvent),
-                            ValueWithUnit(it.lowTarget, UserEntry.Units.Mg_Dl, true),
-                            ValueWithUnit(it.highTarget, UserEntry.Units.Mg_Dl, it.lowTarget != it.highTarget),
-                            ValueWithUnit(it.duration.toInt() / 60000, UserEntry.Units.M, it.duration != 0L)
+                            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()).takeIf { tt.duration != 0L }
                         )
                     }
                 }
 
             // room  Therapy Event
             val therapyEvent = therapyEventFromNsIdForInvalidating(nsId)
-            repository.runTransactionForResult(SyncTherapyEventTransaction(therapyEvent))
+            repository.runTransactionForResult(SyncNsTherapyEventTransaction(therapyEvent, invalidateByNsOnly = true))
                 .doOnError {
-                    aapsLogger.error(LTag.DATABASE, "Error while removing therapy event", it)
-                    ret = Result.failure()
+                    aapsLogger.error(LTag.DATABASE, "Error while invalidating therapy event", it)
+                    ret = Result.failure(workDataOf("Error" to it.toString()))
+                }
+                .blockingGet()
+                .also { result ->
+                    result.invalidated.forEach {
+                        uel.log(Action.CAREPORTAL_REMOVED, Sources.NSClient,
+                            (it.note ?: ""),
+                            ValueWithUnit.Timestamp(it.timestamp),
+                            ValueWithUnit.TherapyEventType(it.type))
+                    }
+                }
+
+            // room  Bolus
+            val bolus = bolusFromNsIdForInvalidating(nsId)
+            repository.runTransactionForResult(SyncNsBolusTransaction(bolus, invalidateByNsOnly = true))
+                .doOnError {
+                    aapsLogger.error(LTag.DATABASE, "Error while invalidating bolus", it)
+                    ret = Result.failure(workDataOf("Error" to it.toString()))
+                }
+                .blockingGet()
+                .also { result ->
+                    result.invalidated.forEach {
+                        uel.log(Action.CAREPORTAL_REMOVED, Sources.NSClient,
+                            ValueWithUnit.Timestamp(it.timestamp),
+                            ValueWithUnit.Insulin(it.amount))
+                    }
+                }
+
+            // room  Carbs
+            val carbs = carbsFromNsIdForInvalidating(nsId)
+            repository.runTransactionForResult(SyncNsCarbsTransaction(carbs, invalidateByNsOnly = true))
+                .doOnError {
+                    aapsLogger.error(LTag.DATABASE, "Error while invalidating carbs", it)
+                    ret = Result.failure(workDataOf("Error" to it.toString()))
+                }
+                .blockingGet()
+                .also { result ->
+                    result.invalidated.forEach {
+                        uel.log(Action.CAREPORTAL_REMOVED, Sources.NSClient,
+                            ValueWithUnit.Timestamp(it.timestamp),
+                            ValueWithUnit.Gram(it.amount.toInt()))
+                    }
+                }
+
+            // room  TemporaryBasal
+            val temporaryBasal = temporaryBasalFromNsIdForInvalidating(nsId)
+            repository.runTransactionForResult(SyncNsTemporaryBasalTransaction(temporaryBasal, invalidateByNsOnly = true))
+                .doOnError {
+                    aapsLogger.error(LTag.DATABASE, "Error while invalidating temporary basal", it)
+                    ret = Result.failure(workDataOf("Error" to it.toString()))
                 }
                 .blockingGet()
                 .also { result ->
                     result.invalidated.forEach {
                         uel.log(
-                            UserEntry.Action.CAREPORTAL_DELETED_FROM_NS, (it.note ?: ""),
-                            ValueWithUnit(it.timestamp, UserEntry.Units.Timestamp, true),
-                            ValueWithUnit(it.type.text, UserEntry.Units.TherapyEvent))
+                            Action.CAREPORTAL_REMOVED, Sources.NSClient,
+                            ValueWithUnit.Timestamp(it.timestamp),
+                            ValueWithUnit.UnitPerHour(it.rate))
+                    }
+                }
+            // room  ExtendedBolus
+            val extendedBolus = extendedBolusFromNsIdForInvalidating(nsId)
+            repository.runTransactionForResult(SyncNsExtendedBolusTransaction(extendedBolus, invalidateByNsOnly = true))
+                .doOnError {
+                    aapsLogger.error(LTag.DATABASE, "Error while invalidating extended bolus", it)
+                    ret = Result.failure(workDataOf("Error" to it.toString()))
+                }
+                .blockingGet()
+                .also { result ->
+                    result.invalidated.forEach {
+                        uel.log(
+                            Action.CAREPORTAL_REMOVED, Sources.NSClient,
+                            ValueWithUnit.Timestamp(it.timestamp),
+                            ValueWithUnit.UnitPerHour(it.rate))
                     }
                 }
 
-            // Insulin, carbs
-            rxBus.send(EventNsTreatment(REMOVE, json))
-            // old DB model
-            databaseHelper.deleteTempBasalById(nsId)
-            databaseHelper.deleteExtendedBolusById(nsId)
-            databaseHelper.deleteProfileSwitchById(nsId)
+            // room  ProfileSwitch
+            repository.runTransactionForResult(InvalidateNsIdProfileSwitchTransaction(nsId))
+                .doOnError {
+                    aapsLogger.error(LTag.DATABASE, "Error while invalidating ProfileSwitch", it)
+                    ret = Result.failure(workDataOf("Error" to it.toString()))
+                }
+                .blockingGet()
+                .also { result ->
+                    result.invalidated.forEach {
+                        uel.log(
+                            Action.CAREPORTAL_REMOVED, Sources.NSClient,
+                            ValueWithUnit.Timestamp(it.timestamp))
+                    }
+                }
         }
 
         return ret

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

@@ -0,0 +1,135 @@
+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.androidaps.database.AppRepository
+import info.nightscout.androidaps.interfaces.DataSyncSelector
+import info.nightscout.androidaps.interfaces.DataSyncSelector.*
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.nsclient.acks.NSUpdateAck
+import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientNewLog
+import info.nightscout.androidaps.receivers.DataWorker
+import info.nightscout.androidaps.utils.rx.AapsSchedulers
+import javax.inject.Inject
+
+class NSClientUpdateRemoveAckWorker(
+    context: Context,
+    params: WorkerParameters
+) : Worker(context, params) {
+
+    @Inject lateinit var dataWorker: DataWorker
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var repository: AppRepository
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var dataSyncSelector: DataSyncSelector
+    @Inject lateinit var aapsSchedulers: AapsSchedulers
+
+    override fun doWork(): Result {
+        var ret = Result.success()
+
+        val ack = dataWorker.pickupObject(inputData.getLong(DataWorker.STORE_KEY, -1)) as NSUpdateAck?
+            ?: return Result.failure(workDataOf("Error" to "missing input data"))
+
+        // new room way
+        when (ack.originalObject) {
+            is PairTemporaryTarget       -> {
+                val pair = ack.originalObject
+                dataSyncSelector.confirmLastTempTargetsIdIfGreater(pair.updateRecordId)
+                rxBus.send(EventNSClientNewLog("DBUPDATE", "Acked TemporaryTarget" + ack._id))
+                // Send new if waiting
+                dataSyncSelector.processChangedTempTargetsCompat()
+                ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
+            }
+
+            is PairGlucoseValue          -> {
+                val pair = ack.originalObject
+                dataSyncSelector.confirmLastGlucoseValueIdIfGreater(pair.updateRecordId)
+                rxBus.send(EventNSClientNewLog("DBUPDATE", "Acked GlucoseValue " + ack._id))
+                // Send new if waiting
+                dataSyncSelector.processChangedGlucoseValuesCompat()
+                ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
+            }
+
+            is PairFood                  -> {
+                val pair = ack.originalObject
+                dataSyncSelector.confirmLastFoodIdIfGreater(pair.updateRecordId)
+                rxBus.send(EventNSClientNewLog("DBUPDATE", "Acked Food " + ack._id))
+                // Send new if waiting
+                dataSyncSelector.processChangedFoodsCompat()
+                ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
+            }
+
+            is PairTherapyEvent          -> {
+                val pair = ack.originalObject
+                dataSyncSelector.confirmLastTherapyEventIdIfGreater(pair.updateRecordId)
+                rxBus.send(EventNSClientNewLog("DBUPDATE", "Acked TherapyEvent " + ack._id))
+                // Send new if waiting
+                dataSyncSelector.processChangedTherapyEventsCompat()
+                ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
+            }
+
+            is PairBolus                 -> {
+                val pair = ack.originalObject
+                dataSyncSelector.confirmLastBolusIdIfGreater(pair.updateRecordId)
+                rxBus.send(EventNSClientNewLog("DBUPDATE", "Acked Bolus " + ack._id))
+                // Send new if waiting
+                dataSyncSelector.processChangedBolusesCompat()
+                ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
+            }
+
+            is PairCarbs                 -> {
+                val pair = ack.originalObject
+                dataSyncSelector.confirmLastCarbsIdIfGreater(pair.updateRecordId)
+                rxBus.send(EventNSClientNewLog("DBUPDATE", "Acked Carbs " + ack._id))
+                // Send new if waiting
+                dataSyncSelector.processChangedCarbsCompat()
+                ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
+            }
+
+            is PairBolusCalculatorResult -> {
+                val pair = ack.originalObject
+                dataSyncSelector.confirmLastBolusCalculatorResultsIdIfGreater(pair.updateRecordId)
+                rxBus.send(EventNSClientNewLog("DBUPDATE", "Acked BolusCalculatorResult " + ack._id))
+                // Send new if waiting
+                dataSyncSelector.processChangedBolusCalculatorResultsCompat()
+                ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
+            }
+
+            is PairTemporaryBasal        -> {
+                val pair = ack.originalObject
+                dataSyncSelector.confirmLastTemporaryBasalIdIfGreater(pair.updateRecordId)
+                rxBus.send(EventNSClientNewLog("DBUPDATE", "Acked TemporaryBasal " + ack._id))
+                // Send new if waiting
+                dataSyncSelector.processChangedTemporaryBasalsCompat()
+                ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
+            }
+
+            is PairExtendedBolus         -> {
+                val pair = ack.originalObject
+                dataSyncSelector.confirmLastExtendedBolusIdIfGreater(pair.updateRecordId)
+                rxBus.send(EventNSClientNewLog("DBUPDATE", "Acked ExtendedBolus " + ack._id))
+                // Send new if waiting
+                dataSyncSelector.processChangedExtendedBolusesCompat()
+                ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
+            }
+
+            is PairProfileSwitch         -> {
+                val pair = ack.originalObject
+                dataSyncSelector.confirmLastProfileSwitchIdIfGreater(pair.updateRecordId)
+                rxBus.send(EventNSClientNewLog("DBUPDATE", "Acked ProfileSwitch " + ack._id))
+                // Send new if waiting
+                dataSyncSelector.processChangedProfileSwitchesCompat()
+                ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
+            }
+        }
+        return ret
+    }
+
+    init {
+        (context.applicationContext as HasAndroidInjector).androidInjector().inject(this)
+    }
+}

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

@@ -1,117 +0,0 @@
-package info.nightscout.androidaps.plugins.general.nsclient;
-
-import java.util.Arrays;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.events.EventChargingState;
-import info.nightscout.androidaps.events.EventNetworkChange;
-import info.nightscout.androidaps.events.EventPreferenceChange;
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
-import info.nightscout.androidaps.receivers.ReceiverStatusStore;
-import info.nightscout.androidaps.utils.resources.ResourceHelper;
-import info.nightscout.androidaps.utils.sharedPreferences.SP;
-
-@Singleton
-class NsClientReceiverDelegate {
-
-    private boolean allowedChargingState = true;
-    private boolean allowedNetworkState = true;
-    boolean allowed = true;
-
-    private RxBusWrapper rxBus;
-    private ResourceHelper resourceHelper;
-    private SP sp;
-    private ReceiverStatusStore receiverStatusStore;
-
-    @Inject
-    public NsClientReceiverDelegate(
-            RxBusWrapper rxBus,
-            ResourceHelper resourceHelper,
-            SP sp,
-            ReceiverStatusStore receiverStatusStore
-    ) {
-        this.rxBus = rxBus;
-        this.resourceHelper = resourceHelper;
-        this.sp = sp;
-        this.receiverStatusStore = receiverStatusStore;
-    }
-
-    void grabReceiversState() {
-
-        receiverStatusStore.updateNetworkStatus();
-    }
-
-    void onStatusEvent(EventPreferenceChange ev) {
-        if (ev.isChanged(resourceHelper, R.string.key_ns_wifionly) ||
-                ev.isChanged(resourceHelper, R.string.key_ns_wifi_ssids) ||
-                ev.isChanged(resourceHelper, R.string.key_ns_allowroaming)
-        ) {
-            receiverStatusStore.updateNetworkStatus();
-            onStatusEvent(receiverStatusStore.getLastNetworkEvent());
-        } else if (ev.isChanged(resourceHelper, R.string.key_ns_chargingonly)) {
-            receiverStatusStore.broadcastChargingState();
-        }
-    }
-
-    void onStatusEvent(final EventChargingState ev) {
-        boolean newChargingState = calculateStatus(ev);
-
-        if (newChargingState != allowedChargingState) {
-            allowedChargingState = newChargingState;
-            processStateChange();
-        }
-    }
-
-    void onStatusEvent(final EventNetworkChange ev) {
-        boolean newNetworkState = calculateStatus(ev);
-
-        if (newNetworkState != allowedNetworkState) {
-            allowedNetworkState = newNetworkState;
-            processStateChange();
-        }
-    }
-
-    private void processStateChange() {
-        boolean newAllowedState = allowedChargingState && allowedNetworkState;
-        if (newAllowedState != allowed) {
-            allowed = newAllowedState;
-            rxBus.send(new EventPreferenceChange(resourceHelper.gs(R.string.key_nsclientinternal_paused)));
-        }
-    }
-
-    boolean calculateStatus(final EventChargingState ev) {
-        boolean chargingOnly = sp.getBoolean(R.string.key_ns_chargingonly, false);
-        boolean newAllowedState = true;
-
-        if (!ev.isCharging() && chargingOnly) {
-            newAllowedState = false;
-        }
-
-        return newAllowedState;
-    }
-
-    boolean calculateStatus(final EventNetworkChange ev) {
-        boolean wifiOnly = sp.getBoolean(R.string.key_ns_wifionly, false);
-        String allowedSSIDstring = sp.getString(R.string.key_ns_wifi_ssids, "");
-        String[] allowedSSIDs = allowedSSIDstring.split(";");
-        if (allowedSSIDstring.isEmpty()) allowedSSIDs = new String[0];
-        boolean allowRoaming = sp.getBoolean(R.string.key_ns_allowroaming, true);
-
-        boolean newAllowedState = true;
-
-        if (ev.getWifiConnected()) {
-            if (allowedSSIDs.length != 0 && !Arrays.asList(allowedSSIDs).contains(ev.getSsid())) {
-                newAllowedState = false;
-            }
-        } else {
-            if ((!allowRoaming && ev.getRoaming()) || wifiOnly) {
-                newAllowedState = false;
-            }
-        }
-
-        return newAllowedState;
-    }
-}

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

@@ -0,0 +1,91 @@
+package info.nightscout.androidaps.plugins.general.nsclient
+
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.events.EventChargingState
+import info.nightscout.androidaps.events.EventNetworkChange
+import info.nightscout.androidaps.events.EventPreferenceChange
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.receivers.ReceiverStatusStore
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class NsClientReceiverDelegate @Inject constructor(
+    private val rxBus: RxBusWrapper,
+    private val resourceHelper: ResourceHelper,
+    private val sp: SP,
+    private val receiverStatusStore: ReceiverStatusStore
+) {
+
+    private var allowedChargingState = true
+    private var allowedNetworkState = true
+    var allowed = true
+
+    fun grabReceiversState() {
+        receiverStatusStore.updateNetworkStatus()
+    }
+
+    fun onStatusEvent(ev: EventPreferenceChange) {
+        if (ev.isChanged(resourceHelper, R.string.key_ns_wifionly) ||
+            ev.isChanged(resourceHelper, R.string.key_ns_wifi_ssids) ||
+            ev.isChanged(resourceHelper, R.string.key_ns_allowroaming)) {
+            receiverStatusStore.updateNetworkStatus()
+            onStatusEvent(receiverStatusStore.lastNetworkEvent)
+        } else if (ev.isChanged(resourceHelper, R.string.key_ns_chargingonly)) {
+            receiverStatusStore.broadcastChargingState()
+        }
+    }
+
+    fun onStatusEvent(ev: EventChargingState) {
+        val newChargingState = calculateStatus(ev)
+        if (newChargingState != allowedChargingState) {
+            allowedChargingState = newChargingState
+            processStateChange()
+        }
+    }
+
+    fun onStatusEvent(ev: EventNetworkChange?) {
+        val newNetworkState = calculateStatus(ev)
+        if (newNetworkState != allowedNetworkState) {
+            allowedNetworkState = newNetworkState
+            processStateChange()
+        }
+    }
+
+    private fun processStateChange() {
+        val newAllowedState = allowedChargingState && allowedNetworkState
+        if (newAllowedState != allowed) {
+            allowed = newAllowedState
+            rxBus.send(EventPreferenceChange(resourceHelper.gs(R.string.key_nsclientinternal_paused)))
+        }
+    }
+
+    fun calculateStatus(ev: EventChargingState): Boolean {
+        val chargingOnly = sp.getBoolean(R.string.key_ns_chargingonly, false)
+        var newAllowedState = true
+        if (!ev.isCharging && chargingOnly) {
+            newAllowedState = false
+        }
+        return newAllowedState
+    }
+
+    fun calculateStatus(ev: EventNetworkChange?): Boolean {
+        val wifiOnly = sp.getBoolean(R.string.key_ns_wifionly, false)
+        val allowedSsidString = sp.getString(R.string.key_ns_wifi_ssids, "")
+        val allowedSSIDs: List<String> = if (allowedSsidString.isEmpty()) List(0) { "" } else allowedSsidString.split(";")
+        val allowRoaming = sp.getBoolean(R.string.key_ns_allowroaming, true)
+        var newAllowedState = true
+        if (ev?.wifiConnected == true) {
+            if (allowedSSIDs.isNotEmpty() && !allowedSSIDs.contains(ev.ssid)) {
+                newAllowedState = false
+            }
+        } else {
+            if (!allowRoaming && ev?.roaming == true || wifiOnly) {
+                newAllowedState = false
+            }
+        }
+        return newAllowedState
+    }
+}

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

@@ -1,146 +0,0 @@
-package info.nightscout.androidaps.plugins.general.nsclient;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.SystemClock;
-
-import com.j256.ormlite.dao.CloseableIterator;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.sql.SQLException;
-
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.db.DatabaseHelper;
-import info.nightscout.androidaps.db.DbRequest;
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface;
-import info.nightscout.androidaps.interfaces.UploadQueueAdminInterface;
-import info.nightscout.androidaps.interfaces.UploadQueueInterface;
-import info.nightscout.androidaps.logging.AAPSLogger;
-import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
-import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientResend;
-import info.nightscout.androidaps.plugins.general.nsclient.services.NSClientService;
-import info.nightscout.androidaps.utils.sharedPreferences.SP;
-
-/**
- * Created by mike on 21.02.2016.
- */
-public class UploadQueue implements UploadQueueAdminInterface {
-    private final AAPSLogger aapsLogger;
-    private final DatabaseHelperInterface databaseHelper;
-    private final Context context;
-    private final SP sp;
-    private final RxBusWrapper rxBus;
-
-    public UploadQueue(
-            AAPSLogger aapsLogger,
-            DatabaseHelperInterface databaseHelper,
-            Context context,
-            SP sp,
-            RxBusWrapper rxBus
-    ) {
-        this.aapsLogger = aapsLogger;
-        this.databaseHelper = databaseHelper;
-        this.context = context;
-        this.sp = sp;
-        this.rxBus = rxBus;
-    }
-
-    public String status() {
-        return "QUEUE: " + databaseHelper.size(DatabaseHelper.DATABASE_DBREQUESTS);
-    }
-
-    @Override
-    public long size() {
-        return databaseHelper.size(DatabaseHelper.DATABASE_DBREQUESTS);
-    }
-
-    private void startService() {
-        if (NSClientService.handler == null) {
-            context.startService(new Intent(context, NSClientService.class));
-            SystemClock.sleep(2000);
-        }
-    }
-
-    public void add(final DbRequest dbr) {
-        if (sp.getBoolean(R.string.key_ns_noupload, false)) return;
-        aapsLogger.debug(LTag.NSCLIENT, "Adding to queue: " + dbr.log());
-        try {
-            databaseHelper.create(dbr);
-        } catch (Exception e) {
-            aapsLogger.error("Unhandled exception", e);
-        }
-        rxBus.send(new EventNSClientResend("newdata"));
-    }
-
-    @Override public void clearQueue() {
-        startService();
-        if (NSClientService.handler != null) {
-            NSClientService.handler.post(() -> {
-                aapsLogger.debug(LTag.NSCLIENT, "ClearQueue");
-                databaseHelper.deleteAllDbRequests();
-                aapsLogger.debug(LTag.NSCLIENT, status());
-            });
-        }
-    }
-
-    @Override
-    public void removeByNsClientIdIfExists(final JSONObject record) {
-        startService();
-        if (NSClientService.handler != null) {
-            NSClientService.handler.post(() -> {
-                try {
-                    String id;
-                    if (record.has("NSCLIENT_ID")) {
-                        id = record.getString("NSCLIENT_ID");
-                    } else {
-                        return;
-                    }
-                    if (databaseHelper.deleteDbRequest(id) == 1) {
-                        aapsLogger.debug(LTag.NSCLIENT, "Removed item from UploadQueue. " + status());
-                    }
-                } catch (JSONException e) {
-                    aapsLogger.error("Unhandled exception", e);
-                }
-            });
-        }
-    }
-
-    @Override
-    public void removeByMongoId(final String action, final String _id) {
-        if (_id == null || _id.equals(""))
-            return;
-        startService();
-        if (NSClientService.handler != null) {
-            NSClientService.handler.post(() -> {
-                databaseHelper.deleteDbRequestbyMongoId(action, _id);
-                aapsLogger.debug(LTag.NSCLIENT, "Removing " + _id + " from UploadQueue. " + status());
-            });
-        }
-    }
-
-    @Override public String textList() {
-        String result = "";
-        CloseableIterator<DbRequest> iterator;
-        try {
-            iterator = databaseHelper.getDbRequestIterator();
-            try {
-                while (iterator.hasNext()) {
-                    DbRequest dbr = iterator.next();
-                    result += "<br>";
-                    result += dbr.action.toUpperCase() + " ";
-                    result += dbr.collection + ": ";
-                    result += dbr.data;
-                }
-            } finally {
-                iterator.close();
-            }
-        } catch (SQLException e) {
-            aapsLogger.error("Unhandled exception", e);
-        }
-        return result;
-    }
-
-}

app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSAddAck.java

@@ -1,62 +0,0 @@
-package info.nightscout.androidaps.plugins.general.nsclient.acks;
-
-import org.json.JSONArray;
-import org.json.JSONObject;
-
-import info.nightscout.androidaps.events.Event;
-import info.nightscout.androidaps.logging.AAPSLogger;
-import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
-import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart;
-import io.socket.client.Ack;
-
-/**
- * Created by mike on 29.12.2015.
- */
-public class NSAddAck extends Event implements Ack {
-    private final AAPSLogger aapsLogger;
-    private final RxBusWrapper rxBus;
-
-    public String _id = null;
-    public String nsClientID = null;
-    public JSONObject json = null;
-
-    public NSAddAck(AAPSLogger aapsLogger, RxBusWrapper rxBus) {
-        this.aapsLogger = aapsLogger;
-        this.rxBus = rxBus;
-    }
-
-    public void call(Object... args) {
-        // Regular response
-        try {
-            JSONArray responsearray = (JSONArray) (args[0]);
-            JSONObject response;
-            if (responsearray.length() > 0) {
-                response = responsearray.getJSONObject(0);
-                _id = response.getString("_id");
-                json = response;
-                if (response.has("NSCLIENT_ID")) {
-                    nsClientID = response.getString("NSCLIENT_ID");
-                }
-            }
-            rxBus.send(this);
-            return;
-        } catch (Exception e) {
-            aapsLogger.error("Unhandled exception", e);
-        }
-        // Check for not authorized
-        try {
-            JSONObject response = (JSONObject) (args[0]);
-            if (response.has("result")) {
-                _id = null;
-                if (response.getString("result").contains("Not")) {
-                    rxBus.send(new EventNSClientRestart());
-                    return;
-                }
-                aapsLogger.debug(LTag.NSCLIENT, "DBACCESS " + response.getString("result"));
-            }
-        } catch (Exception e) {
-            aapsLogger.error("Unhandled exception", e);
-        }
-    }
-}

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

@@ -0,0 +1,54 @@
+package info.nightscout.androidaps.plugins.general.nsclient.acks
+
+import info.nightscout.androidaps.events.Event
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart
+import io.socket.client.Ack
+import org.json.JSONArray
+import org.json.JSONObject
+
+class NSAddAck(
+    private val aapsLogger: AAPSLogger,
+    private val rxBus: RxBusWrapper,
+    val originalObject: Any? = null
+) : Event(), Ack {
+
+    var id: String? = null
+    @JvmField var nsClientID: String? = null
+    @JvmField var json: JSONObject? = null
+    override fun call(vararg args: Any) {
+        // Regular response
+        try {
+            val responseArray = args[0] as JSONArray
+            val response: JSONObject
+            if (responseArray.length() > 0) {
+                response = responseArray.getJSONObject(0)
+                id = response.getString("_id")
+                json = response
+                if (response.has("NSCLIENT_ID")) {
+                    nsClientID = response.getString("NSCLIENT_ID")
+                }
+            }
+            rxBus.send(this)
+            return
+        } catch (e: Exception) {
+            aapsLogger.error("Unhandled exception", e)
+        }
+        // Check for not authorized
+        try {
+            val response = args[0] as JSONObject
+            if (response.has("result")) {
+                id = null
+                if (response.getString("result").contains("Not")) {
+                    rxBus.send(EventNSClientRestart())
+                    return
+                }
+                aapsLogger.debug(LTag.NSCLIENT, "DBACCESS " + response.getString("result"))
+            }
+        } catch (e: Exception) {
+            aapsLogger.error("Unhandled exception", e)
+        }
+    }
+}

app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSUpdateAck.java

@@ -1,46 +0,0 @@
-package info.nightscout.androidaps.plugins.general.nsclient.acks;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import info.nightscout.androidaps.events.Event;
-import info.nightscout.androidaps.logging.AAPSLogger;
-import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
-import io.socket.client.Ack;
-
-/**
- * Created by mike on 21.02.2016.
- */
-public class NSUpdateAck extends Event implements Ack {
-    private final AAPSLogger aapsLogger;
-    private final RxBusWrapper rxBus;
-
-    public boolean result = false;
-    public String _id;
-    public String action;
-
-    public void call(Object... args) {
-        JSONObject response = (JSONObject) args[0];
-        if (response.has("result"))
-            try {
-                if (response.getString("result").equals("success"))
-                    result = true;
-                else if (response.getString("result").equals("Missing _id")) {
-                    result = true;
-                    aapsLogger.debug(LTag.NSCLIENT, "Internal error: Missing _id returned on dbUpdate ack");
-                }
-                rxBus.send(this);
-            } catch (JSONException e) {
-                aapsLogger.error("Unhandled exception", e);
-            }
-    }
-
-    public NSUpdateAck(String action, String _id, AAPSLogger aapsLogger, RxBusWrapper rxBus) {
-        super();
-        this.action = action;
-        this._id = _id;
-        this.aapsLogger = aapsLogger;
-        this.rxBus = rxBus;
-    }
-}

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

@@ -0,0 +1,37 @@
+package info.nightscout.androidaps.plugins.general.nsclient.acks
+
+import info.nightscout.androidaps.events.Event
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import io.socket.client.Ack
+import org.json.JSONException
+import org.json.JSONObject
+
+/**
+ * Created by mike on 21.02.2016.
+ */
+class NSUpdateAck(
+    val action : String,
+    var _id: String,
+    private val aapsLogger: AAPSLogger,
+    private val rxBus: RxBusWrapper,
+    val originalObject: Any? = null
+) : Event(), Ack {
+
+    var result = false
+    override fun call(vararg args: Any) {
+        val response = args[0] as JSONObject
+        if (response.has("result")) try {
+            if (response.getString("result") == "success") {
+                result = true
+            } else if (response.getString("result") == "Missing _id") {
+                result = true
+                aapsLogger.debug(LTag.NSCLIENT, "Internal error: Missing _id returned on dbUpdate ack")
+            }
+            rxBus.send(this)
+        } catch (e: JSONException) {
+            aapsLogger.error("Unhandled exception", e)
+        }
+    }
+}

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

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.nsclient.data
 import android.text.Spanned
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.interfaces.ConfigInterface
+import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.aps.loop.APSResult
@@ -78,7 +78,7 @@ class NSDeviceStatus @Inject constructor(
     private val sp: SP,
     private val resourceHelper: ResourceHelper,
     private val nsSettingsStatus: NSSettingsStatus,
-    private val config: ConfigInterface,
+    private val config: Config,
     private val dateUtil: DateUtil,
     private val runningConfiguration: RunningConfiguration
 ) {
@@ -164,12 +164,12 @@ class NSDeviceStatus @Inject constructor(
 
             // 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.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 < 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.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 < nsSettingsStatus.extendedPumpSettings("warnBattV")         -> Levels.WARN
                 else                                                                                                 -> Levels.INFO
@@ -179,7 +179,7 @@ class NSDeviceStatus @Inject constructor(
             if (fields.contains("reservoir")) string.append(pumpData.reservoir.toInt()).append("U ")
             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(resourceHelper, pumpData.clock)).append(" ")
+            if (fields.contains("clock")) string.append(dateUtil.minAgo(resourceHelper, pumpData.clock)).append(" ")
             if (fields.contains("status")) string.append(pumpData.status).append(" ")
             if (fields.contains("device")) string.append(device).append(" ")
             string.append("</span>") // color
@@ -201,7 +201,7 @@ class NSDeviceStatus @Inject constructor(
         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")).time else 0L
+            val clock = if (pump.has("clock")) dateUtil.fromISODateString(pump.getString("clock")) else 0L
             // check if this is new data
             if (clock == 0L || deviceStatusPumpData != null && clock < deviceStatusPumpData!!.clock) return
 
@@ -247,13 +247,13 @@ class NSDeviceStatus @Inject constructor(
             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")).time else 0L
+            var clock = if (suggested.has("timestamp")) dateUtil.fromISODateString(suggested.getString("timestamp")) else 0L
             // check if this is new data
             if (clock != 0L && clock > deviceStatusOpenAPSData.clockSuggested) {
                 deviceStatusOpenAPSData.suggested = suggested
                 deviceStatusOpenAPSData.clockSuggested = clock
             }
-            clock = if (enacted.has("timestamp")) DateUtil.fromISODateString(enacted.getString("timestamp")).time else 0L
+            clock = if (enacted.has("timestamp")) dateUtil.fromISODateString(enacted.getString("timestamp")) else 0L
             // check if this is new data
             if (clock != 0L && clock > deviceStatusOpenAPSData.clockEnacted) {
                 deviceStatusOpenAPSData.enacted = enacted
@@ -273,12 +273,12 @@ class NSDeviceStatus @Inject constructor(
 
             // test warning level
             val level = when {
-                deviceStatusOpenAPSData.clockSuggested + T.mins(sp.getLong(R.string.key_nsalarm_urgent_staledatavalue, 31)).msecs() < dateUtil._now() -> Levels.URGENT
-                deviceStatusOpenAPSData.clockSuggested + T.mins(sp.getLong(R.string.key_nsalarm_staledatavalue, 16)).msecs() < dateUtil._now()        -> Levels.WARN
-                else                                                                                                                                  -> Levels.INFO
+                deviceStatusOpenAPSData.clockSuggested + T.mins(sp.getLong(R.string.key_nsalarm_urgent_staledatavalue, 31)).msecs() < dateUtil.now() -> Levels.URGENT
+                deviceStatusOpenAPSData.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 (deviceStatusOpenAPSData.clockSuggested != 0L) string.append(DateUtil.minAgo(resourceHelper, deviceStatusOpenAPSData.clockSuggested)).append(" ")
+            if (deviceStatusOpenAPSData.clockSuggested != 0L) string.append(dateUtil.minAgo(resourceHelper, deviceStatusOpenAPSData.clockSuggested)).append(" ")
             string.append("</span>") // color
             return fromHtml(string.toString())
         }
@@ -287,8 +287,8 @@ class NSDeviceStatus @Inject constructor(
         get() {
             val string = StringBuilder()
             try {
-                if (deviceStatusOpenAPSData.enacted != null && deviceStatusOpenAPSData.clockEnacted != deviceStatusOpenAPSData.clockSuggested) string.append("<b>").append(DateUtil.minAgo(resourceHelper, deviceStatusOpenAPSData.clockEnacted)).append("</b> ").append(deviceStatusOpenAPSData.enacted!!.getString("reason")).append("<br>")
-                if (deviceStatusOpenAPSData.suggested != null) string.append("<b>").append(DateUtil.minAgo(resourceHelper, deviceStatusOpenAPSData.clockSuggested)).append("</b> ").append(deviceStatusOpenAPSData.suggested!!.getString("reason")).append("<br>")
+                if (deviceStatusOpenAPSData.enacted != null && deviceStatusOpenAPSData.clockEnacted != deviceStatusOpenAPSData.clockSuggested) string.append("<b>").append(dateUtil.minAgo(resourceHelper, deviceStatusOpenAPSData.clockEnacted)).append("</b> ").append(deviceStatusOpenAPSData.enacted!!.getString("reason")).append("<br>")
+                if (deviceStatusOpenAPSData.suggested != null) string.append("<b>").append(dateUtil.minAgo(resourceHelper, deviceStatusOpenAPSData.clockSuggested)).append("</b> ").append(deviceStatusOpenAPSData.suggested!!.getString("reason")).append("<br>")
                 return fromHtml(string.toString())
             } catch (e: JSONException) {
                 aapsLogger.error("Unhandled exception", e)
@@ -307,7 +307,7 @@ class NSDeviceStatus @Inject constructor(
             val clock =
                 when {
                     jsonObject.has("mills")      -> jsonObject.getLong("mills")
-                    jsonObject.has("created_at") -> DateUtil.fromISODateString(jsonObject.getString("created_at")).time
+                    jsonObject.has("created_at") -> dateUtil.fromISODateString(jsonObject.getString("created_at"))
                     else                         -> 0L
                 }
             val device = device

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

@@ -1,8 +1,9 @@
 package info.nightscout.androidaps.plugins.general.nsclient.data
 
 import android.content.Context
-import info.nightscout.androidaps.Config
+import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.R
+import info.nightscout.androidaps.database.entities.UserEntry
 import info.nightscout.androidaps.database.entities.UserEntry.Action
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -246,7 +247,7 @@ class NSSettingsStatus @Inject constructor(
             getExtendedWarnValue("sage", "urgent")?.let { sp.putDouble(R.string.key_statuslights_sage_critical, it) }
             getExtendedWarnValue("bage", "warn")?.let { sp.putDouble(R.string.key_statuslights_bage_warning, it) }
             getExtendedWarnValue("bage", "urgent")?.let { sp.putDouble(R.string.key_statuslights_bage_critical, it) }
-            uel.log(Action.NS_SETTINGS_COPIED)
+            uel.log(Action.NS_SETTINGS_COPIED, UserEntry.Sources.NSClient)
         }
 
         if (context != null) OKDialog.showConfirmation(context, resourceHelper.gs(R.string.statuslights), resourceHelper.gs(R.string.copyexistingvalues), action)

app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java

@@ -1,894 +0,0 @@
-package info.nightscout.androidaps.plugins.general.nsclient.services;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Binder;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.os.IBinder;
-import android.os.PowerManager;
-import android.os.SystemClock;
-
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-import androidx.work.OneTimeWorkRequest;
-
-import com.google.common.base.Charsets;
-import com.google.common.hash.Hashing;
-import com.j256.ormlite.dao.CloseableIterator;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.net.URISyntaxException;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import dagger.android.DaggerService;
-import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.Config;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.db.DbRequest;
-import info.nightscout.androidaps.events.EventAppExit;
-import info.nightscout.androidaps.events.EventConfigBuilderChange;
-import info.nightscout.androidaps.events.EventPreferenceChange;
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.interfaces.UploadQueueInterface;
-import info.nightscout.androidaps.logging.AAPSLogger;
-import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
-import info.nightscout.androidaps.plugins.general.food.FoodPlugin;
-import info.nightscout.androidaps.plugins.general.nsclient.NSClientAddUpdateWorker;
-import info.nightscout.androidaps.plugins.general.nsclient.NSClientMbgWorker;
-import info.nightscout.androidaps.plugins.general.nsclient.NSClientPlugin;
-import info.nightscout.androidaps.plugins.general.nsclient.NSClientRemoveWorker;
-import info.nightscout.androidaps.plugins.general.nsclient.acks.NSAddAck;
-import info.nightscout.androidaps.plugins.general.nsclient.acks.NSAuthAck;
-import info.nightscout.androidaps.plugins.general.nsclient.acks.NSUpdateAck;
-import info.nightscout.androidaps.plugins.general.nsclient.data.AlarmAck;
-import info.nightscout.androidaps.plugins.general.nsclient.data.NSAlarm;
-import info.nightscout.androidaps.plugins.general.nsclient.data.NSDeviceStatus;
-import info.nightscout.androidaps.plugins.general.nsclient.data.NSSettingsStatus;
-import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientNewLog;
-import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart;
-import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientStatus;
-import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientUpdateGUI;
-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.notifications.Notification;
-import info.nightscout.androidaps.plugins.general.overview.notifications.NotificationWithAction;
-import info.nightscout.androidaps.plugins.profile.ns.NSProfilePlugin;
-import info.nightscout.androidaps.plugins.source.NSClientSourcePlugin;
-import info.nightscout.androidaps.receivers.DataWorker;
-import info.nightscout.androidaps.services.Intents;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.FabricPrivacy;
-import info.nightscout.androidaps.utils.JsonHelper;
-import info.nightscout.androidaps.utils.T;
-import info.nightscout.androidaps.utils.buildHelper.BuildHelper;
-import info.nightscout.androidaps.utils.resources.ResourceHelper;
-import info.nightscout.androidaps.utils.rx.AapsSchedulers;
-import info.nightscout.androidaps.utils.sharedPreferences.SP;
-import io.reactivex.disposables.CompositeDisposable;
-import io.socket.client.IO;
-import io.socket.client.Socket;
-import io.socket.emitter.Emitter;
-
-public class NSClientService extends DaggerService {
-    @Inject HasAndroidInjector injector;
-    @Inject AAPSLogger aapsLogger;
-    @Inject AapsSchedulers aapsSchedulers;
-    @Inject NSSettingsStatus nsSettingsStatus;
-    @Inject NSDeviceStatus nsDeviceStatus;
-    @Inject DatabaseHelperInterface databaseHelper;
-    @Inject RxBusWrapper rxBus;
-    @Inject ResourceHelper resourceHelper;
-    @Inject SP sp;
-    @Inject FabricPrivacy fabricPrivacy;
-    @Inject NSClientPlugin nsClientPlugin;
-    @Inject BuildHelper buildHelper;
-    @Inject Config config;
-    @Inject DateUtil dateUtil;
-    @Inject UploadQueueInterface uploadQueue;
-    @Inject DataWorker dataWorker;
-
-    private final CompositeDisposable disposable = new CompositeDisposable();
-
-    static public PowerManager.WakeLock mWakeLock;
-    private final IBinder mBinder = new NSClientService.LocalBinder();
-
-    static public Handler handler;
-
-    public static Socket mSocket;
-    public static boolean isConnected = false;
-    public static boolean hasWriteAuth = false;
-    private static Integer dataCounter = 0;
-    private static Integer connectCounter = 0;
-
-
-    private boolean nsEnabled = false;
-    static public String nsURL = "";
-    private String nsAPISecret = "";
-    private String nsDevice = "";
-    private final Integer nsHours = 48;
-
-    public long lastResendTime = 0;
-
-    public long latestDateInReceivedData = 0;
-
-    private String nsAPIhashCode = "";
-
-    private final ArrayList<Long> reconnections = new ArrayList<>();
-    private final int WATCHDOG_INTERVAL_MINUTES = 2;
-    private final int WATCHDOG_RECONNECT_IN = 15;
-    private final int WATCHDOG_MAXCONNECTIONS = 5;
-
-    public NSClientService() {
-        super();
-        if (handler == null) {
-            HandlerThread handlerThread = new HandlerThread(NSClientService.class.getSimpleName() + "Handler");
-            handlerThread.start();
-            handler = new Handler(handlerThread.getLooper());
-        }
-    }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        PowerManager powerManager = (PowerManager) getSystemService(Context.POWER_SERVICE);
-        mWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "AndroidAPS:NSClientService");
-        mWakeLock.acquire();
-
-        initialize();
-
-        disposable.add(rxBus
-                .toObservable(EventConfigBuilderChange.class)
-                .observeOn(aapsSchedulers.getIo())
-                .subscribe(event -> {
-                    if (nsEnabled != nsClientPlugin.isEnabled(PluginType.GENERAL)) {
-                        latestDateInReceivedData = 0;
-                        destroy();
-                        initialize();
-                    }
-                }, fabricPrivacy::logException)
-        );
-        disposable.add(rxBus
-                .toObservable(EventPreferenceChange.class)
-                .observeOn(aapsSchedulers.getIo())
-                .subscribe(event -> {
-                    if (event.isChanged(resourceHelper, R.string.key_nsclientinternal_url) ||
-                            event.isChanged(resourceHelper, R.string.key_nsclientinternal_api_secret) ||
-                            event.isChanged(resourceHelper, R.string.key_nsclientinternal_paused)
-                    ) {
-                        latestDateInReceivedData = 0;
-                        destroy();
-                        initialize();
-                    }
-                }, fabricPrivacy::logException)
-        );
-        disposable.add(rxBus
-                .toObservable(EventAppExit.class)
-                .observeOn(aapsSchedulers.getIo())
-                .subscribe(event -> {
-                    aapsLogger.debug(LTag.NSCLIENT, "EventAppExit received");
-                    destroy();
-                    stopSelf();
-                }, fabricPrivacy::logException)
-        );
-        disposable.add(rxBus
-                .toObservable(EventNSClientRestart.class)
-                .observeOn(aapsSchedulers.getIo())
-                .subscribe(event -> {
-                    latestDateInReceivedData = 0;
-                    restart();
-                }, fabricPrivacy::logException)
-        );
-        disposable.add(rxBus
-                .toObservable(NSAuthAck.class)
-                .observeOn(aapsSchedulers.getIo())
-                .subscribe(this::processAuthAck, fabricPrivacy::logException)
-        );
-        disposable.add(rxBus
-                .toObservable(NSUpdateAck.class)
-                .observeOn(aapsSchedulers.getIo())
-                .subscribe(this::processUpdateAck, fabricPrivacy::logException)
-        );
-        disposable.add(rxBus
-                .toObservable(NSAddAck.class)
-                .observeOn(aapsSchedulers.getIo())
-                .subscribe(this::processAddAck, fabricPrivacy::logException)
-        );
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        disposable.clear();
-        if (mWakeLock.isHeld()) mWakeLock.release();
-    }
-
-    public void processAddAck(NSAddAck ack) {
-        if (ack.nsClientID != null) {
-            uploadQueue.removeByNsClientIdIfExists(ack.json);
-            rxBus.send(new EventNSClientNewLog("DBADD", "Acked " + ack.nsClientID));
-        } else {
-            rxBus.send(new EventNSClientNewLog("ERROR", "DBADD Unknown response"));
-        }
-    }
-
-    public void processUpdateAck(NSUpdateAck ack) {
-        if (ack.result) {
-            uploadQueue.removeByMongoId(ack.action, ack._id);
-            rxBus.send(new EventNSClientNewLog("DBUPDATE/DBREMOVE", "Acked " + ack._id));
-        } else {
-            rxBus.send(new EventNSClientNewLog("ERROR", "DBUPDATE/DBREMOVE Unknown response"));
-        }
-    }
-
-    public void processAuthAck(NSAuthAck ack) {
-        String connectionStatus = "Authenticated (";
-        if (ack.read) connectionStatus += "R";
-        if (ack.write) connectionStatus += "W";
-        if (ack.write_treatment) connectionStatus += "T";
-        connectionStatus += ')';
-        isConnected = true;
-        hasWriteAuth = ack.write && ack.write_treatment;
-        rxBus.send(new EventNSClientStatus(connectionStatus));
-        rxBus.send(new EventNSClientNewLog("AUTH", connectionStatus));
-        if (!ack.write) {
-            rxBus.send(new EventNSClientNewLog("ERROR", "Write permission not granted !!!!"));
-        }
-        if (!ack.write_treatment) {
-            rxBus.send(new EventNSClientNewLog("ERROR", "Write treatment permission not granted !!!!"));
-        }
-        if (!hasWriteAuth) {
-            Notification noperm = new Notification(Notification.NSCLIENT_NO_WRITE_PERMISSION, resourceHelper.gs(R.string.nowritepermission), Notification.URGENT);
-            rxBus.send(new EventNewNotification(noperm));
-        } else {
-            rxBus.send(new EventDismissNotification(Notification.NSCLIENT_NO_WRITE_PERMISSION));
-        }
-    }
-
-    public class LocalBinder extends Binder {
-        public NSClientService getServiceInstance() {
-            return NSClientService.this;
-        }
-    }
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        return mBinder;
-    }
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-
-        return START_STICKY;
-    }
-
-    @SuppressWarnings("deprecation")
-    public void initialize() {
-        dataCounter = 0;
-
-        readPreferences();
-
-        if (!nsAPISecret.equals(""))
-            nsAPIhashCode = Hashing.sha1().hashString(nsAPISecret, Charsets.UTF_8).toString();
-
-        rxBus.send(new EventNSClientStatus("Initializing"));
-        if (!nsClientPlugin.isAllowed()) {
-            rxBus.send(new EventNSClientNewLog("NSCLIENT", "not allowed"));
-            rxBus.send(new EventNSClientStatus("Not allowed"));
-        } else if (nsClientPlugin.paused) {
-            rxBus.send(new EventNSClientNewLog("NSCLIENT", "paused"));
-            rxBus.send(new EventNSClientStatus("Paused"));
-        } else if (!nsEnabled) {
-            rxBus.send(new EventNSClientNewLog("NSCLIENT", "disabled"));
-            rxBus.send(new EventNSClientStatus("Disabled"));
-        } else if (!nsURL.equals("") && (buildHelper.isEngineeringMode() || nsURL.toLowerCase().startsWith("https://"))) {
-            try {
-                rxBus.send(new EventNSClientStatus("Connecting ..."));
-                IO.Options opt = new IO.Options();
-                opt.forceNew = true;
-                opt.reconnection = true;
-                mSocket = IO.socket(nsURL, opt);
-                mSocket.on(Socket.EVENT_CONNECT, onConnect);
-                mSocket.on(Socket.EVENT_DISCONNECT, onDisconnect);
-                mSocket.on(Socket.EVENT_ERROR, onError);
-                mSocket.on(Socket.EVENT_CONNECT_ERROR, onError);
-                mSocket.on(Socket.EVENT_CONNECT_TIMEOUT, onError);
-                mSocket.on(Socket.EVENT_PING, onPing);
-                rxBus.send(new EventNSClientNewLog("NSCLIENT", "do connect"));
-                mSocket.connect();
-                mSocket.on("dataUpdate", onDataUpdate);
-                mSocket.on("announcement", onAnnouncement);
-                mSocket.on("alarm", onAlarm);
-                mSocket.on("urgent_alarm", onUrgentAlarm);
-                mSocket.on("clear_alarm", onClearAlarm);
-            } catch (URISyntaxException | RuntimeException e) {
-                rxBus.send(new EventNSClientNewLog("NSCLIENT", "Wrong URL syntax"));
-                rxBus.send(new EventNSClientStatus("Wrong URL syntax"));
-            }
-        } else if (nsURL.toLowerCase().startsWith("http://")) {
-            rxBus.send(new EventNSClientNewLog("NSCLIENT", "NS URL not encrypted"));
-            rxBus.send(new EventNSClientStatus("Not encrypted"));
-        } else {
-            rxBus.send(new EventNSClientNewLog("NSCLIENT", "No NS URL specified"));
-            rxBus.send(new EventNSClientStatus("Not configured"));
-        }
-    }
-
-    private final Emitter.Listener onConnect = new Emitter.Listener() {
-        @Override
-        public void call(Object... args) {
-            connectCounter++;
-            String socketId = mSocket != null ? mSocket.id() : "NULL";
-            rxBus.send(new EventNSClientNewLog("NSCLIENT", "connect #" + connectCounter + " event. ID: " + socketId));
-            if (mSocket != null)
-                sendAuthMessage(new NSAuthAck(rxBus));
-            watchdog();
-        }
-    };
-
-    void watchdog() {
-        synchronized (reconnections) {
-            long now = DateUtil.now();
-            reconnections.add(now);
-            for (int i = 0; i < reconnections.size(); i++) {
-                Long r = reconnections.get(i);
-                if (r < now - T.mins(WATCHDOG_INTERVAL_MINUTES).msecs()) {
-                    reconnections.remove(r);
-                }
-            }
-            rxBus.send(new EventNSClientNewLog("WATCHDOG", "connections in last " + WATCHDOG_INTERVAL_MINUTES + " mins: " + reconnections.size() + "/" + WATCHDOG_MAXCONNECTIONS));
-            if (reconnections.size() >= WATCHDOG_MAXCONNECTIONS) {
-                Notification n = new Notification(Notification.NS_MALFUNCTION, resourceHelper.gs(R.string.nsmalfunction), Notification.URGENT);
-                rxBus.send(new EventNewNotification(n));
-                rxBus.send(new EventNSClientNewLog("WATCHDOG", "pausing for " + WATCHDOG_RECONNECT_IN + " mins"));
-                nsClientPlugin.pause(true);
-                rxBus.send(new EventNSClientUpdateGUI());
-                new Thread(() -> {
-                    SystemClock.sleep(T.mins(WATCHDOG_RECONNECT_IN).msecs());
-                    rxBus.send(new EventNSClientNewLog("WATCHDOG", "reenabling NSClient"));
-                    nsClientPlugin.pause(false);
-                }).start();
-            }
-        }
-    }
-
-    private final Emitter.Listener onDisconnect = new Emitter.Listener() {
-        @Override
-        public void call(Object... args) {
-            aapsLogger.debug(LTag.NSCLIENT, "disconnect reason: {}", args);
-            rxBus.send(new EventNSClientNewLog("NSCLIENT", "disconnect event"));
-        }
-    };
-
-    public synchronized void destroy() {
-        if (mSocket != null) {
-            mSocket.off(Socket.EVENT_CONNECT);
-            mSocket.off(Socket.EVENT_DISCONNECT);
-            mSocket.off(Socket.EVENT_PING);
-            mSocket.off("dataUpdate");
-            mSocket.off("announcement");
-            mSocket.off("alarm");
-            mSocket.off("urgent_alarm");
-            mSocket.off("clear_alarm");
-
-            rxBus.send(new EventNSClientNewLog("NSCLIENT", "destroy"));
-            isConnected = false;
-            hasWriteAuth = false;
-            mSocket.disconnect();
-            mSocket = null;
-        }
-    }
-
-
-    public void sendAuthMessage(NSAuthAck ack) {
-        JSONObject authMessage = new JSONObject();
-        try {
-            authMessage.put("client", "Android_" + nsDevice);
-            authMessage.put("history", nsHours);
-            authMessage.put("status", true); // receive status
-            authMessage.put("from", latestDateInReceivedData); // send data newer than
-            authMessage.put("secret", nsAPIhashCode);
-        } catch (JSONException e) {
-            aapsLogger.error("Unhandled exception", e);
-            return;
-        }
-        rxBus.send(new EventNSClientNewLog("AUTH", "requesting auth"));
-        if (mSocket != null)
-            mSocket.emit("authorize", authMessage, ack);
-    }
-
-    public void readPreferences() {
-        nsEnabled = nsClientPlugin.isEnabled(PluginType.GENERAL);
-        nsURL = sp.getString(R.string.key_nsclientinternal_url, "");
-        nsAPISecret = sp.getString(R.string.key_nsclientinternal_api_secret, "");
-        nsDevice = sp.getString("careportal_enteredby", "");
-    }
-
-    private final Emitter.Listener onError = new Emitter.Listener() {
-        @Override
-        public void call(final Object... args) {
-            String msg = "Unknown Error";
-            if (args.length > 0 && args[0] != null) {
-                msg = args[0].toString();
-            }
-            rxBus.send(new EventNSClientNewLog("ERROR", msg));
-        }
-    };
-
-    private final Emitter.Listener onPing = new Emitter.Listener() {
-        @Override
-        public void call(final Object... args) {
-            rxBus.send(new EventNSClientNewLog("PING", "received"));
-            // send data if there is something waiting
-            resend("Ping received");
-        }
-    };
-
-    private final Emitter.Listener onAnnouncement = new Emitter.Listener() {
-        /*
-        {
-        "level":0,
-        "title":"Announcement",
-        "message":"test",
-        "plugin":{"name":"treatmentnotify","label":"Treatment Notifications","pluginType":"notification","enabled":true},
-        "group":"Announcement",
-        "isAnnouncement":true,
-        "key":"9ac46ad9a1dcda79dd87dae418fce0e7955c68da"
-        }
-         */
-        @Override
-        public void call(final Object... args) {
-            JSONObject data;
-            try {
-                data = (JSONObject) args[0];
-                handleAnnouncement(data);
-            } catch (Exception e) {
-                aapsLogger.error("Unhandled exception", e);
-            }
-        }
-    };
-
-    private final Emitter.Listener onAlarm = new Emitter.Listener() {
-        /*
-        {
-        "level":1,
-        "title":"Warning HIGH",
-        "message":"BG Now: 5 -0.2 → mmol\/L\nRaw BG: 4.8 mmol\/L Čistý\nBG 15m: 4.8 mmol\/L\nIOB: -0.02U\nCOB: 0g",
-        "eventName":"high",
-        "plugin":{"name":"simplealarms","label":"Simple Alarms","pluginType":"notification","enabled":true},
-        "pushoverSound":"climb",
-        "debug":{"lastSGV":5,"thresholds":{"bgHigh":180,"bgTargetTop":75,"bgTargetBottom":72,"bgLow":70}},
-        "group":"default",
-        "key":"simplealarms_1"
-        }
-         */
-        @Override
-        public void call(final Object... args) {
-            JSONObject data;
-            try {
-                data = (JSONObject) args[0];
-                handleAlarm(data);
-            } catch (Exception e) {
-                aapsLogger.error("Unhandled exception", e);
-            }
-        }
-    };
-
-    private final Emitter.Listener onUrgentAlarm = args -> {
-        JSONObject data;
-        try {
-            data = (JSONObject) args[0];
-            handleUrgentAlarm(data);
-        } catch (Exception e) {
-            aapsLogger.error("Unhandled exception", e);
-        }
-    };
-
-    private final Emitter.Listener onClearAlarm = new Emitter.Listener() {
-        /*
-        {
-        "clear":true,
-        "title":"All Clear",
-        "message":"default - Urgent was ack'd",
-        "group":"default"
-        }
-         */
-        @Override
-        public void call(final Object... args) {
-            JSONObject data;
-            try {
-                data = (JSONObject) args[0];
-                rxBus.send(new EventNSClientNewLog("CLEARALARM", "received"));
-                rxBus.send(new EventDismissNotification(Notification.NS_ALARM));
-                rxBus.send(new EventDismissNotification(Notification.NS_URGENT_ALARM));
-                aapsLogger.debug(LTag.NSCLIENT, data.toString());
-            } catch (Exception e) {
-                aapsLogger.error("Unhandled exception", e);
-            }
-        }
-    };
-
-    private final Emitter.Listener onDataUpdate = new Emitter.Listener() {
-        @Override
-        public void call(final Object... args) {
-            NSClientService.handler.post(() -> {
-                PowerManager powerManager = (PowerManager) getSystemService(Context.POWER_SERVICE);
-                PowerManager.WakeLock wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK,
-                        "AndroidAPS:NSClientService_onDataUpdate");
-                wakeLock.acquire();
-                try {
-
-                    JSONObject data = (JSONObject) args[0];
-                    boolean broadcastProfile = false;
-                    try {
-                        // delta means only increment/changes are comming
-                        boolean isDelta = data.has("delta");
-                        boolean isFull = !isDelta;
-                        rxBus.send(new EventNSClientNewLog("DATA", "Data packet #" + dataCounter++ + (isDelta ? " delta" : " full")));
-
-                        if (data.has("status")) {
-                            JSONObject status = data.getJSONObject("status");
-                            nsSettingsStatus.handleNewData(status);
-                        } else if (!isDelta) {
-                            rxBus.send(new EventNSClientNewLog("ERROR", "Unsupported Nightscout version !!!!"));
-                        }
-
-                        if (data.has("profiles")) {
-                            JSONArray profiles = data.getJSONArray("profiles");
-                            if (profiles.length() > 0) {
-                                // take the newest
-                                JSONObject profileStoreJson = (JSONObject) profiles.get(profiles.length() - 1);
-                                rxBus.send(new EventNSClientNewLog("PROFILE", "profile received"));
-                                dataWorker.enqueue(
-                                        new OneTimeWorkRequest.Builder(NSProfilePlugin.NSProfileWorker.class)
-                                                .setInputData(dataWorker.storeInputData(profileStoreJson, null))
-                                                .build());
-
-                                if (sp.getBoolean(R.string.key_nsclient_localbroadcasts, false)) {
-                                    Bundle bundle = new Bundle();
-                                    bundle.putString("profile", profileStoreJson.toString());
-                                    bundle.putBoolean("delta", isDelta);
-                                    Intent intent = new Intent(Intents.ACTION_NEW_PROFILE);
-                                    intent.putExtras(bundle);
-                                    intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-                                    sendBroadcast(intent);
-                                }
-                            }
-                        }
-
-                        if (data.has("treatments")) {
-                            JSONArray treatments = data.getJSONArray("treatments");
-                            JSONArray removedTreatments = new JSONArray();
-                            JSONArray addedOrUpdatedTreatments = new JSONArray();
-                            if (treatments.length() > 0)
-                                rxBus.send(new EventNSClientNewLog("DATA", "received " + treatments.length() + " treatments"));
-                            for (Integer index = 0; index < treatments.length(); index++) {
-                                JSONObject jsonTreatment = treatments.getJSONObject(index);
-                                String action = JsonHelper.safeGetStringAllowNull(jsonTreatment, "action", null);
-                                long mills = JsonHelper.safeGetLong(jsonTreatment, "mills");
-
-                                if (action == null) addedOrUpdatedTreatments.put(jsonTreatment);
-                                else if (action.equals("update"))
-                                    addedOrUpdatedTreatments.put(jsonTreatment);
-                                else if (action.equals("remove") && mills > dateUtil._now() - T.days(1).msecs()) // handle 1 day old deletions only
-                                    removedTreatments.put(jsonTreatment);
-                            }
-                            if (removedTreatments.length() > 0) {
-                                dataWorker.enqueue(
-                                        new OneTimeWorkRequest.Builder(NSClientRemoveWorker.class)
-                                                .setInputData(dataWorker.storeInputData(removedTreatments, null))
-                                                .build());
-
-                                if (sp.getBoolean(R.string.key_nsclient_localbroadcasts, false)) {
-                                    Bundle bundle = new Bundle();
-                                    bundle.putString("treatments", removedTreatments.toString());
-                                    bundle.putBoolean("delta", isDelta);
-                                    Intent intent = new Intent(Intents.ACTION_REMOVED_TREATMENT);
-                                    intent.putExtras(bundle);
-                                    intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-                                    sendBroadcast(intent);
-                                }
-                            }
-                            if (addedOrUpdatedTreatments.length() > 0) {
-                                dataWorker.enqueue(
-                                        new OneTimeWorkRequest.Builder(NSClientAddUpdateWorker.class)
-                                                .setInputData(dataWorker.storeInputData(addedOrUpdatedTreatments, null))
-                                                .build());
-
-                                if (sp.getBoolean(R.string.key_nsclient_localbroadcasts, false)) {
-                                    List<JSONArray> splitted = splitArray(addedOrUpdatedTreatments);
-                                    for (JSONArray part : splitted) {
-                                        Bundle bundle = new Bundle();
-                                        bundle.putString("treatments", part.toString());
-                                        bundle.putBoolean("delta", isDelta);
-                                        Intent intent = new Intent(Intents.ACTION_CHANGED_TREATMENT);
-                                        intent.putExtras(bundle);
-                                        intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-                                        sendBroadcast(intent);
-                                    }
-                                }
-                            }
-                        }
-                        if (data.has("devicestatus")) {
-                            JSONArray devicestatuses = data.getJSONArray("devicestatus");
-                            if (devicestatuses.length() > 0) {
-                                rxBus.send(new EventNSClientNewLog("DATA", "received " + devicestatuses.length() + " device statuses"));
-                                nsDeviceStatus.handleNewData(devicestatuses);
-                            }
-                        }
-                        if (data.has("food")) {
-                            JSONArray foods = data.getJSONArray("food");
-                            if (foods.length() > 0)
-                                rxBus.send(new EventNSClientNewLog("DATA", "received " + foods.length() + " foods"));
-                            dataWorker.enqueue(
-                                    new OneTimeWorkRequest.Builder(FoodPlugin.FoodWorker.class)
-                                            .setInputData(dataWorker.storeInputData(foods, null))
-                                            .build());
-                        }
-                        //noinspection SpellCheckingInspection
-                        if (data.has("mbgs")) {
-                            JSONArray mbgArray = data.getJSONArray("mbgs");
-                            if (mbgArray.length() > 0)
-                                rxBus.send(new EventNSClientNewLog("DATA", "received " + mbgArray.length() + " mbgs"));
-                            dataWorker.enqueue(
-                                    new OneTimeWorkRequest.Builder(NSClientMbgWorker.class)
-                                            .setInputData(dataWorker.storeInputData(mbgArray, null))
-                                            .build());
-                        }
-                        if (data.has("cals")) {
-                            JSONArray cals = data.getJSONArray("cals");
-                            if (cals.length() > 0)
-                                rxBus.send(new EventNSClientNewLog("DATA", "received " + cals.length() + " cals"));
-                            // Calibrations ignored
-                        }
-                        if (data.has("sgvs")) {
-                            JSONArray sgvs = data.getJSONArray("sgvs");
-                            if (sgvs.length() > 0)
-                                rxBus.send(new EventNSClientNewLog("DATA", "received " + sgvs.length() + " sgvs"));
-
-                            dataWorker.enqueue(new OneTimeWorkRequest.Builder(NSClientSourcePlugin.NSClientSourceWorker.class)
-                                    .setInputData(dataWorker.storeInputData(sgvs, null))
-                                    .build());
-
-                            List<JSONArray> splitted = splitArray(sgvs);
-                            if (sp.getBoolean(R.string.key_nsclient_localbroadcasts, false)) {
-                                for (JSONArray part : splitted) {
-                                    Bundle bundle = new Bundle();
-                                    bundle.putString("sgvs", part.toString());
-                                    bundle.putBoolean("delta", isDelta);
-                                    Intent intent = new Intent(Intents.ACTION_NEW_SGV);
-                                    intent.putExtras(bundle);
-                                    intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-                                    sendBroadcast(intent);
-                                }
-                            }
-                        }
-                        rxBus.send(new EventNSClientNewLog("LAST", dateUtil.dateAndTimeString(latestDateInReceivedData)));
-                    } catch (JSONException e) {
-                        aapsLogger.error("Unhandled exception", e);
-                    }
-                    //rxBus.send(new EventNSClientNewLog("NSCLIENT", "onDataUpdate end");
-                } finally {
-                    if (wakeLock.isHeld()) wakeLock.release();
-                }
-            });
-        }
-    };
-
-    public void dbUpdate(DbRequest dbr, NSUpdateAck ack) {
-        try {
-            if (!isConnected || !hasWriteAuth) return;
-            JSONObject message = new JSONObject();
-            message.put("collection", dbr.collection);
-            message.put("_id", dbr._id);
-            message.put("data", new JSONObject(dbr.data));
-            mSocket.emit("dbUpdate", message, ack);
-            rxBus.send(new EventNSClientNewLog("DBUPDATE " + dbr.collection, "Sent " + dbr._id));
-        } catch (JSONException e) {
-            aapsLogger.error("Unhandled exception", e);
-        }
-    }
-
-    public void dbUpdateUnset(DbRequest dbr, NSUpdateAck ack) {
-        try {
-            if (!isConnected || !hasWriteAuth) return;
-            JSONObject message = new JSONObject();
-            message.put("collection", dbr.collection);
-            message.put("_id", dbr._id);
-            message.put("data", new JSONObject(dbr.data));
-            mSocket.emit("dbUpdateUnset", message, ack);
-            rxBus.send(new EventNSClientNewLog("DBUPDATEUNSET " + dbr.collection, "Sent " + dbr._id));
-        } catch (JSONException e) {
-            aapsLogger.error("Unhandled exception", e);
-        }
-    }
-
-    public void dbRemove(DbRequest dbr, NSUpdateAck ack) {
-        try {
-            if (!isConnected || !hasWriteAuth) return;
-            JSONObject message = new JSONObject();
-            message.put("collection", dbr.collection);
-            message.put("_id", dbr._id);
-            mSocket.emit("dbRemove", message, ack);
-            rxBus.send(new EventNSClientNewLog("DBREMOVE " + dbr.collection, "Sent " + dbr._id));
-        } catch (JSONException e) {
-            aapsLogger.error("Unhandled exception", e);
-        }
-    }
-
-    public void dbAdd(DbRequest dbr, NSAddAck ack) {
-        try {
-            if (!isConnected || !hasWriteAuth) return;
-            JSONObject message = new JSONObject();
-            message.put("collection", dbr.collection);
-            message.put("data", new JSONObject(dbr.data));
-            mSocket.emit("dbAdd", message, ack);
-            rxBus.send(new EventNSClientNewLog("DBADD " + dbr.collection, "Sent " + dbr.nsClientID));
-        } catch (JSONException e) {
-            aapsLogger.error("Unhandled exception", e);
-        }
-    }
-
-    public void sendAlarmAck(AlarmAck alarmAck) {
-        if (!isConnected || !hasWriteAuth) return;
-        mSocket.emit("ack", alarmAck.level, alarmAck.group, alarmAck.silenceTime);
-        rxBus.send(new EventNSClientNewLog("ALARMACK ", alarmAck.level + " " + alarmAck.group + " " + alarmAck.silenceTime));
-    }
-
-    public void resend(final String reason) {
-        if (uploadQueue.size() == 0)
-            return;
-
-        if (!isConnected || !hasWriteAuth) return;
-
-        handler.post(() -> {
-            if (mSocket == null || !mSocket.connected()) return;
-
-            if (lastResendTime > System.currentTimeMillis() - 10 * 1000L) {
-                aapsLogger.debug(LTag.NSCLIENT, "Skipping resend by lastResendTime: " + ((System.currentTimeMillis() - lastResendTime) / 1000L) + " sec");
-                return;
-            }
-            lastResendTime = System.currentTimeMillis();
-
-            rxBus.send(new EventNSClientNewLog("QUEUE", "Resend started: " + reason));
-
-            CloseableIterator<DbRequest> iterator;
-            int maxcount = 30;
-            try {
-                iterator = databaseHelper.getDbRequestIterator();
-                try {
-                    while (iterator.hasNext() && maxcount > 0) {
-                        DbRequest dbr = iterator.next();
-                        if (dbr.action.equals("dbAdd")) {
-                            NSAddAck addAck = new NSAddAck(aapsLogger, rxBus);
-                            dbAdd(dbr, addAck);
-                        } else if (dbr.action.equals("dbRemove")) {
-                            NSUpdateAck removeAck = new NSUpdateAck(dbr.action, dbr._id, aapsLogger, rxBus);
-                            dbRemove(dbr, removeAck);
-                        } else if (dbr.action.equals("dbUpdate")) {
-                            NSUpdateAck updateAck = new NSUpdateAck(dbr.action, dbr._id, aapsLogger, rxBus);
-                            dbUpdate(dbr, updateAck);
-                        } else if (dbr.action.equals("dbUpdateUnset")) {
-                            NSUpdateAck updateUnsetAck = new NSUpdateAck(dbr.action, dbr._id, aapsLogger, rxBus);
-                            dbUpdateUnset(dbr, updateUnsetAck);
-                        }
-                        maxcount--;
-                    }
-                } finally {
-                    iterator.close();
-                }
-            } catch (SQLException e) {
-                aapsLogger.error("Unhandled exception", e);
-            }
-
-            rxBus.send(new EventNSClientNewLog("QUEUE", "Resend ended: " + reason));
-        });
-    }
-
-    public void restart() {
-        destroy();
-        initialize();
-    }
-
-    private void handleAnnouncement(JSONObject announcement) {
-        boolean defaultVal = config.getNSCLIENT();
-        if (sp.getBoolean(R.string.key_ns_announcements, defaultVal)) {
-            NSAlarm nsAlarm = new NSAlarm(announcement);
-            Notification notification = new NotificationWithAction(injector, nsAlarm);
-            rxBus.send(new EventNewNotification(notification));
-            rxBus.send(new EventNSClientNewLog("ANNOUNCEMENT", JsonHelper.safeGetString(announcement, "message", "received")));
-            aapsLogger.debug(LTag.NSCLIENT, announcement.toString());
-        }
-    }
-
-    private void handleAlarm(JSONObject alarm) {
-        boolean defaultVal = config.getNSCLIENT();
-        if (sp.getBoolean(R.string.key_ns_alarms, defaultVal)) {
-            long snoozedTo = sp.getLong(R.string.key_snoozedTo, 0L);
-            if (snoozedTo == 0L || System.currentTimeMillis() > snoozedTo) {
-                NSAlarm nsAlarm = new NSAlarm(alarm);
-                Notification notification = new NotificationWithAction(injector, nsAlarm);
-                rxBus.send(new EventNewNotification(notification));
-            }
-            rxBus.send(new EventNSClientNewLog("ALARM", JsonHelper.safeGetString(alarm, "message", "received")));
-            aapsLogger.debug(LTag.NSCLIENT, alarm.toString());
-        }
-    }
-
-    private void handleUrgentAlarm(JSONObject alarm) {
-        boolean defaultVal = config.getNSCLIENT();
-        if (sp.getBoolean(R.string.key_ns_alarms, defaultVal)) {
-            long snoozedTo = sp.getLong(R.string.key_snoozedTo, 0L);
-            if (snoozedTo == 0L || System.currentTimeMillis() > snoozedTo) {
-                NSAlarm nsAlarm = new NSAlarm(alarm);
-                Notification notification = new NotificationWithAction(injector, nsAlarm);
-                rxBus.send(new EventNewNotification(notification));
-            }
-            rxBus.send(new EventNSClientNewLog("URGENTALARM", JsonHelper.safeGetString(alarm, "message", "received")));
-            aapsLogger.debug(LTag.NSCLIENT, alarm.toString());
-        }
-    }
-
-    public void handleNewTreatment(JSONArray treatments, boolean isDelta) {
-        List<JSONArray> splitted = splitArray(treatments);
-        for (JSONArray part : splitted) {
-            Bundle bundle = new Bundle();
-            bundle.putString("treatments", part.toString());
-            bundle.putBoolean("delta", isDelta);
-            Intent intent = new Intent(Intents.ACTION_NEW_TREATMENT);
-            intent.putExtras(bundle);
-            intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-            LocalBroadcastManager.getInstance(this).sendBroadcast(intent);
-        }
-
-        if (sp.getBoolean(R.string.key_nsclient_localbroadcasts, false)) {
-            splitted = splitArray(treatments);
-            for (JSONArray part : splitted) {
-                Bundle bundle = new Bundle();
-                bundle.putString("treatments", part.toString());
-                bundle.putBoolean("delta", isDelta);
-                Intent intent = new Intent(Intents.ACTION_NEW_TREATMENT);
-                intent.putExtras(bundle);
-                intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-                this.getApplicationContext().sendBroadcast(intent);
-            }
-        }
-    }
-
-    public List<JSONArray> splitArray(JSONArray array) {
-        List<JSONArray> ret = new ArrayList<>();
-        try {
-            int size = array.length();
-            int count = 0;
-            JSONArray newarr = null;
-            for (int i = 0; i < size; i++) {
-                if (count == 0) {
-                    if (newarr != null) {
-                        ret.add(newarr);
-                    }
-                    newarr = new JSONArray();
-                    count = 20;
-                }
-                newarr.put(array.get(i));
-                --count;
-            }
-            if (newarr != null && newarr.length() > 0) {
-                ret.add(newarr);
-            }
-        } catch (JSONException e) {
-            aapsLogger.error("Unhandled exception", e);
-            ret = new ArrayList<>();
-            ret.add(array);
-        }
-        return ret;
-    }
-}

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

@@ -0,0 +1,728 @@
+package info.nightscout.androidaps.plugins.general.nsclient.services
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.Intent
+import android.os.*
+import androidx.work.OneTimeWorkRequest
+import com.google.common.base.Charsets
+import com.google.common.hash.Hashing
+import dagger.android.DaggerService
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.database.AppRepository
+import info.nightscout.androidaps.events.EventAppExit
+import info.nightscout.androidaps.events.EventConfigBuilderChange
+import info.nightscout.androidaps.events.EventPreferenceChange
+import info.nightscout.androidaps.interfaces.Config
+import info.nightscout.androidaps.interfaces.DataSyncSelector
+import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.food.FoodPlugin.FoodWorker
+import info.nightscout.androidaps.plugins.general.nsclient.*
+import info.nightscout.androidaps.plugins.general.nsclient.acks.NSAddAck
+import info.nightscout.androidaps.plugins.general.nsclient.acks.NSAuthAck
+import info.nightscout.androidaps.plugins.general.nsclient.acks.NSUpdateAck
+import info.nightscout.androidaps.plugins.general.nsclient.data.AlarmAck
+import info.nightscout.androidaps.plugins.general.nsclient.data.NSAlarm
+import info.nightscout.androidaps.plugins.general.nsclient.data.NSDeviceStatus
+import info.nightscout.androidaps.plugins.general.nsclient.data.NSSettingsStatus
+import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientNewLog
+import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart
+import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientStatus
+import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientUpdateGUI
+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.notifications.Notification
+import info.nightscout.androidaps.plugins.general.overview.notifications.NotificationWithAction
+import info.nightscout.androidaps.plugins.profile.local.LocalProfilePlugin
+import info.nightscout.androidaps.plugins.source.NSClientSourcePlugin.NSClientSourceWorker
+import info.nightscout.androidaps.receivers.DataWorker
+import info.nightscout.androidaps.services.Intents
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.JsonHelper.safeGetLong
+import info.nightscout.androidaps.utils.JsonHelper.safeGetString
+import info.nightscout.androidaps.utils.JsonHelper.safeGetStringAllowNull
+import info.nightscout.androidaps.utils.T.Companion.days
+import info.nightscout.androidaps.utils.T.Companion.mins
+import info.nightscout.androidaps.utils.buildHelper.BuildHelper
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.rx.AapsSchedulers
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import io.reactivex.disposables.CompositeDisposable
+import io.socket.client.IO
+import io.socket.client.Socket
+import io.socket.emitter.Emitter
+import org.json.JSONArray
+import org.json.JSONException
+import org.json.JSONObject
+import java.net.URISyntaxException
+import java.util.*
+import javax.inject.Inject
+
+class NSClientService : DaggerService() {
+
+    @Inject lateinit var injector: HasAndroidInjector
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var aapsSchedulers: AapsSchedulers
+    @Inject lateinit var nsSettingsStatus: NSSettingsStatus
+    @Inject lateinit var nsDeviceStatus: NSDeviceStatus
+    @Inject lateinit var databaseHelper: DatabaseHelperInterface
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var sp: SP
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var nsClientPlugin: NSClientPlugin
+    @Inject lateinit var buildHelper: BuildHelper
+    @Inject lateinit var config: Config
+    @Inject lateinit var dateUtil: DateUtil
+    @Inject lateinit var dataWorker: DataWorker
+    @Inject lateinit var dataSyncSelector: DataSyncSelector
+    @Inject lateinit var repository: AppRepository
+
+    companion object {
+
+        private const val WATCHDOG_INTERVAL_MINUTES = 2
+        private const val WATCHDOG_RECONNECT_IN = 15
+        private const val WATCHDOG_MAX_CONNECTIONS = 5
+    }
+
+    private val disposable = CompositeDisposable()
+
+    private var wakeLock: PowerManager.WakeLock? = null
+    private val binder: IBinder = LocalBinder()
+    private var handler: Handler? = null
+    private var socket: Socket? = null
+    private var dataCounter = 0
+    private var connectCounter = 0
+    private var nsEnabled = false
+    private var nsAPISecret = ""
+    private var nsDevice = ""
+    private val nsHours = 48
+    private var lastAckTime: Long = 0
+    private var nsApiHashCode = ""
+    private val reconnections = ArrayList<Long>()
+
+    var isConnected = false
+    var hasWriteAuth = false
+    var nsURL = ""
+    var latestDateInReceivedData: Long = 0
+
+    @SuppressLint("WakelockTimeout")
+    override fun onCreate() {
+        super.onCreate()
+        wakeLock = (getSystemService(Context.POWER_SERVICE) as PowerManager).newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "AndroidAPS:NSClientService")
+        wakeLock?.acquire()
+        initialize()
+        disposable.add(rxBus
+            .toObservable(EventConfigBuilderChange::class.java)
+            .observeOn(aapsSchedulers.io)
+            .subscribe({
+                if (nsEnabled != nsClientPlugin.isEnabled(PluginType.GENERAL)) {
+                    latestDateInReceivedData = 0
+                    destroy()
+                    initialize()
+                }
+            }, fabricPrivacy::logException)
+        )
+        disposable.add(rxBus
+            .toObservable(EventPreferenceChange::class.java)
+            .observeOn(aapsSchedulers.io)
+            .subscribe({ event: EventPreferenceChange ->
+                if (event.isChanged(resourceHelper, R.string.key_nsclientinternal_url) ||
+                    event.isChanged(resourceHelper, R.string.key_nsclientinternal_api_secret) ||
+                    event.isChanged(resourceHelper, R.string.key_nsclientinternal_paused)) {
+                    latestDateInReceivedData = 0
+                    destroy()
+                    initialize()
+                }
+            }, fabricPrivacy::logException)
+        )
+        disposable.add(rxBus
+            .toObservable(EventAppExit::class.java)
+            .observeOn(aapsSchedulers.io)
+            .subscribe({
+                aapsLogger.debug(LTag.NSCLIENT, "EventAppExit received")
+                destroy()
+                stopSelf()
+            }, fabricPrivacy::logException)
+        )
+        disposable.add(rxBus
+            .toObservable(EventNSClientRestart::class.java)
+            .observeOn(aapsSchedulers.io)
+            .subscribe({
+                latestDateInReceivedData = 0
+                restart()
+            }, fabricPrivacy::logException)
+        )
+        disposable.add(rxBus
+            .toObservable(NSAuthAck::class.java)
+            .observeOn(aapsSchedulers.io)
+            .subscribe({ ack -> processAuthAck(ack) }, fabricPrivacy::logException)
+        )
+        disposable.add(rxBus
+            .toObservable(NSUpdateAck::class.java)
+            .observeOn(aapsSchedulers.io)
+            .subscribe({ ack -> processUpdateAck(ack) }, fabricPrivacy::logException)
+        )
+        disposable.add(rxBus
+            .toObservable(NSAddAck::class.java)
+            .observeOn(aapsSchedulers.io)
+            .subscribe({ ack -> processAddAck(ack) }, fabricPrivacy::logException)
+        )
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        disposable.clear()
+        if (wakeLock?.isHeld == true) wakeLock?.release()
+    }
+
+    private fun processAddAck(ack: NSAddAck) {
+        lastAckTime = dateUtil.now()
+        dataWorker.enqueue(
+            OneTimeWorkRequest.Builder(NSClientAddAckWorker::class.java)
+                .setInputData(dataWorker.storeInputData(ack, null))
+                .build())
+    }
+
+    private fun processUpdateAck(ack: NSUpdateAck) {
+        lastAckTime = dateUtil.now()
+        dataWorker.enqueue(
+            OneTimeWorkRequest.Builder(NSClientUpdateRemoveAckWorker::class.java)
+                .setInputData(dataWorker.storeInputData(ack, null))
+                .build())
+    }
+
+    fun processAuthAck(ack: NSAuthAck) {
+        var connectionStatus = "Authenticated ("
+        if (ack.read) connectionStatus += "R"
+        if (ack.write) connectionStatus += "W"
+        if (ack.write_treatment) connectionStatus += "T"
+        connectionStatus += ')'
+        isConnected = true
+        hasWriteAuth = ack.write && ack.write_treatment
+        rxBus.send(EventNSClientStatus(connectionStatus))
+        rxBus.send(EventNSClientNewLog("AUTH", connectionStatus))
+        if (!ack.write) {
+            rxBus.send(EventNSClientNewLog("ERROR", "Write permission not granted "))
+        }
+        if (!ack.write_treatment) {
+            rxBus.send(EventNSClientNewLog("ERROR", "Write treatment permission not granted "))
+        }
+        if (!hasWriteAuth) {
+            val noWritePerm = Notification(Notification.NSCLIENT_NO_WRITE_PERMISSION, resourceHelper.gs(R.string.nowritepermission), Notification.URGENT)
+            rxBus.send(EventNewNotification(noWritePerm))
+        } else {
+            rxBus.send(EventDismissNotification(Notification.NSCLIENT_NO_WRITE_PERMISSION))
+        }
+    }
+
+    inner class LocalBinder : Binder() {
+
+        val serviceInstance: NSClientService
+            get() = this@NSClientService
+    }
+
+    override fun onBind(intent: Intent): IBinder {
+        return binder
+    }
+
+    override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
+        return START_STICKY
+    }
+
+    fun initialize() {
+        dataCounter = 0
+        readPreferences()
+        @Suppress("UnstableApiUsage", "DEPRECATION")
+        if (nsAPISecret != "") nsApiHashCode = Hashing.sha1().hashString(nsAPISecret, Charsets.UTF_8).toString()
+        rxBus.send(EventNSClientStatus("Initializing"))
+        if (!nsClientPlugin.isAllowed) {
+            rxBus.send(EventNSClientNewLog("NSCLIENT", "not allowed"))
+            rxBus.send(EventNSClientStatus("Not allowed"))
+        } else if (nsClientPlugin.paused) {
+            rxBus.send(EventNSClientNewLog("NSCLIENT", "paused"))
+            rxBus.send(EventNSClientStatus("Paused"))
+        } else if (!nsEnabled) {
+            rxBus.send(EventNSClientNewLog("NSCLIENT", "disabled"))
+            rxBus.send(EventNSClientStatus("Disabled"))
+        } else if (nsURL != "" && (buildHelper.isEngineeringMode() || nsURL.toLowerCase(Locale.getDefault()).startsWith("https://"))) {
+            try {
+                rxBus.send(EventNSClientStatus("Connecting ..."))
+                val opt = IO.Options()
+                opt.forceNew = true
+                opt.reconnection = true
+                socket = IO.socket(nsURL, opt).also { socket ->
+                    socket.on(Socket.EVENT_CONNECT, onConnect)
+                    socket.on(Socket.EVENT_DISCONNECT, onDisconnect)
+                    socket.on(Socket.EVENT_ERROR, onError)
+                    socket.on(Socket.EVENT_CONNECT_ERROR, onError)
+                    socket.on(Socket.EVENT_CONNECT_TIMEOUT, onError)
+                    socket.on(Socket.EVENT_PING, onPing)
+                    rxBus.send(EventNSClientNewLog("NSCLIENT", "do connect"))
+                    socket.connect()
+                    socket.on("dataUpdate", onDataUpdate)
+                    socket.on("announcement", onAnnouncement)
+                    socket.on("alarm", onAlarm)
+                    socket.on("urgent_alarm", onUrgentAlarm)
+                    socket.on("clear_alarm", onClearAlarm)
+                }
+            } catch (e: URISyntaxException) {
+                rxBus.send(EventNSClientNewLog("NSCLIENT", "Wrong URL syntax"))
+                rxBus.send(EventNSClientStatus("Wrong URL syntax"))
+            } catch (e: RuntimeException) {
+                rxBus.send(EventNSClientNewLog("NSCLIENT", "Wrong URL syntax"))
+                rxBus.send(EventNSClientStatus("Wrong URL syntax"))
+            }
+        } else if (nsURL.toLowerCase(Locale.getDefault()).startsWith("http://")) {
+            rxBus.send(EventNSClientNewLog("NSCLIENT", "NS URL not encrypted"))
+            rxBus.send(EventNSClientStatus("Not encrypted"))
+        } else {
+            rxBus.send(EventNSClientNewLog("NSCLIENT", "No NS URL specified"))
+            rxBus.send(EventNSClientStatus("Not configured"))
+        }
+    }
+
+    private val onConnect = Emitter.Listener {
+        connectCounter++
+        val socketId = socket?.id() ?: "NULL"
+        rxBus.send(EventNSClientNewLog("NSCLIENT", "connect #$connectCounter event. ID: $socketId"))
+        if (socket != null) sendAuthMessage(NSAuthAck(rxBus))
+        watchdog()
+    }
+
+    private fun watchdog() {
+        synchronized(reconnections) {
+            val now = dateUtil.now()
+            reconnections.add(now)
+            for (r in reconnections.reversed()) {
+                if (r < now - mins(WATCHDOG_INTERVAL_MINUTES.toLong()).msecs()) {
+                    reconnections.remove(r)
+                }
+            }
+            rxBus.send(EventNSClientNewLog("WATCHDOG", "connections in last " + WATCHDOG_INTERVAL_MINUTES + " minutes: " + reconnections.size + "/" + WATCHDOG_MAX_CONNECTIONS))
+            if (reconnections.size >= WATCHDOG_MAX_CONNECTIONS) {
+                val n = Notification(Notification.NS_MALFUNCTION, resourceHelper.gs(R.string.nsmalfunction), Notification.URGENT)
+                rxBus.send(EventNewNotification(n))
+                rxBus.send(EventNSClientNewLog("WATCHDOG", "pausing for $WATCHDOG_RECONNECT_IN minutes"))
+                nsClientPlugin.pause(true)
+                rxBus.send(EventNSClientUpdateGUI())
+                Thread {
+                    SystemClock.sleep(mins(WATCHDOG_RECONNECT_IN.toLong()).msecs())
+                    rxBus.send(EventNSClientNewLog("WATCHDOG", "re-enabling NSClient"))
+                    nsClientPlugin.pause(false)
+                }.start()
+            }
+        }
+    }
+
+    private val onDisconnect = Emitter.Listener { args ->
+        aapsLogger.debug(LTag.NSCLIENT, "disconnect reason: {}", *args)
+        rxBus.send(EventNSClientNewLog("NSCLIENT", "disconnect event"))
+    }
+
+    @Synchronized fun destroy() {
+        socket?.off(Socket.EVENT_CONNECT)
+        socket?.off(Socket.EVENT_DISCONNECT)
+        socket?.off(Socket.EVENT_PING)
+        socket?.off("dataUpdate")
+        socket?.off("announcement")
+        socket?.off("alarm")
+        socket?.off("urgent_alarm")
+        socket?.off("clear_alarm")
+        rxBus.send(EventNSClientNewLog("NSCLIENT", "destroy"))
+        isConnected = false
+        hasWriteAuth = false
+        socket?.disconnect()
+        socket = null
+    }
+
+    private fun sendAuthMessage(ack: NSAuthAck?) {
+        val authMessage = JSONObject()
+        try {
+            authMessage.put("client", "Android_$nsDevice")
+            authMessage.put("history", nsHours)
+            authMessage.put("status", true) // receive status
+            authMessage.put("from", latestDateInReceivedData) // send data newer than
+            authMessage.put("secret", nsApiHashCode)
+        } catch (e: JSONException) {
+            aapsLogger.error("Unhandled exception", e)
+            return
+        }
+        rxBus.send(EventNSClientNewLog("AUTH", "requesting auth"))
+        socket?.emit("authorize", authMessage, ack)
+    }
+
+    fun readPreferences() {
+        nsEnabled = nsClientPlugin.isEnabled(PluginType.GENERAL)
+        nsURL = sp.getString(R.string.key_nsclientinternal_url, "")
+        nsAPISecret = sp.getString(R.string.key_nsclientinternal_api_secret, "")
+        nsDevice = sp.getString("careportal_enteredby", "")
+    }
+
+    private val onError = Emitter.Listener { args ->
+        var msg = "Unknown Error"
+        if (args.isNotEmpty() && args[0] != null) {
+            msg = args[0].toString()
+        }
+        rxBus.send(EventNSClientNewLog("ERROR", msg))
+    }
+    private val onPing = Emitter.Listener {
+        rxBus.send(EventNSClientNewLog("PING", "received"))
+        // send data if there is something waiting
+        resend("Ping received")
+    }
+    private val onAnnouncement = Emitter.Listener { args ->
+
+        /*
+        {
+        "level":0,
+        "title":"Announcement",
+        "message":"test",
+        "plugin":{"name":"treatmentnotify","label":"Treatment Notifications","pluginType":"notification","enabled":true},
+        "group":"Announcement",
+        "isAnnouncement":true,
+        "key":"9ac46ad9a1dcda79dd87dae418fce0e7955c68da"
+        }
+         */
+        val data: JSONObject
+        try {
+            data = args[0] as JSONObject
+            handleAnnouncement(data)
+        } catch (e: Exception) {
+            aapsLogger.error("Unhandled exception", e)
+        }
+    }
+    private val onAlarm = Emitter.Listener { args ->
+
+        /*
+        {
+        "level":1,
+        "title":"Warning HIGH",
+        "message":"BG Now: 5 -0.2 → mmol\/L\nRaw BG: 4.8 mmol\/L Čistý\nBG 15m: 4.8 mmol\/L\nIOB: -0.02U\nCOB: 0g",
+        "eventName":"high",
+        "plugin":{"name":"simplealarms","label":"Simple Alarms","pluginType":"notification","enabled":true},
+        "pushoverSound":"climb",
+        "debug":{"lastSGV":5,"thresholds":{"bgHigh":180,"bgTargetTop":75,"bgTargetBottom":72,"bgLow":70}},
+        "group":"default",
+        "key":"simplealarms_1"
+        }
+         */
+        val data: JSONObject
+        try {
+            data = args[0] as JSONObject
+            handleAlarm(data)
+        } catch (e: Exception) {
+            aapsLogger.error("Unhandled exception", e)
+        }
+    }
+    private val onUrgentAlarm = Emitter.Listener { args: Array<Any> ->
+        val data: JSONObject
+        try {
+            data = args[0] as JSONObject
+            handleUrgentAlarm(data)
+        } catch (e: Exception) {
+            aapsLogger.error("Unhandled exception", e)
+        }
+    }
+    private val onClearAlarm = Emitter.Listener { args ->
+
+        /*
+        {
+        "clear":true,
+        "title":"All Clear",
+        "message":"default - Urgent was ack'd",
+        "group":"default"
+        }
+         */
+        val data: JSONObject
+        try {
+            data = args[0] as JSONObject
+            rxBus.send(EventNSClientNewLog("CLEARALARM", "received"))
+            rxBus.send(EventDismissNotification(Notification.NS_ALARM))
+            rxBus.send(EventDismissNotification(Notification.NS_URGENT_ALARM))
+            aapsLogger.debug(LTag.NSCLIENT, data.toString())
+        } catch (e: Exception) {
+            aapsLogger.error("Unhandled exception", e)
+        }
+    }
+    private val onDataUpdate = Emitter.Listener { args ->
+        handler?.post {
+            // val powerManager = getSystemService(POWER_SERVICE) as PowerManager
+            // val wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK,
+            //     "AndroidAPS:NSClientService_onDataUpdate")
+            // wakeLock.acquire(3000)
+            try {
+                val data = args[0] as JSONObject
+                try {
+                    // delta means only increment/changes are coming
+                    val isDelta = data.has("delta")
+                    rxBus.send(EventNSClientNewLog("DATA", "Data packet #" + dataCounter++ + if (isDelta) " delta" else " full"))
+                    if (data.has("status")) {
+                        val status = data.getJSONObject("status")
+                        nsSettingsStatus.handleNewData(status)
+                    } else if (!isDelta) {
+                        rxBus.send(EventNSClientNewLog("ERROR", "Unsupported Nightscout version "))
+                    }
+                    if (data.has("profiles")) {
+                        val profiles = data.getJSONArray("profiles")
+                        if (profiles.length() > 0) {
+                            // take the newest
+                            val profileStoreJson = profiles[profiles.length() - 1] as JSONObject
+                            rxBus.send(EventNSClientNewLog("PROFILE", "profile received"))
+                            dataWorker.enqueue(
+                                OneTimeWorkRequest.Builder(LocalProfilePlugin.NSProfileWorker::class.java)
+                                    .setInputData(dataWorker.storeInputData(profileStoreJson, null))
+                                    .build())
+                            if (sp.getBoolean(R.string.key_nsclient_localbroadcasts, false)) {
+                                val bundle = Bundle()
+                                bundle.putString("profile", profileStoreJson.toString())
+                                bundle.putBoolean("delta", isDelta)
+                                val intent = Intent(Intents.ACTION_NEW_PROFILE)
+                                intent.putExtras(bundle)
+                                intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
+                                sendBroadcast(intent)
+                            }
+                        }
+                    }
+                    if (data.has("treatments")) {
+                        val treatments = data.getJSONArray("treatments")
+                        val removedTreatments = JSONArray()
+                        val addedOrUpdatedTreatments = JSONArray()
+                        if (treatments.length() > 0) rxBus.send(EventNSClientNewLog("DATA", "received " + treatments.length() + " treatments"))
+                        for (index in 0 until treatments.length()) {
+                            val jsonTreatment = treatments.getJSONObject(index)
+                            val action = safeGetStringAllowNull(jsonTreatment, "action", null)
+                            val mills = safeGetLong(jsonTreatment, "mills")
+                            if (action == null) addedOrUpdatedTreatments.put(jsonTreatment) else if (action == "update") addedOrUpdatedTreatments.put(jsonTreatment) else if (action == "remove" && mills > dateUtil.now() - days(1).msecs()) // handle 1 day old deletions only
+                                removedTreatments.put(jsonTreatment)
+                        }
+                        if (removedTreatments.length() > 0) {
+                            dataWorker.enqueue(
+                                OneTimeWorkRequest.Builder(NSClientRemoveWorker::class.java)
+                                    .setInputData(dataWorker.storeInputData(removedTreatments, null))
+                                    .build())
+                            if (sp.getBoolean(R.string.key_nsclient_localbroadcasts, false)) {
+                                val bundle = Bundle()
+                                bundle.putString("treatments", removedTreatments.toString())
+                                bundle.putBoolean("delta", isDelta)
+                                val intent = Intent(Intents.ACTION_REMOVED_TREATMENT)
+                                intent.putExtras(bundle)
+                                intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
+                                sendBroadcast(intent)
+                            }
+                        }
+                        if (addedOrUpdatedTreatments.length() > 0) {
+                            dataWorker.enqueue(
+                                OneTimeWorkRequest.Builder(NSClientAddUpdateWorker::class.java)
+                                    .setInputData(dataWorker.storeInputData(addedOrUpdatedTreatments, null))
+                                    .build())
+                            if (sp.getBoolean(R.string.key_nsclient_localbroadcasts, false)) {
+                                val splitted = splitArray(addedOrUpdatedTreatments)
+                                for (part in splitted) {
+                                    val bundle = Bundle()
+                                    bundle.putString("treatments", part.toString())
+                                    bundle.putBoolean("delta", isDelta)
+                                    val intent = Intent(Intents.ACTION_CHANGED_TREATMENT)
+                                    intent.putExtras(bundle)
+                                    intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
+                                    sendBroadcast(intent)
+                                }
+                            }
+                        }
+                    }
+                    if (data.has("devicestatus")) {
+                        val devicestatuses = data.getJSONArray("devicestatus")
+                        if (devicestatuses.length() > 0) {
+                            rxBus.send(EventNSClientNewLog("DATA", "received " + devicestatuses.length() + " device statuses"))
+                            nsDeviceStatus.handleNewData(devicestatuses)
+                        }
+                    }
+                    if (data.has("food")) {
+                        val foods = data.getJSONArray("food")
+                        if (foods.length() > 0) rxBus.send(EventNSClientNewLog("DATA", "received " + foods.length() + " foods"))
+                        dataWorker.enqueue(
+                            OneTimeWorkRequest.Builder(FoodWorker::class.java)
+                                .setInputData(dataWorker.storeInputData(foods, null))
+                                .build())
+                    }
+                    if (data.has("mbgs")) {
+                        val mbgArray = data.getJSONArray("mbgs")
+                        if (mbgArray.length() > 0) rxBus.send(EventNSClientNewLog("DATA", "received " + mbgArray.length() + " mbgs"))
+                        dataWorker.enqueue(
+                            OneTimeWorkRequest.Builder(NSClientMbgWorker::class.java)
+                                .setInputData(dataWorker.storeInputData(mbgArray, null))
+                                .build())
+                    }
+                    if (data.has("cals")) {
+                        val cals = data.getJSONArray("cals")
+                        if (cals.length() > 0) rxBus.send(EventNSClientNewLog("DATA", "received " + cals.length() + " cals"))
+                        // Calibrations ignored
+                    }
+                    if (data.has("sgvs")) {
+                        val sgvs = data.getJSONArray("sgvs")
+                        if (sgvs.length() > 0) rxBus.send(EventNSClientNewLog("DATA", "received " + sgvs.length() + " sgvs"))
+                        dataWorker.enqueue(OneTimeWorkRequest.Builder(NSClientSourceWorker::class.java)
+                            .setInputData(dataWorker.storeInputData(sgvs, null))
+                            .build())
+                        val splitted = splitArray(sgvs)
+                        if (sp.getBoolean(R.string.key_nsclient_localbroadcasts, false)) {
+                            for (part in splitted) {
+                                val bundle = Bundle()
+                                bundle.putString("sgvs", part.toString())
+                                bundle.putBoolean("delta", isDelta)
+                                val intent = Intent(Intents.ACTION_NEW_SGV)
+                                intent.putExtras(bundle)
+                                intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
+                                sendBroadcast(intent)
+                            }
+                        }
+                    }
+                    rxBus.send(EventNSClientNewLog("LAST", dateUtil.dateAndTimeString(latestDateInReceivedData)))
+                } catch (e: JSONException) {
+                    aapsLogger.error("Unhandled exception", e)
+                }
+                //rxBus.send(new EventNSClientNewLog("NSCLIENT", "onDataUpdate end");
+            } finally {
+                // if (wakeLock.isHeld) wakeLock.release()
+            }
+        }
+    }
+
+    fun dbUpdate(collection: String, _id: String?, data: JSONObject?, originalObject: Any, progress: String) {
+        try {
+            if (_id == null) return
+            if (!isConnected || !hasWriteAuth) return
+            val message = JSONObject()
+            message.put("collection", collection)
+            message.put("_id", _id)
+            message.put("data", data)
+            socket?.emit("dbUpdate", message, NSUpdateAck("dbUpdate", _id, aapsLogger, rxBus, originalObject))
+            rxBus.send(EventNSClientNewLog("DBUPDATE $collection", "Sent " + originalObject.javaClass.simpleName + " " + _id + " " + progress))
+        } catch (e: JSONException) {
+            aapsLogger.error("Unhandled exception", e)
+        }
+    }
+
+    fun dbAdd(collection: String, data: JSONObject, originalObject: Any, progress: String) {
+        try {
+            if (!isConnected || !hasWriteAuth) return
+            val message = JSONObject()
+            message.put("collection", collection)
+            message.put("data", data)
+            socket?.emit("dbAdd", message, NSAddAck(aapsLogger, rxBus, originalObject))
+            rxBus.send(EventNSClientNewLog("DBADD $collection", "Sent " + originalObject.javaClass.simpleName + " " + data + " " + progress))
+        } catch (e: JSONException) {
+            aapsLogger.error("Unhandled exception", e)
+        }
+    }
+
+    fun sendAlarmAck(alarmAck: AlarmAck) {
+        if (!isConnected || !hasWriteAuth) return
+        socket?.emit("ack", alarmAck.level, alarmAck.group, alarmAck.silenceTime)
+        rxBus.send(EventNSClientNewLog("ALARMACK ", alarmAck.level.toString() + " " + alarmAck.group + " " + alarmAck.silenceTime))
+    }
+
+    fun resend(reason: String) {
+        if (!isConnected || !hasWriteAuth) return
+        handler?.post {
+            if (socket?.connected() != true) return@post
+            if (lastAckTime > System.currentTimeMillis() - 10 * 1000L) {
+                aapsLogger.debug(LTag.NSCLIENT, "Skipping resend by lastAckTime: " + (System.currentTimeMillis() - lastAckTime) / 1000L + " sec")
+                return@post
+            }
+            // val powerManager = getSystemService(POWER_SERVICE) as PowerManager
+            // val wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK,
+            //     "AndroidAPS:NSClientService_onDataUpdate")
+            // wakeLock.acquire(mins(10).msecs())
+            try {
+                rxBus.send(EventNSClientNewLog("QUEUE", "Resend started: $reason"))
+                dataSyncSelector.doUpload()
+                rxBus.send(EventNSClientNewLog("QUEUE", "Resend ended: $reason"))
+            } finally {
+                // if (wakeLock.isHeld) wakeLock.release()
+            }
+        }
+    }
+
+    fun restart() {
+        destroy()
+        initialize()
+    }
+
+    private fun handleAnnouncement(announcement: JSONObject) {
+        val defaultVal = config.NSCLIENT
+        if (sp.getBoolean(R.string.key_ns_announcements, defaultVal)) {
+            val nsAlarm = NSAlarm(announcement)
+            val notification: Notification = NotificationWithAction(injector, nsAlarm)
+            rxBus.send(EventNewNotification(notification))
+            rxBus.send(EventNSClientNewLog("ANNOUNCEMENT", safeGetString(announcement, "message", "received")))
+            aapsLogger.debug(LTag.NSCLIENT, announcement.toString())
+        }
+    }
+
+    private fun handleAlarm(alarm: JSONObject) {
+        val defaultVal = config.NSCLIENT
+        if (sp.getBoolean(R.string.key_ns_alarms, defaultVal)) {
+            val snoozedTo = sp.getLong(R.string.key_snoozedTo, 0L)
+            if (snoozedTo == 0L || System.currentTimeMillis() > snoozedTo) {
+                val nsAlarm = NSAlarm(alarm)
+                val notification: Notification = NotificationWithAction(injector, nsAlarm)
+                rxBus.send(EventNewNotification(notification))
+            }
+            rxBus.send(EventNSClientNewLog("ALARM", safeGetString(alarm, "message", "received")))
+            aapsLogger.debug(LTag.NSCLIENT, alarm.toString())
+        }
+    }
+
+    private fun handleUrgentAlarm(alarm: JSONObject) {
+        val defaultVal = config.NSCLIENT
+        if (sp.getBoolean(R.string.key_ns_alarms, defaultVal)) {
+            val snoozedTo = sp.getLong(R.string.key_snoozedTo, 0L)
+            if (snoozedTo == 0L || System.currentTimeMillis() > snoozedTo) {
+                val nsAlarm = NSAlarm(alarm)
+                val notification: Notification = NotificationWithAction(injector, nsAlarm)
+                rxBus.send(EventNewNotification(notification))
+            }
+            rxBus.send(EventNSClientNewLog("URGENTALARM", safeGetString(alarm, "message", "received")))
+            aapsLogger.debug(LTag.NSCLIENT, alarm.toString())
+        }
+    }
+
+    private fun splitArray(array: JSONArray): List<JSONArray> {
+        var ret: MutableList<JSONArray> = ArrayList()
+        try {
+            val size = array.length()
+            var count = 0
+            var newarr: JSONArray? = null
+            for (i in 0 until size) {
+                if (count == 0) {
+                    if (newarr != null) ret.add(newarr)
+                    newarr = JSONArray()
+                    count = 20
+                }
+                newarr?.put(array[i])
+                --count
+            }
+            if (newarr != null && newarr.length() > 0) ret.add(newarr)
+        } catch (e: JSONException) {
+            aapsLogger.error("Unhandled exception", e)
+            ret = ArrayList()
+            ret.add(array)
+        }
+        return ret
+    }
+
+    init {
+        if (handler == null) {
+            val handlerThread = HandlerThread(NSClientService::class.java.simpleName + "Handler")
+            handlerThread.start()
+            handler = Handler(handlerThread.looper)
+        }
+    }
+}

app/src/main/java/info/nightscout/androidaps/plugins/general/openhumans/OpenHumansUploader.kt

@@ -28,8 +28,7 @@ import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
-import info.nightscout.androidaps.utils.extensions.toConstant
+import info.nightscout.androidaps.extensions.toConstant
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.androidaps.utils.sharedPreferences.SP
@@ -61,7 +60,6 @@ class OpenHumansUploader @Inject constructor(
     private val sp: SP,
     private val rxBus: RxBusWrapper,
     private val context: Context,
-    private val treatmentsPlugin: TreatmentsPlugin,
     private val databaseHelper: DatabaseHelperInterface,
     val repository: AppRepository
 ) : PluginBase(
@@ -180,24 +178,24 @@ class OpenHumansUploader @Inject constructor(
         }
     }
 
-    @JvmOverloads
-    fun enqueueTreatment(treatment: Treatment?, deleted: Boolean = false) = treatment?.let {
-        insertQueueItem("Treatments") {
-            put("date", treatment.date)
-            put("isValid", treatment.isValid)
-            put("source", treatment.source)
-            put("nsId", treatment._id)
-            put("boluscalc", treatment.boluscalc)
-            put("carbs", treatment.carbs)
-            put("dia", treatment.dia)
-            put("insulin", treatment.insulin)
-            put("insulinInterfaceID", treatment.insulinInterfaceID)
-            put("isSMB", treatment.isSMB)
-            put("mealBolus", treatment.mealBolus)
-            put("bolusCalcJson", treatment.getBoluscalc())
-            put("isDeletion", deleted)
-        }
-    }
+    // @JvmOverloads
+    // fun enqueueTreatment(treatment: Treatment?, deleted: Boolean = false) = treatment?.let {
+    //     insertQueueItem("Treatments") {
+    //         put("date", treatment.date)
+    //         put("isValid", treatment.isValid)
+    //         put("source", treatment.source)
+    //         put("nsId", treatment._id)
+    //         put("boluscalc", treatment.boluscalc)
+    //         put("carbs", treatment.carbs)
+    //         put("dia", treatment.dia)
+    //         put("insulin", treatment.insulin)
+    //         put("insulinInterfaceID", treatment.insulinInterfaceID)
+    //         put("isSMB", treatment.isSMB)
+    //         put("mealBolus", treatment.mealBolus)
+    //         put("bolusCalcJson", treatment.getBoluscalc())
+    //         put("isDeletion", deleted)
+    //     }
+    // }
 
     @JvmOverloads
     fun enqueueTherapyEvent(therapyEvent: TherapyEvent, deleted: Boolean = false) = insertQueueItem("TherapyEvents") {
@@ -212,56 +210,56 @@ class OpenHumansUploader @Inject constructor(
         put("isDeletion", deleted)
     }
 
-    @JvmOverloads
-    fun enqueueExtendedBolus(extendedBolus: ExtendedBolus, deleted: Boolean = false) = insertQueueItem("ExtendedBoluses") {
-        put("date", extendedBolus.date)
-        put("isValid", extendedBolus.isValid)
-        put("source", extendedBolus.source)
-        put("nsId", extendedBolus._id)
-        put("pumpId", extendedBolus.pumpId)
-        put("insulin", extendedBolus.insulin)
-        put("durationInMinutes", extendedBolus.durationInMinutes)
-        put("isDeletion", deleted)
-    }
+    // @JvmOverloads
+    // fun enqueueExtendedBolus(extendedBolus: ExtendedBolus, deleted: Boolean = false) = insertQueueItem("ExtendedBoluses") {
+    //     put("date", extendedBolus.date)
+    //     put("isValid", extendedBolus.isValid)
+    //     put("source", extendedBolus.source)
+    //     put("nsId", extendedBolus._id)
+    //     put("pumpId", extendedBolus.pumpId)
+    //     put("insulin", extendedBolus.insulin)
+    //     put("durationInMinutes", extendedBolus.durationInMinutes)
+    //     put("isDeletion", deleted)
+    // }
 
-    @JvmOverloads
-    fun enqueueProfileSwitch(profileSwitch: ProfileSwitch, deleted: Boolean = false) = insertQueueItem("ProfileSwitches") {
-        put("date", profileSwitch.date)
-        put("isValid", profileSwitch.isValid)
-        put("source", profileSwitch.source)
-        put("nsId", profileSwitch._id)
-        put("isCPP", profileSwitch.isCPP)
-        put("timeshift", profileSwitch.timeshift)
-        put("percentage", profileSwitch.percentage)
-        put("profile", JSONObject(profileSwitch.profileJson))
-        put("profilePlugin", profileSwitch.profilePlugin)
-        put("durationInMinutes", profileSwitch.durationInMinutes)
-        put("isDeletion", deleted)
-    }
+    // @JvmOverloads
+    // fun enqueueProfileSwitch(profileSwitch: ProfileSwitch, deleted: Boolean = false) = insertQueueItem("ProfileSwitches") {
+    //     put("date", profileSwitch.date)
+    //     put("isValid", profileSwitch.isValid)
+    //     put("source", profileSwitch.source)
+    //     put("nsId", profileSwitch._id)
+    //     put("isCPP", profileSwitch.isCPP)
+    //     put("timeshift", profileSwitch.timeshift)
+    //     put("percentage", profileSwitch.percentage)
+    //     put("profile", JSONObject(profileSwitch.profileJson))
+    //     put("profilePlugin", profileSwitch.profilePlugin)
+    //     put("durationInMinutes", profileSwitch.durationInMinutes)
+    //     put("isDeletion", deleted)
+    // }
 
-    fun enqueueTotalDailyDose(tdd: TDD) = insertQueueItem("TotalDailyDoses") {
-        put("double", tdd.date)
-        put("double", tdd.bolus)
-        put("double", tdd.basal)
-        put("double", tdd.total)
-    }
+    // fun enqueueTotalDailyDose(tdd: TDD) = insertQueueItem("TotalDailyDoses") {
+    //     put("double", tdd.date)
+    //     put("double", tdd.bolus)
+    //     put("double", tdd.basal)
+    //     put("double", tdd.total)
+    // }
 
-    @JvmOverloads
-    fun enqueueTemporaryBasal(temporaryBasal: TemporaryBasal?, deleted: Boolean = false) = temporaryBasal?.let {
-        insertQueueItem("TemporaryBasals") {
-            put("date", temporaryBasal.date)
-            put("isValid", temporaryBasal.isValid)
-            put("source", temporaryBasal.source)
-            put("nsId", temporaryBasal._id)
-            put("pumpId", temporaryBasal.pumpId)
-            put("durationInMinutes", temporaryBasal.durationInMinutes)
-            put("durationInMinutes", temporaryBasal.durationInMinutes)
-            put("isAbsolute", temporaryBasal.isAbsolute)
-            put("percentRate", temporaryBasal.percentRate)
-            put("absoluteRate", temporaryBasal.absoluteRate)
-            put("isDeletion", deleted)
-        }
-    }
+    // @JvmOverloads
+    // fun enqueueTemporaryBasal(temporaryBasal: TemporaryBasal?, deleted: Boolean = false) = temporaryBasal?.let {
+    //     insertQueueItem("TemporaryBasals") {
+    //         put("date", temporaryBasal.date)
+    //         put("isValid", temporaryBasal.isValid)
+    //         put("source", temporaryBasal.source)
+    //         put("nsId", temporaryBasal._id)
+    //         put("pumpId", temporaryBasal.pumpId)
+    //         put("durationInMinutes", temporaryBasal.durationInMinutes)
+    //         put("durationInMinutes", temporaryBasal.durationInMinutes)
+    //         put("isAbsolute", temporaryBasal.isAbsolute)
+    //         put("percentRate", temporaryBasal.percentRate)
+    //         put("absoluteRate", temporaryBasal.absoluteRate)
+    //         put("isDeletion", deleted)
+    //     }
+    // }
 
     @JvmOverloads
     fun enqueueTempTarget(tempTarget: TemporaryTarget?, deleted: Boolean = false) = tempTarget?.let {
@@ -356,29 +354,29 @@ class OpenHumansUploader @Inject constructor(
             if (currentProgress % 1000L == 0L) showOngoingNotification(maxProgress, currentProgress)
         }
         copyDisposable = Completable.fromCallable { databaseHelper.clearOpenHumansQueue() }
-            .andThen(Single.defer { Single.just(databaseHelper.getCountOfAllRows() + treatmentsPlugin.service.count()) })
-            .doOnSuccess { maxProgress = it }
-            .flatMapObservable { Observable.defer { Observable.fromIterable(treatmentsPlugin.service.getTreatmentData()) } }
-            .map { enqueueTreatment(it); increaseCounter() }
-            .ignoreElements()
+//            .andThen(Single.defer { Single.just(databaseHelper.getCountOfAllRows() + treatmentsPlugin.service.count()) })
+//            .doOnSuccess { maxProgress = it }
+//            .flatMapObservable { Observable.defer { Observable.fromIterable(treatmentsPlugin.service.getTreatmentData()) } }
+//            .map { enqueueTreatment(it); increaseCounter() }
+//            .ignoreElements()
             .andThen(Observable.defer { Observable.fromIterable(repository.compatGetBgReadingsDataFromTime(0, true).blockingGet()) })
             .map { enqueueBGReading(it); increaseCounter() }
             .ignoreElements()
             .andThen(Observable.defer { Observable.fromIterable(repository.compatGetTherapyEventDataFromTime(0, true).blockingGet()) })
             .map { enqueueTherapyEvent(it); increaseCounter() }
             .ignoreElements()
-            .andThen(Observable.defer { Observable.fromIterable(databaseHelper.getAllExtendedBoluses()) })
-            .map { enqueueExtendedBolus(it); increaseCounter() }
-            .ignoreElements()
-            .andThen(Observable.defer { Observable.fromIterable(databaseHelper.getAllProfileSwitches()) })
-            .map { enqueueProfileSwitch(it); increaseCounter() }
-            .ignoreElements()
-            .andThen(Observable.defer { Observable.fromIterable(databaseHelper.getAllTDDs()) })
-            .map { enqueueTotalDailyDose(it); increaseCounter() }
-            .ignoreElements()
-            .andThen(Observable.defer { Observable.fromIterable(databaseHelper.getAllTemporaryBasals()) })
-            .map { enqueueTemporaryBasal(it); increaseCounter() }
-            .ignoreElements()
+//            .andThen(Observable.defer { Observable.fromIterable(databaseHelper.getAllExtendedBoluses()) })
+//            .map { enqueueExtendedBolus(it); increaseCounter() }
+//            .ignoreElements()
+//             .andThen(Observable.defer { Observable.fromIterable(databaseHelper.getAllProfileSwitches()) })
+//             .map { enqueueProfileSwitch(it); increaseCounter() }
+//             .ignoreElements()
+            // .andThen(Observable.defer { Observable.fromIterable(databaseHelper.getAllTDDs()) })
+            // .map { enqueueTotalDailyDose(it); increaseCounter() }
+            // .ignoreElements()
+            // .andThen(Observable.defer { Observable.fromIterable(databaseHelper.getAllTemporaryBasals()) })
+            // .map { enqueueTemporaryBasal(it); increaseCounter() }
+            // .ignoreElements()
             .andThen(Observable.defer { Observable.fromIterable(repository.compatGetTemporaryTargetData().blockingGet()) })
             .map { enqueueTempTarget(it); increaseCounter() }
             .ignoreElements()