MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-07-22 14:52:25 +02:00
Code Releases Wiki Activity

Removed duplicate UI updates

Browse Source
This commit is contained in:
TaaviE 2020-08-02 22:06:18 +03:00
parent d7ce49a2f3
commit 83f3b8565e
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -548,12 +548,11 @@ public class DiscoveryActivity extends AbstractGBActivity implements AdapterView
handler.sendMessageDelayed(getPostMessage(stopRunnable), SCAN_DURATION); handler.sendMessageDelayed(getPostMessage(stopRunnable), SCAN_DURATION);
if(adapter.startLeScan(leScanCallback)) { if(adapter.startLeScan(leScanCallback)) {
LOG.info("Old Bluetooth LE scan started successfully"); LOG.info("Old Bluetooth LE scan started successfully");
setIsScanning(Scanning.SCANNING_BLE);
bluetoothLEProgress.setVisibility(View.VISIBLE); bluetoothLEProgress.setVisibility(View.VISIBLE);
setIsScanning(Scanning.SCANNING_BLE);
} else { } else {
LOG.info("Old Bluetooth LE scan starting failed"); LOG.info("Old Bluetooth LE scan starting failed");
setIsScanning(Scanning.SCANNING_OFF); setIsScanning(Scanning.SCANNING_OFF);
bluetoothLEProgress.setVisibility(View.GONE);
} }
} }
@ -564,7 +563,6 @@ public class DiscoveryActivity extends AbstractGBActivity implements AdapterView
} }
setIsScanning(Scanning.SCANNING_OFF); setIsScanning(Scanning.SCANNING_OFF);
bluetoothLEProgress.setVisibility(View.GONE);
} }
/* New BTLE Discovery uses startScan (List<ScanFilter> filters, /* New BTLE Discovery uses startScan (List<ScanFilter> filters,
@ -582,8 +580,8 @@ public class DiscoveryActivity extends AbstractGBActivity implements AdapterView
adapter.getBluetoothLeScanner().startScan(null, getScanSettings(), getScanCallback()); adapter.getBluetoothLeScanner().startScan(null, getScanSettings(), getScanCallback());
LOG.debug("Bluetooth LE discovery started successfully"); LOG.debug("Bluetooth LE discovery started successfully");
setIsScanning(Scanning.SCANNING_BLE);
bluetoothLEProgress.setVisibility(View.VISIBLE); bluetoothLEProgress.setVisibility(View.VISIBLE);
setIsScanning(Scanning.SCANNING_BLE);
} }
@RequiresApi(Build.VERSION_CODES.LOLLIPOP) @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
@ -608,9 +606,8 @@ public class DiscoveryActivity extends AbstractGBActivity implements AdapterView
return; return;
} }
bluetoothLEProgress.setVisibility(View.GONE);
setIsScanning(Scanning.SCANNING_OFF);
LOG.debug("Stopped BLE discovery"); LOG.debug("Stopped BLE discovery");
setIsScanning(Scanning.SCANNING_OFF);
} }
/** /**
@ -629,7 +626,6 @@ public class DiscoveryActivity extends AbstractGBActivity implements AdapterView
setIsScanning(what); setIsScanning(what);
} else { } else {
LOG.error("Discovery starting failed"); LOG.error("Discovery starting failed");
bluetoothProgress.setVisibility(View.GONE);
setIsScanning(Scanning.SCANNING_OFF); setIsScanning(Scanning.SCANNING_OFF);
} }
} }
@ -637,11 +633,9 @@ public class DiscoveryActivity extends AbstractGBActivity implements AdapterView
private void stopBTDiscovery() { private void stopBTDiscovery() {
if (adapter != null) { if (adapter != null) {
adapter.cancelDiscovery(); adapter.cancelDiscovery();
bluetoothProgress.setVisibility(View.GONE);
setIsScanning(Scanning.SCANNING_OFF);
LOG.info("Stopped BT discovery"); LOG.info("Stopped BT discovery");
} }
setIsScanning(Scanning.SCANNING_OFF);
} }
private void discoveryFinished() { private void discoveryFinished() {
@ -657,6 +651,8 @@ public class DiscoveryActivity extends AbstractGBActivity implements AdapterView
if (isScanning == Scanning.SCANNING_OFF) { if (isScanning == Scanning.SCANNING_OFF) {
startButton.setText(getString(R.string.discovery_start_scanning)); startButton.setText(getString(R.string.discovery_start_scanning));
bluetoothProgress.setVisibility(View.GONE);
bluetoothLEProgress.setVisibility(View.GONE);
} else { } else {
startButton.setText(getString(R.string.discovery_stop_scanning)); startButton.setText(getString(R.string.discovery_stop_scanning));
} }
@ -673,7 +669,6 @@ public class DiscoveryActivity extends AbstractGBActivity implements AdapterView
bluetoothLEProgress.setVisibility(View.GONE); bluetoothLEProgress.setVisibility(View.GONE);
} }
setIsScanning(Scanning.SCANNING_OFF);
discoveryFinished(); discoveryFinished();
} }