From c246d9e702274db1bb38c39b00d6fb8e9ebf3c42 Mon Sep 17 00:00:00 2001 From: Juha Heinanen Date: Fri, 14 Apr 2023 12:00:28 +0300 Subject: [PATCH] Improved Bluetooth headset connected test --- .../kotlin/com/tutpro/baresip/BaresipService.kt | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt index ed687540..db860986 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt @@ -1549,14 +1549,13 @@ class BaresipService: Service() { return audioFocusRequest == null } - @SuppressLint("MissingPermission") private fun isBluetoothHeadsetConnected(ctx: Context): Boolean { - return if (ActivityCompat.checkSelfPermission(ctx, Manifest.permission.BLUETOOTH_CONNECT) == - PackageManager.PERMISSION_GRANTED) - btAdapter != null && btAdapter!!.isEnabled && - btAdapter!!.getProfileConnectionState(BluetoothHeadset.HEADSET) == BluetoothAdapter.STATE_CONNECTED - else - true + if (VERSION.SDK_INT >= 31 && + ActivityCompat.checkSelfPermission(ctx, Manifest.permission.BLUETOOTH_CONNECT) == + PackageManager.PERMISSION_DENIED) + return false + return btAdapter != null && btAdapter!!.isEnabled && + btAdapter!!.getProfileConnectionState(BluetoothHeadset.HEADSET) == BluetoothAdapter.STATE_CONNECTED } private fun isBluetoothScoOn(am: AudioManager): Boolean {