:core:nssdk cleanup

app/build.gradle

@@ -181,7 +181,7 @@ dependencies {
     implementation project(':core:graphview')
     implementation project(':core:interfaces')
     implementation project(':core:libraries')
-    implementation project(':core:ns-sdk')
+    implementation project(':core:nssdk')
     implementation project(':core:utils')
     implementation project(':core:ui')
     implementation project(':core:validators')

core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/StorageMapper.kt

@@ -1,6 +0,0 @@
-package info.nightscout.sdk.mapper
-
-import info.nightscout.sdk.localmodel.Storage
-import info.nightscout.sdk.remotemodel.RemoteStorage
-
-internal fun RemoteStorage.toLocal() = Storage(storage = storage, version = version)

core/nssdk/build.gradle

@@ -10,7 +10,7 @@ apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle"
 apply from: "${project.rootDir}/core/main/test_dependencies.gradle"
 
 android {
-    namespace 'info.nightscout.sdk'
+    namespace 'app.aaps.core.nssdk'
 }
 
 dependencies {

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/NSAndroidCallbackClientImpl.kt

@@ -1,8 +1,8 @@
-package info.nightscout.sdk
+package app.aaps.core.nssdk
 
-import info.nightscout.sdk.interfaces.NSAndroidCallbackClient
+import app.aaps.core.nssdk.interfaces.NSAndroidCallbackClient
-import info.nightscout.sdk.interfaces.NSAndroidClient
+import app.aaps.core.nssdk.interfaces.NSAndroidClient
-import info.nightscout.sdk.localmodel.Status
+import app.aaps.core.nssdk.localmodel.Status
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/NSAndroidClientImpl.kt

@@ -1,37 +1,37 @@
-package info.nightscout.sdk
+package app.aaps.core.nssdk
 
 import android.content.Context
 import com.google.gson.JsonParser
-import info.nightscout.sdk.exceptions.DateHeaderOutOfToleranceException
+import app.aaps.core.nssdk.exceptions.DateHeaderOutOfToleranceException
-import info.nightscout.sdk.exceptions.InvalidAccessTokenException
+import app.aaps.core.nssdk.exceptions.InvalidAccessTokenException
-import info.nightscout.sdk.exceptions.InvalidFormatNightscoutException
+import app.aaps.core.nssdk.exceptions.InvalidFormatNightscoutException
-import info.nightscout.sdk.exceptions.InvalidParameterNightscoutException
+import app.aaps.core.nssdk.exceptions.InvalidParameterNightscoutException
-import info.nightscout.sdk.exceptions.UnknownResponseNightscoutException
+import app.aaps.core.nssdk.exceptions.UnknownResponseNightscoutException
-import info.nightscout.sdk.exceptions.UnsuccessfullNightscoutException
+import app.aaps.core.nssdk.exceptions.UnsuccessfullNightscoutException
-import info.nightscout.sdk.interfaces.NSAndroidClient
+import app.aaps.core.nssdk.interfaces.NSAndroidClient
-import info.nightscout.sdk.localmodel.Status
+import app.aaps.core.nssdk.localmodel.Status
-import info.nightscout.sdk.localmodel.devicestatus.NSDeviceStatus
+import app.aaps.core.nssdk.localmodel.devicestatus.NSDeviceStatus
-import info.nightscout.sdk.localmodel.entry.NSSgvV3
+import app.aaps.core.nssdk.localmodel.entry.NSSgvV3
-import info.nightscout.sdk.localmodel.food.NSFood
+import app.aaps.core.nssdk.localmodel.food.NSFood
-import info.nightscout.sdk.localmodel.treatment.CreateUpdateResponse
+import app.aaps.core.nssdk.localmodel.treatment.CreateUpdateResponse
-import info.nightscout.sdk.localmodel.treatment.NSTreatment
+import app.aaps.core.nssdk.localmodel.treatment.NSTreatment
-import info.nightscout.sdk.mapper.toLocal
+import app.aaps.core.nssdk.mapper.toLocal
-import info.nightscout.sdk.mapper.toNSDeviceStatus
+import app.aaps.core.nssdk.mapper.toNSDeviceStatus
-import info.nightscout.sdk.mapper.toNSFood
+import app.aaps.core.nssdk.mapper.toNSFood
-import info.nightscout.sdk.mapper.toRemoteDeviceStatus
+import app.aaps.core.nssdk.mapper.toRemoteDeviceStatus
-import info.nightscout.sdk.mapper.toRemoteEntry
+import app.aaps.core.nssdk.mapper.toRemoteEntry
-import info.nightscout.sdk.mapper.toRemoteFood
+import app.aaps.core.nssdk.mapper.toRemoteFood
-import info.nightscout.sdk.mapper.toRemoteTreatment
+import app.aaps.core.nssdk.mapper.toRemoteTreatment
-import info.nightscout.sdk.mapper.toSgv
+import app.aaps.core.nssdk.mapper.toSgv
-import info.nightscout.sdk.mapper.toTreatment
+import app.aaps.core.nssdk.mapper.toTreatment
-import info.nightscout.sdk.networking.NetworkStackBuilder
+import app.aaps.core.nssdk.networking.NetworkStackBuilder
-import info.nightscout.sdk.remotemodel.LastModified
+import app.aaps.core.nssdk.remotemodel.LastModified
-import info.nightscout.sdk.remotemodel.RemoteDeviceStatus
+import app.aaps.core.nssdk.remotemodel.RemoteDeviceStatus
-import info.nightscout.sdk.remotemodel.RemoteEntry
+import app.aaps.core.nssdk.remotemodel.RemoteEntry
-import info.nightscout.sdk.remotemodel.RemoteFood
+import app.aaps.core.nssdk.remotemodel.RemoteFood
-import info.nightscout.sdk.remotemodel.RemoteTreatment
+import app.aaps.core.nssdk.remotemodel.RemoteTreatment
-import info.nightscout.sdk.utils.retry
+import app.aaps.core.nssdk.utils.retry
-import info.nightscout.sdk.utils.toNotNull
+import app.aaps.core.nssdk.utils.toNotNull
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/NSAndroidRxClientImpl.kt

@@ -1,9 +1,9 @@
-package info.nightscout.sdk
+package app.aaps.core.nssdk
 
-import info.nightscout.sdk.interfaces.NSAndroidClient
+import app.aaps.core.nssdk.interfaces.NSAndroidClient
-import info.nightscout.sdk.interfaces.NSAndroidRxClient
+import app.aaps.core.nssdk.interfaces.NSAndroidRxClient
-import info.nightscout.sdk.localmodel.Status
+import app.aaps.core.nssdk.localmodel.Status
-import info.nightscout.sdk.remotemodel.LastModified
+import app.aaps.core.nssdk.remotemodel.LastModified
 import io.reactivex.rxjava3.core.Single
 import kotlinx.coroutines.rx3.rxSingle
 

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/exceptions/DateHeaderOutOfToleranceException.kt

@@ -1,4 +1,4 @@
-package info.nightscout.sdk.exceptions
+package app.aaps.core.nssdk.exceptions
 
 /**
  * Will be thrown if the server responds with 401 UNAUTHORIZED due to the Date Header being off

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/exceptions/InvalidAccessTokenException.kt

@@ -1,3 +1,3 @@
-package info.nightscout.sdk.exceptions
+package app.aaps.core.nssdk.exceptions
 
 class InvalidAccessTokenException : NightscoutException()

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/exceptions/InvalidFormatNightscoutException.kt

@@ -1,4 +1,4 @@
-package info.nightscout.sdk.exceptions
+package app.aaps.core.nssdk.exceptions
 
 @Suppress("unused")
 class InvalidFormatNightscoutException : NightscoutException {

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/exceptions/InvalidParameterNightscoutException.kt

@@ -1,4 +1,4 @@
-package info.nightscout.sdk.exceptions
+package app.aaps.core.nssdk.exceptions
 
 @Suppress("unused")
 class InvalidParameterNightscoutException : NightscoutException {

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/exceptions/NightscoutException.kt

@@ -1,4 +1,4 @@
-package info.nightscout.sdk.exceptions
+package app.aaps.core.nssdk.exceptions
 
 import java.io.IOException
 

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/exceptions/UnknownResponseNightscoutException.kt

@@ -1,3 +1,3 @@
-package info.nightscout.sdk.exceptions
+package app.aaps.core.nssdk.exceptions
 
 class UnknownResponseNightscoutException : NightscoutException()

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/exceptions/UnsuccessfullNightscoutException.kt

@@ -1,4 +1,4 @@
-package info.nightscout.sdk.exceptions
+package app.aaps.core.nssdk.exceptions
 
 class UnsuccessfullNightscoutException : NightscoutException {
     constructor() : super()

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/interfaces/NSAndroidCallbackClient.kt

@@ -1,6 +1,6 @@
-package info.nightscout.sdk.interfaces
+package app.aaps.core.nssdk.interfaces
 
-import info.nightscout.sdk.localmodel.Status
+import app.aaps.core.nssdk.localmodel.Status
 import kotlinx.coroutines.Job
 
 interface NSAndroidCallbackClient {

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/interfaces/NSAndroidClient.kt

@@ -1,12 +1,12 @@
-package info.nightscout.sdk.interfaces
+package app.aaps.core.nssdk.interfaces
 
-import info.nightscout.sdk.localmodel.Status
+import app.aaps.core.nssdk.localmodel.Status
-import info.nightscout.sdk.localmodel.devicestatus.NSDeviceStatus
+import app.aaps.core.nssdk.localmodel.devicestatus.NSDeviceStatus
-import info.nightscout.sdk.localmodel.entry.NSSgvV3
+import app.aaps.core.nssdk.localmodel.entry.NSSgvV3
-import info.nightscout.sdk.localmodel.food.NSFood
+import app.aaps.core.nssdk.localmodel.food.NSFood
-import info.nightscout.sdk.localmodel.treatment.CreateUpdateResponse
+import app.aaps.core.nssdk.localmodel.treatment.CreateUpdateResponse
-import info.nightscout.sdk.localmodel.treatment.NSTreatment
+import app.aaps.core.nssdk.localmodel.treatment.NSTreatment
-import info.nightscout.sdk.remotemodel.LastModified
+import app.aaps.core.nssdk.remotemodel.LastModified
 import org.json.JSONObject
 
 interface NSAndroidClient {

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/interfaces/NSAndroidRxClient.kt

@@ -1,7 +1,7 @@
-package info.nightscout.sdk.interfaces
+package app.aaps.core.nssdk.interfaces
 
-import info.nightscout.sdk.localmodel.Status
+import app.aaps.core.nssdk.localmodel.Status
-import info.nightscout.sdk.remotemodel.LastModified
+import app.aaps.core.nssdk.remotemodel.LastModified
 import io.reactivex.rxjava3.core.Single
 
 interface NSAndroidRxClient {

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/interfaces/RunningConfiguration.kt

@@ -1,6 +1,6 @@
-package info.nightscout.sdk.interfaces
+package app.aaps.core.nssdk.interfaces
 
-import info.nightscout.sdk.localmodel.devicestatus.NSDeviceStatus
+import app.aaps.core.nssdk.localmodel.devicestatus.NSDeviceStatus
 import org.json.JSONObject
 
 interface RunningConfiguration {

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/ApiPermission.kt

@@ -1,4 +1,4 @@
-package info.nightscout.sdk.localmodel
+package app.aaps.core.nssdk.localmodel
 
 data class ApiPermission(
     val create: Boolean,

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/ApiPermissions.kt

@@ -1,4 +1,4 @@
-package info.nightscout.sdk.localmodel
+package app.aaps.core.nssdk.localmodel
 
 data class ApiPermissions(
     val deviceStatus: ApiPermission,

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/Status.kt

@@ -1,4 +1,4 @@
-package info.nightscout.sdk.localmodel
+package app.aaps.core.nssdk.localmodel
 
 data class Status(
     val version: String,

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/Storage.kt

@@ -1,3 +1,3 @@
-package info.nightscout.sdk.localmodel
+package app.aaps.core.nssdk.localmodel
 
 data class Storage(val storage: String, val version: String)

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/devicestatus/NSDeviceStatus.kt

@@ -1,4 +1,4 @@
-package info.nightscout.sdk.localmodel.devicestatus
+package app.aaps.core.nssdk.localmodel.devicestatus
 
 import com.google.gson.annotations.SerializedName
 import kotlinx.serialization.Contextual

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/entry/Direction.kt

@@ -1,4 +1,4 @@
-package info.nightscout.sdk.localmodel.entry
+package app.aaps.core.nssdk.localmodel.entry
 
 enum class Direction(val nsName: String, val txtIcon: String) {
     TRIPLE_DOWN("TripleDown", "\u290B"), // ⤋

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/entry/NSSgvV3.kt

@@ -1,4 +1,4 @@
-package info.nightscout.sdk.localmodel.entry
+package app.aaps.core.nssdk.localmodel.entry
 
 data class NSSgvV3(
     var date: Long?,

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/entry/NsUnits.kt

@@ -1,4 +1,4 @@
-package info.nightscout.sdk.localmodel.entry
+package app.aaps.core.nssdk.localmodel.entry
 
 enum class NsUnits(val value: String) {
     MG_DL("mg/dl"),

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/food/NSFood.kt

@@ -1,6 +1,6 @@
-package info.nightscout.sdk.localmodel.food
+package app.aaps.core.nssdk.localmodel.food
 
-import info.nightscout.sdk.localmodel.entry.NsUnits
+import app.aaps.core.nssdk.localmodel.entry.NsUnits
 
 data class NSFood(
     val date: Long,

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/CreateUpdateResponse.kt

@@ -1,4 +1,4 @@
-package info.nightscout.sdk.localmodel.treatment
+package app.aaps.core.nssdk.localmodel.treatment
 
 class CreateUpdateResponse(
     val response: Int,

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/EventType.kt

@@ -1,4 +1,4 @@
-package info.nightscout.sdk.localmodel.treatment
+package app.aaps.core.nssdk.localmodel.treatment
 
 import com.google.gson.annotations.SerializedName
 

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/GlucoseType.kt

@@ -1,4 +1,4 @@
-package info.nightscout.sdk.localmodel.treatment
+package app.aaps.core.nssdk.localmodel.treatment
 
 import com.google.gson.annotations.SerializedName
 

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSBolus.kt

@@ -1,6 +1,6 @@
-package info.nightscout.sdk.localmodel.treatment
+package app.aaps.core.nssdk.localmodel.treatment
 
-import info.nightscout.sdk.localmodel.entry.NsUnits
+import app.aaps.core.nssdk.localmodel.entry.NsUnits
 
 data class NSBolus(
     override var date: Long?,

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSBolusWizard.kt

@@ -1,6 +1,6 @@
-package info.nightscout.sdk.localmodel.treatment
+package app.aaps.core.nssdk.localmodel.treatment
 
-import info.nightscout.sdk.localmodel.entry.NsUnits
+import app.aaps.core.nssdk.localmodel.entry.NsUnits
 
 data class NSBolusWizard(
     override var date: Long?,

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSCarbs.kt

@@ -1,6 +1,6 @@
-package info.nightscout.sdk.localmodel.treatment
+package app.aaps.core.nssdk.localmodel.treatment
 
-import info.nightscout.sdk.localmodel.entry.NsUnits
+import app.aaps.core.nssdk.localmodel.entry.NsUnits
 
 data class NSCarbs(
     override var date: Long?,

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSEffectiveProfileSwitch.kt

@@ -1,6 +1,6 @@
-package info.nightscout.sdk.localmodel.treatment
+package app.aaps.core.nssdk.localmodel.treatment
 
-import info.nightscout.sdk.localmodel.entry.NsUnits
+import app.aaps.core.nssdk.localmodel.entry.NsUnits
 import org.json.JSONObject
 
 data class NSEffectiveProfileSwitch(

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSExtendedBolus.kt

@@ -1,6 +1,6 @@
-package info.nightscout.sdk.localmodel.treatment
+package app.aaps.core.nssdk.localmodel.treatment
 
-import info.nightscout.sdk.localmodel.entry.NsUnits
+import app.aaps.core.nssdk.localmodel.entry.NsUnits
 
 data class NSExtendedBolus(
     override var date: Long?,

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSOfflineEvent.kt

@@ -1,6 +1,6 @@
-package info.nightscout.sdk.localmodel.treatment
+package app.aaps.core.nssdk.localmodel.treatment
 
-import info.nightscout.sdk.localmodel.entry.NsUnits
+import app.aaps.core.nssdk.localmodel.entry.NsUnits
 
 data class NSOfflineEvent(
     override var date: Long?,

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSProfileSwitch.kt

@@ -1,6 +1,6 @@
-package info.nightscout.sdk.localmodel.treatment
+package app.aaps.core.nssdk.localmodel.treatment
 
-import info.nightscout.sdk.localmodel.entry.NsUnits
+import app.aaps.core.nssdk.localmodel.entry.NsUnits
 import org.json.JSONObject
 
 data class NSProfileSwitch(

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSTemporaryBasal.kt

@@ -1,6 +1,6 @@
-package info.nightscout.sdk.localmodel.treatment
+package app.aaps.core.nssdk.localmodel.treatment
 
-import info.nightscout.sdk.localmodel.entry.NsUnits
+import app.aaps.core.nssdk.localmodel.entry.NsUnits
 
 data class NSTemporaryBasal(
     override var date: Long?,

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSTemporaryTarget.kt

@@ -1,6 +1,6 @@
-package info.nightscout.sdk.localmodel.treatment
+package app.aaps.core.nssdk.localmodel.treatment
 
-import info.nightscout.sdk.localmodel.entry.NsUnits
+import app.aaps.core.nssdk.localmodel.entry.NsUnits
 
 data class NSTemporaryTarget(
     override var date: Long?,

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSTherapyEvent.kt

@@ -1,7 +1,7 @@
-package info.nightscout.sdk.localmodel.treatment
+package app.aaps.core.nssdk.localmodel.treatment
 
 import com.google.gson.annotations.SerializedName
-import info.nightscout.sdk.localmodel.entry.NsUnits
+import app.aaps.core.nssdk.localmodel.entry.NsUnits
 
 data class NSTherapyEvent(
     override var date: Long?,

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSTreatment.kt

@@ -1,6 +1,6 @@
-package info.nightscout.sdk.localmodel.treatment
+package app.aaps.core.nssdk.localmodel.treatment
 
-import info.nightscout.sdk.localmodel.entry.NsUnits
+import app.aaps.core.nssdk.localmodel.entry.NsUnits
 
 interface NSTreatment {
     var date: Long?

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/mapper/ApiPermissionMapper.kt

@@ -1,10 +1,10 @@
-package info.nightscout.sdk.mapper
+package app.aaps.core.nssdk.mapper
 
-import info.nightscout.sdk.localmodel.ApiPermission
+import app.aaps.core.nssdk.localmodel.ApiPermission
-import info.nightscout.sdk.localmodel.ApiPermissions
+import app.aaps.core.nssdk.localmodel.ApiPermissions
-import info.nightscout.sdk.remotemodel.RemoteApiPermission
+import app.aaps.core.nssdk.remotemodel.RemoteApiPermission
-import info.nightscout.sdk.remotemodel.RemoteApiPermissions
+import app.aaps.core.nssdk.remotemodel.RemoteApiPermissions
-import info.nightscout.sdk.remotemodel.read
+import app.aaps.core.nssdk.remotemodel.read
 
 internal fun RemoteApiPermissions.toLocal(): ApiPermissions =
     ApiPermissions(

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/mapper/DeviceStatusMapper.kt

@@ -1,9 +1,9 @@
-package info.nightscout.sdk.mapper
+package app.aaps.core.nssdk.mapper
 
 import com.google.gson.Gson
 import com.google.gson.JsonParser
-import info.nightscout.sdk.localmodel.devicestatus.NSDeviceStatus
+import app.aaps.core.nssdk.localmodel.devicestatus.NSDeviceStatus
-import info.nightscout.sdk.remotemodel.RemoteDeviceStatus
+import app.aaps.core.nssdk.remotemodel.RemoteDeviceStatus
 import org.json.JSONObject
 
 fun NSDeviceStatus.convertToRemoteAndBack(): NSDeviceStatus =

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/mapper/FoodMapper.kt

@@ -1,8 +1,8 @@
-package info.nightscout.sdk.mapper
+package app.aaps.core.nssdk.mapper
 
 import com.google.gson.Gson
-import info.nightscout.sdk.localmodel.food.NSFood
+import app.aaps.core.nssdk.localmodel.food.NSFood
-import info.nightscout.sdk.remotemodel.RemoteFood
+import app.aaps.core.nssdk.remotemodel.RemoteFood
 
 /**
  * Convert to [RemoteFood] and back to [NSFood]

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/mapper/StatusResponseMapper.kt

@@ -1,7 +1,7 @@
-package info.nightscout.sdk.mapper
+package app.aaps.core.nssdk.mapper
 
-import info.nightscout.sdk.localmodel.Status
+import app.aaps.core.nssdk.localmodel.Status
-import info.nightscout.sdk.remotemodel.RemoteStatusResponse
+import app.aaps.core.nssdk.remotemodel.RemoteStatusResponse
 
 internal fun RemoteStatusResponse.toLocal() = Status(
     version = version,

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/mapper/StorageMapper.kt

@@ -0,0 +1,6 @@
+package app.aaps.core.nssdk.mapper
+
+import app.aaps.core.nssdk.localmodel.Storage
+import app.aaps.core.nssdk.remotemodel.RemoteStorage
+
+internal fun RemoteStorage.toLocal() = Storage(storage = storage, version = version)

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/mapper/SvgMapper.kt

@@ -1,10 +1,10 @@
-package info.nightscout.sdk.mapper
+package app.aaps.core.nssdk.mapper
 
 import com.google.gson.Gson
-import info.nightscout.sdk.localmodel.entry.Direction
+import app.aaps.core.nssdk.localmodel.entry.Direction
-import info.nightscout.sdk.localmodel.entry.NSSgvV3
+import app.aaps.core.nssdk.localmodel.entry.NSSgvV3
-import info.nightscout.sdk.localmodel.entry.NsUnits
+import app.aaps.core.nssdk.localmodel.entry.NsUnits
-import info.nightscout.sdk.remotemodel.RemoteEntry
+import app.aaps.core.nssdk.remotemodel.RemoteEntry
 
 fun NSSgvV3.convertToRemoteAndBack(): NSSgvV3? =
     toRemoteEntry().toSgv()

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/mapper/TreatmentMapper.kt

@@ -1,20 +1,20 @@
-package info.nightscout.sdk.mapper
+package app.aaps.core.nssdk.mapper
 
 import com.google.gson.Gson
-import info.nightscout.sdk.localmodel.entry.NsUnits
+import app.aaps.core.nssdk.localmodel.entry.NsUnits
-import info.nightscout.sdk.localmodel.treatment.EventType
+import app.aaps.core.nssdk.localmodel.treatment.EventType
-import info.nightscout.sdk.localmodel.treatment.NSBolus
+import app.aaps.core.nssdk.localmodel.treatment.NSBolus
-import info.nightscout.sdk.localmodel.treatment.NSBolusWizard
+import app.aaps.core.nssdk.localmodel.treatment.NSBolusWizard
-import info.nightscout.sdk.localmodel.treatment.NSCarbs
+import app.aaps.core.nssdk.localmodel.treatment.NSCarbs
-import info.nightscout.sdk.localmodel.treatment.NSEffectiveProfileSwitch
+import app.aaps.core.nssdk.localmodel.treatment.NSEffectiveProfileSwitch
-import info.nightscout.sdk.localmodel.treatment.NSExtendedBolus
+import app.aaps.core.nssdk.localmodel.treatment.NSExtendedBolus
-import info.nightscout.sdk.localmodel.treatment.NSOfflineEvent
+import app.aaps.core.nssdk.localmodel.treatment.NSOfflineEvent
-import info.nightscout.sdk.localmodel.treatment.NSProfileSwitch
+import app.aaps.core.nssdk.localmodel.treatment.NSProfileSwitch
-import info.nightscout.sdk.localmodel.treatment.NSTemporaryBasal
+import app.aaps.core.nssdk.localmodel.treatment.NSTemporaryBasal
-import info.nightscout.sdk.localmodel.treatment.NSTemporaryTarget
+import app.aaps.core.nssdk.localmodel.treatment.NSTemporaryTarget
-import info.nightscout.sdk.localmodel.treatment.NSTherapyEvent
+import app.aaps.core.nssdk.localmodel.treatment.NSTherapyEvent
-import info.nightscout.sdk.localmodel.treatment.NSTreatment
+import app.aaps.core.nssdk.localmodel.treatment.NSTreatment
-import info.nightscout.sdk.remotemodel.RemoteTreatment
+import app.aaps.core.nssdk.remotemodel.RemoteTreatment
 import org.json.JSONObject
 import java.util.concurrent.TimeUnit
 
@@ -33,7 +33,7 @@ fun String.toNSTreatment(): NSTreatment? =
 internal fun RemoteTreatment.toTreatment(): NSTreatment? {
     val treatmentTimestamp = timestamp()
     when {
-        insulin != null && insulin > 0 ->
+        insulin != null && insulin > 0                                     ->
             return NSBolus(
                 date = treatmentTimestamp,
                 device = this.device,

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/networking/NSAuthInterceptor.kt

@@ -1,9 +1,9 @@
-package info.nightscout.sdk.networking
+package app.aaps.core.nssdk.networking
 
-import info.nightscout.sdk.exceptions.DateHeaderOutOfToleranceException
+import app.aaps.core.nssdk.exceptions.DateHeaderOutOfToleranceException
-import info.nightscout.sdk.exceptions.InvalidAccessTokenException
+import app.aaps.core.nssdk.exceptions.InvalidAccessTokenException
-import info.nightscout.sdk.networking.Status.MESSAGE_DATE_HEADER_OUT_OF_TOLERANCE
+import app.aaps.core.nssdk.networking.Status.MESSAGE_DATE_HEADER_OUT_OF_TOLERANCE
-import info.nightscout.sdk.remotemodel.RemoteAuthResponse
+import app.aaps.core.nssdk.remotemodel.RemoteAuthResponse
 import okhttp3.Interceptor
 import okhttp3.Request
 import okhttp3.Response

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/networking/NetworkStackBuilder.kt

@@ -1,4 +1,4 @@
-package info.nightscout.sdk.networking
+package app.aaps.core.nssdk.networking
 
 import android.content.Context
 import com.google.gson.Gson

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/networking/NightscoutAuthRefreshService.kt

@@ -1,6 +1,6 @@
-package info.nightscout.sdk.networking
+package app.aaps.core.nssdk.networking
 
-import info.nightscout.sdk.remotemodel.RemoteAuthResponse
+import app.aaps.core.nssdk.remotemodel.RemoteAuthResponse
 import retrofit2.Call
 import retrofit2.http.GET
 import retrofit2.http.Path

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/networking/NightscoutRemoteService.kt

@@ -1,14 +1,14 @@
-package info.nightscout.sdk.networking
+package app.aaps.core.nssdk.networking
 
 import com.google.gson.JsonObject
-import info.nightscout.sdk.remotemodel.LastModified
+import app.aaps.core.nssdk.remotemodel.LastModified
-import info.nightscout.sdk.remotemodel.NSResponse
+import app.aaps.core.nssdk.remotemodel.NSResponse
-import info.nightscout.sdk.remotemodel.RemoteCreateUpdateResponse
+import app.aaps.core.nssdk.remotemodel.RemoteCreateUpdateResponse
-import info.nightscout.sdk.remotemodel.RemoteDeviceStatus
+import app.aaps.core.nssdk.remotemodel.RemoteDeviceStatus
-import info.nightscout.sdk.remotemodel.RemoteEntry
+import app.aaps.core.nssdk.remotemodel.RemoteEntry
-import info.nightscout.sdk.remotemodel.RemoteFood
+import app.aaps.core.nssdk.remotemodel.RemoteFood
-import info.nightscout.sdk.remotemodel.RemoteStatusResponse
+import app.aaps.core.nssdk.remotemodel.RemoteStatusResponse
-import info.nightscout.sdk.remotemodel.RemoteTreatment
+import app.aaps.core.nssdk.remotemodel.RemoteTreatment
 import org.json.JSONObject
 import retrofit2.Response
 import retrofit2.http.Body

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/networking/Status.kt

@@ -1,4 +1,4 @@
-package info.nightscout.sdk.networking
+package app.aaps.core.nssdk.networking
 
 internal object Status {
 

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/remotemodel/LastModified.kt

@@ -1,4 +1,4 @@
-package info.nightscout.sdk.remotemodel
+package app.aaps.core.nssdk.remotemodel
 
 import com.google.gson.annotations.SerializedName
 import kotlinx.serialization.Serializable

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/remotemodel/RemoteAuthResponse.kt

@@ -1,3 +1,3 @@
-package info.nightscout.sdk.remotemodel
+package app.aaps.core.nssdk.remotemodel
 
 internal data class RemoteAuthResponse(val token: String, val iat: Long, val exp: Long)

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/remotemodel/RemoteDeviceStatus.kt

@@ -1,4 +1,4 @@
-package info.nightscout.sdk.remotemodel
+package app.aaps.core.nssdk.remotemodel
 
 import com.google.gson.JsonObject
 import com.google.gson.annotations.SerializedName

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/remotemodel/RemoteEntry.kt

@@ -1,4 +1,4 @@
-package info.nightscout.sdk.remotemodel
+package app.aaps.core.nssdk.remotemodel
 
 import com.google.gson.annotations.SerializedName
 

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/remotemodel/RemoteFood.kt

@@ -1,4 +1,4 @@
-package info.nightscout.sdk.remotemodel
+package app.aaps.core.nssdk.remotemodel
 
 import com.google.gson.annotations.SerializedName
 

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/remotemodel/RemoteProfileStore.kt

@@ -1,4 +1,4 @@
-package info.nightscout.sdk.remotemodel
+package app.aaps.core.nssdk.remotemodel
 
 import com.google.gson.annotations.SerializedName
 import kotlinx.serialization.Contextual

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/remotemodel/RemoteStatusResponse.kt

@@ -1,4 +1,4 @@
-package info.nightscout.sdk.remotemodel
+package app.aaps.core.nssdk.remotemodel
 
 import com.google.gson.annotations.SerializedName
 

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/remotemodel/RemoteTreatment.kt

@@ -1,7 +1,7 @@
-package info.nightscout.sdk.remotemodel
+package app.aaps.core.nssdk.remotemodel
 
 import com.google.gson.annotations.SerializedName
-import info.nightscout.sdk.localmodel.treatment.EventType
+import app.aaps.core.nssdk.localmodel.treatment.EventType
 import org.joda.time.DateTime
 import org.joda.time.format.ISODateTimeFormat
 

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/utils/CoroutineUtils.kt

@@ -1,4 +1,4 @@
-package info.nightscout.sdk.utils
+package app.aaps.core.nssdk.utils
 
 import kotlinx.coroutines.delay
 import kotlin.reflect.KClass

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/utils/ListUtils.kt

@@ -1,4 +1,4 @@
-package info.nightscout.sdk.utils
+package app.aaps.core.nssdk.utils
 
 @JvmSynthetic
 internal fun <E> List<E?>?.toNotNull(): List<E> = this?.filterNotNull() ?: listOf()

plugins/aps/build.gradle

@@ -19,7 +19,7 @@ dependencies {
     implementation project(':database:impl')
     implementation project(':core:main')
     implementation project(':core:interfaces')
-    implementation project(':core:ns-sdk')
+    implementation project(':core:nssdk')
     implementation project(':core:utils')
     implementation project(':core:ui')
     implementation project(':core:validators')

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

@@ -75,7 +75,7 @@ import info.nightscout.database.impl.transactions.InsertTherapyEventAnnouncement
 import info.nightscout.plugins.aps.R
 import info.nightscout.plugins.aps.loop.events.EventLoopSetLastRunGui
 import info.nightscout.plugins.aps.loop.extensions.json
-import info.nightscout.sdk.interfaces.RunningConfiguration
+import app.aaps.core.nssdk.interfaces.RunningConfiguration
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import org.json.JSONObject

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

@@ -24,7 +24,7 @@ import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.pump.virtual.VirtualPumpPlugin
-import info.nightscout.sdk.interfaces.RunningConfiguration
+import app.aaps.core.nssdk.interfaces.RunningConfiguration
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.mockito.Mock

plugins/configuration/build.gradle

@@ -20,7 +20,7 @@ dependencies {
     implementation project(':database:entities')
     implementation project(':core:interfaces')
     implementation project(':core:main')
-    implementation project(':core:ns-sdk')
+    implementation project(':core:nssdk')
     implementation project(':core:utils')
     implementation project(':core:ui')
     implementation project(':core:validators')

plugins/configuration/src/main/kotlin/app/aaps/configuration/configBuilder/RunningConfigurationImpl.kt

@@ -18,8 +18,8 @@ import app.aaps.core.interfaces.rx.events.EventNSClientNewLog
 import app.aaps.core.interfaces.sharedPreferences.SP
 import app.aaps.core.interfaces.smoothing.Smoothing
 import app.aaps.core.interfaces.ui.UiInteraction
-import info.nightscout.sdk.interfaces.RunningConfiguration
+import app.aaps.core.nssdk.interfaces.RunningConfiguration
-import info.nightscout.sdk.localmodel.devicestatus.NSDeviceStatus
+import app.aaps.core.nssdk.localmodel.devicestatus.NSDeviceStatus
 import org.json.JSONException
 import org.json.JSONObject
 import javax.inject.Inject

plugins/configuration/src/main/kotlin/app/aaps/configuration/di/ConfigurationModule.kt

@@ -19,7 +19,7 @@ import app.aaps.core.interfaces.maintenance.PrefFileListProvider
 import dagger.Binds
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
-import info.nightscout.sdk.interfaces.RunningConfiguration
+import app.aaps.core.nssdk.interfaces.RunningConfiguration
 
 @Module(
     includes = [

plugins/main/build.gradle

@@ -21,7 +21,7 @@ dependencies {
     implementation project(':core:graphview')
     implementation project(':core:interfaces')
     implementation project(':core:main')
-    implementation project(':core:ns-sdk')
+    implementation project(':core:nssdk')
     implementation project(':core:ui')
     implementation project(':core:utils')
     implementation project(':core:validators')

plugins/source/build.gradle

@@ -21,7 +21,7 @@ dependencies {
     implementation project(':database:impl')
     implementation project(':core:interfaces')
     implementation project(':core:main')
-    implementation project(':core:ns-sdk')
+    implementation project(':core:nssdk')
     implementation project(':core:ui')
     implementation project(':core:utils')
 

plugins/sync/build.gradle

@@ -20,7 +20,7 @@ dependencies {
     implementation project(':database:impl')
     implementation project(':core:main')
     implementation project(':core:interfaces')
-    implementation project(':core:ns-sdk')
+    implementation project(':core:nssdk')
     implementation project(':core:ui')
     implementation project(':core:utils')
     implementation project(':core:validators')

plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NsIncomingDataProcessor.kt

@@ -35,19 +35,19 @@ import info.nightscout.plugins.sync.nsclientV3.extensions.toTemporaryBasal
 import info.nightscout.plugins.sync.nsclientV3.extensions.toTemporaryTarget
 import info.nightscout.plugins.sync.nsclientV3.extensions.toTherapyEvent
 import info.nightscout.plugins.sync.nsclientV3.extensions.toTransactionGlucoseValue
-import info.nightscout.sdk.localmodel.entry.NSSgvV3
+import app.aaps.core.nssdk.localmodel.entry.NSSgvV3
-import info.nightscout.sdk.localmodel.food.NSFood
+import app.aaps.core.nssdk.localmodel.food.NSFood
-import info.nightscout.sdk.localmodel.treatment.NSBolus
+import app.aaps.core.nssdk.localmodel.treatment.NSBolus
-import info.nightscout.sdk.localmodel.treatment.NSBolusWizard
+import app.aaps.core.nssdk.localmodel.treatment.NSBolusWizard
-import info.nightscout.sdk.localmodel.treatment.NSCarbs
+import app.aaps.core.nssdk.localmodel.treatment.NSCarbs
-import info.nightscout.sdk.localmodel.treatment.NSEffectiveProfileSwitch
+import app.aaps.core.nssdk.localmodel.treatment.NSEffectiveProfileSwitch
-import info.nightscout.sdk.localmodel.treatment.NSExtendedBolus
+import app.aaps.core.nssdk.localmodel.treatment.NSExtendedBolus
-import info.nightscout.sdk.localmodel.treatment.NSOfflineEvent
+import app.aaps.core.nssdk.localmodel.treatment.NSOfflineEvent
-import info.nightscout.sdk.localmodel.treatment.NSProfileSwitch
+import app.aaps.core.nssdk.localmodel.treatment.NSProfileSwitch
-import info.nightscout.sdk.localmodel.treatment.NSTemporaryBasal
+import app.aaps.core.nssdk.localmodel.treatment.NSTemporaryBasal
-import info.nightscout.sdk.localmodel.treatment.NSTemporaryTarget
+import app.aaps.core.nssdk.localmodel.treatment.NSTemporaryTarget
-import info.nightscout.sdk.localmodel.treatment.NSTherapyEvent
+import app.aaps.core.nssdk.localmodel.treatment.NSTherapyEvent
-import info.nightscout.sdk.localmodel.treatment.NSTreatment
+import app.aaps.core.nssdk.localmodel.treatment.NSTreatment
 import org.json.JSONArray
 import org.json.JSONObject
 import javax.inject.Inject

plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSDeviceStatusHandler.kt

@@ -7,8 +7,8 @@ import app.aaps.core.interfaces.sharedPreferences.SP
 import app.aaps.core.interfaces.utils.DateUtil
 import info.nightscout.core.utils.HtmlHelper
 import info.nightscout.core.utils.JsonHelper
-import info.nightscout.sdk.interfaces.RunningConfiguration
+import app.aaps.core.nssdk.interfaces.RunningConfiguration
-import info.nightscout.sdk.localmodel.devicestatus.NSDeviceStatus
+import app.aaps.core.nssdk.localmodel.devicestatus.NSDeviceStatus
 import javax.inject.Inject
 import javax.inject.Singleton
 

plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/services/NSClientService.kt

@@ -51,7 +51,7 @@ 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.sdk.localmodel.devicestatus.NSDeviceStatus
+import app.aaps.core.nssdk.localmodel.devicestatus.NSDeviceStatus
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import io.socket.client.IO

plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt

@@ -84,13 +84,13 @@ import info.nightscout.plugins.sync.nsclientV3.workers.LoadLastModificationWorke
 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.sdk.NSAndroidClientImpl
+import app.aaps.core.nssdk.NSAndroidClientImpl
-import info.nightscout.sdk.interfaces.NSAndroidClient
+import app.aaps.core.nssdk.interfaces.NSAndroidClient
-import info.nightscout.sdk.mapper.toNSDeviceStatus
+import app.aaps.core.nssdk.mapper.toNSDeviceStatus
-import info.nightscout.sdk.mapper.toNSFood
+import app.aaps.core.nssdk.mapper.toNSFood
-import info.nightscout.sdk.mapper.toNSSgvV3
+import app.aaps.core.nssdk.mapper.toNSSgvV3
-import info.nightscout.sdk.mapper.toNSTreatment
+import app.aaps.core.nssdk.mapper.toNSTreatment
-import info.nightscout.sdk.remotemodel.LastModified
+import app.aaps.core.nssdk.remotemodel.LastModified
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import io.socket.client.Ack

plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/BolusCalculatorResultExtension.kt

@@ -4,9 +4,9 @@ import app.aaps.core.interfaces.utils.T
 import com.google.gson.Gson
 import com.google.gson.JsonSyntaxException
 import info.nightscout.database.entities.BolusCalculatorResult
-import info.nightscout.sdk.localmodel.entry.NsUnits
+import app.aaps.core.nssdk.localmodel.entry.NsUnits
-import info.nightscout.sdk.localmodel.treatment.EventType
+import app.aaps.core.nssdk.localmodel.treatment.EventType
-import info.nightscout.sdk.localmodel.treatment.NSBolusWizard
+import app.aaps.core.nssdk.localmodel.treatment.NSBolusWizard
 
 fun NSBolusWizard.toBolusCalculatorResult(): BolusCalculatorResult? =
     try {

plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/BolusExtension.kt

@@ -3,8 +3,8 @@ package info.nightscout.plugins.sync.nsclientV3.extensions
 import app.aaps.core.interfaces.utils.T
 import info.nightscout.database.entities.Bolus
 import info.nightscout.database.entities.embedments.InterfaceIDs
-import info.nightscout.sdk.localmodel.treatment.EventType
+import app.aaps.core.nssdk.localmodel.treatment.EventType
-import info.nightscout.sdk.localmodel.treatment.NSBolus
+import app.aaps.core.nssdk.localmodel.treatment.NSBolus
 import java.security.InvalidParameterException
 
 fun NSBolus.toBolus(): Bolus =

plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/CarbsExtension.kt

@@ -3,8 +3,8 @@ package info.nightscout.plugins.sync.nsclientV3.extensions
 import app.aaps.core.interfaces.utils.T
 import info.nightscout.database.entities.Carbs
 import info.nightscout.database.entities.embedments.InterfaceIDs
-import info.nightscout.sdk.localmodel.treatment.EventType
+import app.aaps.core.nssdk.localmodel.treatment.EventType
-import info.nightscout.sdk.localmodel.treatment.NSCarbs
+import app.aaps.core.nssdk.localmodel.treatment.NSCarbs
 import java.security.InvalidParameterException
 
 fun NSCarbs.toCarbs(): Carbs =

plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/DeviceStatusExtension.kt

@@ -3,7 +3,7 @@ package info.nightscout.plugins.sync.nsclientV3.extensions
 import com.google.gson.GsonBuilder
 import com.google.gson.JsonDeserializer
 import info.nightscout.database.entities.DeviceStatus
-import info.nightscout.sdk.localmodel.devicestatus.NSDeviceStatus
+import app.aaps.core.nssdk.localmodel.devicestatus.NSDeviceStatus
 import org.json.JSONObject
 
 fun DeviceStatus.toNSDeviceStatus(): NSDeviceStatus {

plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/EffectiveProfileSwitchExtension.kt

@@ -7,8 +7,8 @@ import app.aaps.core.interfaces.utils.T
 import info.nightscout.database.entities.EffectiveProfileSwitch
 import info.nightscout.database.entities.embedments.InterfaceIDs
 import info.nightscout.plugins.sync.nsclient.extensions.fromConstant
-import info.nightscout.sdk.localmodel.treatment.EventType
+import app.aaps.core.nssdk.localmodel.treatment.EventType
-import info.nightscout.sdk.localmodel.treatment.NSEffectiveProfileSwitch
+import app.aaps.core.nssdk.localmodel.treatment.NSEffectiveProfileSwitch
 import java.security.InvalidParameterException
 
 fun NSEffectiveProfileSwitch.toEffectiveProfileSwitch(dateUtil: DateUtil): EffectiveProfileSwitch? {

plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/ExtendedBolusExtension.kt

@@ -5,9 +5,9 @@ import app.aaps.core.interfaces.profile.Profile
 import app.aaps.core.interfaces.utils.T
 import info.nightscout.database.entities.ExtendedBolus
 import info.nightscout.database.entities.embedments.InterfaceIDs
-import info.nightscout.sdk.localmodel.treatment.EventType
+import app.aaps.core.nssdk.localmodel.treatment.EventType
-import info.nightscout.sdk.localmodel.treatment.NSExtendedBolus
+import app.aaps.core.nssdk.localmodel.treatment.NSExtendedBolus
-import info.nightscout.sdk.localmodel.treatment.NSTreatment
+import app.aaps.core.nssdk.localmodel.treatment.NSTreatment
 import java.security.InvalidParameterException
 
 fun NSExtendedBolus.toExtendedBolus(): ExtendedBolus =

plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/FoodExtension.kt

@@ -2,7 +2,7 @@ package info.nightscout.plugins.sync.nsclientV3.extensions
 
 import info.nightscout.database.entities.Food
 import info.nightscout.database.entities.embedments.InterfaceIDs
-import info.nightscout.sdk.localmodel.food.NSFood
+import app.aaps.core.nssdk.localmodel.food.NSFood
 
 fun NSFood.toFood(): Food =
     Food(

plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/GlucoseValueExtension.kt

@@ -3,9 +3,9 @@ package info.nightscout.plugins.sync.nsclientV3.extensions
 import app.aaps.core.interfaces.utils.T
 import info.nightscout.database.entities.GlucoseValue
 import info.nightscout.database.transactions.TransactionGlucoseValue
-import info.nightscout.sdk.localmodel.entry.Direction
+import app.aaps.core.nssdk.localmodel.entry.Direction
-import info.nightscout.sdk.localmodel.entry.NSSgvV3
+import app.aaps.core.nssdk.localmodel.entry.NSSgvV3
-import info.nightscout.sdk.localmodel.entry.NsUnits
+import app.aaps.core.nssdk.localmodel.entry.NsUnits
 import java.security.InvalidParameterException
 
 fun NSSgvV3.toTransactionGlucoseValue(): TransactionGlucoseValue {

plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/OfflineEventExtension.kt

@@ -3,8 +3,8 @@ package info.nightscout.plugins.sync.nsclientV3.extensions
 import app.aaps.core.interfaces.utils.T
 import info.nightscout.database.entities.OfflineEvent
 import info.nightscout.database.entities.embedments.InterfaceIDs
-import info.nightscout.sdk.localmodel.treatment.EventType
+import app.aaps.core.nssdk.localmodel.treatment.EventType
-import info.nightscout.sdk.localmodel.treatment.NSOfflineEvent
+import app.aaps.core.nssdk.localmodel.treatment.NSOfflineEvent
 import java.security.InvalidParameterException
 
 fun NSOfflineEvent.toOfflineEvent(): OfflineEvent =

plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/ProfileSwitchExtension.kt

@@ -10,8 +10,8 @@ import app.aaps.core.interfaces.utils.DecimalFormatter
 import app.aaps.core.interfaces.utils.T
 import info.nightscout.database.entities.ProfileSwitch
 import info.nightscout.database.entities.embedments.InterfaceIDs
-import info.nightscout.sdk.localmodel.treatment.EventType
+import app.aaps.core.nssdk.localmodel.treatment.EventType
-import info.nightscout.sdk.localmodel.treatment.NSProfileSwitch
+import app.aaps.core.nssdk.localmodel.treatment.NSProfileSwitch
 import java.security.InvalidParameterException
 
 fun NSProfileSwitch.toProfileSwitch(activePlugin: ActivePlugin, dateUtil: DateUtil): ProfileSwitch? {

plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/TemporaryBasalExtension.kt

@@ -5,8 +5,8 @@ import app.aaps.core.interfaces.profile.Profile
 import app.aaps.core.interfaces.utils.T
 import info.nightscout.database.entities.TemporaryBasal
 import info.nightscout.database.entities.embedments.InterfaceIDs
-import info.nightscout.sdk.localmodel.treatment.EventType
+import app.aaps.core.nssdk.localmodel.treatment.EventType
-import info.nightscout.sdk.localmodel.treatment.NSTemporaryBasal
+import app.aaps.core.nssdk.localmodel.treatment.NSTemporaryBasal
 import java.security.InvalidParameterException
 
 fun NSTemporaryBasal.toTemporaryBasal(): TemporaryBasal =

plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/TemporaryTargetExtension.kt

@@ -3,9 +3,9 @@ package info.nightscout.plugins.sync.nsclientV3.extensions
 import app.aaps.core.interfaces.utils.T
 import info.nightscout.database.entities.TemporaryTarget
 import info.nightscout.database.entities.embedments.InterfaceIDs
-import info.nightscout.sdk.localmodel.entry.NsUnits
+import app.aaps.core.nssdk.localmodel.entry.NsUnits
-import info.nightscout.sdk.localmodel.treatment.EventType
+import app.aaps.core.nssdk.localmodel.treatment.EventType
-import info.nightscout.sdk.localmodel.treatment.NSTemporaryTarget
+import app.aaps.core.nssdk.localmodel.treatment.NSTemporaryTarget
 import java.security.InvalidParameterException
 
 fun NSTemporaryTarget.toTemporaryTarget(): TemporaryTarget =

plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/TherapyEventExtension.kt

@@ -3,9 +3,9 @@ package info.nightscout.plugins.sync.nsclientV3.extensions
 import app.aaps.core.interfaces.utils.T
 import info.nightscout.database.entities.TherapyEvent
 import info.nightscout.database.entities.embedments.InterfaceIDs
-import info.nightscout.sdk.localmodel.entry.NsUnits
+import app.aaps.core.nssdk.localmodel.entry.NsUnits
-import info.nightscout.sdk.localmodel.treatment.EventType
+import app.aaps.core.nssdk.localmodel.treatment.EventType
-import info.nightscout.sdk.localmodel.treatment.NSTherapyEvent
+import app.aaps.core.nssdk.localmodel.treatment.NSTherapyEvent
 import java.security.InvalidParameterException
 
 fun NSTherapyEvent.toTherapyEvent(): TherapyEvent =

plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorker.kt

@@ -14,8 +14,8 @@ import app.aaps.core.interfaces.sync.NsClient
 import app.aaps.core.interfaces.utils.DateUtil
 import info.nightscout.plugins.sync.nsShared.NsIncomingDataProcessor
 import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin
-import info.nightscout.sdk.interfaces.NSAndroidClient
+import app.aaps.core.nssdk.interfaces.NSAndroidClient
-import info.nightscout.sdk.localmodel.entry.NSSgvV3
+import app.aaps.core.nssdk.localmodel.entry.NSSgvV3
 import kotlinx.coroutines.Dispatchers
 import javax.inject.Inject
 import kotlin.math.max

plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadFoodsWorker.kt

@@ -11,7 +11,7 @@ import app.aaps.core.interfaces.rx.events.EventNSClientNewLog
 import app.aaps.core.interfaces.utils.DateUtil
 import info.nightscout.plugins.sync.nsShared.NsIncomingDataProcessor
 import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin
-import info.nightscout.sdk.localmodel.food.NSFood
+import app.aaps.core.nssdk.localmodel.food.NSFood
 import kotlinx.coroutines.Dispatchers
 import javax.inject.Inject
 

plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadProfileStoreWorker.kt

@@ -13,7 +13,7 @@ import info.nightscout.core.utils.JsonHelper
 import info.nightscout.core.utils.receivers.DataWorkerStorage
 import info.nightscout.plugins.sync.nsShared.NsIncomingDataProcessor
 import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin
-import info.nightscout.sdk.interfaces.NSAndroidClient
+import app.aaps.core.nssdk.interfaces.NSAndroidClient
 import kotlinx.coroutines.Dispatchers
 import org.json.JSONObject
 import javax.inject.Inject

plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadTreatmentsWorker.kt

@@ -12,8 +12,8 @@ import app.aaps.core.interfaces.sync.NsClient
 import app.aaps.core.interfaces.utils.DateUtil
 import info.nightscout.plugins.sync.nsShared.NsIncomingDataProcessor
 import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin
-import info.nightscout.sdk.interfaces.NSAndroidClient
+import app.aaps.core.nssdk.interfaces.NSAndroidClient
-import info.nightscout.sdk.localmodel.treatment.NSTreatment
+import app.aaps.core.nssdk.localmodel.treatment.NSTreatment
 import kotlinx.coroutines.Dispatchers
 import javax.inject.Inject
 import kotlin.math.max

plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3PluginTest.kt

@@ -34,8 +34,8 @@ import info.nightscout.plugins.sync.nsShared.StoreDataForDbImpl
 import info.nightscout.plugins.sync.nsclient.ReceiverDelegate
 import info.nightscout.plugins.sync.nsclient.data.NSDeviceStatusHandler
 import info.nightscout.plugins.sync.nsclient.extensions.fromConstant
-import info.nightscout.sdk.interfaces.NSAndroidClient
+import app.aaps.core.nssdk.interfaces.NSAndroidClient
-import info.nightscout.sdk.localmodel.treatment.CreateUpdateResponse
+import app.aaps.core.nssdk.localmodel.treatment.CreateUpdateResponse
 import kotlinx.coroutines.test.runTest
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test

plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/BolusCalculatorResultExtensionKtTest.kt

@@ -3,8 +3,8 @@ package info.nightscout.plugins.sync.nsclientV3.extensions
 import com.google.common.truth.Truth.assertThat
 import info.nightscout.database.entities.BolusCalculatorResult
 import info.nightscout.database.entities.embedments.InterfaceIDs
-import info.nightscout.sdk.localmodel.treatment.NSBolusWizard
+import app.aaps.core.nssdk.localmodel.treatment.NSBolusWizard
-import info.nightscout.sdk.mapper.convertToRemoteAndBack
+import app.aaps.core.nssdk.mapper.convertToRemoteAndBack
 import org.junit.jupiter.api.Test
 
 @Suppress("SpellCheckingInspection")

plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/BolusExtensionKtTest.kt

@@ -3,8 +3,8 @@ package info.nightscout.plugins.sync.nsclientV3.extensions
 import com.google.common.truth.Truth.assertThat
 import info.nightscout.database.entities.Bolus
 import info.nightscout.database.entities.embedments.InterfaceIDs
-import info.nightscout.sdk.localmodel.treatment.NSBolus
+import app.aaps.core.nssdk.localmodel.treatment.NSBolus
-import info.nightscout.sdk.mapper.convertToRemoteAndBack
+import app.aaps.core.nssdk.mapper.convertToRemoteAndBack
 
 import org.junit.jupiter.api.Test
 

plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/CarbsExtensionKtTest.kt

@@ -3,8 +3,8 @@ package info.nightscout.plugins.sync.nsclientV3.extensions
 import com.google.common.truth.Truth.assertThat
 import info.nightscout.database.entities.Carbs
 import info.nightscout.database.entities.embedments.InterfaceIDs
-import info.nightscout.sdk.localmodel.treatment.NSCarbs
+import app.aaps.core.nssdk.localmodel.treatment.NSCarbs
-import info.nightscout.sdk.mapper.convertToRemoteAndBack
+import app.aaps.core.nssdk.mapper.convertToRemoteAndBack
 import org.junit.jupiter.api.Test
 
 @Suppress("SpellCheckingInspection")