Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed crash if no bluetooth adapter available to get device name

Browse source
This commit is contained in:
Sylvain Berfini 2019-12-20 09:15:41 +01:00
parent 0525386363
commit 076ceff33e
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/org/linphone/compatibility/ApiTwentySixPlus.java
View file

@ -48,7 +48,10 @@ class ApiTwentySixPlus {
Settings.Global.getString( Settings.Global.getString(
context.getContentResolver(), Settings.Global.DEVICE_NAME); context.getContentResolver(), Settings.Global.DEVICE_NAME);
if (name == null) { if (name == null) {
name = BluetoothAdapter.getDefaultAdapter().getName(); BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
if (adapter != null) {
name = adapter.getName();
}
} }
if (name == null) { if (name == null) {
name = Settings.Secure.getString(context.getContentResolver(), "bluetooth_name"); name = Settings.Secure.getString(context.getContentResolver(), "bluetooth_name");

7
app/src/main/java/org/linphone/compatibility/Compatibility.java
View file

@ -51,7 +51,12 @@ public class Compatibility {
return ApiTwentySixPlus.getDeviceName(context); 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) { if (name == null) {
name = Settings.Secure.getString(context.getContentResolver(), "bluetooth_name"); name = Settings.Secure.getString(context.getContentResolver(), "bluetooth_name");
} }