makibes hr3.

added lost reminder support.

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/makibeshr3/MakibesHR3Constants.java

@@ -24,6 +24,7 @@ public final class MakibesHR3Constants {
     // TODO: This doesn't belong here, but I don't want to touch other files to avoid
     // TODO: breaking someone else's device support.
     public static final String PREF_HEADS_UP_SCREEN = "activate_display_on_lift_wrist";
+    public static final String PREF_LOST_REMINDER = "disconnect_notification";
 
     public static final UUID UUID_SERVICE = UUID.fromString("6e400001-b5a3-f393-e0a9-e50e24dcca9e");
     public static final UUID UUID_CHARACTERISTIC_CONTROL = UUID.fromString("6e400002-b5a3-f393-e0a9-e50e24dcca9e");

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/makibeshr3/MakibesHR3Coordinator.java

@@ -29,7 +29,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import de.greenrobot.dao.query.QueryBuilder;
-import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.GBException;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
@@ -51,15 +50,6 @@ public class MakibesHR3Coordinator extends AbstractDeviceCoordinator {
 
     private static final Logger LOG = LoggerFactory.getLogger(MakibesHR3Coordinator.class);
 
-    public static byte getTimeMode(SharedPreferences sharedPrefs) {
-        String timeMode = sharedPrefs.getString(DeviceSettingsPreferenceConst.PREF_TIMEFORMAT, getContext().getString(R.string.p_timeformat_24h));
-
-        if (timeMode.equals(getContext().getString(R.string.p_timeformat_24h))) {
-            return MakibesHR3Constants.ARG_SET_TIMEMODE_24H;
-        } else {
-            return MakibesHR3Constants.ARG_SET_TIMEMODE_12H;
-        }
-    }
 
     public static boolean shouldEnableHeadsUpScreen(SharedPreferences sharedPrefs) {
         String liftMode = sharedPrefs.getString(MakibesHR3Constants.PREF_HEADS_UP_SCREEN, getContext().getString(R.string.p_on));
@@ -68,16 +58,21 @@ public class MakibesHR3Coordinator extends AbstractDeviceCoordinator {
         return (liftMode != getContext().getString(R.string.p_off));
     }
 
-    public static boolean shouldEnableHeadsUpScreen(String deviceAddress) {
+    public static boolean shouldEnableLostReminder(SharedPreferences sharedPrefs) {
-        SharedPreferences sharedPrefs = GBApplication.getDeviceSpecificSharedPrefs(deviceAddress);
+        String lostReminder = sharedPrefs.getString(MakibesHR3Constants.PREF_LOST_REMINDER, getContext().getString(R.string.p_on));
 
-        return shouldEnableHeadsUpScreen(sharedPrefs);
+        // Makibes HR3 doesn't support scheduled intervals. Treat it as "on".
+        return (lostReminder != getContext().getString(R.string.p_off));
     }
 
-    public static byte getTimeMode(String deviceAddress) {
+    public static byte getTimeMode(SharedPreferences sharedPrefs) {
-        SharedPreferences sharedPrefs = GBApplication.getDeviceSpecificSharedPrefs(deviceAddress);
+        String timeMode = sharedPrefs.getString(DeviceSettingsPreferenceConst.PREF_TIMEFORMAT, getContext().getString(R.string.p_timeformat_24h));
 
-        return getTimeMode(sharedPrefs);
+        if (timeMode.equals(getContext().getString(R.string.p_timeformat_24h))) {
+            return MakibesHR3Constants.ARG_SET_TIMEMODE_24H;
+        } else {
+            return MakibesHR3Constants.ARG_SET_TIMEMODE_12H;
+        }
     }
 
     @NonNull
@@ -195,7 +190,8 @@ public class MakibesHR3Coordinator extends AbstractDeviceCoordinator {
     public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
         return new int[]{
                 R.xml.devicesettings_timeformat,
-                R.xml.devicesettings_liftwrist_display
+                R.xml.devicesettings_liftwrist_display,
+                R.xml.devicesettings_disconnectnotification
         };
     }
 }

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/makibeshr3/MakibesHR3DeviceSupport.java

@@ -1,9 +1,11 @@
 // TODO: GB sometimes fails to connect until a connection with WearFit was made. This must be caused
-// TODO: by GB, not by Makibes hr3 support. Charging the watch or attempting to pair might also
+// TODO: by GB, not by Makibes hr3 support. Charging the watch, attempting to pair, delete and
-// TODO: help. This needs further research.
+// TODO: re-add might also help. This needs further research.
 
 // TODO: All the commands that aren't supported by GB should be added to device specific settings.
 
+// TODO: GB doesn't always display the step count even though there's a sample in the db.
+
 // TODO: It'd be cool if we could change the language. There's no official way to do so, but the
 // TODO: watch is sold as chinese/english. Screen-on-time would be nice too.
 
@@ -65,6 +67,7 @@ import nodomain.freeyourgadget.gadgetbridge.model.MusicStateSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.WeatherSpec;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.AbstractBTLEDeviceSupport;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.Transaction;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
 import nodomain.freeyourgadget.gadgetbridge.service.serial.GBDeviceProtocol;
 import nodomain.freeyourgadget.gadgetbridge.util.GB;
@@ -510,10 +513,13 @@ public class MakibesHR3DeviceSupport extends AbstractBTLEDeviceSupport implement
 
     private void syncPreferences(TransactionBuilder transaction) {
 
-        this.setTimeMode(transaction);
+        SharedPreferences sharedPreferences = GBApplication.getDeviceSpecificSharedPrefs(this.getDevice().getAddress());
+
+        this.setTimeMode(transaction, sharedPreferences);
         this.setDateTime(transaction);
 
-        this.setHeadsUpScreen(transaction);
+        this.setHeadsUpScreen(transaction, sharedPreferences);
+        this.setLostReminder(transaction, sharedPreferences);
 
         ActivityUser activityUser = new ActivityUser();
 
@@ -529,12 +535,20 @@ public class MakibesHR3DeviceSupport extends AbstractBTLEDeviceSupport implement
 
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
         LOG.debug(key + " changed");
+
+        if (!this.isConnected()) {
+            LOG.debug("ignoring change, we're disconnected");
+            return;
+        }
+
         TransactionBuilder transactionBuilder = this.createTransactionBuilder("onSharedPreferenceChanged");
 
         if (key.equals(DeviceSettingsPreferenceConst.PREF_TIMEFORMAT)) {
-            this.setTimeMode(transactionBuilder);
+            this.setTimeMode(transactionBuilder, sharedPreferences);
         } else if (key.equals(MakibesHR3Constants.PREF_HEADS_UP_SCREEN)) {
-            this.setHeadsUpScreen(transactionBuilder);
+            this.setHeadsUpScreen(transactionBuilder, sharedPreferences);
+        } else if (key.equals(MakibesHR3Constants.PREF_LOST_REMINDER)) {
+            this.setLostReminder(transactionBuilder, sharedPreferences);
         } else {
             return;
         }
@@ -1014,9 +1028,23 @@ public class MakibesHR3DeviceSupport extends AbstractBTLEDeviceSupport implement
         return this;
     }
 
-    private MakibesHR3DeviceSupport setHeadsUpScreen(TransactionBuilder transactionBuilder) {
+    private MakibesHR3DeviceSupport setHeadsUpScreen(TransactionBuilder transactionBuilder, SharedPreferences sharedPreferences) {
         return this.setHeadsUpScreen(transactionBuilder,
-                MakibesHR3Coordinator.shouldEnableHeadsUpScreen(this.getDevice().getAddress()));
+                MakibesHR3Coordinator.shouldEnableHeadsUpScreen(sharedPreferences));
+    }
+
+    private MakibesHR3DeviceSupport setLostReminder(TransactionBuilder transactionBuilder, boolean enable) {
+        byte[] data = this.craftData(MakibesHR3Constants.CMD_SET_LOST_REMINDER,
+                new byte[]{(byte) (enable ? 0x01 : 0x00)});
+
+        transactionBuilder.write(this.mControlCharacteristic, data);
+
+        return this;
+    }
+
+    private MakibesHR3DeviceSupport setLostReminder(TransactionBuilder transactionBuilder, SharedPreferences sharedPreferences) {
+        return this.setLostReminder(transactionBuilder,
+                MakibesHR3Coordinator.shouldEnableLostReminder(sharedPreferences));
     }
 
     private MakibesHR3DeviceSupport setTimeMode(TransactionBuilder transactionBuilder, byte timeMode) {
@@ -1027,9 +1055,9 @@ public class MakibesHR3DeviceSupport extends AbstractBTLEDeviceSupport implement
         return this;
     }
 
-    private MakibesHR3DeviceSupport setTimeMode(TransactionBuilder transactionBuilder) {
+    private MakibesHR3DeviceSupport setTimeMode(TransactionBuilder transactionBuilder, SharedPreferences sharedPreferences) {
         return this.setTimeMode(transactionBuilder,
-                MakibesHR3Coordinator.getTimeMode(this.getDevice().getAddress()));
+                MakibesHR3Coordinator.getTimeMode(sharedPreferences));
     }
 
     private MakibesHR3DeviceSupport setEnableRealTimeHeartRate(TransactionBuilder transaction, boolean enable) {