diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index bf41126f8b..193c7c536d 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -4,6 +4,8 @@
+
+
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventNSClientNewLog.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventNSClientNewLog.kt
index c88bfec8b3..cc001a4517 100644
--- a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventNSClientNewLog.kt
+++ b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventNSClientNewLog.kt
@@ -15,7 +15,6 @@ class EventNSClientNewLog(val action: String, val logText: String?) : Event() {
stringBuilder.append(action)
stringBuilder.append(" ")
stringBuilder.append(logText)
- stringBuilder.append("
")
return stringBuilder
}
}
\ No newline at end of file
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventXdripNewLog.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventXdripNewLog.kt
new file mode 100644
index 0000000000..933db28162
--- /dev/null
+++ b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventXdripNewLog.kt
@@ -0,0 +1,21 @@
+package info.nightscout.rx.events
+
+import java.text.SimpleDateFormat
+import java.util.Locale
+
+class EventXdripNewLog(val action: String, val logText: String?) : Event() {
+ var date = System.currentTimeMillis()
+
+ private var timeFormat = SimpleDateFormat("HH:mm:ss", Locale.getDefault())
+
+ fun toPreparedHtml(): StringBuilder {
+ val stringBuilder = StringBuilder()
+ stringBuilder.append(timeFormat.format(date))
+ stringBuilder.append(" ")
+ stringBuilder.append(action)
+ stringBuilder.append(" ")
+ stringBuilder.append(logText)
+ stringBuilder.append("
")
+ return stringBuilder
+ }
+}
\ No newline at end of file
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/logging/LTag.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/logging/LTag.kt
index 87a10164a1..7b3d6546e2 100644
--- a/app-wear-shared/shared/src/main/java/info/nightscout/rx/logging/LTag.kt
+++ b/app-wear-shared/shared/src/main/java/info/nightscout/rx/logging/LTag.kt
@@ -28,5 +28,6 @@ enum class LTag(val tag: String, val defaultValue : Boolean = true, val requires
UI("UI", defaultValue = false),
WEAR("WEAR"),
WIDGET("WIDGET"),
- WORKER("WORKER")
+ WORKER("WORKER"),
+ XDRIP("XDRIP")
}
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index b7af93d7db..72f8d7cb18 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -111,7 +111,7 @@ android {
defaultConfig {
multiDexEnabled true
versionCode 1500
- version "3.1.0.3-dev-g"
+ version "3.1.0.3-dev-h"
buildConfigField "String", "VERSION", '"' + version + '"'
buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"'
buildConfigField "String", "REMOTE", '"' + generateGitRemote() + '"'
diff --git a/app/src/main/java/info/nightscout/androidaps/di/AppModule.kt b/app/src/main/java/info/nightscout/androidaps/di/AppModule.kt
index 5c38128af0..a02cf5afc2 100644
--- a/app/src/main/java/info/nightscout/androidaps/di/AppModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/di/AppModule.kt
@@ -34,14 +34,14 @@ open class AppModule {
@PluginsListModule.PumpDriver pumpDrivers: Lazy>,
@PluginsListModule.NotNSClient notNsClient: Lazy>,
@PluginsListModule.APS aps: Lazy>,
- @PluginsListModule.Unfinished unfinished: Lazy>
+ //@PluginsListModule.Unfinished unfinished: Lazy>
)
: List<@JvmSuppressWildcards PluginBase> {
val plugins = allConfigs.toMutableMap()
if (config.PUMPDRIVERS) plugins += pumpDrivers.get()
if (config.APS) plugins += aps.get()
if (!config.NSCLIENT) plugins += notNsClient.get()
- if (config.isUnfinishedMode()) plugins += unfinished.get()
+ //if (config.isUnfinishedMode()) plugins += unfinished.get()
return plugins.toList().sortedBy { it.first }.map { it.second }
}
diff --git a/app/src/main/java/info/nightscout/androidaps/di/PluginsListModule.kt b/app/src/main/java/info/nightscout/androidaps/di/PluginsListModule.kt
index 7e1b89f547..e300898224 100644
--- a/app/src/main/java/info/nightscout/androidaps/di/PluginsListModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/di/PluginsListModule.kt
@@ -318,7 +318,7 @@ abstract class PluginsListModule {
abstract fun bindNSClientV3Plugin(plugin: NSClientV3Plugin): PluginBase
@Binds
- @Unfinished
+ @NotNSClient
@IntoMap
@IntKey(360)
abstract fun bindTidepoolPlugin(plugin: TidepoolPlugin): PluginBase
diff --git a/app/src/main/java/info/nightscout/androidaps/implementations/ConfigImpl.kt b/app/src/main/java/info/nightscout/androidaps/implementations/ConfigImpl.kt
index b3354a1aeb..5c5a09f6a2 100644
--- a/app/src/main/java/info/nightscout/androidaps/implementations/ConfigImpl.kt
+++ b/app/src/main/java/info/nightscout/androidaps/implementations/ConfigImpl.kt
@@ -15,7 +15,7 @@ class ConfigImpl @Inject constructor(
fileListProvider: PrefFileListProvider
) : Config {
- override val SUPPORTED_NS_VERSION = 140206 // 14.2.6
+ override val SUPPORTED_NS_VERSION = 150000 // 15.0.0
override val APS = BuildConfig.FLAVOR == "full"
override val NSCLIENT = BuildConfig.FLAVOR == "aapsclient" || BuildConfig.FLAVOR == "aapsclient2"
override val PUMPCONTROL = BuildConfig.FLAVOR == "pumpcontrol"
diff --git a/app/src/main/java/info/nightscout/androidaps/workflow/WorkerClassesImpl.kt b/app/src/main/java/info/nightscout/androidaps/workflow/WorkerClassesImpl.kt
index 15553e045a..e55d4b8389 100644
--- a/app/src/main/java/info/nightscout/androidaps/workflow/WorkerClassesImpl.kt
+++ b/app/src/main/java/info/nightscout/androidaps/workflow/WorkerClassesImpl.kt
@@ -1,12 +1,9 @@
package info.nightscout.androidaps.workflow
import info.nightscout.interfaces.workflow.WorkerClasses
-import info.nightscout.plugins.profile.ProfilePlugin
-import info.nightscout.source.NSClientSourcePlugin
import javax.inject.Inject
-class WorkerClassesImpl @Inject constructor(): WorkerClasses{
+class WorkerClassesImpl @Inject constructor() : WorkerClasses {
- override val nsClientSourceWorker = NSClientSourcePlugin.NSClientSourceWorker::class.java
- override val nsProfileWorker = ProfilePlugin.NSProfileWorker::class.java
+ //override val nsProfileWorker = ProfilePlugin.NSProfileWorker::class.java
}
\ No newline at end of file
diff --git a/core/graph/src/test/java/info/nightscout/core/graph/data/InMemoryGlucoseValueDataPointTest.kt b/core/graph/src/test/java/info/nightscout/core/graph/data/InMemoryGlucoseValueDataPointTest.kt
index 489876a771..d3f54d1de5 100644
--- a/core/graph/src/test/java/info/nightscout/core/graph/data/InMemoryGlucoseValueDataPointTest.kt
+++ b/core/graph/src/test/java/info/nightscout/core/graph/data/InMemoryGlucoseValueDataPointTest.kt
@@ -2,6 +2,7 @@ package info.nightscout.core.graph.data
import android.content.Context
import android.graphics.Color
+import info.nightscout.database.entities.GlucoseValue
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.interfaces.iob.InMemoryGlucoseValue
import info.nightscout.interfaces.profile.DefaultValueHelper
@@ -35,7 +36,7 @@ internal class InMemoryGlucoseValueDataPointTest {
}
@Test
fun alphaShouldBeAddedForFilledGaps() {
- val gv = InMemoryGlucoseValue(1000, 100.0)
+ val gv = InMemoryGlucoseValue(1000, 100.0, sourceSensor = GlucoseValue.SourceSensor.UNKNOWN)
val sut = InMemoryGlucoseValueDataPoint(gv, defaultValueHelper, profileFunction, rh)
var alpha = sut.color(context).ushr(24)
diff --git a/core/interfaces/src/main/java/info/nightscout/interfaces/XDripBroadcast.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/XDripBroadcast.kt
index e76c7df808..33d5e16aeb 100644
--- a/core/interfaces/src/main/java/info/nightscout/interfaces/XDripBroadcast.kt
+++ b/core/interfaces/src/main/java/info/nightscout/interfaces/XDripBroadcast.kt
@@ -1,18 +1,6 @@
package info.nightscout.interfaces
-import info.nightscout.database.entities.Bolus
-import info.nightscout.database.entities.Carbs
-import info.nightscout.database.entities.DeviceStatus
-import info.nightscout.database.entities.EffectiveProfileSwitch
-import info.nightscout.database.entities.ExtendedBolus
-import info.nightscout.database.entities.GlucoseValue
-import info.nightscout.database.entities.OfflineEvent
-import info.nightscout.database.entities.ProfileSwitch
-import info.nightscout.database.entities.TemporaryBasal
-import info.nightscout.database.entities.TemporaryTarget
-import info.nightscout.database.entities.TherapyEvent
-import org.json.JSONArray
-import org.json.JSONObject
+import info.nightscout.interfaces.sync.DataSyncSelector
/**
* Send data to xDrip+ via Inter-app settings
@@ -24,64 +12,19 @@ interface XDripBroadcast {
* Accepting must be enabled in Inter-app settings - Accept Calibrations
*/
fun sendCalibration(bg: Double): Boolean
- fun sendIn640gMode(glucoseValue: GlucoseValue)
- fun sendProfile(profileStoreJson: JSONObject)
- fun sendTreatments(addedOrUpdatedTreatments: JSONArray)
- fun sendSgvs(sgvs: JSONArray)
/**
* Send data to xDrip+
- * Accepting must be enabled in Inter-app settings - Accept Glucose
+ *
+ * Accepting must be enabled in Inter-app settings - Accept Glucose/Treatments
*/
- fun send(gv: GlucoseValue)
+ fun sendToXdrip(collection: String, dataPair: DataSyncSelector.DataPair, progress: String)
+
/**
* Send data to xDrip+
- * Accepting must be enabled in Inter-app settings - Accept treatments
+ *
+ * Accepting must be enabled in Inter-app settings - Accept Glucose/Treatments
*/
- fun send(bolus: Bolus)
- /**
- * Send data to xDrip+
- * Accepting must be enabled in Inter-app settings - Accept treatments
- */
- fun send(carbs: Carbs)
- /**
- * Send data to xDrip+
- * Accepting must be enabled in Inter-app settings - Accept treatments
- */
- fun send(tt: TemporaryTarget)
- /**
- * Send data to xDrip+
- * Accepting must be enabled in Inter-app settings - Accept treatments
- */
- fun send(te: TherapyEvent)
- /**
- * Send data to xDrip+
- * Accepting must be enabled in Inter-app settings - Accept treatments
- */
- fun send(deviceStatus: DeviceStatus)
- /**
- * Send data to xDrip+
- * Accepting must be enabled in Inter-app settings - Accept treatments
- */
- fun send(tb: TemporaryBasal)
- /**
- * Send data to xDrip+
- * Accepting must be enabled in Inter-app settings - Accept treatments
- */
- fun send(eb: ExtendedBolus)
- /**
- * Send data to xDrip+
- * Accepting must be enabled in Inter-app settings - Accept treatments
- */
- fun send(ps: ProfileSwitch)
- /**
- * Send data to xDrip+
- * Accepting must be enabled in Inter-app settings - Accept treatments
- */
- fun send(ps: EffectiveProfileSwitch)
- /**
- * Send data to xDrip+
- * Accepting must be enabled in Inter-app settings - Accept treatments
- */
- fun send(ps: OfflineEvent)
+ fun sendToXdrip(collection: String, dataPairs: List, progress:
+ String)
}
\ No newline at end of file
diff --git a/core/interfaces/src/main/java/info/nightscout/interfaces/nsclient/StoreDataForDb.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/nsclient/StoreDataForDb.kt
index 216f81f856..15b548a380 100644
--- a/core/interfaces/src/main/java/info/nightscout/interfaces/nsclient/StoreDataForDb.kt
+++ b/core/interfaces/src/main/java/info/nightscout/interfaces/nsclient/StoreDataForDb.kt
@@ -47,4 +47,5 @@ interface StoreDataForDb {
fun storeGlucoseValuesToDb()
fun storeFoodsToDb()
fun scheduleNsIdUpdate()
+ fun updateNsIds()
}
\ No newline at end of file
diff --git a/core/interfaces/src/main/java/info/nightscout/interfaces/profile/ProfileSource.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/profile/ProfileSource.kt
index d9127342f7..207bdfbc9f 100644
--- a/core/interfaces/src/main/java/info/nightscout/interfaces/profile/ProfileSource.kt
+++ b/core/interfaces/src/main/java/info/nightscout/interfaces/profile/ProfileSource.kt
@@ -36,5 +36,6 @@ interface ProfileSource {
var currentProfileIndex: Int
fun currentProfile(): SingleProfile?
fun storeSettings(activity: FragmentActivity? = null, emptyCreated: Boolean = false)
+ fun loadFromStore(store: ProfileStore)
}
\ No newline at end of file
diff --git a/core/interfaces/src/main/java/info/nightscout/interfaces/receivers/Intents.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/receivers/Intents.kt
index ad058a5af0..e9ee19fd85 100644
--- a/core/interfaces/src/main/java/info/nightscout/interfaces/receivers/Intents.kt
+++ b/core/interfaces/src/main/java/info/nightscout/interfaces/receivers/Intents.kt
@@ -8,6 +8,8 @@ interface Intents {
// AAPS -> Xdrip
const val ACTION_NEW_TREATMENT = "info.nightscout.client.NEW_TREATMENT"
const val ACTION_NEW_PROFILE = "info.nightscout.client.NEW_PROFILE"
+ const val ACTION_NEW_DEVICE_STATUS = "info.nightscout.client.NEW_DEVICESTATUS"
+ const val ACTION_NEW_FOOD = "info.nightscout.client.NEW_FOOD"
const val ACTION_NEW_SGV = "info.nightscout.client.NEW_SGV"
const val EXTRA_STATUSLINE = "com.eveningoutpost.dexdrip.Extras.Statusline"
diff --git a/core/interfaces/src/main/java/info/nightscout/interfaces/sync/DataSyncSelector.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/sync/DataSyncSelector.kt
index 34455ff5b3..9de3739d17 100644
--- a/core/interfaces/src/main/java/info/nightscout/interfaces/sync/DataSyncSelector.kt
+++ b/core/interfaces/src/main/java/info/nightscout/interfaces/sync/DataSyncSelector.kt
@@ -17,70 +17,30 @@ import org.json.JSONObject
interface DataSyncSelector {
- interface DataPair {
+ interface DataPair {
+
val value: Any
val id: Long
}
- data class PairTemporaryTarget(override val value: TemporaryTarget, override val id: Long): DataPair
- data class PairGlucoseValue(override val value: GlucoseValue, override val id: Long): DataPair
- data class PairTherapyEvent(override val value: TherapyEvent, override val id: Long): DataPair
- data class PairFood(override val value: Food, override val id: Long): DataPair
- data class PairBolus(override val value: Bolus, override val id: Long): DataPair
- data class PairCarbs(override val value: Carbs, override val id: Long): DataPair
- data class PairBolusCalculatorResult(override val value: BolusCalculatorResult, override val id: Long): DataPair
- data class PairTemporaryBasal(override val value: TemporaryBasal, override val id: Long): DataPair
- data class PairExtendedBolus(override val value: ExtendedBolus, override val id: Long): DataPair
- data class PairProfileSwitch(override val value: ProfileSwitch, override val id: Long): DataPair
- data class PairEffectiveProfileSwitch(override val value: EffectiveProfileSwitch, override val id: Long): DataPair
- data class PairOfflineEvent(override val value: OfflineEvent, override val id: Long): DataPair
- data class PairProfileStore(override val value: JSONObject, override val id: Long): DataPair
- data class PairDeviceStatus(override val value: DeviceStatus, override val id: Long): DataPair
+
+ data class PairTemporaryTarget(override val value: TemporaryTarget, override val id: Long) : DataPair
+ data class PairGlucoseValue(override val value: GlucoseValue, override val id: Long) : DataPair
+ data class PairTherapyEvent(override val value: TherapyEvent, override val id: Long) : DataPair
+ data class PairFood(override val value: Food, override val id: Long) : DataPair
+ data class PairBolus(override val value: Bolus, override val id: Long) : DataPair
+ data class PairCarbs(override val value: Carbs, override val id: Long) : DataPair
+ data class PairBolusCalculatorResult(override val value: BolusCalculatorResult, override val id: Long) : DataPair
+ data class PairTemporaryBasal(override val value: TemporaryBasal, override val id: Long) : DataPair
+ data class PairExtendedBolus(override val value: ExtendedBolus, override val id: Long) : DataPair
+ data class PairProfileSwitch(override val value: ProfileSwitch, override val id: Long) : DataPair
+ data class PairEffectiveProfileSwitch(override val value: EffectiveProfileSwitch, override val id: Long) : DataPair
+ data class PairOfflineEvent(override val value: OfflineEvent, override val id: Long) : DataPair
+ data class PairProfileStore(override val value: JSONObject, override val id: Long) : DataPair
+ data class PairDeviceStatus(override val value: DeviceStatus, override val id: Long) : DataPair
fun queueSize(): Long
- fun doUpload()
-
fun resetToNextFullSync()
- fun confirmLastBolusIdIfGreater(lastSynced: Long)
- fun processChangedBoluses()
-
- fun confirmLastCarbsIdIfGreater(lastSynced: Long)
- fun processChangedCarbs()
-
- fun confirmLastBolusCalculatorResultsIdIfGreater(lastSynced: Long)
- fun processChangedBolusCalculatorResults()
-
- fun confirmLastTempTargetsIdIfGreater(lastSynced: Long)
- fun processChangedTempTargets()
-
- fun confirmLastGlucoseValueIdIfGreater(lastSynced: Long)
- fun processChangedGlucoseValues()
-
- fun confirmLastTherapyEventIdIfGreater(lastSynced: Long)
- fun processChangedTherapyEvents()
-
- fun confirmLastFoodIdIfGreater(lastSynced: Long)
- fun processChangedFoods()
-
- fun confirmLastDeviceStatusIdIfGreater(lastSynced: Long)
- fun processChangedDeviceStatuses()
-
- fun confirmLastTemporaryBasalIdIfGreater(lastSynced: Long)
- fun processChangedTemporaryBasals()
-
- fun confirmLastExtendedBolusIdIfGreater(lastSynced: Long)
- fun processChangedExtendedBoluses()
-
- fun confirmLastProfileSwitchIdIfGreater(lastSynced: Long)
- fun processChangedProfileSwitches()
-
- fun confirmLastEffectiveProfileSwitchIdIfGreater(lastSynced: Long)
- fun processChangedEffectiveProfileSwitches()
-
- fun confirmLastOfflineEventIdIfGreater(lastSynced: Long)
- fun processChangedOfflineEvents()
-
- fun confirmLastProfileStore(lastSynced: Long)
- fun processChangedProfileStore()
+ suspend fun doUpload()
}
\ No newline at end of file
diff --git a/core/interfaces/src/main/java/info/nightscout/interfaces/sync/DataSyncSelectorV1.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/sync/DataSyncSelectorV1.kt
new file mode 100644
index 0000000000..f70d0a6aa3
--- /dev/null
+++ b/core/interfaces/src/main/java/info/nightscout/interfaces/sync/DataSyncSelectorV1.kt
@@ -0,0 +1,46 @@
+package info.nightscout.interfaces.sync
+
+interface DataSyncSelectorV1 : DataSyncSelector {
+
+ fun confirmLastBolusIdIfGreater(lastSynced: Long)
+ suspend fun processChangedBoluses()
+
+ fun confirmLastCarbsIdIfGreater(lastSynced: Long)
+ suspend fun processChangedCarbs()
+
+ fun confirmLastBolusCalculatorResultsIdIfGreater(lastSynced: Long)
+ suspend fun processChangedBolusCalculatorResults()
+
+ fun confirmLastTempTargetsIdIfGreater(lastSynced: Long)
+ suspend fun processChangedTempTargets()
+
+ fun confirmLastGlucoseValueIdIfGreater(lastSynced: Long)
+ suspend fun processChangedGlucoseValues()
+
+ fun confirmLastTherapyEventIdIfGreater(lastSynced: Long)
+ suspend fun processChangedTherapyEvents()
+
+ fun confirmLastFoodIdIfGreater(lastSynced: Long)
+ suspend fun processChangedFoods()
+
+ fun confirmLastDeviceStatusIdIfGreater(lastSynced: Long)
+ suspend fun processChangedDeviceStatuses()
+
+ fun confirmLastTemporaryBasalIdIfGreater(lastSynced: Long)
+ suspend fun processChangedTemporaryBasals()
+
+ fun confirmLastExtendedBolusIdIfGreater(lastSynced: Long)
+ suspend fun processChangedExtendedBoluses()
+
+ fun confirmLastProfileSwitchIdIfGreater(lastSynced: Long)
+ suspend fun processChangedProfileSwitches()
+
+ fun confirmLastEffectiveProfileSwitchIdIfGreater(lastSynced: Long)
+ suspend fun processChangedEffectiveProfileSwitches()
+
+ fun confirmLastOfflineEventIdIfGreater(lastSynced: Long)
+ suspend fun processChangedOfflineEvents()
+
+ fun confirmLastProfileStore(lastSynced: Long)
+ suspend fun processChangedProfileStore()
+}
\ No newline at end of file
diff --git a/core/interfaces/src/main/java/info/nightscout/interfaces/sync/DataSyncSelectorV3.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/sync/DataSyncSelectorV3.kt
new file mode 100644
index 0000000000..90e9c77044
--- /dev/null
+++ b/core/interfaces/src/main/java/info/nightscout/interfaces/sync/DataSyncSelectorV3.kt
@@ -0,0 +1,3 @@
+package info.nightscout.interfaces.sync
+
+interface DataSyncSelectorV3 : DataSyncSelector
diff --git a/core/interfaces/src/main/java/info/nightscout/interfaces/sync/DataSyncSelectorXdrip.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/sync/DataSyncSelectorXdrip.kt
new file mode 100644
index 0000000000..f25fd61207
--- /dev/null
+++ b/core/interfaces/src/main/java/info/nightscout/interfaces/sync/DataSyncSelectorXdrip.kt
@@ -0,0 +1,3 @@
+package info.nightscout.interfaces.sync
+
+interface DataSyncSelectorXdrip : DataSyncSelector
\ No newline at end of file
diff --git a/core/interfaces/src/main/java/info/nightscout/interfaces/sync/NsClient.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/sync/NsClient.kt
index 51eae086c7..d60523ad05 100644
--- a/core/interfaces/src/main/java/info/nightscout/interfaces/sync/NsClient.kt
+++ b/core/interfaces/src/main/java/info/nightscout/interfaces/sync/NsClient.kt
@@ -1,7 +1,7 @@
package info.nightscout.interfaces.sync
-import android.text.Spanned
import info.nightscout.interfaces.nsclient.NSAlarm
+import info.nightscout.rx.events.EventNSClientNewLog
/**
* Plugin providing communication with Nightscout server
@@ -24,14 +24,14 @@ interface NsClient : Sync {
fun resend(reason: String)
/**
- * @return List last of messages for fragment in HTML format
+ * List of log messages for fragment
*/
- fun textLog(): Spanned
+ val listLog: MutableList
/**
- * Clear list of stored messages displayed in fragment
+ * Used data sync selector
*/
- fun clearLog()
+ val dataSyncSelector: DataSyncSelector
/**
* Version of NS server
@@ -89,8 +89,9 @@ interface NsClient : Sync {
* @param collection target ns collection
* @param dataPair data to upload (data.first) and id of changed record (data.second)
* @param progress progress of sync in format "number/number". Only for display in fragment
+ * @return true for successful upload
*/
- fun nsAdd(collection: String, dataPair: DataSyncSelector.DataPair, progress: String)
+ suspend fun nsAdd(collection: String, dataPair: DataSyncSelector.DataPair, progress: String): Boolean
/**
* Upload updated record to NS
@@ -98,6 +99,7 @@ interface NsClient : Sync {
* @param collection target ns collection
* @param dataPair data to upload (data.first) and id of changed record (data.second)
* @param progress progress of sync in format "number/number". Only for display in fragment
+ * @return true for successful upload
*/
- fun nsUpdate(collection: String, dataPair: DataSyncSelector.DataPair, progress: String)
+ suspend fun nsUpdate(collection: String, dataPair: DataSyncSelector.DataPair, progress: String): Boolean
}
\ No newline at end of file
diff --git a/core/interfaces/src/main/java/info/nightscout/interfaces/workflow/WorkerClasses.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/workflow/WorkerClasses.kt
index 1c8a98e7b4..d09fb3e2ac 100644
--- a/core/interfaces/src/main/java/info/nightscout/interfaces/workflow/WorkerClasses.kt
+++ b/core/interfaces/src/main/java/info/nightscout/interfaces/workflow/WorkerClasses.kt
@@ -1,8 +1,5 @@
package info.nightscout.interfaces.workflow
-import androidx.work.ListenableWorker
-
interface WorkerClasses {
- val nsClientSourceWorker: Class
- val nsProfileWorker: Class
+// val nsProfileWorker: Class
}
\ No newline at end of file
diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/NSAndroidClientImpl.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/NSAndroidClientImpl.kt
index e56b3ae64f..7f8c934aa2 100644
--- a/core/ns-sdk/src/main/java/info/nightscout/sdk/NSAndroidClientImpl.kt
+++ b/core/ns-sdk/src/main/java/info/nightscout/sdk/NSAndroidClientImpl.kt
@@ -119,7 +119,11 @@ class NSAndroidClientImpl(
val response = api.getSgvs()
if (response.isSuccessful) {
- return@callWrapper NSAndroidClient.ReadResponse(code = response.raw().networkResponse?.code ?: response.code(), lastServerModified = 0, values = response.body()?.result?.map(RemoteEntry::toSgv).toNotNull())
+ return@callWrapper NSAndroidClient.ReadResponse(
+ code = response.raw().networkResponse?.code ?: response.code(),
+ lastServerModified = 0,
+ values = response.body()?.result?.map(RemoteEntry::toSgv).toNotNull()
+ )
} else if (response.code() in 400..499)
throw InvalidParameterNightscoutException(response.errorBody()?.string() ?: response.message())
else
@@ -132,7 +136,11 @@ class NSAndroidClientImpl(
if (response.isSuccessful) {
val eTagString = response.headers()["ETag"]
val eTag = eTagString?.substring(3, eTagString.length - 1)?.toLong()
- return@callWrapper NSAndroidClient.ReadResponse(code = response.raw().networkResponse?.code ?: response.code(), lastServerModified = eTag, values = response.body()?.result?.map(RemoteEntry::toSgv).toNotNull())
+ return@callWrapper NSAndroidClient.ReadResponse(
+ code = response.raw().networkResponse?.code ?: response.code(),
+ lastServerModified = eTag,
+ values = response.body()?.result?.map(RemoteEntry::toSgv).toNotNull()
+ )
} else if (response.code() in 400..499)
throw InvalidParameterNightscoutException(response.errorBody()?.string() ?: response.message())
else
@@ -143,39 +151,37 @@ class NSAndroidClientImpl(
val response = api.getSgvsNewerThan(from, limit)
if (response.isSuccessful) {
- return@callWrapper NSAndroidClient.ReadResponse(code = response.raw().networkResponse?.code ?: response.code(), lastServerModified = 0, values = response.body()?.result?.map(RemoteEntry::toSgv).toNotNull())
+ return@callWrapper NSAndroidClient.ReadResponse(
+ code = response.raw().networkResponse?.code ?: response.code(),
+ lastServerModified = 0,
+ values = response.body()?.result?.map(RemoteEntry::toSgv).toNotNull()
+ )
} else if (response.code() in 400..499)
throw InvalidParameterNightscoutException(response.errorBody()?.string() ?: response.message())
else
throw UnsuccessfullNightscoutException()
}
- override suspend fun createSvg(nsSgvV3: NSSgvV3): CreateUpdateResponse = callWrapper(dispatcher) {
+ override suspend fun createSgv(nsSgvV3: NSSgvV3): CreateUpdateResponse = callWrapper(dispatcher) {
val remoteEntry = nsSgvV3.toRemoteEntry()
remoteEntry.app = "AAPS"
val response = api.createEntry(remoteEntry)
val responseBody = response.body()
val errorResponse = response.errorBody()?.string()
- if (response.code() == 200) {
+ if (response.code() == 200 || response.code() == 201) {
return@callWrapper CreateUpdateResponse(
response = response.code(),
- identifier = null,
- isDeduplication = true
- )
- } else if (response.code() == 201) {
- return@callWrapper CreateUpdateResponse(
- response = response.code(),
- identifier = responseBody?.result?.identifier,
- isDeduplication = responseBody?.result?.isDeduplication ?: false,
- deduplicatedIdentifier = responseBody?.result?.deduplicatedIdentifier,
- lastModified = responseBody?.result?.lastModified
+ identifier = responseBody?.identifier,
+ isDeduplication = responseBody?.isDeduplication ?: false,
+ deduplicatedIdentifier = responseBody?.deduplicatedIdentifier,
+ lastModified = responseBody?.lastModified
)
} else if (response.code() == 400 && errorResponse?.contains("Bad or missing utcOffset field") == true && nsSgvV3.utcOffset != 0L) {
// Record can be originally uploaded without utcOffset
// because utcOffset is mandatory and cannot be change, try 0
nsSgvV3.utcOffset = 0
- return@callWrapper createSvg(nsSgvV3)
+ return@callWrapper createSgv(nsSgvV3)
} else if (response.code() == 400 && errorResponse?.contains("cannot be modified by the client") == true) {
// there is different field to field in AAPS
// not possible to upload
@@ -234,7 +240,11 @@ class NSAndroidClientImpl(
val response = api.getTreatmentsNewerThan(createdAt, limit)
if (response.isSuccessful) {
- return@callWrapper NSAndroidClient.ReadResponse(code = response.raw().networkResponse?.code ?: response.code(), lastServerModified = 0, values = response.body()?.result?.map(RemoteTreatment::toTreatment).toNotNull())
+ return@callWrapper NSAndroidClient.ReadResponse(
+ code = response.raw().networkResponse?.code ?: response.code(),
+ lastServerModified = 0,
+ values = response.body()?.result?.map(RemoteTreatment::toTreatment).toNotNull()
+ )
} else if (response.code() in 400..499)
throw InvalidParameterNightscoutException(response.errorBody()?.string() ?: response.message())
else
@@ -273,22 +283,13 @@ class NSAndroidClientImpl(
nsDeviceStatus.app = "AAPS"
val response = api.createDeviceStatus(nsDeviceStatus.toRemoteDeviceStatus())
if (response.isSuccessful) {
- if (response.code() == 200) {
+ if (response.code() == 200 || response.code() == 201) {
return@callWrapper CreateUpdateResponse(
response = response.code(),
- identifier = null,
- isDeduplication = true,
- deduplicatedIdentifier = null,
- lastModified = null
- )
- } else if (response.code() == 201) {
- return@callWrapper CreateUpdateResponse(
- response = response.code(),
- identifier = response.body()?.result?.identifier
- ?: throw UnknownResponseNightscoutException(),
- isDeduplication = response.body()?.result?.isDeduplication ?: false,
- deduplicatedIdentifier = response.body()?.result?.deduplicatedIdentifier,
- lastModified = response.body()?.result?.lastModified
+ identifier = response.body()?.identifier,
+ isDeduplication = response.body()?.isDeduplication,
+ deduplicatedIdentifier = response.body()?.deduplicatedIdentifier,
+ lastModified = response.body()?.lastModified
)
} else throw UnknownResponseNightscoutException()
} else if (response.code() in 400..499) {
@@ -307,19 +308,13 @@ class NSAndroidClientImpl(
remoteTreatment.app = "AAPS"
val response = api.createTreatment(remoteTreatment)
val errorResponse = response.errorBody()?.string()
- if (response.code() == 200) {
+ if (response.code() == 200 || response.code() == 201) {
return@callWrapper CreateUpdateResponse(
response = response.code(),
- identifier = null,
- isDeduplication = true
- )
- } else if (response.code() == 201) {
- return@callWrapper CreateUpdateResponse(
- response = response.code(),
- identifier = response.body()?.result?.identifier,
- isDeduplication = response.body()?.result?.isDeduplication ?: false,
- deduplicatedIdentifier = response.body()?.result?.deduplicatedIdentifier,
- lastModified = response.body()?.result?.lastModified
+ identifier = response.body()?.identifier,
+ isDeduplication = response.body()?.isDeduplication ?: false,
+ deduplicatedIdentifier = response.body()?.deduplicatedIdentifier,
+ lastModified = response.body()?.lastModified
)
} else if (response.code() == 400 && errorResponse?.contains("Bad or missing utcOffset field") == true && nsTreatment.utcOffset != 0L) {
// Record can be originally uploaded without utcOffset
@@ -384,7 +379,11 @@ class NSAndroidClientImpl(
val response = api.getFoods(limit)
if (response.isSuccessful) {
- return@callWrapper NSAndroidClient.ReadResponse(code = response.raw().networkResponse?.code ?: response.code(), lastServerModified = 0, values = response.body()?.result?.map(RemoteFood::toNSFood).toNotNull())
+ return@callWrapper NSAndroidClient.ReadResponse(
+ code = response.raw().networkResponse?.code ?: response.code(),
+ lastServerModified = 0,
+ values = response.body()?.result?.map(RemoteFood::toNSFood).toNotNull()
+ )
} else if (response.code() in 400..499)
throw InvalidParameterNightscoutException(response.errorBody()?.string() ?: response.message())
else
@@ -410,21 +409,13 @@ class NSAndroidClientImpl(
remoteFood.app = "AAPS"
val response = api.createFood(remoteFood)
if (response.isSuccessful) {
- if (response.code() == 200) {
+ if (response.code() == 200 || response.code() == 201) {
return@callWrapper CreateUpdateResponse(
response = response.code(),
- identifier = null,
- isDeduplication = true,
- deduplicatedIdentifier = null,
- lastModified = null
- )
- } else if (response.code() == 201) {
- return@callWrapper CreateUpdateResponse(
- response = response.code(),
- identifier = response.body()?.result?.identifier,
- isDeduplication = response.body()?.result?.isDeduplication ?: false,
- deduplicatedIdentifier = response.body()?.result?.deduplicatedIdentifier,
- lastModified = response.body()?.result?.lastModified
+ identifier = response.body()?.identifier,
+ isDeduplication = response.body()?.isDeduplication,
+ deduplicatedIdentifier = response.body()?.deduplicatedIdentifier,
+ lastModified = response.body()?.lastModified
)
} else throw UnsuccessfullNightscoutException()
} else if (response.code() in 400..499) {
@@ -474,21 +465,13 @@ class NSAndroidClientImpl(
remoteProfileStore.put("app", "AAPS")
val response = api.createProfile(JsonParser.parseString(remoteProfileStore.toString()).asJsonObject)
if (response.isSuccessful) {
- if (response.code() == 200) {
+ if (response.code() == 200 || response.code() == 201) {
return@callWrapper CreateUpdateResponse(
response = response.code(),
- identifier = null,
- isDeduplication = true,
- deduplicatedIdentifier = null,
- lastModified = null
- )
- } else if (response.code() == 201) {
- return@callWrapper CreateUpdateResponse(
- response = response.code(),
- identifier = response.body()?.result?.identifier,
- isDeduplication = response.body()?.result?.isDeduplication ?: false,
- deduplicatedIdentifier = response.body()?.result?.deduplicatedIdentifier,
- lastModified = response.body()?.result?.lastModified
+ identifier = response.body()?.identifier,
+ isDeduplication = response.body()?.isDeduplication,
+ deduplicatedIdentifier = response.body()?.deduplicatedIdentifier,
+ lastModified = response.body()?.lastModified
)
} else throw UnsuccessfullNightscoutException()
} else if (response.code() in 400..499) {
@@ -514,7 +497,6 @@ class NSAndroidClientImpl(
throw UnsuccessfullNightscoutException()
}
-
override suspend fun getProfileModifiedSince(from: Long): NSAndroidClient.ReadResponse> = callWrapper(dispatcher) {
val response = api.getProfileModifiedSince(from)
@@ -528,7 +510,6 @@ class NSAndroidClientImpl(
throw UnsuccessfullNightscoutException()
}
-
private suspend fun callWrapper(dispatcher: CoroutineDispatcher, block: suspend () -> T): T =
withContext(dispatcher) {
retry(
diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/interfaces/NSAndroidClient.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/interfaces/NSAndroidClient.kt
index 7c6a5c3f80..d61519452b 100644
--- a/core/ns-sdk/src/main/java/info/nightscout/sdk/interfaces/NSAndroidClient.kt
+++ b/core/ns-sdk/src/main/java/info/nightscout/sdk/interfaces/NSAndroidClient.kt
@@ -25,7 +25,7 @@ interface NSAndroidClient {
suspend fun getSgvs(): ReadResponse>
suspend fun getSgvsModifiedSince(from: Long, limit: Int): ReadResponse>
suspend fun getSgvsNewerThan(from: Long, limit: Int): ReadResponse>
- suspend fun createSvg(nsSgvV3: NSSgvV3): CreateUpdateResponse
+ suspend fun createSgv(nsSgvV3: NSSgvV3): CreateUpdateResponse
suspend fun updateSvg(nsSgvV3: NSSgvV3): CreateUpdateResponse
suspend fun getTreatmentsNewerThan(createdAt: String, limit: Int): ReadResponse>
diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/DeviceStatusMapper.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/DeviceStatusMapper.kt
index 6287091210..a5948af9c1 100644
--- a/core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/DeviceStatusMapper.kt
+++ b/core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/DeviceStatusMapper.kt
@@ -1,5 +1,6 @@
package info.nightscout.sdk.mapper
+import com.google.gson.Gson
import com.google.gson.JsonParser
import info.nightscout.sdk.localmodel.devicestatus.NSDeviceStatus
import info.nightscout.sdk.remotemodel.RemoteDeviceStatus
@@ -8,6 +9,9 @@ import org.json.JSONObject
fun NSDeviceStatus.convertToRemoteAndBack(): NSDeviceStatus =
toRemoteDeviceStatus().toNSDeviceStatus()
+fun String.toNSDeviceStatus(): NSDeviceStatus =
+ Gson().fromJson(this, RemoteDeviceStatus::class.java).toNSDeviceStatus()
+
internal fun RemoteDeviceStatus.toNSDeviceStatus(): NSDeviceStatus =
NSDeviceStatus(
app = app,
diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/FoodMapper.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/FoodMapper.kt
index 15bb3978c9..49ebe6456c 100644
--- a/core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/FoodMapper.kt
+++ b/core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/FoodMapper.kt
@@ -1,5 +1,6 @@
package info.nightscout.sdk.mapper
+import com.google.gson.Gson
import info.nightscout.sdk.localmodel.food.NSFood
import info.nightscout.sdk.remotemodel.RemoteFood
@@ -12,6 +13,9 @@ import info.nightscout.sdk.remotemodel.RemoteFood
fun NSFood.convertToRemoteAndBack(): NSFood? =
toRemoteFood().toNSFood()
+fun String.toNSFood(): NSFood? =
+ Gson().fromJson(this, RemoteFood::class.java).toNSFood()
+
internal fun RemoteFood.toNSFood(): NSFood? {
when (type) {
"food" ->
diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/SvgMapper.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/SvgMapper.kt
index b37a600a86..bc08e4e6f2 100644
--- a/core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/SvgMapper.kt
+++ b/core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/SvgMapper.kt
@@ -1,5 +1,6 @@
package info.nightscout.sdk.mapper
+import com.google.gson.Gson
import info.nightscout.sdk.localmodel.entry.Direction
import info.nightscout.sdk.localmodel.entry.NSSgvV3
import info.nightscout.sdk.localmodel.entry.NsUnits
@@ -8,6 +9,9 @@ import info.nightscout.sdk.remotemodel.RemoteEntry
fun NSSgvV3.convertToRemoteAndBack(): NSSgvV3? =
toRemoteEntry().toSgv()
+fun String.toNSSgvV3(): NSSgvV3? =
+ Gson().fromJson(this, RemoteEntry::class.java).toSgv()
+
internal fun RemoteEntry.toSgv(): NSSgvV3? {
this.sgv ?: return null
diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/TreatmentMapper.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/TreatmentMapper.kt
index 2dbd17f74b..64a500aa81 100644
--- a/core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/TreatmentMapper.kt
+++ b/core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/TreatmentMapper.kt
@@ -1,5 +1,6 @@
package info.nightscout.sdk.mapper
+import com.google.gson.Gson
import info.nightscout.sdk.localmodel.entry.NsUnits
import info.nightscout.sdk.localmodel.treatment.EventType
import info.nightscout.sdk.localmodel.treatment.NSBolus
@@ -26,6 +27,9 @@ import java.util.concurrent.TimeUnit
fun NSTreatment.convertToRemoteAndBack(): NSTreatment? =
toRemoteTreatment()?.toTreatment()
+fun String.toNSTreatment(): NSTreatment? =
+ Gson().fromJson(this, RemoteTreatment::class.java).toTreatment()
+
internal fun RemoteTreatment.toTreatment(): NSTreatment? {
val treatmentTimestamp = timestamp()
when {
diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/networking/NightscoutRemoteService.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/networking/NightscoutRemoteService.kt
index 902874df7e..f61576bb19 100644
--- a/core/ns-sdk/src/main/java/info/nightscout/sdk/networking/NightscoutRemoteService.kt
+++ b/core/ns-sdk/src/main/java/info/nightscout/sdk/networking/NightscoutRemoteService.kt
@@ -48,7 +48,7 @@ internal interface NightscoutRemoteService {
suspend fun getSgvsModifiedSince(@Path("from") from: Long, @Query("limit") limit: Int): Response>>
@POST("v3/entries")
- suspend fun createEntry(@Body remoteEntry: RemoteEntry): Response>
+ suspend fun createEntry(@Body remoteEntry: RemoteEntry): Response
@PATCH("v3/entries/{identifier}")
suspend fun updateEntry(@Body remoteEntry: RemoteEntry, @Path("identifier") identifier: String): Response>
@@ -63,16 +63,16 @@ internal interface NightscoutRemoteService {
suspend fun getTreatmentsModifiedSince(@Path("from") from: Long, @Query("limit") limit: Int): Response>>
@POST("v3/treatments")
- suspend fun createTreatment(@Body remoteTreatment: RemoteTreatment): Response>
+ suspend fun createTreatment(@Body remoteTreatment: RemoteTreatment): Response
@PATCH("v3/treatments/{identifier}")
- suspend fun updateTreatment(@Body remoteTreatment: RemoteTreatment, @Path("identifier") identifier: String): Response>
+ suspend fun updateTreatment(@Body remoteTreatment: RemoteTreatment, @Path("identifier") identifier: String): Response
@DELETE("v3/treatments/{identifier}")
- suspend fun deleteTreatment(@Path("identifier") identifier: String): Response>
+ suspend fun deleteTreatment(@Path("identifier") identifier: String): Response
@POST("v3/devicestatus")
- suspend fun createDeviceStatus(@Body remoteDeviceStatus: RemoteDeviceStatus): Response>
+ suspend fun createDeviceStatus(@Body remoteDeviceStatus: RemoteDeviceStatus): Response
@GET("v3/devicestatus/history/{from}")
suspend fun getDeviceStatusModifiedSince(@Path("from") from: Long): Response>>
@@ -85,13 +85,13 @@ internal interface NightscoutRemoteService {
suspend fun getFoodsModifiedSince(@Path("from") from: Long, @Query("limit") limit: Int): Response>>
*/
@POST("v3/food")
- suspend fun createFood(@Body remoteFood: RemoteFood): Response>
+ suspend fun createFood(@Body remoteFood: RemoteFood): Response
@PATCH("v3/food")
- suspend fun updateFood(@Body remoteFood: RemoteFood, @Path("identifier") identifier: String): Response>
+ suspend fun updateFood(@Body remoteFood: RemoteFood, @Path("identifier") identifier: String): Response
@DELETE("v3/food")
- suspend fun deleteFood(@Path("identifier") identifier: String): Response>
+ suspend fun deleteFood(@Path("identifier") identifier: String): Response
@GET("v3/profile/history/{from}")
suspend fun getProfileModifiedSince(@Path("from") from: Long, @Query("limit") limit: Int = 10): Response>>
@@ -100,8 +100,7 @@ internal interface NightscoutRemoteService {
@GET("v3/profile?sort\$desc=date&limit=1")
suspend fun getLastProfile(): Response>>
-
@POST("v3/profile")
- suspend fun createProfile(@Body profile: JsonObject): Response>
+ suspend fun createProfile(@Body profile: JsonObject): Response
}
diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/LastModified.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/LastModified.kt
index 2a9716adc6..4d48a5f46d 100644
--- a/core/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/LastModified.kt
+++ b/core/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/LastModified.kt
@@ -22,4 +22,15 @@ data class LastModified(
@SerializedName("foods") var foods: Long = 0, // foods collection
@SerializedName("settings") var settings: Long = 0 // settings collection
)
+
+ fun set(colName: String, value: Long) {
+ when (colName) {
+ "devicestatus" -> collections.devicestatus = value
+ "entries" -> collections.entries = value
+ "profile" -> collections.profile = value
+ "treatments" -> collections.treatments = value
+ "foods" -> collections.foods = value
+ "settings" -> collections.settings = value
+ }
+ }
}
diff --git a/core/ui/src/main/java/info/nightscout/core/ui/dialogs/OKDialog.kt b/core/ui/src/main/java/info/nightscout/core/ui/dialogs/OKDialog.kt
index c2436e0fb3..8776206258 100644
--- a/core/ui/src/main/java/info/nightscout/core/ui/dialogs/OKDialog.kt
+++ b/core/ui/src/main/java/info/nightscout/core/ui/dialogs/OKDialog.kt
@@ -39,6 +39,28 @@ object OKDialog {
.setCanceledOnTouchOutside(false)
}
+ @SuppressLint("InflateParams")
+ fun show(context: Context, title: String, message: Spanned, runnable: Runnable? = null) {
+ var okClicked = false
+ var notEmptyTitle = title
+ if (notEmptyTitle.isEmpty()) notEmptyTitle = context.getString(R.string.message)
+
+ MaterialAlertDialogBuilder(context, R.style.DialogTheme)
+ .setCustomTitle(AlertDialogHelper.buildCustomTitle(context, notEmptyTitle))
+ .setMessage(message)
+ .setPositiveButton(context.getString(R.string.ok)) { dialog: DialogInterface, _: Int ->
+ if (okClicked) return@setPositiveButton
+ else {
+ okClicked = true
+ dialog.dismiss()
+ SystemClock.sleep(100)
+ runOnUiThread(runnable)
+ }
+ }
+ .show()
+ .setCanceledOnTouchOutside(false)
+ }
+
@SuppressLint("InflateParams")
fun show(activity: FragmentActivity, title: String, message: Spanned, runnable: Runnable? = null) {
var okClicked = false
diff --git a/core/ui/src/main/res/values/strings.xml b/core/ui/src/main/res/values/strings.xml
index 2b4c48f452..12b4051add 100644
--- a/core/ui/src/main/res/values/strings.xml
+++ b/core/ui/src/main/res/values/strings.xml
@@ -45,7 +45,7 @@
Mute for 5 minutes
Mute
Success
- Advanced Settings
+ Advanced Settings
Extended bolus delivery error
APS Mode
Extended bolus
@@ -620,4 +620,9 @@
- %1$d minutes
+
+ Do you want to cleanup the database?\nIt will remove tracked changes and historic data older than 3 months.
+ Do you want to cleanup the database?\nIt will remove tracked changes and historic data older than 3 months.\nDoing it will speedup full synchronization dramatically.
+ Cleared entries
+
diff --git a/core/utils/src/main/res/values/keys.xml b/core/utils/src/main/res/values/keys.xml
index 8377c4b5d7..df88e2de3c 100644
--- a/core/utils/src/main/res/values/keys.xml
+++ b/core/utils/src/main/res/values/keys.xml
@@ -70,8 +70,7 @@
autotune_additional_log
key_autotune_plugin
key_autotune_last_run
- dexcomg5_xdripupload
- nsclient_localbroadcasts
+ xdrip_local_broadcasts
use_bolus_reminder
carbs_button_increment_1
carbs_button_increment_2
@@ -85,6 +84,7 @@
ns_receive_profile_store
nsclientinternal_url
nsclientinternal_api_secret
+ ns_use_ws
ns_receive_insulin
ns_receive_carbs
ns_receive_therapy_events
diff --git a/database/entities/src/main/java/info/nightscout/database/entities/OfflineEvent.kt b/database/entities/src/main/java/info/nightscout/database/entities/OfflineEvent.kt
index 3ba6a14b14..36c4281960 100644
--- a/database/entities/src/main/java/info/nightscout/database/entities/OfflineEvent.kt
+++ b/database/entities/src/main/java/info/nightscout/database/entities/OfflineEvent.kt
@@ -8,6 +8,7 @@ import androidx.room.PrimaryKey
import info.nightscout.database.entities.embedments.InterfaceIDs
import info.nightscout.database.entities.interfaces.DBEntryWithTimeAndDuration
import info.nightscout.database.entities.interfaces.TraceableDBEntry
+import info.nightscout.database.entities.interfaces.end
import java.util.TimeZone
@Entity(
@@ -53,9 +54,6 @@ data class OfflineEvent(
previous.interfaceIDs.nightscoutId == null &&
interfaceIDs.nightscoutId != null
- fun isRecordDeleted(other: OfflineEvent): Boolean =
- isValid && !other.isValid
-
enum class Reason {
DISCONNECT_PUMP,
SUSPEND,
diff --git a/database/impl/src/main/java/info/nightscout/database/impl/AppRepository.kt b/database/impl/src/main/java/info/nightscout/database/impl/AppRepository.kt
index 5879064d62..478aae9239 100644
--- a/database/impl/src/main/java/info/nightscout/database/impl/AppRepository.kt
+++ b/database/impl/src/main/java/info/nightscout/database/impl/AppRepository.kt
@@ -123,7 +123,7 @@ import kotlin.math.roundToInt
val ret = StringBuilder()
removed
.filter { it.second > 0 }
- .map { ret.append(it.first + " " + it.second + "\n") }
+ .map { ret.append(it.first + " " + it.second + "
") }
return ret.toString()
}
@@ -150,10 +150,8 @@ import kotlin.math.roundToInt
database.glucoseValueDao.getModifiedFrom(lastId)
.subscribeOn(Schedulers.io())
- fun getLastGlucoseValueIdWrapped(): Single> =
+ fun getLastGlucoseValueId(): Long? =
database.glucoseValueDao.getLastId()
- .subscribeOn(Schedulers.io())
- .toWrappedSingle()
fun getLastGlucoseValueWrapped(): Single> =
database.glucoseValueDao.getLast()
@@ -233,10 +231,8 @@ import kotlin.math.roundToInt
fun deleteAllTempTargetEntries() =
database.temporaryTargetDao.deleteAllEntries()
- fun getLastTempTargetIdWrapped(): Single> =
+ fun getLastTempTargetId(): Long? =
database.temporaryTargetDao.getLastId()
- .subscribeOn(Schedulers.io())
- .toWrappedSingle()
// USER ENTRY
fun getAllUserEntries(): Single> =
@@ -309,10 +305,8 @@ import kotlin.math.roundToInt
.map { if (!ascending) it.reversed() else it }
.subscribeOn(Schedulers.io())
- fun getLastProfileSwitchIdWrapped(): Single> =
+ fun getLastProfileSwitchId(): Long? =
database.profileSwitchDao.getLastId()
- .subscribeOn(Schedulers.io())
- .toWrappedSingle()
// EFFECTIVE PROFILE SWITCH
/*
@@ -368,10 +362,8 @@ import kotlin.math.roundToInt
fun deleteAllEffectiveProfileSwitches() =
database.effectiveProfileSwitchDao.deleteAllEntries()
- fun getLastEffectiveProfileSwitchIdWrapped(): Single> =
+ fun getLastEffectiveProfileSwitchId(): Long? =
database.effectiveProfileSwitchDao.getLastId()
- .subscribeOn(Schedulers.io())
- .toWrappedSingle()
// THERAPY EVENT
/*
@@ -435,10 +427,8 @@ import kotlin.math.roundToInt
database.therapyEventDao.compatGetTherapyEventDataFromToTime(from, to)
.subscribeOn(Schedulers.io())
- fun getLastTherapyEventIdWrapped(): Single> =
+ fun getLastTherapyEventId(): Long? =
database.therapyEventDao.getLastId()
- .subscribeOn(Schedulers.io())
- .toWrappedSingle()
// FOOD
/*
@@ -471,10 +461,8 @@ import kotlin.math.roundToInt
fun deleteAllFoods() =
database.foodDao.deleteAllEntries()
- fun getLastFoodIdWrapped(): Single> =
+ fun getLastFoodId(): Long? =
database.foodDao.getLastId()
- .subscribeOn(Schedulers.io())
- .toWrappedSingle()
// BOLUS
/*
@@ -539,10 +527,8 @@ import kotlin.math.roundToInt
fun deleteAllBoluses() =
database.bolusDao.deleteAllEntries()
- fun getLastBolusIdWrapped(): Single> =
+ fun getLastBolusId(): Long? =
database.bolusDao.getLastId()
- .subscribeOn(Schedulers.io())
- .toWrappedSingle()
// CARBS
private fun expandCarbs(carbs: Carbs): List =
@@ -656,10 +642,8 @@ import kotlin.math.roundToInt
fun deleteAllCarbs() =
database.carbsDao.deleteAllEntries()
- fun getLastCarbsIdWrapped(): Single> =
+ fun getLastCarbsId(): Long? =
database.carbsDao.getLastId()
- .subscribeOn(Schedulers.io())
- .toWrappedSingle()
// BOLUS CALCULATOR RESULT
/*
@@ -698,10 +682,8 @@ import kotlin.math.roundToInt
fun deleteAllBolusCalculatorResults() =
database.bolusCalculatorResultDao.deleteAllEntries()
- fun getLastBolusCalculatorResultIdWrapped(): Single> =
+ fun getLastBolusCalculatorResultId(): Long? =
database.bolusCalculatorResultDao.getLastId()
- .subscribeOn(Schedulers.io())
- .toWrappedSingle()
// DEVICE STATUS
fun insert(deviceStatus: DeviceStatus): Long =
@@ -723,10 +705,8 @@ import kotlin.math.roundToInt
database.deviceStatusDao.getModifiedFrom(lastId)
.subscribeOn(Schedulers.io())
- fun getLastDeviceStatusIdWrapped(): Single> =
+ fun getLastDeviceStatusId(): Long? =
database.deviceStatusDao.getLastId()
- .subscribeOn(Schedulers.io())
- .toWrappedSingle()
// TEMPORARY BASAL
/*
@@ -789,10 +769,8 @@ import kotlin.math.roundToInt
fun getOldestTemporaryBasalRecord(): TemporaryBasal? =
database.temporaryBasalDao.getOldestRecord()
- fun getLastTemporaryBasalIdWrapped(): Single> =
+ fun getLastTemporaryBasalId(): Long? =
database.temporaryBasalDao.getLastId()
- .subscribeOn(Schedulers.io())
- .toWrappedSingle()
// EXTENDED BOLUS
/*
@@ -847,10 +825,8 @@ import kotlin.math.roundToInt
fun getOldestExtendedBolusRecord(): ExtendedBolus? =
database.extendedBolusDao.getOldestRecord()
- fun getLastExtendedBolusIdWrapped(): Single> =
+ fun getLastExtendedBolusId(): Long? =
database.extendedBolusDao.getLastId()
- .subscribeOn(Schedulers.io())
- .toWrappedSingle()
// TotalDailyDose
fun getLastTotalDailyDoses(count: Int, ascending: Boolean): Single> =
@@ -918,10 +894,8 @@ import kotlin.math.roundToInt
fun deleteAllOfflineEventEntries() =
database.offlineEventDao.deleteAllEntries()
- fun getLastOfflineEventIdWrapped(): Single> =
+ fun getLastOfflineEventId(): Long? =
database.offlineEventDao.getLastId()
- .subscribeOn(Schedulers.io())
- .toWrappedSingle()
suspend fun collectNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int) = NewEntries(
apsResults = database.apsResultDao.getNewEntriesSince(since, until, limit, offset),
diff --git a/database/impl/src/main/java/info/nightscout/database/impl/daos/BolusCalculatorResultDao.kt b/database/impl/src/main/java/info/nightscout/database/impl/daos/BolusCalculatorResultDao.kt
index b2432d2ada..2cd4c7d3b3 100644
--- a/database/impl/src/main/java/info/nightscout/database/impl/daos/BolusCalculatorResultDao.kt
+++ b/database/impl/src/main/java/info/nightscout/database/impl/daos/BolusCalculatorResultDao.kt
@@ -24,7 +24,7 @@ internal interface BolusCalculatorResultDao : TraceableDao
+ fun getLastId(): Long?
@Query("SELECT * FROM $TABLE_BOLUS_CALCULATOR_RESULTS WHERE timestamp = :timestamp AND referenceId IS NULL")
fun findByTimestamp(timestamp: Long): BolusCalculatorResult?
diff --git a/database/impl/src/main/java/info/nightscout/database/impl/daos/BolusDao.kt b/database/impl/src/main/java/info/nightscout/database/impl/daos/BolusDao.kt
index df1a9c7d2f..cb91fed85b 100644
--- a/database/impl/src/main/java/info/nightscout/database/impl/daos/BolusDao.kt
+++ b/database/impl/src/main/java/info/nightscout/database/impl/daos/BolusDao.kt
@@ -24,7 +24,7 @@ internal interface BolusDao : TraceableDao {
override fun deleteTrackedChanges(): Int
@Query("SELECT id FROM $TABLE_BOLUSES ORDER BY id DESC limit 1")
- fun getLastId(): Maybe
+ fun getLastId(): Long?
@Query("SELECT * FROM $TABLE_BOLUSES WHERE timestamp = :timestamp AND referenceId IS NULL")
fun findByTimestamp(timestamp: Long): Bolus?
diff --git a/database/impl/src/main/java/info/nightscout/database/impl/daos/CarbsDao.kt b/database/impl/src/main/java/info/nightscout/database/impl/daos/CarbsDao.kt
index 7cf52a10d8..9bba531e0a 100644
--- a/database/impl/src/main/java/info/nightscout/database/impl/daos/CarbsDao.kt
+++ b/database/impl/src/main/java/info/nightscout/database/impl/daos/CarbsDao.kt
@@ -23,7 +23,7 @@ internal interface CarbsDao : TraceableDao {
override fun deleteTrackedChanges(): Int
@Query("SELECT id FROM $TABLE_CARBS ORDER BY id DESC limit 1")
- fun getLastId(): Maybe
+ fun getLastId(): Long?
@Query("SELECT * FROM $TABLE_CARBS WHERE nightscoutId = :nsId AND referenceId IS NULL")
fun findByNSId(nsId: String): Carbs?
diff --git a/database/impl/src/main/java/info/nightscout/database/impl/daos/DeviceStatusDao.kt b/database/impl/src/main/java/info/nightscout/database/impl/daos/DeviceStatusDao.kt
index 35627f67c6..b4fd87f225 100644
--- a/database/impl/src/main/java/info/nightscout/database/impl/daos/DeviceStatusDao.kt
+++ b/database/impl/src/main/java/info/nightscout/database/impl/daos/DeviceStatusDao.kt
@@ -29,7 +29,7 @@ internal interface DeviceStatusDao {
fun deleteOlderThan(than: Long): Int
@Query("SELECT id FROM $TABLE_DEVICE_STATUS ORDER BY id DESC limit 1")
- fun getLastId(): Maybe
+ fun getLastId(): Long?
@Query("DELETE FROM $TABLE_DEVICE_STATUS WHERE id NOT IN (SELECT MAX(id) FROM $TABLE_DEVICE_STATUS)")
fun deleteAllEntriesExceptLast()
diff --git a/database/impl/src/main/java/info/nightscout/database/impl/daos/EffectiveProfileSwitchDao.kt b/database/impl/src/main/java/info/nightscout/database/impl/daos/EffectiveProfileSwitchDao.kt
index 74c38cd7ce..a8b9c7f168 100644
--- a/database/impl/src/main/java/info/nightscout/database/impl/daos/EffectiveProfileSwitchDao.kt
+++ b/database/impl/src/main/java/info/nightscout/database/impl/daos/EffectiveProfileSwitchDao.kt
@@ -23,7 +23,7 @@ internal interface EffectiveProfileSwitchDao : TraceableDao
+ fun getLastId(): Long?
@Query("SELECT * FROM $TABLE_EFFECTIVE_PROFILE_SWITCHES WHERE timestamp = :timestamp AND referenceId IS NULL")
fun findByTimestamp(timestamp: Long): EffectiveProfileSwitch?
diff --git a/database/impl/src/main/java/info/nightscout/database/impl/daos/ExtendedBolusDao.kt b/database/impl/src/main/java/info/nightscout/database/impl/daos/ExtendedBolusDao.kt
index 65ea850580..92fe71aad4 100644
--- a/database/impl/src/main/java/info/nightscout/database/impl/daos/ExtendedBolusDao.kt
+++ b/database/impl/src/main/java/info/nightscout/database/impl/daos/ExtendedBolusDao.kt
@@ -24,7 +24,7 @@ internal interface ExtendedBolusDao : TraceableDao {
override fun deleteTrackedChanges(): Int
@Query("SELECT id FROM $TABLE_EXTENDED_BOLUSES ORDER BY id DESC limit 1")
- fun getLastId(): Maybe
+ fun getLastId(): Long?
@Query("SELECT * FROM $TABLE_EXTENDED_BOLUSES WHERE timestamp = :timestamp AND referenceId IS NULL")
fun findByTimestamp(timestamp: Long): ExtendedBolus?
diff --git a/database/impl/src/main/java/info/nightscout/database/impl/daos/FoodDao.kt b/database/impl/src/main/java/info/nightscout/database/impl/daos/FoodDao.kt
index fc3d85989b..aae37a724a 100644
--- a/database/impl/src/main/java/info/nightscout/database/impl/daos/FoodDao.kt
+++ b/database/impl/src/main/java/info/nightscout/database/impl/daos/FoodDao.kt
@@ -23,7 +23,7 @@ internal interface FoodDao : TraceableDao {
override fun deleteTrackedChanges(): Int
@Query("SELECT id FROM $TABLE_FOODS ORDER BY id DESC limit 1")
- fun getLastId(): Maybe
+ fun getLastId(): Long?
@Query("SELECT * FROM $TABLE_FOODS WHERE nightscoutId = :nsId AND referenceId IS NULL")
fun findByNSId(nsId: String): Food?
diff --git a/database/impl/src/main/java/info/nightscout/database/impl/daos/GlucoseValueDao.kt b/database/impl/src/main/java/info/nightscout/database/impl/daos/GlucoseValueDao.kt
index f30847c410..3b5cb40950 100644
--- a/database/impl/src/main/java/info/nightscout/database/impl/daos/GlucoseValueDao.kt
+++ b/database/impl/src/main/java/info/nightscout/database/impl/daos/GlucoseValueDao.kt
@@ -26,7 +26,7 @@ internal interface GlucoseValueDao : TraceableDao {
fun getLast(): Maybe
@Query("SELECT id FROM $TABLE_GLUCOSE_VALUES ORDER BY id DESC limit 1")
- fun getLastId(): Maybe
+ fun getLastId(): Long?
@Query("SELECT * FROM $TABLE_GLUCOSE_VALUES WHERE nightscoutId = :nsId AND referenceId IS NULL")
fun findByNSIdMaybe(nsId: String): Maybe
diff --git a/database/impl/src/main/java/info/nightscout/database/impl/daos/OfflineEventDao.kt b/database/impl/src/main/java/info/nightscout/database/impl/daos/OfflineEventDao.kt
index 06bcf84542..7f2209cc7a 100644
--- a/database/impl/src/main/java/info/nightscout/database/impl/daos/OfflineEventDao.kt
+++ b/database/impl/src/main/java/info/nightscout/database/impl/daos/OfflineEventDao.kt
@@ -23,7 +23,7 @@ internal interface OfflineEventDao : TraceableDao {
override fun deleteTrackedChanges(): Int
@Query("SELECT id FROM $TABLE_OFFLINE_EVENTS ORDER BY id DESC limit 1")
- fun getLastId(): Maybe
+ fun getLastId(): Long?
@Query("SELECT * FROM $TABLE_OFFLINE_EVENTS WHERE nightscoutId = :nsId AND referenceId IS NULL")
fun findByNSId(nsId: String): OfflineEvent?
diff --git a/database/impl/src/main/java/info/nightscout/database/impl/daos/ProfileSwitchDao.kt b/database/impl/src/main/java/info/nightscout/database/impl/daos/ProfileSwitchDao.kt
index a15d7e1315..dc62152b4a 100644
--- a/database/impl/src/main/java/info/nightscout/database/impl/daos/ProfileSwitchDao.kt
+++ b/database/impl/src/main/java/info/nightscout/database/impl/daos/ProfileSwitchDao.kt
@@ -24,7 +24,7 @@ internal interface ProfileSwitchDao : info.nightscout.database.impl.daos.workaro
override fun deleteTrackedChanges(): Int
@Query("SELECT id FROM $TABLE_PROFILE_SWITCHES ORDER BY id DESC limit 1")
- fun getLastId(): Maybe
+ fun getLastId(): Long?
@Query("SELECT * FROM $TABLE_PROFILE_SWITCHES WHERE timestamp = :timestamp AND referenceId IS NULL")
fun findByTimestamp(timestamp: Long): ProfileSwitch?
diff --git a/database/impl/src/main/java/info/nightscout/database/impl/daos/TemporaryBasalDao.kt b/database/impl/src/main/java/info/nightscout/database/impl/daos/TemporaryBasalDao.kt
index 88865ce2e8..0a89476e45 100644
--- a/database/impl/src/main/java/info/nightscout/database/impl/daos/TemporaryBasalDao.kt
+++ b/database/impl/src/main/java/info/nightscout/database/impl/daos/TemporaryBasalDao.kt
@@ -24,7 +24,7 @@ internal interface TemporaryBasalDao : TraceableDao {
override fun deleteTrackedChanges(): Int
@Query("SELECT id FROM $TABLE_TEMPORARY_BASALS ORDER BY id DESC limit 1")
- fun getLastId(): Maybe
+ fun getLastId(): Long?
@Query("SELECT * FROM $TABLE_TEMPORARY_BASALS WHERE temporaryId = :temporaryId")
fun findByTempId(temporaryId: Long): TemporaryBasal?
diff --git a/database/impl/src/main/java/info/nightscout/database/impl/daos/TemporaryTargetDao.kt b/database/impl/src/main/java/info/nightscout/database/impl/daos/TemporaryTargetDao.kt
index f123ecd975..dfe77af51b 100644
--- a/database/impl/src/main/java/info/nightscout/database/impl/daos/TemporaryTargetDao.kt
+++ b/database/impl/src/main/java/info/nightscout/database/impl/daos/TemporaryTargetDao.kt
@@ -23,7 +23,7 @@ internal interface TemporaryTargetDao : TraceableDao {
override fun deleteTrackedChanges(): Int
@Query("SELECT id FROM $TABLE_TEMPORARY_TARGETS ORDER BY id DESC limit 1")
- fun getLastId(): Maybe
+ fun getLastId(): Long?
@Query("SELECT * FROM $TABLE_TEMPORARY_TARGETS WHERE nightscoutId = :nsId AND referenceId IS NULL")
fun findByNSId(nsId: String): TemporaryTarget?
diff --git a/database/impl/src/main/java/info/nightscout/database/impl/daos/TherapyEventDao.kt b/database/impl/src/main/java/info/nightscout/database/impl/daos/TherapyEventDao.kt
index 366d06b5bf..c6abfbf11e 100644
--- a/database/impl/src/main/java/info/nightscout/database/impl/daos/TherapyEventDao.kt
+++ b/database/impl/src/main/java/info/nightscout/database/impl/daos/TherapyEventDao.kt
@@ -23,7 +23,7 @@ internal interface TherapyEventDao : TraceableDao {
override fun deleteTrackedChanges(): Int
@Query("SELECT id FROM $TABLE_THERAPY_EVENTS ORDER BY id DESC limit 1")
- fun getLastId(): Maybe
+ fun getLastId(): Long?
@Query("SELECT * FROM $TABLE_THERAPY_EVENTS WHERE type = :type AND timestamp = :timestamp AND referenceId IS NULL")
fun findByTimestamp(type: TherapyEvent.Type, timestamp: Long): TherapyEvent?
diff --git a/implementation/src/main/java/info/nightscout/implementation/db/PersistenceLayerImpl.kt b/implementation/src/main/java/info/nightscout/implementation/db/PersistenceLayerImpl.kt
index 6b99d9a8ca..5bb7a7ee96 100644
--- a/implementation/src/main/java/info/nightscout/implementation/db/PersistenceLayerImpl.kt
+++ b/implementation/src/main/java/info/nightscout/implementation/db/PersistenceLayerImpl.kt
@@ -31,7 +31,7 @@ class PersistenceLayerImpl @Inject constructor(
private val disposable = CompositeDisposable()
override fun clearDatabases() = repository.clearDatabases()
- override fun cleanupDatabase(keepDays: Long, deleteTrackedChanges: Boolean): String = cleanupDatabase(keepDays, deleteTrackedChanges)
+ override fun cleanupDatabase(keepDays: Long, deleteTrackedChanges: Boolean): String = repository.cleanupDatabase(keepDays, deleteTrackedChanges)
override fun insertOrUpdate(bolusCalculatorResult: BolusCalculatorResult) {
disposable += repository.runTransactionForResult(InsertOrUpdateBolusCalculatorResultTransaction(bolusCalculatorResult))
diff --git a/implementation/src/test/java/info/nightscout/implementation/iob/GlucoseStatusTest.kt b/implementation/src/test/java/info/nightscout/implementation/iob/GlucoseStatusTest.kt
index 040ed19d88..110bbdff63 100644
--- a/implementation/src/test/java/info/nightscout/implementation/iob/GlucoseStatusTest.kt
+++ b/implementation/src/test/java/info/nightscout/implementation/iob/GlucoseStatusTest.kt
@@ -142,14 +142,14 @@ class GlucoseStatusTest : TestBase() {
// [{"mgdl":214,"mills":1521895773113,"device":"xDrip-DexcomG5","direction":"Flat","filtered":191040,"unfiltered":205024,"noise":1,"rssi":100},{"mgdl":219,"mills":1521896073352,"device":"xDrip-DexcomG5","direction":"Flat","filtered":200160,"unfiltered":209760,"noise":1,"rssi":100},{"mgdl":222,"mills":1521896372890,"device":"xDrip-DexcomG5","direction":"Flat","filtered":207360,"unfiltered":212512,"noise":1,"rssi":100},{"mgdl":220,"mills":1521896673062,"device":"xDrip-DexcomG5","direction":"Flat","filtered":211488,"unfiltered":210688,"noise":1,"rssi":100},{"mgdl":193,"mills":1521896972933,"device":"xDrip-DexcomG5","direction":"Flat","filtered":212384,"unfiltered":208960,"noise":1,"rssi":100},{"mgdl":181,"mills":1521897273336,"device":"xDrip-DexcomG5","direction":"SingleDown","filtered":210592,"unfiltered":204320,"noise":1,"rssi":100},{"mgdl":176,"mills":1521897572875,"device":"xDrip-DexcomG5","direction":"FortyFiveDown","filtered":206720,"unfiltered":197440,"noise":1,"rssi":100},{"mgdl":168,"mills":1521897872929,"device":"xDrip-DexcomG5","direction":"FortyFiveDown","filtered":201024,"unfiltered":187904,"noise":1,"rssi":100},{"mgdl":161,"mills":1521898172814,"device":"xDrip-DexcomG5","direction":"FortyFiveDown","filtered":193376,"unfiltered":178144,"noise":1,"rssi":100},{"mgdl":148,"mills":1521898472879,"device":"xDrip-DexcomG5","direction":"SingleDown","filtered":183264,"unfiltered":161216,"noise":1,"rssi":100},{"mgdl":139,"mills":1521898772862,"device":"xDrip-DexcomG5","direction":"FortyFiveDown","filtered":170784,"unfiltered":148928,"noise":1,"rssi":100},{"mgdl":132,"mills":1521899072896,"device":"xDrip-DexcomG5","direction":"FortyFiveDown","filtered":157248,"unfiltered":139552,"noise":1,"rssi":100},{"mgdl":125,"mills":1521899372834,"device":"xDrip-DexcomG5","direction":"FortyFiveDown","filtered":144416,"unfiltered":129616.00000000001,"noise":1,"rssi":100},{"mgdl":128,"mills":1521899973456,"device":"xDrip-DexcomG5","direction":"Flat","filtered":130240.00000000001,"unfiltered":133536,"noise":1,"rssi":100},{"mgdl":132,"mills":1521900573287,"device":"xDrip-DexcomG5","direction":"Flat","filtered":133504,"unfiltered":138720,"noise":1,"rssi":100},{"mgdl":127,"mills":1521900873711,"device":"xDrip-DexcomG5","direction":"Flat","filtered":136480,"unfiltered":132992,"noise":1,"rssi":100},{"mgdl":127,"mills":1521901180151,"device":"xDrip-DexcomG5","direction":"Flat","filtered":136896,"unfiltered":132128,"noise":1,"rssi":100},{"mgdl":125,"mills":1521901473582,"device":"xDrip-DexcomG5","direction":"Flat","filtered":134624,"unfiltered":129696,"noise":1,"rssi":100},{"mgdl":120,"mills":1521901773597,"device":"xDrip-DexcomG5","direction":"Flat","filtered":130704.00000000001,"unfiltered":123376,"noise":1,"rssi":100},{"mgdl":116,"mills":1521902075855,"device":"xDrip-DexcomG5","direction":"Flat","filtered":126272,"unfiltered":118448,"noise":1,"rssi":100}]
private fun generateValidBgData(): MutableList {
val list: MutableList = ArrayList()
- list.add(InMemoryGlucoseValue(value = 214.0, timestamp = 1514766900000, trendArrow = GlucoseValue.TrendArrow.FLAT))
- list.add(InMemoryGlucoseValue(value = 216.0, timestamp = 1514766600000, trendArrow = GlucoseValue.TrendArrow.FLAT))
- list.add(InMemoryGlucoseValue(value = 219.0, timestamp = 1514766300000, trendArrow = GlucoseValue.TrendArrow.FLAT))
- list.add(InMemoryGlucoseValue(value = 223.0, timestamp = 1514766000000, trendArrow = GlucoseValue.TrendArrow.FLAT))
- list.add(InMemoryGlucoseValue(value = 222.0, timestamp = 1514765700000, trendArrow = GlucoseValue.TrendArrow.FLAT))
- list.add(InMemoryGlucoseValue(value = 224.0, timestamp = 1514765400000, trendArrow = GlucoseValue.TrendArrow.FLAT))
- list.add(InMemoryGlucoseValue(value = 226.0, timestamp = 1514765100000, trendArrow = GlucoseValue.TrendArrow.FLAT))
- list.add(InMemoryGlucoseValue(value = 228.0, timestamp = 1514764800000, trendArrow = GlucoseValue.TrendArrow.FLAT))
+ list.add(InMemoryGlucoseValue(value = 214.0, timestamp = 1514766900000, trendArrow = GlucoseValue.TrendArrow.FLAT, sourceSensor = GlucoseValue.SourceSensor.UNKNOWN))
+ list.add(InMemoryGlucoseValue(value = 216.0, timestamp = 1514766600000, trendArrow = GlucoseValue.TrendArrow.FLAT, sourceSensor = GlucoseValue.SourceSensor.UNKNOWN))
+ list.add(InMemoryGlucoseValue(value = 219.0, timestamp = 1514766300000, trendArrow = GlucoseValue.TrendArrow.FLAT, sourceSensor = GlucoseValue.SourceSensor.UNKNOWN))
+ list.add(InMemoryGlucoseValue(value = 223.0, timestamp = 1514766000000, trendArrow = GlucoseValue.TrendArrow.FLAT, sourceSensor = GlucoseValue.SourceSensor.UNKNOWN))
+ list.add(InMemoryGlucoseValue(value = 222.0, timestamp = 1514765700000, trendArrow = GlucoseValue.TrendArrow.FLAT, sourceSensor = GlucoseValue.SourceSensor.UNKNOWN))
+ list.add(InMemoryGlucoseValue(value = 224.0, timestamp = 1514765400000, trendArrow = GlucoseValue.TrendArrow.FLAT, sourceSensor = GlucoseValue.SourceSensor.UNKNOWN))
+ list.add(InMemoryGlucoseValue(value = 226.0, timestamp = 1514765100000, trendArrow = GlucoseValue.TrendArrow.FLAT, sourceSensor = GlucoseValue.SourceSensor.UNKNOWN))
+ list.add(InMemoryGlucoseValue(value = 228.0, timestamp = 1514764800000, trendArrow = GlucoseValue.TrendArrow.FLAT, sourceSensor = GlucoseValue.SourceSensor.UNKNOWN))
return list
}
@@ -159,13 +159,13 @@ class GlucoseStatusTest : TestBase() {
private fun generateOldBgData(): MutableList {
val list: MutableList = ArrayList()
- list.add(InMemoryGlucoseValue(value = 228.0, timestamp = 1514764800000, trendArrow = GlucoseValue.TrendArrow.FLAT))
+ list.add(InMemoryGlucoseValue(value = 228.0, timestamp = 1514764800000, trendArrow = GlucoseValue.TrendArrow.FLAT, sourceSensor = GlucoseValue.SourceSensor.UNKNOWN))
return list
}
private fun generateOneCurrentRecordBgData(): MutableList {
val list: MutableList = ArrayList()
- list.add(InMemoryGlucoseValue(value = 214.0, timestamp = 1514766900000, trendArrow = GlucoseValue.TrendArrow.FLAT))
+ list.add(InMemoryGlucoseValue(value = 214.0, timestamp = 1514766900000, trendArrow = GlucoseValue.TrendArrow.FLAT, sourceSensor = GlucoseValue.SourceSensor.UNKNOWN))
return list
}
}
\ No newline at end of file
diff --git a/plugins/aps/src/main/res/xml/pref_openapsama.xml b/plugins/aps/src/main/res/xml/pref_openapsama.xml
index e1d6444080..155b434ef0 100644
--- a/plugins/aps/src/main/res/xml/pref_openapsama.xml
+++ b/plugins/aps/src/main/res/xml/pref_openapsama.xml
@@ -52,7 +52,7 @@
+ android:title="@string/advanced_settings_title">
+ android:title="@string/advanced_settings_title">
+ android:title="@string/advanced_settings_title">
{
val list: MutableList = ArrayList()
- list.add(InMemoryGlucoseValue(value = 214.0, timestamp = now - 1, trendArrow = GlucoseValue.TrendArrow.FLAT))
+ list.add(InMemoryGlucoseValue(value = 214.0, timestamp = now - 1, trendArrow = GlucoseValue.TrendArrow.FLAT, sourceSensor = GlucoseValue.SourceSensor.UNKNOWN))
return list
}
}
\ No newline at end of file
diff --git a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerDeltaTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerDeltaTest.kt
index 1a51a05df7..13cf5b3efc 100644
--- a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerDeltaTest.kt
+++ b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerDeltaTest.kt
@@ -91,14 +91,14 @@ class TriggerDeltaTest : TriggerTestBase() {
private fun generateValidBgData(): MutableList {
val list: MutableList = ArrayList()
- list.add(InMemoryGlucoseValue(value = 214.0, timestamp = 1514766900000, trendArrow = GlucoseValue.TrendArrow.FLAT))
- list.add(InMemoryGlucoseValue(value = 216.0, timestamp = 1514766600000, trendArrow = GlucoseValue.TrendArrow.FLAT))
- list.add(InMemoryGlucoseValue(value = 219.0, timestamp = 1514766300000, trendArrow = GlucoseValue.TrendArrow.FLAT))
- list.add(InMemoryGlucoseValue(value = 223.0, timestamp = 1514766000000, trendArrow = GlucoseValue.TrendArrow.FLAT))
- list.add(InMemoryGlucoseValue(value = 222.0, timestamp = 1514765700000, trendArrow = GlucoseValue.TrendArrow.FLAT))
- list.add(InMemoryGlucoseValue(value = 224.0, timestamp = 1514765400000, trendArrow = GlucoseValue.TrendArrow.FLAT))
- list.add(InMemoryGlucoseValue(value = 226.0, timestamp = 1514765100000, trendArrow = GlucoseValue.TrendArrow.FLAT))
- list.add(InMemoryGlucoseValue(value = 228.0, timestamp = 1514764800000, trendArrow = GlucoseValue.TrendArrow.FLAT))
+ list.add(InMemoryGlucoseValue(value = 214.0, timestamp = 1514766900000, trendArrow = GlucoseValue.TrendArrow.FLAT, sourceSensor = GlucoseValue.SourceSensor.UNKNOWN))
+ list.add(InMemoryGlucoseValue(value = 216.0, timestamp = 1514766600000, trendArrow = GlucoseValue.TrendArrow.FLAT, sourceSensor = GlucoseValue.SourceSensor.UNKNOWN))
+ list.add(InMemoryGlucoseValue(value = 219.0, timestamp = 1514766300000, trendArrow = GlucoseValue.TrendArrow.FLAT, sourceSensor = GlucoseValue.SourceSensor.UNKNOWN))
+ list.add(InMemoryGlucoseValue(value = 223.0, timestamp = 1514766000000, trendArrow = GlucoseValue.TrendArrow.FLAT, sourceSensor = GlucoseValue.SourceSensor.UNKNOWN))
+ list.add(InMemoryGlucoseValue(value = 222.0, timestamp = 1514765700000, trendArrow = GlucoseValue.TrendArrow.FLAT, sourceSensor = GlucoseValue.SourceSensor.UNKNOWN))
+ list.add(InMemoryGlucoseValue(value = 224.0, timestamp = 1514765400000, trendArrow = GlucoseValue.TrendArrow.FLAT, sourceSensor = GlucoseValue.SourceSensor.UNKNOWN))
+ list.add(InMemoryGlucoseValue(value = 226.0, timestamp = 1514765100000, trendArrow = GlucoseValue.TrendArrow.FLAT, sourceSensor = GlucoseValue.SourceSensor.UNKNOWN))
+ list.add(InMemoryGlucoseValue(value = 228.0, timestamp = 1514764800000, trendArrow = GlucoseValue.TrendArrow.FLAT, sourceSensor = GlucoseValue.SourceSensor.UNKNOWN))
return list
}
}
\ No newline at end of file
diff --git a/plugins/configuration/src/main/java/info/nightscout/configuration/configBuilder/RunningConfigurationImpl.kt b/plugins/configuration/src/main/java/info/nightscout/configuration/configBuilder/RunningConfigurationImpl.kt
index 81643a8d2d..1696e5c6a0 100644
--- a/plugins/configuration/src/main/java/info/nightscout/configuration/configBuilder/RunningConfigurationImpl.kt
+++ b/plugins/configuration/src/main/java/info/nightscout/configuration/configBuilder/RunningConfigurationImpl.kt
@@ -75,7 +75,7 @@ class RunningConfigurationImpl @Inject constructor(
assert(config.NSCLIENT)
configuration.version?.let {
- rxBus.send(EventNSClientNewLog("VERSION", "Received AAPS version $it"))
+ rxBus.send(EventNSClientNewLog("◄ VERSION", "Received AAPS version $it"))
if (config.VERSION_NAME.startsWith(it).not())
uiInteraction.addNotification(Notification.NSCLIENT_VERSION_DOES_NOT_MATCH, rh.gs(R.string.nsclient_version_does_not_match), Notification.NORMAL)
}
diff --git a/plugins/configuration/src/main/java/info/nightscout/configuration/maintenance/MaintenanceFragment.kt b/plugins/configuration/src/main/java/info/nightscout/configuration/maintenance/MaintenanceFragment.kt
index 07129ebf4b..d54b79ee3d 100644
--- a/plugins/configuration/src/main/java/info/nightscout/configuration/maintenance/MaintenanceFragment.kt
+++ b/plugins/configuration/src/main/java/info/nightscout/configuration/maintenance/MaintenanceFragment.kt
@@ -24,7 +24,7 @@ import info.nightscout.interfaces.plugin.OwnDatabasePlugin
import info.nightscout.interfaces.protection.ProtectionCheck
import info.nightscout.interfaces.protection.ProtectionCheck.Protection.PREFERENCES
import info.nightscout.interfaces.pump.PumpSync
-import info.nightscout.interfaces.sync.DataSyncSelector
+import info.nightscout.interfaces.sync.DataSyncSelectorXdrip
import info.nightscout.interfaces.ui.UiInteraction
import info.nightscout.interfaces.utils.HtmlHelper
import info.nightscout.rx.AapsSchedulers
@@ -51,7 +51,7 @@ class MaintenanceFragment : DaggerFragment() {
@Inject lateinit var persistenceLayer: PersistenceLayer
@Inject lateinit var protectionCheck: ProtectionCheck
@Inject lateinit var uel: UserEntryLogger
- @Inject lateinit var dataSyncSelector: DataSyncSelector
+ @Inject lateinit var dataSyncSelectorXdrip: DataSyncSelectorXdrip
@Inject lateinit var pumpSync: PumpSync
@Inject lateinit var iobCobCalculator: IobCobCalculator
@Inject lateinit var overviewData: OverviewData
@@ -93,7 +93,8 @@ class MaintenanceFragment : DaggerFragment() {
for (plugin in activePlugin.getSpecificPluginsListByInterface(OwnDatabasePlugin::class.java)) {
(plugin as OwnDatabasePlugin).clearAllTables()
}
- dataSyncSelector.resetToNextFullSync()
+ activePlugin.activeNsClient?.dataSyncSelector?.resetToNextFullSync()
+ dataSyncSelectorXdrip.resetToNextFullSync()
pumpSync.connectNewPump()
overviewData.reset()
iobCobCalculator.ads.reset()
@@ -111,7 +112,7 @@ class MaintenanceFragment : DaggerFragment() {
binding.cleanupDb.setOnClickListener {
activity?.let { activity ->
var result = ""
- OKDialog.showConfirmation(activity, rh.gs(R.string.maintenance), rh.gs(R.string.cleanup_db_confirm), Runnable {
+ OKDialog.showConfirmation(activity, rh.gs(R.string.maintenance), rh.gs(info.nightscout.core.ui.R.string.cleanup_db_confirm), Runnable {
disposable += Completable.fromAction { result = persistenceLayer.cleanupDatabase(93, deleteTrackedChanges = true) }
.subscribeOn(aapsSchedulers.io)
.observeOn(aapsSchedulers.main)
@@ -119,7 +120,12 @@ class MaintenanceFragment : DaggerFragment() {
onError = { aapsLogger.error("Error cleaning up databases", it) },
onComplete = {
if (result.isNotEmpty())
- OKDialog.show(activity, rh.gs(info.nightscout.core.ui.R.string.result), HtmlHelper.fromHtml("" + rh.gs(R.string.cleared_entries) + "\n" + result).toSpanned())
+ OKDialog.show(
+ activity,
+ rh.gs(info.nightscout.core.ui.R.string.result),
+ HtmlHelper.fromHtml("" + rh.gs(info.nightscout.core.ui.R.string.cleared_entries) + "
" + result)
+ .toSpanned()
+ )
aapsLogger.info(LTag.CORE, "Cleaned up databases with result: $result")
}
)
diff --git a/plugins/configuration/src/main/res/values/strings.xml b/plugins/configuration/src/main/res/values/strings.xml
index 5d4775d22f..11d79252f0 100644
--- a/plugins/configuration/src/main/res/values/strings.xml
+++ b/plugins/configuration/src/main/res/values/strings.xml
@@ -122,8 +122,6 @@
MAINT
Provides several functions for maintenance (eg. log sending, log deletion).
Database cleanup
- Do you want to cleanup the database?\nIt will remove tracked changes and historic data older than 3 months.
- Cleared entries
Do you really want to reset the databases?
Maintenance Settings
Email recipient
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/di/PluginsModule.kt b/plugins/main/src/main/java/info/nightscout/plugins/di/PluginsModule.kt
index 3cab10f782..7cf567fff0 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/di/PluginsModule.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/di/PluginsModule.kt
@@ -17,6 +17,7 @@ import info.nightscout.plugins.iob.iobCobCalculator.data.AutosensDataObject
FoodModule::class,
SMSCommunicatorModule::class,
ProfileModule::class,
+ ProfileModule.Bindings::class,
SkinsModule::class,
SkinsUiModule::class,
ActionsModule::class,
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/di/ProfileModule.kt b/plugins/main/src/main/java/info/nightscout/plugins/di/ProfileModule.kt
index d8498abafb..f9a1642a8e 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/di/ProfileModule.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/di/ProfileModule.kt
@@ -1,7 +1,9 @@
package info.nightscout.plugins.di
+import dagger.Binds
import dagger.Module
import dagger.android.ContributesAndroidInjector
+import info.nightscout.interfaces.profile.ProfileSource
import info.nightscout.plugins.profile.ProfileFragment
import info.nightscout.plugins.profile.ProfilePlugin
@@ -9,6 +11,12 @@ import info.nightscout.plugins.profile.ProfilePlugin
@Suppress("unused")
abstract class ProfileModule {
- @ContributesAndroidInjector abstract fun contributesNSProfileWorker(): ProfilePlugin.NSProfileWorker
@ContributesAndroidInjector abstract fun contributesLocalProfileFragment(): ProfileFragment
+
+ @Module
+ interface Bindings {
+
+ @Binds fun bindProfileSource(profilePlugin: ProfilePlugin): ProfileSource
+ }
+
}
\ No newline at end of file
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/notifications/NotificationWithAction.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/notifications/NotificationWithAction.kt
index fe25a9823c..27c2be99fe 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/notifications/NotificationWithAction.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/notifications/NotificationWithAction.kt
@@ -4,7 +4,6 @@ import dagger.android.HasAndroidInjector
import info.nightscout.interfaces.notifications.Notification
import info.nightscout.interfaces.nsclient.NSAlarm
import info.nightscout.interfaces.plugin.ActivePlugin
-import info.nightscout.interfaces.profile.DefaultValueHelper
import info.nightscout.plugins.R
import info.nightscout.rx.logging.AAPSLogger
import info.nightscout.rx.logging.LTag
@@ -21,7 +20,6 @@ class NotificationWithAction constructor(
@Inject lateinit var aapsLogger: AAPSLogger
@Inject lateinit var rh: ResourceHelper
@Inject lateinit var sp: SP
- @Inject lateinit var defaultValueHelper: DefaultValueHelper
@Inject lateinit var activePlugin: ActivePlugin
init {
@@ -66,7 +64,7 @@ class NotificationWithAction constructor(
aapsLogger.debug(LTag.NOTIFICATION, "Notification text is: $text")
val msToSnooze = sp.getInt(info.nightscout.core.utils.R.string.key_ns_alarm_stale_data_value, 15) * 60 * 1000L
aapsLogger.debug(LTag.NOTIFICATION, "snooze nsalarm_staledatavalue in minutes is ${T.msecs(msToSnooze).mins()} currentTimeMillis is: ${System.currentTimeMillis()}")
- sp.putLong(info.nightscout.core.utils.R.string.key_snoozed_to, System.currentTimeMillis() + msToSnooze)
+ sp.putLong(rh.gs(info.nightscout.core.utils.R.string.key_snoozed_to) + nsAlarm.level(), System.currentTimeMillis() + msToSnooze)
}
}
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfilePlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfilePlugin.kt
index 85b4fe2f74..2c50a283d2 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfilePlugin.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfilePlugin.kt
@@ -1,9 +1,6 @@
package info.nightscout.plugins.profile
-import android.content.Context
import androidx.fragment.app.FragmentActivity
-import androidx.work.WorkerParameters
-import androidx.work.workDataOf
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.annotations.OpenForTesting
import info.nightscout.core.extensions.blockFromJsonArray
@@ -11,12 +8,9 @@ import info.nightscout.core.extensions.pureProfileFromJson
import info.nightscout.core.profile.ProfileSealed
import info.nightscout.core.ui.dialogs.OKDialog
import info.nightscout.core.ui.toast.ToastUtils
-import info.nightscout.core.utils.receivers.DataWorkerStorage
-import info.nightscout.core.utils.worker.LoggingWorker
import info.nightscout.interfaces.Config
import info.nightscout.interfaces.Constants
import info.nightscout.interfaces.GlucoseUnit
-import info.nightscout.interfaces.XDripBroadcast
import info.nightscout.interfaces.notifications.Notification
import info.nightscout.interfaces.plugin.ActivePlugin
import info.nightscout.interfaces.plugin.PluginBase
@@ -40,7 +34,6 @@ import info.nightscout.rx.logging.LTag
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.shared.sharedPreferences.SP
import info.nightscout.shared.utils.DateUtil
-import kotlinx.coroutines.Dispatchers
import org.json.JSONArray
import org.json.JSONException
import org.json.JSONObject
@@ -235,7 +228,7 @@ class ProfilePlugin @Inject constructor(
}
@Synchronized
- fun loadFromStore(store: ProfileStore) {
+ override fun loadFromStore(store: ProfileStore) {
try {
val newProfiles: ArrayList = ArrayList()
for (p in store.getProfileList()) {
@@ -429,41 +422,4 @@ class ProfilePlugin @Inject constructor(
get() = rawProfile?.getDefaultProfile()?.let {
DecimalFormatter.to2Decimal(ProfileSealed.Pure(it).percentageBasalSum()) + "U "
} ?: "INVALID"
-
- // cannot be inner class because of needed injection
- class NSProfileWorker(
- context: Context,
- params: WorkerParameters
- ) : LoggingWorker(context, params, Dispatchers.Default) {
-
- @Inject lateinit var injector: HasAndroidInjector
- @Inject lateinit var rxBus: RxBus
- @Inject lateinit var dateUtil: DateUtil
- @Inject lateinit var dataWorkerStorage: DataWorkerStorage
- @Inject lateinit var sp: SP
- @Inject lateinit var config: Config
- @Inject lateinit var profilePlugin: ProfilePlugin
- @Inject lateinit var xDripBroadcast: XDripBroadcast
- @Inject lateinit var instantiator: Instantiator
-
- override suspend fun doWorkAndLog(): Result {
- val profileJson = dataWorkerStorage.pickupJSONObject(inputData.getLong(DataWorkerStorage.STORE_KEY, -1))
- ?: return Result.failure(workDataOf("Error" to "missing input data"))
- xDripBroadcast.sendProfile(profileJson)
- if (sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_receive_profile_store, true) || config.NSCLIENT) {
- val store = instantiator.provideProfileStore(profileJson)
- val createdAt = store.getStartDate()
- val lastLocalChange = sp.getLong(info.nightscout.core.utils.R.string.key_local_profile_last_change, 0)
- aapsLogger.debug(LTag.PROFILE, "Received profileStore: createdAt: $createdAt Local last modification: $lastLocalChange")
- @Suppress("LiftReturnOrAssignment")
- if (createdAt > lastLocalChange || createdAt % 1000 == 0L) {// whole second means edited in NS
- profilePlugin.loadFromStore(store)
- aapsLogger.debug(LTag.PROFILE, "Received profileStore: $profileJson")
- return Result.success(workDataOf("Data" to profileJson.toString().substring(0..Integer.min(5000, profileJson.length()))))
- } else
- return Result.success(workDataOf("Result" to "Unchanged. Ignoring"))
- }
- return Result.success(workDataOf("Result" to "Sync not enabled"))
- }
- }
}
\ No newline at end of file
diff --git a/plugins/main/src/main/res/xml/pref_overview.xml b/plugins/main/src/main/res/xml/pref_overview.xml
index 4e8498cf49..cd195d6e1a 100644
--- a/plugins/main/src/main/res/xml/pref_overview.xml
+++ b/plugins/main/src/main/res/xml/pref_overview.xml
@@ -496,7 +496,7 @@
+ android:title="@string/advanced_settings_title">
+
+ android:title="@string/advanced_settings_title">
+ android:title="@string/advanced_settings_title">
Sources.Tomato
R.string.glunovo -> Sources.Glunovo
R.string.intelligo -> Sources.Intelligo
- R.string.xdrip -> Sources.Xdrip
+ R.string.source_xdrip -> Sources.Xdrip
R.string.aidex -> Sources.Aidex
else -> Sources.Unknown
}
diff --git a/plugins/source/src/main/java/info/nightscout/source/DexcomPlugin.kt b/plugins/source/src/main/java/info/nightscout/source/DexcomPlugin.kt
index 16b2f58c36..7aefb92707 100644
--- a/plugins/source/src/main/java/info/nightscout/source/DexcomPlugin.kt
+++ b/plugins/source/src/main/java/info/nightscout/source/DexcomPlugin.kt
@@ -20,7 +20,6 @@ import info.nightscout.database.impl.transactions.CgmSourceTransaction
import info.nightscout.database.impl.transactions.InvalidateGlucoseValueTransaction
import info.nightscout.database.transactions.TransactionGlucoseValue
import info.nightscout.interfaces.Config
-import info.nightscout.interfaces.XDripBroadcast
import info.nightscout.interfaces.logging.UserEntryLogger
import info.nightscout.interfaces.plugin.PluginBase
import info.nightscout.interfaces.plugin.PluginDescription
@@ -91,7 +90,6 @@ class DexcomPlugin @Inject constructor(
@Inject lateinit var sp: SP
@Inject lateinit var dateUtil: DateUtil
@Inject lateinit var dataWorkerStorage: DataWorkerStorage
- @Inject lateinit var xDripBroadcast: XDripBroadcast
@Inject lateinit var repository: AppRepository
@Inject lateinit var uel: UserEntryLogger
@@ -185,11 +183,9 @@ class DexcomPlugin @Inject constructor(
}
}
}
- xDripBroadcast.sendIn640gMode(result.inserted[i])
aapsLogger.debug(LTag.DATABASE, "Inserted bg ${result.inserted[i]}")
}
result.updated.forEach {
- xDripBroadcast.sendIn640gMode(it)
aapsLogger.debug(LTag.DATABASE, "Updated bg $it")
}
result.sensorInsertionsInserted.forEach {
diff --git a/plugins/source/src/main/java/info/nightscout/source/EversensePlugin.kt b/plugins/source/src/main/java/info/nightscout/source/EversensePlugin.kt
index b915b0df08..fef2626d90 100644
--- a/plugins/source/src/main/java/info/nightscout/source/EversensePlugin.kt
+++ b/plugins/source/src/main/java/info/nightscout/source/EversensePlugin.kt
@@ -12,7 +12,6 @@ import info.nightscout.database.impl.AppRepository
import info.nightscout.database.impl.transactions.CgmSourceTransaction
import info.nightscout.database.impl.transactions.InsertIfNewByTimestampTherapyEventTransaction
import info.nightscout.database.transactions.TransactionGlucoseValue
-import info.nightscout.interfaces.XDripBroadcast
import info.nightscout.interfaces.plugin.PluginBase
import info.nightscout.interfaces.plugin.PluginDescription
import info.nightscout.interfaces.plugin.PluginType
@@ -61,7 +60,6 @@ class EversensePlugin @Inject constructor(
@Inject lateinit var dateUtil: DateUtil
@Inject lateinit var dataWorkerStorage: DataWorkerStorage
@Inject lateinit var repository: AppRepository
- @Inject lateinit var xDripBroadcast: XDripBroadcast
override suspend fun doWorkAndLog(): Result {
var ret = Result.success()
@@ -114,7 +112,6 @@ class EversensePlugin @Inject constructor(
.blockingGet()
.also { savedValues ->
savedValues.inserted.forEach {
- xDripBroadcast.sendIn640gMode(it)
aapsLogger.debug(LTag.DATABASE, "Inserted bg $it")
}
}
diff --git a/plugins/source/src/main/java/info/nightscout/source/GlimpPlugin.kt b/plugins/source/src/main/java/info/nightscout/source/GlimpPlugin.kt
index 1d05c43f57..5e1328a22f 100644
--- a/plugins/source/src/main/java/info/nightscout/source/GlimpPlugin.kt
+++ b/plugins/source/src/main/java/info/nightscout/source/GlimpPlugin.kt
@@ -10,7 +10,6 @@ import info.nightscout.database.entities.GlucoseValue
import info.nightscout.database.impl.AppRepository
import info.nightscout.database.impl.transactions.CgmSourceTransaction
import info.nightscout.database.transactions.TransactionGlucoseValue
-import info.nightscout.interfaces.XDripBroadcast
import info.nightscout.interfaces.plugin.PluginBase
import info.nightscout.interfaces.plugin.PluginDescription
import info.nightscout.interfaces.plugin.PluginType
@@ -50,7 +49,6 @@ class GlimpPlugin @Inject constructor(
@Inject lateinit var injector: HasAndroidInjector
@Inject lateinit var glimpPlugin: GlimpPlugin
@Inject lateinit var repository: AppRepository
- @Inject lateinit var xDripBroadcast: XDripBroadcast
override suspend fun doWorkAndLog(): Result {
var ret = Result.success()
@@ -74,7 +72,6 @@ class GlimpPlugin @Inject constructor(
.blockingGet()
.also { savedValues ->
savedValues.inserted.forEach {
- xDripBroadcast.sendIn640gMode(it)
aapsLogger.debug(LTag.DATABASE, "Inserted bg $it")
}
}
diff --git a/plugins/source/src/main/java/info/nightscout/source/GlunovoPlugin.kt b/plugins/source/src/main/java/info/nightscout/source/GlunovoPlugin.kt
index 29cec010b6..2c7bf928ba 100644
--- a/plugins/source/src/main/java/info/nightscout/source/GlunovoPlugin.kt
+++ b/plugins/source/src/main/java/info/nightscout/source/GlunovoPlugin.kt
@@ -14,7 +14,6 @@ import info.nightscout.database.impl.AppRepository
import info.nightscout.database.impl.transactions.CgmSourceTransaction
import info.nightscout.database.transactions.TransactionGlucoseValue
import info.nightscout.interfaces.Constants
-import info.nightscout.interfaces.XDripBroadcast
import info.nightscout.interfaces.logging.UserEntryLogger
import info.nightscout.interfaces.plugin.PluginBase
import info.nightscout.interfaces.plugin.PluginDescription
@@ -38,7 +37,6 @@ class GlunovoPlugin @Inject constructor(
private val sp: SP,
private val context: Context,
private val repository: AppRepository,
- private val xDripBroadcast: XDripBroadcast,
private val dateUtil: DateUtil,
private val uel: UserEntryLogger,
private val fabricPrivacy: FabricPrivacy
@@ -148,7 +146,6 @@ class GlunovoPlugin @Inject constructor(
.blockingGet()
.also { savedValues ->
savedValues.inserted.forEach {
- xDripBroadcast.sendIn640gMode(it)
aapsLogger.debug(LTag.DATABASE, "Inserted bg $it")
}
savedValues.calibrationsInserted.forEach { calibration ->
diff --git a/plugins/source/src/main/java/info/nightscout/source/IntelligoPlugin.kt b/plugins/source/src/main/java/info/nightscout/source/IntelligoPlugin.kt
index a1f166ab7b..411a30f0ac 100644
--- a/plugins/source/src/main/java/info/nightscout/source/IntelligoPlugin.kt
+++ b/plugins/source/src/main/java/info/nightscout/source/IntelligoPlugin.kt
@@ -16,7 +16,6 @@ import info.nightscout.database.impl.AppRepository
import info.nightscout.database.impl.transactions.CgmSourceTransaction
import info.nightscout.database.transactions.TransactionGlucoseValue
import info.nightscout.interfaces.Constants
-import info.nightscout.interfaces.XDripBroadcast
import info.nightscout.interfaces.logging.UserEntryLogger
import info.nightscout.interfaces.plugin.PluginBase
import info.nightscout.interfaces.plugin.PluginDescription
@@ -41,7 +40,6 @@ class IntelligoPlugin @Inject constructor(
private val sp: SP,
private val context: Context,
private val repository: AppRepository,
- private val xDripBroadcast: XDripBroadcast,
private val dateUtil: DateUtil,
private val uel: UserEntryLogger,
private val fabricPrivacy: FabricPrivacy
@@ -159,7 +157,6 @@ class IntelligoPlugin @Inject constructor(
.blockingGet()
.also { savedValues ->
savedValues.inserted.forEach {
- xDripBroadcast.sendIn640gMode(it)
aapsLogger.debug(LTag.DATABASE, "Inserted bg $it")
}
savedValues.calibrationsInserted.forEach { calibration ->
diff --git a/plugins/source/src/main/java/info/nightscout/source/MM640gPlugin.kt b/plugins/source/src/main/java/info/nightscout/source/MM640gPlugin.kt
index 78440fd2de..41c60db626 100644
--- a/plugins/source/src/main/java/info/nightscout/source/MM640gPlugin.kt
+++ b/plugins/source/src/main/java/info/nightscout/source/MM640gPlugin.kt
@@ -4,13 +4,11 @@ import android.content.Context
import androidx.work.WorkerParameters
import androidx.work.workDataOf
import dagger.android.HasAndroidInjector
-import info.nightscout.core.utils.receivers.DataWorkerStorage
import info.nightscout.core.utils.worker.LoggingWorker
import info.nightscout.database.entities.GlucoseValue
import info.nightscout.database.impl.AppRepository
import info.nightscout.database.impl.transactions.CgmSourceTransaction
import info.nightscout.database.transactions.TransactionGlucoseValue
-import info.nightscout.interfaces.XDripBroadcast
import info.nightscout.interfaces.plugin.PluginBase
import info.nightscout.interfaces.plugin.PluginDescription
import info.nightscout.interfaces.plugin.PluginType
@@ -51,9 +49,7 @@ class MM640gPlugin @Inject constructor(
@Inject lateinit var mM640gPlugin: MM640gPlugin
@Inject lateinit var injector: HasAndroidInjector
@Inject lateinit var dateUtil: DateUtil
- @Inject lateinit var dataWorkerStorage: DataWorkerStorage
@Inject lateinit var repository: AppRepository
- @Inject lateinit var xDripBroadcast: XDripBroadcast
override suspend fun doWorkAndLog(): Result {
var ret = Result.success()
@@ -90,7 +86,6 @@ class MM640gPlugin @Inject constructor(
.blockingGet()
.also { savedValues ->
savedValues.all().forEach {
- xDripBroadcast.sendIn640gMode(it)
aapsLogger.debug(LTag.DATABASE, "Inserted bg $it")
}
}
diff --git a/plugins/source/src/main/java/info/nightscout/source/NSClientSourcePlugin.kt b/plugins/source/src/main/java/info/nightscout/source/NSClientSourcePlugin.kt
index 9863eff071..d4aee71030 100644
--- a/plugins/source/src/main/java/info/nightscout/source/NSClientSourcePlugin.kt
+++ b/plugins/source/src/main/java/info/nightscout/source/NSClientSourcePlugin.kt
@@ -1,39 +1,16 @@
package info.nightscout.source
-import android.content.Context
-import androidx.work.WorkerParameters
-import androidx.work.workDataOf
import dagger.android.HasAndroidInjector
-import info.nightscout.core.utils.receivers.DataWorkerStorage
-import info.nightscout.core.utils.worker.LoggingWorker
import info.nightscout.database.entities.GlucoseValue
-import info.nightscout.database.impl.AppRepository
-import info.nightscout.database.transactions.TransactionGlucoseValue
import info.nightscout.interfaces.Config
-import info.nightscout.interfaces.XDripBroadcast
-import info.nightscout.interfaces.notifications.Notification
-import info.nightscout.interfaces.nsclient.NSSgv
-import info.nightscout.interfaces.nsclient.StoreDataForDb
-import info.nightscout.interfaces.plugin.ActivePlugin
import info.nightscout.interfaces.plugin.PluginBase
import info.nightscout.interfaces.plugin.PluginDescription
import info.nightscout.interfaces.plugin.PluginType
import info.nightscout.interfaces.source.BgSource
import info.nightscout.interfaces.source.DoingOwnUploadSource
import info.nightscout.interfaces.source.NSClientSource
-import info.nightscout.rx.bus.RxBus
-import info.nightscout.rx.events.EventDismissNotification
import info.nightscout.rx.logging.AAPSLogger
-import info.nightscout.rx.logging.LTag
-import info.nightscout.sdk.localmodel.entry.NSSgvV3
import info.nightscout.shared.interfaces.ResourceHelper
-import info.nightscout.shared.sharedPreferences.SP
-import info.nightscout.shared.utils.DateUtil
-import info.nightscout.shared.utils.T
-import kotlinx.coroutines.Dispatchers
-import org.json.JSONArray
-import org.json.JSONObject
-import java.security.InvalidParameterException
import javax.inject.Inject
import javax.inject.Singleton
@@ -50,21 +27,15 @@ class NSClientSourcePlugin @Inject constructor(
.pluginIcon(info.nightscout.core.main.R.drawable.ic_nsclient_bg)
.pluginName(R.string.ns_client_bg)
.shortName(R.string.ns_client_bg_short)
- .description(R.string.description_source_ns_client),
+ .description(R.string.description_source_ns_client)
+ .alwaysEnabled(config.NSCLIENT)
+ .setDefault(config.NSCLIENT),
aapsLogger, rh, injector
), BgSource, NSClientSource, DoingOwnUploadSource {
private var lastBGTimeStamp: Long = 0
private var isAdvancedFilteringEnabled = false
- init {
- if (config.NSCLIENT) {
- pluginDescription
- .alwaysEnabled(true)
- .setDefault()
- }
- }
-
override fun advancedFilteringSupported(): Boolean = isAdvancedFilteringEnabled
override fun shouldUploadToNs(glucoseValue: GlucoseValue): Boolean = false
@@ -81,96 +52,4 @@ class NSClientSourcePlugin @Inject constructor(
lastBGTimeStamp = glucoseValue.timestamp
}
}
-
- // cannot be inner class because of needed injection
- class NSClientSourceWorker(
- context: Context,
- params: WorkerParameters
- ) : LoggingWorker(context, params, Dispatchers.IO) {
-
- @Inject lateinit var nsClientSourcePlugin: NSClientSourcePlugin
- @Inject lateinit var injector: HasAndroidInjector
- @Inject lateinit var sp: SP
- @Inject lateinit var rxBus: RxBus
- @Inject lateinit var dateUtil: DateUtil
- @Inject lateinit var dataWorkerStorage: DataWorkerStorage
- @Inject lateinit var repository: AppRepository
- @Inject lateinit var xDripBroadcast: XDripBroadcast
- @Inject lateinit var activePlugin: ActivePlugin
- @Inject lateinit var storeDataForDb: StoreDataForDb
-
- private fun toGv(jsonObject: JSONObject): TransactionGlucoseValue? {
- val sgv = NSSgv(jsonObject)
- return TransactionGlucoseValue(
- timestamp = sgv.mills ?: return null,
- value = sgv.mgdl?.toDouble() ?: return null,
- noise = null,
- raw = sgv.filtered?.toDouble(),
- trendArrow = GlucoseValue.TrendArrow.fromString(sgv.direction),
- nightscoutId = sgv.id,
- sourceSensor = GlucoseValue.SourceSensor.fromString(sgv.device)
- )
- }
-
- private fun toGv(sgv: NSSgvV3): TransactionGlucoseValue {
- return TransactionGlucoseValue(
- timestamp = sgv.date ?: throw InvalidParameterException(),
- value = sgv.sgv,
- noise = sgv.noise?.toDouble(),
- raw = sgv.filtered,
- trendArrow = GlucoseValue.TrendArrow.fromString(sgv.direction?.nsName),
- nightscoutId = sgv.identifier,
- sourceSensor = GlucoseValue.SourceSensor.fromString(sgv.device),
- isValid = sgv.isValid,
- utcOffset = T.mins(sgv.utcOffset ?: 0L).msecs()
- )
- }
-
- @Suppress("SpellCheckingInspection")
- override suspend fun doWorkAndLog(): Result {
- var ret = Result.success()
- val sgvs = dataWorkerStorage.pickupObject(inputData.getLong(DataWorkerStorage.STORE_KEY, -1))
- ?: return Result.failure(workDataOf("Error" to "missing input data"))
-
- if (!nsClientSourcePlugin.isEnabled() && !sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_receive_cgm, false))
- return Result.success(workDataOf("Result" to "Sync not enabled"))
-
- var latestDateInReceivedData: Long = 0
- aapsLogger.debug(LTag.BGSOURCE, "Received NS Data: $sgvs")
- val glucoseValues = mutableListOf()
-
- try {
- if (sgvs is JSONArray) { // V1 client
- xDripBroadcast.sendSgvs(sgvs)
-
- for (i in 0 until sgvs.length()) {
- val sgv = toGv(sgvs.getJSONObject(i)) ?: continue
- if (sgv.timestamp < dateUtil.now() && sgv.timestamp > latestDateInReceivedData) latestDateInReceivedData = sgv.timestamp
- glucoseValues += sgv
- }
-
- } else if (sgvs is List<*>) { // V3 client
-
- for (i in 0 until sgvs.size) {
- val sgv = toGv(sgvs[i] as NSSgvV3)
- if (sgv.timestamp < dateUtil.now() && sgv.timestamp > latestDateInReceivedData) latestDateInReceivedData = sgv.timestamp
- glucoseValues += sgv
- }
-
- }
- activePlugin.activeNsClient?.updateLatestBgReceivedIfNewer(latestDateInReceivedData)
- // Was that sgv more less 5 mins ago ?
- if (T.msecs(dateUtil.now() - latestDateInReceivedData).mins() < 5L) {
- rxBus.send(EventDismissNotification(Notification.NS_ALARM))
- rxBus.send(EventDismissNotification(Notification.NS_URGENT_ALARM))
- }
-
- storeDataForDb.glucoseValues.addAll(glucoseValues)
- } catch (e: Exception) {
- aapsLogger.error("Unhandled exception", e)
- ret = Result.failure(workDataOf("Error" to e.toString()))
- }
- return ret
- }
- }
}
\ No newline at end of file
diff --git a/plugins/source/src/main/java/info/nightscout/source/PoctechPlugin.kt b/plugins/source/src/main/java/info/nightscout/source/PoctechPlugin.kt
index ff20504e27..e4aa9ce32e 100644
--- a/plugins/source/src/main/java/info/nightscout/source/PoctechPlugin.kt
+++ b/plugins/source/src/main/java/info/nightscout/source/PoctechPlugin.kt
@@ -10,7 +10,6 @@ import info.nightscout.database.impl.AppRepository
import info.nightscout.database.impl.transactions.CgmSourceTransaction
import info.nightscout.database.transactions.TransactionGlucoseValue
import info.nightscout.interfaces.Constants
-import info.nightscout.interfaces.XDripBroadcast
import info.nightscout.interfaces.plugin.PluginBase
import info.nightscout.interfaces.plugin.PluginDescription
import info.nightscout.interfaces.plugin.PluginType
@@ -52,7 +51,6 @@ class PoctechPlugin @Inject constructor(
@Inject lateinit var injector: HasAndroidInjector
@Inject lateinit var poctechPlugin: PoctechPlugin
@Inject lateinit var repository: AppRepository
- @Inject lateinit var xDripBroadcast: XDripBroadcast
override suspend fun doWorkAndLog(): Result {
var ret = Result.success()
@@ -83,7 +81,6 @@ class PoctechPlugin @Inject constructor(
.blockingGet()
.also { savedValues ->
savedValues.inserted.forEach {
- xDripBroadcast.sendIn640gMode(it)
aapsLogger.debug(LTag.DATABASE, "Inserted bg $it")
}
}
diff --git a/plugins/source/src/main/java/info/nightscout/source/RandomBgPlugin.kt b/plugins/source/src/main/java/info/nightscout/source/RandomBgPlugin.kt
index c1b14e5a54..88e20a0972 100644
--- a/plugins/source/src/main/java/info/nightscout/source/RandomBgPlugin.kt
+++ b/plugins/source/src/main/java/info/nightscout/source/RandomBgPlugin.kt
@@ -10,7 +10,6 @@ import info.nightscout.database.impl.AppRepository
import info.nightscout.database.impl.transactions.CgmSourceTransaction
import info.nightscout.database.transactions.TransactionGlucoseValue
import info.nightscout.interfaces.Config
-import info.nightscout.interfaces.XDripBroadcast
import info.nightscout.interfaces.plugin.PluginBase
import info.nightscout.interfaces.plugin.PluginDescription
import info.nightscout.interfaces.plugin.PluginType
@@ -38,7 +37,6 @@ class RandomBgPlugin @Inject constructor(
aapsLogger: AAPSLogger,
private val sp: SP,
private val repository: AppRepository,
- private val xDripBroadcast: XDripBroadcast,
private val virtualPump: VirtualPump,
private val config: Config
) : PluginBase(
@@ -119,7 +117,6 @@ class RandomBgPlugin @Inject constructor(
disposable += repository.runTransactionForResult(CgmSourceTransaction(glucoseValues, emptyList(), null))
.subscribe({ savedValues ->
savedValues.inserted.forEach {
- xDripBroadcast.sendIn640gMode(it)
aapsLogger.debug(LTag.DATABASE, "Inserted bg $it")
}
}, { aapsLogger.error(LTag.DATABASE, "Error while saving values from Random plugin", it) }
diff --git a/plugins/source/src/main/java/info/nightscout/source/TomatoPlugin.kt b/plugins/source/src/main/java/info/nightscout/source/TomatoPlugin.kt
index bf7fd2c0cf..1c4d0432ab 100644
--- a/plugins/source/src/main/java/info/nightscout/source/TomatoPlugin.kt
+++ b/plugins/source/src/main/java/info/nightscout/source/TomatoPlugin.kt
@@ -9,7 +9,6 @@ import info.nightscout.database.entities.GlucoseValue
import info.nightscout.database.impl.AppRepository
import info.nightscout.database.impl.transactions.CgmSourceTransaction
import info.nightscout.database.transactions.TransactionGlucoseValue
-import info.nightscout.interfaces.XDripBroadcast
import info.nightscout.interfaces.plugin.PluginBase
import info.nightscout.interfaces.plugin.PluginDescription
import info.nightscout.interfaces.plugin.PluginType
@@ -50,7 +49,6 @@ class TomatoPlugin @Inject constructor(
@Inject lateinit var tomatoPlugin: TomatoPlugin
@Inject lateinit var sp: SP
@Inject lateinit var repository: AppRepository
- @Inject lateinit var xDripBroadcast: XDripBroadcast
@Suppress("SpellCheckingInspection")
override suspend fun doWorkAndLog(): Result {
@@ -74,7 +72,6 @@ class TomatoPlugin @Inject constructor(
.blockingGet()
.also { savedValues ->
savedValues.inserted.forEach {
- xDripBroadcast.sendIn640gMode(it)
aapsLogger.debug(LTag.DATABASE, "Inserted bg $it")
}
}
diff --git a/plugins/source/src/main/java/info/nightscout/source/XdripSourcePlugin.kt b/plugins/source/src/main/java/info/nightscout/source/XdripSourcePlugin.kt
index 78c9084dab..227fa23f42 100644
--- a/plugins/source/src/main/java/info/nightscout/source/XdripSourcePlugin.kt
+++ b/plugins/source/src/main/java/info/nightscout/source/XdripSourcePlugin.kt
@@ -34,7 +34,7 @@ class XdripSourcePlugin @Inject constructor(
.mainType(PluginType.BGSOURCE)
.fragmentClass(BGSourceFragment::class.java.name)
.pluginIcon((info.nightscout.core.main.R.drawable.ic_blooddrop_48))
- .pluginName(R.string.xdrip)
+ .pluginName(R.string.source_xdrip)
.description(R.string.description_source_xdrip),
aapsLogger, rh, injector
), BgSource, DoingOwnUploadSource, XDrip {
diff --git a/plugins/source/src/main/java/info/nightscout/source/di/SourceModule.kt b/plugins/source/src/main/java/info/nightscout/source/di/SourceModule.kt
index 08d5e3e57b..7ef977156b 100644
--- a/plugins/source/src/main/java/info/nightscout/source/di/SourceModule.kt
+++ b/plugins/source/src/main/java/info/nightscout/source/di/SourceModule.kt
@@ -29,7 +29,6 @@ abstract class SourceModule {
@ContributesAndroidInjector abstract fun contributesBGSourceFragment(): BGSourceFragment
- @ContributesAndroidInjector abstract fun contributesNSClientSourceWorker(): NSClientSourcePlugin.NSClientSourceWorker
@ContributesAndroidInjector abstract fun contributesXdripWorker(): XdripSourcePlugin.XdripSourceWorker
@ContributesAndroidInjector abstract fun contributesDexcomWorker(): DexcomPlugin.DexcomWorker
@ContributesAndroidInjector abstract fun contributesMM640gWorker(): MM640gPlugin.MM640gWorker
diff --git a/plugins/source/src/main/res/values/strings.xml b/plugins/source/src/main/res/values/strings.xml
index dabac7c3bd..9c2db02d03 100644
--- a/plugins/source/src/main/res/values/strings.xml
+++ b/plugins/source/src/main/res/values/strings.xml
@@ -8,7 +8,7 @@
NSClient BG
NS BG
Downloads BG data from Nightscout
- xDrip+
+ xDrip+ BG
Receive BG values from xDrip+.
BYODA
BYODA
diff --git a/plugins/source/src/main/res/xml/pref_bgsource.xml b/plugins/source/src/main/res/xml/pref_bgsource.xml
index 3fde7f76c8..5105ceb21a 100644
--- a/plugins/source/src/main/res/xml/pref_bgsource.xml
+++ b/plugins/source/src/main/res/xml/pref_bgsource.xml
@@ -12,12 +12,6 @@
android:key="@string/key_do_ns_upload"
android:title="@string/do_ns_upload_title" />
-
-
\ No newline at end of file
diff --git a/plugins/source/src/main/res/xml/pref_dexcom.xml b/plugins/source/src/main/res/xml/pref_dexcom.xml
index 0685dcaf6d..f9891d0049 100644
--- a/plugins/source/src/main/res/xml/pref_dexcom.xml
+++ b/plugins/source/src/main/res/xml/pref_dexcom.xml
@@ -12,12 +12,6 @@
android:key="@string/key_do_ns_upload"
android:title="@string/do_ns_upload_title" />
-
-
- sp.putBoolean(R.string.key_ns_client_autoscroll, isChecked)
- updateGui()
- }
-
- binding.paused.isChecked = sp.getBoolean(R.string.key_ns_client_paused, false)
+ binding.paused.isChecked = sp.getBoolean(R.string.key_ns_paused, false)
binding.paused.setOnCheckedChangeListener { _, isChecked ->
uel.log(if (isChecked) UserEntry.Action.NS_PAUSED else UserEntry.Action.NS_RESUME, UserEntry.Sources.NSClient)
nsClientPlugin?.pause(isChecked)
- updateGui()
}
+
+ logAdapter = RecyclerViewAdapter(nsClientPlugin?.listLog ?: emptyList())
+ binding.recyclerview.layoutManager = FixedLinearLayoutManager(context)
+ binding.recyclerview.adapter = logAdapter
}
override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
@@ -100,7 +119,12 @@ class NSClientFragment : DaggerFragment(), MenuProvider, PluginFragment {
override fun onMenuItemSelected(item: MenuItem): Boolean =
when (item.itemId) {
ID_MENU_CLEAR_LOG -> {
- nsClientPlugin?.clearLog()
+ nsClientPlugin?.listLog?.let {
+ synchronized(it) {
+ it.clear()
+ _binding?.recyclerview?.swapAdapter(RecyclerViewAdapter(it), true)
+ }
+ }
true
}
@@ -115,10 +139,40 @@ class NSClientFragment : DaggerFragment(), MenuProvider, PluginFragment {
}
ID_MENU_FULL_SYNC -> {
+ var result = ""
context?.let { context ->
OKDialog.showConfirmation(
context, rh.gs(R.string.ns_client), rh.gs(R.string.full_sync_comment),
- Runnable { nsClientPlugin?.resetToFullSync() }
+ Runnable {
+ OKDialog.showConfirmation(requireContext(), rh.gs(R.string.ns_client), rh.gs(info.nightscout.core.ui.R.string.cleanup_db_confirm_sync), Runnable {
+ disposable += Completable.fromAction { result = persistenceLayer.cleanupDatabase(93, deleteTrackedChanges = true) }
+ .subscribeOn(aapsSchedulers.io)
+ .observeOn(aapsSchedulers.main)
+ .subscribeBy(
+ onError = { aapsLogger.error("Error cleaning up databases", it) },
+ onComplete = {
+ if (result.isNotEmpty())
+ OKDialog.show(
+ requireContext(),
+ rh.gs(info.nightscout.core.ui.R.string.result),
+ HtmlHelper.fromHtml("" + rh.gs(info.nightscout.core.ui.R.string.cleared_entries) + "
" + result)
+ .toSpanned()
+ )
+ aapsLogger.info(LTag.CORE, "Cleaned up databases with result: $result")
+ handler.post {
+ nsClientPlugin?.resetToFullSync()
+ nsClientPlugin?.resend("FULL_SYNC")
+ }
+ }
+ )
+ uel.log(UserEntry.Action.CLEANUP_DATABASES, UserEntry.Sources.NSClient)
+ }, Runnable {
+ handler.post {
+ nsClientPlugin?.resetToFullSync()
+ nsClientPlugin?.resend("FULL_SYNC")
+ }
+ })
+ }
)
}
true
@@ -127,28 +181,69 @@ class NSClientFragment : DaggerFragment(), MenuProvider, PluginFragment {
else -> false
}
- @Synchronized override fun onResume() {
- super.onResume()
- disposable += rxBus
- .toObservable(EventNSClientUpdateGUI::class.java)
- .observeOn(aapsSchedulers.main)
- .subscribe({ updateGui() }, fabricPrivacy::logException)
- updateGui()
+ @Synchronized
+ override fun onDestroyView() {
+ super.onDestroyView()
+ binding.recyclerview.adapter = null // avoid leaks
+ _binding = null
}
- @Synchronized override fun onPause() {
+ @Synchronized
+ override fun onResume() {
+ super.onResume()
+ disposable += rxBus
+ .toObservable(EventNSClientUpdateGuiData::class.java)
+ .observeOn(aapsSchedulers.main)
+ .subscribe(
+ {
+ _binding?.recyclerview?.swapAdapter(RecyclerViewAdapter(nsClientPlugin?.listLog ?: arrayListOf()), true)
+ }, fabricPrivacy::logException
+ )
+ disposable += rxBus
+ .toObservable(EventNSClientUpdateGuiQueue::class.java)
+ .observeOn(aapsSchedulers.main)
+ .subscribe({ updateQueue() }, fabricPrivacy::logException)
+ disposable += rxBus
+ .toObservable(EventNSClientUpdateGuiStatus::class.java)
+ .debounce(3L, TimeUnit.SECONDS)
+ .observeOn(aapsSchedulers.main)
+ .subscribe({ updateStatus() }, fabricPrivacy::logException)
+ updateStatus()
+ updateQueue()
+ }
+
+ @Synchronized
+ override fun onPause() {
super.onPause()
disposable.clear()
}
- private fun updateGui() {
+ private fun updateQueue() {
+ val size = nsClientPlugin?.dataSyncSelector?.queueSize() ?: 0L
+ _binding?.queue?.text = if (size >= 0) size.toString() else rh.gs(info.nightscout.core.ui.R.string.value_unavailable_short)
+ }
+
+ private fun updateStatus() {
if (_binding == null) return
- binding.paused.isChecked = sp.getBoolean(R.string.key_ns_client_paused, false)
- binding.log.text = nsClientPlugin?.textLog()
- if (sp.getBoolean(R.string.key_ns_client_autoscroll, true)) binding.logScrollview.fullScroll(ScrollView.FOCUS_DOWN)
+ binding.paused.isChecked = sp.getBoolean(R.string.key_ns_paused, false)
binding.url.text = nsClientPlugin?.address
binding.status.text = nsClientPlugin?.status
- val size = dataSyncSelector.queueSize()
- binding.queue.text = if (size >= 0) size.toString() else rh.gs(info.nightscout.core.ui.R.string.value_unavailable_short)
+ }
+
+ private inner class RecyclerViewAdapter(private var logList: List) : RecyclerView.Adapter() {
+
+ override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): NsClientLogViewHolder =
+ NsClientLogViewHolder(LayoutInflater.from(viewGroup.context).inflate(R.layout.ns_client_log_item, viewGroup, false))
+
+ override fun onBindViewHolder(holder: NsClientLogViewHolder, position: Int) {
+ holder.binding.logText.text = HtmlHelper.fromHtml(logList[position].toPreparedHtml().toString())
+ }
+
+ override fun getItemCount() = logList.size
+
+ inner class NsClientLogViewHolder(view: View) : RecyclerView.ViewHolder(view) {
+
+ val binding = NsClientLogItemBinding.bind(view)
+ }
}
}
\ No newline at end of file
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NsIncomingDataProcessor.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NsIncomingDataProcessor.kt
new file mode 100644
index 0000000000..bff985c3c4
--- /dev/null
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NsIncomingDataProcessor.kt
@@ -0,0 +1,232 @@
+package info.nightscout.plugins.sync.nsShared
+
+import info.nightscout.androidaps.annotations.OpenForTesting
+import info.nightscout.core.extensions.foodFromJson
+import info.nightscout.database.entities.Food
+import info.nightscout.database.entities.GlucoseValue
+import info.nightscout.database.transactions.TransactionGlucoseValue
+import info.nightscout.interfaces.Config
+import info.nightscout.interfaces.Constants
+import info.nightscout.interfaces.notifications.Notification
+import info.nightscout.interfaces.nsclient.NSSgv
+import info.nightscout.interfaces.nsclient.StoreDataForDb
+import info.nightscout.interfaces.plugin.ActivePlugin
+import info.nightscout.interfaces.profile.Instantiator
+import info.nightscout.interfaces.profile.ProfileSource
+import info.nightscout.interfaces.source.NSClientSource
+import info.nightscout.interfaces.utils.JsonHelper
+import info.nightscout.plugins.sync.R
+import info.nightscout.plugins.sync.nsclientV3.extensions.*
+import info.nightscout.rx.bus.RxBus
+import info.nightscout.rx.events.EventDismissNotification
+import info.nightscout.rx.events.EventNSClientNewLog
+import info.nightscout.rx.logging.AAPSLogger
+import info.nightscout.rx.logging.LTag
+import info.nightscout.sdk.localmodel.entry.NSSgvV3
+import info.nightscout.sdk.localmodel.food.NSFood
+import info.nightscout.sdk.localmodel.treatment.*
+import info.nightscout.shared.sharedPreferences.SP
+import info.nightscout.shared.utils.DateUtil
+import info.nightscout.shared.utils.T
+import org.json.JSONArray
+import org.json.JSONObject
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@OpenForTesting
+@Singleton
+class NsIncomingDataProcessor @Inject constructor(
+ private val aapsLogger: AAPSLogger,
+ private val nsClientSource: NSClientSource,
+ private val sp: SP,
+ private val rxBus: RxBus,
+ private val dateUtil: DateUtil,
+ private val activePlugin: ActivePlugin,
+ private val storeDataForDb: StoreDataForDb,
+ private val config: Config,
+ private val instantiator: Instantiator,
+ private val profileSource: ProfileSource
+) {
+
+ private fun toGv(jsonObject: JSONObject): TransactionGlucoseValue? {
+ val sgv = NSSgv(jsonObject)
+ return TransactionGlucoseValue(
+ timestamp = sgv.mills ?: return null,
+ value = sgv.mgdl?.toDouble() ?: return null,
+ noise = null,
+ raw = sgv.filtered?.toDouble(),
+ trendArrow = GlucoseValue.TrendArrow.fromString(sgv.direction),
+ nightscoutId = sgv.id,
+ sourceSensor = GlucoseValue.SourceSensor.fromString(sgv.device)
+ )
+ }
+
+ @Suppress("SpellCheckingInspection")
+ fun processSgvs(sgvs: Any) {
+
+ if (!nsClientSource.isEnabled() && !sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_receive_cgm, false)) return
+
+ var latestDateInReceivedData: Long = 0
+ aapsLogger.debug(LTag.NSCLIENT, "Received NS Data: $sgvs")
+ val glucoseValues = mutableListOf()
+
+ if (sgvs is JSONArray) { // V1 client
+ for (i in 0 until sgvs.length()) {
+ val sgv = toGv(sgvs.getJSONObject(i)) ?: continue
+ if (sgv.timestamp < dateUtil.now() && sgv.timestamp > latestDateInReceivedData) latestDateInReceivedData = sgv.timestamp
+ glucoseValues += sgv
+ }
+ } else if (sgvs is List<*>) { // V3 client
+
+ for (i in 0 until sgvs.size) {
+ val sgv = (sgvs[i] as NSSgvV3).toTransactionGlucoseValue()
+ if (sgv.timestamp < dateUtil.now() && sgv.timestamp > latestDateInReceivedData) latestDateInReceivedData = sgv.timestamp
+ glucoseValues += sgv
+ }
+ }
+ activePlugin.activeNsClient?.updateLatestBgReceivedIfNewer(latestDateInReceivedData)
+ // Was that sgv more less 5 mins ago ?
+ if (T.msecs(dateUtil.now() - latestDateInReceivedData).mins() < 5L) {
+ rxBus.send(EventDismissNotification(Notification.NS_ALARM))
+ rxBus.send(EventDismissNotification(Notification.NS_URGENT_ALARM))
+ }
+ storeDataForDb.glucoseValues.addAll(glucoseValues)
+ }
+
+ fun processTreatments(treatments: List) {
+ try {
+ var latestDateInReceivedData: Long = 0
+ for (treatment in treatments) {
+ aapsLogger.debug(LTag.DATABASE, "Received NS treatment: $treatment")
+ val date = treatment.date ?: continue
+ if (date > latestDateInReceivedData) latestDateInReceivedData = date
+
+ when (treatment) {
+ is NSBolus ->
+ if (sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_receive_insulin, false) || config.NSCLIENT)
+ storeDataForDb.boluses.add(treatment.toBolus())
+
+ is NSCarbs ->
+ if (sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_receive_carbs, false) || config.NSCLIENT)
+ storeDataForDb.carbs.add(treatment.toCarbs())
+
+ is NSTemporaryTarget ->
+ if (sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_receive_temp_target, false) || config.NSCLIENT) {
+ if (treatment.duration > 0L) {
+ // not ending event
+ if (treatment.targetBottomAsMgdl() < Constants.MIN_TT_MGDL
+ || treatment.targetBottomAsMgdl() > Constants.MAX_TT_MGDL
+ || treatment.targetTopAsMgdl() < Constants.MIN_TT_MGDL
+ || treatment.targetTopAsMgdl() > Constants.MAX_TT_MGDL
+ || treatment.targetBottomAsMgdl() > treatment.targetTopAsMgdl()
+ ) {
+ aapsLogger.debug(LTag.DATABASE, "Ignored TemporaryTarget $treatment")
+ continue
+ }
+ }
+ storeDataForDb.temporaryTargets.add(treatment.toTemporaryTarget())
+ }
+
+ is NSTemporaryBasal ->
+ if (config.isEngineeringMode() && sp.getBoolean(R.string.key_ns_receive_tbr_eb, false) || config.NSCLIENT)
+ storeDataForDb.temporaryBasals.add(treatment.toTemporaryBasal())
+
+ is NSEffectiveProfileSwitch ->
+ if (sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_receive_profile_switch, false) || config.NSCLIENT) {
+ treatment.toEffectiveProfileSwitch(dateUtil)?.let { effectiveProfileSwitch ->
+ storeDataForDb.effectiveProfileSwitches.add(effectiveProfileSwitch)
+ }
+ }
+
+ is NSProfileSwitch ->
+ if (sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_receive_profile_switch, false) || config.NSCLIENT) {
+ treatment.toProfileSwitch(activePlugin, dateUtil)?.let { profileSwitch ->
+ storeDataForDb.profileSwitches.add(profileSwitch)
+ }
+ }
+
+ is NSBolusWizard ->
+ treatment.toBolusCalculatorResult()?.let { bolusCalculatorResult ->
+ storeDataForDb.bolusCalculatorResults.add(bolusCalculatorResult)
+ }
+
+ is NSTherapyEvent ->
+ if (sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_receive_therapy_events, false) || config.NSCLIENT)
+ treatment.toTherapyEvent().let { therapyEvent ->
+ storeDataForDb.therapyEvents.add(therapyEvent)
+ }
+
+ is NSOfflineEvent ->
+ if (sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_receive_offline_event, false) && config.isEngineeringMode() || config.NSCLIENT)
+ treatment.toOfflineEvent().let { offlineEvent ->
+ storeDataForDb.offlineEvents.add(offlineEvent)
+ }
+
+ is NSExtendedBolus ->
+ if (config.isEngineeringMode() && sp.getBoolean(R.string.key_ns_receive_tbr_eb, false) || config.NSCLIENT)
+ treatment.toExtendedBolus().let { extendedBolus ->
+ storeDataForDb.extendedBoluses.add(extendedBolus)
+ }
+ }
+ }
+ activePlugin.activeNsClient?.updateLatestTreatmentReceivedIfNewer(latestDateInReceivedData)
+ } catch (error: Exception) {
+ aapsLogger.error("Error: ", error)
+ rxBus.send(EventNSClientNewLog("◄ ERROR", error.localizedMessage))
+ }
+ }
+
+ fun processFood(data: Any) {
+ aapsLogger.debug(LTag.DATABASE, "Received Food Data: $data")
+
+ try {
+ val foods = mutableListOf()
+ if (data is JSONArray) {
+ for (index in 0 until data.length()) {
+ val jsonFood: JSONObject = data.getJSONObject(index)
+
+ if (JsonHelper.safeGetString(jsonFood, "type") != "food") continue
+
+ when (JsonHelper.safeGetString(jsonFood, "action")) {
+ "remove" -> {
+ val delFood = Food(
+ name = "",
+ portion = 0.0,
+ carbs = 0,
+ isValid = false
+ ).also { it.interfaceIDs.nightscoutId = JsonHelper.safeGetString(jsonFood, "_id") }
+ foods += delFood
+ }
+
+ else -> {
+ val food = foodFromJson(jsonFood)
+ if (food != null) foods += food
+ else aapsLogger.error(LTag.DATABASE, "Error parsing food", jsonFood.toString())
+ }
+ }
+ }
+ } else if (data is List<*>) {
+ for (i in 0 until data.size)
+ foods += (data[i] as NSFood).toFood()
+ }
+ storeDataForDb.foods.addAll(foods)
+ } catch (error: Exception) {
+ aapsLogger.error("Error: ", error)
+ rxBus.send(EventNSClientNewLog("◄ ERROR", error.localizedMessage))
+ }
+ }
+
+ fun processProfile(profileJson: JSONObject) {
+ if (sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_receive_profile_store, true) || config.NSCLIENT) {
+ val store = instantiator.provideProfileStore(profileJson)
+ val createdAt = store.getStartDate()
+ val lastLocalChange = sp.getLong(info.nightscout.core.utils.R.string.key_local_profile_last_change, 0)
+ aapsLogger.debug(LTag.PROFILE, "Received profileStore: createdAt: $createdAt Local last modification: $lastLocalChange")
+ @Suppress("LiftReturnOrAssignment")
+ if (createdAt > lastLocalChange || createdAt % 1000 == 0L) {// whole second means edited in NS
+ profileSource.loadFromStore(store)
+ aapsLogger.debug(LTag.PROFILE, "Received profileStore: $profileJson")
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/StoreDataForDbImpl.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/StoreDataForDbImpl.kt
index 445c934835..e3e340c09a 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/StoreDataForDbImpl.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/StoreDataForDbImpl.kt
@@ -1,9 +1,6 @@
package info.nightscout.plugins.sync.nsShared
-import android.content.Context
import android.os.SystemClock
-import androidx.work.WorkerParameters
-import info.nightscout.core.utils.worker.LoggingWorker
import info.nightscout.database.entities.Bolus
import info.nightscout.database.entities.BolusCalculatorResult
import info.nightscout.database.entities.Carbs
@@ -48,7 +45,6 @@ import info.nightscout.database.impl.transactions.UpdateNsIdTherapyEventTransact
import info.nightscout.database.transactions.TransactionGlucoseValue
import info.nightscout.interfaces.Config
import info.nightscout.interfaces.Constants
-import info.nightscout.interfaces.XDripBroadcast
import info.nightscout.interfaces.logging.UserEntryLogger
import info.nightscout.interfaces.notifications.Notification
import info.nightscout.interfaces.nsclient.StoreDataForDb
@@ -61,7 +57,6 @@ import info.nightscout.rx.logging.AAPSLogger
import info.nightscout.rx.logging.LTag
import info.nightscout.shared.sharedPreferences.SP
import info.nightscout.shared.utils.DateUtil
-import kotlinx.coroutines.Dispatchers
import java.util.concurrent.Executors
import java.util.concurrent.ScheduledFuture
import java.util.concurrent.TimeUnit
@@ -78,7 +73,6 @@ class StoreDataForDbImpl @Inject constructor(
private val dateUtil: DateUtil,
private val config: Config,
private val nsClientSource: NSClientSource,
- private val xDripBroadcast: XDripBroadcast,
private val virtualPump: VirtualPump,
private val uiInteraction: UiInteraction
) : StoreDataForDb {
@@ -121,39 +115,11 @@ class StoreDataForDbImpl @Inject constructor(
private val pause = 1000L // to slow down db operations
- class StoreBgWorker(
- context: Context,
- params: WorkerParameters
- ) : LoggingWorker(context, params, Dispatchers.Default) {
-
- @Inject lateinit var storeDataForDb: StoreDataForDb
-
- override suspend fun doWorkAndLog(): Result {
- storeDataForDb.storeGlucoseValuesToDb()
- return Result.success()
- }
- }
-
- class StoreFoodWorker(
- context: Context,
- params: WorkerParameters
- ) : LoggingWorker(context, params, Dispatchers.Default) {
-
- @Inject lateinit var storeDataForDb: StoreDataForDb
-
- override suspend fun doWorkAndLog(): Result {
- storeDataForDb.storeFoodsToDb()
- return Result.success()
- }
- }
-
fun HashMap.inc(key: T) =
if (containsKey(key)) merge(key, 1, Long::plus)
else put(key, 1)
override fun storeGlucoseValuesToDb() {
- rxBus.send(EventNSClientNewLog("PROCESSING BG", ""))
-
if (glucoseValues.isNotEmpty())
repository.runTransactionForResult(CgmSourceTransaction(glucoseValues, emptyList(), null))
.doOnError {
@@ -163,19 +129,16 @@ class StoreDataForDbImpl @Inject constructor(
.also { result ->
glucoseValues.clear()
result.updated.forEach {
- xDripBroadcast.sendIn640gMode(it)
nsClientSource.detectSource(it)
aapsLogger.debug(LTag.DATABASE, "Updated bg $it")
updated.inc(GlucoseValue::class.java.simpleName)
}
result.inserted.forEach {
- xDripBroadcast.sendIn640gMode(it)
nsClientSource.detectSource(it)
aapsLogger.debug(LTag.DATABASE, "Inserted bg $it")
inserted.inc(GlucoseValue::class.java.simpleName)
}
result.updatedNsId.forEach {
- xDripBroadcast.sendIn640gMode(it)
nsClientSource.detectSource(it)
aapsLogger.debug(LTag.DATABASE, "Updated nsId bg $it")
nsIdUpdated.inc(GlucoseValue::class.java.simpleName)
@@ -184,12 +147,10 @@ class StoreDataForDbImpl @Inject constructor(
sendLog("GlucoseValue", GlucoseValue::class.java.simpleName)
SystemClock.sleep(pause)
- rxBus.send(EventNSClientNewLog("DONE BG", ""))
+ rxBus.send(EventNSClientNewLog("● DONE PROCESSING BG", ""))
}
override fun storeFoodsToDb() {
- rxBus.send(EventNSClientNewLog("PROCESSING FOOD", ""))
-
if (foods.isNotEmpty())
repository.runTransactionForResult(SyncNsFoodTransaction(foods))
.doOnError {
@@ -214,12 +175,10 @@ class StoreDataForDbImpl @Inject constructor(
sendLog("Food", Food::class.java.simpleName)
SystemClock.sleep(pause)
- rxBus.send(EventNSClientNewLog("DONE FOOD", ""))
+ rxBus.send(EventNSClientNewLog("● DONE PROCESSING FOOD", ""))
}
override fun storeTreatmentsToDb() {
- rxBus.send(EventNSClientNewLog("PROCESSING TR", ""))
-
if (boluses.isNotEmpty())
repository.runTransactionForResult(SyncNsBolusTransaction(boluses))
.doOnError {
@@ -796,11 +755,13 @@ class StoreDataForDbImpl @Inject constructor(
SystemClock.sleep(pause)
uel.log(userEntries)
- rxBus.send(EventNSClientNewLog("DONE TR", ""))
+ rxBus.send(EventNSClientNewLog("● DONE PROCESSING TR", ""))
}
private val eventWorker = Executors.newSingleThreadScheduledExecutor()
private var scheduledEventPost: ScheduledFuture<*>? = null
+
+ @Synchronized
override fun scheduleNsIdUpdate() {
class PostRunnable : Runnable {
@@ -816,7 +777,8 @@ class StoreDataForDbImpl @Inject constructor(
scheduledEventPost = eventWorker.schedule(task, 10, TimeUnit.SECONDS)
}
- private fun updateNsIds() {
+ @Synchronized
+ override fun updateNsIds() {
repository.runTransactionForResult(UpdateNsIdTemporaryTargetTransaction(nsIdTemporaryTargets))
.doOnError { error ->
aapsLogger.error(LTag.DATABASE, "Updated nsId of TemporaryTarget failed", error)
@@ -996,32 +958,32 @@ class StoreDataForDbImpl @Inject constructor(
sendLog("TherapyEvent", TherapyEvent::class.java.simpleName)
sendLog("OfflineEvent", OfflineEvent::class.java.simpleName)
sendLog("ExtendedBolus", ExtendedBolus::class.java.simpleName)
- rxBus.send(EventNSClientNewLog("DONE NSIDs", ""))
+ rxBus.send(EventNSClientNewLog("● DONE NSIDs", ""))
}
private fun sendLog(item: String, clazz: String) {
inserted[clazz]?.let {
- rxBus.send(EventNSClientNewLog("INSERT", "$item $it"))
+ rxBus.send(EventNSClientNewLog("◄ INSERT", "$item $it"))
}
inserted.remove(clazz)
updated[clazz]?.let {
- rxBus.send(EventNSClientNewLog("UPDATE", "$item $it"))
+ rxBus.send(EventNSClientNewLog("◄ UPDATE", "$item $it"))
}
updated.remove(clazz)
invalidated[clazz]?.let {
- rxBus.send(EventNSClientNewLog("INVALIDATE", "$item $it"))
+ rxBus.send(EventNSClientNewLog("◄ INVALIDATE", "$item $it"))
}
invalidated.remove(clazz)
nsIdUpdated[clazz]?.let {
- rxBus.send(EventNSClientNewLog("NS_ID", "$item $it"))
+ rxBus.send(EventNSClientNewLog("◄ NS_ID", "$item $it"))
}
nsIdUpdated.remove(clazz)
durationUpdated[clazz]?.let {
- rxBus.send(EventNSClientNewLog("DURATION", "$item $it"))
+ rxBus.send(EventNSClientNewLog("◄ DURATION", "$item $it"))
}
durationUpdated.remove(clazz)
ended[clazz]?.let {
- rxBus.send(EventNSClientNewLog("CUT", "$item $it"))
+ rxBus.send(EventNSClientNewLog("◄ CUT", "$item $it"))
}
ended.remove(clazz)
}
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventConnectivityOptionChanged.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventConnectivityOptionChanged.kt
new file mode 100644
index 0000000000..2262b27775
--- /dev/null
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventConnectivityOptionChanged.kt
@@ -0,0 +1,5 @@
+package info.nightscout.plugins.sync.nsShared.events
+
+import info.nightscout.rx.events.Event
+
+class EventConnectivityOptionChanged(val blockingReason: String) : Event()
\ No newline at end of file
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventNSClientUpdateGUI.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventNSClientUpdateGuiData.kt
similarity index 66%
rename from plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventNSClientUpdateGUI.kt
rename to plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventNSClientUpdateGuiData.kt
index 86578a7585..1b2f2ed858 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventNSClientUpdateGUI.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventNSClientUpdateGuiData.kt
@@ -2,4 +2,4 @@ package info.nightscout.plugins.sync.nsShared.events
import info.nightscout.rx.events.EventUpdateGui
-class EventNSClientUpdateGUI : EventUpdateGui()
\ No newline at end of file
+class EventNSClientUpdateGuiData : EventUpdateGui()
\ No newline at end of file
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventNSClientUpdateGuiQueue.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventNSClientUpdateGuiQueue.kt
new file mode 100644
index 0000000000..e936de214d
--- /dev/null
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventNSClientUpdateGuiQueue.kt
@@ -0,0 +1,5 @@
+package info.nightscout.plugins.sync.nsShared.events
+
+import info.nightscout.rx.events.EventUpdateGui
+
+class EventNSClientUpdateGuiQueue : EventUpdateGui()
\ No newline at end of file
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventNSClientUpdateGuiStatus.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventNSClientUpdateGuiStatus.kt
new file mode 100644
index 0000000000..b319c3bae2
--- /dev/null
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventNSClientUpdateGuiStatus.kt
@@ -0,0 +1,5 @@
+package info.nightscout.plugins.sync.nsShared.events
+
+import info.nightscout.rx.events.EventUpdateGui
+
+class EventNSClientUpdateGuiStatus : EventUpdateGui()
\ No newline at end of file
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/DataSyncSelectorImplementation.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/DataSyncSelectorV1Impl.kt
similarity index 80%
rename from plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/DataSyncSelectorImplementation.kt
rename to plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/DataSyncSelectorV1Impl.kt
index 60562c323c..56abd0acff 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/DataSyncSelectorImplementation.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/DataSyncSelectorV1Impl.kt
@@ -1,12 +1,15 @@
-package info.nightscout.plugins.sync.nsShared
+package info.nightscout.plugins.sync.nsclient
-import info.nightscout.database.ValueWrapper
import info.nightscout.database.impl.AppRepository
import info.nightscout.interfaces.plugin.ActivePlugin
import info.nightscout.interfaces.profile.ProfileFunction
import info.nightscout.interfaces.sync.DataSyncSelector
+import info.nightscout.interfaces.sync.DataSyncSelectorV1
import info.nightscout.interfaces.utils.JsonHelper
import info.nightscout.plugins.sync.R
+import info.nightscout.plugins.sync.nsShared.events.EventNSClientUpdateGuiQueue
+import info.nightscout.plugins.sync.nsShared.events.EventNSClientUpdateGuiStatus
+import info.nightscout.rx.bus.RxBus
import info.nightscout.rx.logging.AAPSLogger
import info.nightscout.rx.logging.LTag
import info.nightscout.shared.sharedPreferences.SP
@@ -15,14 +18,15 @@ import javax.inject.Inject
import javax.inject.Singleton
@Singleton
-class DataSyncSelectorImplementation @Inject constructor(
+class DataSyncSelectorV1Impl @Inject constructor(
private val sp: SP,
private val aapsLogger: AAPSLogger,
private val dateUtil: DateUtil,
private val profileFunction: ProfileFunction,
private val activePlugin: ActivePlugin,
- private val appRepository: AppRepository
-) : DataSyncSelector {
+ private val appRepository: AppRepository,
+ private val rxBus: RxBus
+) : DataSyncSelectorV1 {
class QueueCounter(
var bolusesRemaining: Long = -1L,
@@ -57,12 +61,27 @@ class DataSyncSelectorImplementation @Inject constructor(
}
private val queueCounter = QueueCounter()
- private val isPaused get() = sp.getBoolean(R.string.key_ns_client_paused, false)
+ private val isPaused get() = sp.getBoolean(R.string.key_ns_paused, false)
override fun queueSize(): Long = queueCounter.size()
- override fun doUpload() {
+ override suspend fun doUpload() {
+ rxBus.send(EventNSClientUpdateGuiStatus())
if (sp.getBoolean(R.string.key_ns_upload, true) && !isPaused) {
+ queueCounter.bolusesRemaining = (appRepository.getLastBolusId() ?: 0L) - sp.getLong(R.string.key_ns_bolus_last_synced_id, 0)
+ queueCounter.carbsRemaining = (appRepository.getLastCarbsId() ?: 0L) - sp.getLong(R.string.key_ns_carbs_last_synced_id, 0)
+ queueCounter.bcrRemaining = (appRepository.getLastBolusCalculatorResultId() ?: 0L) - sp.getLong(R.string.key_ns_bolus_calculator_result_last_synced_id, 0)
+ queueCounter.ttsRemaining = (appRepository.getLastTempTargetId() ?: 0L) - sp.getLong(R.string.key_ns_temporary_target_last_synced_id, 0)
+ queueCounter.foodsRemaining = (appRepository.getLastFoodId() ?: 0L) - sp.getLong(R.string.key_ns_food_last_synced_id, 0)
+ queueCounter.gvsRemaining = (appRepository.getLastGlucoseValueId() ?: 0L) - sp.getLong(R.string.key_ns_glucose_value_last_synced_id, 0)
+ queueCounter.tesRemaining = (appRepository.getLastTherapyEventId() ?: 0L) - sp.getLong(R.string.key_ns_therapy_event_last_synced_id, 0)
+ queueCounter.dssRemaining = (appRepository.getLastDeviceStatusId() ?: 0L) - sp.getLong(R.string.key_ns_device_status_last_synced_id, 0)
+ queueCounter.tbrsRemaining = (appRepository.getLastTemporaryBasalId() ?: 0L) - sp.getLong(R.string.key_ns_temporary_basal_last_synced_id, 0)
+ queueCounter.ebsRemaining = (appRepository.getLastExtendedBolusId() ?: 0L) - sp.getLong(R.string.key_ns_extended_bolus_last_synced_id, 0)
+ queueCounter.pssRemaining = (appRepository.getLastProfileSwitchId() ?: 0L) - sp.getLong(R.string.key_ns_profile_switch_last_synced_id, 0)
+ queueCounter.epssRemaining = (appRepository.getLastEffectiveProfileSwitchId() ?: 0L) - sp.getLong(R.string.key_ns_effective_profile_switch_last_synced_id, 0)
+ queueCounter.oesRemaining = (appRepository.getLastOfflineEventId() ?: 0L) - sp.getLong(R.string.key_ns_offline_event_last_synced_id, 0)
+ rxBus.send(EventNSClientUpdateGuiQueue())
processChangedBoluses()
processChangedCarbs()
processChangedBolusCalculatorResults()
@@ -78,6 +97,7 @@ class DataSyncSelectorImplementation @Inject constructor(
processChangedOfflineEvents()
processChangedProfileStore()
}
+ rxBus.send(EventNSClientUpdateGuiStatus())
}
override fun resetToNextFullSync() {
@@ -95,8 +115,8 @@ class DataSyncSelectorImplementation @Inject constructor(
sp.remove(R.string.key_ns_offline_event_last_synced_id)
sp.remove(R.string.key_ns_profile_store_last_synced_timestamp)
- val lastDeviceStatusDbIdWrapped = appRepository.getLastDeviceStatusIdWrapped().blockingGet()
- if (lastDeviceStatusDbIdWrapped is ValueWrapper.Existing) sp.putLong(R.string.key_ns_device_status_last_synced_id, lastDeviceStatusDbIdWrapped.value)
+ val lastDeviceStatusDbId = appRepository.getLastDeviceStatusId()
+ if (lastDeviceStatusDbId != null) sp.putLong(R.string.key_ns_device_status_last_synced_id, lastDeviceStatusDbId)
else sp.remove(R.string.key_ns_device_status_last_synced_id)
}
@@ -107,16 +127,16 @@ class DataSyncSelectorImplementation @Inject constructor(
}
}
- override tailrec fun processChangedBoluses() {
+ override tailrec suspend fun processChangedBoluses() {
if (isPaused) return
- val lastDbIdWrapped = appRepository.getLastBolusIdWrapped().blockingGet()
- val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
+ val lastDbId = appRepository.getLastBolusId() ?: 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
}
queueCounter.bolusesRemaining = lastDbId - startId
+ rxBus.send(EventNSClientUpdateGuiQueue())
appRepository.getNextSyncElementBolus(startId).blockingGet()?.let { bolus ->
aapsLogger.info(LTag.NSCLIENT, "Loading Bolus data Start: $startId ${bolus.first} forID: ${bolus.second.id} ")
when {
@@ -136,18 +156,10 @@ class DataSyncSelectorImplementation @Inject constructor(
}
// without nsId = create new
bolus.first.interfaceIDs.nightscoutId == null ->
- activePlugin.activeNsClient?.nsAdd(
- "treatments",
- DataSyncSelector.PairBolus(bolus.first, bolus.second.id),
- " $startId/$lastDbId"
- )
+ activePlugin.activeNsClient?.nsAdd("treatments", DataSyncSelector.PairBolus(bolus.first, bolus.second.id), " $startId/$lastDbId")
// with nsId = update if it's modified record
bolus.first.interfaceIDs.nightscoutId != null && bolus.first.id != bolus.second.id ->
- activePlugin.activeNsClient?.nsUpdate(
- "treatments",
- DataSyncSelector.PairBolus(bolus.first, bolus.second.id),
- "$startId/$lastDbId"
- )
+ activePlugin.activeNsClient?.nsUpdate("treatments", DataSyncSelector.PairBolus(bolus.first, bolus.second.id), "$startId/$lastDbId")
}
return
}
@@ -160,16 +172,16 @@ class DataSyncSelectorImplementation @Inject constructor(
}
}
- override tailrec fun processChangedCarbs() {
+ override tailrec suspend fun processChangedCarbs() {
if (isPaused) return
- val lastDbIdWrapped = appRepository.getLastCarbsIdWrapped().blockingGet()
- val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
+ val lastDbId = appRepository.getLastCarbsId() ?: 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
}
queueCounter.carbsRemaining = lastDbId - startId
+ rxBus.send(EventNSClientUpdateGuiQueue())
appRepository.getNextSyncElementCarbs(startId).blockingGet()?.let { carb ->
aapsLogger.info(LTag.NSCLIENT, "Loading Carbs data Start: $startId ${carb.first} forID: ${carb.second.id} ")
when {
@@ -209,16 +221,16 @@ class DataSyncSelectorImplementation @Inject constructor(
}
}
- override tailrec fun processChangedBolusCalculatorResults() {
+ override tailrec suspend fun processChangedBolusCalculatorResults() {
if (isPaused) return
- val lastDbIdWrapped = appRepository.getLastBolusCalculatorResultIdWrapped().blockingGet()
- val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
+ val lastDbId = appRepository.getLastBolusCalculatorResultId() ?: 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
}
queueCounter.bcrRemaining = lastDbId - startId
+ rxBus.send(EventNSClientUpdateGuiQueue())
appRepository.getNextSyncElementBolusCalculatorResult(startId).blockingGet()?.let { bolusCalculatorResult ->
aapsLogger.info(LTag.NSCLIENT, "Loading BolusCalculatorResult data Start: $startId ${bolusCalculatorResult.first} forID: ${bolusCalculatorResult.second.id} ")
when {
@@ -238,17 +250,10 @@ class DataSyncSelectorImplementation @Inject constructor(
}
// without nsId = create new
bolusCalculatorResult.first.interfaceIDs.nightscoutId == null ->
- activePlugin.activeNsClient?.nsAdd(
- "treatments",
- DataSyncSelector.PairBolusCalculatorResult(bolusCalculatorResult.first, bolusCalculatorResult.second.id),
- "$startId/$lastDbId"
- )
+ activePlugin.activeNsClient?.nsAdd("treatments", DataSyncSelector.PairBolusCalculatorResult(bolusCalculatorResult.first, bolusCalculatorResult.second.id), "$startId/$lastDbId")
// with nsId = update if it's modified record
bolusCalculatorResult.first.interfaceIDs.nightscoutId != null && bolusCalculatorResult.first.id != bolusCalculatorResult.second.id ->
- activePlugin.activeNsClient?.nsUpdate(
- "treatments",
- DataSyncSelector.PairBolusCalculatorResult(bolusCalculatorResult.first, bolusCalculatorResult.second.id), "$startId/$lastDbId"
- )
+ activePlugin.activeNsClient?.nsUpdate("treatments", DataSyncSelector.PairBolusCalculatorResult(bolusCalculatorResult.first, bolusCalculatorResult.second.id), "$startId/$lastDbId")
}
return
}
@@ -261,16 +266,16 @@ class DataSyncSelectorImplementation @Inject constructor(
}
}
- override tailrec fun processChangedTempTargets() {
+ override tailrec suspend fun processChangedTempTargets() {
if (isPaused) return
- val lastDbIdWrapped = appRepository.getLastTempTargetIdWrapped().blockingGet()
- val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
+ val lastDbId = appRepository.getLastTempTargetId() ?: 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
}
queueCounter.ttsRemaining = lastDbId - startId
+ rxBus.send(EventNSClientUpdateGuiQueue())
appRepository.getNextSyncElementTemporaryTarget(startId).blockingGet()?.let { tt ->
aapsLogger.info(LTag.NSCLIENT, "Loading TemporaryTarget data Start: $startId ${tt.first} forID: ${tt.second.id} ")
when {
@@ -290,18 +295,10 @@ class DataSyncSelectorImplementation @Inject constructor(
}
// without nsId = create new
tt.first.interfaceIDs.nightscoutId == null ->
- activePlugin.activeNsClient?.nsAdd(
- "treatments",
- DataSyncSelector.PairTemporaryTarget(tt.first, tt.second.id),
- "$startId/$lastDbId"
- )
+ activePlugin.activeNsClient?.nsAdd("treatments", DataSyncSelector.PairTemporaryTarget(tt.first, tt.second.id), "$startId/$lastDbId")
// existing with nsId = update
tt.first.interfaceIDs.nightscoutId != null ->
- activePlugin.activeNsClient?.nsUpdate(
- "treatments",
- DataSyncSelector.PairTemporaryTarget(tt.first, tt.second.id),
- "$startId/$lastDbId"
- )
+ activePlugin.activeNsClient?.nsUpdate("treatments", DataSyncSelector.PairTemporaryTarget(tt.first, tt.second.id), "$startId/$lastDbId")
}
return
}
@@ -314,16 +311,16 @@ class DataSyncSelectorImplementation @Inject constructor(
}
}
- override tailrec fun processChangedFoods() {
+ override tailrec suspend fun processChangedFoods() {
if (isPaused) return
- val lastDbIdWrapped = appRepository.getLastFoodIdWrapped().blockingGet()
- val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
+ val lastDbId = appRepository.getLastFoodId() ?: 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
}
queueCounter.foodsRemaining = lastDbId - startId
+ rxBus.send(EventNSClientUpdateGuiQueue())
appRepository.getNextSyncElementFood(startId).blockingGet()?.let { food ->
aapsLogger.info(LTag.NSCLIENT, "Loading Food data Start: $startId ${food.first} forID: ${food.second.id} ")
when {
@@ -346,11 +343,7 @@ class DataSyncSelectorImplementation @Inject constructor(
activePlugin.activeNsClient?.nsAdd("food", DataSyncSelector.PairFood(food.first, food.second.id), "$startId/$lastDbId")
// with nsId = update
food.first.interfaceIDs.nightscoutId != null ->
- activePlugin.activeNsClient?.nsUpdate(
- "food",
- DataSyncSelector.PairFood(food.first, food.second.id),
- "$startId/$lastDbId"
- )
+ activePlugin.activeNsClient?.nsUpdate("food", DataSyncSelector.PairFood(food.first, food.second.id), "$startId/$lastDbId")
}
return
}
@@ -363,16 +356,16 @@ class DataSyncSelectorImplementation @Inject constructor(
}
}
- override tailrec fun processChangedGlucoseValues() {
+ override tailrec suspend fun processChangedGlucoseValues() {
if (isPaused) return
- val lastDbIdWrapped = appRepository.getLastGlucoseValueIdWrapped().blockingGet()
- val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
+ val lastDbId = appRepository.getLastGlucoseValueId() ?: 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
}
queueCounter.gvsRemaining = lastDbId - startId
+ rxBus.send(EventNSClientUpdateGuiQueue())
appRepository.getNextSyncElementGlucoseValue(startId).blockingGet()?.let { gv ->
aapsLogger.info(LTag.NSCLIENT, "Loading GlucoseValue data Start: $startId ${gv.first} forID: ${gv.second.id} ")
if (activePlugin.activeBgSource.shouldUploadToNs(gv.first)) {
@@ -396,11 +389,7 @@ class DataSyncSelectorImplementation @Inject constructor(
activePlugin.activeNsClient?.nsAdd("entries", DataSyncSelector.PairGlucoseValue(gv.first, gv.second.id), "$startId/$lastDbId")
// with nsId = update
else -> // gv.first.interfaceIDs.nightscoutId != null
- activePlugin.activeNsClient?.nsUpdate(
- "entries",
- DataSyncSelector.PairGlucoseValue(gv.first, gv.second.id),
- "$startId/$lastDbId"
- )
+ activePlugin.activeNsClient?.nsUpdate("entries", DataSyncSelector.PairGlucoseValue(gv.first, gv.second.id), "$startId/$lastDbId")
}
} else {
confirmLastGlucoseValueIdIfGreater(gv.second.id)
@@ -417,16 +406,16 @@ class DataSyncSelectorImplementation @Inject constructor(
}
}
- override tailrec fun processChangedTherapyEvents() {
+ override tailrec suspend fun processChangedTherapyEvents() {
if (isPaused) return
- val lastDbIdWrapped = appRepository.getLastTherapyEventIdWrapped().blockingGet()
- val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
+ val lastDbId = appRepository.getLastTherapyEventId() ?: 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
}
queueCounter.tesRemaining = lastDbId - startId
+ rxBus.send(EventNSClientUpdateGuiQueue())
appRepository.getNextSyncElementTherapyEvent(startId).blockingGet()?.let { te ->
aapsLogger.info(LTag.NSCLIENT, "Loading TherapyEvents data Start: $startId ${te.first} forID: ${te.second.id} ")
when {
@@ -449,11 +438,7 @@ class DataSyncSelectorImplementation @Inject constructor(
activePlugin.activeNsClient?.nsAdd("treatments", DataSyncSelector.PairTherapyEvent(te.first, te.second.id), "$startId/$lastDbId")
// nsId = update
te.first.interfaceIDs.nightscoutId != null ->
- activePlugin.activeNsClient?.nsUpdate(
- "treatments",
- DataSyncSelector.PairTherapyEvent(te.first, te.second.id),
- "$startId/$lastDbId"
- )
+ activePlugin.activeNsClient?.nsUpdate("treatments", DataSyncSelector.PairTherapyEvent(te.first, te.second.id), "$startId/$lastDbId")
}
return
}
@@ -466,16 +451,16 @@ class DataSyncSelectorImplementation @Inject constructor(
}
}
- override fun processChangedDeviceStatuses() {
+ override suspend fun processChangedDeviceStatuses() {
if (isPaused) return
- val lastDbIdWrapped = appRepository.getLastDeviceStatusIdWrapped().blockingGet()
- val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
+ val lastDbId = appRepository.getLastDeviceStatusId() ?: 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
}
queueCounter.dssRemaining = lastDbId - startId
+ rxBus.send(EventNSClientUpdateGuiQueue())
appRepository.getNextSyncElementDeviceStatus(startId).blockingGet()?.let { deviceStatus ->
aapsLogger.info(LTag.NSCLIENT, "Loading DeviceStatus data Start: $startId $deviceStatus")
when {
@@ -496,16 +481,16 @@ class DataSyncSelectorImplementation @Inject constructor(
}
}
- override tailrec fun processChangedTemporaryBasals() {
+ override tailrec suspend fun processChangedTemporaryBasals() {
if (isPaused) return
- val lastDbIdWrapped = appRepository.getLastTemporaryBasalIdWrapped().blockingGet()
- val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
+ val lastDbId = appRepository.getLastTemporaryBasalId() ?: 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
}
queueCounter.tbrsRemaining = lastDbId - startId
+ rxBus.send(EventNSClientUpdateGuiQueue())
appRepository.getNextSyncElementTemporaryBasal(startId).blockingGet()?.let { tb ->
aapsLogger.info(LTag.NSCLIENT, "Loading TemporaryBasal data Start: $startId ${tb.first} forID: ${tb.second.id} ")
when {
@@ -525,18 +510,10 @@ class DataSyncSelectorImplementation @Inject constructor(
}
// without nsId = create new
tb.first.interfaceIDs.nightscoutId == null ->
- activePlugin.activeNsClient?.nsAdd(
- "treatments",
- DataSyncSelector.PairTemporaryBasal(tb.first, tb.second.id),
- "$startId/$lastDbId"
- )
+ activePlugin.activeNsClient?.nsAdd("treatments", DataSyncSelector.PairTemporaryBasal(tb.first, tb.second.id), "$startId/$lastDbId")
// with nsId = update
tb.first.interfaceIDs.nightscoutId != null ->
- activePlugin.activeNsClient?.nsUpdate(
- "treatments",
- DataSyncSelector.PairTemporaryBasal(tb.first, tb.second.id),
- "$startId/$lastDbId"
- )
+ activePlugin.activeNsClient?.nsUpdate("treatments", DataSyncSelector.PairTemporaryBasal(tb.first, tb.second.id), "$startId/$lastDbId")
}
return
}
@@ -549,16 +526,16 @@ class DataSyncSelectorImplementation @Inject constructor(
}
}
- override tailrec fun processChangedExtendedBoluses() {
+ override tailrec suspend fun processChangedExtendedBoluses() {
if (isPaused) return
- val lastDbIdWrapped = appRepository.getLastExtendedBolusIdWrapped().blockingGet()
- val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
+ val lastDbId = appRepository.getLastExtendedBolusId() ?: 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
}
queueCounter.ebsRemaining = lastDbId - startId
+ rxBus.send(EventNSClientUpdateGuiQueue())
appRepository.getNextSyncElementExtendedBolus(startId).blockingGet()?.let { eb ->
aapsLogger.info(LTag.NSCLIENT, "Loading ExtendedBolus data Start: $startId ${eb.first} forID: ${eb.second.id} ")
val profile = profileFunction.getProfile(eb.first.timestamp)
@@ -580,18 +557,10 @@ class DataSyncSelectorImplementation @Inject constructor(
}
// without nsId = create new
eb.first.interfaceIDs.nightscoutId == null ->
- activePlugin.activeNsClient?.nsAdd(
- "treatments",
- DataSyncSelector.PairExtendedBolus(eb.first, eb.second.id),
- "$startId/$lastDbId"
- )
+ activePlugin.activeNsClient?.nsAdd("treatments", DataSyncSelector.PairExtendedBolus(eb.first, eb.second.id), "$startId/$lastDbId")
// with nsId = update
eb.first.interfaceIDs.nightscoutId != null ->
- activePlugin.activeNsClient?.nsUpdate(
- "treatments",
- DataSyncSelector.PairExtendedBolus(eb.first, eb.second.id),
- "$startId/$lastDbId"
- )
+ activePlugin.activeNsClient?.nsUpdate("treatments", DataSyncSelector.PairExtendedBolus(eb.first, eb.second.id), "$startId/$lastDbId")
}
return
} else {
@@ -610,16 +579,16 @@ class DataSyncSelectorImplementation @Inject constructor(
}
}
- override tailrec fun processChangedProfileSwitches() {
+ override tailrec suspend fun processChangedProfileSwitches() {
if (isPaused) return
- val lastDbIdWrapped = appRepository.getLastProfileSwitchIdWrapped().blockingGet()
- val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
+ val lastDbId = appRepository.getLastProfileSwitchId() ?: 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
}
queueCounter.pssRemaining = lastDbId - startId
+ rxBus.send(EventNSClientUpdateGuiQueue())
appRepository.getNextSyncElementProfileSwitch(startId).blockingGet()?.let { ps ->
aapsLogger.info(LTag.NSCLIENT, "Loading ProfileSwitch data Start: $startId ${ps.first} forID: ${ps.second.id} ")
when {
@@ -642,11 +611,7 @@ class DataSyncSelectorImplementation @Inject constructor(
activePlugin.activeNsClient?.nsAdd("treatments", DataSyncSelector.PairProfileSwitch(ps.first, ps.second.id), "$startId/$lastDbId")
// with nsId = update
ps.first.interfaceIDs.nightscoutId != null ->
- activePlugin.activeNsClient?.nsUpdate(
- "treatments",
- DataSyncSelector.PairProfileSwitch(ps.first, ps.second.id),
- "$startId/$lastDbId"
- )
+ activePlugin.activeNsClient?.nsUpdate("treatments", DataSyncSelector.PairProfileSwitch(ps.first, ps.second.id), "$startId/$lastDbId")
}
return
}
@@ -659,16 +624,16 @@ class DataSyncSelectorImplementation @Inject constructor(
}
}
- override tailrec fun processChangedEffectiveProfileSwitches() {
+ override tailrec suspend fun processChangedEffectiveProfileSwitches() {
if (isPaused) return
- val lastDbIdWrapped = appRepository.getLastEffectiveProfileSwitchIdWrapped().blockingGet()
- val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
+ val lastDbId = appRepository.getLastEffectiveProfileSwitchId() ?: 0L
var startId = sp.getLong(R.string.key_ns_effective_profile_switch_last_synced_id, 0)
if (startId > lastDbId) {
sp.putLong(R.string.key_ns_effective_profile_switch_last_synced_id, 0)
startId = 0
}
queueCounter.epssRemaining = lastDbId - startId
+ rxBus.send(EventNSClientUpdateGuiQueue())
appRepository.getNextSyncElementEffectiveProfileSwitch(startId).blockingGet()?.let { ps ->
aapsLogger.info(LTag.NSCLIENT, "Loading EffectiveProfileSwitch data Start: $startId ${ps.first} forID: ${ps.second.id} ")
when {
@@ -688,18 +653,10 @@ class DataSyncSelectorImplementation @Inject constructor(
}
// without nsId = create new
ps.first.interfaceIDs.nightscoutId == null ->
- activePlugin.activeNsClient?.nsAdd(
- "treatments",
- DataSyncSelector.PairEffectiveProfileSwitch(ps.first, ps.second.id),
- "$startId/$lastDbId"
- )
+ activePlugin.activeNsClient?.nsAdd("treatments", DataSyncSelector.PairEffectiveProfileSwitch(ps.first, ps.second.id), "$startId/$lastDbId")
// with nsId = update
ps.first.interfaceIDs.nightscoutId != null ->
- activePlugin.activeNsClient?.nsUpdate(
- "treatments",
- DataSyncSelector.PairEffectiveProfileSwitch(ps.first, ps.second.id),
- "$startId/$lastDbId"
- )
+ activePlugin.activeNsClient?.nsUpdate("treatments", DataSyncSelector.PairEffectiveProfileSwitch(ps.first, ps.second.id), "$startId/$lastDbId")
}
return
}
@@ -712,16 +669,16 @@ class DataSyncSelectorImplementation @Inject constructor(
}
}
- override tailrec fun processChangedOfflineEvents() {
+ override tailrec suspend fun processChangedOfflineEvents() {
if (isPaused) return
- val lastDbIdWrapped = appRepository.getLastOfflineEventIdWrapped().blockingGet()
- val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
+ val lastDbId = appRepository.getLastOfflineEventId() ?: 0L
var startId = sp.getLong(R.string.key_ns_offline_event_last_synced_id, 0)
if (startId > lastDbId) {
sp.putLong(R.string.key_ns_offline_event_last_synced_id, 0)
startId = 0
}
queueCounter.oesRemaining = lastDbId - startId
+ rxBus.send(EventNSClientUpdateGuiQueue())
appRepository.getNextSyncElementOfflineEvent(startId).blockingGet()?.let { oe ->
aapsLogger.info(LTag.NSCLIENT, "Loading OfflineEvent data Start: $startId ${oe.first} forID: ${oe.second.id} ")
when {
@@ -744,11 +701,7 @@ class DataSyncSelectorImplementation @Inject constructor(
activePlugin.activeNsClient?.nsAdd("treatments", DataSyncSelector.PairOfflineEvent(oe.first, oe.second.id), "$startId/$lastDbId")
// existing with nsId = update
oe.first.interfaceIDs.nightscoutId != null ->
- activePlugin.activeNsClient?.nsUpdate(
- "treatments",
- DataSyncSelector.PairOfflineEvent(oe.first, oe.second.id),
- "$startId/$lastDbId"
- )
+ activePlugin.activeNsClient?.nsUpdate("treatments", DataSyncSelector.PairOfflineEvent(oe.first, oe.second.id), "$startId/$lastDbId")
}
return
}
@@ -758,7 +711,7 @@ class DataSyncSelectorImplementation @Inject constructor(
sp.putLong(R.string.key_ns_profile_store_last_synced_timestamp, lastSynced)
}
- override fun processChangedProfileStore() {
+ override suspend fun processChangedProfileStore() {
if (isPaused) return
val lastSync = sp.getLong(R.string.key_ns_profile_store_last_synced_timestamp, 0)
val lastChange = sp.getLong(info.nightscout.core.utils.R.string.key_local_profile_last_change, 0)
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/NSClientPlugin.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/NSClientPlugin.kt
index 53ca1d3e73..01421ddc4a 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/NSClientPlugin.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/NSClientPlugin.kt
@@ -4,17 +4,13 @@ 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 android.text.Spanned
import androidx.preference.PreferenceFragmentCompat
import androidx.preference.PreferenceScreen
import androidx.preference.SwitchPreference
import dagger.android.HasAndroidInjector
import info.nightscout.core.extensions.toJson
import info.nightscout.core.utils.fabric.FabricPrivacy
-import info.nightscout.core.validators.ValidatingEditTextPreference
import info.nightscout.interfaces.Config
import info.nightscout.interfaces.Constants
import info.nightscout.interfaces.nsclient.NSAlarm
@@ -26,24 +22,22 @@ import info.nightscout.interfaces.plugin.PluginType
import info.nightscout.interfaces.profile.ProfileFunction
import info.nightscout.interfaces.source.DoingOwnUploadSource
import info.nightscout.interfaces.sync.DataSyncSelector
+import info.nightscout.interfaces.sync.DataSyncSelectorV1
import info.nightscout.interfaces.sync.NsClient
import info.nightscout.interfaces.sync.Sync
-import info.nightscout.interfaces.ui.UiInteraction
-import info.nightscout.interfaces.utils.HtmlHelper.fromHtml
import info.nightscout.plugins.sync.R
import info.nightscout.plugins.sync.nsShared.NSClientFragment
import info.nightscout.plugins.sync.nsShared.events.EventNSClientResend
import info.nightscout.plugins.sync.nsShared.events.EventNSClientStatus
-import info.nightscout.plugins.sync.nsShared.events.EventNSClientUpdateGUI
+import info.nightscout.plugins.sync.nsShared.events.EventNSClientUpdateGuiData
+import info.nightscout.plugins.sync.nsShared.events.EventNSClientUpdateGuiStatus
import info.nightscout.plugins.sync.nsclient.data.AlarmAck
import info.nightscout.plugins.sync.nsclient.extensions.toJson
import info.nightscout.plugins.sync.nsclient.services.NSClientService
import info.nightscout.rx.AapsSchedulers
import info.nightscout.rx.bus.RxBus
import info.nightscout.rx.events.EventAppExit
-import info.nightscout.rx.events.EventChargingState
import info.nightscout.rx.events.EventNSClientNewLog
-import info.nightscout.rx.events.EventNetworkChange
import info.nightscout.rx.events.EventPreferenceChange
import info.nightscout.rx.events.EventSWSyncStatus
import info.nightscout.rx.logging.AAPSLogger
@@ -66,10 +60,9 @@ class NSClientPlugin @Inject constructor(
private val context: Context,
private val fabricPrivacy: FabricPrivacy,
private val sp: SP,
- private val nsClientReceiverDelegate: NsClientReceiverDelegate,
+ private val receiverDelegate: ReceiverDelegate,
private val config: Config,
- private val dataSyncSelector: DataSyncSelector,
- private val uiInteraction: UiInteraction,
+ private val dataSyncSelectorV1: DataSyncSelectorV1,
private val activePlugin: ActivePlugin,
private val dateUtil: DateUtil,
private val profileFunction: ProfileFunction,
@@ -87,36 +80,28 @@ class NSClientPlugin @Inject constructor(
) {
private val disposable = CompositeDisposable()
- private val handler = Handler(HandlerThread(this::class.simpleName + "Handler").also { it.start() }.looper)
- private val listLog: MutableList = ArrayList()
+ override val listLog: MutableList = ArrayList()
+ override val dataSyncSelector: DataSyncSelector get() = dataSyncSelectorV1
override var status = ""
var nsClientService: NSClientService? = null
val isAllowed: Boolean
- get() = nsClientReceiverDelegate.allowed
+ get() = receiverDelegate.allowed
val blockingReason: String
- get() = nsClientReceiverDelegate.blockingReason
+ get() = receiverDelegate.blockingReason
override fun onStart() {
context.bindService(Intent(context, NSClientService::class.java), mConnection, Context.BIND_AUTO_CREATE)
super.onStart()
- nsClientReceiverDelegate.grabReceiversState()
+ receiverDelegate.grabReceiversState()
disposable += rxBus
.toObservable(EventNSClientStatus::class.java)
.observeOn(aapsSchedulers.io)
.subscribe({ event ->
- status = event.getStatus(context)
- rxBus.send(EventNSClientUpdateGUI())
- // Pass to setup wizard
- rxBus.send(EventSWSyncStatus(event.getStatus(context)))
+ status = event.getStatus(context)
+ rxBus.send(EventNSClientUpdateGuiStatus())
+ // Pass to setup wizard
+ rxBus.send(EventSWSyncStatus(event.getStatus(context)))
}, fabricPrivacy::logException)
- disposable += rxBus
- .toObservable(EventNetworkChange::class.java)
- .observeOn(aapsSchedulers.io)
- .subscribe({ ev -> nsClientReceiverDelegate.onStatusEvent(ev) }, fabricPrivacy::logException)
- disposable += rxBus
- .toObservable(EventPreferenceChange::class.java)
- .observeOn(aapsSchedulers.io)
- .subscribe({ ev -> nsClientReceiverDelegate.onStatusEvent(ev) }, fabricPrivacy::logException)
disposable += rxBus
.toObservable(EventAppExit::class.java)
.observeOn(aapsSchedulers.io)
@@ -128,10 +113,6 @@ class NSClientPlugin @Inject constructor(
addToLog(event)
aapsLogger.debug(LTag.NSCLIENT, event.action + " " + event.logText)
}, fabricPrivacy::logException)
- disposable += rxBus
- .toObservable(EventChargingState::class.java)
- .observeOn(aapsSchedulers.io)
- .subscribe({ ev -> nsClientReceiverDelegate.onStatusEvent(ev) }, fabricPrivacy::logException)
disposable += rxBus
.toObservable(EventNSClientResend::class.java)
.observeOn(aapsSchedulers.io)
@@ -174,37 +155,17 @@ class NSClientPlugin @Inject constructor(
}
}
- override fun clearLog() {
- handler.post {
- synchronized(listLog) { listLog.clear() }
- rxBus.send(EventNSClientUpdateGUI())
- }
- }
-
- override fun detectedNsVersion(): String? = nsSettingsStatus.getVersion()
+ override fun detectedNsVersion(): String = nsSettingsStatus.getVersion()
private fun addToLog(ev: EventNSClientNewLog) {
synchronized(listLog) {
- listLog.add(ev)
+ listLog.add(0, ev)
// remove the first line if log is too large
if (listLog.size >= Constants.MAX_LOG_LINES) {
- listLog.removeAt(0)
+ listLog.removeAt(listLog.size - 1)
}
+ rxBus.send(EventNSClientUpdateGuiData())
}
- rxBus.send(EventNSClientUpdateGUI())
- }
-
- override fun textLog(): Spanned {
- try {
- val newTextLog = StringBuilder()
- synchronized(listLog) {
- for (log in listLog) newTextLog.append(log.toPreparedHtml())
- }
- return fromHtml(newTextLog.toString())
- } catch (e: OutOfMemoryError) {
- uiInteraction.showToastAndNotification(context, "Out of memory!\nStop using this phone !!!", info.nightscout.core.ui.R.raw.error)
- }
- return fromHtml("")
}
override fun resend(reason: String) {
@@ -212,8 +173,8 @@ class NSClientPlugin @Inject constructor(
}
override fun pause(newState: Boolean) {
- sp.putBoolean(R.string.key_ns_client_paused, newState)
- rxBus.send(EventPreferenceChange(rh.gs(R.string.key_ns_client_paused)))
+ sp.putBoolean(R.string.key_ns_paused, newState)
+ rxBus.send(EventPreferenceChange(rh.gs(R.string.key_ns_paused)))
}
override val address: String get() = nsClientService?.nsURL ?: ""
@@ -244,7 +205,7 @@ class NSClientPlugin @Inject constructor(
dataSyncSelector.resetToNextFullSync()
}
- override fun nsAdd(collection: String, dataPair: DataSyncSelector.DataPair, progress: String) {
+ override suspend fun nsAdd(collection: String, dataPair: DataSyncSelector.DataPair, progress: String): Boolean {
when (dataPair) {
is DataSyncSelector.PairBolus -> dataPair.value.toJson(true, dateUtil)
is DataSyncSelector.PairCarbs -> dataPair.value.toJson(true, dateUtil)
@@ -264,9 +225,10 @@ class NSClientPlugin @Inject constructor(
}?.let { data ->
nsClientService?.dbAdd(collection, data, dataPair, progress)
}
+ return true
}
- override fun nsUpdate(collection: String, dataPair: DataSyncSelector.DataPair, progress: String) {
+ override suspend fun nsUpdate(collection: String, dataPair: DataSyncSelector.DataPair, progress: String): Boolean {
val id = when (dataPair) {
is DataSyncSelector.PairBolus -> dataPair.value.interfaceIDs.nightscoutId
is DataSyncSelector.PairCarbs -> dataPair.value.interfaceIDs.nightscoutId
@@ -299,5 +261,6 @@ class NSClientPlugin @Inject constructor(
}?.let { data ->
nsClientService?.dbUpdate(collection, id, data, dataPair, progress)
}
+ return true
}
}
\ No newline at end of file
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/NsClientReceiverDelegate.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/ReceiverDelegate.kt
similarity index 57%
rename from plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/NsClientReceiverDelegate.kt
rename to plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/ReceiverDelegate.kt
index b515ee08ab..6866d36408 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/NsClientReceiverDelegate.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/ReceiverDelegate.kt
@@ -1,43 +1,67 @@
package info.nightscout.plugins.sync.nsclient
import info.nightscout.androidaps.annotations.OpenForTesting
+import info.nightscout.core.utils.fabric.FabricPrivacy
import info.nightscout.interfaces.receivers.ReceiverStatusStore
import info.nightscout.plugins.sync.R
+import info.nightscout.plugins.sync.nsShared.events.EventConnectivityOptionChanged
+import info.nightscout.rx.AapsSchedulers
import info.nightscout.rx.bus.RxBus
import info.nightscout.rx.events.EventChargingState
import info.nightscout.rx.events.EventNetworkChange
import info.nightscout.rx.events.EventPreferenceChange
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.shared.sharedPreferences.SP
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
import javax.inject.Inject
import javax.inject.Singleton
@OpenForTesting
@Singleton
-class NsClientReceiverDelegate @Inject constructor(
+class ReceiverDelegate @Inject constructor(
private val rxBus: RxBus,
private val rh: ResourceHelper,
private val sp: SP,
- private val receiverStatusStore: ReceiverStatusStore
+ private val receiverStatusStore: ReceiverStatusStore,
+ aapsSchedulers: AapsSchedulers,
+ fabricPrivacy: FabricPrivacy
) {
- private var allowedChargingState = true
- private var allowedNetworkState = true
- var allowed = true
- var blockingReason = ""
+ private var allowedChargingState: Boolean? = null
+ private var allowedNetworkState: Boolean? = null
+ var allowed: Boolean = false
+ var blockingReason = "Status not available"
+
+ private val disposable = CompositeDisposable()
+
+ init {
+ disposable += rxBus
+ .toObservable(EventPreferenceChange::class.java)
+ .observeOn(aapsSchedulers.io)
+ .subscribe({ ev -> onPreferenceChange(ev) }, fabricPrivacy::logException)
+ disposable += rxBus
+ .toObservable(EventNetworkChange::class.java)
+ .observeOn(aapsSchedulers.io)
+ .subscribe({ ev -> onNetworkChange(ev) }, fabricPrivacy::logException)
+ disposable += rxBus
+ .toObservable(EventChargingState::class.java)
+ .observeOn(aapsSchedulers.io)
+ .subscribe({ ev -> onChargingStateChange(ev) }, fabricPrivacy::logException)
+ }
fun grabReceiversState() {
receiverStatusStore.updateNetworkStatus()
}
- fun onStatusEvent(ev: EventPreferenceChange) {
+ private fun onPreferenceChange(ev: EventPreferenceChange) {
when {
ev.isChanged(rh.gs(R.string.key_ns_wifi)) ||
ev.isChanged(rh.gs(R.string.key_ns_cellular)) ||
ev.isChanged(rh.gs(R.string.key_ns_wifi_ssids)) ||
ev.isChanged(rh.gs(R.string.key_ns_allow_roaming)) -> {
receiverStatusStore.updateNetworkStatus()
- receiverStatusStore.lastNetworkEvent?.let { onStatusEvent(it) }
+ receiverStatusStore.lastNetworkEvent?.let { onNetworkChange(it) }
}
ev.isChanged(rh.gs(R.string.key_ns_charging)) ||
@@ -47,29 +71,30 @@ class NsClientReceiverDelegate @Inject constructor(
}
}
- fun onStatusEvent(ev: EventChargingState) {
+ private fun onChargingStateChange(ev: EventChargingState) {
val newChargingState = calculateStatus(ev)
if (newChargingState != allowedChargingState) {
allowedChargingState = newChargingState
- blockingReason = rh.gs(R.string.blocked_by_charging)
+ if (!newChargingState) blockingReason = rh.gs(R.string.blocked_by_charging)
processStateChange()
}
}
- fun onStatusEvent(ev: EventNetworkChange) {
+ private fun onNetworkChange(ev: EventNetworkChange) {
val newNetworkState = calculateStatus(ev)
if (newNetworkState != allowedNetworkState) {
allowedNetworkState = newNetworkState
- blockingReason = rh.gs(R.string.blocked_by_connectivity)
+ if (!newNetworkState) blockingReason = rh.gs(R.string.blocked_by_connectivity)
processStateChange()
}
}
private fun processStateChange() {
- val newAllowedState = allowedChargingState && allowedNetworkState
+ val newAllowedState = allowedChargingState == true && allowedNetworkState == true
if (newAllowedState != allowed) {
allowed = newAllowedState
- rxBus.send(EventPreferenceChange(rh.gs(R.string.key_ns_client_paused)))
+ if (allowed) blockingReason = ""
+ rxBus.send(EventConnectivityOptionChanged(blockingReason))
}
}
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSDeviceStatusHandler.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSDeviceStatusHandler.kt
index 2560a8dfdd..53e35fe771 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSDeviceStatusHandler.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSDeviceStatusHandler.kt
@@ -1,5 +1,6 @@
package info.nightscout.plugins.sync.nsclient.data
+import info.nightscout.androidaps.annotations.OpenForTesting
import info.nightscout.interfaces.Config
import info.nightscout.interfaces.configBuilder.RunningConfiguration
import info.nightscout.interfaces.nsclient.ProcessedDeviceStatusData
@@ -65,6 +66,7 @@ import javax.inject.Singleton
*/
@Suppress("SpellCheckingInspection")
@Singleton
+@OpenForTesting
class NSDeviceStatusHandler @Inject constructor(
private val sp: SP,
private val config: Config,
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/services/NSClientService.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/services/NSClientService.kt
index e4a5df6141..d68215364a 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/services/NSClientService.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/services/NSClientService.kt
@@ -24,15 +24,16 @@ import info.nightscout.interfaces.Config
import info.nightscout.interfaces.notifications.Notification
import info.nightscout.interfaces.nsclient.NSAlarm
import info.nightscout.interfaces.nsclient.NSSettingsStatus
-import info.nightscout.interfaces.sync.DataSyncSelector
+import info.nightscout.interfaces.nsclient.StoreDataForDb
+import info.nightscout.interfaces.sync.DataSyncSelectorV1
import info.nightscout.interfaces.ui.UiInteraction
import info.nightscout.interfaces.utils.JsonHelper.safeGetString
import info.nightscout.interfaces.utils.JsonHelper.safeGetStringAllowNull
-import info.nightscout.interfaces.workflow.WorkerClasses
import info.nightscout.plugins.sync.R
-import info.nightscout.plugins.sync.nsShared.StoreDataForDbImpl
+import info.nightscout.plugins.sync.nsShared.NsIncomingDataProcessor
+import info.nightscout.plugins.sync.nsShared.events.EventConnectivityOptionChanged
import info.nightscout.plugins.sync.nsShared.events.EventNSClientStatus
-import info.nightscout.plugins.sync.nsShared.events.EventNSClientUpdateGUI
+import info.nightscout.plugins.sync.nsShared.events.EventNSClientUpdateGuiStatus
import info.nightscout.plugins.sync.nsclient.NSClientPlugin
import info.nightscout.plugins.sync.nsclient.acks.NSAddAck
import info.nightscout.plugins.sync.nsclient.acks.NSAuthAck
@@ -41,15 +42,9 @@ import info.nightscout.plugins.sync.nsclient.data.AlarmAck
import info.nightscout.plugins.sync.nsclient.data.NSDeviceStatusHandler
import info.nightscout.plugins.sync.nsclient.workers.NSClientAddUpdateWorker
import info.nightscout.plugins.sync.nsclient.workers.NSClientMbgWorker
-import info.nightscout.plugins.sync.nsclientV3.workers.ProcessFoodWorker
import info.nightscout.rx.AapsSchedulers
import info.nightscout.rx.bus.RxBus
-import info.nightscout.rx.events.EventAppExit
-import info.nightscout.rx.events.EventConfigBuilderChange
-import info.nightscout.rx.events.EventDismissNotification
-import info.nightscout.rx.events.EventNSClientNewLog
-import info.nightscout.rx.events.EventNSClientRestart
-import info.nightscout.rx.events.EventPreferenceChange
+import info.nightscout.rx.events.*
import info.nightscout.rx.logging.AAPSLogger
import info.nightscout.rx.logging.LTag
import info.nightscout.sdk.localmodel.devicestatus.NSDeviceStatus
@@ -62,14 +57,19 @@ import io.reactivex.rxjava3.kotlin.plusAssign
import io.socket.client.IO
import io.socket.client.Socket
import io.socket.emitter.Emitter
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.async
+import kotlinx.coroutines.runBlocking
import org.json.JSONArray
import org.json.JSONException
import org.json.JSONObject
import java.net.URISyntaxException
-import java.util.Locale
+import java.util.*
import javax.inject.Inject
-class NSClientService : DaggerService() {
+@Suppress("SpellCheckingInspection") class NSClientService : DaggerService() {
@Inject lateinit var injector: HasAndroidInjector
@Inject lateinit var aapsLogger: AAPSLogger
@@ -84,10 +84,11 @@ class NSClientService : DaggerService() {
@Inject lateinit var config: Config
@Inject lateinit var dateUtil: DateUtil
@Inject lateinit var dataWorkerStorage: DataWorkerStorage
- @Inject lateinit var dataSyncSelector: DataSyncSelector
+ @Inject lateinit var dataSyncSelectorV1: DataSyncSelectorV1
@Inject lateinit var repository: AppRepository
@Inject lateinit var uiInteraction: UiInteraction
- @Inject lateinit var workerClasses: WorkerClasses
+ @Inject lateinit var nsIncomingDataProcessor: NsIncomingDataProcessor
+ @Inject lateinit var storeDataForDb: StoreDataForDb
companion object {
@@ -97,6 +98,7 @@ class NSClientService : DaggerService() {
}
private val disposable = CompositeDisposable()
+ private var scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
private var wakeLock: PowerManager.WakeLock? = null
private val binder: IBinder = LocalBinder()
@@ -139,13 +141,21 @@ class NSClientService : DaggerService() {
.subscribe({ event: EventPreferenceChange ->
if (event.isChanged(rh.gs(info.nightscout.core.utils.R.string.key_nsclientinternal_url)) ||
event.isChanged(rh.gs(info.nightscout.core.utils.R.string.key_nsclientinternal_api_secret)) ||
- event.isChanged(rh.gs(R.string.key_ns_client_paused))
+ event.isChanged(rh.gs(R.string.key_ns_paused))
) {
latestDateInReceivedData = 0
destroy()
initialize()
}
}, fabricPrivacy::logException)
+ disposable += rxBus
+ .toObservable(EventConnectivityOptionChanged::class.java)
+ .observeOn(aapsSchedulers.io)
+ .subscribe({
+ latestDateInReceivedData = 0
+ destroy()
+ initialize()
+ }, fabricPrivacy::logException)
disposable += rxBus
.toObservable(EventAppExit::class.java)
.observeOn(aapsSchedulers.io)
@@ -165,6 +175,10 @@ class NSClientService : DaggerService() {
.toObservable(NSAuthAck::class.java)
.observeOn(aapsSchedulers.io)
.subscribe({ ack -> processAuthAck(ack) }, fabricPrivacy::logException)
+ disposable += rxBus
+ .toObservable(EventNewHistoryData::class.java)
+ .observeOn(aapsSchedulers.io)
+ .subscribe({ resend("NEW_DATA") }, fabricPrivacy::logException)
}
override fun onDestroy() {
@@ -182,12 +196,12 @@ class NSClientService : DaggerService() {
isConnected = true
hasWriteAuth = ack.write && ack.writeTreatment
rxBus.send(EventNSClientStatus(connectionStatus))
- rxBus.send(EventNSClientNewLog("AUTH", connectionStatus))
+ rxBus.send(EventNSClientNewLog("◄ AUTH", connectionStatus))
if (!ack.write) {
- rxBus.send(EventNSClientNewLog("ERROR", "Write permission not granted "))
+ rxBus.send(EventNSClientNewLog("◄ ERROR", "Write permission not granted "))
}
if (!ack.writeTreatment) {
- rxBus.send(EventNSClientNewLog("ERROR", "Write treatment permission not granted "))
+ rxBus.send(EventNSClientNewLog("◄ ERROR", "Write treatment permission not granted "))
}
if (!hasWriteAuth) {
val noWritePerm = Notification(Notification.NSCLIENT_NO_WRITE_PERMISSION, rh.gs(R.string.no_write_permission), Notification.URGENT)
@@ -214,28 +228,22 @@ class NSClientService : DaggerService() {
if (nsAPISecret != "") nsApiHashCode = Hashing.sha1().hashString(nsAPISecret, Charsets.UTF_8).toString()
rxBus.send(EventNSClientStatus("Initializing"))
if (!nsClientPlugin.isAllowed) {
- rxBus.send(EventNSClientNewLog("NSCLIENT", nsClientPlugin.blockingReason))
+ rxBus.send(EventNSClientNewLog("● NSCLIENT", nsClientPlugin.blockingReason))
rxBus.send(EventNSClientStatus(nsClientPlugin.blockingReason))
- } else if (sp.getBoolean(R.string.key_ns_client_paused, false)) {
- rxBus.send(EventNSClientNewLog("NSCLIENT", "paused"))
+ } else if (sp.getBoolean(R.string.key_ns_paused, false)) {
+ rxBus.send(EventNSClientNewLog("● NSCLIENT", "paused"))
rxBus.send(EventNSClientStatus("Paused"))
} else if (!nsEnabled) {
- rxBus.send(EventNSClientNewLog("NSCLIENT", "disabled"))
+ rxBus.send(EventNSClientNewLog("● NSCLIENT", "disabled"))
rxBus.send(EventNSClientStatus("Disabled"))
} else if (nsURL != "" && (nsURL.lowercase(Locale.getDefault()).startsWith("https://"))) {
try {
rxBus.send(EventNSClientStatus("Connecting ..."))
- val opt = IO.Options()
- opt.forceNew = true
- opt.reconnection = true
+ val opt = IO.Options().also { it.forceNew = 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"))
+ rxBus.send(EventNSClientNewLog("● NSCLIENT", "do connect"))
socket.connect()
socket.on("dataUpdate", onDataUpdate)
socket.on("announcement", onAnnouncement)
@@ -244,17 +252,17 @@ class NSClientService : DaggerService() {
socket.on("clear_alarm", onClearAlarm)
}
} catch (e: URISyntaxException) {
- rxBus.send(EventNSClientNewLog("NSCLIENT", "Wrong URL syntax"))
+ 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(EventNSClientNewLog("● NSCLIENT", "Wrong URL syntax"))
rxBus.send(EventNSClientStatus("Wrong URL syntax"))
}
} else if (nsURL.lowercase(Locale.getDefault()).startsWith("http://")) {
- rxBus.send(EventNSClientNewLog("NSCLIENT", "NS URL not encrypted"))
+ rxBus.send(EventNSClientNewLog("● NSCLIENT", "NS URL not encrypted"))
rxBus.send(EventNSClientStatus("Not encrypted"))
} else {
- rxBus.send(EventNSClientNewLog("NSCLIENT", "No NS URL specified"))
+ rxBus.send(EventNSClientNewLog("● NSCLIENT", "No NS URL specified"))
rxBus.send(EventNSClientStatus("Not configured"))
}
}
@@ -262,7 +270,7 @@ class NSClientService : DaggerService() {
private val onConnect = Emitter.Listener {
connectCounter++
val socketId = socket?.id() ?: "NULL"
- rxBus.send(EventNSClientNewLog("NSCLIENT", "connect #$connectCounter event. ID: $socketId"))
+ rxBus.send(EventNSClientNewLog("● NSCLIENT", "connect #$connectCounter event. ID: $socketId"))
if (socket != null) sendAuthMessage(NSAuthAck(rxBus))
watchdog()
}
@@ -276,16 +284,16 @@ class NSClientService : DaggerService() {
reconnections.remove(r)
}
}
- rxBus.send(EventNSClientNewLog("WATCHDOG", "connections in last " + WATCHDOG_INTERVAL_MINUTES + " minutes: " + reconnections.size + "/" + WATCHDOG_MAX_CONNECTIONS))
+ 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, rh.gs(R.string.ns_malfunction), Notification.URGENT)
rxBus.send(EventNewNotification(n))
- rxBus.send(EventNSClientNewLog("WATCHDOG", "pausing for $WATCHDOG_RECONNECT_IN minutes"))
+ rxBus.send(EventNSClientNewLog("● WATCHDOG", "pausing for $WATCHDOG_RECONNECT_IN minutes"))
nsClientPlugin.pause(true)
- rxBus.send(EventNSClientUpdateGUI())
+ rxBus.send(EventNSClientUpdateGuiStatus())
Thread {
SystemClock.sleep(mins(WATCHDOG_RECONNECT_IN.toLong()).msecs())
- rxBus.send(EventNSClientNewLog("WATCHDOG", "re-enabling NSClient"))
+ rxBus.send(EventNSClientNewLog("● WATCHDOG", "re-enabling NSClient"))
nsClientPlugin.pause(false)
}.start()
}
@@ -294,19 +302,18 @@ class NSClientService : DaggerService() {
private val onDisconnect = Emitter.Listener { args ->
aapsLogger.debug(LTag.NSCLIENT, "disconnect reason: {}", *args)
- rxBus.send(EventNSClientNewLog("NSCLIENT", "disconnect event"))
+ 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"))
+ rxBus.send(EventNSClientNewLog("● NSCLIENT", "destroy"))
isConnected = false
hasWriteAuth = false
socket?.disconnect()
@@ -325,7 +332,7 @@ class NSClientService : DaggerService() {
aapsLogger.error("Unhandled exception", e)
return
}
- rxBus.send(EventNSClientNewLog("AUTH", "requesting auth"))
+ rxBus.send(EventNSClientNewLog("► AUTH", "requesting auth"))
socket?.emit("authorize", authMessage, ack)
}
@@ -336,18 +343,6 @@ class NSClientService : DaggerService() {
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 ->
/*
@@ -414,7 +409,7 @@ class NSClientService : DaggerService() {
val data: JSONObject
try {
data = args[0] as JSONObject
- rxBus.send(EventNSClientNewLog("CLEARALARM", "received"))
+ rxBus.send(EventNSClientNewLog("◄ CLEARALARM", "received"))
rxBus.send(EventDismissNotification(Notification.NS_ALARM))
rxBus.send(EventDismissNotification(Notification.NS_URGENT_ALARM))
aapsLogger.debug(LTag.NSCLIENT, data.toString())
@@ -433,30 +428,26 @@ class NSClientService : DaggerService() {
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"))
+ 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 "))
+ 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"))
- dataWorkerStorage.enqueue(
- OneTimeWorkRequest.Builder(workerClasses.nsProfileWorker)
- .setInputData(dataWorkerStorage.storeInputData(profileStoreJson))
- .build()
- )
+ rxBus.send(EventNSClientNewLog("◄ PROFILE", "profile received"))
+ nsIncomingDataProcessor.processProfile(profileStoreJson)
}
}
if (data.has("treatments")) {
val treatments = data.getJSONArray("treatments")
val addedOrUpdatedTreatments = JSONArray()
- if (treatments.length() > 0) rxBus.send(EventNSClientNewLog("DATA", "received " + treatments.length() + " treatments"))
+ 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)
@@ -502,7 +493,7 @@ class NSClientService : DaggerService() {
aapsLogger.warn(
LTag.NSCLIENT,
"JSON devicestatus object #$arrayIndex (out of ${devicestatusJsonArray.length()}) " +
- "has invalid value \"$batteryValue\" (expected integer); replacing with hardcoded integer 100"
+ "has invalid value \"$batteryValue\" (expected integer); replacing with hardcoded integer 100"
)
uploaderObject.put("battery", 100)
}
@@ -512,7 +503,7 @@ class NSClientService : DaggerService() {
val devicestatuses = gson.fromJson(data.getString("devicestatus"), Array::class.java)
if (devicestatuses.isNotEmpty()) {
- rxBus.send(EventNSClientNewLog("DATA", "received " + devicestatuses.size + " device statuses"))
+ rxBus.send(EventNSClientNewLog("◄ DATA", "received " + devicestatuses.size + " device statuses"))
nsDeviceStatusHandler.handleNewData(devicestatuses)
}
} catch (e: JSONException) {
@@ -521,19 +512,13 @@ class NSClientService : DaggerService() {
}
if (data.has("food")) {
val foods = data.getJSONArray("food")
- if (foods.length() > 0) rxBus.send(EventNSClientNewLog("DATA", "received " + foods.length() + " foods"))
- dataWorkerStorage
- .beginUniqueWork(
- "ProcessFoods",
- OneTimeWorkRequest.Builder(ProcessFoodWorker::class.java)
- .setInputData(dataWorkerStorage.storeInputData(foods))
- .build()
- ).then(OneTimeWorkRequest.Builder(StoreDataForDbImpl.StoreFoodWorker::class.java).build())
- .enqueue()
+ if (foods.length() > 0) rxBus.send(EventNSClientNewLog("◄ DATA", "received " + foods.length() + " foods"))
+ nsIncomingDataProcessor.processFood(foods)
+ storeDataForDb.storeFoodsToDb()
}
if (data.has("mbgs")) {
val mbgArray = data.getJSONArray("mbgs")
- if (mbgArray.length() > 0) rxBus.send(EventNSClientNewLog("DATA", "received " + mbgArray.length() + " mbgs"))
+ if (mbgArray.length() > 0) rxBus.send(EventNSClientNewLog("◄ DATA", "received " + mbgArray.length() + " mbgs"))
dataWorkerStorage.enqueue(
OneTimeWorkRequest.Builder(NSClientMbgWorker::class.java)
.setInputData(dataWorkerStorage.storeInputData(mbgArray))
@@ -542,26 +527,20 @@ class NSClientService : DaggerService() {
}
if (data.has("cals")) {
val cals = data.getJSONArray("cals")
- if (cals.length() > 0) rxBus.send(EventNSClientNewLog("DATA", "received " + cals.length() + " 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"))
+ rxBus.send(EventNSClientNewLog("◄ DATA", "received " + sgvs.length() + " sgvs"))
// Objective0
sp.putBoolean(info.nightscout.core.utils.R.string.key_objectives_bg_is_available_in_ns, true)
- dataWorkerStorage
- .beginUniqueWork(
- "ProcessBg",
- OneTimeWorkRequest.Builder(workerClasses.nsClientSourceWorker)
- .setInputData(dataWorkerStorage.storeInputData(sgvs))
- .build()
- ).then(OneTimeWorkRequest.Builder(StoreDataForDbImpl.StoreBgWorker::class.java).build())
- .enqueue()
+ nsIncomingDataProcessor.processSgvs(sgvs)
+ storeDataForDb.storeGlucoseValuesToDb()
}
}
- rxBus.send(EventNSClientNewLog("LAST", dateUtil.dateAndTimeString(latestDateInReceivedData)))
+ rxBus.send(EventNSClientNewLog("◄ LAST", dateUtil.dateAndTimeString(latestDateInReceivedData)))
} catch (e: JSONException) {
aapsLogger.error("Unhandled exception", e)
}
@@ -583,7 +562,7 @@ class NSClientService : DaggerService() {
socket?.emit("dbUpdate", message, NSUpdateAck("dbUpdate", _id, aapsLogger, rxBus, this, dateUtil, dataWorkerStorage, originalObject))
rxBus.send(
EventNSClientNewLog(
- "UPDATE $collection", "Sent " + originalObject.javaClass.simpleName + " " +
+ "► UPDATE $collection", "Sent " + originalObject.javaClass.simpleName + " " +
"" + _id + " " + data + progress
)
)
@@ -599,7 +578,7 @@ class NSClientService : DaggerService() {
message.put("collection", collection)
message.put("data", data)
socket?.emit("dbAdd", message, NSAddAck(aapsLogger, rxBus, this, dateUtil, dataWorkerStorage, originalObject))
- rxBus.send(EventNSClientNewLog("ADD $collection", "Sent " + originalObject.javaClass.simpleName + " " + data + " " + progress))
+ rxBus.send(EventNSClientNewLog("► ADD $collection", "Sent " + originalObject.javaClass.simpleName + " " + data + " " + progress))
} catch (e: JSONException) {
aapsLogger.error("Unhandled exception", e)
}
@@ -608,29 +587,22 @@ class NSClientService : DaggerService() {
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))
+ 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
+ @Synchronized
+ fun resend(reason: String) = runBlocking {
+ if (!isConnected || !hasWriteAuth) return@runBlocking
+ scope.async {
+ if (socket?.connected() != true) return@async
if (lastAckTime > System.currentTimeMillis() - 10 * 1000L) {
aapsLogger.debug(LTag.NSCLIENT, "Skipping resend by lastAckTime: " + (System.currentTimeMillis() - lastAckTime) / 1000L + " sec")
- return@post
+ return@async
}
- // 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()
- }
- }
+ rxBus.send(EventNSClientNewLog("● QUEUE", "Resend started: $reason"))
+ dataSyncSelectorV1.doUpload()
+ rxBus.send(EventNSClientNewLog("● QUEUE", "Resend ended: $reason"))
+ }.join()
}
fun restart() {
@@ -643,7 +615,7 @@ class NSClientService : DaggerService() {
if (sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_announcements, defaultVal)) {
val nsAlarm = NSAlarm(announcement)
uiInteraction.addNotificationWithAction(injector, nsAlarm)
- rxBus.send(EventNSClientNewLog("ANNOUNCEMENT", safeGetString(announcement, "message", "received")))
+ rxBus.send(EventNSClientNewLog("◄ ANNOUNCEMENT", safeGetString(announcement, "message", "received")))
aapsLogger.debug(LTag.NSCLIENT, announcement.toString())
}
}
@@ -651,12 +623,12 @@ class NSClientService : DaggerService() {
private fun handleAlarm(alarm: JSONObject) {
val defaultVal = config.NSCLIENT
if (sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_alarms, defaultVal)) {
- val snoozedTo = sp.getLong(info.nightscout.core.utils.R.string.key_snoozed_to, 0L)
+ val snoozedTo = sp.getLong(rh.gs(info.nightscout.core.utils.R.string.key_snoozed_to) + alarm.optString("level"), 0L)
if (snoozedTo == 0L || System.currentTimeMillis() > snoozedTo) {
val nsAlarm = NSAlarm(alarm)
uiInteraction.addNotificationWithAction(injector, nsAlarm)
}
- rxBus.send(EventNSClientNewLog("ALARM", safeGetString(alarm, "message", "received")))
+ rxBus.send(EventNSClientNewLog("◄ ALARM", safeGetString(alarm, "message", "received")))
aapsLogger.debug(LTag.NSCLIENT, alarm.toString())
}
}
@@ -664,12 +636,12 @@ class NSClientService : DaggerService() {
private fun handleUrgentAlarm(alarm: JSONObject) {
val defaultVal = config.NSCLIENT
if (sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_alarms, defaultVal)) {
- val snoozedTo = sp.getLong(info.nightscout.core.utils.R.string.key_snoozed_to, 0L)
+ val snoozedTo = sp.getLong(rh.gs(info.nightscout.core.utils.R.string.key_snoozed_to) + alarm.optString("level"), 0L)
if (snoozedTo == 0L || System.currentTimeMillis() > snoozedTo) {
val nsAlarm = NSAlarm(alarm)
uiInteraction.addNotificationWithAction(injector, nsAlarm)
}
- rxBus.send(EventNSClientNewLog("URGENTALARM", safeGetString(alarm, "message", "received")))
+ rxBus.send(EventNSClientNewLog("◄ URGENTALARM", safeGetString(alarm, "message", "received")))
aapsLogger.debug(LTag.NSCLIENT, alarm.toString())
}
}
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddAckWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddAckWorker.kt
index 7ba606c4b7..5575b25e66 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddAckWorker.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddAckWorker.kt
@@ -22,6 +22,7 @@ import info.nightscout.interfaces.sync.DataSyncSelector.PairProfileSwitch
import info.nightscout.interfaces.sync.DataSyncSelector.PairTemporaryBasal
import info.nightscout.interfaces.sync.DataSyncSelector.PairTemporaryTarget
import info.nightscout.interfaces.sync.DataSyncSelector.PairTherapyEvent
+import info.nightscout.interfaces.sync.DataSyncSelectorV1
import info.nightscout.plugins.sync.R
import info.nightscout.plugins.sync.nsclient.acks.NSAddAck
import info.nightscout.rx.AapsSchedulers
@@ -39,7 +40,7 @@ class NSClientAddAckWorker(
@Inject lateinit var dataWorkerStorage: DataWorkerStorage
@Inject lateinit var repository: AppRepository
@Inject lateinit var rxBus: RxBus
- @Inject lateinit var dataSyncSelector: DataSyncSelector
+ @Inject lateinit var dataSyncSelectorV1: DataSyncSelectorV1
@Inject lateinit var aapsSchedulers: AapsSchedulers
@Inject lateinit var sp: SP
@Inject lateinit var storeDataForDb: StoreDataForDb
@@ -60,148 +61,148 @@ class NSClientAddAckWorker(
val pair = ack.originalObject
pair.value.interfaceIDs.nightscoutId = ack.id
storeDataForDb.nsIdTemporaryTargets.add(pair.value)
- dataSyncSelector.confirmLastTempTargetsIdIfGreater(pair.id)
+ dataSyncSelectorV1.confirmLastTempTargetsIdIfGreater(pair.id)
storeDataForDb.scheduleNsIdUpdate()
- rxBus.send(EventNSClientNewLog("DBADD", "Acked TemporaryTarget " + pair.value.interfaceIDs.nightscoutId))
+ rxBus.send(EventNSClientNewLog("◄ DBADD", "Acked TemporaryTarget " + pair.value.interfaceIDs.nightscoutId))
// Send new if waiting
- dataSyncSelector.processChangedTempTargets()
+ dataSyncSelectorV1.processChangedTempTargets()
}
is PairGlucoseValue -> {
val pair = ack.originalObject
pair.value.interfaceIDs.nightscoutId = ack.id
storeDataForDb.nsIdGlucoseValues.add(pair.value)
- dataSyncSelector.confirmLastGlucoseValueIdIfGreater(pair.id)
+ dataSyncSelectorV1.confirmLastGlucoseValueIdIfGreater(pair.id)
storeDataForDb.scheduleNsIdUpdate()
- rxBus.send(EventNSClientNewLog("DBADD", "Acked GlucoseValue " + pair.value.interfaceIDs.nightscoutId))
+ rxBus.send(EventNSClientNewLog("◄ DBADD", "Acked GlucoseValue " + pair.value.interfaceIDs.nightscoutId))
// Send new if waiting
- dataSyncSelector.processChangedGlucoseValues()
+ dataSyncSelectorV1.processChangedGlucoseValues()
}
is PairFood -> {
val pair = ack.originalObject
pair.value.interfaceIDs.nightscoutId = ack.id
storeDataForDb.nsIdFoods.add(pair.value)
- dataSyncSelector.confirmLastFoodIdIfGreater(pair.id)
+ dataSyncSelectorV1.confirmLastFoodIdIfGreater(pair.id)
storeDataForDb.scheduleNsIdUpdate()
- rxBus.send(EventNSClientNewLog("DBADD", "Acked Food " + pair.value.interfaceIDs.nightscoutId))
+ rxBus.send(EventNSClientNewLog("◄ DBADD", "Acked Food " + pair.value.interfaceIDs.nightscoutId))
// Send new if waiting
- dataSyncSelector.processChangedFoods()
+ dataSyncSelectorV1.processChangedFoods()
}
is PairTherapyEvent -> {
val pair = ack.originalObject
pair.value.interfaceIDs.nightscoutId = ack.id
storeDataForDb.nsIdTherapyEvents.add(pair.value)
- dataSyncSelector.confirmLastTherapyEventIdIfGreater(pair.id)
+ dataSyncSelectorV1.confirmLastTherapyEventIdIfGreater(pair.id)
storeDataForDb.scheduleNsIdUpdate()
- rxBus.send(EventNSClientNewLog("DBADD", "Acked TherapyEvent " + pair.value.interfaceIDs.nightscoutId))
+ rxBus.send(EventNSClientNewLog("◄ DBADD", "Acked TherapyEvent " + pair.value.interfaceIDs.nightscoutId))
// Send new if waiting
- dataSyncSelector.processChangedTherapyEvents()
+ dataSyncSelectorV1.processChangedTherapyEvents()
}
is PairBolus -> {
val pair = ack.originalObject
pair.value.interfaceIDs.nightscoutId = ack.id
storeDataForDb.nsIdBoluses.add(pair.value)
- dataSyncSelector.confirmLastBolusIdIfGreater(pair.id)
+ dataSyncSelectorV1.confirmLastBolusIdIfGreater(pair.id)
storeDataForDb.scheduleNsIdUpdate()
- rxBus.send(EventNSClientNewLog("DBADD", "Acked Bolus " + pair.value.interfaceIDs.nightscoutId))
+ rxBus.send(EventNSClientNewLog("◄ DBADD", "Acked Bolus " + pair.value.interfaceIDs.nightscoutId))
// Send new if waiting
- dataSyncSelector.processChangedBoluses()
+ dataSyncSelectorV1.processChangedBoluses()
}
is PairCarbs -> {
val pair = ack.originalObject
pair.value.interfaceIDs.nightscoutId = ack.id
storeDataForDb.nsIdCarbs.add(pair.value)
- dataSyncSelector.confirmLastCarbsIdIfGreater(pair.id)
+ dataSyncSelectorV1.confirmLastCarbsIdIfGreater(pair.id)
storeDataForDb.scheduleNsIdUpdate()
- rxBus.send(EventNSClientNewLog("DBADD", "Acked Carbs " + pair.value.interfaceIDs.nightscoutId))
+ rxBus.send(EventNSClientNewLog("◄ DBADD", "Acked Carbs " + pair.value.interfaceIDs.nightscoutId))
// Send new if waiting
- dataSyncSelector.processChangedCarbs()
+ dataSyncSelectorV1.processChangedCarbs()
}
is PairBolusCalculatorResult -> {
val pair = ack.originalObject
pair.value.interfaceIDs.nightscoutId = ack.id
storeDataForDb.nsIdBolusCalculatorResults.add(pair.value)
- dataSyncSelector.confirmLastBolusCalculatorResultsIdIfGreater(pair.id)
+ dataSyncSelectorV1.confirmLastBolusCalculatorResultsIdIfGreater(pair.id)
storeDataForDb.scheduleNsIdUpdate()
- rxBus.send(EventNSClientNewLog("DBADD", "Acked BolusCalculatorResult " + pair.value.interfaceIDs.nightscoutId))
+ rxBus.send(EventNSClientNewLog("◄ DBADD", "Acked BolusCalculatorResult " + pair.value.interfaceIDs.nightscoutId))
// Send new if waiting
- dataSyncSelector.processChangedBolusCalculatorResults()
+ dataSyncSelectorV1.processChangedBolusCalculatorResults()
}
is PairTemporaryBasal -> {
val pair = ack.originalObject
pair.value.interfaceIDs.nightscoutId = ack.id
storeDataForDb.nsIdTemporaryBasals.add(pair.value)
- dataSyncSelector.confirmLastTemporaryBasalIdIfGreater(pair.id)
+ dataSyncSelectorV1.confirmLastTemporaryBasalIdIfGreater(pair.id)
storeDataForDb.scheduleNsIdUpdate()
- rxBus.send(EventNSClientNewLog("DBADD", "Acked TemporaryBasal " + pair.value.interfaceIDs.nightscoutId))
+ rxBus.send(EventNSClientNewLog("◄ DBADD", "Acked TemporaryBasal " + pair.value.interfaceIDs.nightscoutId))
// Send new if waiting
- dataSyncSelector.processChangedTemporaryBasals()
+ dataSyncSelectorV1.processChangedTemporaryBasals()
}
is PairExtendedBolus -> {
val pair = ack.originalObject
pair.value.interfaceIDs.nightscoutId = ack.id
storeDataForDb.nsIdExtendedBoluses.add(pair.value)
- dataSyncSelector.confirmLastExtendedBolusIdIfGreater(pair.id)
+ dataSyncSelectorV1.confirmLastExtendedBolusIdIfGreater(pair.id)
storeDataForDb.scheduleNsIdUpdate()
- rxBus.send(EventNSClientNewLog("DBADD", "Acked ExtendedBolus " + pair.value.interfaceIDs.nightscoutId))
+ rxBus.send(EventNSClientNewLog("◄ DBADD", "Acked ExtendedBolus " + pair.value.interfaceIDs.nightscoutId))
// Send new if waiting
- dataSyncSelector.processChangedExtendedBoluses()
+ dataSyncSelectorV1.processChangedExtendedBoluses()
}
is PairProfileSwitch -> {
val pair = ack.originalObject
pair.value.interfaceIDs.nightscoutId = ack.id
storeDataForDb.nsIdProfileSwitches.add(pair.value)
- dataSyncSelector.confirmLastProfileSwitchIdIfGreater(pair.id)
+ dataSyncSelectorV1.confirmLastProfileSwitchIdIfGreater(pair.id)
storeDataForDb.scheduleNsIdUpdate()
- rxBus.send(EventNSClientNewLog("DBADD", "Acked ProfileSwitch " + pair.value.interfaceIDs.nightscoutId))
+ rxBus.send(EventNSClientNewLog("◄ DBADD", "Acked ProfileSwitch " + pair.value.interfaceIDs.nightscoutId))
// Send new if waiting
- dataSyncSelector.processChangedProfileSwitches()
+ dataSyncSelectorV1.processChangedProfileSwitches()
}
is PairEffectiveProfileSwitch -> {
val pair = ack.originalObject
pair.value.interfaceIDs.nightscoutId = ack.id
storeDataForDb.nsIdEffectiveProfileSwitches.add(pair.value)
- dataSyncSelector.confirmLastEffectiveProfileSwitchIdIfGreater(pair.id)
+ dataSyncSelectorV1.confirmLastEffectiveProfileSwitchIdIfGreater(pair.id)
storeDataForDb.scheduleNsIdUpdate()
- rxBus.send(EventNSClientNewLog("DBADD", "Acked EffectiveProfileSwitch " + pair.value.interfaceIDs.nightscoutId))
+ rxBus.send(EventNSClientNewLog("◄ DBADD", "Acked EffectiveProfileSwitch " + pair.value.interfaceIDs.nightscoutId))
// Send new if waiting
- dataSyncSelector.processChangedEffectiveProfileSwitches()
+ dataSyncSelectorV1.processChangedEffectiveProfileSwitches()
}
is DataSyncSelector.PairDeviceStatus -> {
val pair = ack.originalObject
pair.value.interfaceIDs.nightscoutId = ack.id
storeDataForDb.nsIdDeviceStatuses.add(pair.value)
- dataSyncSelector.confirmLastDeviceStatusIdIfGreater(pair.value.id)
+ dataSyncSelectorV1.confirmLastDeviceStatusIdIfGreater(pair.value.id)
storeDataForDb.scheduleNsIdUpdate()
- rxBus.send(EventNSClientNewLog("DBADD", "Acked DeviceStatus " + pair.value.interfaceIDs.nightscoutId))
+ rxBus.send(EventNSClientNewLog("◄ DBADD", "Acked DeviceStatus " + pair.value.interfaceIDs.nightscoutId))
// Send new if waiting
- dataSyncSelector.processChangedDeviceStatuses()
+ dataSyncSelectorV1.processChangedDeviceStatuses()
}
is PairProfileStore -> {
- dataSyncSelector.confirmLastProfileStore(ack.originalObject.id)
- rxBus.send(EventNSClientNewLog("DBADD", "Acked ProfileStore " + ack.id))
+ dataSyncSelectorV1.confirmLastProfileStore(ack.originalObject.id)
+ rxBus.send(EventNSClientNewLog("◄ DBADD", "Acked ProfileStore " + ack.id))
}
is PairOfflineEvent -> {
val pair = ack.originalObject
pair.value.interfaceIDs.nightscoutId = ack.id
storeDataForDb.nsIdOfflineEvents.add(pair.value)
- dataSyncSelector.confirmLastOfflineEventIdIfGreater(pair.id)
+ dataSyncSelectorV1.confirmLastOfflineEventIdIfGreater(pair.id)
storeDataForDb.scheduleNsIdUpdate()
- rxBus.send(EventNSClientNewLog("DBADD", "Acked OfflineEvent " + pair.value.interfaceIDs.nightscoutId))
+ rxBus.send(EventNSClientNewLog("◄ DBADD", "Acked OfflineEvent " + pair.value.interfaceIDs.nightscoutId))
// Send new if waiting
- dataSyncSelector.processChangedOfflineEvents()
+ dataSyncSelectorV1.processChangedOfflineEvents()
}
}
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddUpdateWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddUpdateWorker.kt
index b6f9731224..3974c4f99c 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddUpdateWorker.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddUpdateWorker.kt
@@ -44,7 +44,6 @@ class NSClientAddUpdateWorker(
@Inject lateinit var repository: AppRepository
@Inject lateinit var activePlugin: ActivePlugin
@Inject lateinit var rxBus: RxBus
- @Inject lateinit var xDripBroadcast: XDripBroadcast
@Inject lateinit var storeDataForDb: StoreDataForDb
override suspend fun doWorkAndLog(): Result {
@@ -164,7 +163,6 @@ class NSClientAddUpdateWorker(
}
storeDataForDb.storeTreatmentsToDb()
activePlugin.activeNsClient?.updateLatestTreatmentReceivedIfNewer(latestDateInReceivedData)
- xDripBroadcast.sendTreatments(treatments)
return ret
}
}
\ No newline at end of file
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientUpdateRemoveAckWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientUpdateRemoveAckWorker.kt
index eaa06b80bb..157b597d31 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientUpdateRemoveAckWorker.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientUpdateRemoveAckWorker.kt
@@ -6,7 +6,6 @@ import androidx.work.workDataOf
import info.nightscout.core.utils.receivers.DataWorkerStorage
import info.nightscout.core.utils.worker.LoggingWorker
import info.nightscout.database.impl.AppRepository
-import info.nightscout.interfaces.sync.DataSyncSelector
import info.nightscout.interfaces.sync.DataSyncSelector.PairBolus
import info.nightscout.interfaces.sync.DataSyncSelector.PairBolusCalculatorResult
import info.nightscout.interfaces.sync.DataSyncSelector.PairCarbs
@@ -19,6 +18,7 @@ import info.nightscout.interfaces.sync.DataSyncSelector.PairProfileSwitch
import info.nightscout.interfaces.sync.DataSyncSelector.PairTemporaryBasal
import info.nightscout.interfaces.sync.DataSyncSelector.PairTemporaryTarget
import info.nightscout.interfaces.sync.DataSyncSelector.PairTherapyEvent
+import info.nightscout.interfaces.sync.DataSyncSelectorV1
import info.nightscout.plugins.sync.nsclient.acks.NSUpdateAck
import info.nightscout.rx.AapsSchedulers
import info.nightscout.rx.bus.RxBus
@@ -34,7 +34,7 @@ class NSClientUpdateRemoveAckWorker(
@Inject lateinit var dataWorkerStorage: DataWorkerStorage
@Inject lateinit var repository: AppRepository
@Inject lateinit var rxBus: RxBus
- @Inject lateinit var dataSyncSelector: DataSyncSelector
+ @Inject lateinit var dataSyncSelectorV1: DataSyncSelectorV1
@Inject lateinit var aapsSchedulers: AapsSchedulers
override suspend fun doWorkAndLog(): Result {
@@ -47,109 +47,109 @@ class NSClientUpdateRemoveAckWorker(
when (ack.originalObject) {
is PairTemporaryTarget -> {
val pair = ack.originalObject
- dataSyncSelector.confirmLastTempTargetsIdIfGreater(pair.id)
- rxBus.send(EventNSClientNewLog("DBUPDATE", "Acked TemporaryTarget" + ack._id))
+ dataSyncSelectorV1.confirmLastTempTargetsIdIfGreater(pair.id)
+ rxBus.send(EventNSClientNewLog("◄ DBUPDATE", "Acked TemporaryTarget" + ack._id))
// Send new if waiting
- dataSyncSelector.processChangedTempTargets()
+ dataSyncSelectorV1.processChangedTempTargets()
ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
}
is PairGlucoseValue -> {
val pair = ack.originalObject
- dataSyncSelector.confirmLastGlucoseValueIdIfGreater(pair.id)
- rxBus.send(EventNSClientNewLog("DBUPDATE", "Acked GlucoseValue " + ack._id))
+ dataSyncSelectorV1.confirmLastGlucoseValueIdIfGreater(pair.id)
+ rxBus.send(EventNSClientNewLog("◄ DBUPDATE", "Acked GlucoseValue " + ack._id))
// Send new if waiting
- dataSyncSelector.processChangedGlucoseValues()
+ dataSyncSelectorV1.processChangedGlucoseValues()
ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
}
is PairFood -> {
val pair = ack.originalObject
- dataSyncSelector.confirmLastFoodIdIfGreater(pair.id)
- rxBus.send(EventNSClientNewLog("DBUPDATE", "Acked Food " + ack._id))
+ dataSyncSelectorV1.confirmLastFoodIdIfGreater(pair.id)
+ rxBus.send(EventNSClientNewLog("◄ DBUPDATE", "Acked Food " + ack._id))
// Send new if waiting
- dataSyncSelector.processChangedFoods()
+ dataSyncSelectorV1.processChangedFoods()
ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
}
is PairTherapyEvent -> {
val pair = ack.originalObject
- dataSyncSelector.confirmLastTherapyEventIdIfGreater(pair.id)
- rxBus.send(EventNSClientNewLog("DBUPDATE", "Acked TherapyEvent " + ack._id))
+ dataSyncSelectorV1.confirmLastTherapyEventIdIfGreater(pair.id)
+ rxBus.send(EventNSClientNewLog("◄ DBUPDATE", "Acked TherapyEvent " + ack._id))
// Send new if waiting
- dataSyncSelector.processChangedTherapyEvents()
+ dataSyncSelectorV1.processChangedTherapyEvents()
ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
}
is PairBolus -> {
val pair = ack.originalObject
- dataSyncSelector.confirmLastBolusIdIfGreater(pair.id)
- rxBus.send(EventNSClientNewLog("DBUPDATE", "Acked Bolus " + ack._id))
+ dataSyncSelectorV1.confirmLastBolusIdIfGreater(pair.id)
+ rxBus.send(EventNSClientNewLog("◄ DBUPDATE", "Acked Bolus " + ack._id))
// Send new if waiting
- dataSyncSelector.processChangedBoluses()
+ dataSyncSelectorV1.processChangedBoluses()
ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
}
is PairCarbs -> {
val pair = ack.originalObject
- dataSyncSelector.confirmLastCarbsIdIfGreater(pair.id)
- rxBus.send(EventNSClientNewLog("DBUPDATE", "Acked Carbs " + ack._id))
+ dataSyncSelectorV1.confirmLastCarbsIdIfGreater(pair.id)
+ rxBus.send(EventNSClientNewLog("◄ DBUPDATE", "Acked Carbs " + ack._id))
// Send new if waiting
- dataSyncSelector.processChangedCarbs()
+ dataSyncSelectorV1.processChangedCarbs()
ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
}
is PairBolusCalculatorResult -> {
val pair = ack.originalObject
- dataSyncSelector.confirmLastBolusCalculatorResultsIdIfGreater(pair.id)
- rxBus.send(EventNSClientNewLog("DBUPDATE", "Acked BolusCalculatorResult " + ack._id))
+ dataSyncSelectorV1.confirmLastBolusCalculatorResultsIdIfGreater(pair.id)
+ rxBus.send(EventNSClientNewLog("◄ DBUPDATE", "Acked BolusCalculatorResult " + ack._id))
// Send new if waiting
- dataSyncSelector.processChangedBolusCalculatorResults()
+ dataSyncSelectorV1.processChangedBolusCalculatorResults()
ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
}
is PairTemporaryBasal -> {
val pair = ack.originalObject
- dataSyncSelector.confirmLastTemporaryBasalIdIfGreater(pair.id)
- rxBus.send(EventNSClientNewLog("DBUPDATE", "Acked TemporaryBasal " + ack._id))
+ dataSyncSelectorV1.confirmLastTemporaryBasalIdIfGreater(pair.id)
+ rxBus.send(EventNSClientNewLog("◄ DBUPDATE", "Acked TemporaryBasal " + ack._id))
// Send new if waiting
- dataSyncSelector.processChangedTemporaryBasals()
+ dataSyncSelectorV1.processChangedTemporaryBasals()
ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
}
is PairExtendedBolus -> {
val pair = ack.originalObject
- dataSyncSelector.confirmLastExtendedBolusIdIfGreater(pair.id)
- rxBus.send(EventNSClientNewLog("DBUPDATE", "Acked ExtendedBolus " + ack._id))
+ dataSyncSelectorV1.confirmLastExtendedBolusIdIfGreater(pair.id)
+ rxBus.send(EventNSClientNewLog("◄ DBUPDATE", "Acked ExtendedBolus " + ack._id))
// Send new if waiting
- dataSyncSelector.processChangedExtendedBoluses()
+ dataSyncSelectorV1.processChangedExtendedBoluses()
ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
}
is PairProfileSwitch -> {
val pair = ack.originalObject
- dataSyncSelector.confirmLastProfileSwitchIdIfGreater(pair.id)
- rxBus.send(EventNSClientNewLog("DBUPDATE", "Acked ProfileSwitch " + ack._id))
+ dataSyncSelectorV1.confirmLastProfileSwitchIdIfGreater(pair.id)
+ rxBus.send(EventNSClientNewLog("◄ DBUPDATE", "Acked ProfileSwitch " + ack._id))
// Send new if waiting
- dataSyncSelector.processChangedProfileSwitches()
+ dataSyncSelectorV1.processChangedProfileSwitches()
ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
}
is PairEffectiveProfileSwitch -> {
val pair = ack.originalObject
- dataSyncSelector.confirmLastEffectiveProfileSwitchIdIfGreater(pair.id)
- rxBus.send(EventNSClientNewLog("DBUPDATE", "Acked EffectiveProfileSwitch " + ack._id))
+ dataSyncSelectorV1.confirmLastEffectiveProfileSwitchIdIfGreater(pair.id)
+ rxBus.send(EventNSClientNewLog("◄ DBUPDATE", "Acked EffectiveProfileSwitch " + ack._id))
// Send new if waiting
- dataSyncSelector.processChangedEffectiveProfileSwitches()
+ dataSyncSelectorV1.processChangedEffectiveProfileSwitches()
ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
}
is PairOfflineEvent -> {
val pair = ack.originalObject
- dataSyncSelector.confirmLastOfflineEventIdIfGreater(pair.id)
- rxBus.send(EventNSClientNewLog("DBUPDATE", "Acked OfflineEvent" + ack._id))
+ dataSyncSelectorV1.confirmLastOfflineEventIdIfGreater(pair.id)
+ rxBus.send(EventNSClientNewLog("◄ DBUPDATE", "Acked OfflineEvent" + ack._id))
// Send new if waiting
- dataSyncSelector.processChangedOfflineEvents()
+ dataSyncSelectorV1.processChangedOfflineEvents()
ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
}
}
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/DataSyncSelectorV3Impl.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/DataSyncSelectorV3Impl.kt
new file mode 100644
index 0000000000..23bdbcb5c0
--- /dev/null
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/DataSyncSelectorV3Impl.kt
@@ -0,0 +1,708 @@
+package info.nightscout.plugins.sync.nsclientV3
+
+import info.nightscout.androidaps.annotations.OpenForTesting
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.interfaces.nsclient.StoreDataForDb
+import info.nightscout.interfaces.plugin.ActivePlugin
+import info.nightscout.interfaces.profile.ProfileFunction
+import info.nightscout.interfaces.sync.DataSyncSelector
+import info.nightscout.interfaces.sync.DataSyncSelectorV3
+import info.nightscout.interfaces.utils.JsonHelper
+import info.nightscout.plugins.sync.R
+import info.nightscout.plugins.sync.nsShared.events.EventNSClientUpdateGuiQueue
+import info.nightscout.plugins.sync.nsShared.events.EventNSClientUpdateGuiStatus
+import info.nightscout.rx.bus.RxBus
+import info.nightscout.rx.logging.AAPSLogger
+import info.nightscout.rx.logging.LTag
+import info.nightscout.shared.sharedPreferences.SP
+import info.nightscout.shared.utils.DateUtil
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@OpenForTesting
+@Singleton
+class DataSyncSelectorV3Impl @Inject constructor(
+ private val sp: SP,
+ private val aapsLogger: AAPSLogger,
+ private val dateUtil: DateUtil,
+ private val profileFunction: ProfileFunction,
+ private val activePlugin: ActivePlugin,
+ private val appRepository: AppRepository,
+ private val rxBus: RxBus,
+ private val storeDataForDb: StoreDataForDb
+) : DataSyncSelectorV3 {
+
+ class QueueCounter(
+ var bolusesRemaining: Long = -1L,
+ var carbsRemaining: Long = -1L,
+ var bcrRemaining: Long = -1L,
+ var ttsRemaining: Long = -1L,
+ var foodsRemaining: Long = -1L,
+ var gvsRemaining: Long = -1L,
+ var tesRemaining: Long = -1L,
+ var dssRemaining: Long = -1L,
+ var tbrsRemaining: Long = -1L,
+ var ebsRemaining: Long = -1L,
+ var pssRemaining: Long = -1L,
+ var epssRemaining: Long = -1L,
+ var oesRemaining: Long = -1L
+ ) {
+
+ fun size(): Long =
+ bolusesRemaining +
+ carbsRemaining +
+ bcrRemaining +
+ ttsRemaining +
+ foodsRemaining +
+ gvsRemaining +
+ tesRemaining +
+ dssRemaining +
+ tbrsRemaining +
+ ebsRemaining +
+ pssRemaining +
+ epssRemaining +
+ oesRemaining
+ }
+
+ private val queueCounter = QueueCounter()
+ private val isPaused get() = sp.getBoolean(R.string.key_ns_paused, false)
+
+ override fun queueSize(): Long = queueCounter.size()
+
+ override suspend fun doUpload() {
+ rxBus.send(EventNSClientUpdateGuiStatus())
+ if (sp.getBoolean(R.string.key_ns_upload, true) && !isPaused) {
+ queueCounter.bolusesRemaining = (appRepository.getLastBolusId() ?: 0L) - sp.getLong(R.string.key_ns_bolus_last_synced_id, 0)
+ queueCounter.carbsRemaining = (appRepository.getLastCarbsId() ?: 0L) - sp.getLong(R.string.key_ns_carbs_last_synced_id, 0)
+ queueCounter.bcrRemaining = (appRepository.getLastBolusCalculatorResultId() ?: 0L) - sp.getLong(R.string.key_ns_bolus_calculator_result_last_synced_id, 0)
+ queueCounter.ttsRemaining = (appRepository.getLastTempTargetId() ?: 0L) - sp.getLong(R.string.key_ns_temporary_target_last_synced_id, 0)
+ queueCounter.foodsRemaining = (appRepository.getLastFoodId() ?: 0L) - sp.getLong(R.string.key_ns_food_last_synced_id, 0)
+ queueCounter.gvsRemaining = (appRepository.getLastGlucoseValueId() ?: 0L) - sp.getLong(R.string.key_ns_glucose_value_last_synced_id, 0)
+ queueCounter.tesRemaining = (appRepository.getLastTherapyEventId() ?: 0L) - sp.getLong(R.string.key_ns_therapy_event_last_synced_id, 0)
+ queueCounter.dssRemaining = (appRepository.getLastDeviceStatusId() ?: 0L) - sp.getLong(R.string.key_ns_device_status_last_synced_id, 0)
+ queueCounter.tbrsRemaining = (appRepository.getLastTemporaryBasalId() ?: 0L) - sp.getLong(R.string.key_ns_temporary_basal_last_synced_id, 0)
+ queueCounter.ebsRemaining = (appRepository.getLastExtendedBolusId() ?: 0L) - sp.getLong(R.string.key_ns_extended_bolus_last_synced_id, 0)
+ queueCounter.pssRemaining = (appRepository.getLastProfileSwitchId() ?: 0L) - sp.getLong(R.string.key_ns_profile_switch_last_synced_id, 0)
+ queueCounter.epssRemaining = (appRepository.getLastEffectiveProfileSwitchId() ?: 0L) - sp.getLong(R.string.key_ns_effective_profile_switch_last_synced_id, 0)
+ queueCounter.oesRemaining = (appRepository.getLastOfflineEventId() ?: 0L) - sp.getLong(R.string.key_ns_offline_event_last_synced_id, 0)
+ rxBus.send(EventNSClientUpdateGuiQueue())
+ processChangedGlucoseValues()
+ processChangedBoluses()
+ processChangedCarbs()
+ processChangedBolusCalculatorResults()
+ processChangedTemporaryBasals()
+ processChangedExtendedBoluses()
+ processChangedProfileSwitches()
+ processChangedEffectiveProfileSwitches()
+ processChangedTempTargets()
+ processChangedFoods()
+ processChangedTherapyEvents()
+ processChangedDeviceStatuses()
+ processChangedOfflineEvents()
+ processChangedProfileStore()
+ storeDataForDb.updateNsIds()
+ }
+ rxBus.send(EventNSClientUpdateGuiStatus())
+ }
+
+ override fun resetToNextFullSync() {
+ sp.remove(R.string.key_ns_glucose_value_last_synced_id)
+ sp.remove(R.string.key_ns_temporary_basal_last_synced_id)
+ sp.remove(R.string.key_ns_temporary_target_last_synced_id)
+ sp.remove(R.string.key_ns_extended_bolus_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_therapy_event_last_synced_id)
+ sp.remove(R.string.key_ns_profile_switch_last_synced_id)
+ sp.remove(R.string.key_ns_effective_profile_switch_last_synced_id)
+ sp.remove(R.string.key_ns_offline_event_last_synced_id)
+ sp.remove(R.string.key_ns_profile_store_last_synced_timestamp)
+
+ val lastDeviceStatusDbId = appRepository.getLastDeviceStatusId()
+ if (lastDeviceStatusDbId != null) sp.putLong(R.string.key_ns_device_status_last_synced_id, lastDeviceStatusDbId)
+ else sp.remove(R.string.key_ns_device_status_last_synced_id)
+ }
+
+ 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)
+ }
+ }
+
+ suspend fun processChangedBoluses() {
+ var cont = true
+ while (cont) {
+ if (isPaused) return
+ val lastDbId = appRepository.getLastBolusId() ?: 0L
+ var startId = sp.getLong(R.string.key_ns_bolus_last_synced_id, 0)
+ if (startId > lastDbId) {
+ aapsLogger.info(LTag.NSCLIENT, "Resetting startId: $startId lastDbId: $lastDbId")
+ sp.putLong(R.string.key_ns_bolus_last_synced_id, 0)
+ startId = 0
+ }
+ queueCounter.bolusesRemaining = lastDbId - startId
+ rxBus.send(EventNSClientUpdateGuiQueue())
+ appRepository.getNextSyncElementBolus(startId).blockingGet()?.let { bolus ->
+ //aapsLogger.info(LTag.NSCLIENT, "Loading Bolus data Start: $startId ${bolus.first} forID: ${bolus.second.id} ")
+ when {
+ // new record with existing NS id => must be coming from NS => ignore
+ bolus.first.id == bolus.second.id && bolus.first.interfaceIDs.nightscoutId != null ->
+ aapsLogger.info(LTag.NSCLIENT, "Ignoring Bolus. Loaded from NS: ${bolus.second.id} ")
+ // only NsId changed, no need to upload
+ bolus.first.onlyNsIdAdded(bolus.second) ->
+ aapsLogger.info(LTag.NSCLIENT, "Ignoring Bolus. Only NS id changed: ${bolus.second.id} ")
+ // without nsId = create new
+ bolus.first.interfaceIDs.nightscoutId == null ->
+ cont = activePlugin.activeNsClient?.nsAdd("treatments", DataSyncSelector.PairBolus(bolus.first, bolus.second.id), " $startId/$lastDbId") ?: false
+ // with nsId = update if it's modified record
+ bolus.first.interfaceIDs.nightscoutId != null && bolus.first.id != bolus.second.id ->
+ cont = activePlugin.activeNsClient?.nsUpdate("treatments", DataSyncSelector.PairBolus(bolus.first, bolus.second.id), "$startId/$lastDbId") ?: false
+ }
+ confirmLastBolusIdIfGreater(bolus.second.id)
+ } ?: run {
+ cont = false
+ }
+ }
+ }
+
+ 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)
+ }
+ }
+
+ suspend fun processChangedCarbs() {
+ var cont = true
+ while (cont) {
+ if (isPaused) return
+ val lastDbId = appRepository.getLastCarbsId() ?: 0L
+ var startId = sp.getLong(R.string.key_ns_carbs_last_synced_id, 0)
+ if (startId > lastDbId) {
+ aapsLogger.info(LTag.NSCLIENT, "Resetting startId: $startId lastDbId: $lastDbId")
+ sp.putLong(R.string.key_ns_carbs_last_synced_id, 0)
+ startId = 0
+ }
+ queueCounter.carbsRemaining = lastDbId - startId
+ rxBus.send(EventNSClientUpdateGuiQueue())
+ appRepository.getNextSyncElementCarbs(startId).blockingGet()?.let { carb ->
+ //aapsLogger.info(LTag.NSCLIENT, "Loading Carbs data Start: $startId ${carb.first} forID: ${carb.second.id} ")
+ when {
+ // new record with existing NS id => must be coming from NS => ignore
+ carb.first.id == carb.second.id && carb.first.interfaceIDs.nightscoutId != null ->
+ aapsLogger.info(LTag.NSCLIENT, "Ignoring Carbs. Loaded from NS: ${carb.second.id} ")
+ // only NsId changed, no need to upload
+ carb.first.onlyNsIdAdded(carb.second) ->
+ aapsLogger.info(LTag.NSCLIENT, "Ignoring Carbs. Only NS id changed ID: ${carb.second.id} ")
+ // without nsId = create new
+ carb.first.interfaceIDs.nightscoutId == null ->
+ cont = activePlugin.activeNsClient?.nsAdd("treatments", DataSyncSelector.PairCarbs(carb.first, carb.second.id), "$startId/$lastDbId") ?: false
+ // with nsId = update if it's modified record
+ carb.first.interfaceIDs.nightscoutId != null && carb.first.id != carb.second.id ->
+ cont = activePlugin.activeNsClient?.nsUpdate("treatments", DataSyncSelector.PairCarbs(carb.first, carb.second.id), "$startId/$lastDbId") ?: false
+ }
+ confirmLastCarbsIdIfGreater(carb.second.id)
+ } ?: run {
+ cont = false
+ }
+ }
+ }
+
+ 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)
+ }
+ }
+
+ suspend fun processChangedBolusCalculatorResults() {
+ var cont = true
+ while (cont) {
+ if (isPaused) return
+ val lastDbId = appRepository.getLastBolusCalculatorResultId() ?: 0L
+ var startId = sp.getLong(R.string.key_ns_bolus_calculator_result_last_synced_id, 0)
+ if (startId > lastDbId) {
+ aapsLogger.info(LTag.NSCLIENT, "Resetting startId: $startId lastDbId: $lastDbId")
+ sp.putLong(R.string.key_ns_bolus_calculator_result_last_synced_id, 0)
+ startId = 0
+ }
+ queueCounter.bcrRemaining = lastDbId - startId
+ rxBus.send(EventNSClientUpdateGuiQueue())
+ appRepository.getNextSyncElementBolusCalculatorResult(startId).blockingGet()?.let { bolusCalculatorResult ->
+ //aapsLogger.info(LTag.NSCLIENT, "Loading BolusCalculatorResult data Start: $startId ${bolusCalculatorResult.first} forID: ${bolusCalculatorResult.second.id} ")
+ when {
+ // new record with existing NS id => must be coming from NS => ignore
+ bolusCalculatorResult.first.id == bolusCalculatorResult.second.id && bolusCalculatorResult.first.interfaceIDs.nightscoutId != null ->
+ aapsLogger.info(LTag.NSCLIENT, "Ignoring BolusCalculatorResult. Loaded from NS: ${bolusCalculatorResult.second.id} ")
+ // only NsId changed, no need to upload
+ bolusCalculatorResult.first.onlyNsIdAdded(bolusCalculatorResult.second) ->
+ aapsLogger.info(LTag.NSCLIENT, "Ignoring BolusCalculatorResult. Only NS id changed ID: ${bolusCalculatorResult.second.id} ")
+ // without nsId = create new
+ bolusCalculatorResult.first.interfaceIDs.nightscoutId == null ->
+ cont = activePlugin.activeNsClient?.nsAdd(
+ "treatments",
+ DataSyncSelector.PairBolusCalculatorResult(bolusCalculatorResult.first, bolusCalculatorResult.second.id),
+ "$startId/$lastDbId"
+ ) ?: false
+ // with nsId = update if it's modified record
+ bolusCalculatorResult.first.interfaceIDs.nightscoutId != null && bolusCalculatorResult.first.id != bolusCalculatorResult.second.id ->
+ cont = activePlugin.activeNsClient?.nsUpdate(
+ "treatments",
+ DataSyncSelector.PairBolusCalculatorResult(bolusCalculatorResult.first, bolusCalculatorResult.second.id),
+ "$startId/$lastDbId"
+ ) ?: false
+ }
+ confirmLastBolusCalculatorResultsIdIfGreater(bolusCalculatorResult.second.id)
+ } ?: run {
+ cont = false
+ }
+ }
+ }
+
+ 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)
+ }
+ }
+
+ suspend fun processChangedTempTargets() {
+ var cont = true
+ while (cont) {
+ if (isPaused) return
+ val lastDbId = appRepository.getLastTempTargetId() ?: 0L
+ var startId = sp.getLong(R.string.key_ns_temporary_target_last_synced_id, 0)
+ if (startId > lastDbId) {
+ aapsLogger.info(LTag.NSCLIENT, "Resetting startId: $startId lastDbId: $lastDbId")
+ sp.putLong(R.string.key_ns_temporary_target_last_synced_id, 0)
+ startId = 0
+ }
+ queueCounter.ttsRemaining = lastDbId - startId
+ rxBus.send(EventNSClientUpdateGuiQueue())
+ appRepository.getNextSyncElementTemporaryTarget(startId).blockingGet()?.let { tt ->
+ //aapsLogger.info(LTag.NSCLIENT, "Loading TemporaryTarget data Start: $startId ${tt.first} forID: ${tt.second.id} ")
+ when {
+ // new record with existing NS id => must be coming from NS => ignore
+ tt.first.id == tt.second.id && tt.first.interfaceIDs.nightscoutId != null ->
+ aapsLogger.info(LTag.NSCLIENT, "Ignoring TemporaryTarget. Loaded from NS: ${tt.second.id} ")
+ // only NsId changed, no need to upload
+ tt.first.onlyNsIdAdded(tt.second) ->
+ aapsLogger.info(LTag.NSCLIENT, "Ignoring TemporaryTarget. Only NS id changed ID: ${tt.second.id} ")
+ // without nsId = create new
+ tt.first.interfaceIDs.nightscoutId == null ->
+ cont = activePlugin.activeNsClient?.nsAdd("treatments", DataSyncSelector.PairTemporaryTarget(tt.first, tt.second.id), "$startId/$lastDbId") ?: false
+ // existing with nsId = update
+ tt.first.interfaceIDs.nightscoutId != null ->
+ cont = activePlugin.activeNsClient?.nsUpdate("treatments", DataSyncSelector.PairTemporaryTarget(tt.first, tt.second.id), "$startId/$lastDbId") ?: false
+ }
+ confirmLastTempTargetsIdIfGreater(tt.second.id)
+ } ?: run {
+ cont = false
+ }
+ }
+ }
+
+ 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)
+ }
+ }
+
+ suspend fun processChangedFoods() {
+ var cont = true
+ while (cont) {
+ if (isPaused) return
+ val lastDbId = appRepository.getLastFoodId() ?: 0L
+ var startId = sp.getLong(R.string.key_ns_food_last_synced_id, 0)
+ if (startId > lastDbId) {
+ aapsLogger.info(LTag.NSCLIENT, "Resetting startId: $startId lastDbId: $lastDbId")
+ sp.putLong(R.string.key_ns_food_last_synced_id, 0)
+ startId = 0
+ }
+ queueCounter.foodsRemaining = lastDbId - startId
+ rxBus.send(EventNSClientUpdateGuiQueue())
+ appRepository.getNextSyncElementFood(startId).blockingGet()?.let { food ->
+ //aapsLogger.info(LTag.NSCLIENT, "Loading Food data Start: $startId ${food.first} forID: ${food.second.id} ")
+ when {
+ // new record with existing NS id => must be coming from NS => ignore
+ food.first.id == food.second.id && food.first.interfaceIDs.nightscoutId != null ->
+ aapsLogger.info(LTag.NSCLIENT, "Ignoring Food. Loaded from NS: ${food.second.id} ")
+ // only NsId changed, no need to upload
+ food.first.onlyNsIdAdded(food.second) ->
+ aapsLogger.info(LTag.NSCLIENT, "Ignoring Food. Only NS id changed ID: ${food.second.id} ")
+ // without nsId = create new
+ food.first.interfaceIDs.nightscoutId == null ->
+ cont = activePlugin.activeNsClient?.nsAdd("food", DataSyncSelector.PairFood(food.first, food.second.id), "$startId/$lastDbId") ?: false
+ // with nsId = update
+ food.first.interfaceIDs.nightscoutId != null ->
+ cont = activePlugin.activeNsClient?.nsUpdate("food", DataSyncSelector.PairFood(food.first, food.second.id), "$startId/$lastDbId") ?: false
+ }
+ confirmLastFoodIdIfGreater(food.second.id)
+ } ?: run {
+ cont = false
+ }
+ }
+ }
+
+ 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)
+ }
+ }
+
+ suspend fun processChangedGlucoseValues() {
+ var cont = true
+ while (cont) {
+ if (isPaused) return
+ val lastDbId = appRepository.getLastGlucoseValueId() ?: 0L
+ var startId = sp.getLong(R.string.key_ns_glucose_value_last_synced_id, 0)
+ if (startId > lastDbId) {
+ aapsLogger.info(LTag.NSCLIENT, "Resetting startId: $startId lastDbId: $lastDbId")
+ sp.putLong(R.string.key_ns_glucose_value_last_synced_id, 0)
+ startId = 0
+ }
+ queueCounter.gvsRemaining = lastDbId - startId
+ rxBus.send(EventNSClientUpdateGuiQueue())
+ appRepository.getNextSyncElementGlucoseValue(startId).blockingGet()?.let { gv ->
+ //aapsLogger.info(LTag.NSCLIENT, "Loading GlucoseValue data Start: $startId ${gv.first} forID: ${gv.second.id} ")
+ if (activePlugin.activeBgSource.shouldUploadToNs(gv.first)) {
+ when {
+ // new record with existing NS id => must be coming from NS => ignore
+ gv.first.id == gv.second.id && gv.first.interfaceIDs.nightscoutId != null ->
+ aapsLogger.info(LTag.NSCLIENT, "Ignoring GlucoseValue. Loaded from NS: ${gv.second.id} ")
+ // only NsId changed, no need to upload
+ gv.first.onlyNsIdAdded(gv.second) ->
+ aapsLogger.info(LTag.NSCLIENT, "Ignoring GlucoseValue. Only NS id changed ID: ${gv.second.id} ")
+ // without nsId = create new
+ gv.first.interfaceIDs.nightscoutId == null ->
+ cont = activePlugin.activeNsClient?.nsAdd("entries", DataSyncSelector.PairGlucoseValue(gv.first, gv.second.id), "$startId/$lastDbId") ?: false
+ // with nsId = update
+ else -> // gv.first.interfaceIDs.nightscoutId != null
+ cont = activePlugin.activeNsClient?.nsUpdate("entries", DataSyncSelector.PairGlucoseValue(gv.first, gv.second.id), "$startId/$lastDbId") ?: false
+ }
+ }
+ confirmLastGlucoseValueIdIfGreater(gv.second.id)
+ } ?: run {
+ cont = false
+ }
+ }
+ }
+
+ 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)
+ }
+ }
+
+ suspend fun processChangedTherapyEvents() {
+ var cont = true
+ while (cont) {
+ if (isPaused) return
+ val lastDbId = appRepository.getLastTherapyEventId() ?: 0L
+ var startId = sp.getLong(R.string.key_ns_therapy_event_last_synced_id, 0)
+ if (startId > lastDbId) {
+ aapsLogger.info(LTag.NSCLIENT, "Resetting startId: $startId lastDbId: $lastDbId")
+ sp.putLong(R.string.key_ns_therapy_event_last_synced_id, 0)
+ startId = 0
+ }
+ queueCounter.tesRemaining = lastDbId - startId
+ rxBus.send(EventNSClientUpdateGuiQueue())
+ appRepository.getNextSyncElementTherapyEvent(startId).blockingGet()?.let { te ->
+ //aapsLogger.info(LTag.NSCLIENT, "Loading TherapyEvents data Start: $startId ${te.first} forID: ${te.second.id} ")
+ when {
+ // new record with existing NS id => must be coming from NS => ignore
+ te.first.id == te.second.id && te.first.interfaceIDs.nightscoutId != null ->
+ aapsLogger.info(LTag.NSCLIENT, "Ignoring TherapyEvent. Loaded from NS: ${te.second.id} ")
+ // only NsId changed, no need to upload
+ te.first.onlyNsIdAdded(te.second) ->
+ aapsLogger.info(LTag.NSCLIENT, "Ignoring TherapyEvent. Only NS id changed ID: ${te.second.id} ")
+ // without nsId = create new
+ te.first.interfaceIDs.nightscoutId == null ->
+ cont = activePlugin.activeNsClient?.nsAdd("treatments", DataSyncSelector.PairTherapyEvent(te.first, te.second.id), "$startId/$lastDbId") ?: false
+ // nsId = update
+ te.first.interfaceIDs.nightscoutId != null ->
+ cont = activePlugin.activeNsClient?.nsUpdate("treatments", DataSyncSelector.PairTherapyEvent(te.first, te.second.id), "$startId/$lastDbId") ?: false
+ }
+ confirmLastTherapyEventIdIfGreater(te.second.id)
+ } ?: run {
+ cont = false
+ }
+ }
+ }
+
+ 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)
+ }
+ }
+
+ suspend fun processChangedDeviceStatuses() {
+ if (isPaused) return
+ val lastDbId = appRepository.getLastDeviceStatusId() ?: 0L
+ var startId = sp.getLong(R.string.key_ns_device_status_last_synced_id, 0)
+ if (startId > lastDbId) {
+ aapsLogger.info(LTag.NSCLIENT, "Resetting startId: $startId lastDbId: $lastDbId")
+ sp.putLong(R.string.key_ns_device_status_last_synced_id, 0)
+ startId = 0
+ }
+ queueCounter.dssRemaining = lastDbId - startId
+ rxBus.send(EventNSClientUpdateGuiQueue())
+ appRepository.getNextSyncElementDeviceStatus(startId).blockingGet()?.let { deviceStatus ->
+ //aapsLogger.info(LTag.NSCLIENT, "Loading DeviceStatus data Start: $startId $deviceStatus")
+ // without nsId = create new
+ if (deviceStatus.interfaceIDs.nightscoutId == null) {
+ if (activePlugin.activeNsClient?.nsAdd("devicestatus", DataSyncSelector.PairDeviceStatus(deviceStatus, lastDbId), "$startId/$lastDbId") == true)
+ confirmLastDeviceStatusIdIfGreater(lastDbId)
+ }
+ // with nsId = ignore
+ }
+ queueCounter.dssRemaining = 0
+ }
+
+ 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)
+ }
+ }
+
+ suspend fun processChangedTemporaryBasals() {
+ var cont = true
+ while (cont) {
+ if (isPaused) return
+ val lastDbId = appRepository.getLastTemporaryBasalId() ?: 0L
+ var startId = sp.getLong(R.string.key_ns_temporary_basal_last_synced_id, 0)
+ if (startId > lastDbId) {
+ aapsLogger.info(LTag.NSCLIENT, "Resetting startId: $startId lastDbId: $lastDbId")
+ sp.putLong(R.string.key_ns_temporary_basal_last_synced_id, 0)
+ startId = 0
+ }
+ queueCounter.tbrsRemaining = lastDbId - startId
+ rxBus.send(EventNSClientUpdateGuiQueue())
+ appRepository.getNextSyncElementTemporaryBasal(startId).blockingGet()?.let { tb ->
+ //aapsLogger.info(LTag.NSCLIENT, "Loading TemporaryBasal data Start: $startId ${tb.first} forID: ${tb.second.id} ")
+ when {
+ // new record with existing NS id => must be coming from NS => ignore
+ tb.first.id == tb.second.id && tb.first.interfaceIDs.nightscoutId != null ->
+ aapsLogger.info(LTag.NSCLIENT, "Ignoring TemporaryBasal. Loaded from NS: ${tb.second.id} ")
+ // only NsId changed, no need to upload
+ tb.first.onlyNsIdAdded(tb.second) ->
+ aapsLogger.info(LTag.NSCLIENT, "Ignoring TemporaryBasal. Only NS id changed ID: ${tb.second.id} ")
+ // without nsId = create new
+ tb.first.interfaceIDs.nightscoutId == null ->
+ cont = activePlugin.activeNsClient?.nsAdd("treatments", DataSyncSelector.PairTemporaryBasal(tb.first, tb.second.id), "$startId/$lastDbId") ?: false
+ // with nsId = update
+ tb.first.interfaceIDs.nightscoutId != null ->
+ cont = activePlugin.activeNsClient?.nsUpdate("treatments", DataSyncSelector.PairTemporaryBasal(tb.first, tb.second.id), "$startId/$lastDbId") ?: false
+ }
+ confirmLastTemporaryBasalIdIfGreater(tb.second.id)
+ } ?: run {
+ cont = false
+ }
+ }
+ }
+
+ 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)
+ }
+ }
+
+ suspend fun processChangedExtendedBoluses() {
+ var cont = true
+ while (cont) {
+ if (isPaused) return
+ val lastDbId = appRepository.getLastExtendedBolusId() ?: 0L
+ var startId = sp.getLong(R.string.key_ns_extended_bolus_last_synced_id, 0)
+ if (startId > lastDbId) {
+ aapsLogger.info(LTag.NSCLIENT, "Resetting startId: $startId lastDbId: $lastDbId")
+ sp.putLong(R.string.key_ns_extended_bolus_last_synced_id, 0)
+ startId = 0
+ }
+ queueCounter.ebsRemaining = lastDbId - startId
+ rxBus.send(EventNSClientUpdateGuiQueue())
+ appRepository.getNextSyncElementExtendedBolus(startId).blockingGet()?.let { eb ->
+ //aapsLogger.info(LTag.NSCLIENT, "Loading ExtendedBolus data Start: $startId ${eb.first} forID: ${eb.second.id} ")
+ val profile = profileFunction.getProfile(eb.first.timestamp)
+ if (profile != null) {
+ when {
+ // new record with existing NS id => must be coming from NS => ignore
+ eb.first.id == eb.second.id && eb.first.interfaceIDs.nightscoutId != null ->
+ aapsLogger.info(LTag.NSCLIENT, "Ignoring ExtendedBolus. Loaded from NS: ${eb.second.id} ")
+ // only NsId changed, no need to upload
+ eb.first.onlyNsIdAdded(eb.second) ->
+ aapsLogger.info(LTag.NSCLIENT, "Ignoring ExtendedBolus. Only NS id changed ID: ${eb.second.id} ")
+ // without nsId = create new
+ eb.first.interfaceIDs.nightscoutId == null ->
+ cont = activePlugin.activeNsClient?.nsAdd("treatments", DataSyncSelector.PairExtendedBolus(eb.first, eb.second.id), "$startId/$lastDbId") ?: false
+ // with nsId = update
+ eb.first.interfaceIDs.nightscoutId != null ->
+ cont = activePlugin.activeNsClient?.nsUpdate("treatments", DataSyncSelector.PairExtendedBolus(eb.first, eb.second.id), "$startId/$lastDbId") ?: false
+ }
+ } else aapsLogger.info(LTag.NSCLIENT, "Ignoring ExtendedBolus. No profile: ${eb.second.id} ")
+ confirmLastExtendedBolusIdIfGreater(eb.second.id)
+ } ?: run {
+ cont = false
+ }
+ }
+ }
+
+ 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)
+ }
+ }
+
+ suspend fun processChangedProfileSwitches() {
+ var cont = true
+ while (cont) {
+ if (isPaused) return
+ val lastDbId = appRepository.getLastProfileSwitchId() ?: 0L
+ var startId = sp.getLong(R.string.key_ns_profile_switch_last_synced_id, 0)
+ if (startId > lastDbId) {
+ aapsLogger.info(LTag.NSCLIENT, "Resetting startId: $startId lastDbId: $lastDbId")
+ sp.putLong(R.string.key_ns_profile_switch_last_synced_id, 0)
+ startId = 0
+ }
+ queueCounter.pssRemaining = lastDbId - startId
+ rxBus.send(EventNSClientUpdateGuiQueue())
+ appRepository.getNextSyncElementProfileSwitch(startId).blockingGet()?.let { ps ->
+ //aapsLogger.info(LTag.NSCLIENT, "Loading ProfileSwitch data Start: $startId ${ps.first} forID: ${ps.second.id} ")
+ when {
+ // new record with existing NS id => must be coming from NS => ignore
+ ps.first.id == ps.second.id && ps.first.interfaceIDs.nightscoutId != null ->
+ aapsLogger.info(LTag.NSCLIENT, "Ignoring ProfileSwitch. Loaded from NS: ${ps.second.id} ")
+ // only NsId changed, no need to upload
+ ps.first.onlyNsIdAdded(ps.second) ->
+ aapsLogger.info(LTag.NSCLIENT, "Ignoring ProfileSwitch. Only NS id changed ID: ${ps.second.id} ")
+ // without nsId = create new
+ ps.first.interfaceIDs.nightscoutId == null ->
+ cont = activePlugin.activeNsClient?.nsAdd("treatments", DataSyncSelector.PairProfileSwitch(ps.first, ps.second.id), "$startId/$lastDbId") ?: false
+ // with nsId = update
+ ps.first.interfaceIDs.nightscoutId != null ->
+ cont = activePlugin.activeNsClient?.nsUpdate("treatments", DataSyncSelector.PairProfileSwitch(ps.first, ps.second.id), "$startId/$lastDbId") ?: false
+ }
+ confirmLastProfileSwitchIdIfGreater(ps.second.id)
+ } ?: run {
+ cont = false
+ }
+ }
+ }
+
+ fun confirmLastEffectiveProfileSwitchIdIfGreater(lastSynced: Long) {
+ if (lastSynced > sp.getLong(R.string.key_ns_effective_profile_switch_last_synced_id, 0)) {
+ //aapsLogger.debug(LTag.NSCLIENT, "Setting EffectiveProfileSwitch data sync from $lastSynced")
+ sp.putLong(R.string.key_ns_effective_profile_switch_last_synced_id, lastSynced)
+ }
+ }
+
+ suspend fun processChangedEffectiveProfileSwitches() {
+ var cont = true
+ while (cont) {
+ if (isPaused) return
+ val lastDbId = appRepository.getLastEffectiveProfileSwitchId() ?: 0L
+ var startId = sp.getLong(R.string.key_ns_effective_profile_switch_last_synced_id, 0)
+ if (startId > lastDbId) {
+ aapsLogger.info(LTag.NSCLIENT, "Resetting startId: $startId lastDbId: $lastDbId")
+ sp.putLong(R.string.key_ns_effective_profile_switch_last_synced_id, 0)
+ startId = 0
+ }
+ queueCounter.epssRemaining = lastDbId - startId
+ rxBus.send(EventNSClientUpdateGuiQueue())
+ appRepository.getNextSyncElementEffectiveProfileSwitch(startId).blockingGet()?.let { ps ->
+ //aapsLogger.info(LTag.NSCLIENT, "Loading EffectiveProfileSwitch data Start: $startId ${ps.first} forID: ${ps.second.id} ")
+ when {
+ // new record with existing NS id => must be coming from NS => ignore
+ ps.first.id == ps.second.id && ps.first.interfaceIDs.nightscoutId != null ->
+ aapsLogger.info(LTag.NSCLIENT, "Ignoring EffectiveProfileSwitch. Loaded from NS: ${ps.second.id} ")
+ // only NsId changed, no need to upload
+ ps.first.onlyNsIdAdded(ps.second) ->
+ aapsLogger.info(LTag.NSCLIENT, "Ignoring EffectiveProfileSwitch. Only NS id changed ID: ${ps.second.id} ")
+ // without nsId = create new
+ ps.first.interfaceIDs.nightscoutId == null ->
+ cont = activePlugin.activeNsClient?.nsAdd("treatments", DataSyncSelector.PairEffectiveProfileSwitch(ps.first, ps.second.id), "$startId/$lastDbId") ?: false
+ // with nsId = update
+ ps.first.interfaceIDs.nightscoutId != null ->
+ cont = activePlugin.activeNsClient?.nsUpdate("treatments", DataSyncSelector.PairEffectiveProfileSwitch(ps.first, ps.second.id), "$startId/$lastDbId") ?: false
+ }
+ confirmLastEffectiveProfileSwitchIdIfGreater(ps.second.id)
+ } ?: run {
+ cont = false
+ }
+ }
+ }
+
+ fun confirmLastOfflineEventIdIfGreater(lastSynced: Long) {
+ if (lastSynced > sp.getLong(R.string.key_ns_offline_event_last_synced_id, 0)) {
+ //aapsLogger.debug(LTag.NSCLIENT, "Setting OfflineEvent data sync from $lastSynced")
+ sp.putLong(R.string.key_ns_offline_event_last_synced_id, lastSynced)
+ }
+ }
+
+ suspend fun processChangedOfflineEvents() {
+ var cont = true
+ while (cont) {
+ if (isPaused) return
+ val lastDbId = appRepository.getLastOfflineEventId() ?: 0L
+ var startId = sp.getLong(R.string.key_ns_offline_event_last_synced_id, 0)
+ if (startId > lastDbId) {
+ aapsLogger.info(LTag.NSCLIENT, "Resetting startId: $startId lastDbId: $lastDbId")
+ sp.putLong(R.string.key_ns_offline_event_last_synced_id, 0)
+ startId = 0
+ }
+ queueCounter.oesRemaining = lastDbId - startId
+ rxBus.send(EventNSClientUpdateGuiQueue())
+ appRepository.getNextSyncElementOfflineEvent(startId).blockingGet()?.let { oe ->
+ //aapsLogger.info(LTag.NSCLIENT, "Loading OfflineEvent data Start: $startId ${oe.first} forID: ${oe.second.id} ")
+ when {
+ // new record with existing NS id => must be coming from NS => ignore
+ oe.first.id == oe.second.id && oe.first.interfaceIDs.nightscoutId != null ->
+ aapsLogger.info(LTag.NSCLIENT, "Ignoring OfflineEvent. Loaded from NS: ${oe.second.id} ")
+ // only NsId changed, no need to upload
+ oe.first.onlyNsIdAdded(oe.second) ->
+ aapsLogger.info(LTag.NSCLIENT, "Ignoring OfflineEvent. Only NS id changed ID: ${oe.second.id} ")
+ // without nsId = create new
+ oe.first.interfaceIDs.nightscoutId == null ->
+ cont = activePlugin.activeNsClient?.nsAdd("treatments", DataSyncSelector.PairOfflineEvent(oe.first, oe.second.id), "$startId/$lastDbId") ?: false
+ // existing with nsId = update
+ oe.first.interfaceIDs.nightscoutId != null ->
+ cont = activePlugin.activeNsClient?.nsUpdate("treatments", DataSyncSelector.PairOfflineEvent(oe.first, oe.second.id), "$startId/$lastDbId") ?: false
+ }
+ confirmLastOfflineEventIdIfGreater(oe.second.id)
+ } ?: run {
+ cont = false
+ }
+ }
+ }
+
+ fun confirmLastProfileStore(lastSynced: Long) {
+ sp.putLong(R.string.key_ns_profile_store_last_synced_timestamp, lastSynced)
+ }
+
+ suspend fun processChangedProfileStore() {
+ if (isPaused) return
+ val lastSync = sp.getLong(R.string.key_ns_profile_store_last_synced_timestamp, 0)
+ val lastChange = sp.getLong(info.nightscout.core.utils.R.string.key_local_profile_last_change, 0)
+ if (lastChange == 0L) return
+ if (lastChange > lastSync) {
+ if (activePlugin.activeProfileSource.profile?.allProfilesValid != true) return
+ val profileStore = activePlugin.activeProfileSource.profile
+ val profileJson = profileStore?.data ?: return
+ // add for v3
+ if (JsonHelper.safeGetLongAllowNull(profileJson, "date") == null)
+ profileJson.put("date", profileStore.getStartDate())
+ val now = dateUtil.now()
+ if (activePlugin.activeNsClient?.nsAdd("profile", DataSyncSelector.PairProfileStore(profileJson, now), "") == true)
+ confirmLastProfileStore(now)
+ }
+ }
+}
\ No newline at end of file
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt
index bd1019d213..311fa80b06 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt
@@ -3,7 +3,7 @@ package info.nightscout.plugins.sync.nsclientV3
import android.content.Context
import android.os.Handler
import android.os.HandlerThread
-import android.text.Spanned
+import android.os.SystemClock
import androidx.preference.PreferenceFragmentCompat
import androidx.preference.PreferenceScreen
import androidx.preference.SwitchPreference
@@ -21,21 +21,28 @@ import info.nightscout.database.entities.interfaces.TraceableDBEntry
import info.nightscout.database.impl.AppRepository
import info.nightscout.interfaces.Config
import info.nightscout.interfaces.Constants
+import info.nightscout.interfaces.notifications.Notification
import info.nightscout.interfaces.nsclient.NSAlarm
+import info.nightscout.interfaces.nsclient.StoreDataForDb
import info.nightscout.interfaces.plugin.PluginBase
import info.nightscout.interfaces.plugin.PluginDescription
import info.nightscout.interfaces.plugin.PluginType
import info.nightscout.interfaces.profile.ProfileFunction
+import info.nightscout.interfaces.source.NSClientSource
import info.nightscout.interfaces.sync.DataSyncSelector
+import info.nightscout.interfaces.sync.DataSyncSelectorV3
import info.nightscout.interfaces.sync.NsClient
import info.nightscout.interfaces.sync.Sync
import info.nightscout.interfaces.ui.UiInteraction
-import info.nightscout.interfaces.utils.HtmlHelper
import info.nightscout.plugins.sync.R
import info.nightscout.plugins.sync.nsShared.NSClientFragment
+import info.nightscout.plugins.sync.nsShared.NsIncomingDataProcessor
+import info.nightscout.plugins.sync.nsShared.events.EventConnectivityOptionChanged
import info.nightscout.plugins.sync.nsShared.events.EventNSClientResend
-import info.nightscout.plugins.sync.nsShared.events.EventNSClientUpdateGUI
-import info.nightscout.plugins.sync.nsclient.NsClientReceiverDelegate
+import info.nightscout.plugins.sync.nsShared.events.EventNSClientUpdateGuiData
+import info.nightscout.plugins.sync.nsShared.events.EventNSClientUpdateGuiStatus
+import info.nightscout.plugins.sync.nsclient.ReceiverDelegate
+import info.nightscout.plugins.sync.nsclient.data.NSDeviceStatusHandler
import info.nightscout.plugins.sync.nsclientV3.extensions.toNSBolus
import info.nightscout.plugins.sync.nsclientV3.extensions.toNSBolusWizard
import info.nightscout.plugins.sync.nsclientV3.extensions.toNSCarbs
@@ -49,16 +56,19 @@ import info.nightscout.plugins.sync.nsclientV3.extensions.toNSSvgV3
import info.nightscout.plugins.sync.nsclientV3.extensions.toNSTemporaryBasal
import info.nightscout.plugins.sync.nsclientV3.extensions.toNSTemporaryTarget
import info.nightscout.plugins.sync.nsclientV3.extensions.toNSTherapyEvent
+import info.nightscout.plugins.sync.nsclientV3.workers.DataSyncWorker
import info.nightscout.plugins.sync.nsclientV3.workers.LoadBgWorker
+import info.nightscout.plugins.sync.nsclientV3.workers.LoadDeviceStatusWorker
+import info.nightscout.plugins.sync.nsclientV3.workers.LoadFoodsWorker
import info.nightscout.plugins.sync.nsclientV3.workers.LoadLastModificationWorker
+import info.nightscout.plugins.sync.nsclientV3.workers.LoadProfileStoreWorker
import info.nightscout.plugins.sync.nsclientV3.workers.LoadStatusWorker
+import info.nightscout.plugins.sync.nsclientV3.workers.LoadTreatmentsWorker
import info.nightscout.rx.AapsSchedulers
import info.nightscout.rx.bus.RxBus
import info.nightscout.rx.events.EventAppExit
-import info.nightscout.rx.events.EventChargingState
+import info.nightscout.rx.events.EventDismissNotification
import info.nightscout.rx.events.EventNSClientNewLog
-import info.nightscout.rx.events.EventNetworkChange
-import info.nightscout.rx.events.EventNewBG
import info.nightscout.rx.events.EventNewHistoryData
import info.nightscout.rx.events.EventPreferenceChange
import info.nightscout.rx.events.EventSWSyncStatus
@@ -66,6 +76,10 @@ import info.nightscout.rx.logging.AAPSLogger
import info.nightscout.rx.logging.LTag
import info.nightscout.sdk.NSAndroidClientImpl
import info.nightscout.sdk.interfaces.NSAndroidClient
+import info.nightscout.sdk.mapper.toNSDeviceStatus
+import info.nightscout.sdk.mapper.toNSFood
+import info.nightscout.sdk.mapper.toNSSgvV3
+import info.nightscout.sdk.mapper.toNSTreatment
import info.nightscout.sdk.remotemodel.LastModified
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.shared.sharedPreferences.SP
@@ -73,18 +87,20 @@ import info.nightscout.shared.utils.DateUtil
import info.nightscout.shared.utils.T
import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.launch
+import io.socket.client.Ack
+import io.socket.client.IO
+import io.socket.client.Socket
+import io.socket.emitter.Emitter
import kotlinx.serialization.decodeFromString
import kotlinx.serialization.json.Json
-import java.util.concurrent.Executors
-import java.util.concurrent.ScheduledFuture
-import java.util.concurrent.TimeUnit
+import org.json.JSONArray
+import org.json.JSONObject
+import java.net.URISyntaxException
+import java.security.InvalidParameterException
import javax.inject.Inject
import javax.inject.Singleton
+@Suppress("SpellCheckingInspection")
@OpenForTesting
@Singleton
class NSClientV3Plugin @Inject constructor(
@@ -96,13 +112,17 @@ class NSClientV3Plugin @Inject constructor(
private val context: Context,
private val fabricPrivacy: FabricPrivacy,
private val sp: SP,
- private val nsClientReceiverDelegate: NsClientReceiverDelegate,
+ private val receiverDelegate: ReceiverDelegate,
private val config: Config,
private val dateUtil: DateUtil,
private val uiInteraction: UiInteraction,
- private val dataSyncSelector: DataSyncSelector,
+ private val dataSyncSelectorV3: DataSyncSelectorV3,
private val profileFunction: ProfileFunction,
- private val repository: AppRepository
+ private val repository: AppRepository,
+ private val nsDeviceStatusHandler: NSDeviceStatusHandler,
+ private val nsClientSource: NSClientSource,
+ private val nsIncomingDataProcessor: NsIncomingDataProcessor,
+ private val storeDataForDb: StoreDataForDb
) : NsClient, Sync, PluginBase(
PluginDescription()
.mainType(PluginType.SYNC)
@@ -115,36 +135,39 @@ class NSClientV3Plugin @Inject constructor(
aapsLogger, rh, injector
) {
+ @Suppress("PropertyName")
+ val JOB_NAME: String = this::class.java.simpleName
+
companion object {
- val JOB_NAME: String = this::class.java.simpleName
- val REFRESH_INTERVAL = T.secs(30).msecs()
const val RECORDS_TO_LOAD = 500
}
private val disposable = CompositeDisposable()
- var scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
private lateinit var runLoop: Runnable
private val handler = Handler(HandlerThread(this::class.simpleName + "Handler").also { it.start() }.looper)
- private val listLog: MutableList = ArrayList()
+ override val listLog: MutableList = ArrayList()
+ override val dataSyncSelector: DataSyncSelector get() = dataSyncSelectorV3
override val status
get() =
when {
- sp.getBoolean(R.string.key_ns_client_paused, false) -> rh.gs(info.nightscout.core.ui.R.string.paused)
- isAllowed.not() -> blockingReason
- lastOperationError != null -> rh.gs(info.nightscout.core.ui.R.string.error)
- nsAndroidClient?.lastStatus == null -> rh.gs(R.string.not_connected)
- workIsRunning(arrayOf(JOB_NAME)) -> rh.gs(R.string.working)
- nsAndroidClient?.lastStatus?.apiPermissions?.isFull() == true -> rh.gs(info.nightscout.shared.R.string.connected)
- nsAndroidClient?.lastStatus?.apiPermissions?.isRead() == true -> rh.gs(R.string.read_only)
- else -> rh.gs(info.nightscout.core.ui.R.string.unknown)
+ sp.getBoolean(R.string.key_ns_paused, false) -> rh.gs(info.nightscout.core.ui.R.string.paused)
+ isAllowed.not() -> blockingReason
+ sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_use_ws, true) && wsConnected -> "WS: " + rh.gs(info.nightscout.shared.R.string.connected)
+ sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_use_ws, true) && !wsConnected -> "WS: " + rh.gs(R.string.not_connected)
+ lastOperationError != null -> rh.gs(info.nightscout.core.ui.R.string.error)
+ nsAndroidClient?.lastStatus == null -> rh.gs(R.string.not_connected)
+ workIsRunning() -> rh.gs(R.string.working)
+ nsAndroidClient?.lastStatus?.apiPermissions?.isFull() == true -> rh.gs(info.nightscout.shared.R.string.connected)
+ nsAndroidClient?.lastStatus?.apiPermissions?.isRead() == true -> rh.gs(R.string.read_only)
+ else -> rh.gs(info.nightscout.core.ui.R.string.unknown)
}
var lastOperationError: String? = null
internal var nsAndroidClient: NSAndroidClient? = null
- private val isAllowed get() = nsClientReceiverDelegate.allowed
- private val blockingReason get() = nsClientReceiverDelegate.blockingReason
+ private val isAllowed get() = receiverDelegate.allowed
+ private val blockingReason get() = receiverDelegate.blockingReason
val maxAge = T.days(77).msecs()
internal var newestDataOnServer: LastModified? = null // timestamp of last modification for every collection provided by server
@@ -161,24 +184,33 @@ class NSClientV3Plugin @Inject constructor(
)
)
- setClient()
+ setClient("START")
- nsClientReceiverDelegate.grabReceiversState()
+ receiverDelegate.grabReceiversState()
disposable += rxBus
- .toObservable(EventNetworkChange::class.java)
+ .toObservable(EventConnectivityOptionChanged::class.java)
.observeOn(aapsSchedulers.io)
.subscribe({ ev ->
- nsClientReceiverDelegate.onStatusEvent(ev)
- setClient()
- rxBus.send(EventNSClientUpdateGUI())
+ rxBus.send(EventNSClientNewLog("● CONNECTIVITY", ev.blockingReason))
+ setClient("CONNECTIVITY")
+ if (isAllowed) executeLoop("CONNECTIVITY", forceNew = false)
+ rxBus.send(EventNSClientUpdateGuiStatus())
}, fabricPrivacy::logException)
disposable += rxBus
.toObservable(EventPreferenceChange::class.java)
.observeOn(aapsSchedulers.io)
.subscribe({ ev ->
- nsClientReceiverDelegate.onStatusEvent(ev)
- if (ev.isChanged(rh.gs(R.string.key_ns_client_token)) || ev.isChanged(rh.gs(info.nightscout.core.utils.R.string.key_nsclientinternal_url)))
- setClient()
+ if (ev.isChanged(rh.gs(R.string.key_ns_client_token)) ||
+ ev.isChanged(rh.gs(info.nightscout.core.utils.R.string.key_nsclientinternal_url)) ||
+ ev.isChanged(rh.gs(info.nightscout.core.utils.R.string.key_ns_use_ws)) ||
+ ev.isChanged(rh.gs(R.string.key_ns_paused)) ||
+ ev.isChanged(rh.gs(info.nightscout.core.utils.R.string.key_ns_alarms)) ||
+ ev.isChanged(rh.gs(info.nightscout.core.utils.R.string.key_ns_announcements))
+ )
+ setClient("SETTING CHANGE")
+ if (ev.isChanged(rh.gs(info.nightscout.core.utils.R.string.key_local_profile_last_change)))
+ executeUpload("PROFILE_CHANGE", forceNew = true)
+
}, fabricPrivacy::logException)
disposable += rxBus
.toObservable(EventAppExit::class.java)
@@ -191,47 +223,58 @@ class NSClientV3Plugin @Inject constructor(
addToLog(event)
aapsLogger.debug(LTag.NSCLIENT, event.action + " " + event.logText)
}, fabricPrivacy::logException)
- disposable += rxBus
- .toObservable(EventChargingState::class.java)
- .observeOn(aapsSchedulers.io)
- .subscribe({ ev ->
- nsClientReceiverDelegate.onStatusEvent(ev)
- rxBus.send(EventNSClientUpdateGUI())
- }, fabricPrivacy::logException)
disposable += rxBus
.toObservable(EventNSClientResend::class.java)
.observeOn(aapsSchedulers.io)
.subscribe({ event -> resend(event.reason) }, fabricPrivacy::logException)
- disposable += rxBus
- .toObservable(EventNewBG::class.java)
- .observeOn(aapsSchedulers.io)
- .subscribe({ delayAndScheduleExecution("NEW_BG") }, fabricPrivacy::logException)
disposable += rxBus
.toObservable(EventNewHistoryData::class.java)
.observeOn(aapsSchedulers.io)
- .subscribe({ delayAndScheduleExecution("NEW_DATA") }, fabricPrivacy::logException)
+ .subscribe({ executeUpload("NEW_DATA", forceNew = false) }, fabricPrivacy::logException)
runLoop = Runnable {
- handler.postDelayed(runLoop, REFRESH_INTERVAL)
+ var refreshInterval = T.mins(5).msecs()
repository.getLastGlucoseValueWrapped().blockingGet().let {
// if last value is older than 5 min or there is no bg
if (it is ValueWrapper.Existing) {
- if (it.value.timestamp < dateUtil.now() - T.mins(5).plus(T.secs(20)).msecs())
+ if (it.value.timestamp < dateUtil.now() - T.mins(5).plus(T.secs(20)).msecs()) {
+ refreshInterval = T.mins(1).msecs()
executeLoop("MAIN_LOOP", forceNew = false)
- else {
- if (isAllowed) rxBus.send(EventNSClientNewLog("RECENT", "No need to load"))
}
} else executeLoop("MAIN_LOOP", forceNew = false)
}
+ handler.postDelayed(runLoop, refreshInterval)
+ rxBus.send(EventNSClientNewLog("● TICK", ""))
+ }
+ handler.postDelayed(runLoop, T.mins(2).msecs())
+ }
+
+ fun scheduleIrregularExecution(refreshToken: Boolean = false) {
+ if (refreshToken) {
+ handler.post { executeLoop("REFRESH TOKEN", forceNew = true) }
+ return
+ }
+ if (config.NSCLIENT || nsClientSource.isEnabled()) {
+ var origin = "5_MIN_AFTER_BG"
+ var forceNew = true
+ var toTime = lastLoadedSrvModified.collections.entries + T.mins(5).plus(T.secs(10)).msecs()
+ if (toTime < dateUtil.now()) {
+ toTime = dateUtil.now() + T.mins(1).plus(T.secs(0)).msecs()
+ origin = "1_MIN_OLD_DATA"
+ forceNew = false
+ }
+ handler.postDelayed({ executeLoop(origin, forceNew = forceNew) }, toTime - dateUtil.now())
+ rxBus.send(EventNSClientNewLog("● NEXT", dateUtil.dateAndTimeAndSecondsString(toTime)))
}
- handler.postDelayed(runLoop, REFRESH_INTERVAL)
- executeLoop("START", forceNew = false)
}
override fun onStop() {
- // context.applicationContext.unbindService(mConnection)
handler.removeCallbacksAndMessages(null)
disposable.clear()
+ storageSocket?.disconnect()
+ alarmSocket?.disconnect()
+ storageSocket = null
+ alarmSocket = null
super.onStop()
}
@@ -248,14 +291,18 @@ class NSClientV3Plugin @Inject constructor(
override val hasWritePermission: Boolean get() = nsAndroidClient?.lastStatus?.apiPermissions?.isFull() ?: false
override val connected: Boolean get() = nsAndroidClient?.lastStatus != null
- override fun clearLog() {
- handler.post {
- synchronized(listLog) { listLog.clear() }
- rxBus.send(EventNSClientUpdateGUI())
+ private fun addToLog(ev: EventNSClientNewLog) {
+ synchronized(listLog) {
+ listLog.add(0, ev)
+ // remove the first line if log is too large
+ if (listLog.size >= Constants.MAX_LOG_LINES) {
+ listLog.removeAt(listLog.size - 1)
+ }
+ rxBus.send(EventNSClientUpdateGuiData())
}
}
- private fun setClient() {
+ private fun setClient(reason: String) {
nsAndroidClient = NSAndroidClientImpl(
baseUrl = sp.getString(info.nightscout.core.utils.R.string.key_nsclientinternal_url, "").lowercase().replace("https://", "").replace(Regex("/$"), ""),
accessToken = sp.getString(R.string.key_ns_client_token, ""),
@@ -263,45 +310,233 @@ class NSClientV3Plugin @Inject constructor(
logging = true,
logger = { msg -> aapsLogger.debug(LTag.HTTP, msg) }
)
+ if (wsConnected) {
+ storageSocket?.disconnect()
+ alarmSocket?.disconnect()
+ storageSocket = null
+ alarmSocket = null
+ }
+ SystemClock.sleep(2000)
+ initializeWebSockets(reason)
rxBus.send(EventSWSyncStatus(status))
}
- private fun addToLog(ev: EventNSClientNewLog) {
- synchronized(listLog) {
- listLog.add(ev)
- // remove the first line if log is too large
- if (listLog.size >= Constants.MAX_LOG_LINES) {
- listLog.removeAt(0)
+ /**********************
+ WS code
+ **********************/
+ private var storageSocket: Socket? = null
+ private var alarmSocket: Socket? = null
+ var wsConnected = false
+ internal var initialLoadFinished = false
+ private fun initializeWebSockets(reason: String) {
+ if (!sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_use_ws, true)) return
+ if (sp.getString(info.nightscout.core.utils.R.string.key_nsclientinternal_url, "").isEmpty()) return
+ val urlStorage = sp.getString(info.nightscout.core.utils.R.string.key_nsclientinternal_url, "").lowercase().replace(Regex("/$"), "") + "/storage"
+ val urlAlarm = sp.getString(info.nightscout.core.utils.R.string.key_nsclientinternal_url, "").lowercase().replace(Regex("/$"), "") + "/alarm"
+ if (!isAllowed) {
+ rxBus.send(EventNSClientNewLog("● WS", blockingReason))
+ } else if (sp.getBoolean(R.string.key_ns_paused, false)) {
+ rxBus.send(EventNSClientNewLog("● WS", "paused"))
+ } else {
+ try {
+ // java io.client doesn't support multiplexing. create 2 sockets
+ storageSocket = IO.socket(urlStorage).also { socket ->
+ socket.on(Socket.EVENT_CONNECT, onConnectStorage)
+ socket.on(Socket.EVENT_DISCONNECT, onDisconnectStorage)
+ rxBus.send(EventNSClientNewLog("► WS", "do connect storage $reason"))
+ socket.connect()
+ socket.on("create", onDataCreateUpdate)
+ socket.on("update", onDataCreateUpdate)
+ socket.on("delete", onDataDelete)
+ }
+ if (sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_announcements, config.NSCLIENT) ||
+ sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_alarms, config.NSCLIENT)
+ )
+ alarmSocket = IO.socket(urlAlarm).also { socket ->
+ socket.on(Socket.EVENT_CONNECT, onConnectAlarms)
+ socket.on(Socket.EVENT_DISCONNECT, onDisconnectAlarm)
+ rxBus.send(EventNSClientNewLog("► WS", "do connect alarm $reason"))
+ socket.connect()
+ socket.on("announcement", onAnnouncement)
+ socket.on("alarm", onAlarm)
+ socket.on("urgent_alarm", onUrgentAlarm)
+ socket.on("clear_alarm", onClearAlarm)
+ }
+ } catch (e: URISyntaxException) {
+ rxBus.send(EventNSClientNewLog("● WS", "Wrong URL syntax"))
+ } catch (e: RuntimeException) {
+ rxBus.send(EventNSClientNewLog("● WS", "RuntimeException"))
}
}
- rxBus.send(EventNSClientUpdateGUI())
}
- override fun textLog(): Spanned {
- try {
- val newTextLog = StringBuilder()
- synchronized(listLog) {
- for (log in listLog) newTextLog.append(log.toPreparedHtml())
+ private val onConnectStorage = Emitter.Listener {
+ val socketId = storageSocket?.id() ?: "NULL"
+ rxBus.send(EventNSClientNewLog("◄ WS", "connected storage ID: $socketId"))
+ if (storageSocket != null) {
+ val authMessage = JSONObject().also {
+ it.put("accessToken", sp.getString(R.string.key_ns_client_token, ""))
+ it.put("collections", JSONArray(arrayOf("devicestatus", "entries", "profile", "treatments", "foods", "settings")))
}
- return HtmlHelper.fromHtml(newTextLog.toString())
- } catch (e: OutOfMemoryError) {
- uiInteraction.showToastAndNotification(context, "Out of memory!\nStop using this phone !!!", info.nightscout.core.ui.R.raw.error)
+ rxBus.send(EventNSClientNewLog("► WS", "requesting auth for storage"))
+ storageSocket?.emit("subscribe", authMessage, Ack { args ->
+ val response = args[0] as JSONObject
+ wsConnected = if (response.optBoolean("success")) {
+ rxBus.send(EventNSClientNewLog("◄ WS", "Subscribed for: ${response.optString("collections")}"))
+ true
+ } else {
+ rxBus.send(EventNSClientNewLog("◄ WS", "Auth failed"))
+ false
+ }
+ })
}
- return HtmlHelper.fromHtml("")
}
- override fun resend(reason: String) {
- executeLoop("RESEND", forceNew = false)
+ private val onConnectAlarms = Emitter.Listener {
+ val socket = alarmSocket
+ val socketId = socket?.id() ?: "NULL"
+ rxBus.send(EventNSClientNewLog("◄ WS", "connected alarms ID: $socketId"))
+ if (socket != null) {
+ val authMessage = JSONObject().also {
+ it.put("accessToken", sp.getString(R.string.key_ns_client_token, ""))
+ }
+ rxBus.send(EventNSClientNewLog("► WS", "requesting auth for alarms"))
+ socket?.emit("subscribe", authMessage, Ack { args ->
+ val response = args[0] as JSONObject
+ wsConnected = if (response.optBoolean("success")) {
+ rxBus.send(EventNSClientNewLog("◄ WS", response.optString("message")))
+ true
+ } else {
+ rxBus.send(EventNSClientNewLog("◄ WS", "Auth failed"))
+ false
+ }
+ })
+ }
}
- override fun pause(newState: Boolean) {
- sp.putBoolean(R.string.key_ns_client_paused, newState)
- rxBus.send(EventPreferenceChange(rh.gs(R.string.key_ns_client_paused)))
- }
+ private val onDisconnectStorage = Emitter.Listener { args ->
+ aapsLogger.debug(LTag.NSCLIENT, "disconnect storage reason: ${args[0]}")
+ rxBus.send(EventNSClientNewLog("◄ WS", "disconnect storage event"))
+ wsConnected = false
+ initialLoadFinished = false
+ }
- override fun detectedNsVersion(): String? = nsAndroidClient?.lastStatus?.version
+ private val onDisconnectAlarm = Emitter.Listener { args ->
+ aapsLogger.debug(LTag.NSCLIENT, "disconnect alarm reason: ${args[0]}")
+ rxBus.send(EventNSClientNewLog("◄ WS", "disconnect alarm event"))
+ }
- override val address: String get() = sp.getString(info.nightscout.core.utils.R.string.key_nsclientinternal_url, "")
+ private val onDataCreateUpdate = Emitter.Listener { args ->
+ val response = args[0] as JSONObject
+ aapsLogger.debug(LTag.NSCLIENT, "onDataCreateUpdate: $response")
+ val collection = response.getString("colName")
+ val docJson = response.getJSONObject("doc")
+ val docString = response.getString("doc")
+ rxBus.send(EventNSClientNewLog("◄ WS CREATE/UPDATE", "$collection $docString"))
+ val srvModified = docJson.getLong("srvModified")
+ lastLoadedSrvModified.set(collection, srvModified)
+ storeLastLoadedSrvModified()
+ when (collection) {
+ "devicestatus" -> docString.toNSDeviceStatus().let { nsDeviceStatusHandler.handleNewData(arrayOf(it)) }
+ "entries" -> docString.toNSSgvV3()?.let {
+ nsIncomingDataProcessor.processSgvs(listOf(it))
+ storeDataForDb.storeGlucoseValuesToDb()
+ }
+
+ "profile" ->
+ nsIncomingDataProcessor.processProfile(docJson)
+
+ "treatments" -> docString.toNSTreatment()?.let {
+ nsIncomingDataProcessor.processTreatments(listOf(it))
+ storeDataForDb.storeTreatmentsToDb()
+ }
+
+ "foods" -> docString.toNSFood()?.let {
+ nsIncomingDataProcessor.processFood(listOf(it))
+ storeDataForDb.storeFoodsToDb()
+ }
+
+ "settings" -> {}
+ }
+ }
+
+ private val onDataDelete = Emitter.Listener { args ->
+ val response = args[0] as JSONObject
+ aapsLogger.debug(LTag.NSCLIENT, "onDataDelete: $response")
+ rxBus.send(EventNSClientNewLog("◄ WS DELETE", "${response.optString("collection")} ${response.optString("doc")}"))
+ }
+
+ 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 = args[0] as JSONObject
+ rxBus.send(EventNSClientNewLog("◄ ANNOUNCEMENT", data.optString("message")))
+ aapsLogger.debug(LTag.NSCLIENT, data.toString())
+ if (sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_announcements, config.NSCLIENT))
+ uiInteraction.addNotificationWithAction(injector, NSAlarm(data))
+ }
+ 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 = args[0] as JSONObject
+ rxBus.send(EventNSClientNewLog("◄ ALARM", data.optString("message")))
+ aapsLogger.debug(LTag.NSCLIENT, data.toString())
+ if (sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_alarms, config.NSCLIENT)) {
+ val snoozedTo = sp.getLong(rh.gs(info.nightscout.core.utils.R.string.key_snoozed_to) + data.optString("level"), 0L)
+ if (snoozedTo == 0L || System.currentTimeMillis() > snoozedTo)
+ uiInteraction.addNotificationWithAction(injector, NSAlarm(data))
+ }
+ }
+
+ private val onUrgentAlarm = Emitter.Listener { args: Array ->
+ val data = args[0] as JSONObject
+ rxBus.send(EventNSClientNewLog("◄ URGENT ALARM", data.optString("message")))
+ aapsLogger.debug(LTag.NSCLIENT, data.toString())
+ if (sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_alarms, config.NSCLIENT)) {
+ val snoozedTo = sp.getLong(rh.gs(info.nightscout.core.utils.R.string.key_snoozed_to) + data.optString("level"), 0L)
+ if (snoozedTo == 0L || System.currentTimeMillis() > snoozedTo)
+ uiInteraction.addNotificationWithAction(injector, NSAlarm(data))
+ }
+ }
+
+ private val onClearAlarm = Emitter.Listener { args ->
+
+ /*
+ {
+ "clear":true,
+ "title":"All Clear",
+ "message":"default - Urgent was ack'd",
+ "group":"default"
+ }
+ */
+ val data = args[0] as JSONObject
+ rxBus.send(EventNSClientNewLog("◄ CLEARALARM", data.optString("title")))
+ aapsLogger.debug(LTag.NSCLIENT, data.toString())
+ rxBus.send(EventDismissNotification(Notification.NS_ALARM))
+ rxBus.send(EventDismissNotification(Notification.NS_URGENT_ALARM))
+ }
override fun handleClearAlarm(originalAlarm: NSAlarm, silenceTimeInMilliseconds: Long) {
if (!isEnabled()) return
@@ -309,14 +544,30 @@ class NSClientV3Plugin @Inject constructor(
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
- // })
+ alarmSocket?.emit("ack", originalAlarm.level(), originalAlarm.group(), silenceTimeInMilliseconds)
+ rxBus.send(EventNSClientNewLog("► ALARMACK ", "${originalAlarm.level()} ${originalAlarm.group()} $silenceTimeInMilliseconds"))
}
+ /**********************
+ WS code end
+ **********************/
+
+ override fun resend(reason: String) {
+ if (sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_use_ws, true))
+ executeUpload("RESEND", forceNew = false)
+ else
+ executeLoop("RESEND", forceNew = false)
+ }
+
+ override fun pause(newState: Boolean) {
+ sp.putBoolean(R.string.key_ns_paused, newState)
+ rxBus.send(EventPreferenceChange(rh.gs(R.string.key_ns_paused)))
+ }
+
+ override fun detectedNsVersion(): String? = nsAndroidClient?.lastStatus?.version
+
+ override val address: String get() = sp.getString(info.nightscout.core.utils.R.string.key_nsclientinternal_url, "")
+
override fun isFirstLoad(collection: NsClient.Collection) =
when (collection) {
NsClient.Collection.ENTRIES -> lastLoadedSrvModified.collections.entries == 0L
@@ -336,191 +587,167 @@ class NSClientV3Plugin @Inject constructor(
override fun resetToFullSync() {
firstLoadContinueTimestamp = LastModified(LastModified.Collections())
lastLoadedSrvModified = LastModified(LastModified.Collections())
+ initialLoadFinished = false
storeLastLoadedSrvModified()
+ dataSyncSelectorV3.resetToNextFullSync()
}
- override fun nsAdd(collection: String, dataPair: DataSyncSelector.DataPair, progress: String) {
+ override suspend fun nsAdd(collection: String, dataPair: DataSyncSelector.DataPair, progress: String): Boolean =
dbOperation(collection, dataPair, progress, Operation.CREATE)
- }
- override fun nsUpdate(collection: String, dataPair: DataSyncSelector.DataPair, progress: String) {
+ override suspend fun nsUpdate(collection: String, dataPair: DataSyncSelector.DataPair, progress: String): Boolean =
dbOperation(collection, dataPair, progress, Operation.UPDATE)
- }
enum class Operation { CREATE, UPDATE }
private val gson: Gson = GsonBuilder().create()
- private fun dbOperationProfileStore(collection: String = "profile", dataPair: DataSyncSelector.DataPair, progress: String) {
+
+ private suspend fun slowDown() {
+ if (sp.getBoolean(R.string.key_ns_sync_slow, false)) SystemClock.sleep(250)
+ else SystemClock.sleep(10)
+ }
+
+ private suspend fun dbOperationProfileStore(collection: String = "profile", dataPair: DataSyncSelector.DataPair, progress: String): Boolean {
val data = (dataPair as DataSyncSelector.PairProfileStore).value
- scope.launch {
- try {
- rxBus.send(EventNSClientNewLog("ADD $collection", "Sent ${dataPair.javaClass.simpleName} $data $progress"))
- nsAndroidClient?.createProfileStore(data)?.let { result ->
- when (result.response) {
- 200 -> rxBus.send(EventNSClientNewLog("UPDATED", "OK ProfileStore"))
- 201 -> rxBus.send(EventNSClientNewLog("ADDED", "OK ProfileStore"))
- 404 -> rxBus.send(EventNSClientNewLog("NOT_FOUND", "${dataPair.value.javaClass.simpleName} ${result.errorResponse}"))
+ try {
+ rxBus.send(EventNSClientNewLog("► ADD $collection", "Sent ${dataPair.javaClass.simpleName} $data $progress"))
+ nsAndroidClient?.createProfileStore(data)?.let { result ->
+ when (result.response) {
+ 200 -> rxBus.send(EventNSClientNewLog("◄ UPDATED", "OK ProfileStore"))
+ 201 -> rxBus.send(EventNSClientNewLog("◄ ADDED", "OK ProfileStore"))
+ 404 -> rxBus.send(EventNSClientNewLog("◄ NOT_FOUND", "${dataPair.value.javaClass.simpleName} ${result.errorResponse}"))
- else -> {
- rxBus.send(EventNSClientNewLog("ERROR", "ProfileStore"))
- return@launch
- }
+ else -> {
+ rxBus.send(EventNSClientNewLog("◄ ERROR", "ProfileStore"))
+ return true
}
- // if (result.response == 201) { // created
- // dataPair.value.interfaceIDs.nightscoutId = result.identifier
- // storeDataForDb.nsIdDeviceStatuses.add(dataPair.value)
- // storeDataForDb.scheduleNsIdUpdate()
- // }
- dataSyncSelector.confirmLastProfileStore(dataPair.id)
- dataSyncSelector.processChangedProfileStore()
}
- } catch (e: Exception) {
- aapsLogger.error(LTag.NSCLIENT, "Upload exception", e)
+ slowDown()
}
+ } catch (e: Exception) {
+ aapsLogger.error(LTag.NSCLIENT, "Upload exception", e)
+ return false
}
+ return true
}
- private fun dbOperationDeviceStatus(collection: String = "devicestatus", dataPair: DataSyncSelector.DataPair, progress: String) {
- val data = (dataPair as DataSyncSelector.PairDeviceStatus).value.toNSDeviceStatus()
- scope.launch {
- try {
- rxBus.send(EventNSClientNewLog("ADD $collection", "Sent ${dataPair.javaClass.simpleName} ${gson.toJson(data)} $progress"))
- nsAndroidClient?.createDeviceStatus(data)?.let { result ->
- when (result.response) {
- 200 -> rxBus.send(EventNSClientNewLog("UPDATED", "OK ${dataPair.value.javaClass.simpleName}"))
- 201 -> rxBus.send(EventNSClientNewLog("ADDED", "OK ${dataPair.value.javaClass.simpleName} ${result.identifier}"))
- 404 -> rxBus.send(EventNSClientNewLog("NOT_FOUND", "${dataPair.value.javaClass.simpleName} ${result.errorResponse}"))
+ private suspend fun dbOperationDeviceStatus(collection: String = "devicestatus", dataPair: DataSyncSelector.PairDeviceStatus, progress: String): Boolean {
+ try {
+ val data = dataPair.value.toNSDeviceStatus()
+ rxBus.send(EventNSClientNewLog("► ADD $collection", "Sent ${dataPair.javaClass.simpleName} ${gson.toJson(data)} $progress"))
+ nsAndroidClient?.createDeviceStatus(data)?.let { result ->
+ when (result.response) {
+ 200 -> rxBus.send(EventNSClientNewLog("◄ UPDATED", "OK ${dataPair.value.javaClass.simpleName}"))
+ 201 -> rxBus.send(EventNSClientNewLog("◄ ADDED", "OK ${dataPair.value.javaClass.simpleName} ${result.identifier}"))
+ 404 -> rxBus.send(EventNSClientNewLog("◄ NOT_FOUND", "${dataPair.value.javaClass.simpleName} ${result.errorResponse}"))
- else -> {
- rxBus.send(EventNSClientNewLog("ERROR", "${dataPair.value.javaClass.simpleName} "))
- return@launch
- }
+ else -> {
+ rxBus.send(EventNSClientNewLog("◄ ERROR", "${dataPair.value.javaClass.simpleName} "))
+ return true
}
- // if (result.response == 201) { // created
- // dataPair.value.interfaceIDs.nightscoutId = result.identifier
- // storeDataForDb.nsIdDeviceStatuses.add(dataPair.value)
- // storeDataForDb.scheduleNsIdUpdate()
- // }
- dataSyncSelector.confirmLastDeviceStatusIdIfGreater(dataPair.id)
- dataSyncSelector.processChangedDeviceStatuses()
}
- } catch (e: Exception) {
- aapsLogger.error(LTag.NSCLIENT, "Upload exception", e)
+ result.identifier?.let {
+ dataPair.value.interfaceIDs.nightscoutId = it
+ storeDataForDb.nsIdDeviceStatuses.add(dataPair.value)
+ }
}
+ } catch (e: Exception) {
+ aapsLogger.error(LTag.NSCLIENT, "Upload exception", e)
}
+ return true
}
- private fun dbOperationEntries(collection: String = "entries", dataPair: DataSyncSelector.DataPair, progress: String, operation: Operation) {
+ private suspend fun dbOperationEntries(collection: String = "entries", dataPair: DataSyncSelector.PairGlucoseValue, progress: String, operation: Operation): Boolean {
val call = when (operation) {
- Operation.CREATE -> nsAndroidClient?.let { return@let it::createSvg }
+ Operation.CREATE -> nsAndroidClient?.let { return@let it::createSgv }
Operation.UPDATE -> nsAndroidClient?.let { return@let it::updateSvg }
}
- when (dataPair) {
- is DataSyncSelector.PairGlucoseValue -> dataPair.value.toNSSvgV3()
- else -> null
- }?.let { data ->
- scope.launch {
- try {
- val id = if (dataPair.value is TraceableDBEntry) (dataPair.value as TraceableDBEntry).interfaceIDs.nightscoutId else ""
- rxBus.send(
- EventNSClientNewLog(
- when (operation) {
- Operation.CREATE -> "ADD $collection"
- Operation.UPDATE -> "UPDATE $collection"
- },
- when (operation) {
- Operation.CREATE -> "Sent ${dataPair.javaClass.simpleName} ${gson.toJson(data)} $progress"
- Operation.UPDATE -> "Sent ${dataPair.javaClass.simpleName} $id ${gson.toJson(data)} $progress"
- }
- )
- )
- call?.let { it(data) }?.let { result ->
- when (result.response) {
- 200 -> rxBus.send(EventNSClientNewLog("UPDATED", "OK ${dataPair.value.javaClass.simpleName}"))
- 201 -> rxBus.send(EventNSClientNewLog("ADDED", "OK ${dataPair.value.javaClass.simpleName}"))
- 400 -> rxBus.send(EventNSClientNewLog("FAIL", "${dataPair.value.javaClass.simpleName} ${result.errorResponse}"))
- 404 -> rxBus.send(EventNSClientNewLog("NOT_FOUND", "${dataPair.value.javaClass.simpleName} ${result.errorResponse}"))
-
- else -> {
- rxBus.send(EventNSClientNewLog("ERROR", "${dataPair.value.javaClass.simpleName} "))
- return@launch
- }
- }
- when (dataPair) {
- is DataSyncSelector.PairGlucoseValue -> {
- // if (result.response == 201) { // created
- // dataPair.value.interfaceIDs.nightscoutId = result.identifier
- // storeDataForDb.nsIdGlucoseValues.add(dataPair.value)
- // storeDataForDb.scheduleNsIdUpdate()
- // }
- dataSyncSelector.confirmLastGlucoseValueIdIfGreater(dataPair.id)
- dataSyncSelector.processChangedGlucoseValues()
- }
- }
+ try {
+ val data = dataPair.value.toNSSvgV3()
+ val id = dataPair.value.interfaceIDs.nightscoutId
+ rxBus.send(
+ EventNSClientNewLog(
+ when (operation) {
+ Operation.CREATE -> "► ADD $collection"
+ Operation.UPDATE -> "► UPDATE $collection"
+ },
+ when (operation) {
+ Operation.CREATE -> "Sent ${dataPair.javaClass.simpleName} ${gson.toJson(data)} $progress"
+ Operation.UPDATE -> "Sent ${dataPair.javaClass.simpleName} $id ${gson.toJson(data)} $progress"
+ }
+ )
+ )
+ call?.let { it(data) }?.let { result ->
+ when (result.response) {
+ 200 -> rxBus.send(EventNSClientNewLog("◄ UPDATED", "OK ${dataPair.value.javaClass.simpleName}"))
+ 201 -> rxBus.send(EventNSClientNewLog("◄ ADDED", "OK ${dataPair.value.javaClass.simpleName}"))
+ 400 -> rxBus.send(EventNSClientNewLog("◄ FAIL", "${dataPair.value.javaClass.simpleName} ${result.errorResponse}"))
+ 404 -> rxBus.send(EventNSClientNewLog("◄ NOT_FOUND", "${dataPair.value.javaClass.simpleName} ${result.errorResponse}"))
+
+ else -> {
+ rxBus.send(EventNSClientNewLog("◄ ERROR", "${dataPair.value.javaClass.simpleName} "))
+ return true
}
- } catch (e: Exception) {
- aapsLogger.error(LTag.NSCLIENT, "Upload exception", e)
}
+ result.identifier?.let {
+ dataPair.value.interfaceIDs.nightscoutId = it
+ storeDataForDb.nsIdGlucoseValues.add(dataPair.value)
+ }
+ slowDown()
}
+ } catch (e: Exception) {
+ aapsLogger.error(LTag.NSCLIENT, "Upload exception", e)
+ return false
}
+ return true
}
- private fun dbOperationFood(collection: String = "food", dataPair: DataSyncSelector.DataPair, progress: String, operation: Operation) {
+ private suspend fun dbOperationFood(collection: String = "food", dataPair: DataSyncSelector.PairFood, progress: String, operation: Operation): Boolean {
val call = when (operation) {
Operation.CREATE -> nsAndroidClient?.let { return@let it::createFood }
Operation.UPDATE -> nsAndroidClient?.let { return@let it::updateFood }
}
- when (dataPair) {
- is DataSyncSelector.PairFood -> dataPair.value.toNSFood()
- else -> null
- }?.let { data ->
- scope.launch {
- try {
- val id = if (dataPair.value is TraceableDBEntry) (dataPair.value as TraceableDBEntry).interfaceIDs.nightscoutId else ""
- rxBus.send(
- EventNSClientNewLog(
- when (operation) {
- Operation.CREATE -> "ADD $collection"
- Operation.UPDATE -> "UPDATE $collection"
- },
- when (operation) {
- Operation.CREATE -> "Sent ${dataPair.javaClass.simpleName} ${gson.toJson(data)} $progress"
- Operation.UPDATE -> "Sent ${dataPair.javaClass.simpleName} $id ${gson.toJson(data)} $progress"
- }
- )
- )
- call?.let { it(data) }?.let { result ->
- when (result.response) {
- 200 -> rxBus.send(EventNSClientNewLog("UPDATED", "OK ${dataPair.value.javaClass.simpleName}"))
- 201 -> rxBus.send(EventNSClientNewLog("ADDED", "OK ${dataPair.value.javaClass.simpleName}"))
- 400 -> rxBus.send(EventNSClientNewLog("FAIL", "${dataPair.value.javaClass.simpleName} ${result.errorResponse}"))
- 404 -> rxBus.send(EventNSClientNewLog("NOT_FOUND", "${dataPair.value.javaClass.simpleName} ${result.errorResponse}"))
-
- else -> {
- rxBus.send(EventNSClientNewLog("ERROR", "${dataPair.value.javaClass.simpleName} "))
- return@launch
- }
- }
- when (dataPair) {
- is DataSyncSelector.PairFood -> {
- // if (result.response == 201) { // created
- // dataPair.value.interfaceIDs.nightscoutId = result.identifier
- // storeDataForDb.nsIdFoods.add(dataPair.value)
- // storeDataForDb.scheduleNsIdUpdate()
- // }
- dataSyncSelector.confirmLastFoodIdIfGreater(dataPair.id)
- dataSyncSelector.processChangedFoods()
- }
- }
+ try {
+ val data = dataPair.value.toNSFood()
+ val id = dataPair.value.interfaceIDs.nightscoutId
+ rxBus.send(
+ EventNSClientNewLog(
+ when (operation) {
+ Operation.CREATE -> "► ADD $collection"
+ Operation.UPDATE -> "► UPDATE $collection"
+ },
+ when (operation) {
+ Operation.CREATE -> "Sent ${dataPair.javaClass.simpleName} ${gson.toJson(data)} $progress"
+ Operation.UPDATE -> "Sent ${dataPair.javaClass.simpleName} $id ${gson.toJson(data)} $progress"
+ }
+ )
+ )
+ call?.let { it(data) }?.let { result ->
+ when (result.response) {
+ 200 -> rxBus.send(EventNSClientNewLog("◄ UPDATED", "OK ${dataPair.value.javaClass.simpleName}"))
+ 201 -> rxBus.send(EventNSClientNewLog("◄ ADDED", "OK ${dataPair.value.javaClass.simpleName}"))
+ 400 -> rxBus.send(EventNSClientNewLog("◄ FAIL", "${dataPair.value.javaClass.simpleName} ${result.errorResponse}"))
+ 404 -> rxBus.send(EventNSClientNewLog("◄ NOT_FOUND", "${dataPair.value.javaClass.simpleName} ${result.errorResponse}"))
+
+ else -> {
+ rxBus.send(EventNSClientNewLog("◄ ERROR", "${dataPair.value.javaClass.simpleName} "))
+ return true
}
- } catch (e: Exception) {
- aapsLogger.error(LTag.NSCLIENT, "Upload exception", e)
}
+ result.identifier?.let {
+ dataPair.value.interfaceIDs.nightscoutId = it
+ storeDataForDb.nsIdFoods.add(dataPair.value)
+ }
+ slowDown()
}
+ } catch (e: Exception) {
+ aapsLogger.error(LTag.NSCLIENT, "Upload exception", e)
+ return false
}
+ return true
}
- private fun dbOperationTreatments(collection: String = "treatments", dataPair: DataSyncSelector.DataPair, progress: String, operation: Operation) {
+ private suspend fun dbOperationTreatments(collection: String = "treatments", dataPair: DataSyncSelector.DataPair, progress: String, operation: Operation): Boolean {
val call = when (operation) {
Operation.CREATE -> nsAndroidClient?.let { return@let it::createTreatment }
Operation.UPDATE -> nsAndroidClient?.let { return@let it::updateTreatment }
@@ -533,22 +760,12 @@ class NSClientV3Plugin @Inject constructor(
is DataSyncSelector.PairTherapyEvent -> dataPair.value.toNSTherapyEvent()
is DataSyncSelector.PairTemporaryBasal -> {
- val profile = profileFunction.getProfile(dataPair.value.timestamp)
- if (profile == null) {
- dataSyncSelector.confirmLastTemporaryBasalIdIfGreater(dataPair.id)
- dataSyncSelector.processChangedTemporaryBasals()
- return
- }
+ val profile = profileFunction.getProfile(dataPair.value.timestamp) ?: return true
dataPair.value.toNSTemporaryBasal(profile)
}
is DataSyncSelector.PairExtendedBolus -> {
- val profile = profileFunction.getProfile(dataPair.value.timestamp)
- if (profile == null) {
- dataSyncSelector.confirmLastExtendedBolusIdIfGreater(dataPair.id)
- dataSyncSelector.processChangedExtendedBoluses()
- return
- }
+ val profile = profileFunction.getProfile(dataPair.value.timestamp) ?: return true
dataPair.value.toNSExtendedBolus(profile)
}
@@ -557,185 +774,132 @@ class NSClientV3Plugin @Inject constructor(
is DataSyncSelector.PairOfflineEvent -> dataPair.value.toNSOfflineEvent()
else -> null
}?.let { data ->
- scope.launch {
- try {
- val id = if (dataPair.value is TraceableDBEntry) (dataPair.value as TraceableDBEntry).interfaceIDs.nightscoutId else ""
- rxBus.send(
- EventNSClientNewLog(
- when (operation) {
- Operation.CREATE -> "ADD $collection"
- Operation.UPDATE -> "UPDATE $collection"
- },
- when (operation) {
- Operation.CREATE -> "Sent ${dataPair.javaClass.simpleName} ${gson.toJson(data)} $progress"
- Operation.UPDATE -> "Sent ${dataPair.javaClass.simpleName} $id ${gson.toJson(data)} $progress"
- }
- )
- )
- call?.let { it(data) }?.let { result ->
- when (result.response) {
- 200 -> rxBus.send(EventNSClientNewLog("UPDATED", "OK ${dataPair.value.javaClass.simpleName}"))
- 201 -> rxBus.send(EventNSClientNewLog("ADDED", "OK ${dataPair.value.javaClass.simpleName}"))
- 400 -> rxBus.send(EventNSClientNewLog("FAIL", "${dataPair.value.javaClass.simpleName} ${result.errorResponse}"))
- 404 -> rxBus.send(EventNSClientNewLog("NOT_FOUND", "${dataPair.value.javaClass.simpleName} ${result.errorResponse}"))
-
- else -> {
- rxBus.send(EventNSClientNewLog("ERROR", "${dataPair.value.javaClass.simpleName} "))
- return@launch
- }
+ try {
+ val id = if (dataPair.value is TraceableDBEntry) (dataPair.value as TraceableDBEntry).interfaceIDs.nightscoutId else ""
+ rxBus.send(
+ EventNSClientNewLog(
+ when (operation) {
+ Operation.CREATE -> "► ADD $collection"
+ Operation.UPDATE -> "► UPDATE $collection"
+ },
+ when (operation) {
+ Operation.CREATE -> "Sent ${dataPair.javaClass.simpleName} ${gson.toJson(data)} $progress"
+ Operation.UPDATE -> "Sent ${dataPair.javaClass.simpleName} $id ${gson.toJson(data)} $progress"
}
+ )
+ )
+ call?.let { it(data) }?.let { result ->
+ when (result.response) {
+ 200 -> rxBus.send(EventNSClientNewLog("◄ UPDATED", "OK ${dataPair.value.javaClass.simpleName}"))
+ 201 -> rxBus.send(EventNSClientNewLog("◄ ADDED", "OK ${dataPair.value.javaClass.simpleName}"))
+ 400 -> rxBus.send(EventNSClientNewLog("◄ FAIL", "${dataPair.value.javaClass.simpleName} ${result.errorResponse}"))
+ 404 -> rxBus.send(EventNSClientNewLog("◄ NOT_FOUND", "${dataPair.value.javaClass.simpleName} ${result.errorResponse}"))
+
+ else -> {
+ rxBus.send(EventNSClientNewLog("◄ ERROR", "${dataPair.value.javaClass.simpleName} "))
+ return true
+ }
+ }
+ result.identifier?.let {
when (dataPair) {
is DataSyncSelector.PairBolus -> {
- // if (result.response == 201) { // created
- // dataPair.value.interfaceIDs.nightscoutId = result.identifier
- // storeDataForDb.nsIdBoluses.add(dataPair.value)
- // storeDataForDb.scheduleNsIdUpdate()
- // }
- dataSyncSelector.confirmLastBolusIdIfGreater(dataPair.id)
- dataSyncSelector.processChangedBoluses()
+ dataPair.value.interfaceIDs.nightscoutId = it
+ storeDataForDb.nsIdBoluses.add(dataPair.value)
}
is DataSyncSelector.PairCarbs -> {
- // if (result.response == 201) { // created
- // dataPair.value.interfaceIDs.nightscoutId = result.identifier
- // storeDataForDb.nsIdCarbs.add(dataPair.value)
- // storeDataForDb.scheduleNsIdUpdate()
- // }
- dataSyncSelector.confirmLastCarbsIdIfGreater(dataPair.id)
- dataSyncSelector.processChangedCarbs()
+ dataPair.value.interfaceIDs.nightscoutId = it
+ storeDataForDb.nsIdCarbs.add(dataPair.value)
}
is DataSyncSelector.PairBolusCalculatorResult -> {
- // if (result.response == 201) { // created
- // dataPair.value.interfaceIDs.nightscoutId = result.identifier
- // storeDataForDb.nsIdBolusCalculatorResults.add(dataPair.value)
- // storeDataForDb.scheduleNsIdUpdate()
- // }
- dataSyncSelector.confirmLastBolusCalculatorResultsIdIfGreater(dataPair.id)
- dataSyncSelector.processChangedBolusCalculatorResults()
+ dataPair.value.interfaceIDs.nightscoutId = it
+ storeDataForDb.nsIdBolusCalculatorResults.add(dataPair.value)
}
is DataSyncSelector.PairTemporaryTarget -> {
- // if (result.response == 201) { // created
- // dataPair.value.interfaceIDs.nightscoutId = result.identifier
- // storeDataForDb.nsIdTemporaryTargets.add(dataPair.value)
- // storeDataForDb.scheduleNsIdUpdate()
- // }
- dataSyncSelector.confirmLastTempTargetsIdIfGreater(dataPair.id)
- dataSyncSelector.processChangedTempTargets()
+ dataPair.value.interfaceIDs.nightscoutId = it
+ storeDataForDb.nsIdTemporaryTargets.add(dataPair.value)
}
is DataSyncSelector.PairTherapyEvent -> {
- // if (result.response == 201) { // created
- // dataPair.value.interfaceIDs.nightscoutId = result.identifier
- // storeDataForDb.nsIdTherapyEvents.add(dataPair.value)
- // storeDataForDb.scheduleNsIdUpdate()
- // }
- dataSyncSelector.confirmLastTherapyEventIdIfGreater(dataPair.id)
- dataSyncSelector.processChangedTherapyEvents()
+ dataPair.value.interfaceIDs.nightscoutId = it
+ storeDataForDb.nsIdTherapyEvents.add(dataPair.value)
}
is DataSyncSelector.PairTemporaryBasal -> {
- // if (result.response == 201) { // created
- // dataPair.value.interfaceIDs.nightscoutId = result.identifier
- // storeDataForDb.nsIdTemporaryBasals.add(dataPair.value)
- // storeDataForDb.scheduleNsIdUpdate()
- // }
- dataSyncSelector.confirmLastTemporaryBasalIdIfGreater(dataPair.id)
- dataSyncSelector.processChangedTemporaryBasals()
+ dataPair.value.interfaceIDs.nightscoutId = it
+ storeDataForDb.nsIdTemporaryBasals.add(dataPair.value)
}
is DataSyncSelector.PairExtendedBolus -> {
- // if (result.response == 201) { // created
- // dataPair.value.interfaceIDs.nightscoutId = result.identifier
- // storeDataForDb.nsIdExtendedBoluses.add(dataPair.value)
- // storeDataForDb.scheduleNsIdUpdate()
- // }
- dataSyncSelector.confirmLastExtendedBolusIdIfGreater(dataPair.id)
- dataSyncSelector.processChangedExtendedBoluses()
+ dataPair.value.interfaceIDs.nightscoutId = it
+ storeDataForDb.nsIdExtendedBoluses.add(dataPair.value)
}
is DataSyncSelector.PairProfileSwitch -> {
- // if (result.response == 201) { // created
- // dataPair.value.interfaceIDs.nightscoutId = result.identifier
- // storeDataForDb.nsIdProfileSwitches.add(dataPair.value)
- // storeDataForDb.scheduleNsIdUpdate()
- // }
- dataSyncSelector.confirmLastProfileSwitchIdIfGreater(dataPair.id)
- dataSyncSelector.processChangedProfileSwitches()
+ dataPair.value.interfaceIDs.nightscoutId = it
+ storeDataForDb.nsIdProfileSwitches.add(dataPair.value)
}
is DataSyncSelector.PairEffectiveProfileSwitch -> {
- // if (result.response == 201) { // created
- // dataPair.value.interfaceIDs.nightscoutId = result.identifier
- // storeDataForDb.nsIdEffectiveProfileSwitches.add(dataPair.value)
- // storeDataForDb.scheduleNsIdUpdate()
- // }
- dataSyncSelector.confirmLastEffectiveProfileSwitchIdIfGreater(dataPair.id)
- dataSyncSelector.processChangedEffectiveProfileSwitches()
+ dataPair.value.interfaceIDs.nightscoutId = it
+ storeDataForDb.nsIdEffectiveProfileSwitches.add(dataPair.value)
}
is DataSyncSelector.PairOfflineEvent -> {
- // if (result.response == 201) { // created
- // dataPair.value.interfaceIDs.nightscoutId = result.identifier
- // storeDataForDb.nsIdOfflineEvents.add(dataPair.value)
- // storeDataForDb.scheduleNsIdUpdate()
- // }
- dataSyncSelector.confirmLastOfflineEventIdIfGreater(dataPair.id)
- dataSyncSelector.processChangedOfflineEvents()
+ dataPair.value.interfaceIDs.nightscoutId = it
+ storeDataForDb.nsIdOfflineEvents.add(dataPair.value)
+ }
+
+ else -> {
+ throw InvalidParameterException()
}
}
}
- } catch (e: Exception) {
- aapsLogger.error(LTag.NSCLIENT, "Upload exception", e)
+ slowDown()
}
+ } catch (e: Exception) {
+ aapsLogger.error(LTag.NSCLIENT, "Upload exception", e)
+ return false
}
}
+ return true
}
- private fun dbOperation(collection: String, dataPair: DataSyncSelector.DataPair, progress: String, operation: Operation) {
+ private suspend fun dbOperation(collection: String, dataPair: DataSyncSelector.DataPair, progress: String, operation: Operation): Boolean =
when (collection) {
"profile" -> dbOperationProfileStore(dataPair = dataPair, progress = progress)
- "devicestatus" -> dbOperationDeviceStatus(dataPair = dataPair, progress = progress)
- "entries" -> dbOperationEntries(dataPair = dataPair, progress = progress, operation = operation)
- "food" -> dbOperationFood(dataPair = dataPair, progress = progress, operation = operation)
+ "devicestatus" -> dbOperationDeviceStatus(dataPair = dataPair as DataSyncSelector.PairDeviceStatus, progress = progress)
+ "entries" -> dbOperationEntries(dataPair = dataPair as DataSyncSelector.PairGlucoseValue, progress = progress, operation = operation)
+ "food" -> dbOperationFood(dataPair = dataPair as DataSyncSelector.PairFood, progress = progress, operation = operation)
"treatments" -> dbOperationTreatments(dataPair = dataPair, progress = progress, operation = operation)
+
+ else -> false
}
- }
fun storeLastLoadedSrvModified() {
sp.putString(R.string.key_ns_client_v3_last_modified, Json.encodeToString(LastModified.serializer(), lastLoadedSrvModified))
}
- fun scheduleIrregularExecution() {
- var origin = "5_MIN_AFTER_BG"
- var forceNew = true
- var toTime = lastLoadedSrvModified.collections.entries + T.mins(5).plus(T.secs(10)).msecs()
- if (toTime < dateUtil.now()) {
- toTime = dateUtil.now() + T.mins(1).plus(T.secs(0)).msecs()
- origin = "1_MIN_OLD_DATA"
- forceNew = false
- }
- handler.postDelayed({ executeLoop(origin, forceNew = forceNew) }, toTime - dateUtil.now())
- rxBus.send(EventNSClientNewLog("NEXT", dateUtil.dateAndTimeAndSecondsString(toTime)))
- }
-
private fun executeLoop(origin: String, forceNew: Boolean) {
- if (sp.getBoolean(R.string.key_ns_client_paused, false)) {
- rxBus.send(EventNSClientNewLog("RUN", "paused"))
+ if (sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_use_ws, true) && initialLoadFinished) return
+ if (sp.getBoolean(R.string.key_ns_paused, false)) {
+ rxBus.send(EventNSClientNewLog("● RUN", "paused $origin"))
return
}
if (!isAllowed) {
- rxBus.send(EventNSClientNewLog("RUN", blockingReason))
+ rxBus.send(EventNSClientNewLog("● RUN", "$blockingReason $origin"))
return
}
- if (workIsRunning(arrayOf(JOB_NAME))) {
- rxBus.send(EventNSClientNewLog("RUN", "Already running $origin"))
+ if (workIsRunning()) {
+ rxBus.send(EventNSClientNewLog("● RUN", "Already running $origin"))
if (!forceNew) return
// Wait for end and start new cycle
- while (workIsRunning(arrayOf(JOB_NAME))) Thread.sleep(5000)
+ while (workIsRunning()) Thread.sleep(5000)
}
- rxBus.send(EventNSClientNewLog("RUN", "Starting next round $origin"))
+ rxBus.send(EventNSClientNewLog("● RUN", "Starting next round $origin"))
+ rxBus.send(EventNSClientUpdateGuiStatus())
WorkManager.getInstance(context)
.beginUniqueWork(
JOB_NAME,
@@ -744,36 +908,42 @@ class NSClientV3Plugin @Inject constructor(
)
.then(OneTimeWorkRequest.Builder(LoadLastModificationWorker::class.java).build())
.then(OneTimeWorkRequest.Builder(LoadBgWorker::class.java).build())
- // Other Workers are enqueued after BG finish
- // LoadTreatmentsWorker
- // LoadFoodsWorker
- // LoadProfileStoreWorker
- // LoadDeviceStatusWorker
- // DataSyncWorker
+ .then(OneTimeWorkRequest.Builder(LoadTreatmentsWorker::class.java).build())
+ .then(OneTimeWorkRequest.Builder(LoadFoodsWorker::class.java).build())
+ .then(OneTimeWorkRequest.Builder(LoadProfileStoreWorker::class.java).build())
+ .then(OneTimeWorkRequest.Builder(LoadDeviceStatusWorker::class.java).build())
+ .then(OneTimeWorkRequest.Builder(DataSyncWorker::class.java).build())
.enqueue()
}
- private fun workIsRunning(workNames: Array): Boolean {
- for (workName in workNames)
- for (workInfo in WorkManager.getInstance(context).getWorkInfosForUniqueWork(workName).get())
- if (workInfo.state == WorkInfo.State.BLOCKED || workInfo.state == WorkInfo.State.ENQUEUED || workInfo.state == WorkInfo.State.RUNNING)
- return true
+ private fun executeUpload(origin: String, forceNew: Boolean) {
+ if (sp.getBoolean(R.string.key_ns_paused, false)) {
+ rxBus.send(EventNSClientNewLog("● RUN", "paused"))
+ return
+ }
+ if (!isAllowed) {
+ rxBus.send(EventNSClientNewLog("● RUN", blockingReason))
+ return
+ }
+ if (workIsRunning()) {
+ rxBus.send(EventNSClientNewLog("● RUN", "Already running $origin"))
+ if (!forceNew) return
+ // Wait for end and start new cycle
+ while (workIsRunning()) Thread.sleep(5000)
+ }
+ rxBus.send(EventNSClientNewLog("● RUN", "Starting upload $origin"))
+ WorkManager.getInstance(context)
+ .enqueueUniqueWork(
+ JOB_NAME,
+ ExistingWorkPolicy.REPLACE,
+ OneTimeWorkRequest.Builder(DataSyncWorker::class.java).build()
+ )
+ }
+
+ private fun workIsRunning(workName: String = JOB_NAME): Boolean {
+ for (workInfo in WorkManager.getInstance(context).getWorkInfosForUniqueWork(workName).get())
+ if (workInfo.state == WorkInfo.State.BLOCKED || workInfo.state == WorkInfo.State.ENQUEUED || workInfo.state == WorkInfo.State.RUNNING)
+ return true
return false
}
-
- private val eventWorker = Executors.newSingleThreadScheduledExecutor()
- private var scheduledEventPost: ScheduledFuture<*>? = null
- private fun delayAndScheduleExecution(origin: String) {
- class PostRunnable : Runnable {
-
- override fun run() {
- scheduledEventPost = null
- executeLoop(origin, forceNew = true)
- }
- }
- // cancel waiting task to prevent sending multiple posts
- scheduledEventPost?.cancel(false)
- val task: Runnable = PostRunnable()
- scheduledEventPost = eventWorker.schedule(task, 10, TimeUnit.SECONDS)
- }
}
\ No newline at end of file
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/GlucoseValueExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/GlucoseValueExtension.kt
index e1585bce92..70db058412 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/GlucoseValueExtension.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/GlucoseValueExtension.kt
@@ -8,7 +8,6 @@ import info.nightscout.sdk.localmodel.entry.NsUnits
import info.nightscout.shared.utils.T
import java.security.InvalidParameterException
-// copy of NSClientSourcePlugin for testing
fun NSSgvV3.toTransactionGlucoseValue(): TransactionGlucoseValue {
return TransactionGlucoseValue(
timestamp = date ?: throw InvalidParameterException(),
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/DataSyncWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/DataSyncWorker.kt
index 0c446063b6..c9c35d47cd 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/DataSyncWorker.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/DataSyncWorker.kt
@@ -5,8 +5,8 @@ import androidx.work.WorkerParameters
import info.nightscout.androidaps.annotations.OpenForTesting
import info.nightscout.core.utils.worker.LoggingWorker
import info.nightscout.interfaces.plugin.ActivePlugin
-import info.nightscout.interfaces.sync.DataSyncSelector
-import info.nightscout.plugins.sync.nsShared.events.EventNSClientUpdateGUI
+import info.nightscout.interfaces.sync.DataSyncSelectorV3
+import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin
import info.nightscout.rx.bus.RxBus
import info.nightscout.rx.events.EventNSClientNewLog
import kotlinx.coroutines.Dispatchers
@@ -17,17 +17,21 @@ class DataSyncWorker(
context: Context, params: WorkerParameters
) : LoggingWorker(context, params, Dispatchers.IO) {
- @Inject lateinit var dataSyncSelector: DataSyncSelector
+ @Inject lateinit var dataSyncSelectorV3: DataSyncSelectorV3
@Inject lateinit var activePlugin: ActivePlugin
@Inject lateinit var rxBus: RxBus
+ @Inject lateinit var nsClientV3Plugin: NSClientV3Plugin
override suspend fun doWorkAndLog(): Result {
- if (activePlugin.activeNsClient?.hasWritePermission == true) {
- rxBus.send(EventNSClientNewLog("UPL", "Start"))
- dataSyncSelector.doUpload()
- rxBus.send(EventNSClientNewLog("UPL", "End"))
+ if (activePlugin.activeNsClient?.hasWritePermission == true || nsClientV3Plugin.wsConnected) {
+ rxBus.send(EventNSClientNewLog("► UPL", "Start"))
+ dataSyncSelectorV3.doUpload()
+ rxBus.send(EventNSClientNewLog("► UPL", "End"))
+ } else {
+ rxBus.send(EventNSClientNewLog("► ERROR", "Not connected or write permission"))
+ // refresh token
+ nsClientV3Plugin.scheduleIrregularExecution(refreshToken = true)
}
- rxBus.send(EventNSClientUpdateGUI())
return Result.success()
}
}
\ No newline at end of file
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorker.kt
index bf5d253bc2..e9106f9fd2 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorker.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorker.kt
@@ -1,18 +1,13 @@
package info.nightscout.plugins.sync.nsclientV3.workers
import android.content.Context
-import androidx.work.ExistingWorkPolicy
-import androidx.work.OneTimeWorkRequest
-import androidx.work.WorkManager
import androidx.work.WorkerParameters
import androidx.work.workDataOf
-import info.nightscout.core.utils.receivers.DataWorkerStorage
import info.nightscout.core.utils.worker.LoggingWorker
-import info.nightscout.core.utils.worker.then
+import info.nightscout.interfaces.nsclient.StoreDataForDb
import info.nightscout.interfaces.source.NSClientSource
import info.nightscout.interfaces.sync.NsClient
-import info.nightscout.interfaces.workflow.WorkerClasses
-import info.nightscout.plugins.sync.nsShared.StoreDataForDbImpl
+import info.nightscout.plugins.sync.nsShared.NsIncomingDataProcessor
import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin
import info.nightscout.rx.bus.RxBus
import info.nightscout.rx.events.EventNSClientNewLog
@@ -29,98 +24,72 @@ class LoadBgWorker(
context: Context, params: WorkerParameters
) : LoggingWorker(context, params, Dispatchers.IO) {
- @Inject lateinit var dataWorkerStorage: DataWorkerStorage
@Inject lateinit var rxBus: RxBus
@Inject lateinit var sp: SP
@Inject lateinit var context: Context
@Inject lateinit var dateUtil: DateUtil
@Inject lateinit var nsClientV3Plugin: NSClientV3Plugin
@Inject lateinit var nsClientSource: NSClientSource
- @Inject lateinit var workerClasses: WorkerClasses
- @Inject lateinit var workManager: WorkManager
+ @Inject lateinit var nsIncomingDataProcessor: NsIncomingDataProcessor
+ @Inject lateinit var storeDataForDb: StoreDataForDb
override suspend fun doWorkAndLog(): Result {
- if (!nsClientSource.isEnabled() && !sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_receive_cgm, false)) {
- workManager
- .enqueueUniqueWork(
- NSClientV3Plugin.JOB_NAME,
- ExistingWorkPolicy.APPEND_OR_REPLACE,
- OneTimeWorkRequest.Builder(LoadTreatmentsWorker::class.java).build()
- )
+ if (!nsClientSource.isEnabled() && !sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_receive_cgm, false))
return Result.success(workDataOf("Result" to "Load not enabled"))
- }
+ val nsAndroidClient = nsClientV3Plugin.nsAndroidClient ?: return Result.failure(workDataOf("Error" to "AndroidClient is null"))
+ var continueLoading = true
try {
- val nsAndroidClient = nsClientV3Plugin.nsAndroidClient ?: return Result.failure(workDataOf("Error" to "AndroidClient is null"))
- val isFirstLoad = nsClientV3Plugin.isFirstLoad(NsClient.Collection.ENTRIES)
- val lastLoaded =
- if (isFirstLoad) max(nsClientV3Plugin.firstLoadContinueTimestamp.collections.entries, dateUtil.now() - nsClientV3Plugin.maxAge)
- else max(nsClientV3Plugin.lastLoadedSrvModified.collections.entries, dateUtil.now() - nsClientV3Plugin.maxAge)
- if ((nsClientV3Plugin.newestDataOnServer?.collections?.entries ?: Long.MAX_VALUE) > lastLoaded) {
- val sgvs: List
- val response: NSAndroidClient.ReadResponse>?
- if (isFirstLoad) response = nsAndroidClient.getSgvsNewerThan(lastLoaded, NSClientV3Plugin.RECORDS_TO_LOAD)
- else {
- response = nsAndroidClient.getSgvsModifiedSince(lastLoaded, NSClientV3Plugin.RECORDS_TO_LOAD)
- aapsLogger.debug(LTag.NSCLIENT, "lastLoadedSrvModified: ${response.lastServerModified}")
- response.lastServerModified?.let { nsClientV3Plugin.lastLoadedSrvModified.collections.entries = it }
- nsClientV3Plugin.storeLastLoadedSrvModified()
- nsClientV3Plugin.scheduleIrregularExecution() // Idea is to run after 5 min after last BG
- }
- sgvs = response.values
- aapsLogger.debug(LTag.NSCLIENT, "SGVS: $sgvs")
- if (sgvs.isNotEmpty()) {
- val action = if (isFirstLoad) "RCV-FIRST" else "RCV"
- rxBus.send(EventNSClientNewLog(action, "${sgvs.size} SVGs from ${dateUtil.dateAndTimeAndSecondsString(lastLoaded)}"))
- // Objective0
- sp.putBoolean(info.nightscout.core.utils.R.string.key_objectives_bg_is_available_in_ns, true)
- // Schedule processing of fetched data and continue of loading
- val stopLoading = sgvs.size != NSClientV3Plugin.RECORDS_TO_LOAD || response.code == 304
- workManager
- .beginUniqueWork(
- NSClientV3Plugin.JOB_NAME,
- ExistingWorkPolicy.APPEND_OR_REPLACE,
- OneTimeWorkRequest.Builder(workerClasses.nsClientSourceWorker).setInputData(dataWorkerStorage.storeInputData(sgvs)).build()
- )
- // response 304 == Not modified (happens when date > srvModified => bad time on phone or server during upload
- .then(!stopLoading, OneTimeWorkRequest.Builder(LoadBgWorker::class.java).build())
- .then(stopLoading, OneTimeWorkRequest.Builder(LoadTreatmentsWorker::class.java).build())
- .enqueue()
+ while (continueLoading) {
+ val isFirstLoad = nsClientV3Plugin.isFirstLoad(NsClient.Collection.ENTRIES)
+ val lastLoaded =
+ if (isFirstLoad) max(nsClientV3Plugin.firstLoadContinueTimestamp.collections.entries, dateUtil.now() - nsClientV3Plugin.maxAge)
+ else max(nsClientV3Plugin.lastLoadedSrvModified.collections.entries, dateUtil.now() - nsClientV3Plugin.maxAge)
+ if ((nsClientV3Plugin.newestDataOnServer?.collections?.entries ?: Long.MAX_VALUE) > lastLoaded) {
+ val sgvs: List
+ val response: NSAndroidClient.ReadResponse>?
+ if (isFirstLoad) response = nsAndroidClient.getSgvsNewerThan(lastLoaded, NSClientV3Plugin.RECORDS_TO_LOAD)
+ else {
+ response = nsAndroidClient.getSgvsModifiedSince(lastLoaded, NSClientV3Plugin.RECORDS_TO_LOAD)
+ aapsLogger.debug(LTag.NSCLIENT, "lastLoadedSrvModified: ${response.lastServerModified}")
+ response.lastServerModified?.let { nsClientV3Plugin.lastLoadedSrvModified.collections.entries = it }
+ nsClientV3Plugin.storeLastLoadedSrvModified()
+ nsClientV3Plugin.scheduleIrregularExecution() // Idea is to run after 5 min after last BG
+ }
+ sgvs = response.values
+ aapsLogger.debug(LTag.NSCLIENT, "SGVS: $sgvs")
+ if (sgvs.isNotEmpty()) {
+ val action = if (isFirstLoad) "RCV-F" else "RCV"
+ rxBus.send(EventNSClientNewLog("◄ $action", "${sgvs.size} SVGs from ${dateUtil.dateAndTimeAndSecondsString(lastLoaded)}"))
+ // Objective0
+ sp.putBoolean(info.nightscout.core.utils.R.string.key_objectives_bg_is_available_in_ns, true)
+ // Schedule processing of fetched data and continue of loading
+ continueLoading = !(sgvs.size != NSClientV3Plugin.RECORDS_TO_LOAD || response.code == 304)
+ nsIncomingDataProcessor.processSgvs(sgvs)
+ } else {
+ // End first load
+ if (isFirstLoad) {
+ nsClientV3Plugin.lastLoadedSrvModified.collections.entries = lastLoaded
+ nsClientV3Plugin.storeLastLoadedSrvModified()
+ }
+ rxBus.send(EventNSClientNewLog("◄ RCV BG END", "No data from ${dateUtil.dateAndTimeAndSecondsString(lastLoaded)}"))
+ storeDataForDb.storeGlucoseValuesToDb()
+ continueLoading = false
+ }
} else {
// End first load
if (isFirstLoad) {
nsClientV3Plugin.lastLoadedSrvModified.collections.entries = lastLoaded
nsClientV3Plugin.storeLastLoadedSrvModified()
}
- rxBus.send(EventNSClientNewLog("RCV END", "No SGVs from ${dateUtil.dateAndTimeAndSecondsString(lastLoaded)}"))
- workManager
- .beginUniqueWork(
- NSClientV3Plugin.JOB_NAME,
- ExistingWorkPolicy.APPEND_OR_REPLACE,
- OneTimeWorkRequest.Builder(StoreDataForDbImpl.StoreBgWorker::class.java).build()
- )
- .then(OneTimeWorkRequest.Builder(LoadTreatmentsWorker::class.java).build())
- .enqueue()
+ rxBus.send(EventNSClientNewLog("◄ RCV BG END", "No new data from ${dateUtil.dateAndTimeAndSecondsString(lastLoaded)}"))
+ storeDataForDb.storeGlucoseValuesToDb()
+ continueLoading = false
}
- } else {
- // End first load
- if (isFirstLoad) {
- nsClientV3Plugin.lastLoadedSrvModified.collections.entries = lastLoaded
- nsClientV3Plugin.storeLastLoadedSrvModified()
- }
- rxBus.send(EventNSClientNewLog("RCV END", "No new SGVs from ${dateUtil.dateAndTimeAndSecondsString(lastLoaded)}"))
- workManager
- .beginUniqueWork(
- NSClientV3Plugin.JOB_NAME,
- ExistingWorkPolicy.APPEND_OR_REPLACE,
- OneTimeWorkRequest.Builder(StoreDataForDbImpl.StoreBgWorker::class.java).build()
- )
- .then(OneTimeWorkRequest.Builder(LoadTreatmentsWorker::class.java).build())
- .enqueue()
}
} catch (error: Exception) {
aapsLogger.error("Error: ", error)
- rxBus.send(EventNSClientNewLog("ERROR", error.localizedMessage))
+ rxBus.send(EventNSClientNewLog("◄ ERROR", error.localizedMessage))
nsClientV3Plugin.lastOperationError = error.localizedMessage
return Result.failure(workDataOf("Error" to error.localizedMessage))
}
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadDeviceStatusWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadDeviceStatusWorker.kt
index 437f2acae2..0deb717e48 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadDeviceStatusWorker.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadDeviceStatusWorker.kt
@@ -1,9 +1,6 @@
package info.nightscout.plugins.sync.nsclientV3.workers
import android.content.Context
-import androidx.work.ExistingWorkPolicy
-import androidx.work.OneTimeWorkRequest
-import androidx.work.WorkManager
import androidx.work.WorkerParameters
import androidx.work.workDataOf
import info.nightscout.core.utils.receivers.DataWorkerStorage
@@ -33,25 +30,22 @@ class LoadDeviceStatusWorker(
val nsAndroidClient = nsClientV3Plugin.nsAndroidClient ?: return Result.failure(workDataOf("Error" to "AndroidClient is null"))
try {
+ // Notify plugin we loaded al missed data
+ nsClientV3Plugin.initialLoadFinished = true
+
val from = dateUtil.now() - T.mins(7).msecs()
val deviceStatuses = nsAndroidClient.getDeviceStatusModifiedSince(from)
aapsLogger.debug("DEVICESTATUSES: $deviceStatuses")
if (deviceStatuses.isNotEmpty()) {
- rxBus.send(EventNSClientNewLog("RCV", "${deviceStatuses.size} DSs from ${dateUtil.dateAndTimeAndSecondsString(from)}"))
+ rxBus.send(EventNSClientNewLog("◄ RCV", "${deviceStatuses.size} DSs from ${dateUtil.dateAndTimeAndSecondsString(from)}"))
nsDeviceStatusHandler.handleNewData(deviceStatuses.toTypedArray())
- rxBus.send(EventNSClientNewLog("DONE DS", ""))
+ rxBus.send(EventNSClientNewLog("● DONE PROCESSING DS", ""))
} else {
- rxBus.send(EventNSClientNewLog("RCV END", "No DSs from ${dateUtil.dateAndTimeAndSecondsString(from)}"))
+ rxBus.send(EventNSClientNewLog("◄ RCV DS END", "No data from ${dateUtil.dateAndTimeAndSecondsString(from)}"))
}
- WorkManager.getInstance(context)
- .enqueueUniqueWork(
- NSClientV3Plugin.JOB_NAME,
- ExistingWorkPolicy.APPEND_OR_REPLACE,
- OneTimeWorkRequest.Builder(DataSyncWorker::class.java).build()
- )
} catch (error: Exception) {
aapsLogger.error("Error: ", error)
- rxBus.send(EventNSClientNewLog("ERROR", error.localizedMessage))
+ rxBus.send(EventNSClientNewLog("◄ ERROR", error.localizedMessage))
nsClientV3Plugin.lastOperationError = error.localizedMessage
return Result.failure(workDataOf("Error" to error.localizedMessage))
}
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadFoodsWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadFoodsWorker.kt
index 8a92a1f703..bb9adcb75a 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadFoodsWorker.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadFoodsWorker.kt
@@ -1,15 +1,11 @@
package info.nightscout.plugins.sync.nsclientV3.workers
import android.content.Context
-import androidx.work.ExistingWorkPolicy
-import androidx.work.OneTimeWorkRequest
-import androidx.work.WorkManager
import androidx.work.WorkerParameters
import androidx.work.workDataOf
-import info.nightscout.core.utils.receivers.DataWorkerStorage
import info.nightscout.core.utils.worker.LoggingWorker
import info.nightscout.interfaces.nsclient.StoreDataForDb
-import info.nightscout.plugins.sync.nsShared.StoreDataForDbImpl
+import info.nightscout.plugins.sync.nsShared.NsIncomingDataProcessor
import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin
import info.nightscout.rx.bus.RxBus
import info.nightscout.rx.events.EventNSClientNewLog
@@ -24,12 +20,12 @@ class LoadFoodsWorker(
params: WorkerParameters
) : LoggingWorker(context, params, Dispatchers.IO) {
- @Inject lateinit var dataWorkerStorage: DataWorkerStorage
@Inject lateinit var rxBus: RxBus
@Inject lateinit var context: Context
@Inject lateinit var nsClientV3Plugin: NSClientV3Plugin
@Inject lateinit var dateUtil: DateUtil
@Inject lateinit var storeDataForDb: StoreDataForDb
+ @Inject lateinit var nsIncomingDataProcessor: NsIncomingDataProcessor
override suspend fun doWorkAndLog(): Result {
val nsAndroidClient = nsClientV3Plugin.nsAndroidClient ?: return Result.failure(workDataOf("Error" to "AndroidClient is null"))
@@ -40,30 +36,16 @@ class LoadFoodsWorker(
if (nsClientV3Plugin.lastLoadedSrvModified.collections.foods++ % 5 == 0L) {
val foods: List = nsAndroidClient.getFoods(1000).values
aapsLogger.debug(LTag.NSCLIENT, "FOODS: $foods")
- rxBus.send(EventNSClientNewLog("RCV", "${foods.size} FOODs"))
+ rxBus.send(EventNSClientNewLog("◄ RCV", "${foods.size} FOODs"))
// Schedule processing of fetched data
- WorkManager.getInstance(context)
- .beginUniqueWork(
- NSClientV3Plugin.JOB_NAME,
- ExistingWorkPolicy.APPEND_OR_REPLACE,
- OneTimeWorkRequest.Builder(ProcessFoodWorker::class.java)
- .setInputData(dataWorkerStorage.storeInputData(foods))
- .build()
- ).then(OneTimeWorkRequest.Builder(StoreDataForDbImpl.StoreFoodWorker::class.java).build())
- .then(OneTimeWorkRequest.Builder(LoadProfileStoreWorker::class.java).build())
- .enqueue()
+ nsIncomingDataProcessor.processFood(foods)
+ storeDataForDb.storeFoodsToDb()
} else {
- rxBus.send(EventNSClientNewLog("RCV", "FOOD skipped"))
- WorkManager.getInstance(context)
- .enqueueUniqueWork(
- NSClientV3Plugin.JOB_NAME,
- ExistingWorkPolicy.APPEND_OR_REPLACE,
- OneTimeWorkRequest.Builder(LoadProfileStoreWorker::class.java).build()
- )
+ rxBus.send(EventNSClientNewLog("● RCV FOOD", "skipped"))
}
} catch (error: Exception) {
aapsLogger.error("Error: ", error)
- rxBus.send(EventNSClientNewLog("ERROR", error.localizedMessage))
+ rxBus.send(EventNSClientNewLog("◄ ERROR", error.localizedMessage))
nsClientV3Plugin.lastOperationError = error.localizedMessage
return Result.failure(workDataOf("Error" to error.localizedMessage))
}
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadLastModificationWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadLastModificationWorker.kt
index c4333ab28b..addcf27ce6 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadLastModificationWorker.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadLastModificationWorker.kt
@@ -27,7 +27,7 @@ class LoadLastModificationWorker(
aapsLogger.debug(LTag.NSCLIENT, "LAST MODIFIED: ${nsClientV3Plugin.newestDataOnServer}")
} catch (error: Exception) {
aapsLogger.error(LTag.NSCLIENT, "Error: ", error)
- rxBus.send(EventNSClientNewLog("ERROR", error.localizedMessage))
+ rxBus.send(EventNSClientNewLog("◄ ERROR", error.localizedMessage))
nsClientV3Plugin.lastOperationError = error.localizedMessage
return Result.failure(workDataOf("Error" to error.localizedMessage))
}
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadProfileStoreWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadProfileStoreWorker.kt
index 2428816bfc..ce4a7d81ca 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadProfileStoreWorker.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadProfileStoreWorker.kt
@@ -1,16 +1,13 @@
package info.nightscout.plugins.sync.nsclientV3.workers
import android.content.Context
-import androidx.work.ExistingWorkPolicy
-import androidx.work.OneTimeWorkRequest
-import androidx.work.WorkManager
import androidx.work.WorkerParameters
import androidx.work.workDataOf
import info.nightscout.core.utils.receivers.DataWorkerStorage
import info.nightscout.core.utils.worker.LoggingWorker
import info.nightscout.interfaces.sync.NsClient
import info.nightscout.interfaces.utils.JsonHelper
-import info.nightscout.interfaces.workflow.WorkerClasses
+import info.nightscout.plugins.sync.nsShared.NsIncomingDataProcessor
import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin
import info.nightscout.rx.bus.RxBus
import info.nightscout.rx.events.EventNSClientNewLog
@@ -32,7 +29,7 @@ class LoadProfileStoreWorker(
@Inject lateinit var context: Context
@Inject lateinit var nsClientV3Plugin: NSClientV3Plugin
@Inject lateinit var dateUtil: DateUtil
- @Inject lateinit var workerClasses: WorkerClasses
+ @Inject lateinit var nsIncomingDataProcessor: NsIncomingDataProcessor
override suspend fun doWorkAndLog(): Result {
val nsAndroidClient = nsClientV3Plugin.nsAndroidClient ?: return Result.failure(workDataOf("Error" to "AndroidClient is null"))
@@ -58,40 +55,21 @@ class LoadProfileStoreWorker(
{ nsClientV3Plugin.lastLoadedSrvModified.collections.profile = dateUtil.now() }
nsClientV3Plugin.storeLastLoadedSrvModified()
aapsLogger.debug(LTag.NSCLIENT, "PROFILE: $profile")
- rxBus.send(EventNSClientNewLog("RCV", "1 PROFILE from ${dateUtil.dateAndTimeAndSecondsString(lastLoaded)}"))
- WorkManager.getInstance(context)
- .beginUniqueWork(
- NSClientV3Plugin.JOB_NAME,
- ExistingWorkPolicy.APPEND_OR_REPLACE,
- OneTimeWorkRequest.Builder((workerClasses.nsProfileWorker))
- .setInputData(dataWorkerStorage.storeInputData(profile))
- .build()
- ).then(OneTimeWorkRequest.Builder(LoadDeviceStatusWorker::class.java).build())
- .enqueue()
+ rxBus.send(EventNSClientNewLog("◄ RCV", "1 PROFILE from ${dateUtil.dateAndTimeAndSecondsString(lastLoaded)}"))
+ nsIncomingDataProcessor.processProfile(profile)
} else {
- rxBus.send(EventNSClientNewLog("RCV END", "No new PROFILE from ${dateUtil.dateAndTimeAndSecondsString(lastLoaded)}"))
- WorkManager.getInstance(context)
- .enqueueUniqueWork(
- NSClientV3Plugin.JOB_NAME,
- ExistingWorkPolicy.APPEND_OR_REPLACE,
- OneTimeWorkRequest.Builder(LoadDeviceStatusWorker::class.java).build()
- )
+ rxBus.send(EventNSClientNewLog("◄ RCV PROFILE END", "No new data from ${dateUtil.dateAndTimeAndSecondsString(lastLoaded)}"))
}
} else {
- rxBus.send(EventNSClientNewLog("RCV END", "No PROFILE from ${dateUtil.dateAndTimeAndSecondsString(lastLoaded)}"))
- WorkManager.getInstance(context)
- .enqueueUniqueWork(
- NSClientV3Plugin.JOB_NAME,
- ExistingWorkPolicy.APPEND_OR_REPLACE,
- OneTimeWorkRequest.Builder(LoadDeviceStatusWorker::class.java).build()
- )
+ rxBus.send(EventNSClientNewLog("◄ RCV PROFILE END", "No data from ${dateUtil.dateAndTimeAndSecondsString(lastLoaded)}"))
}
} catch (error: Exception) {
aapsLogger.error("Error: ", error)
- rxBus.send(EventNSClientNewLog("ERROR", error.localizedMessage))
+ rxBus.send(EventNSClientNewLog("◄ ERROR", error.localizedMessage))
return Result.failure(workDataOf("Error" to error.localizedMessage))
}
return Result.success()
}
+
}
\ No newline at end of file
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadStatusWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadStatusWorker.kt
index d51a286306..d0d73f0b52 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadStatusWorker.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadStatusWorker.kt
@@ -4,6 +4,7 @@ import android.content.Context
import androidx.work.WorkerParameters
import androidx.work.workDataOf
import info.nightscout.core.utils.worker.LoggingWorker
+import info.nightscout.plugins.sync.nsShared.events.EventNSClientUpdateGuiStatus
import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin
import info.nightscout.rx.bus.RxBus
import info.nightscout.rx.events.EventNSClientNewLog
@@ -26,11 +27,13 @@ class LoadStatusWorker(
aapsLogger.debug(LTag.NSCLIENT, "STATUS: $status")
} catch (error: Exception) {
aapsLogger.error("Error: ", error)
- rxBus.send(EventNSClientNewLog("ERROR", error.localizedMessage))
+ rxBus.send(EventNSClientNewLog("◄ ERROR", error.localizedMessage))
nsClientV3Plugin.lastOperationError = error.localizedMessage
+ rxBus.send(EventNSClientUpdateGuiStatus())
return Result.failure(workDataOf("Error" to error.localizedMessage))
}
nsClientV3Plugin.lastOperationError = null
+ rxBus.send(EventNSClientUpdateGuiStatus())
return Result.success()
}
}
\ No newline at end of file
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadTreatmentsWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadTreatmentsWorker.kt
index de4682b4c3..f428594fa3 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadTreatmentsWorker.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadTreatmentsWorker.kt
@@ -1,16 +1,12 @@
package info.nightscout.plugins.sync.nsclientV3.workers
import android.content.Context
-import androidx.work.ExistingWorkPolicy
-import androidx.work.OneTimeWorkRequest
-import androidx.work.WorkManager
import androidx.work.WorkerParameters
import androidx.work.workDataOf
-import info.nightscout.core.utils.receivers.DataWorkerStorage
import info.nightscout.core.utils.worker.LoggingWorker
-import info.nightscout.core.utils.worker.then
import info.nightscout.interfaces.nsclient.StoreDataForDb
import info.nightscout.interfaces.sync.NsClient
+import info.nightscout.plugins.sync.nsShared.NsIncomingDataProcessor
import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin
import info.nightscout.rx.bus.RxBus
import info.nightscout.rx.events.EventNSClientNewLog
@@ -27,89 +23,70 @@ class LoadTreatmentsWorker(
params: WorkerParameters
) : LoggingWorker(context, params, Dispatchers.IO) {
- @Inject lateinit var dataWorkerStorage: DataWorkerStorage
@Inject lateinit var rxBus: RxBus
@Inject lateinit var context: Context
@Inject lateinit var nsClientV3Plugin: NSClientV3Plugin
@Inject lateinit var dateUtil: DateUtil
@Inject lateinit var storeDataForDb: StoreDataForDb
+ @Inject lateinit var nsIncomingDataProcessor: NsIncomingDataProcessor
override suspend fun doWorkAndLog(): Result {
val nsAndroidClient = nsClientV3Plugin.nsAndroidClient ?: return Result.failure(workDataOf("Error" to "AndroidClient is null"))
+ var continueLoading = true
try {
- val isFirstLoad = nsClientV3Plugin.isFirstLoad(NsClient.Collection.TREATMENTS)
- val lastLoaded =
- if (isFirstLoad) max(nsClientV3Plugin.firstLoadContinueTimestamp.collections.treatments, dateUtil.now() - nsClientV3Plugin.maxAge)
- else max(nsClientV3Plugin.lastLoadedSrvModified.collections.treatments, dateUtil.now() - nsClientV3Plugin.maxAge)
- if ((nsClientV3Plugin.newestDataOnServer?.collections?.treatments ?: Long.MAX_VALUE) > lastLoaded) {
- val treatments: List
- val response: NSAndroidClient.ReadResponse>?
- if (isFirstLoad) {
- val lastLoadedIso = dateUtil.toISOString(lastLoaded)
- response = nsAndroidClient.getTreatmentsNewerThan(lastLoadedIso, NSClientV3Plugin.RECORDS_TO_LOAD)
- } else {
- response = nsAndroidClient.getTreatmentsModifiedSince(lastLoaded, NSClientV3Plugin.RECORDS_TO_LOAD)
- aapsLogger.debug(LTag.NSCLIENT, "lastLoadedSrvModified: ${response.lastServerModified}")
- response.lastServerModified?.let { nsClientV3Plugin.lastLoadedSrvModified.collections.treatments = it }
- nsClientV3Plugin.storeLastLoadedSrvModified()
- }
- treatments = response.values
- aapsLogger.debug(LTag.NSCLIENT, "TREATMENTS: $treatments")
- if (treatments.isNotEmpty()) {
- val action = if (isFirstLoad) "RCV-FIRST" else "RCV"
- rxBus.send(EventNSClientNewLog(action, "${treatments.size} TRs from ${dateUtil.dateAndTimeAndSecondsString(lastLoaded)}"))
- // Schedule processing of fetched data and continue of loading
- val stopLoading = treatments.size != NSClientV3Plugin.RECORDS_TO_LOAD || response.code == 304
- WorkManager.getInstance(context)
- .beginUniqueWork(
- NSClientV3Plugin.JOB_NAME,
- ExistingWorkPolicy.APPEND_OR_REPLACE,
- OneTimeWorkRequest.Builder(ProcessTreatmentsWorker::class.java)
- .setInputData(dataWorkerStorage.storeInputData(response))
- .build()
- )
- // response 304 == Not modified (happens when date > srvModified => bad time on phone or server during upload
- .then(!stopLoading, OneTimeWorkRequest.Builder(LoadTreatmentsWorker::class.java).build())
- .then(stopLoading, OneTimeWorkRequest.Builder(LoadFoodsWorker::class.java).build())
- .enqueue()
+ while (continueLoading) {
+ val isFirstLoad = nsClientV3Plugin.isFirstLoad(NsClient.Collection.TREATMENTS)
+ val lastLoaded =
+ if (isFirstLoad) max(nsClientV3Plugin.firstLoadContinueTimestamp.collections.treatments, dateUtil.now() - nsClientV3Plugin.maxAge)
+ else max(nsClientV3Plugin.lastLoadedSrvModified.collections.treatments, dateUtil.now() - nsClientV3Plugin.maxAge)
+ if ((nsClientV3Plugin.newestDataOnServer?.collections?.treatments ?: Long.MAX_VALUE) > lastLoaded) {
+ val treatments: List
+ val response: NSAndroidClient.ReadResponse>?
+ if (isFirstLoad) {
+ val lastLoadedIso = dateUtil.toISOString(lastLoaded)
+ response = nsAndroidClient.getTreatmentsNewerThan(lastLoadedIso, NSClientV3Plugin.RECORDS_TO_LOAD)
+ } else {
+ response = nsAndroidClient.getTreatmentsModifiedSince(lastLoaded, NSClientV3Plugin.RECORDS_TO_LOAD)
+ aapsLogger.debug(LTag.NSCLIENT, "lastLoadedSrvModified: ${response.lastServerModified}")
+ response.lastServerModified?.let { nsClientV3Plugin.lastLoadedSrvModified.collections.treatments = it }
+ nsClientV3Plugin.storeLastLoadedSrvModified()
+ }
+ treatments = response.values
+ aapsLogger.debug(LTag.NSCLIENT, "TREATMENTS: $treatments")
+ if (treatments.isNotEmpty()) {
+ val action = if (isFirstLoad) "RCV-F" else "RCV"
+ rxBus.send(EventNSClientNewLog("◄ $action", "${treatments.size} TRs from ${dateUtil.dateAndTimeAndSecondsString(lastLoaded)}"))
+ // Schedule processing of fetched data and continue of loading
+ continueLoading = !(treatments.size != NSClientV3Plugin.RECORDS_TO_LOAD || response.code == 304)
+ nsIncomingDataProcessor.processTreatments(response.values)
+ } else {
+ // End first load
+ if (isFirstLoad) {
+ nsClientV3Plugin.lastLoadedSrvModified.collections.treatments = lastLoaded
+ nsClientV3Plugin.storeLastLoadedSrvModified()
+ }
+ rxBus.send(EventNSClientNewLog("◄ RCV TR END", "No data from ${dateUtil.dateAndTimeAndSecondsString(lastLoaded)}"))
+ continueLoading = false
+ }
} else {
// End first load
if (isFirstLoad) {
nsClientV3Plugin.lastLoadedSrvModified.collections.treatments = lastLoaded
nsClientV3Plugin.storeLastLoadedSrvModified()
}
- rxBus.send(EventNSClientNewLog("RCV END", "No TRs from ${dateUtil.dateAndTimeAndSecondsString(lastLoaded)}"))
- storeDataForDb.storeTreatmentsToDb()
- WorkManager.getInstance(context)
- .enqueueUniqueWork(
- NSClientV3Plugin.JOB_NAME,
- ExistingWorkPolicy.APPEND_OR_REPLACE,
- OneTimeWorkRequest.Builder(LoadFoodsWorker::class.java).build()
- )
+ rxBus.send(EventNSClientNewLog("◄ RCV TR END", "No new data from ${dateUtil.dateAndTimeAndSecondsString(lastLoaded)}"))
+ continueLoading = false
}
- } else {
- // End first load
- if (isFirstLoad) {
- nsClientV3Plugin.lastLoadedSrvModified.collections.treatments = lastLoaded
- nsClientV3Plugin.storeLastLoadedSrvModified()
- }
- rxBus.send(EventNSClientNewLog("RCV END", "No new TRs from ${dateUtil.dateAndTimeAndSecondsString(lastLoaded)}"))
- storeDataForDb.storeTreatmentsToDb()
- WorkManager.getInstance(context)
- .enqueueUniqueWork(
- NSClientV3Plugin.JOB_NAME,
- ExistingWorkPolicy.APPEND_OR_REPLACE,
- OneTimeWorkRequest.Builder(LoadFoodsWorker::class.java).build()
- )
}
} catch (error: Exception) {
aapsLogger.error("Error: ", error)
- rxBus.send(EventNSClientNewLog("ERROR", error.localizedMessage))
+ rxBus.send(EventNSClientNewLog("◄ ERROR", error.localizedMessage))
nsClientV3Plugin.lastOperationError = error.localizedMessage
return Result.failure(workDataOf("Error" to error.localizedMessage))
}
+ storeDataForDb.storeTreatmentsToDb()
nsClientV3Plugin.lastOperationError = null
return Result.success()
}
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/ProcessFoodWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/ProcessFoodWorker.kt
deleted file mode 100644
index 32bdc3ac54..0000000000
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/ProcessFoodWorker.kt
+++ /dev/null
@@ -1,81 +0,0 @@
-package info.nightscout.plugins.sync.nsclientV3.workers
-
-import android.content.Context
-import androidx.work.WorkerParameters
-import androidx.work.workDataOf
-import dagger.android.HasAndroidInjector
-import info.nightscout.core.extensions.foodFromJson
-import info.nightscout.core.utils.receivers.DataWorkerStorage
-import info.nightscout.core.utils.worker.LoggingWorker
-import info.nightscout.database.entities.Food
-import info.nightscout.database.impl.AppRepository
-import info.nightscout.interfaces.nsclient.StoreDataForDb
-import info.nightscout.interfaces.utils.JsonHelper
-import info.nightscout.plugins.sync.nsclientV3.extensions.toFood
-import info.nightscout.rx.bus.RxBus
-import info.nightscout.rx.events.EventNSClientNewLog
-import info.nightscout.rx.logging.LTag
-import info.nightscout.sdk.localmodel.food.NSFood
-import info.nightscout.shared.sharedPreferences.SP
-import kotlinx.coroutines.Dispatchers
-import org.json.JSONArray
-import org.json.JSONObject
-import javax.inject.Inject
-
-class ProcessFoodWorker(
- context: Context,
- params: WorkerParameters
-) : LoggingWorker(context, params, Dispatchers.Default) {
-
- @Inject lateinit var injector: HasAndroidInjector
- @Inject lateinit var repository: AppRepository
- @Inject lateinit var sp: SP
- @Inject lateinit var dataWorkerStorage: DataWorkerStorage
- @Inject lateinit var storeDataForDb: StoreDataForDb
- @Inject lateinit var rxBus: RxBus
-
- override suspend fun doWorkAndLog(): Result {
- val data = dataWorkerStorage.pickupObject(inputData.getLong(DataWorkerStorage.STORE_KEY, -1))
- ?: return Result.failure(workDataOf("Error" to "missing input data"))
- aapsLogger.debug(LTag.DATABASE, "Received Food Data: $data")
-
- try {
- val foods = mutableListOf()
- if (data is JSONArray) {
- for (index in 0 until data.length()) {
- val jsonFood: JSONObject = data.getJSONObject(index)
-
- if (JsonHelper.safeGetString(jsonFood, "type") != "food") continue
-
- when (JsonHelper.safeGetString(jsonFood, "action")) {
- "remove" -> {
- val delFood = Food(
- name = "",
- portion = 0.0,
- carbs = 0,
- isValid = false
- ).also { it.interfaceIDs.nightscoutId = JsonHelper.safeGetString(jsonFood, "_id") }
- foods += delFood
- }
-
- else -> {
- val food = foodFromJson(jsonFood)
- if (food != null) foods += food
- else aapsLogger.error(LTag.DATABASE, "Error parsing food", jsonFood.toString())
- }
- }
- }
- } else if (data is List<*>) {
- for (i in 0 until data.size)
- foods += (data[i] as NSFood).toFood()
- }
- storeDataForDb.foods.addAll(foods)
- } catch (error: Exception) {
- aapsLogger.error("Error: ", error)
- rxBus.send(EventNSClientNewLog("ERROR", error.localizedMessage))
- return Result.failure(workDataOf("Error" to error.localizedMessage))
- }
-
- return Result.success()
- }
-}
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/ProcessTreatmentsWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/ProcessTreatmentsWorker.kt
deleted file mode 100644
index 3f96ad4922..0000000000
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/ProcessTreatmentsWorker.kt
+++ /dev/null
@@ -1,147 +0,0 @@
-package info.nightscout.plugins.sync.nsclientV3.workers
-
-import android.content.Context
-import androidx.work.WorkerParameters
-import androidx.work.workDataOf
-import info.nightscout.core.utils.receivers.DataWorkerStorage
-import info.nightscout.core.utils.worker.LoggingWorker
-import info.nightscout.database.impl.AppRepository
-import info.nightscout.interfaces.Config
-import info.nightscout.interfaces.Constants
-import info.nightscout.interfaces.nsclient.StoreDataForDb
-import info.nightscout.interfaces.plugin.ActivePlugin
-import info.nightscout.plugins.sync.R
-import info.nightscout.plugins.sync.nsclientV3.extensions.toBolus
-import info.nightscout.plugins.sync.nsclientV3.extensions.toBolusCalculatorResult
-import info.nightscout.plugins.sync.nsclientV3.extensions.toCarbs
-import info.nightscout.plugins.sync.nsclientV3.extensions.toEffectiveProfileSwitch
-import info.nightscout.plugins.sync.nsclientV3.extensions.toExtendedBolus
-import info.nightscout.plugins.sync.nsclientV3.extensions.toOfflineEvent
-import info.nightscout.plugins.sync.nsclientV3.extensions.toProfileSwitch
-import info.nightscout.plugins.sync.nsclientV3.extensions.toTemporaryBasal
-import info.nightscout.plugins.sync.nsclientV3.extensions.toTemporaryTarget
-import info.nightscout.plugins.sync.nsclientV3.extensions.toTherapyEvent
-import info.nightscout.rx.bus.RxBus
-import info.nightscout.rx.events.EventNSClientNewLog
-import info.nightscout.rx.logging.LTag
-import info.nightscout.sdk.interfaces.NSAndroidClient
-import info.nightscout.sdk.localmodel.treatment.NSBolus
-import info.nightscout.sdk.localmodel.treatment.NSBolusWizard
-import info.nightscout.sdk.localmodel.treatment.NSCarbs
-import info.nightscout.sdk.localmodel.treatment.NSEffectiveProfileSwitch
-import info.nightscout.sdk.localmodel.treatment.NSExtendedBolus
-import info.nightscout.sdk.localmodel.treatment.NSOfflineEvent
-import info.nightscout.sdk.localmodel.treatment.NSProfileSwitch
-import info.nightscout.sdk.localmodel.treatment.NSTemporaryBasal
-import info.nightscout.sdk.localmodel.treatment.NSTemporaryTarget
-import info.nightscout.sdk.localmodel.treatment.NSTherapyEvent
-import info.nightscout.sdk.localmodel.treatment.NSTreatment
-import info.nightscout.shared.sharedPreferences.SP
-import info.nightscout.shared.utils.DateUtil
-import kotlinx.coroutines.Dispatchers
-import javax.inject.Inject
-
-class ProcessTreatmentsWorker(
- context: Context,
- params: WorkerParameters
-) : LoggingWorker(context, params, Dispatchers.Default) {
-
- @Inject lateinit var dataWorkerStorage: DataWorkerStorage
- @Inject lateinit var config: Config
- @Inject lateinit var sp: SP
- @Inject lateinit var dateUtil: DateUtil
- @Inject lateinit var repository: AppRepository
- @Inject lateinit var activePlugin: ActivePlugin
- @Inject lateinit var rxBus: RxBus
- @Inject lateinit var storeDataForDb: StoreDataForDb
-
- override suspend fun doWorkAndLog(): Result {
- @Suppress("UNCHECKED_CAST")
- val treatments = dataWorkerStorage.pickupObject(inputData.getLong(DataWorkerStorage.STORE_KEY, -1)) as NSAndroidClient.ReadResponse>?
- ?: return Result.failure(workDataOf("Error" to "missing input data"))
-
- try {
- var latestDateInReceivedData: Long = 0
- for (treatment in treatments.values) {
- aapsLogger.debug(LTag.DATABASE, "Received NS treatment: $treatment")
- val date = treatment.date ?: continue
- if (date > latestDateInReceivedData) latestDateInReceivedData = date
-
- when (treatment) {
- is NSBolus ->
- if (sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_receive_insulin, false) || config.NSCLIENT)
- storeDataForDb.boluses.add(treatment.toBolus())
-
- is NSCarbs ->
- if (sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_receive_carbs, false) || config.NSCLIENT)
- storeDataForDb.carbs.add(treatment.toCarbs())
-
- is NSTemporaryTarget ->
- if (sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_receive_temp_target, false) || config.NSCLIENT) {
- if (treatment.duration > 0L) {
- // not ending event
- if (treatment.targetBottomAsMgdl() < Constants.MIN_TT_MGDL
- || treatment.targetBottomAsMgdl() > Constants.MAX_TT_MGDL
- || treatment.targetTopAsMgdl() < Constants.MIN_TT_MGDL
- || treatment.targetTopAsMgdl() > Constants.MAX_TT_MGDL
- || treatment.targetBottomAsMgdl() > treatment.targetTopAsMgdl()
- ) {
- aapsLogger.debug(LTag.DATABASE, "Ignored TemporaryTarget $treatment")
- continue
- }
- }
- storeDataForDb.temporaryTargets.add(treatment.toTemporaryTarget())
- }
-
- is NSTemporaryBasal ->
- if (config.isEngineeringMode() && sp.getBoolean(R.string.key_ns_receive_tbr_eb, false) || config.NSCLIENT)
- storeDataForDb.temporaryBasals.add(treatment.toTemporaryBasal())
-
- is NSEffectiveProfileSwitch ->
- if (sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_receive_profile_switch, false) || config.NSCLIENT) {
- treatment.toEffectiveProfileSwitch(dateUtil)?.let { effectiveProfileSwitch ->
- storeDataForDb.effectiveProfileSwitches.add(effectiveProfileSwitch)
- }
- }
-
- is NSProfileSwitch ->
- if (sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_receive_profile_switch, false) || config.NSCLIENT) {
- treatment.toProfileSwitch(activePlugin, dateUtil)?.let { profileSwitch ->
- storeDataForDb.profileSwitches.add(profileSwitch)
- }
- }
-
- is NSBolusWizard ->
- treatment.toBolusCalculatorResult()?.let { bolusCalculatorResult ->
- storeDataForDb.bolusCalculatorResults.add(bolusCalculatorResult)
- }
-
- is NSTherapyEvent ->
- if (sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_receive_therapy_events, false) || config.NSCLIENT)
- treatment.toTherapyEvent().let { therapyEvent ->
- storeDataForDb.therapyEvents.add(therapyEvent)
- }
-
- is NSOfflineEvent ->
- if (sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_receive_offline_event, false) && config.isEngineeringMode() || config.NSCLIENT)
- treatment.toOfflineEvent().let { offlineEvent ->
- storeDataForDb.offlineEvents.add(offlineEvent)
- }
-
- is NSExtendedBolus ->
- if (config.isEngineeringMode() && sp.getBoolean(R.string.key_ns_receive_tbr_eb, false) || config.NSCLIENT)
- treatment.toExtendedBolus().let { extendedBolus ->
- storeDataForDb.extendedBoluses.add(extendedBolus)
- }
- }
- }
- activePlugin.activeNsClient?.updateLatestTreatmentReceivedIfNewer(latestDateInReceivedData)
-// xDripBroadcast.sendTreatments(treatments)
- } catch (error: Exception) {
- aapsLogger.error("Error: ", error)
- rxBus.send(EventNSClientNewLog("ERROR", error.localizedMessage))
- return Result.failure(workDataOf("Error" to error.localizedMessage))
- }
- return Result.success()
- }
-}
\ No newline at end of file
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolFragment.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolFragment.kt
index eb4eeef486..827d8c5a2c 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolFragment.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolFragment.kt
@@ -2,9 +2,14 @@ package info.nightscout.plugins.sync.tidepool
import android.os.Bundle
import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
import android.view.View
import android.view.ViewGroup
import android.widget.ScrollView
+import androidx.core.view.MenuProvider
+import androidx.lifecycle.Lifecycle
import dagger.android.support.DaggerFragment
import info.nightscout.core.utils.fabric.FabricPrivacy
import info.nightscout.plugins.sync.R
@@ -15,12 +20,13 @@ import info.nightscout.plugins.sync.tidepool.events.EventTidepoolResetData
import info.nightscout.plugins.sync.tidepool.events.EventTidepoolUpdateGUI
import info.nightscout.rx.AapsSchedulers
import info.nightscout.rx.bus.RxBus
+import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.shared.sharedPreferences.SP
import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign
import javax.inject.Inject
-class TidepoolFragment : DaggerFragment() {
+class TidepoolFragment : DaggerFragment(), MenuProvider {
@Inject lateinit var rxBus: RxBus
@Inject lateinit var tidepoolPlugin: TidepoolPlugin
@@ -28,6 +34,15 @@ class TidepoolFragment : DaggerFragment() {
@Inject lateinit var sp: SP
@Inject lateinit var fabricPrivacy: FabricPrivacy
@Inject lateinit var aapsSchedulers: AapsSchedulers
+ @Inject lateinit var rh: ResourceHelper
+
+ companion object {
+
+ const val ID_MENU_LOGIN = 530
+ const val ID_MENU_SEND_NOW = 531
+ const val ID_MENU_REMOVE_ALL = 532
+ const val ID_MENU_FULL_SYNC = 533
+ }
private var disposable: CompositeDisposable = CompositeDisposable()
@@ -39,31 +54,59 @@ class TidepoolFragment : DaggerFragment() {
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
_binding = TidepoolFragmentBinding.inflate(inflater, container, false)
+ requireActivity().addMenuProvider(this, viewLifecycleOwner, Lifecycle.State.RESUMED)
return binding.root
}
- override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
- super.onViewCreated(view, savedInstanceState)
- binding.login.setOnClickListener { tidepoolUploader.doLogin(false) }
- binding.uploadnow.setOnClickListener { rxBus.send(EventTidepoolDoUpload()) }
- binding.removeall.setOnClickListener { rxBus.send(EventTidepoolResetData()) }
- binding.resertstart.setOnClickListener { sp.putLong(R.string.key_tidepool_last_end, 0) }
+ override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
+ menu.add(Menu.FIRST, ID_MENU_LOGIN, 0, rh.gs(info.nightscout.core.ui.R.string.login)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
+ menu.add(Menu.FIRST, ID_MENU_SEND_NOW, 0, rh.gs(R.string.upload_now)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
+ menu.add(Menu.FIRST, ID_MENU_REMOVE_ALL, 0, rh.gs(R.string.remove_all)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
+ menu.add(Menu.FIRST, ID_MENU_FULL_SYNC, 0, rh.gs(R.string.full_sync)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
+ menu.setGroupDividerEnabled(true)
}
+ override fun onMenuItemSelected(item: MenuItem): Boolean =
+ when (item.itemId) {
+ ID_MENU_LOGIN -> {
+ tidepoolUploader.doLogin(false)
+ true
+ }
+
+ ID_MENU_SEND_NOW -> {
+ rxBus.send(EventTidepoolDoUpload())
+ true
+ }
+
+ ID_MENU_REMOVE_ALL -> {
+ rxBus.send(EventTidepoolResetData())
+ true
+ }
+
+ ID_MENU_FULL_SYNC -> {
+ sp.putLong(R.string.key_tidepool_last_end, 0)
+ true
+ }
+
+ else -> false
+ }
+
@Synchronized
override fun onResume() {
super.onResume()
disposable += rxBus
.toObservable(EventTidepoolUpdateGUI::class.java)
.observeOn(aapsSchedulers.main)
- .subscribe({
- if (_binding == null) return@subscribe
- tidepoolPlugin.updateLog()
- binding.log.text = tidepoolPlugin.textLog
- binding.status.text = tidepoolUploader.connectionStatus.name
- binding.log.text = tidepoolPlugin.textLog
- binding.logscrollview.fullScroll(ScrollView.FOCUS_DOWN)
- }, fabricPrivacy::logException)
+ .subscribe({ updateGui() }, fabricPrivacy::logException)
+ updateGui()
+ }
+
+ private fun updateGui() {
+ tidepoolPlugin.updateLog()
+ _binding?.log?.text = tidepoolPlugin.textLog
+ _binding?.status?.text = tidepoolUploader.connectionStatus.name
+ _binding?.log?.text = tidepoolPlugin.textLog
+ _binding?.logScrollview?.fullScroll(ScrollView.FOCUS_DOWN)
}
@Synchronized
@@ -77,5 +120,4 @@ class TidepoolFragment : DaggerFragment() {
super.onDestroyView()
_binding = null
}
-
}
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolPlugin.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolPlugin.kt
index 549c0e6f8f..521d21e66f 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolPlugin.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolPlugin.kt
@@ -10,11 +10,12 @@ import info.nightscout.interfaces.Constants
import info.nightscout.interfaces.plugin.PluginBase
import info.nightscout.interfaces.plugin.PluginDescription
import info.nightscout.interfaces.plugin.PluginType
-import info.nightscout.interfaces.receivers.ReceiverStatusStore
import info.nightscout.interfaces.sync.Sync
import info.nightscout.interfaces.ui.UiInteraction
import info.nightscout.interfaces.utils.HtmlHelper
import info.nightscout.plugins.sync.R
+import info.nightscout.plugins.sync.nsShared.events.EventConnectivityOptionChanged
+import info.nightscout.plugins.sync.nsclient.ReceiverDelegate
import info.nightscout.plugins.sync.tidepool.comm.TidepoolUploader
import info.nightscout.plugins.sync.tidepool.comm.UploadChunk
import info.nightscout.plugins.sync.tidepool.events.EventTidepoolDoUpload
@@ -24,7 +25,7 @@ import info.nightscout.plugins.sync.tidepool.events.EventTidepoolUpdateGUI
import info.nightscout.plugins.sync.tidepool.utils.RateLimit
import info.nightscout.rx.AapsSchedulers
import info.nightscout.rx.bus.RxBus
-import info.nightscout.rx.events.EventNetworkChange
+import info.nightscout.rx.events.EventNSClientNewLog
import info.nightscout.rx.events.EventNewBG
import info.nightscout.rx.events.EventPreferenceChange
import info.nightscout.rx.logging.AAPSLogger
@@ -50,7 +51,7 @@ class TidepoolPlugin @Inject constructor(
private val uploadChunk: UploadChunk,
private val sp: SP,
private val rateLimit: RateLimit,
- private val receiverStatusStore: ReceiverStatusStore,
+ private val receiverDelegate: ReceiverDelegate,
private val uiInteraction: UiInteraction
) : Sync, PluginBase(
PluginDescription()
@@ -67,10 +68,18 @@ class TidepoolPlugin @Inject constructor(
private val listLog = ArrayList()
var textLog: Spanned = HtmlHelper.fromHtml("")
+ private val isAllowed get() = receiverDelegate.allowed
- @Suppress("UNNECESSARY_NOT_NULL_ASSERTION")
override fun onStart() {
super.onStart()
+ disposable += rxBus
+ .toObservable(EventConnectivityOptionChanged::class.java)
+ .observeOn(aapsSchedulers.io)
+ .subscribe({ ev ->
+ rxBus.send(EventNSClientNewLog("● CONNECTIVITY", ev.blockingReason))
+ tidepoolUploader.resetInstance()
+ if (isAllowed) doUpload()
+ }, fabricPrivacy::logException)
disposable += rxBus
.toObservable(EventTidepoolDoUpload::class.java)
.observeOn(aapsSchedulers.io)
@@ -94,17 +103,13 @@ class TidepoolPlugin @Inject constructor(
disposable += rxBus
.toObservable(EventNewBG::class.java)
.observeOn(aapsSchedulers.io)
- .filter { it.glucoseValueTimestamp != null } // better would be optional in API level >24
- .map { it.glucoseValueTimestamp!! }
- .subscribe({ bgReadingTimestamp ->
- if (bgReadingTimestamp < uploadChunk.getLastEnd())
- uploadChunk.setLastEnd(bgReadingTimestamp)
- if (isEnabled()
- && (!sp.getBoolean(R.string.key_tidepool_only_while_charging, false) || receiverStatusStore.isCharging)
- && (!sp.getBoolean(R.string.key_tidepool_only_while_unmetered, false) || receiverStatusStore.isWifiConnected)
- && rateLimit.rateLimit("tidepool-new-data-upload", T.mins(4).secs().toInt())
- )
- doUpload()
+ .subscribe({
+ it.glucoseValueTimestamp?.let { bgReadingTimestamp ->
+ if (bgReadingTimestamp < uploadChunk.getLastEnd())
+ uploadChunk.setLastEnd(bgReadingTimestamp)
+ if (isAllowed && rateLimit.rateLimit("tidepool-new-data-upload", T.mins(4).secs().toInt()))
+ doUpload()
+ }
}, fabricPrivacy::logException)
disposable += rxBus
.toObservable(EventPreferenceChange::class.java)
@@ -116,11 +121,6 @@ class TidepoolPlugin @Inject constructor(
)
tidepoolUploader.resetInstance()
}, fabricPrivacy::logException)
- disposable += rxBus
- .toObservable(EventNetworkChange::class.java)
- .observeOn(aapsSchedulers.io)
- .subscribe({}, fabricPrivacy::logException) // TODO start upload on wifi connect
-
}
override fun onStop() {
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/comm/InfoInterceptor.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/comm/InfoInterceptor.kt
index 71987129f0..2eec303461 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/comm/InfoInterceptor.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/comm/InfoInterceptor.kt
@@ -8,7 +8,7 @@ import okhttp3.Response
import okio.Buffer
import java.io.IOException
-class InfoInterceptor(val tag: String = "interceptor", val aapsLogger: AAPSLogger) : Interceptor {
+class InfoInterceptor(val aapsLogger: AAPSLogger) : Interceptor {
@Throws(IOException::class)
override fun intercept(chain: Interceptor.Chain): Response {
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/comm/Session.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/comm/Session.kt
index 4c425899b7..1d47adfd78 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/comm/Session.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/comm/Session.kt
@@ -4,38 +4,37 @@ import info.nightscout.plugins.sync.tidepool.messages.AuthReplyMessage
import info.nightscout.plugins.sync.tidepool.messages.DatasetReplyMessage
import okhttp3.Headers
-class Session(val authHeader: String?,
- private val sessionTokenHeader: String,
- val service: TidepoolApiService?) {
+class Session(
+ val authHeader: String?,
+ private val sessionTokenHeader: String,
+ val service: TidepoolApiService?
+) {
internal var token: String? = null
internal var authReply: AuthReplyMessage? = null
internal var datasetReply: DatasetReplyMessage? = null
internal var start: Long = 0
internal var end: Long = 0
+
@Volatile
internal var iterations: Int = 0
fun populateHeaders(headers: Headers) {
if (this.token == null) {
- this.token = headers.get(sessionTokenHeader)
+ this.token = headers[sessionTokenHeader]
}
}
fun populateBody(obj: Any?) {
- if (obj == null) return
- if (obj is AuthReplyMessage) {
- authReply = obj
- } else if (obj is List<*>) {
- val list = obj as? List<*>?
+ when (obj) {
+ is AuthReplyMessage -> authReply = obj
- list?.getOrNull(0)?.let {
- if (it is DatasetReplyMessage) {
- datasetReply = it
+ is List<*> ->
+ (obj as? List<*>?)?.getOrNull(0)?.let {
+ if (it is DatasetReplyMessage) datasetReply = it
}
- }
- } else if (obj is DatasetReplyMessage) {
- datasetReply = obj
+
+ is DatasetReplyMessage -> datasetReply = obj
}
}
}
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/comm/TidepoolCallback.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/comm/TidepoolCallback.kt
index 9b06e3367a..b39c955fb8 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/comm/TidepoolCallback.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/comm/TidepoolCallback.kt
@@ -8,7 +8,14 @@ import retrofit2.Call
import retrofit2.Callback
import retrofit2.Response
-internal class TidepoolCallback(private val aapsLogger: AAPSLogger, private val rxBus: RxBus, private val session: Session, val name: String, val onSuccess: () -> Unit, val onFail: () -> Unit) :
+internal class TidepoolCallback(
+ private val aapsLogger: AAPSLogger,
+ private val rxBus: RxBus,
+ private val session: Session,
+ private val name: String,
+ private val onSuccess: () -> Unit,
+ private val onFail: () -> Unit
+) :
Callback {
override fun onResponse(call: Call, response: Response) {
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/comm/TidepoolUploader.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/comm/TidepoolUploader.kt
index bb1e8e930f..22066019d1 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/comm/TidepoolUploader.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/comm/TidepoolUploader.kt
@@ -5,8 +5,8 @@ import android.os.PowerManager
import android.os.SystemClock
import info.nightscout.core.ui.dialogs.OKDialog
import info.nightscout.interfaces.Config
-import info.nightscout.interfaces.plugin.ActivePlugin
import info.nightscout.plugins.sync.R
+import info.nightscout.plugins.sync.nsclient.ReceiverDelegate
import info.nightscout.plugins.sync.tidepool.events.EventTidepoolStatus
import info.nightscout.plugins.sync.tidepool.messages.AuthReplyMessage
import info.nightscout.plugins.sync.tidepool.messages.AuthRequestMessage
@@ -37,11 +37,12 @@ class TidepoolUploader @Inject constructor(
private val rh: ResourceHelper,
private val sp: SP,
private val uploadChunk: UploadChunk,
- private val activePlugin: ActivePlugin,
private val dateUtil: DateUtil,
+ private val receiverDelegate: ReceiverDelegate,
private val config: Config
) {
+ private val isAllowed get() = receiverDelegate.allowed
private var wl: PowerManager.WakeLock? = null
companion object {
@@ -57,7 +58,7 @@ class TidepoolUploader @Inject constructor(
private var session: Session? = null
enum class ConnectionStatus {
- DISCONNECTED, CONNECTING, CONNECTED, FAILED
+ BLOCKED, DISCONNECTED, CONNECTING, CONNECTED, FAILED
}
var connectionStatus: ConnectionStatus = ConnectionStatus.DISCONNECTED
@@ -70,7 +71,7 @@ class TidepoolUploader @Inject constructor(
val client = OkHttpClient.Builder()
.addInterceptor(httpLoggingInterceptor)
- .addInterceptor(InfoInterceptor(TidepoolUploader::class.java.name, aapsLogger))
+ .addInterceptor(InfoInterceptor(aapsLogger))
.build()
retrofit = Retrofit.Builder()
@@ -87,7 +88,6 @@ class TidepoolUploader @Inject constructor(
return Session(AuthRequestMessage.getAuthRequestHeader(sp), SESSION_TOKEN_HEADER, service)
}
- // TODO: call on preference change
fun resetInstance() {
retrofit = null
aapsLogger.debug(LTag.TIDEPOOL, "Instance reset")
@@ -96,6 +96,11 @@ class TidepoolUploader @Inject constructor(
@Synchronized
fun doLogin(doUpload: Boolean = false) {
+ if (!isAllowed) {
+ connectionStatus = ConnectionStatus.BLOCKED
+ aapsLogger.debug(LTag.TIDEPOOL, "Blocked by connectivity settings")
+ return
+ }
if (connectionStatus == ConnectionStatus.CONNECTED || connectionStatus == ConnectionStatus.CONNECTING) {
aapsLogger.debug(LTag.TIDEPOOL, "Already connected")
return
@@ -109,12 +114,15 @@ class TidepoolUploader @Inject constructor(
rxBus.send(EventTidepoolStatus(("Connecting")))
val call = session?.service?.getLogin(authHeader)
- call?.enqueue(TidepoolCallback(aapsLogger, rxBus, session!!, "Login", {
- startSession(session!!, doUpload)
- }, {
- connectionStatus = ConnectionStatus.FAILED
- releaseWakeLock()
- }))
+ call?.enqueue(TidepoolCallback(
+ aapsLogger, rxBus, session!!, "Login",
+ {
+ startSession(session!!, doUpload)
+ }, {
+ connectionStatus = ConnectionStatus.FAILED
+ releaseWakeLock()
+ })
+ )
return
} else {
aapsLogger.debug(LTag.TIDEPOOL, "Cannot do login as user credentials have not been set correctly")
@@ -130,16 +138,14 @@ class TidepoolUploader @Inject constructor(
session.authHeader?.let {
val call = session.service?.getLogin(it)
- call?.enqueue(TidepoolCallback(aapsLogger, rxBus, session, "Login", {
- OKDialog.show(rootContext, rh.gs(R.string.tidepool), "Successfully logged into Tidepool.")
- }, {
- OKDialog.show(
- rootContext,
- rh.gs(R.string.tidepool),
- "Failed to log into Tidepool.\nCheck that your user name and password are correct."
- )
- }))
-
+ call?.enqueue(TidepoolCallback(
+ aapsLogger, rxBus, session, "Login",
+ {
+ OKDialog.show(rootContext, rh.gs(R.string.tidepool), "Successfully logged into Tidepool.")
+ }, {
+ OKDialog.show(rootContext, rh.gs(R.string.tidepool), "Failed to log into Tidepool.\nCheck that your user name and password are correct.")
+ })
+ )
}
?: OKDialog.show(rootContext, rh.gs(R.string.tidepool), "Cannot do login as user credentials have not been set correctly")
@@ -154,39 +160,41 @@ class TidepoolUploader @Inject constructor(
session.authReply!!.userid!!, "AAPS", 1
)
- datasetCall.enqueue(TidepoolCallback>(aapsLogger, rxBus, session, "Get Open Datasets", {
- if (session.datasetReply == null) {
- rxBus.send(EventTidepoolStatus(("Creating new dataset")))
- val call = session.service.openDataSet(
- session.token!!, session.authReply!!.userid!!,
- OpenDatasetRequestMessage(config, dateUtil).getBody()
- )
- call.enqueue(TidepoolCallback(aapsLogger, rxBus, session, "Open New Dataset", {
- connectionStatus = ConnectionStatus.CONNECTED
- rxBus.send(EventTidepoolStatus(("New dataset OK")))
- if (doUpload) doUpload()
- else
- releaseWakeLock()
+ datasetCall.enqueue(
+ TidepoolCallback>(
+ aapsLogger, rxBus, session, "Get Open Datasets",
+ {
+ if (session.datasetReply == null) {
+ rxBus.send(EventTidepoolStatus(("Creating new dataset")))
+ val call = session.service.openDataSet(session.token!!, session.authReply!!.userid!!, OpenDatasetRequestMessage(config, dateUtil).getBody())
+ call.enqueue(TidepoolCallback(
+ aapsLogger, rxBus, session, "Open New Dataset",
+ {
+ connectionStatus = ConnectionStatus.CONNECTED
+ rxBus.send(EventTidepoolStatus(("New dataset OK")))
+ if (doUpload) doUpload()
+ else releaseWakeLock()
+ }, {
+ rxBus.send(EventTidepoolStatus(("New dataset FAILED")))
+ connectionStatus = ConnectionStatus.FAILED
+ releaseWakeLock()
+ })
+ )
+ } else {
+ aapsLogger.debug(LTag.TIDEPOOL, "Existing Dataset: " + session.datasetReply!!.getUploadId())
+ // TODO: Wouldn't need to do this if we could block on the above `call.enqueue`.
+ // ie, do the openDataSet conditionally, and then do `doUpload` either way.
+ connectionStatus = ConnectionStatus.CONNECTED
+ rxBus.send(EventTidepoolStatus(("Appending to existing dataset")))
+ if (doUpload) doUpload()
+ else releaseWakeLock()
+ }
}, {
- rxBus.send(EventTidepoolStatus(("New dataset FAILED")))
- connectionStatus = ConnectionStatus.FAILED
- releaseWakeLock()
- }))
- } else {
- aapsLogger.debug(LTag.TIDEPOOL, "Existing Dataset: " + session.datasetReply!!.getUploadId())
- // TODO: Wouldn't need to do this if we could block on the above `call.enqueue`.
- // ie, do the openDataSet conditionally, and then do `doUpload` either way.
- connectionStatus = ConnectionStatus.CONNECTED
- rxBus.send(EventTidepoolStatus(("Appending to existing dataset")))
- if (doUpload) doUpload()
- else
+ connectionStatus = ConnectionStatus.FAILED
+ rxBus.send(EventTidepoolStatus(("Open dataset FAILED")))
releaseWakeLock()
- }
- }, {
- connectionStatus = ConnectionStatus.FAILED
- rxBus.send(EventTidepoolStatus(("Open dataset FAILED")))
- releaseWakeLock()
- }))
+ })
+ )
} else {
aapsLogger.error("Got login response but cannot determine userId - cannot proceed")
connectionStatus = ConnectionStatus.FAILED
@@ -197,6 +205,11 @@ class TidepoolUploader @Inject constructor(
@Synchronized
fun doUpload() {
+ if (!isAllowed) {
+ connectionStatus = ConnectionStatus.BLOCKED
+ aapsLogger.debug(LTag.TIDEPOOL, "Blocked by connectivity settings")
+ return
+ }
session.let { session ->
if (session == null) {
aapsLogger.error("Session is null, cannot proceed")
@@ -225,16 +238,20 @@ class TidepoolUploader @Inject constructor(
rxBus.send(EventTidepoolStatus(("Uploading")))
if (session.service != null && session.token != null && session.datasetReply != null) {
val call = session.service.doUpload(session.token!!, session.datasetReply!!.getUploadId()!!, body)
- call.enqueue(TidepoolCallback(aapsLogger, rxBus, session, "Data Upload", {
- uploadChunk.setLastEnd(session.end)
- rxBus.send(EventTidepoolStatus(("Upload completed OK")))
- releaseWakeLock()
- uploadNext()
- }, {
- connectionStatus = ConnectionStatus.FAILED
- rxBus.send(EventTidepoolStatus(("Upload FAILED")))
- releaseWakeLock()
- }))
+ call.enqueue(TidepoolCallback(
+ aapsLogger, rxBus, session, "Data Upload",
+ {
+ uploadChunk.setLastEnd(session.end)
+ connectionStatus = ConnectionStatus.CONNECTED
+ rxBus.send(EventTidepoolStatus(("Upload completed OK")))
+ releaseWakeLock()
+ uploadNext()
+ }, {
+ connectionStatus = ConnectionStatus.DISCONNECTED
+ rxBus.send(EventTidepoolStatus(("Upload FAILED")))
+ releaseWakeLock()
+ })
+ )
}
}
}
@@ -242,7 +259,12 @@ class TidepoolUploader @Inject constructor(
}
private fun uploadNext() {
- if (uploadChunk.getLastEnd() < dateUtil.now() - T.mins(1).msecs()) {
+ if (!isAllowed) {
+ connectionStatus = ConnectionStatus.BLOCKED
+ aapsLogger.debug(LTag.TIDEPOOL, "Blocked by connectivity settings")
+ return
+ }
+ if (uploadChunk.getLastEnd() < dateUtil.now() - T.hours(3).msecs() - T.mins(1).msecs()) {
SystemClock.sleep(3000)
aapsLogger.debug(LTag.TIDEPOOL, "Restarting doUpload. Last: " + dateUtil.dateAndTimeString(uploadChunk.getLastEnd()))
doUpload()
@@ -253,15 +275,18 @@ class TidepoolUploader @Inject constructor(
if (session?.datasetReply?.id != null) {
extendWakeLock(60000)
val call = session!!.service?.deleteDataSet(session!!.token!!, session!!.datasetReply!!.id!!)
- call?.enqueue(TidepoolCallback(aapsLogger, rxBus, session!!, "Delete Dataset", {
- connectionStatus = ConnectionStatus.DISCONNECTED
- rxBus.send(EventTidepoolStatus(("Dataset removed OK")))
- releaseWakeLock()
- }, {
- connectionStatus = ConnectionStatus.DISCONNECTED
- rxBus.send(EventTidepoolStatus(("Dataset remove FAILED")))
- releaseWakeLock()
- }))
+ call?.enqueue(TidepoolCallback(
+ aapsLogger, rxBus, session!!, "Delete Dataset",
+ {
+ connectionStatus = ConnectionStatus.DISCONNECTED
+ rxBus.send(EventTidepoolStatus(("Dataset removed OK")))
+ releaseWakeLock()
+ }, {
+ connectionStatus = ConnectionStatus.DISCONNECTED
+ rxBus.send(EventTidepoolStatus(("Dataset remove FAILED")))
+ releaseWakeLock()
+ })
+ )
} else {
aapsLogger.error("Got login response but cannot determine datasetId - cannot proceed")
}
@@ -278,15 +303,19 @@ class TidepoolUploader @Inject constructor(
requireNotNull(userId)
extendWakeLock(60000)
val call = session.service?.deleteAllData(token, userId)
- call?.enqueue(TidepoolCallback(aapsLogger, rxBus, session, "Delete all data", {
- connectionStatus = ConnectionStatus.DISCONNECTED
- rxBus.send(EventTidepoolStatus(("All data removed OK")))
- releaseWakeLock()
- }, {
- connectionStatus = ConnectionStatus.DISCONNECTED
- rxBus.send(EventTidepoolStatus(("All data remove FAILED")))
- releaseWakeLock()
- }))
+ call?.enqueue(
+ TidepoolCallback(
+ aapsLogger, rxBus, session, "Delete all data",
+ {
+ connectionStatus = ConnectionStatus.DISCONNECTED
+ rxBus.send(EventTidepoolStatus(("All data removed OK")))
+ releaseWakeLock()
+ }, {
+ connectionStatus = ConnectionStatus.DISCONNECTED
+ rxBus.send(EventTidepoolStatus(("All data remove FAILED")))
+ releaseWakeLock()
+ })
+ )
} catch (e: IllegalArgumentException) {
aapsLogger.error("Got login response but cannot determine userId - cannot proceed")
}
@@ -307,13 +336,12 @@ class TidepoolUploader @Inject constructor(
@Synchronized
private fun releaseWakeLock() {
wl?.let {
- if (it.isHeld) {
+ if (it.isHeld)
try {
it.release()
} catch (e: Exception) {
aapsLogger.error("Error releasing wakelock: $e")
}
- }
}
}
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/comm/UploadChunk.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/comm/UploadChunk.kt
index dc962f0f83..069c78a2f2 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/comm/UploadChunk.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/comm/UploadChunk.kt
@@ -41,21 +41,21 @@ class UploadChunk @Inject constructor(
private val maxUploadSize = T.days(7).msecs() // don't change this
fun getNext(session: Session?): String? {
- if (session == null)
- return null
+ session ?: return null
session.start = getLastEnd()
- session.end = min(session.start + maxUploadSize, dateUtil.now())
+ // do not upload last 3h, TBR can be still running
+ session.end = min(session.start + maxUploadSize, dateUtil.now() - T.hours(3).msecs())
val result = get(session.start, session.end)
if (result.length < 3) {
aapsLogger.debug(LTag.TIDEPOOL, "No records in this time period, setting start to best end time")
- setLastEnd(max(session.end, getOldestRecordTimeStamp()))
+ setLastEnd(session.end)
}
return result
}
- operator fun get(start: Long, end: Long): String {
+ fun get(start: Long, end: Long): String {
aapsLogger.debug(LTag.TIDEPOOL, "Syncing data between: " + dateUtil.dateAndTimeString(start) + " -> " + dateUtil.dateAndTimeString(end))
if (end <= start) {
@@ -69,16 +69,11 @@ class UploadChunk @Inject constructor(
val records = LinkedList()
- if (sp.getBoolean(R.string.key_tidepool_upload_bolus, true))
- records.addAll(getTreatments(start, end))
- if (sp.getBoolean(R.string.key_tidepool_upload_bg, true))
- records.addAll(getBloodTests(start, end))
- if (sp.getBoolean(R.string.key_tidepool_upload_tbr, true))
- records.addAll(getBasals(start, end))
- if (sp.getBoolean(R.string.key_tidepool_upload_cgm, true))
- records.addAll(getBgReadings(start, end))
- if (sp.getBoolean(R.string.key_tidepool_upload_profile, true))
- records.addAll(getProfiles(start, end))
+ records.addAll(getTreatments(start, end))
+ records.addAll(getBloodTests(start, end))
+ records.addAll(getBasals(start, end))
+ records.addAll(getBgReadings(start, end))
+ records.addAll(getProfiles(start, end))
return GsonInstance.defaultGsonInstance().toJson(records)
}
@@ -99,21 +94,6 @@ class UploadChunk @Inject constructor(
}
}
- // numeric limits must match max time windows
-
- private fun getOldestRecordTimeStamp(): Long {
- // TODO we could make sure we include records older than the first bg record for completeness
-
- val start: Long = 0
- val end = dateUtil.now()
-
- val bgReadingList = repository.compatGetBgReadingsDataFromTime(start, end, true)
- .blockingGet()
- return if (bgReadingList.isNotEmpty())
- bgReadingList[0].timestamp
- else -1
- }
-
private fun getTreatments(start: Long, end: Long): List {
val result = LinkedList()
repository.getBolusesDataFromTimeToTime(start, end, true)
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/elements/BasalElement.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/elements/BasalElement.kt
index 154b4472f3..3b9b593a7c 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/elements/BasalElement.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/elements/BasalElement.kt
@@ -7,7 +7,7 @@ import info.nightscout.interfaces.profile.Profile
import info.nightscout.shared.utils.DateUtil
import java.util.UUID
-class BasalElement(tbr: TemporaryBasal, private val profile: Profile, dateUtil: DateUtil)
+class BasalElement(tbr: TemporaryBasal, profile: Profile, dateUtil: DateUtil)
: BaseElement(tbr.timestamp, UUID.nameUUIDFromBytes(("AAPS-basal" + tbr.timestamp).toByteArray()).toString(), dateUtil) {
internal var timestamp: Long = 0 // not exposed
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/elements/ProfileElement.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/elements/ProfileElement.kt
index 297bee3ca5..ea6ed877fb 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/elements/ProfileElement.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/elements/ProfileElement.kt
@@ -35,14 +35,21 @@ class ProfileElement(ps: EffectiveProfileSwitch, serialNumber: String, dateUtil:
init {
type = "pumpSettings"
val profile: Profile = ProfileSealed.EPS(ps)
- for (br in profile.getBasalValues())
- basalSchedules.Normal.add(BasalRate(br.timeAsSeconds * 1000, br.value))
- for (target in profile.getSingleTargetsMgdl())
- bgTargets.Normal.add(Target(target.timeAsSeconds * 1000, target.value.toInt()))
- for (ic in profile.getIcsValues())
- carbRatios.Normal.add(Ratio(ic.timeAsSeconds * 1000, ic.value.toInt()))
- for (isf in profile.getIsfsMgdlValues())
- insulinSensitivities.Normal.add(Ratio(isf.timeAsSeconds * 1000, isf.value.toInt()))
+ // for (br in profile.getBasalValues())
+ // basalSchedules.Normal.add(BasalRate(br.timeAsSeconds * 1000, br.value))
+ // for (target in profile.getSingleTargetsMgdl())
+ // bgTargets.Normal.add(Target(target.timeAsSeconds * 1000, target.value.toInt()))
+ // for (ic in profile.getIcsValues())
+ // carbRatios.Normal.add(Ratio(ic.timeAsSeconds * 1000, ic.value.toInt()))
+ // for (isf in profile.getIsfsMgdlValues())
+ // insulinSensitivities.Normal.add(Ratio(isf.timeAsSeconds * 1000, isf.value.toInt()))
+ for (hour in 0..23) {
+ val seconds = hour * 3600
+ basalSchedules.Normal.add(BasalRate(seconds * 1000, profile.getBasalTimeFromMidnight(seconds)))
+ bgTargets.Normal.add(Target(seconds * 1000, Profile.toMgdl((((profile.getTargetLowMgdlTimeFromMidnight(seconds) + profile.getTargetLowMgdlTimeFromMidnight(seconds))) / 2)).toInt()))
+ carbRatios.Normal.add(Ratio(seconds * 1000, profile.getIcTimeFromMidnight(seconds).toInt()))
+ insulinSensitivities.Normal.add(Ratio(seconds * 1000, profile.getIsfMgdlTimeFromMidnight(seconds).toInt()))
+ }
}
inner class BasalProfile internal constructor(
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/utils/RateLimit.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/utils/RateLimit.kt
index a819ded98e..1367ceed31 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/utils/RateLimit.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/utils/RateLimit.kt
@@ -1,7 +1,6 @@
package info.nightscout.plugins.sync.tidepool.utils
import info.nightscout.rx.logging.AAPSLogger
-import info.nightscout.rx.logging.LTag
import info.nightscout.shared.utils.DateUtil
import info.nightscout.shared.utils.T
import javax.inject.Inject
@@ -21,7 +20,7 @@ class RateLimit @Inject constructor(
// check if over limit
rateLimits[name]?.let {
if (dateUtil.now() - it < T.secs(seconds.toLong()).msecs()) {
- aapsLogger.debug(LTag.TIDEPOOL, "$name rate limited: $seconds seconds")
+ //aapsLogger.debug(LTag.TIDEPOOL, "$name rate limited: $seconds seconds")
return false
}
}
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/DataSyncSelectorXdripImpl.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/DataSyncSelectorXdripImpl.kt
new file mode 100644
index 0000000000..5bc3ceadce
--- /dev/null
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/DataSyncSelectorXdripImpl.kt
@@ -0,0 +1,552 @@
+package info.nightscout.plugins.sync.xdrip
+
+import dagger.Lazy
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.interfaces.XDripBroadcast
+import info.nightscout.interfaces.plugin.ActivePlugin
+import info.nightscout.interfaces.profile.ProfileFunction
+import info.nightscout.interfaces.sync.DataSyncSelector
+import info.nightscout.interfaces.sync.DataSyncSelectorXdrip
+import info.nightscout.interfaces.utils.JsonHelper
+import info.nightscout.plugins.sync.R
+import info.nightscout.rx.logging.AAPSLogger
+import info.nightscout.rx.logging.LTag
+import info.nightscout.shared.sharedPreferences.SP
+import info.nightscout.shared.utils.DateUtil
+import info.nightscout.shared.utils.T
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class DataSyncSelectorXdripImpl @Inject constructor(
+ private val sp: SP,
+ private val aapsLogger: AAPSLogger,
+ private val dateUtil: DateUtil,
+ private val profileFunction: ProfileFunction,
+ private val activePlugin: ActivePlugin,
+ private val xdripBroadcast: Lazy,
+ private val appRepository: AppRepository
+) : DataSyncSelectorXdrip {
+
+ class QueueCounter(
+ var bolusesRemaining: Long = -1L,
+ var carbsRemaining: Long = -1L,
+ var bcrRemaining: Long = -1L,
+ var ttsRemaining: Long = -1L,
+ var foodsRemaining: Long = -1L,
+ var gvsRemaining: Long = -1L,
+ var tesRemaining: Long = -1L,
+ var dssRemaining: Long = -1L,
+ var tbrsRemaining: Long = -1L,
+ var ebsRemaining: Long = -1L,
+ var pssRemaining: Long = -1L,
+ var epssRemaining: Long = -1L,
+ var oesRemaining: Long = -1L
+ ) {
+
+ fun size(): Long =
+ bolusesRemaining +
+ carbsRemaining +
+ bcrRemaining +
+ ttsRemaining +
+ foodsRemaining +
+ gvsRemaining +
+ tesRemaining +
+ dssRemaining +
+ tbrsRemaining +
+ ebsRemaining +
+ pssRemaining +
+ epssRemaining +
+ oesRemaining
+ }
+
+ private val queueCounter = QueueCounter()
+ private val isEnabled get() = sp.getBoolean(info.nightscout.core.utils.R.string.key_xdrip_local_broadcasts, false)
+ private val xdripPlugin get() = xdripBroadcast.get()
+
+ private val maxAge get() = T.days(1).msecs()
+ private fun isOld(timestamp: Long) = timestamp < dateUtil.now() - maxAge
+ private val preparedEntries = mutableListOf()
+ private val preparedTreatments = mutableListOf()
+ private val preparedFoods = mutableListOf()
+
+ override fun queueSize(): Long = queueCounter.size()
+
+ override suspend fun doUpload() {
+ if (isEnabled) {
+ processChangedGlucoseValues()
+ processChangedBoluses()
+ processChangedCarbs()
+ // not supported at the moment
+ //processChangedBolusCalculatorResults()
+ // not supported at the moment
+ //processChangedTemporaryBasals()
+ processChangedExtendedBoluses()
+ processChangedProfileSwitches()
+ // not supported at the moment
+ //processChangedEffectiveProfileSwitches()
+ processChangedTempTargets()
+ // not supported at the moment
+ //processChangedFoods()
+ processChangedTherapyEvents()
+ // not supported at the moment
+ //processChangedDeviceStatuses()
+ // not supported at the moment
+ //processChangedOfflineEvents()
+ // not supported at the moment
+ //processChangedProfileStore()
+ }
+ }
+
+ override fun resetToNextFullSync() {
+ sp.remove(R.string.key_xdrip_glucose_value_last_synced_id)
+ sp.remove(R.string.key_xdrip_temporary_basal_last_synced_id)
+ sp.remove(R.string.key_xdrip_temporary_target_last_synced_id)
+ sp.remove(R.string.key_xdrip_extended_bolus_last_synced_id)
+ sp.remove(R.string.key_xdrip_food_last_synced_id)
+ sp.remove(R.string.key_xdrip_bolus_last_synced_id)
+ sp.remove(R.string.key_xdrip_carbs_last_synced_id)
+ sp.remove(R.string.key_xdrip_bolus_calculator_result_last_synced_id)
+ sp.remove(R.string.key_xdrip_therapy_event_last_synced_id)
+ sp.remove(R.string.key_xdrip_profile_switch_last_synced_id)
+ sp.remove(R.string.key_xdrip_effective_profile_switch_last_synced_id)
+ sp.remove(R.string.key_xdrip_offline_event_last_synced_id)
+ sp.remove(R.string.key_xdrip_profile_store_last_synced_timestamp)
+
+ val lastDeviceStatusDbId = appRepository.getLastDeviceStatusId()
+ if (lastDeviceStatusDbId != null) sp.putLong(R.string.key_xdrip_device_status_last_synced_id, lastDeviceStatusDbId)
+ else sp.remove(R.string.key_xdrip_device_status_last_synced_id)
+ }
+
+ fun confirmLastGlucoseValueIdIfGreater(lastSynced: Long) {
+ if (lastSynced > sp.getLong(R.string.key_xdrip_glucose_value_last_synced_id, 0)) {
+ //aapsLogger.debug(LTag.XDRIP, "Setting GlucoseValue data sync from $lastSynced")
+ sp.putLong(R.string.key_xdrip_glucose_value_last_synced_id, lastSynced)
+ }
+ }
+
+ private fun processChangedGlucoseValues() {
+ var progress: String
+ val lastDbId = appRepository.getLastGlucoseValueId() ?: 0L
+ while (true) {
+ if (!isEnabled) return
+ var startId = sp.getLong(R.string.key_xdrip_glucose_value_last_synced_id, 0)
+ if (startId > lastDbId) {
+ sp.putLong(R.string.key_xdrip_glucose_value_last_synced_id, 0)
+ startId = 0
+ }
+ queueCounter.gvsRemaining = lastDbId - startId
+ progress = "$startId/$lastDbId"
+ appRepository.getNextSyncElementGlucoseValue(startId).blockingGet()?.let { gv ->
+ aapsLogger.info(LTag.XDRIP, "Loading GlucoseValue data Start: $startId ${gv.first} forID: ${gv.second.id} ")
+ if (!isOld(gv.first.timestamp))
+ preparedEntries.add(DataSyncSelector.PairGlucoseValue(gv.first, gv.second.id))
+ sendEntries(force = false, progress)
+ confirmLastGlucoseValueIdIfGreater(gv.second.id)
+ } ?: break
+ }
+ sendEntries(force = true, progress)
+ }
+
+ private fun sendEntries(force: Boolean, progress: String) {
+ if (preparedEntries.isNotEmpty() && (preparedEntries.size >= 100 || force)) {
+ xdripPlugin.sendToXdrip("entries", preparedEntries, progress)
+ preparedEntries.clear()
+ }
+ }
+
+ private fun sendTreatments(force: Boolean, progress: String) {
+ if (preparedTreatments.isNotEmpty() && (preparedTreatments.size >= 100 || force)) {
+ xdripPlugin.sendToXdrip("treatments", preparedTreatments, progress)
+ preparedTreatments.clear()
+ }
+ }
+
+ private fun sendFoods(force: Boolean, progress: String) {
+ if (preparedFoods.isNotEmpty() && (preparedFoods.size >= 100 || force)) {
+ xdripPlugin.sendToXdrip("food", preparedFoods, progress)
+ preparedFoods.clear()
+ }
+ }
+
+ fun confirmLastBolusIdIfGreater(lastSynced: Long) {
+ if (lastSynced > sp.getLong(R.string.key_xdrip_bolus_last_synced_id, 0)) {
+ //aapsLogger.debug(LTag.XDRIP, "Setting Bolus data sync from $lastSynced")
+ sp.putLong(R.string.key_xdrip_bolus_last_synced_id, lastSynced)
+ }
+ }
+
+ private fun processChangedBoluses() {
+ var progress: String
+ val lastDbId = appRepository.getLastBolusId() ?: 0L
+ while (true) {
+ if (!isEnabled) return
+ var startId = sp.getLong(R.string.key_xdrip_bolus_last_synced_id, 0)
+ if (startId > lastDbId) {
+ sp.putLong(R.string.key_xdrip_bolus_last_synced_id, 0)
+ startId = 0
+ }
+ queueCounter.bolusesRemaining = lastDbId - startId
+ progress = "$startId/$lastDbId"
+ appRepository.getNextSyncElementBolus(startId).blockingGet()?.let { bolus ->
+ aapsLogger.info(LTag.XDRIP, "Loading Bolus data Start: $startId ${bolus.first} forID: ${bolus.second.id} ")
+ if (!isOld(bolus.first.timestamp))
+ preparedTreatments.add(DataSyncSelector.PairBolus(bolus.first, bolus.second.id))
+ sendTreatments(force = false, progress)
+ confirmLastBolusIdIfGreater(bolus.second.id)
+ } ?: break
+ }
+ sendTreatments(force = true, progress)
+ }
+
+ fun confirmLastCarbsIdIfGreater(lastSynced: Long) {
+ if (lastSynced > sp.getLong(R.string.key_xdrip_carbs_last_synced_id, 0)) {
+ //aapsLogger.debug(LTag.XDRIP, "Setting Carbs data sync from $lastSynced")
+ sp.putLong(R.string.key_xdrip_carbs_last_synced_id, lastSynced)
+ }
+ }
+
+ private fun processChangedCarbs() {
+ var progress: String
+ val lastDbId = appRepository.getLastCarbsId() ?: 0L
+ while (true) {
+ if (!isEnabled) return
+ var startId = sp.getLong(R.string.key_xdrip_carbs_last_synced_id, 0)
+ if (startId > lastDbId) {
+ sp.putLong(R.string.key_xdrip_carbs_last_synced_id, 0)
+ startId = 0
+ }
+ queueCounter.carbsRemaining = lastDbId - startId
+ progress = "$startId/$lastDbId"
+ appRepository.getNextSyncElementCarbs(startId).blockingGet()?.let { carb ->
+ aapsLogger.info(LTag.XDRIP, "Loading Carbs data Start: $startId ${carb.first} forID: ${carb.second.id} ")
+ if (!isOld(carb.first.timestamp))
+ preparedTreatments.add(DataSyncSelector.PairCarbs(carb.first, carb.second.id))
+ sendTreatments(force = false, progress)
+ confirmLastCarbsIdIfGreater(carb.second.id)
+ } ?: break
+ }
+ sendTreatments(force = true, progress)
+ }
+
+ fun confirmLastBolusCalculatorResultsIdIfGreater(lastSynced: Long) {
+ if (lastSynced > sp.getLong(R.string.key_xdrip_bolus_calculator_result_last_synced_id, 0)) {
+ //aapsLogger.debug(LTag.XDRIP, "Setting BolusCalculatorResult data sync from $lastSynced")
+ sp.putLong(R.string.key_xdrip_bolus_calculator_result_last_synced_id, lastSynced)
+ }
+ }
+
+ private fun processChangedBolusCalculatorResults() {
+ var progress: String
+ val lastDbId = appRepository.getLastBolusCalculatorResultId() ?: 0L
+ while (true) {
+ if (!isEnabled) return
+ var startId = sp.getLong(R.string.key_xdrip_bolus_calculator_result_last_synced_id, 0)
+ if (startId > lastDbId) {
+ sp.putLong(R.string.key_xdrip_bolus_calculator_result_last_synced_id, 0)
+ startId = 0
+ }
+ queueCounter.bcrRemaining = lastDbId - startId
+ progress = "$startId/$lastDbId"
+ appRepository.getNextSyncElementBolusCalculatorResult(startId).blockingGet()?.let { bolusCalculatorResult ->
+ aapsLogger.info(LTag.XDRIP, "Loading BolusCalculatorResult data Start: $startId ${bolusCalculatorResult.first} forID: ${bolusCalculatorResult.second.id} ")
+ if (!isOld(bolusCalculatorResult.first.timestamp))
+ preparedTreatments.add(DataSyncSelector.PairBolusCalculatorResult(bolusCalculatorResult.first, bolusCalculatorResult.second.id))
+ sendTreatments(force = false, progress)
+ confirmLastBolusCalculatorResultsIdIfGreater(bolusCalculatorResult.second.id)
+ } ?: break
+ }
+ sendTreatments(force = true, progress)
+ }
+
+ fun confirmLastTempTargetsIdIfGreater(lastSynced: Long) {
+ if (lastSynced > sp.getLong(R.string.key_xdrip_temporary_target_last_synced_id, 0)) {
+ //aapsLogger.debug(LTag.XDRIP, "Setting TemporaryTarget data sync from $lastSynced")
+ sp.putLong(R.string.key_xdrip_temporary_target_last_synced_id, lastSynced)
+ }
+ }
+
+ private fun processChangedTempTargets() {
+ var progress: String
+ val lastDbId = appRepository.getLastTempTargetId() ?: 0L
+ while (true) {
+ if (!isEnabled) return
+ var startId = sp.getLong(R.string.key_xdrip_temporary_target_last_synced_id, 0)
+ if (startId > lastDbId) {
+ sp.putLong(R.string.key_xdrip_temporary_target_last_synced_id, 0)
+ startId = 0
+ }
+ queueCounter.ttsRemaining = lastDbId - startId
+ progress = "$startId/$lastDbId"
+ appRepository.getNextSyncElementTemporaryTarget(startId).blockingGet()?.let { tt ->
+ aapsLogger.info(LTag.XDRIP, "Loading TemporaryTarget data Start: $startId ${tt.first} forID: ${tt.second.id} ")
+ if (!isOld(tt.first.timestamp))
+ preparedTreatments.add(DataSyncSelector.PairTemporaryTarget(tt.first, tt.second.id))
+ sendTreatments(force = false, progress)
+ confirmLastTempTargetsIdIfGreater(tt.second.id)
+ } ?: break
+ }
+ sendTreatments(force = true, progress)
+ }
+
+ fun confirmLastFoodIdIfGreater(lastSynced: Long) {
+ if (lastSynced > sp.getLong(R.string.key_xdrip_food_last_synced_id, 0)) {
+ //aapsLogger.debug(LTag.XDRIP, "Setting Food data sync from $lastSynced")
+ sp.putLong(R.string.key_xdrip_food_last_synced_id, lastSynced)
+ }
+ }
+
+ private fun processChangedFoods() {
+ var progress: String
+ val lastDbId = appRepository.getLastFoodId() ?: 0L
+ while (true) {
+ if (!isEnabled) return
+ var startId = sp.getLong(R.string.key_xdrip_food_last_synced_id, 0)
+ if (startId > lastDbId) {
+ sp.putLong(R.string.key_xdrip_food_last_synced_id, 0)
+ startId = 0
+ }
+ queueCounter.foodsRemaining = lastDbId - startId
+ progress = "$startId/$lastDbId"
+ appRepository.getNextSyncElementFood(startId).blockingGet()?.let { food ->
+ aapsLogger.info(LTag.XDRIP, "Loading Food data Start: $startId ${food.first} forID: ${food.second.id} ")
+ preparedFoods.add(DataSyncSelector.PairFood(food.first, food.second.id))
+ sendFoods(force = false, progress)
+ confirmLastFoodIdIfGreater(food.second.id)
+ } ?: break
+ }
+ sendFoods(force = true, progress)
+ }
+
+ fun confirmLastTherapyEventIdIfGreater(lastSynced: Long) {
+ if (lastSynced > sp.getLong(R.string.key_xdrip_therapy_event_last_synced_id, 0)) {
+ //aapsLogger.debug(LTag.XDRIP, "Setting TherapyEvents data sync from $lastSynced")
+ sp.putLong(R.string.key_xdrip_therapy_event_last_synced_id, lastSynced)
+ }
+ }
+
+ private fun processChangedTherapyEvents() {
+ var progress: String
+ val lastDbId = appRepository.getLastTherapyEventId() ?: 0L
+ while (true) {
+ if (!isEnabled) return
+ var startId = sp.getLong(R.string.key_xdrip_therapy_event_last_synced_id, 0)
+ if (startId > lastDbId) {
+ sp.putLong(R.string.key_xdrip_therapy_event_last_synced_id, 0)
+ startId = 0
+ }
+ queueCounter.tesRemaining = lastDbId - startId
+ progress = "$startId/$lastDbId"
+ appRepository.getNextSyncElementTherapyEvent(startId).blockingGet()?.let { te ->
+ aapsLogger.info(LTag.XDRIP, "Loading TherapyEvents data Start: $startId ${te.first} forID: ${te.second.id} ")
+ if (!isOld(te.first.timestamp))
+ preparedTreatments.add(DataSyncSelector.PairTherapyEvent(te.first, te.second.id))
+ sendTreatments(force = false, progress)
+ confirmLastTherapyEventIdIfGreater(te.second.id)
+ } ?: break
+ }
+ sendTreatments(force = true, progress)
+ }
+
+ fun confirmLastDeviceStatusIdIfGreater(lastSynced: Long) {
+ if (lastSynced > sp.getLong(R.string.key_xdrip_device_status_last_synced_id, 0)) {
+ //aapsLogger.debug(LTag.XDRIP, "Setting DeviceStatus data sync from $lastSynced")
+ sp.putLong(R.string.key_xdrip_device_status_last_synced_id, lastSynced)
+ }
+ }
+
+ private fun processChangedDeviceStatuses() {
+ val lastDbId = appRepository.getLastDeviceStatusId() ?: 0L
+ while (true) {
+ if (!isEnabled) return
+ var startId = sp.getLong(R.string.key_xdrip_device_status_last_synced_id, 0)
+ if (startId > lastDbId) {
+ sp.putLong(R.string.key_xdrip_device_status_last_synced_id, 0)
+ startId = 0
+ }
+ queueCounter.dssRemaining = lastDbId - startId
+ appRepository.getNextSyncElementDeviceStatus(startId).blockingGet()?.let { deviceStatus ->
+ aapsLogger.info(LTag.XDRIP, "Loading DeviceStatus data Start: $startId $deviceStatus")
+ if (!isOld(deviceStatus.timestamp))
+ xdripPlugin.sendToXdrip("devicestatus", DataSyncSelector.PairDeviceStatus(deviceStatus, lastDbId), "$startId/$lastDbId")
+ confirmLastDeviceStatusIdIfGreater(lastDbId)
+ } ?: break
+ }
+ }
+
+ fun confirmLastTemporaryBasalIdIfGreater(lastSynced: Long) {
+ if (lastSynced > sp.getLong(R.string.key_xdrip_temporary_basal_last_synced_id, 0)) {
+ //aapsLogger.debug(LTag.XDRIP, "Setting TemporaryBasal data sync from $lastSynced")
+ sp.putLong(R.string.key_xdrip_temporary_basal_last_synced_id, lastSynced)
+ }
+ }
+
+ private fun processChangedTemporaryBasals() {
+ var progress: String
+ val lastDbId = appRepository.getLastTemporaryBasalId() ?: 0L
+ while (true) {
+ if (!isEnabled) return
+ var startId = sp.getLong(R.string.key_xdrip_temporary_basal_last_synced_id, 0)
+ if (startId > lastDbId) {
+ sp.putLong(R.string.key_xdrip_temporary_basal_last_synced_id, 0)
+ startId = 0
+ }
+ queueCounter.tbrsRemaining = lastDbId - startId
+ progress = "$startId/$lastDbId"
+ appRepository.getNextSyncElementTemporaryBasal(startId).blockingGet()?.let { tb ->
+ aapsLogger.info(LTag.XDRIP, "Loading TemporaryBasal data Start: $startId ${tb.first} forID: ${tb.second.id} ")
+ if (!isOld(tb.first.timestamp))
+ preparedTreatments.add(DataSyncSelector.PairTemporaryBasal(tb.first, tb.second.id))
+ sendTreatments(force = false, progress)
+ confirmLastTemporaryBasalIdIfGreater(tb.second.id)
+ } ?: break
+ }
+ sendTreatments(force = true, progress)
+ }
+
+ fun confirmLastExtendedBolusIdIfGreater(lastSynced: Long) {
+ if (lastSynced > sp.getLong(R.string.key_xdrip_extended_bolus_last_synced_id, 0)) {
+ //aapsLogger.debug(LTag.XDRIP, "Setting ExtendedBolus data sync from $lastSynced")
+ sp.putLong(R.string.key_xdrip_extended_bolus_last_synced_id, lastSynced)
+ }
+ }
+
+ private fun processChangedExtendedBoluses() {
+ var progress: String
+ val lastDbId = appRepository.getLastExtendedBolusId() ?: 0L
+ while (true) {
+ if (!isEnabled) return
+ var startId = sp.getLong(R.string.key_xdrip_extended_bolus_last_synced_id, 0)
+ if (startId > lastDbId) {
+ sp.putLong(R.string.key_xdrip_extended_bolus_last_synced_id, 0)
+ startId = 0
+ }
+ queueCounter.ebsRemaining = lastDbId - startId
+ progress = "$startId/$lastDbId"
+ appRepository.getNextSyncElementExtendedBolus(startId).blockingGet()?.let { eb ->
+ aapsLogger.info(LTag.XDRIP, "Loading ExtendedBolus data Start: $startId ${eb.first} forID: ${eb.second.id} ")
+ val profile = profileFunction.getProfile(eb.first.timestamp)
+ if (profile != null && !isOld(eb.first.timestamp)) {
+ preparedTreatments.add(DataSyncSelector.PairExtendedBolus(eb.first, eb.second.id))
+ sendTreatments(force = false, progress)
+ } else
+ aapsLogger.info(LTag.XDRIP, "Ignoring ExtendedBolus. No profile: ${eb.second.id} ")
+ confirmLastExtendedBolusIdIfGreater(eb.second.id)
+ } ?: break
+ }
+ sendTreatments(force = true, progress)
+ }
+
+ fun confirmLastProfileSwitchIdIfGreater(lastSynced: Long) {
+ if (lastSynced > sp.getLong(R.string.key_xdrip_profile_switch_last_synced_id, 0)) {
+ //aapsLogger.debug(LTag.XDRIP, "Setting ProfileSwitch data sync from $lastSynced")
+ sp.putLong(R.string.key_xdrip_profile_switch_last_synced_id, lastSynced)
+ }
+ }
+
+ private fun processChangedProfileSwitches() {
+ var progress: String
+ val lastDbId = appRepository.getLastProfileSwitchId() ?: 0L
+ while (true) {
+ if (!isEnabled) return
+ var startId = sp.getLong(R.string.key_xdrip_profile_switch_last_synced_id, 0)
+ if (startId > lastDbId) {
+ sp.putLong(R.string.key_xdrip_profile_switch_last_synced_id, 0)
+ startId = 0
+ }
+ queueCounter.pssRemaining = lastDbId - startId
+ progress = "$startId/$lastDbId"
+ appRepository.getNextSyncElementProfileSwitch(startId).blockingGet()?.let { ps ->
+ aapsLogger.info(LTag.XDRIP, "Loading ProfileSwitch data Start: $startId ${ps.first} forID: ${ps.second.id} ")
+ if (!isOld(ps.first.timestamp))
+ preparedTreatments.add(DataSyncSelector.PairProfileSwitch(ps.first, ps.second.id))
+ sendTreatments(force = false, progress)
+ confirmLastProfileSwitchIdIfGreater(ps.second.id)
+ } ?: break
+ }
+ sendTreatments(force = true, progress)
+ }
+
+ fun confirmLastEffectiveProfileSwitchIdIfGreater(lastSynced: Long) {
+ if (lastSynced > sp.getLong(R.string.key_xdrip_effective_profile_switch_last_synced_id, 0)) {
+ //aapsLogger.debug(LTag.XDRIP, "Setting EffectiveProfileSwitch data sync from $lastSynced")
+ sp.putLong(R.string.key_xdrip_effective_profile_switch_last_synced_id, lastSynced)
+ }
+ }
+
+ private fun processChangedEffectiveProfileSwitches() {
+ var progress: String
+ val lastDbId = appRepository.getLastEffectiveProfileSwitchId() ?: 0L
+ while (true) {
+ if (!isEnabled) return
+ var startId = sp.getLong(R.string.key_xdrip_effective_profile_switch_last_synced_id, 0)
+ if (startId > lastDbId) {
+ sp.putLong(R.string.key_xdrip_effective_profile_switch_last_synced_id, 0)
+ startId = 0
+ }
+ queueCounter.epssRemaining = lastDbId - startId
+ progress = "$startId/$lastDbId"
+ appRepository.getNextSyncElementEffectiveProfileSwitch(startId).blockingGet()?.let { ps ->
+ aapsLogger.info(LTag.XDRIP, "Loading EffectiveProfileSwitch data Start: $startId ${ps.first} forID: ${ps.second.id} ")
+ if (!isOld(ps.first.timestamp))
+ preparedTreatments.add(DataSyncSelector.PairEffectiveProfileSwitch(ps.first, ps.second.id))
+ sendTreatments(force = false, progress)
+ confirmLastEffectiveProfileSwitchIdIfGreater(ps.second.id)
+ } ?: break
+ }
+ sendTreatments(force = true, progress)
+ }
+
+ fun confirmLastOfflineEventIdIfGreater(lastSynced: Long) {
+ if (lastSynced > sp.getLong(R.string.key_xdrip_offline_event_last_synced_id, 0)) {
+ //aapsLogger.debug(LTag.XDRIP, "Setting OfflineEvent data sync from $lastSynced")
+ sp.putLong(R.string.key_xdrip_offline_event_last_synced_id, lastSynced)
+ }
+ }
+
+ private fun processChangedOfflineEvents() {
+ var progress: String
+ val lastDbId = appRepository.getLastOfflineEventId() ?: 0L
+ while (true) {
+ if (!isEnabled) return
+ var startId = sp.getLong(R.string.key_xdrip_offline_event_last_synced_id, 0)
+ if (startId > lastDbId) {
+ sp.putLong(R.string.key_xdrip_offline_event_last_synced_id, 0)
+ startId = 0
+ }
+ queueCounter.oesRemaining = lastDbId - startId
+ progress = "$startId/$lastDbId"
+ appRepository.getNextSyncElementOfflineEvent(startId).blockingGet()?.let { oe ->
+ aapsLogger.info(LTag.XDRIP, "Loading OfflineEvent data Start: $startId ${oe.first} forID: ${oe.second.id} ")
+ if (!isOld(oe.first.timestamp))
+ preparedTreatments.add(DataSyncSelector.PairOfflineEvent(oe.first, oe.second.id))
+ sendTreatments(force = false, progress)
+ confirmLastOfflineEventIdIfGreater(oe.second.id)
+ } ?: break
+ }
+ sendTreatments(force = true, progress)
+ }
+
+ fun confirmLastProfileStore(lastSynced: Long) {
+ sp.putLong(R.string.key_xdrip_profile_store_last_synced_timestamp, lastSynced)
+ }
+
+ private fun processChangedProfileStore() {
+ if (!isEnabled) return
+ val lastSync = sp.getLong(R.string.key_xdrip_profile_store_last_synced_timestamp, 0)
+ val lastChange = sp.getLong(info.nightscout.core.utils.R.string.key_local_profile_last_change, 0)
+ if (lastChange == 0L) return
+ if (lastChange > lastSync) {
+ if (activePlugin.activeProfileSource.profile?.allProfilesValid != true) return
+ val profileStore = activePlugin.activeProfileSource.profile
+ val profileJson = profileStore?.data ?: return
+ // add for v3
+ if (JsonHelper.safeGetLongAllowNull(profileJson, "date") == null)
+ profileJson.put("date", profileStore.getStartDate())
+ val now = dateUtil.now()
+ xdripPlugin.sendToXdrip("profile", DataSyncSelector.PairProfileStore(profileJson, now), "")
+ confirmLastProfileStore(now)
+ processChangedProfileStore()
+ }
+ }
+}
\ No newline at end of file
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/XdripFragment.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/XdripFragment.kt
new file mode 100644
index 0000000000..5502011cc3
--- /dev/null
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/XdripFragment.kt
@@ -0,0 +1,111 @@
+package info.nightscout.plugins.sync.xdrip
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.MenuProvider
+import androidx.lifecycle.Lifecycle
+import dagger.android.support.DaggerFragment
+import info.nightscout.core.ui.dialogs.OKDialog
+import info.nightscout.core.utils.fabric.FabricPrivacy
+import info.nightscout.interfaces.Config
+import info.nightscout.interfaces.plugin.PluginBase
+import info.nightscout.interfaces.plugin.PluginFragment
+import info.nightscout.plugins.sync.R
+import info.nightscout.plugins.sync.databinding.XdripFragmentBinding
+import info.nightscout.plugins.sync.xdrip.events.EventXdripUpdateGUI
+import info.nightscout.rx.AapsSchedulers
+import info.nightscout.rx.bus.RxBus
+import info.nightscout.rx.logging.AAPSLogger
+import info.nightscout.shared.interfaces.ResourceHelper
+import info.nightscout.shared.sharedPreferences.SP
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
+import javax.inject.Inject
+
+class XdripFragment : DaggerFragment(), MenuProvider, PluginFragment {
+
+ @Inject lateinit var sp: SP
+ @Inject lateinit var rh: ResourceHelper
+ @Inject lateinit var rxBus: RxBus
+ @Inject lateinit var fabricPrivacy: FabricPrivacy
+ @Inject lateinit var aapsSchedulers: AapsSchedulers
+ @Inject lateinit var dataSyncSelector: DataSyncSelectorXdripImpl
+ @Inject lateinit var aapsLogger: AAPSLogger
+ @Inject lateinit var xdripPlugin: XdripPlugin
+ @Inject lateinit var config: Config
+
+ companion object {
+
+ const val ID_MENU_CLEAR_LOG = 511
+ const val ID_MENU_FULL_SYNC = 512
+ }
+
+ override var plugin: PluginBase? = null
+
+ private val disposable = CompositeDisposable()
+
+ private var _binding: XdripFragmentBinding? = 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 =
+ XdripFragmentBinding.inflate(inflater, container, false).also {
+ _binding = it
+ requireActivity().addMenuProvider(this, viewLifecycleOwner, Lifecycle.State.RESUMED)
+ }.root
+
+ override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
+ menu.add(Menu.FIRST, ID_MENU_CLEAR_LOG, 0, rh.gs(R.string.clear_log)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
+ menu.add(Menu.FIRST, ID_MENU_FULL_SYNC, 0, rh.gs(R.string.full_sync)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
+ menu.setGroupDividerEnabled(true)
+ }
+
+ override fun onMenuItemSelected(item: MenuItem): Boolean =
+ when (item.itemId) {
+ ID_MENU_CLEAR_LOG -> {
+ xdripPlugin.clearLog()
+ true
+ }
+
+ ID_MENU_FULL_SYNC -> {
+ context?.let { context ->
+ OKDialog.showConfirmation(
+ context, rh.gs(R.string.ns_client), rh.gs(R.string.full_sync_comment),
+ Runnable { dataSyncSelector.resetToNextFullSync() }
+ )
+ }
+ true
+ }
+
+ else -> false
+ }
+
+ @Synchronized
+ override fun onResume() {
+ super.onResume()
+ disposable += rxBus
+ .toObservable(EventXdripUpdateGUI::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
+ binding.log.text = xdripPlugin.textLog()
+ val size = dataSyncSelector.queueSize()
+ binding.queue.text = if (size >= 0) size.toString() else rh.gs(info.nightscout.core.ui.R.string.value_unavailable_short)
+ }
+}
\ No newline at end of file
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/XdripPlugin.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/XdripPlugin.kt
index 99b166862a..a2ff7d3f31 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/XdripPlugin.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/XdripPlugin.kt
@@ -3,23 +3,21 @@ package info.nightscout.plugins.sync.xdrip
import android.content.Context
import android.content.Intent
import android.os.Bundle
+import android.os.Handler
+import android.os.HandlerThread
+import android.text.Spanned
+import androidx.work.ExistingWorkPolicy
+import androidx.work.OneTimeWorkRequest
+import androidx.work.WorkInfo
+import androidx.work.WorkManager
import dagger.android.HasAndroidInjector
+import info.nightscout.core.extensions.toJson
import info.nightscout.core.extensions.toStringShort
import info.nightscout.core.iob.generateCOBString
import info.nightscout.core.iob.round
import info.nightscout.core.ui.toast.ToastUtils
import info.nightscout.core.utils.fabric.FabricPrivacy
-import info.nightscout.database.entities.Bolus
-import info.nightscout.database.entities.Carbs
-import info.nightscout.database.entities.DeviceStatus
-import info.nightscout.database.entities.EffectiveProfileSwitch
-import info.nightscout.database.entities.ExtendedBolus
-import info.nightscout.database.entities.GlucoseValue
-import info.nightscout.database.entities.OfflineEvent
-import info.nightscout.database.entities.ProfileSwitch
-import info.nightscout.database.entities.TemporaryBasal
-import info.nightscout.database.entities.TemporaryTarget
-import info.nightscout.database.entities.TherapyEvent
+import info.nightscout.interfaces.Constants
import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.interfaces.XDripBroadcast
import info.nightscout.interfaces.aps.Loop
@@ -30,26 +28,41 @@ import info.nightscout.interfaces.plugin.PluginType
import info.nightscout.interfaces.profile.Profile
import info.nightscout.interfaces.profile.ProfileFunction
import info.nightscout.interfaces.receivers.Intents
+import info.nightscout.interfaces.sync.DataSyncSelector
+import info.nightscout.interfaces.sync.DataSyncSelectorXdrip
+import info.nightscout.interfaces.sync.Sync
+import info.nightscout.interfaces.ui.UiInteraction
import info.nightscout.interfaces.utils.DecimalFormatter
+import info.nightscout.interfaces.utils.HtmlHelper
import info.nightscout.plugins.sync.R
+import info.nightscout.plugins.sync.nsclient.extensions.toJson
+import info.nightscout.plugins.sync.xdrip.events.EventXdripUpdateGUI
+import info.nightscout.plugins.sync.xdrip.extensions.toXdripJson
+import info.nightscout.plugins.sync.xdrip.workers.XdripDataSyncWorker
import info.nightscout.rx.AapsSchedulers
import info.nightscout.rx.bus.RxBus
+import info.nightscout.rx.events.EventAppExit
import info.nightscout.rx.events.EventAppInitialized
import info.nightscout.rx.events.EventAutosensCalculationFinished
+import info.nightscout.rx.events.EventNewBG
import info.nightscout.rx.events.EventNewHistoryData
-import info.nightscout.rx.events.EventRefreshOverview
+import info.nightscout.rx.events.EventXdripNewLog
import info.nightscout.rx.logging.AAPSLogger
import info.nightscout.rx.logging.LTag
import info.nightscout.shared.extensions.safeQueryBroadcastReceivers
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.shared.sharedPreferences.SP
+import info.nightscout.shared.utils.DateUtil
import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.launch
import org.json.JSONArray
-import org.json.JSONException
-import org.json.JSONObject
-import java.text.SimpleDateFormat
-import java.util.Locale
+import java.util.concurrent.Executors
+import java.util.concurrent.ScheduledFuture
+import java.util.concurrent.TimeUnit
import javax.inject.Inject
import javax.inject.Singleton
@@ -65,30 +78,62 @@ class XdripPlugin @Inject constructor(
private val loop: Loop,
private val iobCobCalculator: IobCobCalculator,
private val rxBus: RxBus,
+ private val uiInteraction: UiInteraction,
+ private val dataSyncSelector: DataSyncSelectorXdrip,
+ private val dateUtil: DateUtil,
aapsLogger: AAPSLogger
-) : PluginBase(
+) : XDripBroadcast, Sync, PluginBase(
PluginDescription()
.mainType(PluginType.SYNC)
+ .fragmentClass(XdripFragment::class.java.name)
.pluginIcon((info.nightscout.core.main.R.drawable.ic_blooddrop_48))
.pluginName(R.string.xdrip)
.shortName(R.string.xdrip_shortname)
- .neverVisible(true)
.preferencesId(R.xml.pref_xdrip)
.description(R.string.description_xdrip),
aapsLogger, rh, injector
-), XDripBroadcast {
+) {
+ @Suppress("PrivatePropertyName")
+ private val XDRIP_JOB_NAME: String = this::class.java.simpleName
+
+ private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
private val disposable = CompositeDisposable()
+ private val handler = Handler(HandlerThread(this::class.simpleName + "Handler").also { it.start() }.looper)
+ private val listLog: MutableList = ArrayList()
private var lastLoopStatus = false
+ // Not used Sync interface members
+ override val hasWritePermission: Boolean = true
+ override val connected: Boolean = true
+ override val status: String = ""
+
override fun onStart() {
super.onStart()
- disposable += rxBus.toObservable(EventRefreshOverview::class.java)
+ disposable += rxBus
+ .toObservable(EventAppExit::class.java)
.observeOn(aapsSchedulers.io)
- .subscribe({ if (lastLoopStatus != loop.isEnabled()) sendStatusLine() }, fabricPrivacy::logException)
+ .subscribe({ WorkManager.getInstance(context).cancelUniqueWork(XDRIP_JOB_NAME) }, fabricPrivacy::logException)
+ disposable += rxBus
+ .toObservable(EventXdripNewLog::class.java)
+ .observeOn(aapsSchedulers.io)
+ .subscribe({ event ->
+ addToLog(event)
+ aapsLogger.debug(LTag.XDRIP, event.action + " " + event.logText)
+ }, fabricPrivacy::logException)
+ disposable += rxBus
+ .toObservable(EventNewBG::class.java)
+ .observeOn(aapsSchedulers.io)
+ .subscribe({
+ sendStatusLine()
+ delayAndScheduleExecution("NEW_BG")
+ }, fabricPrivacy::logException)
disposable += rxBus.toObservable(EventNewHistoryData::class.java)
.observeOn(aapsSchedulers.io)
- .subscribe({ sendStatusLine() }, fabricPrivacy::logException)
+ .subscribe({
+ sendStatusLine()
+ delayAndScheduleExecution("NEW_DATA")
+ }, fabricPrivacy::logException)
disposable += rxBus.toObservable(EventAutosensCalculationFinished::class.java)
.observeOn(aapsSchedulers.io)
.subscribe({ sendStatusLine() }, fabricPrivacy::logException)
@@ -99,8 +144,39 @@ class XdripPlugin @Inject constructor(
override fun onStop() {
super.onStop()
+ handler.removeCallbacksAndMessages(null)
disposable.clear()
- sendStatusLine()
+ }
+
+ fun clearLog() {
+ handler.post {
+ synchronized(listLog) { listLog.clear() }
+ rxBus.send(EventXdripUpdateGUI())
+ }
+ }
+
+ private fun addToLog(ev: EventXdripNewLog) {
+ 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(EventXdripUpdateGUI())
+ }
+
+ fun textLog(): Spanned {
+ try {
+ val newTextLog = StringBuilder()
+ synchronized(listLog) {
+ for (log in listLog) newTextLog.append(log.toPreparedHtml())
+ }
+ return HtmlHelper.fromHtml(newTextLog.toString())
+ } catch (e: OutOfMemoryError) {
+ uiInteraction.showToastAndNotification(context, "Out of memory!\nStop using this phone !!!", info.nightscout.core.ui.R.raw.error)
+ }
+ return HtmlHelper.fromHtml("")
}
private fun sendStatusLine() {
@@ -115,6 +191,45 @@ class XdripPlugin @Inject constructor(
}
}
+ private fun executeLoop(origin: String) {
+ if (workIsRunning(arrayOf(XDRIP_JOB_NAME))) {
+ rxBus.send(EventXdripNewLog("RUN", "Already running $origin"))
+ return
+ }
+ rxBus.send(EventXdripNewLog("RUN", "Starting next round $origin"))
+ WorkManager.getInstance(context)
+ .beginUniqueWork(
+ XDRIP_JOB_NAME,
+ ExistingWorkPolicy.REPLACE,
+ OneTimeWorkRequest.Builder(XdripDataSyncWorker::class.java).build()
+ )
+ .enqueue()
+ }
+
+ private fun workIsRunning(workNames: Array): Boolean {
+ for (workName in workNames)
+ for (workInfo in WorkManager.getInstance(context).getWorkInfosForUniqueWork(workName).get())
+ if (workInfo.state == WorkInfo.State.BLOCKED || workInfo.state == WorkInfo.State.ENQUEUED || workInfo.state == WorkInfo.State.RUNNING)
+ return true
+ return false
+ }
+
+ private val eventWorker = Executors.newSingleThreadScheduledExecutor()
+ private var scheduledEventPost: ScheduledFuture<*>? = null
+ private fun delayAndScheduleExecution(origin: String) {
+ class PostRunnable : Runnable {
+
+ override fun run() {
+ scheduledEventPost = null
+ executeLoop(origin)
+ }
+ }
+ // cancel waiting task to prevent sending multiple posts
+ scheduledEventPost?.cancel(false)
+ val task: Runnable = PostRunnable()
+ scheduledEventPost = eventWorker.schedule(task, 10, TimeUnit.SECONDS)
+ }
+
private fun buildStatusLine(profile: Profile): String {
val status = StringBuilder()
@Suppress("LiftReturnOrAssignment")
@@ -169,145 +284,146 @@ class XdripPlugin @Inject constructor(
}
}
- // sent in 640G mode
- // com.eveningoutpost.dexdrip.NSEmulatorReceiver
- override fun sendIn640gMode(glucoseValue: GlucoseValue) {
- if (sp.getBoolean(info.nightscout.core.utils.R.string.key_dexcomg5_xdripupload, false)) {
- val format = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ", Locale.US)
- try {
- val entriesBody = JSONArray()
- val json = JSONObject()
- json.put("sgv", glucoseValue.value)
- json.put("direction", glucoseValue.trendArrow.text)
- json.put("device", "G5")
- json.put("type", "sgv")
- json.put("date", glucoseValue.timestamp)
- json.put("dateString", format.format(glucoseValue.timestamp))
- entriesBody.put(json)
- val bundle = Bundle()
- bundle.putString("action", "add")
- bundle.putString("collection", "entries")
- bundle.putString("data", entriesBody.toString())
- val intent = Intent(Intents.XDRIP_PLUS_NS_EMULATOR)
- intent.putExtras(bundle).addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
- context.sendBroadcast(intent)
- val receivers = context.packageManager.safeQueryBroadcastReceivers(intent, 0)
- if (receivers.isEmpty()) {
- //NSUpload.log.debug("No xDrip receivers found. ")
- aapsLogger.debug(LTag.BGSOURCE, "No xDrip receivers found.")
- } else {
- aapsLogger.debug(LTag.BGSOURCE, "${receivers.size} xDrip receivers")
+ /*
+ // sent in 640G mode
+ // com.eveningoutpost.dexdrip.NSEmulatorReceiver
+ override fun sendIn640gMode(glucoseValue: GlucoseValue) {
+ if (sp.getBoolean(info.nightscout.core.utils.R.string.key_dexcomg5_xdripupload, false)) {
+ val format = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ", Locale.US)
+ try {
+ val entriesBody = JSONArray()
+ val json = JSONObject()
+ json.put("sgv", glucoseValue.value)
+ json.put("direction", glucoseValue.trendArrow.text)
+ json.put("device", "G5")
+ json.put("type", "sgv")
+ json.put("date", glucoseValue.timestamp)
+ json.put("dateString", format.format(glucoseValue.timestamp))
+ entriesBody.put(json)
+ val bundle = Bundle()
+ bundle.putString("action", "add")
+ bundle.putString("collection", "entries")
+ bundle.putString("data", entriesBody.toString())
+ val intent = Intent(Intents.XDRIP_PLUS_NS_EMULATOR)
+ intent.putExtras(bundle).addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
+ context.sendBroadcast(intent)
+ val receivers = context.packageManager.safeQueryBroadcastReceivers(intent, 0)
+ if (receivers.isEmpty()) {
+ //NSUpload.log.debug("No xDrip receivers found. ")
+ aapsLogger.debug(LTag.BGSOURCE, "No xDrip receivers found.")
+ } else {
+ aapsLogger.debug(LTag.BGSOURCE, "${receivers.size} xDrip receivers")
+ }
+ } catch (e: JSONException) {
+ aapsLogger.error(LTag.BGSOURCE, "Unhandled exception", e)
}
- } catch (e: JSONException) {
- aapsLogger.error(LTag.BGSOURCE, "Unhandled exception", e)
+ }
+ }
+ */
+
+ override fun sendToXdrip(collection: String, dataPair: DataSyncSelector.DataPair, progress: String) {
+ scope.launch {
+ when (collection) {
+ "profile" -> sendProfileStore(dataPair = dataPair, progress = progress)
+ "devicestatus" -> sendDeviceStatus(dataPair = dataPair, progress = progress)
+ else -> throw IllegalStateException()
}
}
}
- // sent in NSClient dbaccess mode
- override fun sendProfile(profileStoreJson: JSONObject) {
- if (sp.getBoolean(info.nightscout.core.utils.R.string.key_nsclient_localbroadcasts, false))
- broadcast(
- Intent(Intents.ACTION_NEW_PROFILE).apply {
- addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
- putExtras(Bundle().apply { putString("profile", profileStoreJson.toString()) })
- }
- )
-
- }
-
- // sent in NSClient dbaccess mode
- override fun sendTreatments(addedOrUpdatedTreatments: JSONArray) {
- if (sp.getBoolean(info.nightscout.core.utils.R.string.key_nsclient_localbroadcasts, false))
- splitArray(addedOrUpdatedTreatments).forEach { part ->
- broadcast(
- Intent(Intents.ACTION_NEW_TREATMENT).apply {
- addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
- putExtras(Bundle().apply { putString("treatments", part.toString()) })
- }
- )
+ override fun sendToXdrip(collection: String, dataPairs: List, progress: String) {
+ scope.launch {
+ when (collection) {
+ "entries" -> sendEntries(dataPairs = dataPairs, progress = progress)
+ "food" -> sendFood(dataPairs = dataPairs, progress = progress)
+ "treatments" -> sendTreatments(dataPairs = dataPairs, progress = progress)
+ else -> throw IllegalStateException()
}
- }
-
- // sent in NSClient dbaccess mode
- override fun sendSgvs(sgvs: JSONArray) {
- if (sp.getBoolean(info.nightscout.core.utils.R.string.key_nsclient_localbroadcasts, false))
- splitArray(sgvs).forEach { part ->
- broadcast(
- Intent(Intents.ACTION_NEW_SGV).apply {
- addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
- putExtras(Bundle().apply { putString("sgvs", part.toString()) })
- }
- )
- }
- }
-
- override fun send(gv: GlucoseValue) {
- TODO("Not yet implemented")
- }
-
- override fun send(bolus: Bolus) {
- TODO("Not yet implemented")
- }
-
- override fun send(carbs: Carbs) {
- TODO("Not yet implemented")
- }
-
- override fun send(tt: TemporaryTarget) {
- TODO("Not yet implemented")
- }
-
- override fun send(te: TherapyEvent) {
- TODO("Not yet implemented")
- }
-
- override fun send(deviceStatus: DeviceStatus) {
- TODO("Not yet implemented")
- }
-
- override fun send(tb: TemporaryBasal) {
- TODO("Not yet implemented")
- }
-
- override fun send(eb: ExtendedBolus) {
- TODO("Not yet implemented")
- }
-
- override fun send(ps: ProfileSwitch) {
- TODO("Not yet implemented")
- }
-
- override fun send(ps: EffectiveProfileSwitch) {
- TODO("Not yet implemented")
- }
-
- override fun send(ps: OfflineEvent) {
- TODO("Not yet implemented")
- }
-
- private fun splitArray(array: JSONArray): List {
- var ret: MutableList = 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
+ }
+
+ private suspend fun sendProfileStore(dataPair: DataSyncSelector.DataPair, progress: String) {
+ val data = (dataPair as DataSyncSelector.PairProfileStore).value
+ rxBus.send(EventXdripNewLog("SENDING", "Sent 1 PROFILE ($progress)"))
+ broadcast(
+ Intent(Intents.ACTION_NEW_PROFILE)
+ .addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
+ .putExtras(Bundle().apply { putString("profile", data.toString()) })
+ )
+ }
+
+ private fun sendDeviceStatus(dataPair: DataSyncSelector.DataPair, progress: String) {
+ val data = (dataPair as DataSyncSelector.PairDeviceStatus).value.toJson(dateUtil)
+ rxBus.send(EventXdripNewLog("SENDING", "Sent 1 DEVICESTATUS ($progress)"))
+ broadcast(
+ Intent(Intents.ACTION_NEW_DEVICE_STATUS)
+ .addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
+ .putExtras(Bundle().apply { putString("devicestatus", data.toString()) })
+ )
+ }
+
+ private fun sendEntries(dataPairs: List, progress: String) {
+ val array = JSONArray()
+ for (dataPair in dataPairs) {
+ val data = (dataPair as DataSyncSelector.PairGlucoseValue).value.toXdripJson()
+ array.put(data)
+ }
+ rxBus.send(EventXdripNewLog("SENDING", "Sent ${array.length()} BGs ($progress)"))
+ broadcast(
+ Intent(Intents.ACTION_NEW_SGV)
+ .addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
+ .putExtras(Bundle().apply { putString("sgvs", array.toString()) })
+ )
+ }
+
+ private fun sendFood(dataPairs: List, progress: String) {
+ val array = JSONArray()
+ for (dataPair in dataPairs) {
+ val data = (dataPair as DataSyncSelector.PairFood).value.toJson(true)
+ array.put(data)
+ }
+ rxBus.send(EventXdripNewLog("SENDING", "Sent ${array.length()} FOODs ($progress)"))
+ broadcast(
+ Intent(Intents.ACTION_NEW_FOOD)
+ .addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
+ .putExtras(Bundle().apply { putString("foods", array.toString()) })
+ )
+ }
+
+ private fun sendTreatments(dataPairs: List, progress: String) {
+ val array = JSONArray()
+ for (dataPair in dataPairs) {
+ when (dataPair) {
+ is DataSyncSelector.PairBolus -> dataPair.value.toJson(true, dateUtil)
+ is DataSyncSelector.PairCarbs -> dataPair.value.toJson(true, dateUtil)
+ is DataSyncSelector.PairBolusCalculatorResult -> dataPair.value.toJson(true, dateUtil, profileFunction)
+ is DataSyncSelector.PairTemporaryTarget -> dataPair.value.toJson(true, profileFunction.getUnits(), dateUtil)
+ is DataSyncSelector.PairTherapyEvent -> dataPair.value.toJson(true, dateUtil)
+
+ is DataSyncSelector.PairTemporaryBasal -> {
+ val profile = profileFunction.getProfile(dataPair.value.timestamp) ?: return
+ dataPair.value.toJson(true, profile, dateUtil)
+ }
+
+ is DataSyncSelector.PairExtendedBolus -> {
+ val profile = profileFunction.getProfile(dataPair.value.timestamp) ?: return
+ dataPair.value.toJson(true, profile, dateUtil)
+ }
+
+ is DataSyncSelector.PairProfileSwitch -> dataPair.value.toJson(true, dateUtil)
+ is DataSyncSelector.PairEffectiveProfileSwitch -> dataPair.value.toJson(true, dateUtil)
+ is DataSyncSelector.PairOfflineEvent -> dataPair.value.toJson(true, dateUtil)
+ else -> null
+ }?.let {
+ array.put(it)
+ }
+ }
+ rxBus.send(EventXdripNewLog("SENDING", "Sent ${array.length()} TRs ($progress)"))
+ broadcast(
+ Intent(Intents.ACTION_NEW_FOOD)
+ .addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
+ .putExtras(Bundle().apply { putString("treatments", array.toString()) })
+ )
}
private fun broadcast(intent: Intent) {
@@ -315,7 +431,10 @@ class XdripPlugin @Inject constructor(
resolveInfo.activityInfo.packageName?.let {
intent.setPackage(it)
context.sendBroadcast(intent)
- aapsLogger.debug(LTag.CORE, "Sending broadcast " + intent.action + " to: " + it)
+ aapsLogger.debug(LTag.XDRIP, "Sending broadcast " + intent.action + " to: " + it)
+ rxBus.send(EventXdripNewLog("RECIPIENT", it))
+ rxBus.send(EventXdripUpdateGUI())
+ Thread.sleep(100)
}
}
}
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/events/EventXdripUpdateGUI.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/events/EventXdripUpdateGUI.kt
new file mode 100644
index 0000000000..bf6af43e8c
--- /dev/null
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/events/EventXdripUpdateGUI.kt
@@ -0,0 +1,5 @@
+package info.nightscout.plugins.sync.xdrip.events
+
+import info.nightscout.rx.events.EventUpdateGui
+
+class EventXdripUpdateGUI : EventUpdateGui()
\ No newline at end of file
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/extensions/GlucoseValueExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/extensions/GlucoseValueExtension.kt
new file mode 100644
index 0000000000..14761b5a76
--- /dev/null
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/extensions/GlucoseValueExtension.kt
@@ -0,0 +1,19 @@
+package info.nightscout.plugins.sync.xdrip.extensions
+
+
+import info.nightscout.database.entities.GlucoseValue
+import info.nightscout.interfaces.Constants
+import info.nightscout.interfaces.GlucoseUnit
+import info.nightscout.interfaces.iob.InMemoryGlucoseValue
+import info.nightscout.interfaces.utils.DecimalFormatter
+import info.nightscout.shared.utils.DateUtil
+import org.json.JSONObject
+
+fun GlucoseValue.toXdripJson(): JSONObject =
+ JSONObject()
+ .put("device", sourceSensor.text)
+ .put("mills", timestamp)
+ .put("isValid", isValid)
+ .put("mgdl", value)
+ .put("direction", trendArrow.text)
+
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/workers/XdripDataSyncWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/workers/XdripDataSyncWorker.kt
new file mode 100644
index 0000000000..68d2dbf7db
--- /dev/null
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/workers/XdripDataSyncWorker.kt
@@ -0,0 +1,31 @@
+package info.nightscout.plugins.sync.xdrip.workers
+
+import android.content.Context
+import androidx.work.WorkerParameters
+import info.nightscout.androidaps.annotations.OpenForTesting
+import info.nightscout.core.utils.worker.LoggingWorker
+import info.nightscout.interfaces.plugin.ActivePlugin
+import info.nightscout.plugins.sync.xdrip.DataSyncSelectorXdripImpl
+import info.nightscout.plugins.sync.xdrip.events.EventXdripUpdateGUI
+import info.nightscout.rx.bus.RxBus
+import info.nightscout.rx.events.EventXdripNewLog
+import kotlinx.coroutines.Dispatchers
+import javax.inject.Inject
+
+@OpenForTesting
+class XdripDataSyncWorker(
+ context: Context, params: WorkerParameters
+) : LoggingWorker(context, params, Dispatchers.IO) {
+
+ @Inject lateinit var dataSyncSelector: DataSyncSelectorXdripImpl
+ @Inject lateinit var activePlugin: ActivePlugin
+ @Inject lateinit var rxBus: RxBus
+
+ override suspend fun doWorkAndLog(): Result {
+ rxBus.send(EventXdripNewLog("UPL", "Start"))
+ dataSyncSelector.doUpload()
+ rxBus.send(EventXdripNewLog("UPL", "End"))
+ rxBus.send(EventXdripUpdateGUI())
+ return Result.success()
+ }
+}
\ No newline at end of file
diff --git a/plugins/sync/src/main/res/layout/ns_client_fragment.xml b/plugins/sync/src/main/res/layout/ns_client_fragment.xml
index 3a92d3f400..9720ddd1eb 100644
--- a/plugins/sync/src/main/res/layout/ns_client_fragment.xml
+++ b/plugins/sync/src/main/res/layout/ns_client_fragment.xml
@@ -3,7 +3,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- tools:context=".sync.nsShared.NSClientFragment">
+ tools:context="info.nightscout.plugins.sync.nsShared.NSClientFragment">
-
-
-
+
-
-
+
diff --git a/plugins/sync/src/main/res/layout/ns_client_log_item.xml b/plugins/sync/src/main/res/layout/ns_client_log_item.xml
new file mode 100644
index 0000000000..ecfea0129b
--- /dev/null
+++ b/plugins/sync/src/main/res/layout/ns_client_log_item.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/plugins/sync/src/main/res/layout/tidepool_fragment.xml b/plugins/sync/src/main/res/layout/tidepool_fragment.xml
index 51d3d90f92..d2d3f42327 100644
--- a/plugins/sync/src/main/res/layout/tidepool_fragment.xml
+++ b/plugins/sync/src/main/res/layout/tidepool_fragment.xml
@@ -1,82 +1,46 @@
-
+ android:layout_height="match_parent"
+ tools:context="info.nightscout.plugins.sync.tidepool.TidepoolFragment">
-
+ android:layout_marginBottom="10dp"
+ android:layout_marginStart="5dp"
+ android:layout_marginEnd="5dp"
+ android:orientation="horizontal">
-
+
-
+
-
-
-
+
+ android:id="@+id/log_scrollview"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:layout_marginStart="5dp"
+ android:layout_marginEnd="5dp">
-
+ android:text="" />
-
+
diff --git a/plugins/sync/src/main/res/layout/xdrip_fragment.xml b/plugins/sync/src/main/res/layout/xdrip_fragment.xml
new file mode 100644
index 0000000000..8e4f95e2ba
--- /dev/null
+++ b/plugins/sync/src/main/res/layout/xdrip_fragment.xml
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/plugins/sync/src/main/res/values/strings.xml b/plugins/sync/src/main/res/values/strings.xml
index f80089bca5..5ab8ee3488 100644
--- a/plugins/sync/src/main/res/values/strings.xml
+++ b/plugins/sync/src/main/res/values/strings.xml
@@ -11,7 +11,7 @@
ns_device_status_last_synced_id
ns_temporary_basal_last_synced_id
ns_extended_bolus_last_synced_id
- profile_switch_last_synced_id
+ ns_profile_switch_last_synced_id
ns_effective_profile_switch_last_synced_id
ns_offline_event_last_synced_id
ns_profile_store_last_synced_timestamp
@@ -47,8 +47,7 @@
NSClient malfunction. Consider NS and NSClient restart.
- ns_client_autoscroll
- ns_client_paused
+ ns_client_paused
ns_log_app_started_event
NSCLIENT has no write permission. Wrong API secret?
@@ -57,7 +56,6 @@
NSClient
NSCI
URL:
- Autoscroll
Restart
NSClient
Nightscout URL
@@ -106,8 +104,6 @@
Stale data threshold [min]
Urgent stale data threshold [min]
Log app start to NS
- Enable broadcasts to other apps (like xDrip+). Do not enable if you have more than one instance of AAPS or AAPSClient installed!
- Enable local Broadcasts.
Copy NS settings (if exists)?
@@ -115,14 +111,7 @@
tidepool_password
tidepool_dev_servers
tidepool_test_login
- tidepool_only_while_charging
- tidepool_only_while_unmetered
tidepool_last_end
- tidepool_upload_profile
- tidepool_upload_tbr
- tidepool_upload_cgm
- tidepool_upload_bolus
- tidepool_upload_bg
Your Tidepool login user name, normally your email address
Login User Name
@@ -168,8 +157,28 @@
xDrip+ not installed
Calibration sent to xDrip+
+ xdrip_temporary_target_last_sync
+ xdrip_glucose_value_last_sync
+ xdrip_food_last_sync
+ xdrip_therapy_event_last_sync
+ xdrip_bolus_calculator_result_last_synced_id
+ xdrip_carbs_last_synced_id
+ xdrip_bolus_last_synced_id
+ xdrip_device_status_last_synced_id
+ xdrip_temporary_basal_last_synced_id
+ xdrip_extended_bolus_last_synced_id
+ profile_switch_last_synced_id
+ xdrip_effective_profile_switch_last_synced_id
+ xdrip_offline_event_last_synced_id
+ xdrip_profile_store_last_synced_timestamp
+
+ Send glucose and treatments data to xDrip+. Data Source \"xDrip+ Sync Follower\" must be selected and accepting of data must be enabled in Settings - Inter-app settings - Accept Glucose/Treatments
+ Enable broadcasts to xDrip+.
+
Data Broadcaster
+ Connect to websockets
+ Enabling means: faster updates, receiving alarms and announcements and higher battery consumption similar to v1. All other uploaderds to NS must use v3 protocol.
\ No newline at end of file
diff --git a/plugins/sync/src/main/res/xml/pref_ns_client.xml b/plugins/sync/src/main/res/xml/pref_ns_client.xml
index c6f9cdb768..7d8fcb6f87 100644
--- a/plugins/sync/src/main/res/xml/pref_ns_client.xml
+++ b/plugins/sync/src/main/res/xml/pref_ns_client.xml
@@ -178,14 +178,13 @@
+ android:title="@string/advanced_settings_title">
+ android:summary="@string/ns_log_app_started_event" />
-
-
+ validate:testType="minLength" />
+
+
+ android:title="@string/advanced_settings_title">
+ android:summary="@string/ns_log_app_started_event" />
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
diff --git a/plugins/sync/src/main/res/xml/pref_xdrip.xml b/plugins/sync/src/main/res/xml/pref_xdrip.xml
index 2eb3f53b2c..5f28dcbbf9 100644
--- a/plugins/sync/src/main/res/xml/pref_xdrip.xml
+++ b/plugins/sync/src/main/res/xml/pref_xdrip.xml
@@ -7,6 +7,12 @@
android:title="@string/xdrip"
app:initialExpandedChildrenCount="0">
+
+
(context).build()
`when`(nsClient.hasWritePermission).thenReturn(false)
sut.doWorkAndLog()
- Mockito.verify(dataSyncSelector, Mockito.times(0)).doUpload()
+ Mockito.verify(dataSyncSelectorV3, Mockito.times(0)).doUpload()
`when`(nsClient.hasWritePermission).thenReturn(true)
val result = sut.doWorkAndLog()
- Mockito.verify(dataSyncSelector, Mockito.times(1)).doUpload()
+ Mockito.verify(dataSyncSelectorV3, Mockito.times(1)).doUpload()
Assertions.assertTrue(result is Success)
}
}
\ No newline at end of file
diff --git a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorkerTest.kt b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorkerTest.kt
index 21269b63de..be8f72305b 100644
--- a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorkerTest.kt
+++ b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorkerTest.kt
@@ -1,6 +1,5 @@
package info.nightscout.plugins.sync.nsclientV3.workers
-import androidx.work.ExistingWorkPolicy
import androidx.work.ListenableWorker
import androidx.work.OneTimeWorkRequest
import androidx.work.WorkContinuation
@@ -11,18 +10,19 @@ import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.TestBase
import info.nightscout.core.utils.fabric.FabricPrivacy
import info.nightscout.core.utils.receivers.DataWorkerStorage
-import info.nightscout.core.utils.worker.LoggingWorker
import info.nightscout.database.entities.GlucoseValue
import info.nightscout.database.entities.embedments.InterfaceIDs
import info.nightscout.database.impl.AppRepository
import info.nightscout.interfaces.Config
+import info.nightscout.interfaces.nsclient.StoreDataForDb
import info.nightscout.interfaces.profile.ProfileFunction
import info.nightscout.interfaces.receivers.ReceiverStatusStore
import info.nightscout.interfaces.source.NSClientSource
-import info.nightscout.interfaces.sync.DataSyncSelector
+import info.nightscout.interfaces.sync.DataSyncSelectorV3
import info.nightscout.interfaces.ui.UiInteraction
-import info.nightscout.interfaces.workflow.WorkerClasses
-import info.nightscout.plugins.sync.nsclient.NsClientReceiverDelegate
+import info.nightscout.plugins.sync.nsShared.NsIncomingDataProcessor
+import info.nightscout.plugins.sync.nsclient.ReceiverDelegate
+import info.nightscout.plugins.sync.nsclient.data.NSDeviceStatusHandler
import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin
import info.nightscout.plugins.sync.nsclientV3.extensions.toNSSvgV3
import info.nightscout.rx.bus.RxBus
@@ -40,32 +40,33 @@ import org.mockito.ArgumentMatchers.any
import org.mockito.ArgumentMatchers.anyInt
import org.mockito.ArgumentMatchers.anyLong
import org.mockito.ArgumentMatchers.anyString
-import org.mockito.ArgumentMatchers.eq
import org.mockito.Mock
import org.mockito.Mockito
@OptIn(ExperimentalCoroutinesApi::class)
internal class LoadBgWorkerTest : TestBase() {
- @Mock lateinit var workerClasses: WorkerClasses
@Mock lateinit var sp: SP
@Mock lateinit var fabricPrivacy: FabricPrivacy
- @Mock lateinit var rxBus: RxBus
@Mock lateinit var dateUtil: DateUtil
@Mock lateinit var nsAndroidClient: NSAndroidClient
@Mock lateinit var rh: ResourceHelper
@Mock lateinit var profileFunction: ProfileFunction
@Mock lateinit var config: Config
@Mock lateinit var uiInteraction: UiInteraction
- @Mock lateinit var dataSyncSelector: DataSyncSelector
+ @Mock lateinit var dataSyncSelectorV3: DataSyncSelectorV3
@Mock lateinit var repository: AppRepository
@Mock lateinit var receiverStatusStore: ReceiverStatusStore
@Mock lateinit var nsClientSource: NSClientSource
@Mock lateinit var workManager: WorkManager
@Mock lateinit var workContinuation: WorkContinuation
+ @Mock lateinit var nsDeviceStatusHandler: NSDeviceStatusHandler
+ @Mock lateinit var storeDataForDb: StoreDataForDb
+ @Mock lateinit var nsIncomingDataProcessor: NsIncomingDataProcessor
+ private val rxBus: RxBus = RxBus(aapsSchedulers, aapsLogger)
private lateinit var nsClientV3Plugin: NSClientV3Plugin
- private lateinit var nsClientReceiverDelegate: NsClientReceiverDelegate
+ private lateinit var receiverDelegate: ReceiverDelegate
private lateinit var dataWorkerStorage: DataWorkerStorage
private lateinit var sut: LoadBgWorker
@@ -76,15 +77,13 @@ internal class LoadBgWorkerTest : TestBase() {
if (it is LoadBgWorker) {
it.aapsLogger = aapsLogger
it.fabricPrivacy = fabricPrivacy
- it.dataWorkerStorage = dataWorkerStorage
it.sp = sp
it.rxBus = rxBus
it.context = context
it.dateUtil = dateUtil
it.nsClientV3Plugin = nsClientV3Plugin
- it.workerClasses = workerClasses
it.nsClientSource = nsClientSource
- it.workManager = workManager
+ it.storeDataForDb = storeDataForDb
}
}
}
@@ -96,10 +95,11 @@ internal class LoadBgWorkerTest : TestBase() {
Mockito.`when`(dateUtil.now()).thenReturn(now)
Mockito.`when`(nsClientSource.isEnabled()).thenReturn(true)
dataWorkerStorage = DataWorkerStorage(context)
- nsClientReceiverDelegate = NsClientReceiverDelegate(rxBus, rh, sp, receiverStatusStore)
+ receiverDelegate = ReceiverDelegate(rxBus, rh, sp, receiverStatusStore, aapsSchedulers, fabricPrivacy)
nsClientV3Plugin = NSClientV3Plugin(
- injector, aapsLogger, aapsSchedulers, rxBus, rh, context, fabricPrivacy, sp, nsClientReceiverDelegate, config, dateUtil, uiInteraction, dataSyncSelector,
- profileFunction, repository
+ injector, aapsLogger, aapsSchedulers, rxBus, rh, context, fabricPrivacy,
+ sp, receiverDelegate, config, dateUtil, uiInteraction, dataSyncSelectorV3, profileFunction, repository,
+ nsDeviceStatusHandler, nsClientSource, nsIncomingDataProcessor, storeDataForDb
)
nsClientV3Plugin.newestDataOnServer = LastModified(LastModified.Collections())
}
@@ -121,11 +121,6 @@ internal class LoadBgWorkerTest : TestBase() {
val result = sut.doWorkAndLog()
Assertions.assertTrue(result is ListenableWorker.Result.Success)
Assertions.assertTrue(result.outputData.getString("Result") == "Load not enabled")
- Mockito.verify(workManager, Mockito.times(1)).enqueueUniqueWork(
- eq(NSClientV3Plugin.JOB_NAME),
- eq(ExistingWorkPolicy.APPEND_OR_REPLACE),
- any()
- )
}
@Test
@@ -141,13 +136,6 @@ internal class LoadBgWorkerTest : TestBase() {
val result = sut.doWorkAndLog()
Assertions.assertEquals(now - 1000, nsClientV3Plugin.lastLoadedSrvModified.collections.entries)
Assertions.assertTrue(result is ListenableWorker.Result.Success)
- Mockito.verify(workManager, Mockito.times(1)).beginUniqueWork(
- eq(NSClientV3Plugin.JOB_NAME),
- eq(ExistingWorkPolicy.APPEND_OR_REPLACE),
- any()
- )
- Mockito.verify(workContinuation, Mockito.times(1)).then(any())
- Mockito.verify(workContinuation, Mockito.times(1)).enqueue()
}
@Test
@@ -168,7 +156,6 @@ internal class LoadBgWorkerTest : TestBase() {
Mockito.`when`(workManager.beginUniqueWork(anyString(), any(), any())).thenReturn(workContinuation)
Mockito.`when`(workContinuation.then(any())).thenReturn(workContinuation)
- Mockito.`when`(workerClasses.nsClientSourceWorker).thenReturn(LoggingWorker::class.java)
nsClientV3Plugin.nsAndroidClient = nsAndroidClient
nsClientV3Plugin.lastLoadedSrvModified.collections.entries = 0L // first load
nsClientV3Plugin.firstLoadContinueTimestamp.collections.entries = now - 1000
@@ -177,13 +164,6 @@ internal class LoadBgWorkerTest : TestBase() {
val result = sut.doWorkAndLog()
Assertions.assertTrue(result is ListenableWorker.Result.Success)
- Mockito.verify(workManager, Mockito.times(1)).beginUniqueWork(
- eq(NSClientV3Plugin.JOB_NAME),
- eq(ExistingWorkPolicy.APPEND_OR_REPLACE),
- any()
- )
- Mockito.verify(workContinuation, Mockito.times(1)).then(any())
- Mockito.verify(workContinuation, Mockito.times(1)).enqueue()
}
@@ -200,12 +180,5 @@ internal class LoadBgWorkerTest : TestBase() {
val result = sut.doWorkAndLog()
Assertions.assertEquals(now - 1000, nsClientV3Plugin.lastLoadedSrvModified.collections.entries)
Assertions.assertTrue(result is ListenableWorker.Result.Success)
- Mockito.verify(workManager, Mockito.times(1)).beginUniqueWork(
- eq(NSClientV3Plugin.JOB_NAME),
- eq(ExistingWorkPolicy.APPEND_OR_REPLACE),
- any()
- )
- Mockito.verify(workContinuation, Mockito.times(1)).then(any())
- Mockito.verify(workContinuation, Mockito.times(1)).enqueue()
}
}
\ No newline at end of file
diff --git a/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Plugin.kt b/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Plugin.kt
index 0c7b50402b..321b3273b0 100644
--- a/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Plugin.kt
+++ b/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Plugin.kt
@@ -292,7 +292,7 @@ class ComboV2Plugin @Inject constructor (
// Continue initialization in a separate coroutine. This allows us to call
// runWithPermissionCheck(), which will keep trying to run the code block
- // until either the necessary Bluetooth permissios are granted, or the
+ // until either the necessary Bluetooth permissions are granted, or the
// coroutine is cancelled (see onStop() below).
pumpCoroutineScope.launch {
runWithPermissionCheck(
@@ -378,7 +378,7 @@ class ComboV2Plugin @Inject constructor (
// Setup coroutine to enable/disable the pair and unpair
// preferences depending on the pairing state.
preferenceFragment.run {
- // We use the fragment's lifecyle instead of the fragment view's, since the latter
+ // We use the fragment's lifecycle instead of the fragment view's, since the latter
// is initialized in onCreateView(), and we reach this point here _before_ that
// method is called. In other words, the fragment view does not exist at this point.
// repeatOnLifecycle() is a utility function that runs its block when the lifecycle
@@ -984,7 +984,7 @@ class ComboV2Plugin @Inject constructor (
// Store a local reference to the Pump instance. "pump"
// is set to null in case of an error, because then,
// disconnectInternal() is called (which sets pump to null).
- // However, we still need to access the last deliverd bolus
+ // However, we still need to access the last delivered bolus
// from the pump's lastBolusFlow, even if an error happened.
// Solve this by storing this reference and accessing the
// lastBolusFlow through it.
@@ -1171,9 +1171,8 @@ class ComboV2Plugin @Inject constructor (
runBlocking {
try {
executeCommand {
- val setTbrOutcome = pump!!.setTbr(percentage, durationInMinutes, tbrType, force100Percent)
- val tbrComment = when (setTbrOutcome) {
+ val tbrComment = when (pump!!.setTbr(percentage, durationInMinutes, tbrType, force100Percent)) {
ComboCtlPump.SetTbrOutcome.SET_NORMAL_TBR ->
rh.gs(R.string.combov2_setting_tbr_succeeded)
ComboCtlPump.SetTbrOutcome.SET_EMULATED_100_TBR ->
@@ -2281,7 +2280,7 @@ class ComboV2Plugin @Inject constructor (
.comment(comment)
private fun getBluetoothAddress(): ComboCtlBluetoothAddress? =
- pumpManager!!.getPairedPumpAddresses().firstOrNull()
+ pumpManager?.getPairedPumpAddresses()?.firstOrNull()
private fun isDisconnected() =
when (driverStateFlow.value) {