From 8dfbe983967b30e31e22fdbf28ab85fbdfa76e1a Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 19 Jan 2022 12:24:17 +0100 Subject: [PATCH] Prevent crash if bluetooth isn't available on the device --- .../main/java/org/linphone/compatibility/Api21Compatibility.kt | 3 ++- .../main/java/org/linphone/compatibility/Api25Compatibility.kt | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/linphone/compatibility/Api21Compatibility.kt b/app/src/main/java/org/linphone/compatibility/Api21Compatibility.kt index 9b3eaa38b..3bff031ee 100644 --- a/app/src/main/java/org/linphone/compatibility/Api21Compatibility.kt +++ b/app/src/main/java/org/linphone/compatibility/Api21Compatibility.kt @@ -48,7 +48,8 @@ class Api21Compatibility { companion object { @SuppressLint("MissingPermission") fun getDeviceName(context: Context): String { - var name = BluetoothAdapter.getDefaultAdapter().name + val adapter = BluetoothAdapter.getDefaultAdapter() + var name = adapter?.name if (name == null) { name = Settings.Secure.getString( context.contentResolver, diff --git a/app/src/main/java/org/linphone/compatibility/Api25Compatibility.kt b/app/src/main/java/org/linphone/compatibility/Api25Compatibility.kt index 084ee9d71..a813f8a81 100644 --- a/app/src/main/java/org/linphone/compatibility/Api25Compatibility.kt +++ b/app/src/main/java/org/linphone/compatibility/Api25Compatibility.kt @@ -34,7 +34,8 @@ class Api25Compatibility { context.contentResolver, Settings.Global.DEVICE_NAME ) if (name == null) { - name = BluetoothAdapter.getDefaultAdapter().name + val adapter = BluetoothAdapter.getDefaultAdapter() + name = adapter?.name } if (name == null) { name = Settings.Secure.getString(