nixo
/
GadgetBridge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Do not crash on null BT adapter, allows UI work on emulator.

This commit is contained in:
Lem Dulfo 2016-04-09 09:12:40 +08:00 committed by cpfeiffer
parent 57ecba16f3
commit 3ef942b5d3
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DiscoveryActivity.java
View File

@ -290,6 +290,11 @@ public class DiscoveryActivity extends Activity implements AdapterView.OnItemCli
return false; return false;
} }
BluetoothAdapter adapter = bluetoothService.getAdapter(); BluetoothAdapter adapter = bluetoothService.getAdapter();
if (adapter == null) {
LOG.warn("No bluetooth available");
this.adapter = null;
return false;
}
if (!adapter.isEnabled()) { if (!adapter.isEnabled()) {
LOG.warn("Bluetooth not enabled"); LOG.warn("Bluetooth not enabled");
Intent enableBtIntent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE); Intent enableBtIntent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE);