react-native-mytatva-rn-sdk 1.2.46 → 1.2.49

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

@@ -81,8 +81,7 @@ class ConnectSensorActivity : BaseBleActivity() {
         binding.commonButton.btnProceed.setOnClickListener {
             transmitterDeviceInfo?.let {
                 QRActivity.startQR(
-                    this,
-                    it.pocDevice
+                    this, it.pocDevice
                 )
             }
         }
@@ -93,8 +92,7 @@ class ConnectSensorActivity : BaseBleActivity() {
 
         binding.toolbar.btnWhatsapp.setOnClickListener {
             startActivity(
-                Intent(this, HelpActivity::class.java)
-                    .putExtra("ScreenName", "Sensor Screen")
+                Intent(this, HelpActivity::class.java).putExtra("ScreenName", "Sensor Screen")
             )
         }
 
@@ -102,7 +100,7 @@ class ConnectSensorActivity : BaseBleActivity() {
             sendDataToRN("", "cgm_watch_demo_clicked")
 
             startActivity(
-                Intent(this, VideoActivity::class.java).putExtra("VideoId", "r5Zemc4R044")
+                Intent(this, VideoActivity::class.java).putExtra("VideoId", if (isForReconnect) "n_pUrFoZ1wQ" else "r5Zemc4R044")
             )
         }
 
@@ -136,10 +134,7 @@ class ConnectSensorActivity : BaseBleActivity() {
             binding.clMain.visibility = View.GONE
             binding.commonButton.root.visibility = View.GONE
 
-            Glide.with(this)
-                .asGif()
-                .load(R.drawable.warning)
-                .into(binding.ivGif)
+            Glide.with(this).asGif().load(R.drawable.warning).into(binding.ivGif)
 
             binding.btnSupport.tvProceed.text = "Contact Support"
             binding.btnRetry.tvProceed.text = "Retry"
@@ -155,8 +150,7 @@ class ConnectSensorActivity : BaseBleActivity() {
 
             binding.btnSupport.btnProceed.setOnClickListener {
                 startActivity(
-                    Intent(this, HelpActivity::class.java)
-                        .putExtra("ScreenName", "Sensor Screen")
+                    Intent(this, HelpActivity::class.java).putExtra("ScreenName", "Sensor Screen")
                 )
             }
 
@@ -165,8 +159,7 @@ class ConnectSensorActivity : BaseBleActivity() {
 
                 transmitterDeviceInfo?.let {
                     QRActivity.startQR(
-                        this,
-                        it.pocDevice
+                        this, it.pocDevice
                     )
                 }
             }
@@ -194,8 +187,7 @@ class ConnectSensorActivity : BaseBleActivity() {
             onCameraPermissionGranted()
         } else {
             if (ActivityCompat.shouldShowRequestPermissionRationale(
-                    this,
-                    Manifest.permission.CAMERA
+                    this, Manifest.permission.CAMERA
                 )
             ) {
                 showPermissionRationale(
@@ -203,17 +195,12 @@ class ConnectSensorActivity : BaseBleActivity() {
                     message = "We need access to your camera to proceed.",
                     onProceed = {
                         ActivityCompat.requestPermissions(
-                            this,
-                            PermissionUtils.CAMERA_PERMISSION,
-                            CAMERA_REQUEST_CODE
+                            this, PermissionUtils.CAMERA_PERMISSION, CAMERA_REQUEST_CODE
                         )
-                    }
-                )
+                    })
             } else {
                 ActivityCompat.requestPermissions(
-                    this,
-                    PermissionUtils.CAMERA_PERMISSION,
-                    CAMERA_REQUEST_CODE
+                    this, PermissionUtils.CAMERA_PERMISSION, CAMERA_REQUEST_CODE
                 )
             }
         }
@@ -226,11 +213,8 @@ class ConnectSensorActivity : BaseBleActivity() {
     }
 
     private fun showPermissionRationale(title: String, message: String, onProceed: () -> Unit) {
-        AlertDialog.Builder(this)
-            .setTitle(title)
-            .setMessage(message)
-            .setPositiveButton("OK") { _, _ -> onProceed() }
-            .setNegativeButton("Cancel", null)
+        AlertDialog.Builder(this).setTitle(title).setMessage(message)
+            .setPositiveButton("OK") { _, _ -> onProceed() }.setNegativeButton("Cancel", null)
             .show()
     }
 
@@ -242,8 +226,7 @@ class ConnectSensorActivity : BaseBleActivity() {
 
     fun isCameraPermissionGranted(context: Context): Boolean {
         return ContextCompat.checkSelfPermission(
-            context,
-            Manifest.permission.CAMERA
+            context, Manifest.permission.CAMERA
         ) == PackageManager.PERMISSION_GRANTED
     }
 
@@ -283,9 +266,7 @@ class ConnectSensorActivity : BaseBleActivity() {
     }
 
     override fun onRequestPermissionsResult(
-        requestCode: Int,
-        permissions: Array<out String>,
-        grantResults: IntArray
+        requestCode: Int, permissions: Array<out String>, grantResults: IntArray
     ) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults)
         val allGranted = grantResults.all { it == PackageManager.PERMISSION_GRANTED }
@@ -336,11 +317,9 @@ class ConnectSensorActivity : BaseBleActivity() {
         if (isForReconnect) {
             sendDataToRN("", "WARM_PERIOD_STARTED")
             startActivity(
-                Intent(this, SensorConnectSuccessActivity::class.java)
-                    .putExtra(
-                        "IsForReconnect",
-                        true
-                    )
+                Intent(this, SensorConnectSuccessActivity::class.java).putExtra(
+                    "IsForReconnect", true
+                )
             )
         } else {
             startActivity(Intent(this, SensorConnectSuccessActivity::class.java))

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

@@ -11,68 +11,68 @@ import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.mytatvarnsdk.R
 
 class ExitJourneyBottomSheet : BottomSheetDialogFragment() {
-  private var exitListener: OnExitListener? = null
+    private var exitListener: OnExitListener? = null
 
-  fun interface OnExitListener {
-    fun onExitConfirmed()
-  }
+    fun interface OnExitListener {
+        fun onExitConfirmed()
+    }
 
-  fun setOnExitListener(listener: OnExitListener?) {
-    this.exitListener = listener
-  }
+    fun setOnExitListener(listener: OnExitListener?) {
+        this.exitListener = listener
+    }
 
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-    setStyle(STYLE_NORMAL, R.style.CustomBottomSheetDialogTheme)
-  }
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setStyle(STYLE_NORMAL, R.style.CustomBottomSheetDialogTheme)
+    }
 
-  override fun onCreateView(
-    inflater: LayoutInflater, container: ViewGroup?,
-    savedInstanceState: Bundle?
-  ): View? {
-    return inflater.inflate(R.layout.exit_dialog_bottomsheet, container, false)
-  }
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        return inflater.inflate(R.layout.exit_dialog_bottomsheet, container, false)
+    }
 
-  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-    super.onViewCreated(view, savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
 
-    val exitButton = view.findViewById<ConstraintLayout>(R.id.btnExit)
-    val cancelButton = view.findViewById<ConstraintLayout>(R.id.btnCancel)
-    val closeButton = view.findViewById<AppCompatImageView>(R.id.close_button)
+        val exitButton = view.findViewById<ConstraintLayout>(R.id.btnExit)
+        val cancelButton = view.findViewById<ConstraintLayout>(R.id.btnCancel)
+        val closeButton = view.findViewById<AppCompatImageView>(R.id.close_button)
 
-    exitButton.setOnClickListener(View.OnClickListener { v: View? ->
-      if (exitListener != null) {
-        exitListener!!.onExitConfirmed()
-      }
-      dismiss()
-    })
+        exitButton.setOnClickListener(View.OnClickListener { v: View? ->
+            if (exitListener != null) {
+                exitListener!!.onExitConfirmed()
+            }
+            dismiss()
+        })
 
-    cancelButton.setOnClickListener(View.OnClickListener { v: View? -> dismiss() })
-    closeButton.setOnClickListener(View.OnClickListener { v: View? -> dismiss() })
-  }
+        cancelButton.setOnClickListener(View.OnClickListener { v: View? -> dismiss() })
+        closeButton.setOnClickListener(View.OnClickListener { v: View? -> dismiss() })
+    }
 
-  override fun onStart() {
-    super.onStart()
-    if (getDialog() != null) {
-      val bottomSheet =
-        getDialog()!!.findViewById<View?>(com.google.android.material.R.id.design_bottom_sheet)
-      if (bottomSheet != null) {
-        // Force the bottom sheet to expand fully
-        val behavior =
-          BottomSheetBehavior.from<View?>(bottomSheet)
-        behavior.setState(BottomSheetBehavior.STATE_EXPANDED)
-        behavior.setSkipCollapsed(true)
-        behavior.setHideable(true)
+    override fun onStart() {
+        super.onStart()
+        if (getDialog() != null) {
+            val bottomSheet =
+                getDialog()!!.findViewById<View?>(com.google.android.material.R.id.design_bottom_sheet)
+            if (bottomSheet != null) {
+                // Force the bottom sheet to expand fully
+                val behavior =
+                    BottomSheetBehavior.from<View?>(bottomSheet)
+                behavior.setState(BottomSheetBehavior.STATE_EXPANDED)
+                behavior.setSkipCollapsed(true)
+                behavior.setHideable(true)
 
-        // Set height to match parent
-        bottomSheet.getLayoutParams().height = ViewGroup.LayoutParams.WRAP_CONTENT
-      }
+                // Set height to match parent
+                bottomSheet.getLayoutParams().height = ViewGroup.LayoutParams.WRAP_CONTENT
+            }
+        }
     }
-  }
 
-  companion object {
-    fun newInstance(): ExitJourneyBottomSheet {
-      return ExitJourneyBottomSheet()
+    companion object {
+        fun newInstance(): ExitJourneyBottomSheet {
+            return ExitJourneyBottomSheet()
+        }
     }
-  }
 }

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

@@ -51,6 +51,8 @@ class PermissionActivity : BasePermissionActivity() {
     }
     private val reactContext = CgmTrackyLibModule.mReactContext
 
+    private var isForReconnect: Boolean = false
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityPermissionBinding.inflate(layoutInflater)
@@ -124,6 +126,8 @@ class PermissionActivity : BasePermissionActivity() {
 
     @SuppressLint("MissingPermission")
     private fun initialize() {
+        isForReconnect = intent.getBooleanExtra("IsForReconnect", false)
+
         sendDataToRN("", "cgm_permissions_page_landing")
 
         bluetoothAdapter?.let {
@@ -151,10 +155,8 @@ class PermissionActivity : BasePermissionActivity() {
             sendDataToRN(jsonObject.toString(), "cgm_permissions_proceed_clicked")
 
             startActivity(
-                Intent(this@PermissionActivity, SearchTransmitterActivity::class.java).putExtra(
-                    "IsForReconnect",
-                    intent.getBooleanExtra("IsForReconnect", false)
-                )
+                Intent(this@PermissionActivity, SearchTransmitterActivity::class.java)
+                    .putExtra("IsForReconnect", isForReconnect)
             )
             finish()
         }
@@ -170,7 +172,10 @@ class PermissionActivity : BasePermissionActivity() {
             sendDataToRN("", "cgm_watch_demo_clicked")
 
             startActivity(
-                Intent(this, VideoActivity::class.java).putExtra("VideoId", "r5Zemc4R044")
+                Intent(this, VideoActivity::class.java).putExtra(
+                    "VideoId",
+                    if (isForReconnect) "n_pUrFoZ1wQ" else "r5Zemc4R044"
+                )
             )
         }
 

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

@@ -25,14 +25,11 @@ import com.mytatvarnsdk.CgmTrackyLibModule
 import com.mytatvarnsdk.R
 import com.mytatvarnsdk.databinding.ActivityPlaceSensorBinding
 import com.mytatvarnsdk.databinding.ExitDialogBottomsheetBinding
-import com.pierfrancescosoffritti.androidyoutubeplayer.core.player.YouTubePlayer
-import com.pierfrancescosoffritti.androidyoutubeplayer.core.player.listeners.AbstractYouTubePlayerListener
-import com.pierfrancescosoffritti.androidyoutubeplayer.core.player.listeners.FullscreenListener
-import com.pierfrancescosoffritti.androidyoutubeplayer.core.player.options.IFramePlayerOptions
 
 class PlaceSensorActivity : AppCompatActivity() {
     private lateinit var binding: ActivityPlaceSensorBinding
     private val reactContext = CgmTrackyLibModule.mReactContext
+    private var isForReconnect: Boolean = false
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -48,6 +45,8 @@ class PlaceSensorActivity : AppCompatActivity() {
     }
 
     private fun init() {
+        isForReconnect = intent.getBooleanExtra("IsForReconnect", false)
+
         sendDataToRN("", "cgm_place_sensor_landing")
 
         Glide.with(this)
@@ -71,7 +70,7 @@ class PlaceSensorActivity : AppCompatActivity() {
             sendDataToRN("", "cgm_watch_demo_clicked")
 
             startActivity(
-                Intent(this, VideoActivity::class.java).putExtra("VideoId", "r5Zemc4R044")
+                Intent(this, VideoActivity::class.java).putExtra("VideoId", if (isForReconnect) "n_pUrFoZ1wQ" else "r5Zemc4R044")
             )
         }
 

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

@@ -25,14 +25,11 @@ import com.mytatvarnsdk.CgmTrackyLibModule
 import com.mytatvarnsdk.R
 import com.mytatvarnsdk.databinding.ActivityPlaceTransmitterBinding
 import com.mytatvarnsdk.databinding.ExitDialogBottomsheetBinding
-import com.pierfrancescosoffritti.androidyoutubeplayer.core.player.YouTubePlayer
-import com.pierfrancescosoffritti.androidyoutubeplayer.core.player.listeners.AbstractYouTubePlayerListener
-import com.pierfrancescosoffritti.androidyoutubeplayer.core.player.listeners.FullscreenListener
-import com.pierfrancescosoffritti.androidyoutubeplayer.core.player.options.IFramePlayerOptions
 
 class PlaceTransmitterActivity : AppCompatActivity() {
     private lateinit var binding: ActivityPlaceTransmitterBinding
     private val reactContext = CgmTrackyLibModule.mReactContext
+    private var isForReconnect: Boolean = false
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -48,6 +45,8 @@ class PlaceTransmitterActivity : AppCompatActivity() {
     }
 
     private fun init() {
+        isForReconnect = intent.getBooleanExtra("IsForReconnect", false)
+
         sendDataToRN("", "cgm_place_transmitter_landing")
 
         Glide.with(this)
@@ -79,7 +78,7 @@ class PlaceTransmitterActivity : AppCompatActivity() {
             sendDataToRN("", "cgm_watch_demo_clicked")
 
             startActivity(
-                Intent(this, VideoActivity::class.java).putExtra("VideoId", "r5Zemc4R044")
+                Intent(this, VideoActivity::class.java).putExtra("VideoId", if (isForReconnect) "n_pUrFoZ1wQ" else "r5Zemc4R044")
             )
         }
 

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

@@ -19,101 +19,105 @@ import ist.com.sdk.AlgorithmTools
 import ist.com.sdk.KRDecodeData
 
 class QRActivity : AppCompatActivity(), View.OnClickListener {
-  private var mQRFragment: QRFragment? = null
-  private var mPocDevice: PocDevice? = null
-
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-    setContentView(R.layout.activity_qr)
-    findViewById<View?>(R.id.btnLeft).setOnClickListener(this)
-    mPocDevice = intent.getParcelableExtra("device")
-    if (mPocDevice == null) {
-      finish()
+    private var mQRFragment: QRFragment? = null
+    private var mPocDevice: PocDevice? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_qr)
+        findViewById<View?>(R.id.btnLeft).setOnClickListener(this)
+        mPocDevice = intent.getParcelableExtra("device")
+        if (mPocDevice == null) {
+            finish()
+        }
     }
-  }
-
-  override fun onResume() {
-    super.onResume()
-    mQRFragment = QRFragment.newInstance(object : OnFragmentListener {
-      override fun onPermissionRequestFail(isForever: Boolean) {
-      }
-
-      override fun onCameraOpenError(e: Exception?) {
-      }
-
-      override fun onScanResult(messages: String?, bitmap: Bitmap?) {
-        Log.d("QR Info ==> ", "onScanResult: $messages")
-        mQRFragment!!.restartPreviewAfterDelay(0)
-      }
-
-      override fun onScanResultFromCT2(messages: String?, bitmap: Bitmap?) {
-        Log.d("QR Info ==> ", "onScanResultFromCT2: $messages")
-
-      }
-
-      override fun onScanResultFromCT3(messages: String, bitmap: Bitmap?) {
-        decodeMessageCt3(messages)
-      }
-
-      override fun onScanResultFromCT5(messages: String?, bitmap: Bitmap?) {
-      }
-    })
-    supportFragmentManager.beginTransaction()
-      .add(R.id.container, mQRFragment!!)
-      .commit()
-  }
-
-
-  /**
-   * 进行数据解析
-   *
-   * @param message 需要解析的信息
-   */
-  private fun decodeMessageCt3(message: String) {
-    Log.d("QR Info ==> ", "decodeMessageCt3: $message")
-
-    val decodeData: KRDecodeData = AlgorithmTools.getInstance().decodeCT(message.toCharArray())
-
-    Log.d("QR Info ==> ", "decodeData: $decodeData")
-
-    showMessage(message, decodeData.k, decodeData.r, message)
-  }
-
-  fun showMessage(message: String?, k: Float, r: Float, sensorInfo: String?) {
-    try {
-
-      val prefsHelper = SharedPreferencesLibraryUtil(this)
-      prefsHelper.setQRInformation(mPocDevice?.name, message, k, r, sensorInfo)
-      val qrInformation: QRInformation? = prefsHelper.qrInformation
-
-      Log.d("qrInformation==> ", "mPocDevice:  ${mPocDevice.toString()}")
-      if (qrInformation != null && qrInformation.isEffective(mPocDevice?.name, r, k)) {
-        Log.d("qrInformation==> ", "qrInformation:  $qrInformation")
-        setResult(RESULT_OK, Intent().putExtra("device", mPocDevice as Parcelable))
-        finish()
-      } else {
-        Toast.makeText(this@QRActivity, getString(R.string.verification_fail), Toast.LENGTH_SHORT)
-          .show()
-        mQRFragment!!.restartPreviewAfterDelay(0)
-      }
-    } catch (e: Exception) {
-      e.printStackTrace()
-      finish()
+
+    override fun onResume() {
+        super.onResume()
+        mQRFragment = QRFragment.newInstance(object : OnFragmentListener {
+            override fun onPermissionRequestFail(isForever: Boolean) {
+            }
+
+            override fun onCameraOpenError(e: Exception?) {
+            }
+
+            override fun onScanResult(messages: String?, bitmap: Bitmap?) {
+                Log.d("QR Info ==> ", "onScanResult: $messages")
+                mQRFragment!!.restartPreviewAfterDelay(0)
+            }
+
+            override fun onScanResultFromCT2(messages: String?, bitmap: Bitmap?) {
+                Log.d("QR Info ==> ", "onScanResultFromCT2: $messages")
+
+            }
+
+            override fun onScanResultFromCT3(messages: String, bitmap: Bitmap?) {
+                decodeMessageCt3(messages)
+            }
+
+            override fun onScanResultFromCT5(messages: String?, bitmap: Bitmap?) {
+            }
+        })
+        supportFragmentManager.beginTransaction()
+            .add(R.id.container, mQRFragment!!)
+            .commit()
+    }
+
+
+    /**
+     * 进行数据解析
+     *
+     * @param message 需要解析的信息
+     */
+    private fun decodeMessageCt3(message: String) {
+        Log.d("QR Info ==> ", "decodeMessageCt3: $message")
+
+        val decodeData: KRDecodeData = AlgorithmTools.getInstance().decodeCT(message.toCharArray())
+
+        Log.d("QR Info ==> ", "decodeData: $decodeData")
+
+        showMessage(message, decodeData.k, decodeData.r, message)
+    }
+
+    fun showMessage(message: String?, k: Float, r: Float, sensorInfo: String?) {
+        try {
+
+            val prefsHelper = SharedPreferencesLibraryUtil(this)
+            prefsHelper.setQRInformation(mPocDevice?.name, message, k, r, sensorInfo)
+            val qrInformation: QRInformation? = prefsHelper.qrInformation
+
+            Log.d("qrInformation==> ", "mPocDevice:  ${mPocDevice.toString()}")
+            if (qrInformation != null && qrInformation.isEffective(mPocDevice?.name, r, k)) {
+                Log.d("qrInformation==> ", "qrInformation:  $qrInformation")
+                setResult(RESULT_OK, Intent().putExtra("device", mPocDevice as Parcelable))
+                finish()
+            } else {
+                Toast.makeText(
+                    this@QRActivity,
+                    getString(R.string.verification_fail),
+                    Toast.LENGTH_SHORT
+                )
+                    .show()
+                mQRFragment!!.restartPreviewAfterDelay(0)
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+            finish()
+        }
     }
-  }
 
-  override fun onClick(v: View) {
-    if (v.id == R.id.btnLeft) {
-      finish()
+    override fun onClick(v: View) {
+        if (v.id == R.id.btnLeft) {
+            finish()
+        }
     }
-  }
-
-  companion object {
-    fun startQR(activity: Activity, device: PocDevice?) {
-      val intent = Intent(activity, QRActivity::class.java)
-      intent.flags = Intent.FLAG_ACTIVITY_SINGLE_TOP
-      intent.putExtra("device", device as Parcelable)
-      activity.startActivityForResult(intent, 115)
+
+    companion object {
+        fun startQR(activity: Activity, device: PocDevice?) {
+            val intent = Intent(activity, QRActivity::class.java)
+            intent.flags = Intent.FLAG_ACTIVITY_SINGLE_TOP
+            intent.putExtra("device", device as Parcelable)
+            activity.startActivityForResult(intent, 115)
+        }
     }
-  }
 }

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

@@ -272,8 +272,8 @@ class SearchTransmitterActivity : BaseBleActivity() {
         binding.tvTransName.text = "Sno: ${transmitterDeviceInfo!!.pocDevice.name}"
         val formatter = SimpleDateFormat("hh:mm a", Locale.getDefault())
         binding.tvDateTime.text = "Connected on ${formatter.format(Date()).uppercase()}"
-        binding.clSuccess.visibility = View.VISIBLE
         binding.clMain.visibility = View.GONE
+        binding.clSuccess.visibility = View.VISIBLE
         binding.commonButton.btnProceed.isEnabled = true
         binding.commonButton.btnProceed.alpha = 1.0f
         binding.view2.background = ContextCompat.getDrawable(this, R.drawable.bg_green_progress)
@@ -334,7 +334,7 @@ class SearchTransmitterActivity : BaseBleActivity() {
             sendDataToRN("", "cgm_watch_demo_clicked")
 
             startActivity(
-                Intent(this, VideoActivity::class.java).putExtra("VideoId", "r5Zemc4R044")
+                Intent(this, VideoActivity::class.java).putExtra("VideoId", if (isForReconnect) "n_pUrFoZ1wQ" else "r5Zemc4R044")
             )
         }
 

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

@@ -88,7 +88,7 @@ class SensorConnectSuccessActivity : AppCompatActivity() {
             sendDataToRN("","cgm_watch_demo_clicked")
 
             startActivity(
-                Intent(this, VideoActivity::class.java).putExtra("VideoId", "r5Zemc4R044")
+                Intent(this, VideoActivity::class.java).putExtra("VideoId", if (isForReconnect) "n_pUrFoZ1wQ" else "r5Zemc4R044")
             )
         }
 

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

@@ -27,7 +27,6 @@ import com.mytatvarnsdk.CgmTrackyLibModule.Companion.mReactContext
 import com.mytatvarnsdk.R
 import com.mytatvarnsdk.databinding.ActivityStartCgmactivityBinding
 import com.mytatvarnsdk.databinding.ExitDialogBottomsheetBinding
-import org.json.JSONObject
 
 
 class StartCGMActivity : AppCompatActivity() {
@@ -96,7 +95,10 @@ class StartCGMActivity : AppCompatActivity() {
         binding.toolbar.btnWatchDemo.setOnClickListener {
             sendDataToRN("", "cgm_watch_demo_clicked")
             startActivity(
-                Intent(this, VideoActivity::class.java).putExtra("VideoId", "r5Zemc4R044")
+                Intent(this, VideoActivity::class.java).putExtra(
+                    "VideoId",
+                    if (isForReconnect) "n_pUrFoZ1wQ" else "r5Zemc4R044"
+                )
             )
         }
 

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

@@ -8,7 +8,6 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import com.mytatvarnsdk.R
-import com.mytatvarnsdk.databinding.ActivityStartCgmactivityBinding
 import com.mytatvarnsdk.databinding.ActivityVideoBinding
 import com.pierfrancescosoffritti.androidyoutubeplayer.core.player.YouTubePlayer
 import com.pierfrancescosoffritti.androidyoutubeplayer.core.player.listeners.AbstractYouTubePlayerListener
@@ -46,6 +45,9 @@ class VideoActivity : AppCompatActivity() {
             .build()
         binding.youtubePlayerView.enableAutomaticInitialization = false
 
+        binding.ivClose.setOnClickListener {
+            handleBackPressedManually()
+        }
 
         binding.youtubePlayerView.addFullscreenListener(object : FullscreenListener {
             override fun onEnterFullscreen(fullscreenView: View, exitFullscreen: () -> Unit) {
@@ -83,12 +85,15 @@ class VideoActivity : AppCompatActivity() {
 
     private val onBackPressedCallback = object : OnBackPressedCallback(true) {
         override fun handleOnBackPressed() {
-            if (isFullscreen) {
-                // if the player is in fullscreen, exit fullscreen
-                youTubePlayer.toggleFullscreen()
-            } else {
-                finish()
-            }
+            handleBackPressedManually()
+        }
+    }
+
+    private fun handleBackPressedManually() {
+        if (isFullscreen) {
+            youTubePlayer.toggleFullscreen()
+        } else {
+            finish()
         }
     }
 }