Fix: App Crash on Android 12

umer0586 · Jan 8, 2025 · de093d1 · de093d1
1 parent 25c499f
commit de093d1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/app/src/main/java/com/github/umer0586/droidpad/data/connection/BluetoothLEConnection.kt b/app/src/main/java/com/github/umer0586/droidpad/data/connection/BluetoothLEConnection.kt
@@ -81,9 +81,13 @@ class BluetoothLEConnection(
     private var connectedDevice: BluetoothDevice? = null
 
 
-    val localName: String
-        @SuppressLint("MissingPermission")
-        get() = bluetoothAdapter.name ?: "Unknown"
+    val bluetoothDisplayName: String
+        get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S &&
+            context.checkSelfPermission(Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED) {
+            "Unknown"
+        } else {
+            bluetoothAdapter.name ?: "Unknown"
+        }
 
     override val connectionType: ConnectionType
         get() = ConnectionType.BLUETOOTH_LE

diff --git a/...github/umer0586/droidpad/ui/screens/controlpadplayscreen/ControlPadPlayScreenViewModel.kt b/...github/umer0586/droidpad/ui/screens/controlpadplayscreen/ControlPadPlayScreenViewModel.kt
@@ -111,7 +111,7 @@ class ControlPadPlayScreenViewModel @Inject constructor(
                                 ConnectionType.UDP -> (connection as UDPConnection).udpConfig.address
                                 ConnectionType.WEBSOCKET -> (connection as WebsocketConnection).webSocketConfig.address
                                 ConnectionType.MQTT -> (connection as MqttConnection).mqttConfig.brokerAddress
-                                ConnectionType.BLUETOOTH_LE -> (connection as BluetoothLEConnection).localName
+                                ConnectionType.BLUETOOTH_LE -> (connection as BluetoothLEConnection).bluetoothDisplayName
 
                             }
                         )