From 6c79bbb73025de31f84d18e42b12a64855ea5f8c Mon Sep 17 00:00:00 2001 From: lazarosfs Date: Mon, 31 Jul 2017 18:39:54 +0300 Subject: [PATCH] honor autoreconnect We should also honor autoreconnect option before we auto connect on startup. Pressing Connect button does not check autoreconnect, it just sets autoreconnect and connects. --- .../gadgetbridge/service/DeviceCommunicationService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java index e884d8175..35b2cca85 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java @@ -281,8 +281,9 @@ public class DeviceCommunicationService extends Service implements SharedPrefere Prefs prefs = getPrefs(); switch (action) { case ACTION_START: + boolean autoReconnect = getGBPrefs().getAutoReconnect(); BluetoothAdapter mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter(); - if (mBluetoothAdapter.isEnabled()) { + if ((mBluetoothAdapter.isEnabled())&&(autoReconnect == true)) { intent.setAction(ACTION_CONNECT); // if bt is enabled go to connect so after reboot we autoconnect wihout prompts onStartCommand(intent,flags,startId); break; @@ -324,7 +325,7 @@ public class DeviceCommunicationService extends Service implements SharedPrefere btDeviceAddress = gbDevice.getAddress(); } - boolean autoReconnect = GBPrefs.AUTO_RECONNECT_DEFAULT; + autoReconnect = GBPrefs.AUTO_RECONNECT_DEFAULT; if (prefs != null && prefs.getPreferences() != null) { prefs.getPreferences().edit().putString("last_device_address", btDeviceAddress).apply(); autoReconnect = getGBPrefs().getAutoReconnect();