Fixed a reported IllegalStateException.

dmnsea · Jan 27, 2023 · 44bd267 · 44bd267
1 parent e5d3f41
commit 44bd267
Showing 1 changed file with 19 additions and 5 deletions.
diff --git a/app/src/main/java/com/guillaumepayet/remotenumpad/helpers/IBluetoothConnector.kt b/app/src/main/java/com/guillaumepayet/remotenumpad/helpers/IBluetoothConnector.kt
@@ -73,17 +73,15 @@ interface IBluetoothConnector {
                             onUserDeclinedBluetooth()
                         },
                         onGranted = {
-                            activity.registerPermissionResultCallback(permissionResultCallback)
-                            activity.requestPermission(permission)
+                            requestPermission(permission)
                         }
                     ).show(activity.supportFragmentManager, null)
 
                     activity.isShowingDialog = true
                 }
             }
             !userHasDeclinedBluetooth -> {
-                activity.registerPermissionResultCallback(permissionResultCallback)
-                activity.requestPermission(permission)
+                requestPermission(permission)
             }
         }
 
@@ -104,12 +102,28 @@ interface IBluetoothConnector {
             !userHasDeclinedBluetooth -> {
                 if (!activity.isShowingDialog) {
                     activity.registerActivityResultCallback(activityResultCallback)
-                    activity.startActivityForResult(Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE))
+
+                    try {
+                        activity.startActivityForResult(Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE))
+                    } catch (e: IllegalStateException) {
+                        activity.unregisterActivityResultCallback(activityResultCallback)
+                    }
+
                     activity.isShowingDialog = true
                 }
             }
         }
 
         return null
     }
+
+    private fun requestPermission(permission: String) {
+        activity.registerPermissionResultCallback(permissionResultCallback)
+
+        try {
+            activity.requestPermission(permission)
+        } catch (e: IllegalStateException) {
+            activity.unregisterPermissionResultCallback(permissionResultCallback)
+        }
+    }
 }