From 076ceff33e64c8b499936f9ba6b580d05906ebdf Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Fri, 20 Dec 2019 09:15:41 +0100 Subject: [PATCH] Fixed crash if no bluetooth adapter available to get device name --- .../java/org/linphone/compatibility/ApiTwentySixPlus.java | 5 ++++- .../java/org/linphone/compatibility/Compatibility.java | 7 ++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/linphone/compatibility/ApiTwentySixPlus.java b/app/src/main/java/org/linphone/compatibility/ApiTwentySixPlus.java index 03aa2c732..7abf51488 100644 --- a/app/src/main/java/org/linphone/compatibility/ApiTwentySixPlus.java +++ b/app/src/main/java/org/linphone/compatibility/ApiTwentySixPlus.java @@ -48,7 +48,10 @@ class ApiTwentySixPlus { Settings.Global.getString( context.getContentResolver(), Settings.Global.DEVICE_NAME); if (name == null) { - name = BluetoothAdapter.getDefaultAdapter().getName(); + BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter(); + if (adapter != null) { + name = adapter.getName(); + } } if (name == null) { name = Settings.Secure.getString(context.getContentResolver(), "bluetooth_name"); diff --git a/app/src/main/java/org/linphone/compatibility/Compatibility.java b/app/src/main/java/org/linphone/compatibility/Compatibility.java index 057c6e68a..23268222d 100644 --- a/app/src/main/java/org/linphone/compatibility/Compatibility.java +++ b/app/src/main/java/org/linphone/compatibility/Compatibility.java @@ -51,7 +51,12 @@ public class Compatibility { return ApiTwentySixPlus.getDeviceName(context); } - String name = BluetoothAdapter.getDefaultAdapter().getName(); + String name = null; + BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter(); + if (adapter != null) { + name = adapter.getName(); + } + if (name == null) { name = Settings.Secure.getString(context.getContentResolver(), "bluetooth_name"); }