react-native-mytatva-rn-sdk 1.2.96 → 1.2.98

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

@@ -15,6 +15,9 @@ import cgmblelib.utils.SharedPreferencesLibraryUtil
 import com.myc.library_zxing.QRFragment
 import com.myc.library_zxing.view.OnFragmentListener
 import com.mytatvarnsdk.R
+import com.mytatvarnsdk.utils.CgmModuleSentryLog.logModuleEvent
+import com.mytatvarnsdk.utils.CgmModuleSentryLog.safeLogModuleEvent
+import io.sentry.SentryLogLevel
 import ist.com.sdk.AlgorithmTools
 import ist.com.sdk.KRDecodeData
 
@@ -28,6 +31,18 @@ class QRActivity : AppCompatActivity(), View.OnClickListener {
         findViewById<View?>(R.id.btnLeft).setOnClickListener(this)
         mPocDevice = intent.getParcelableExtra("device")
         if (mPocDevice == null) {
+            safeLogModuleEvent {
+                logModuleEvent(
+                    where = "QRActivity.missingDevice",
+                    message = "CGM journey error | screen=${javaClass.simpleName} | QR scan started without transmitter device",
+                    level = SentryLogLevel.WARN,
+                    attributes = mapOf(
+                        "error_message" to "QR scan started without transmitter device",
+                        "screen" to javaClass.simpleName,
+                    ),
+                    logsOnly = true,
+                )
+            }
             finish()
         }
     }
