fix leak

storytellerF · Mar 30, 2023 · c1eac68 · c1eac68
1 parent f0cb7b4
commit c1eac68
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/app/src/main/java/com/storyteller_f/fei/MainActivity.kt b/app/src/main/java/com/storyteller_f/fei/MainActivity.kt
@@ -156,6 +156,7 @@ class MainActivity : ComponentActivity() {
                 super.onDestroy(owner)
                 unregisterReceiver(bluetoothStateReceiver)
                 unRegister(this@MainActivity, hidDevice)
+                closeBluetoothProfile(bluetoothManager, hidDevice)
             }
         })
         val connectDevice: (String) -> Boolean = { address ->

diff --git a/app/src/main/java/com/storyteller_f/fei/ui/components/Hid.kt b/app/src/main/java/com/storyteller_f/fei/ui/components/Hid.kt
@@ -4,6 +4,8 @@ import android.Manifest
 import android.bluetooth.BluetoothDevice
 import android.bluetooth.BluetoothHidDevice
 import android.bluetooth.BluetoothHidDeviceAppSdpSettings
+import android.bluetooth.BluetoothManager
+import android.bluetooth.BluetoothProfile
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
@@ -365,3 +367,11 @@ object Dvorak : KeyboardInterfaceInterceptor {
         }.joinToString("")
     }
 }
+
+fun closeBluetoothProfile(
+    bluetoothManager: BluetoothManager, bluetoothHidDevice: BluetoothHidDevice?
+) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+        bluetoothManager.adapter.closeProfileProxy(BluetoothProfile.HID_DEVICE, bluetoothHidDevice)
+    }
+}