WIP: Mi Band 3: Activate display upon lift during DND

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiCoordinator.java

@@ -254,6 +254,11 @@ public static DoNotDisturb getDoNotDisturb(Context context) {
         return DoNotDisturb.OFF;
     }
 
+    public static boolean getDoNotDisturbLiftWrist() {
+        Prefs prefs = GBApplication.getPrefs();
+        return prefs.getBoolean(MiBandConst.PREF_MI2_DO_NOT_DISTURB_LIFT_WRIST, false);
+    }
+
     @Override
     public boolean supportsScreenshots() {
         return false;

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandConst.java

@@ -60,6 +60,7 @@ public final class MiBandConst {
     public static final String PREF_MI2_DO_NOT_DISTURB_SCHEDULED = "scheduled";
     public static final String PREF_MI2_DO_NOT_DISTURB_START = "mi2_do_not_disturb_start";
     public static final String PREF_MI2_DO_NOT_DISTURB_END = "mi2_do_not_disturb_end";
+    public static final String PREF_MI2_DO_NOT_DISTURB_LIFT_WRIST = "mi2_do_not_disturb_lift_wrist";
     public static final String PREF_MI2_INACTIVITY_WARNINGS = "mi2_inactivity_warnings";
     public static final String PREF_MI2_INACTIVITY_WARNINGS_THRESHOLD = "mi2_inactivity_warnings_threshold";
     public static final String PREF_MI2_INACTIVITY_WARNINGS_START = "mi2_inactivity_warnings_start";

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPreferencesActivity.java

@@ -45,6 +45,7 @@
 import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_MI2_DISPLAY_ITEMS;
 import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_MI2_DO_NOT_DISTURB;
 import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_MI2_DO_NOT_DISTURB_END;
+import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_MI2_DO_NOT_DISTURB_LIFT_WRIST;
 import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_MI2_DO_NOT_DISTURB_OFF;
 import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_MI2_DO_NOT_DISTURB_SCHEDULED;
 import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_MI2_DO_NOT_DISTURB_START;
@@ -241,6 +242,22 @@ public void run() {
 
         String doNotDisturbState = prefs.getString(MiBandConst.PREF_MI2_DO_NOT_DISTURB, PREF_MI2_DO_NOT_DISTURB_OFF);
         boolean doNotDisturbScheduled = doNotDisturbState.equals(PREF_MI2_DO_NOT_DISTURB_SCHEDULED);
+        boolean doNotDisturbOff = doNotDisturbState.equals(PREF_MI2_DO_NOT_DISTURB_OFF);
+
+        final Preference doNotDisturbLiftWrist = findPreference(PREF_MI2_DO_NOT_DISTURB_LIFT_WRIST);
+        doNotDisturbLiftWrist.setEnabled(!doNotDisturbOff);
+        doNotDisturbLiftWrist.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object newVal) {
+                invokeLater(new Runnable() {
+                    @Override
+                    public void run() {
+                        GBApplication.deviceService().onSendConfiguration(PREF_MI2_DO_NOT_DISTURB_LIFT_WRIST);
+                    }
+                });
+                return true;
+            }
+        });
 
         final Preference doNotDisturbStart = findPreference(PREF_MI2_DO_NOT_DISTURB_START);
         doNotDisturbStart.setEnabled(doNotDisturbScheduled);
