mirror of
https://codeberg.org/Freeyourgadget/Gadgetbridge
synced 2024-08-25 16:50:44 +02:00
Do not crash inside the emulator (#1150)
As there is no bluetooth support in the emulator
This commit is contained in:
parent
355f2e6bb5
commit
11c545362a
@ -399,7 +399,7 @@ public class DiscoveryActivity extends AbstractGBActivity implements AdapterView
|
|||||||
} else if (what == Scanning.SCANNING_NEW_BTLE) {
|
} else if (what == Scanning.SCANNING_NEW_BTLE) {
|
||||||
if (GB.supportsBluetoothLE()) {
|
if (GB.supportsBluetoothLE()) {
|
||||||
startNEWBTLEDiscovery();
|
startNEWBTLEDiscovery();
|
||||||
} else {
|
} else {
|
||||||
discoveryFinished();
|
discoveryFinished();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -433,15 +433,20 @@ public class DiscoveryActivity extends AbstractGBActivity implements AdapterView
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void stopBTLEDiscovery() {
|
private void stopBTLEDiscovery() {
|
||||||
adapter.stopLeScan(leScanCallback);
|
if (adapter != null)
|
||||||
|
adapter.stopLeScan(leScanCallback);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void stopBTDiscovery() {
|
private void stopBTDiscovery() {
|
||||||
adapter.cancelDiscovery();
|
if (adapter != null)
|
||||||
|
adapter.cancelDiscovery();
|
||||||
}
|
}
|
||||||
|
|
||||||
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
|
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
|
||||||
private void stopNewBTLEDiscovery() {
|
private void stopNewBTLEDiscovery() {
|
||||||
|
if (adapter == null)
|
||||||
|
return;
|
||||||
|
|
||||||
BluetoothLeScanner bluetoothLeScanner = adapter.getBluetoothLeScanner();
|
BluetoothLeScanner bluetoothLeScanner = adapter.getBluetoothLeScanner();
|
||||||
if (bluetoothLeScanner == null) {
|
if (bluetoothLeScanner == null) {
|
||||||
LOG.warn("could not get BluetoothLeScanner()!");
|
LOG.warn("could not get BluetoothLeScanner()!");
|
||||||
@ -520,10 +525,10 @@ public class DiscoveryActivity extends AbstractGBActivity implements AdapterView
|
|||||||
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
|
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
|
||||||
private void startNEWBTLEDiscovery() {
|
private void startNEWBTLEDiscovery() {
|
||||||
// Only use new API when user uses Lollipop+ device
|
// Only use new API when user uses Lollipop+ device
|
||||||
LOG.info("Start New BTLE Discovery");
|
LOG.info("Start New BTLE Discovery");
|
||||||
handler.removeMessages(0, stopRunnable);
|
handler.removeMessages(0, stopRunnable);
|
||||||
handler.sendMessageDelayed(getPostMessage(stopRunnable), SCAN_DURATION);
|
handler.sendMessageDelayed(getPostMessage(stopRunnable), SCAN_DURATION);
|
||||||
adapter.getBluetoothLeScanner().startScan(getScanFilters(), getScanSettings(), getScanCallback());
|
adapter.getBluetoothLeScanner().startScan(getScanFilters(), getScanSettings(), getScanCallback());
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<ScanFilter> getScanFilters() {
|
private List<ScanFilter> getScanFilters() {
|
||||||
|
Loading…
Reference in New Issue
Block a user