react-native-mytatva-rn-sdk 1.2.71 → 1.2.72

package/android/src/main/java/com/mytatvarnsdk/CgmTrackyLibModule.kt

@@ -363,7 +363,9 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
     fun startCgmTracky(token: String, envType: String) {
         try {
             userToken = token
+            env = envType.lowercase()
             val intent = Intent(currentActivity, StartCGMActivity::class.java)
+            intent.putExtra("envType", env)
             currentActivity?.startActivity(intent)
         } catch (e: Exception) {
             Log.e("startCgmTracky", "startCgmTracky: ${e.message}")
@@ -385,11 +387,12 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
     fun reconnectCgmTracky(token: String, envType: String) {
         try {
             userToken = token
+            env = envType.lowercase()
             currentActivity?.startActivity(
                 Intent(currentActivity, StartCGMActivity::class.java).putExtra(
                     "IsForReconnect",
                     true
-                )
+                ).putExtra("envType", env)
             )
         } catch (e: Exception) {
             Log.e("reconnectCgmTracky", "reconnectCgmTracky: ${e.message}")
@@ -495,7 +498,7 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
 
                 // Check for duplicate using glucoseId
                 val glucoseId = pocGlucose.glucoseId ?: continue
-                
+
                 if (!processedGlucoseIds.add(glucoseId)) {
                     Log.d("triggerDataUpload", "Already processed: $glucoseId, skipping")
                     continue
@@ -518,7 +521,7 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
                     // Put it back in queue for batch to handle
                     pendingDataQueue.offer(pocGlucose)
                     Log.d("triggerDataUpload", "Old data detected, triggering batch: $glucoseId")
-                    
+
                     // Trigger batch process on main thread
                     withContext(Dispatchers.Main) {
                         observeAllGlucoseData(userToken, false, envType)
@@ -543,40 +546,40 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
             Log.d("handleGlucoseData", "Processing glucose data: ${pocGlucose.glucoseId}")
 
             if (pocGlucose.errorCode == enumError.NONE) {
-               /* if (pocGlucose.showGlucoseMG > 0) { */
-                    val dto: GlucoseLog = mapToDto(pocGlucose)
-                    val logs: ArrayList<GlucoseLog> = ArrayList()
-                    logs.add(dto)
-
-                    val request: GlucoseLogRequest =
-                        GlucoseLogRequest(vendor = "GoodFlip", logs = logs)
-                    val gson: Gson = GsonBuilder().create()
-                    val json = gson.toJson(request)
-
-                    Log.d("Glucose data 3 min==> ", "Glucose data 3 min==> final Json: $json")
-
-                    authenticateSDKService.postCGMData(
-                        environment = if (envType.lowercase() == "uat") TATVA_ENVIRONMENT.STAGE else TATVA_ENVIRONMENT.PROD,
-                        data = json,
-                        token = userToken,
-                        responseListener = object : AuthenticateSDKService.ResponseListener {
-                            override fun onResponseSuccess(response: String) {
-                                updateSyncMetadata(pocGlucose)
-                                Log.d("CGM Data", "Single glucose data uploaded successfully")
-                            }
+                /* if (pocGlucose.showGlucoseMG > 0) { */
+                val dto: GlucoseLog = mapToDto(pocGlucose)
+                val logs: ArrayList<GlucoseLog> = ArrayList()
+                logs.add(dto)
 
-                            override fun onResponseFail() {
-                                Log.e("CGM Data", "Failed to upload single glucose data")
-                            }
+                val request: GlucoseLogRequest =
+                    GlucoseLogRequest(vendor = "GoodFlip", logs = logs)
+                val gson: Gson = GsonBuilder().create()
+                val json = gson.toJson(request)
+
+                Log.d("Glucose data 3 min==> ", "Glucose data 3 min==> final Json: $json")
+
+                authenticateSDKService.postCGMData(
+                    environment = if (envType.lowercase() == "uat") TATVA_ENVIRONMENT.STAGE else TATVA_ENVIRONMENT.PROD,
+                    data = json,
+                    token = userToken,
+                    responseListener = object : AuthenticateSDKService.ResponseListener {
+                        override fun onResponseSuccess(response: String) {
+                            updateSyncMetadata(pocGlucose)
+                            Log.d("CGM Data", "Single glucose data uploaded successfully")
                         }
-                    )
-             /*   } */
-               /* else {
-                    Log.d(
-                        "handleGlucoseData",
-                        "Glucose value is 0 or negative: ${pocGlucose.showGlucoseMG}"
-                    )
-                } */
+
+                        override fun onResponseFail() {
+                            Log.e("CGM Data", "Failed to upload single glucose data")
+                        }
+                    }
+                )
+                /*   } */
+                /* else {
+                     Log.d(
+                         "handleGlucoseData",
+                         "Glucose value is 0 or negative: ${pocGlucose.showGlucoseMG}"
+                     )
+                 } */
             } else {
                 Log.d("handleGlucoseData", "Glucose data has error: ${pocGlucose.errorCode}")
                 handleGlucoseError(pocGlucose, envType)
@@ -653,7 +656,7 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
                 while (pendingDataQueue.isNotEmpty()) {
                     pendingDataQueue.poll()?.let { pendingData.add(it) }
                 }
-                
+
                 if (pendingData.isNotEmpty()) {
                     Log.d("observeAllGlucoseData", "Found ${pendingData.size} items in pending queue")
                 }
@@ -668,7 +671,7 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
                     val glucoseData = mModel.getGlucoseBetweenTime(lastSyncData.timeInMillis)
 
                     Log.d("observeAllGlucoseData", "Retrieved ${glucoseData?.size ?: 0} records from DB")
-                    
+
                     // Combine database data with pending queue data
                     val allData = mutableListOf<PocGlucose>()
                     glucoseData?.let { allData.addAll(it) }
@@ -687,7 +690,7 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
                     sortedGlucoseData.take(5).forEachIndexed { i, data ->
                         Log.d("AFTER Sort [$i]", "timeInMillis: ${data.timeInMillis}, glucoseId: ${data.glucoseId}")
                     }
-                    
+
                     if (sortedGlucoseData.isNotEmpty()) {
                         Log.d("observeAllGlucoseData", "✅ Sorted ${sortedGlucoseData.size} records chronologically")
                         Log.d("observeAllGlucoseData", "Oldest: ${sortedGlucoseData.first().timeInMillis}")
@@ -722,7 +725,7 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
                             }
                         }
                     }
-                    
+
                     withContext(Dispatchers.Main) {
                         if (!isObserving) {
                             observeGlucoseData(userToken, isForClear, envType)
@@ -760,7 +763,7 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
             }
 
             // Don't reset flag here - it's reset in observeAllGlucoseData's finally block
-            
+
             // Ensure we're on main thread and not already observing
             withContext(Dispatchers.Main) {
                 if (!isObserving) {
@@ -813,7 +816,7 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
             // Cancel all coroutines
             debounceJob?.cancel()
             debounceJob = null
-            
+
             uploadJob?.cancel()
             uploadJob = null
 
@@ -826,7 +829,7 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
             // Clear processed IDs and pending queue
             processedGlucoseIds.clear()
             pendingDataQueue.clear()
-            
+
             // Reset batch processing flag
             isBatchProcessing.set(false)
 
@@ -847,20 +850,20 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
         try {
             val context = reactApplicationContext
             val logFiles = mutableListOf<String>()
-            
+
             // Get the primary log folder path
             val externalFilesDir = context.getExternalFilesDir(android.os.Environment.DIRECTORY_DOCUMENTS)
             val primaryFolder = externalFilesDir?.absolutePath
-            
+
             // Get the fallback log folder path
-            val fallbackFolder = android.os.Environment.getExternalStorageDirectory().absolutePath + 
-                                File.separatorChar + "PocData" + File.separatorChar + "logger"
-            
+            val fallbackFolder = android.os.Environment.getExternalStorageDirectory().absolutePath +
+                    File.separatorChar + "PocData" + File.separatorChar + "logger"
+
             // Check primary folder
             if (primaryFolder != null) {
                 val primaryDir = File(primaryFolder)
                 if (primaryDir.exists() && primaryDir.isDirectory) {
-                    val files = primaryDir.listFiles { file -> 
+                    val files = primaryDir.listFiles { file ->
                         file.isFile && file.name.endsWith(".csv")
                     }
                     files?.forEach { file ->
@@ -868,11 +871,11 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
                     }
                 }
             }
-            
+
             // Check fallback folder
             val fallbackDir = File(fallbackFolder)
             if (fallbackDir.exists() && fallbackDir.isDirectory) {
-                val files = fallbackDir.listFiles { file -> 
+                val files = fallbackDir.listFiles { file ->
                     file.isFile && file.name.endsWith(".csv")
                 }
                 files?.forEach { file ->
@@ -882,17 +885,17 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
                     }
                 }
             }
-            
+
             Log.d("getCgmLogFiles", "Found ${logFiles.size} log files")
-            
+
             // Convert list to WritableArray
             val resultArray = Arguments.createArray()
             logFiles.forEach { path ->
                 resultArray.pushString(path)
             }
-            
+
             promise.resolve(resultArray)
-            
+
         } catch (e: Exception) {
             Log.e("getCgmLogFiles", "Error getting log files: ${e.message}")
             promise.reject("ERROR_GET_LOG_FILES", e.message, e)
@@ -1035,7 +1038,7 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
     fun stopObservingGlucoseData() {
         stopObservingGlucoseDataInternal()
     }
-    
+
     // Internal method that doesn't clear the queue (used during restarts)
     private fun stopObservingGlucoseDataInternal() {
         Log.d("stopObservingGlucoseData", "Stopping glucose data observation")
@@ -1110,10 +1113,10 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
                             it.glucoseId
                         )
                         prefsHelper?.lastSyncData = syncData
-                        
+
                         // Mark this glucose ID as processed
                         it.glucoseId?.let { id -> processedGlucoseIds.add(id) }
-                        
+
                         Log.d(
                             "Sync Metadata",
                             "Sync metadata updated: glucoseId=${it.glucoseId}, time=${it.timeInMillis}"

package/android/src/main/java/com/mytatvarnsdk/activity/StartCGMActivity.kt

@@ -54,6 +54,9 @@ class StartCGMActivity : AppCompatActivity() {
 
     private fun init() {
         isForReconnect = intent.getBooleanExtra("IsForReconnect", false)
+        val envType = intent.getStringExtra("envType") ?: "prod"
+
+        // Use envType as needed
 
         sendDataToRN("", "cgm_start_connection_landing")
 

package/android/src/main/java/com/mytatvarnsdk/network/AuthenticateSDKService.kt

@@ -19,6 +19,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.RequestBody.Companion.toRequestBody
+import retrofit2.HttpException
 
 class AuthenticateSDKService(val scope: CoroutineScope) {
 
@@ -158,6 +159,13 @@ class AuthenticateSDKService(val scope: CoroutineScope) {
 
                 Log.d("API Response", "API response: $decryptedResponse")
 
+            } catch (e: HttpException) {
+                if (e.code() == 401) {
+                    Log.d("API Error", "401 Unauthorized - Token: $token")
+                    // Further handling if necessary
+                } else {
+                    throw e
+                }
             } catch (e: Exception) {
                 e.printStackTrace()
                 Log.d("API Response", "Exception: ${e.message}")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-mytatva-rn-sdk",
-  "version": "1.2.71",
+  "version": "1.2.72",
   "description": "a package to inject data into visit health pwa",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",