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

only disconnect device when confirming delete dialog

This commit is contained in:
Andreas Shimokawa 2016-09-30 19:20:04 +02:00
parent 456fcfdd98
commit 56d8a49d5b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -300,7 +300,6 @@ public class ControlCenter extends GBActivity {
return true; return true;
case R.id.controlcenter_delete_device: case R.id.controlcenter_delete_device:
if (selectedDevice != null) { if (selectedDevice != null) {
GBApplication.deviceService().disconnect();
showDeleteDeviceDialog(selectedDevice); showDeleteDeviceDialog(selectedDevice);
selectedDevice = null; selectedDevice = null;
refreshPairedDevices(); refreshPairedDevices();
@ -372,6 +371,10 @@ public class ControlCenter extends GBActivity {
private void deleteDevice(final GBDevice gbDevice) { private void deleteDevice(final GBDevice gbDevice) {
LOG.info("will try to delete device: " + gbDevice.getName()); LOG.info("will try to delete device: " + gbDevice.getName());
if (gbDevice.isConnected() || gbDevice.isConnected()) {
GBApplication.deviceService().disconnect();
}
GBApplication.deviceService().disconnect();
try (DBHandler dbHandler = GBApplication.acquireDB()) { try (DBHandler dbHandler = GBApplication.acquireDB()) {
DaoSession session = dbHandler.getDaoSession(); DaoSession session = dbHandler.getDaoSession();
Device device = DBHelper.getDevice(gbDevice, session); Device device = DBHelper.getDevice(gbDevice, session);