Skip to content

Commit

Permalink
:core:nssdk cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
MilosKozak committed Sep 24, 2023
1 parent e5f3545 commit e1e72bf
Show file tree
Hide file tree
Showing 112 changed files with 270 additions and 270 deletions.
2 changes: 1 addition & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down

This file was deleted.

File renamed without changes.
2 changes: 1 addition & 1 deletion core/ns-sdk/build.gradle → core/nssdk/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package info.nightscout.sdk
package app.aaps.core.nssdk

import info.nightscout.sdk.interfaces.NSAndroidCallbackClient
import info.nightscout.sdk.interfaces.NSAndroidClient
import info.nightscout.sdk.localmodel.Status
import app.aaps.core.nssdk.interfaces.NSAndroidCallbackClient
import app.aaps.core.nssdk.interfaces.NSAndroidClient
import app.aaps.core.nssdk.localmodel.Status
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.SupervisorJob
Expand Down
Original file line number Diff line number Diff line change
@@ -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 info.nightscout.sdk.exceptions.InvalidAccessTokenException
import info.nightscout.sdk.exceptions.InvalidFormatNightscoutException
import info.nightscout.sdk.exceptions.InvalidParameterNightscoutException
import info.nightscout.sdk.exceptions.UnknownResponseNightscoutException
import info.nightscout.sdk.exceptions.UnsuccessfullNightscoutException
import info.nightscout.sdk.interfaces.NSAndroidClient
import info.nightscout.sdk.localmodel.Status
import info.nightscout.sdk.localmodel.devicestatus.NSDeviceStatus
import info.nightscout.sdk.localmodel.entry.NSSgvV3
import info.nightscout.sdk.localmodel.food.NSFood
import info.nightscout.sdk.localmodel.treatment.CreateUpdateResponse
import info.nightscout.sdk.localmodel.treatment.NSTreatment
import info.nightscout.sdk.mapper.toLocal
import info.nightscout.sdk.mapper.toNSDeviceStatus
import info.nightscout.sdk.mapper.toNSFood
import info.nightscout.sdk.mapper.toRemoteDeviceStatus
import info.nightscout.sdk.mapper.toRemoteEntry
import info.nightscout.sdk.mapper.toRemoteFood
import info.nightscout.sdk.mapper.toRemoteTreatment
import info.nightscout.sdk.mapper.toSgv
import info.nightscout.sdk.mapper.toTreatment
import info.nightscout.sdk.networking.NetworkStackBuilder
import info.nightscout.sdk.remotemodel.LastModified
import info.nightscout.sdk.remotemodel.RemoteDeviceStatus
import info.nightscout.sdk.remotemodel.RemoteEntry
import info.nightscout.sdk.remotemodel.RemoteFood
import info.nightscout.sdk.remotemodel.RemoteTreatment
import info.nightscout.sdk.utils.retry
import info.nightscout.sdk.utils.toNotNull
import app.aaps.core.nssdk.exceptions.DateHeaderOutOfToleranceException
import app.aaps.core.nssdk.exceptions.InvalidAccessTokenException
import app.aaps.core.nssdk.exceptions.InvalidFormatNightscoutException
import app.aaps.core.nssdk.exceptions.InvalidParameterNightscoutException
import app.aaps.core.nssdk.exceptions.UnknownResponseNightscoutException
import app.aaps.core.nssdk.exceptions.UnsuccessfullNightscoutException
import app.aaps.core.nssdk.interfaces.NSAndroidClient
import app.aaps.core.nssdk.localmodel.Status
import app.aaps.core.nssdk.localmodel.devicestatus.NSDeviceStatus
import app.aaps.core.nssdk.localmodel.entry.NSSgvV3
import app.aaps.core.nssdk.localmodel.food.NSFood
import app.aaps.core.nssdk.localmodel.treatment.CreateUpdateResponse
import app.aaps.core.nssdk.localmodel.treatment.NSTreatment
import app.aaps.core.nssdk.mapper.toLocal
import app.aaps.core.nssdk.mapper.toNSDeviceStatus
import app.aaps.core.nssdk.mapper.toNSFood
import app.aaps.core.nssdk.mapper.toRemoteDeviceStatus
import app.aaps.core.nssdk.mapper.toRemoteEntry
import app.aaps.core.nssdk.mapper.toRemoteFood
import app.aaps.core.nssdk.mapper.toRemoteTreatment
import app.aaps.core.nssdk.mapper.toSgv
import app.aaps.core.nssdk.mapper.toTreatment
import app.aaps.core.nssdk.networking.NetworkStackBuilder
import app.aaps.core.nssdk.remotemodel.LastModified
import app.aaps.core.nssdk.remotemodel.RemoteDeviceStatus
import app.aaps.core.nssdk.remotemodel.RemoteEntry
import app.aaps.core.nssdk.remotemodel.RemoteFood
import app.aaps.core.nssdk.remotemodel.RemoteTreatment
import app.aaps.core.nssdk.utils.retry
import app.aaps.core.nssdk.utils.toNotNull
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package info.nightscout.sdk
package app.aaps.core.nssdk