@@ -36,9 +51,41 @@ class QRActivity : AppCompatActivity(), View.OnClickListener {
         super.onResume()
         mQRFragment = QRFragment.newInstance(object : OnFragmentListener {
             override fun onPermissionRequestFail(isForever: Boolean) {
+                val errorMessage = if (isForever) {
+                    "Camera permission denied permanently"
+                } else {
+                    "Camera permission denied"
+                }
+                safeLogModuleEvent {
+                    logModuleEvent(
+                        where = "QRActivity.cameraPermissionDenied",
+                        message = "CGM journey error | screen=${javaClass.simpleName} | $errorMessage",
+                        level = SentryLogLevel.WARN,
+                        attributes = mapOf(
+                            "error_message" to errorMessage,
+                            "screen" to javaClass.simpleName,
+                            "permission_denied_forever" to isForever.toString(),
+                        ),
+                        logsOnly = true,
+                    )
+                }
             }
 
             override fun onCameraOpenError(e: Exception?) {
+                val errorMessage = e?.message ?: "Camera failed to open"
+                safeLogModuleEvent {
+                    logModuleEvent(
+                        where = "QRActivity.cameraOpenError",
+                        message = "CGM journey error | screen=${javaClass.simpleName} | $errorMessage",
+                        level = SentryLogLevel.WARN,
+                        throwable = e,
+                        attributes = mapOf(
+                            "error_message" to errorMessage,
+                            "screen" to javaClass.simpleName,
+                        ),
+                        logsOnly = true,
+                    )
+                }
             }
 
             override fun onScanResult(messages: String?, bitmap: Bitmap?) {
@@ -71,12 +118,47 @@ class QRActivity : AppCompatActivity(), View.OnClickListener {
      */
     private fun decodeMessageCt3(message: String) {
         Log.d("QR Info ==> ", "decodeMessageCt3: $message")
+        try {
+            safeLogModuleEvent {
+                logModuleEvent(
+                    where = "cgmJourney.cgm_qr_scanned",
+                    message = "CGM journey | screen=${javaClass.simpleName} | step=cgm_qr_scanned",
+                    level = SentryLogLevel.INFO,
+                    jsonPayload = message,
+                    attributes = mapOf(
+                        "journey_step" to "cgm_qr_scanned",
+                        "screen" to javaClass.simpleName,
+                    ),
+                    logsOnly = true,
+                )
+            }
 
-        val decodeData: KRDecodeData = AlgorithmTools.getInstance().decodeCT(message.toCharArray())
+            val decodeData: KRDecodeData = AlgorithmTools.getInstance().decodeCT(message.toCharArray())
 
-        Log.d("QR Info ==> ", "decodeData: $decodeData")
+            Log.d("QR Info ==> ", "decodeData: $decodeData")
 
-        showMessage(message, decodeData.k, decodeData.r, message)
+            showMessage(message, decodeData.k, decodeData.r, message)
+        } catch (e: Exception) {
+            val errorMessage = e.message ?: "QR decode failed"
+            safeLogModuleEvent {
+                logModuleEvent(
+                    where = "QRActivity.decodeMessageCt3",
+                    message = "CGM journey error | screen=${javaClass.simpleName} | $errorMessage",
+                    level = SentryLogLevel.WARN,
+                    throwable = e,
+                    attributes = mapOf(
+                        "error_message" to errorMessage,
+                        "screen" to javaClass.simpleName,
+                        "qr_raw" to message,
+                    ),
+                    logsOnly = true,
+                )
+            }
+            try {
+                mQRFragment?.restartPreviewAfterDelay(0)
+            } catch (_: Throwable) {
+            }
+        }
     }
 
     fun showMessage(message: String?, k: Float, r: Float, sensorInfo: String?) {
@@ -87,20 +169,79 @@ class QRActivity : AppCompatActivity(), View.OnClickListener {
             val qrInformation: QRInformation? = prefsHelper.qrInformation
 
             Log.d("qrInformation==> ", "mPocDevice:  ${mPocDevice.toString()}")
-            if (qrInformation != null && qrInformation.isEffective(mPocDevice?.name, r, k)) {
+            val isEffective = qrInformation?.isEffective(mPocDevice?.name, r, k) ?: false
+            safeLogModuleEvent {
+                logModuleEvent(
+                    where = "cgmJourney.cgm_qr_is_effective",
+                    message = "CGM journey | screen=${javaClass.simpleName} | isEffective=$isEffective",
+                    level = SentryLogLevel.INFO,
+                    jsonPayload = isEffective.toString(),
+                    attributes = mapOf(
+                        "journey_step" to "cgm_qr_is_effective",
+                        "screen" to javaClass.simpleName,
+                        "is_effective" to isEffective.toString(),
+                    ),
+                    logsOnly = true,
+                )
+            }
+            if (isEffective && qrInformation != null) {
                 Log.d("qrInformation==> ", "qrInformation:  $qrInformation")
+                safeLogModuleEvent {
+                    logModuleEvent(
+                        where = "cgmJourney.cgm_qr_validation_success",
+                        message = "CGM journey | screen=${javaClass.simpleName} | step=cgm_qr_validation_success",
+                        level = SentryLogLevel.INFO,
+                        jsonPayload = qrInformation.toString(),
+                        attributes = mapOf(
+                            "journey_step" to "cgm_qr_validation_success",
+                            "screen" to javaClass.simpleName,
+                            "transmitter_name" to (mPocDevice?.name ?: ""),
+                            "sensor_id" to (qrInformation.sensor ?: ""),
+                        ),
+                        logsOnly = true,
+                    )
+                }
                 setResult(RESULT_OK, Intent().putExtra("device", mPocDevice as Parcelable))
                 finish()
             } else {
+                val failMessage = getString(R.string.verification_fail)
+                safeLogModuleEvent {
+                    logModuleEvent(
+                        where = "QRActivity.qrValidationFailed",
+                        message = "CGM journey error | screen=${javaClass.simpleName} | $failMessage",
+                        level = SentryLogLevel.WARN,
+                        attributes = mapOf(
+                            "error_message" to failMessage,
+                            "screen" to javaClass.simpleName,
+                            "transmitter_name" to (mPocDevice?.name ?: ""),
+                            "qr_raw" to (message ?: ""),
+                        ),
+                        logsOnly = true,
+                    )
+                }
                 Toast.makeText(
                     this@QRActivity,
-                    getString(R.string.verification_fail),
+                    failMessage,
                     Toast.LENGTH_SHORT
                 )
                     .show()
                 mQRFragment!!.restartPreviewAfterDelay(0)
             }
         } catch (e: Exception) {
+            val errorMessage = e.message ?: "QR validation exception"
+            safeLogModuleEvent {
+                logModuleEvent(
+                    where = "QRActivity.showMessage",
+                    message = "CGM journey error | screen=${javaClass.simpleName} | $errorMessage",
+                    level = SentryLogLevel.WARN,
+                    throwable = e,
+                    attributes = mapOf(
+                        "error_message" to errorMessage,
+                        "screen" to javaClass.simpleName,
+                    ),
+                    logsOnly = true,
+                )
+            }
             e.printStackTrace()
             finish()
         }

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

@@ -52,6 +52,10 @@ import com.mytatvarnsdk.myView.dialog.WarnDialogUtils
 import com.mytatvarnsdk.myView.progress.ProgressManagement
 import com.mytatvarnsdk.myView.progress.ProgressType
 import com.mytatvarnsdk.network.AuthenticateSDKService
+import com.mytatvarnsdk.utils.CgmModuleSentryLog.logModuleEvent
+import com.mytatvarnsdk.utils.ToolbarSupportHelper
+import com.mytatvarnsdk.utils.CgmModuleSentryLog.safeLogModuleEvent
+import io.sentry.SentryLogLevel
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -127,6 +131,21 @@ class SearchTransmitterActivity : BaseBleActivity() {
 
     fun manageErrorState(showError: Boolean, errorStatus: String) {
         if (showError) {
+            if (errorStatus.isNotEmpty()) {
+                safeLogModuleEvent {
+                    logModuleEvent(
+                        where = "SearchTransmitterActivity.error",
+                        message = "CGM journey error | screen=${javaClass.simpleName} | $errorStatus",
+                        level = SentryLogLevel.WARN,
+                        attributes = mapOf(
+                            "error_message" to errorStatus,
+                            "screen" to javaClass.simpleName,
+                            "is_reconnect" to isForReconnect.toString(),
+                        ),
+                        logsOnly = true,
+                    )
+                }
+            }
             binding.clFail.visibility = View.VISIBLE
             binding.clMain.visibility = View.GONE
             binding.commonButton.root.visibility = View.GONE
@@ -296,11 +315,37 @@ class SearchTransmitterActivity : BaseBleActivity() {
 
     public override fun checkFailForLowPower() {
         ProgressManagement.getInstance().dismissWait(this)
+        safeLogModuleEvent {
+            logModuleEvent(
+                where = "SearchTransmitterActivity.checkFailForLowPower",
+                message = "CGM journey error | screen=${javaClass.simpleName} | Transmitter low power",
+                level = SentryLogLevel.WARN,
+                attributes = mapOf(
+                    "error_message" to "Transmitter low power",
+                    "screen" to javaClass.simpleName,
+                    "is_reconnect" to isForReconnect.toString(),
+                ),
+                logsOnly = true,
+            )
+        }
         WarnDialogUtils.getInstance().showWarnDialog(this, DialogType.TYPE_LOW_POWER)
     }
 
     public override fun checkFailErrorTemperature() {
         ProgressManagement.getInstance().dismissWait(this)
+        safeLogModuleEvent {
+            logModuleEvent(
+                where = "SearchTransmitterActivity.checkFailErrorTemperature",
+                message = "CGM journey error | screen=${javaClass.simpleName} | Transmitter temperature error",
+                level = SentryLogLevel.WARN,
+                attributes = mapOf(
+                    "error_message" to "Transmitter temperature error",
+                    "screen" to javaClass.simpleName,
+                    "is_reconnect" to isForReconnect.toString(),
+                ),
+                logsOnly = true,
+            )
+        }
     }
 
     public override fun onlineLost() {
@@ -318,24 +363,33 @@ class SearchTransmitterActivity : BaseBleActivity() {
             }
         } catch (e: Exception) {
             Log.d("bind::-> ", "bind: ${e.message}")
+            safeLogModuleEvent {
+                val errorMessage = e.message ?: "Transmitter bind exception"
+                logModuleEvent(
+                    where = "SearchTransmitterActivity.bind",
+                    message = "CGM journey error | screen=${javaClass.simpleName} | $errorMessage",
+                    level = SentryLogLevel.WARN,
+                    throwable = e,
+                    attributes = mapOf(
+                        "error_message" to errorMessage,
+                        "screen" to javaClass.simpleName,
+                        "is_reconnect" to isForReconnect.toString(),
+                    ),
+                    logsOnly = true,
+                )
+            }
         }
     }
 
     private fun setupClickListeners() {
-        binding.toolbar.btnWhatsapp.setOnClickListener {
-            startActivity(
-                Intent(this, HelpActivity::class.java)
-                    .putExtra("ScreenName", "Transmitter page")
-            )
-        }
+        ToolbarSupportHelper.bindWhatsappButton(this, binding.toolbar.btnWhatsapp)
 
-        binding.toolbar.btnWatchDemo.setOnClickListener {
-            sendDataToRN("", "cgm_watch_demo_clicked")
-
-            startActivity(
-                Intent(this, VideoActivity::class.java).putExtra("VideoId", if (isForReconnect) "n_pUrFoZ1wQ" else "r5Zemc4R044")
-            )
-        }
+        ToolbarSupportHelper.configureWatchDemoButton(
+            context = this,
+            btnWatchDemo = binding.toolbar.btnWatchDemo,
+            isForReconnect = isForReconnect,
+            onClickAnalytics = { sendDataToRN("", "cgm_watch_demo_clicked") }
+        )
 
         binding.toolbar.btnClose.setOnClickListener {
             openExitDialog()
@@ -440,6 +494,20 @@ class SearchTransmitterActivity : BaseBleActivity() {
     }
 
     private fun sendDataToRN(data: String, status: String) {
+        safeLogModuleEvent {
+            logModuleEvent(
+                where = "cgmJourney.$status",
+                message = "CGM journey | screen=${javaClass.simpleName} | step=$status",
+                level = SentryLogLevel.INFO,
+                jsonPayload = data.takeIf { it.isNotEmpty() },
+                attributes = mapOf(
+                    "journey_step" to status,
+                    "screen" to javaClass.simpleName,
+                    "is_reconnect" to isForReconnect.toString(),
+                ),
+                logsOnly = true,
+            )
+        }
         if (reactContext != null) {
             try {
                 val catalystInstance: CatalystInstance = reactContext.catalystInstance
@@ -487,6 +555,19 @@ class SearchTransmitterActivity : BaseBleActivity() {
     }
 
     private fun startDeviceSearch() {
+        safeLogModuleEvent {
+            logModuleEvent(
+                where = "cgmJourney.cgm_transmitter_scan_started",
+                message = "CGM journey | screen=${javaClass.simpleName} | step=cgm_transmitter_scan_started",
+                level = SentryLogLevel.INFO,
+                attributes = mapOf(
+                    "journey_step" to "cgm_transmitter_scan_started",
+                    "screen" to javaClass.simpleName,
+                    "is_reconnect" to isForReconnect.toString(),
+                ),
+                logsOnly = true,
+            )
+        }
         mModel = ViewModelProviders.of(this)[MainActivityModel::class.java]
 
         ReconnectManagement.getInstance()
@@ -544,6 +625,20 @@ class SearchTransmitterActivity : BaseBleActivity() {
         isTransmitterConnected = true
 
         if (transmitterDeviceInfo != null) {
+            safeLogModuleEvent {
+                logModuleEvent(
+                    where = "cgmJourney.cgm_transmitter_connect_clicked",
+                    message = "CGM journey | screen=${javaClass.simpleName} | step=cgm_transmitter_connect_clicked",
+                    level = SentryLogLevel.INFO,
+                    jsonPayload = transmitterDeviceInfo?.pocDevice?.name ?: "",
+                    attributes = mapOf(
+                        "journey_step" to "cgm_transmitter_connect_clicked",
+                        "screen" to javaClass.simpleName,
+                        "is_reconnect" to isForReconnect.toString(),
+                    ),
+                    logsOnly = true,
+                )
+            }
             if (isForReconnect) {
                 GattTool.unBindInDatabase(this, enumUnBind.UNBIND_FORCE)
             }

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

@@ -31,6 +31,10 @@ import com.mytatvarnsdk.network.AuthenticateSDKService
 import com.mytatvarnsdk.network.AuthenticateSDKService.LoaderListener
 import com.mytatvarnsdk.utils.DeviceStatus
 import com.mytatvarnsdk.utils.TATVA_ENVIRONMENT
+import com.mytatvarnsdk.utils.ToolbarSupportHelper
+import com.mytatvarnsdk.utils.CgmModuleSentryLog.logModuleEvent
+import com.mytatvarnsdk.utils.CgmModuleSentryLog.safeLogModuleEvent
+import io.sentry.SentryLogLevel
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -77,23 +81,14 @@ class SensorConnectSuccessActivity : AppCompatActivity() {
 
         authenticateSDKService = AuthenticateSDKService(scope = scope)
 
-        binding.toolbar.btnWhatsapp.setOnClickListener {
-            startActivity(
-                Intent(this, HelpActivity::class.java)
-                    .putExtra("ScreenName", "Sensor page")
-            )
-        }
+        ToolbarSupportHelper.bindWhatsappButton(this, binding.toolbar.btnWhatsapp)
 
-        binding.toolbar.btnWatchDemo.setOnClickListener {
-            sendDataToRN("", "cgm_watch_demo_clicked")
-
-            startActivity(
-                Intent(this, VideoActivity::class.java).putExtra(
-                    "VideoId",
-                    if (isForReconnect) "n_pUrFoZ1wQ" else "r5Zemc4R044"
-                )
-            )
-        }
+        ToolbarSupportHelper.configureWatchDemoButton(
+            context = this,
+            btnWatchDemo = binding.toolbar.btnWatchDemo,
+            isForReconnect = isForReconnect,
+            onClickAnalytics = { sendDataToRN("", "cgm_watch_demo_clicked") }
+        )
 
         binding.commonButton.btnProceed.setOnClickListener {
             sendDataToRN("", "cgm_connect_sensor_proceed_clicked")
@@ -121,6 +116,20 @@ class SensorConnectSuccessActivity : AppCompatActivity() {
     }
 
     private fun sendDataToRN(data: String, status: String) {
+        safeLogModuleEvent {
+            logModuleEvent(
+                where = "cgmJourney.$status",
+                message = "CGM journey | screen=${javaClass.simpleName} | step=$status",
+                level = SentryLogLevel.INFO,
+                jsonPayload = data.takeIf { it.isNotEmpty() },
+                attributes = mapOf(
+                    "journey_step" to status,
+                    "screen" to javaClass.simpleName,
+                    "is_reconnect" to isForReconnect.toString(),
+                ),
+                logsOnly = true,
+            )
+        }
         if (reactContext != null) {
             try {
                 val catalystInstance: CatalystInstance = reactContext.catalystInstance
@@ -173,6 +182,20 @@ class SensorConnectSuccessActivity : AppCompatActivity() {
         obj.put("status", DeviceStatus.CONNECTED.id)
         obj.put("rawData", rawData)
 
+        safeLogModuleEvent {
+            logModuleEvent(
+                where = "SensorConnectSuccessActivity.postDeviceData.request",
+                message = "POST /cgm/connection CONNECTED on sensor success screen",
+                level = SentryLogLevel.INFO,
+                jsonPayload = "request=${obj}",
+                attributes = mapOf(
+                    "cgm_status" to DeviceStatus.CONNECTED.id,
+                    "sensor_id" to (information.sensor ?: ""),
+                ),
+                logsOnly = true,
+            )
+        }
+
         authenticateSDKService.postDeviceData(
             environment = if (CgmTrackyLibModule.env.lowercase() == "uat") TATVA_ENVIRONMENT.STAGE else TATVA_ENVIRONMENT.PROD,
             data = obj.toString(),
@@ -224,4 +247,8 @@ class SensorConnectSuccessActivity : AppCompatActivity() {
         dialog.show()
     }
 
+    override fun onResume() {
+        super.onResume()
+    }
+
 }

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

@@ -28,6 +28,10 @@ import com.mytatvarnsdk.CgmTrackyLibModule.Companion.mReactContext
 import com.mytatvarnsdk.R
 import com.mytatvarnsdk.databinding.ActivityStartCgmactivityBinding
 import com.mytatvarnsdk.databinding.ExitDialogBottomsheetBinding
+import com.mytatvarnsdk.utils.CgmModuleSentryLog.logModuleEvent
+import com.mytatvarnsdk.utils.CgmModuleSentryLog.safeLogModuleEvent
+import com.mytatvarnsdk.utils.ToolbarSupportHelper
+import io.sentry.SentryLogLevel
 
 
 class StartCGMActivity : AppCompatActivity() {
@@ -92,22 +96,15 @@ class StartCGMActivity : AppCompatActivity() {
             openExitDialog()
         }
 
-        binding.toolbar.btnWhatsapp.setOnClickListener {
-            startActivity(
-                Intent(this, HelpActivity::class.java)
-                    .putExtra("ScreenName", "connection journey page")
-            )
-        }
+        ToolbarSupportHelper.bindWhatsappButton(this, binding.toolbar.btnWhatsapp)
 
-        binding.toolbar.btnWatchDemo.setOnClickListener {
-            sendDataToRN("", "cgm_watch_demo_clicked")
-            startActivity(
-                Intent(this, VideoActivity::class.java).putExtra(
-                    "VideoId",
-                    if (isForReconnect) "n_pUrFoZ1wQ" else "r5Zemc4R044"
-                )
-            )
-        }
+        binding.toolbar.btnWatchDemo.setOnClickListener(null)
+        ToolbarSupportHelper.configureWatchDemoButton(
+            context = this,
+            btnWatchDemo = binding.toolbar.btnWatchDemo,
+            isForReconnect = isForReconnect,
+            onClickAnalytics = { sendDataToRN("", "cgm_watch_demo_clicked") }
+        )
 
         val callback: OnBackPressedCallback = object : OnBackPressedCallback(true) {
             override fun handleOnBackPressed() {
@@ -168,6 +165,20 @@ class StartCGMActivity : AppCompatActivity() {
     }
 
     private fun sendDataToRN(data: String, status: String) {
+        safeLogModuleEvent {
+            logModuleEvent(
+                where = "cgmJourney.$status",
+                message = "CGM journey | screen=${javaClass.simpleName} | step=$status",
+                level = SentryLogLevel.INFO,
+                jsonPayload = data.takeIf { it.isNotEmpty() },
+                attributes = mapOf(
+                    "journey_step" to status,
+                    "screen" to javaClass.simpleName,
+                    "is_reconnect" to isForReconnect.toString(),
+                ),
+                logsOnly = true,
+            )
+        }
         if (reactContext != null) {
             try {
                 val catalystInstance: CatalystInstance = reactContext.catalystInstance