Merge pull request #103 from realifetech/release/2.3.1

Release/2.3.1
realifetech · Jun 2, 2023 · 2e47363 · 2e47363
2 parents c4a7875 + 067c52d
commit 2e47363
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 12 deletions.
diff --git a/sdk/sdk.properties b/sdk/sdk.properties
@@ -2,7 +2,7 @@
 #Mon May 08 11:29:53 CLT 2023
 sdk.buildmeta=
 sdk.major=2
-sdk.minor=2
-sdk.patch=8
-sdk.prerelease=alpha
-sdk.semver=2.2.8-alpha
+sdk.minor=3
+sdk.patch=1
+sdk.prerelease=
+sdk.semver=
diff --git a/sdk/src/main/java/com/realifetech/sdk/di/features/modules/FeatureModule.kt b/sdk/src/main/java/com/realifetech/sdk/di/features/modules/FeatureModule.kt
@@ -19,6 +19,7 @@ import com.realifetech.sdk.core.utils.DeviceCalendar
 import com.realifetech.sdk.core.utils.NetworkUtil
 import com.realifetech.sdk.di.features.FeatureScope
 import com.realifetech.sdk.general.General
+import com.realifetech.sdk.general.data.PhysicalDeviceInfo
 import com.realifetech.sdk.general.domain.DeviceRepository
 import com.realifetech.sdk.general.domain.SdkInitializationPrecondition
 import com.realifetech.sdk.identity.Identity
@@ -98,13 +99,15 @@ object FeatureModule {
         deviceRepository: DeviceRepository,
         sdkInitializationPrecondition: SdkInitializationPrecondition,
         configuration: ConfigurationStorage,
-        colorPallet: ColorPallet
+        colorPallet: ColorPallet,
+        physicalDeviceInfo: PhysicalDeviceInfo
     ): General =
         General(
             deviceRepository,
             sdkInitializationPrecondition,
             configuration,
-            colorPallet
+            colorPallet,
+            physicalDeviceInfo
         )
 
     @FeatureScope

diff --git a/sdk/src/main/java/com/realifetech/sdk/general/General.kt b/sdk/src/main/java/com/realifetech/sdk/general/General.kt
@@ -8,6 +8,7 @@ import com.realifetech.sdk.core.data.model.color.ColorType.*
 import com.realifetech.sdk.core.utils.ColorPallet
 import com.realifetech.sdk.core.utils.Result
 import com.realifetech.sdk.general.data.DeviceConsent
+import com.realifetech.sdk.general.data.PhysicalDeviceInfo
 import com.realifetech.sdk.general.domain.DeviceRepository
 import com.realifetech.sdk.general.domain.SdkInitializationPrecondition
 import javax.inject.Inject
@@ -16,9 +17,14 @@ class General @Inject constructor(
     private val deviceRepository: DeviceRepository,
     private val sdkInitializationPrecondition: SdkInitializationPrecondition,
     private val configuration: ConfigurationStorage,
-    private val colorPallet: ColorPallet
+    private val colorPallet: ColorPallet,
+    physicalDeviceInfo: PhysicalDeviceInfo
 ) {
 
+    init {
+        configuration.deviceId = physicalDeviceInfo.deviceId
+    }
+
     var isSdkReady: Boolean = false
         private set
 

diff --git a/sdk/src/main/java/com/realifetech/sdk/general/data/DeviceNetworkDataSourceImpl.kt b/sdk/src/main/java/com/realifetech/sdk/general/data/DeviceNetworkDataSourceImpl.kt
@@ -25,7 +25,7 @@ internal class DeviceNetworkDataSourceImpl(
     private val input: DeviceInput
         get() {
             return DeviceInput(
-                token = deviceInfo.deviceId,
+                token = configuration.deviceId,
                 type = ANDROID.toInput(),
                 appVersion = deviceInfo.appVersionName.toInput(),
                 osVersion = deviceInfo.osVersion.toInput(),
@@ -38,7 +38,6 @@ internal class DeviceNetworkDataSourceImpl(
         }
 
     override fun registerDevice(callback: (error: Exception?, registered: Boolean?) -> Unit) {
-        configuration.deviceId = deviceInfo.deviceId
         try {
             val response = apolloClient.mutate(SyncDeviceMutation(input))
             response.enqueue(object : ApolloCall.Callback<SyncDeviceMutation.Data>() {

diff --git a/sdk/src/main/java/com/realifetech/sdk/general/data/PhysicalDeviceInfo.kt b/sdk/src/main/java/com/realifetech/sdk/general/data/PhysicalDeviceInfo.kt
@@ -3,11 +3,11 @@ package com.realifetech.sdk.general.data
 import android.bluetooth.BluetoothAdapter
 import android.content.Context
 import android.os.Build
-import android.provider.Settings
 import android.util.DisplayMetrics
 import com.realifetech.sdk.core.data.database.preferences.configuration.ConfigurationStorage
 import com.realifetech.sdk.core.utils.isWifiConnected
 import com.realifetech.sdk.core.utils.isWifiOn
+import java.util.*
 import javax.inject.Inject
 
 /**
@@ -24,7 +24,7 @@ open class PhysicalDeviceInfo @Inject constructor(
     }
 
     override val deviceId: String
-        get() = Settings.Secure.getString(context.contentResolver, Settings.Secure.ANDROID_ID) + ":" + context.packageName
+        get() = UUID.randomUUID().toString() + ":" + context.packageName
 
     override val appVersionName: String
         get() = configurationStorage.appVersion

diff --git a/sdk/src/main/java/com/realifetech/sdk/general/domain/DeviceRepository.kt b/sdk/src/main/java/com/realifetech/sdk/general/domain/DeviceRepository.kt
@@ -16,7 +16,6 @@ class DeviceRepository @Inject constructor(
     private val oAuthManager: Lazy<OAuthManager>
 ) {
     private lateinit var result: Result<Boolean>
-    private lateinit var updateMyDeviceConsentResult: Result<Boolean>
 
     private val retryPolicy: RetryPolicy =
         LinearRetryPolicy(DEVICE_REGISTRATION_RETRY_TIME_MILLISECONDS) {