Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-14 11:49:04 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '1785-bluetooth-adapter-npe' into 'master'

Browse Source 
Check whether Bluetooth adapter exists before trying to get address

Closes #1785

See merge request briar/briar!1288
This commit is contained in:
Torsten Grote
2020-09-29 12:51:22 +00:00
parent e2124ff3c9 e9cdec95e0
commit 6a2c2bed0f
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPlugin.java
View File

@@ -135,6 +135,7 @@ class AndroidBluetoothPlugin
@Override @Override
@Nullable @Nullable
String getBluetoothAddress() { String getBluetoothAddress() {
if (adapter == null) return null;
String address = AndroidUtils.getBluetoothAddress(app, adapter); String address = AndroidUtils.getBluetoothAddress(app, adapter);
return address.isEmpty() ? null : address; return address.isEmpty() ? null : address;
} }