@@ -277,9 +294,11 @@ public void run() {
             @Override
             public boolean onPreferenceChange(Preference preference, Object newVal) {
                 final boolean scheduled = PREF_MI2_DO_NOT_DISTURB_SCHEDULED.equals(newVal.toString());
+                final boolean off = PREF_MI2_DO_NOT_DISTURB_OFF.equals(newVal.toString());
 
                 doNotDisturbStart.setEnabled(scheduled);
                 doNotDisturbEnd.setEnabled(scheduled);
+                doNotDisturbLiftWrist.setEnabled(!off);
 
                 invokeLater(new Runnable() {
                     @Override

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java

@@ -1517,6 +1517,7 @@ public void onSendConfiguration(String config) {
                 case MiBandConst.PREF_MI2_DO_NOT_DISTURB:
                 case MiBandConst.PREF_MI2_DO_NOT_DISTURB_START:
                 case MiBandConst.PREF_MI2_DO_NOT_DISTURB_END:
+                case MiBandConst.PREF_MI2_DO_NOT_DISTURB_LIFT_WRIST:
                     setDoNotDisturb(builder);
                     break;
                 case MiBandConst.PREF_MI2_INACTIVITY_WARNINGS:
@@ -1665,16 +1666,19 @@ private HuamiSupport setDisplayCaller(TransactionBuilder builder) {
 
     private HuamiSupport setDoNotDisturb(TransactionBuilder builder) {
         DoNotDisturb doNotDisturb = HuamiCoordinator.getDoNotDisturb(getContext());
-        LOG.info("Setting do not disturb to " + doNotDisturb);
+        boolean doNotDisturbLiftWrist = HuamiCoordinator.getDoNotDisturbLiftWrist();
+        LOG.info("Setting do not disturb to " + doNotDisturb + ", wake on lift wrist " + doNotDisturbLiftWrist);
+        byte[] data = null;
+
         switch (doNotDisturb) {
             case OFF:
-                builder.write(getCharacteristic(HuamiService.UUID_CHARACTERISTIC_3_CONFIGURATION), HuamiService.COMMAND_DO_NOT_DISTURB_OFF);
+                data = HuamiService.COMMAND_DO_NOT_DISTURB_OFF.clone();
                 break;
             case AUTOMATIC:
-                builder.write(getCharacteristic(HuamiService.UUID_CHARACTERISTIC_3_CONFIGURATION), HuamiService.COMMAND_DO_NOT_DISTURB_AUTOMATIC);
+                data = HuamiService.COMMAND_DO_NOT_DISTURB_AUTOMATIC.clone();
                 break;
             case SCHEDULED:
-                byte[] data = HuamiService.COMMAND_DO_NOT_DISTURB_SCHEDULED.clone();
+                data = HuamiService.COMMAND_DO_NOT_DISTURB_SCHEDULED.clone();
 
                 Calendar calendar = GregorianCalendar.getInstance();
 
@@ -1693,6 +1697,14 @@ private HuamiSupport setDoNotDisturb(TransactionBuilder builder) {
                 break;
         }
 
+        if (data != null) {
+            if (doNotDisturbLiftWrist && doNotDisturb != DoNotDisturb.OFF) {
+                data[1] &= ~0x80;
+            }
+
+            builder.write(getCharacteristic(HuamiService.UUID_CHARACTERISTIC_3_CONFIGURATION), data);
+        }
+
         return this;
     }
 

app/src/main/res/values/strings.xml

@@ -428,6 +428,7 @@
     <string name="mi2_prefs_inactivity_warnings_dnd_summary">Disable the inactivity warnings for a time interval</string>
     <string name="mi2_prefs_do_not_disturb_start">Start time</string>
     <string name="mi2_prefs_do_not_disturb_end">End time</string>
+    <string name="mi2_prefs_do_not_disturb_lift_wrist">Activate display upon lift during DND</string>
     <string name="mi3_prefs_band_screen_unlock">Band screen unlock"</string>
     <string name="mi3_prefs_band_screen_unlock_summary">Swipe up to unlock the band\'s screen</string>
     <string name="automatic">Automatic</string>

app/src/main/res/xml/miband_preferences.xml

@@ -222,6 +222,11 @@
             android:title="@string/mi2_prefs_do_not_disturb"
             android:summary="%s" />
 
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="mi2_do_not_disturb_lift_wrist"
+            android:title="@string/mi2_prefs_do_not_disturb_lift_wrist" />
+
         <nodomain.freeyourgadget.gadgetbridge.util.TimePreference
             android:defaultValue="01:00"
             android:key="mi2_do_not_disturb_start"