react-native-mytatva-rn-sdk 1.2.8 → 1.2.10

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

@@ -107,7 +107,7 @@ class ConnectSensorActivity : BaseBleActivity() {
     }
   }
 
-  fun manageErrorState(showError: Boolean) {
+  fun manageErrorState(showError: Boolean, errorStatus: String) {
     ProgressManagement.getInstance().dismissWait(this)
     if (showError) {
       binding.clFail.visibility = View.VISIBLE
@@ -138,6 +138,13 @@ class ConnectSensorActivity : BaseBleActivity() {
           )
         }
       }
+
+      if (errorStatus.isNotEmpty()) {
+        binding.tvReason.visibility = View.VISIBLE
+        binding.tvReason.text = "Reason - ${errorStatus}"
+      } else {
+        binding.tvReason.visibility = View.GONE
+      }
     } else {
       binding.commonButton.root.visibility = View.VISIBLE
       binding.clFail.visibility = View.GONE
@@ -278,7 +285,7 @@ class ConnectSensorActivity : BaseBleActivity() {
 
   override fun bindFail() {
     super.bindFail()
-    manageErrorState(true)
+    manageErrorState(true, "Bind Fail")
   }
 
   override fun bindSuccess() {
@@ -291,43 +298,43 @@ class ConnectSensorActivity : BaseBleActivity() {
 
   override fun bluetoothStateOFF() {
     super.bluetoothStateOFF()
-    manageErrorState(true)
+    manageErrorState(true, "Bluetooth Off")
 
   }
 
   override fun disconnect() {
     super.disconnect()
-    manageErrorState(true)
+    manageErrorState(true, "Disconnected")
 
   }
 
   override fun disconnectForTimeout() {
     super.disconnectForTimeout()
-    manageErrorState(true)
+    manageErrorState(true, "Disconnected")
 
   }
 
   override fun checkFailForLowPower() {
     super.checkFailForLowPower()
-    manageErrorState(true)
+    manageErrorState(true, "Low Power")
 
   }
 
   override fun checkFailErrorTemperature() {
     super.checkFailErrorTemperature()
-    manageErrorState(true)
+    manageErrorState(true, "Temperature Error")
 
   }
 
   override fun unbindReset() {
     super.unbindReset()
-    manageErrorState(true)
+    manageErrorState(true, "Unbinded")
 
   }
 
   override fun unbindCommand() {
     super.unbindCommand()
-    manageErrorState(true)
+    manageErrorState(true, "Unbinded")
 
   }
 

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

@@ -1,8 +1,10 @@
 package com.mytatvarnsdk.activity
 
 import android.Manifest
+import android.annotation.SuppressLint
 import android.app.AlertDialog
 import android.app.Dialog
+import android.bluetooth.BluetoothAdapter
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
@@ -14,9 +16,11 @@ import android.view.Gravity
 import android.view.View
 import android.view.ViewGroup
 import android.view.Window
+import android.widget.Toast
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.enableEdgeToEdge
 import androidx.annotation.RequiresApi
+import androidx.annotation.RequiresPermission
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.toDrawable
@@ -33,6 +37,11 @@ class PermissionActivity : BasePermissionActivity() {
   private val LOCATION_REQUEST_CODE = 101
   private val BLUETOOTH_REQUEST_CODE = 102
 
+  private val REQUEST_ENABLE_BT = 1
+  private val bluetoothAdapter: BluetoothAdapter? by lazy {
+    BluetoothAdapter.getDefaultAdapter()
+  }
+
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     binding = ActivityPermissionBinding.inflate(layoutInflater)
@@ -104,8 +113,12 @@ class PermissionActivity : BasePermissionActivity() {
   }
 
 
+  @SuppressLint("MissingPermission")
   private fun initialize() {
-    binding.switchBluetooth.isChecked = isBluetoothPermissionGranted(this)
+    bluetoothAdapter?.let {
+      binding.switchBluetooth.isChecked = isBluetoothPermissionGranted(this) && it.isEnabled
+    }
+
     binding.switchLocation.isChecked = isLocationPermissionGranted(this)
 
     binding.switchBluetooth.setOnCheckedChangeListener { _, isChecked ->
@@ -218,6 +231,7 @@ class PermissionActivity : BasePermissionActivity() {
     }
   }
 
+  @RequiresPermission(Manifest.permission.BLUETOOTH_CONNECT)
   private fun requestBluetoothPermission() {
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
       val permissions = PermissionUtils.BLUETOOTH_S
@@ -279,11 +293,12 @@ class PermissionActivity : BasePermissionActivity() {
   }
 
   private fun updateProceedButtonState() {
-    binding.commonButton.btnProceed.isEnabled = areAllPermissionsGranted()
-    if (areAllPermissionsGranted()) {
+    if (areAllPermissionsGranted() && bluetoothAdapter!!.isEnabled) {
       binding.commonButton.btnProceed.alpha = 1f
+      binding.commonButton.btnProceed.isEnabled = true
     } else {
       binding.commonButton.btnProceed.alpha = 0.5f
+      binding.commonButton.btnProceed.isEnabled = false
     }
   }
 
@@ -298,6 +313,7 @@ class PermissionActivity : BasePermissionActivity() {
     }
   }
 
+  @RequiresPermission(Manifest.permission.BLUETOOTH_CONNECT)
   override fun onRequestPermissionsResult(
     requestCode: Int,
     permissions: Array<out String>,
@@ -335,7 +351,17 @@ class PermissionActivity : BasePermissionActivity() {
     // Start location-based action
   }
 
+  @RequiresPermission(Manifest.permission.BLUETOOTH_CONNECT)
   private fun onBluetoothPermissionGranted() {
+    if (bluetoothAdapter == null) {
+      Toast.makeText(this, "Bluetooth not supported", Toast.LENGTH_SHORT).show()
+    } else {
+      if (!bluetoothAdapter!!.isEnabled) {
+        val enableBtIntent = Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE)
+        startActivityForResult(enableBtIntent, REQUEST_ENABLE_BT)
+      }
+    }
+
     updateProceedButtonState()
     // Start Bluetooth device scan or connect
   }
@@ -345,6 +371,14 @@ class PermissionActivity : BasePermissionActivity() {
     updateProceedButtonState()
   }
 
+  override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+    super.onActivityResult(requestCode, resultCode, data)
+    if (requestCode == REQUEST_ENABLE_BT) {
+      if (resultCode == RESULT_OK) {
+        updateProceedButtonState()
+      }
+    }
+  }
 }
 
 object PermissionUtils {