import info.nightscout.sdk.interfaces.NSAndroidClient
import info.nightscout.sdk.interfaces.NSAndroidRxClient
import info.nightscout.sdk.localmodel.Status
import info.nightscout.sdk.remotemodel.LastModified
import app.aaps.core.nssdk.interfaces.NSAndroidClient
import app.aaps.core.nssdk.interfaces.NSAndroidRxClient
import app.aaps.core.nssdk.localmodel.Status
import app.aaps.core.nssdk.remotemodel.LastModified
import io.reactivex.rxjava3.core.Single
import kotlinx.coroutines.rx3.rxSingle

Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package info.nightscout.sdk.exceptions
package app.aaps.core.nssdk.exceptions

class InvalidAccessTokenException : NightscoutException()
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package info.nightscout.sdk.exceptions
package app.aaps.core.nssdk.exceptions

@Suppress("unused")
class InvalidFormatNightscoutException : NightscoutException {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package info.nightscout.sdk.exceptions
package app.aaps.core.nssdk.exceptions

@Suppress("unused")
class InvalidParameterNightscoutException : NightscoutException {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package info.nightscout.sdk.exceptions
package app.aaps.core.nssdk.exceptions

import java.io.IOException

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package info.nightscout.sdk.exceptions
package app.aaps.core.nssdk.exceptions

class UnknownResponseNightscoutException : NightscoutException()
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package info.nightscout.sdk.exceptions
package app.aaps.core.nssdk.exceptions

class UnsuccessfullNightscoutException : NightscoutException {
constructor() : super()
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package info.nightscout.sdk.interfaces

import info.nightscout.sdk.localmodel.Status
import info.nightscout.sdk.localmodel.devicestatus.NSDeviceStatus
import info.nightscout.sdk.localmodel.entry.NSSgvV3
import info.nightscout.sdk.localmodel.food.NSFood
import info.nightscout.sdk.localmodel.treatment.CreateUpdateResponse
import info.nightscout.sdk.localmodel.treatment.NSTreatment
import info.nightscout.sdk.remotemodel.LastModified
package app.aaps.core.nssdk.interfaces

import app.aaps.core.nssdk.localmodel.Status
import app.aaps.core.nssdk.localmodel.devicestatus.NSDeviceStatus
import app.aaps.core.nssdk.localmodel.entry.NSSgvV3
import app.aaps.core.nssdk.localmodel.food.NSFood
import app.aaps.core.nssdk.localmodel.treatment.CreateUpdateResponse
import app.aaps.core.nssdk.localmodel.treatment.NSTreatment
import app.aaps.core.nssdk.remotemodel.LastModified
import org.json.JSONObject

interface NSAndroidClient {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package info.nightscout.sdk.interfaces
package app.aaps.core.nssdk.interfaces

import info.nightscout.sdk.localmodel.Status
import info.nightscout.sdk.remotemodel.LastModified
import app.aaps.core.nssdk.localmodel.Status
import app.aaps.core.nssdk.remotemodel.LastModified
import io.reactivex.rxjava3.core.Single

interface NSAndroidRxClient {
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package info.nightscout.sdk.localmodel
package app.aaps.core.nssdk.localmodel

data class ApiPermission(
val create: Boolean,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package info.nightscout.sdk.localmodel
package app.aaps.core.nssdk.localmodel

data class ApiPermissions(
val deviceStatus: ApiPermission,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package info.nightscout.sdk.localmodel
package app.aaps.core.nssdk.localmodel

data class Status(
val version: String,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package info.nightscout.sdk.localmodel
package app.aaps.core.nssdk.localmodel

data class Storage(val storage: String, val version: String)
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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"), //
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package info.nightscout.sdk.localmodel.entry
package app.aaps.core.nssdk.localmodel.entry

data class NSSgvV3(
var date: Long?,
Expand Down
Original file line number Diff line number Diff line change
@@ -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"),
Expand Down
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package info.nightscout.sdk.localmodel.treatment
package app.aaps.core.nssdk.localmodel.treatment

class CreateUpdateResponse(
val response: Int,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package info.nightscout.sdk.localmodel.treatment
package app.aaps.core.nssdk.localmodel.treatment

import com.google.gson.annotations.SerializedName

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package info.nightscout.sdk.localmodel.treatment
package app.aaps.core.nssdk.localmodel.treatment

import com.google.gson.annotations.SerializedName

Expand Down
Original file line number Diff line number Diff line change
@@ -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?,
Expand Down
Original file line number Diff line number Diff line change
@@ -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?,
Expand Down
Original file line number Diff line number Diff line change
@@ -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?,
Expand Down
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
Original file line number Diff line number Diff line change
@@ -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?,
Expand Down
Original file line number Diff line number Diff line change
@@ -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?,
Expand Down
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
Original file line number Diff line number Diff line change
@@ -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?,
Expand Down
Original file line number Diff line number Diff line change
@@ -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?,
Expand Down
Original file line number Diff line number Diff line change
@@ -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?,
Expand Down
Original file line number Diff line number Diff line change
@@ -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?
Expand Down
Loading

0 comments on commit e1e72bf

Please sign in to comment.