From 97540d734ffc3f835fc2730771557f12b103223e Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Thu, 1 Aug 2019 23:07:28 +0200
Subject: [PATCH] Mi Band 3/4: Allow enabling the "NFC" menu where supported

Pretty useless, because we do not support NFC - but nice for testing
---
 .../gadgetbridge/devices/huami/miband3/MiBand3Service.java  | 2 +-
 .../service/devices/huami/miband3/MiBand3Support.java       | 6 +++++-
 app/src/main/res/values/arrays.xml                          | 2 ++
 app/src/main/res/values/strings.xml                         | 1 +
 app/src/main/res/values/values.xml                          | 1 +
 5 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3Service.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3Service.java
index 5974cdb85..f4e6a5381 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3Service.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3Service.java
@@ -22,7 +22,7 @@ import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiService.EN
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiService.ENDPOINT_DISPLAY_ITEMS;
 
 public class MiBand3Service {
-    public static final byte[] COMMAND_CHANGE_SCREENS = new byte[]{ENDPOINT_DISPLAY_ITEMS, DISPLAY_ITEM_BIT_CLOCK, 0x30, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00};
+    public static final byte[] COMMAND_CHANGE_SCREENS = new byte[]{ENDPOINT_DISPLAY_ITEMS, DISPLAY_ITEM_BIT_CLOCK, 0x30, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00};
     public static final byte[] COMMAND_ENABLE_BAND_SCREEN_UNLOCK = new byte[]{ENDPOINT_DISPLAY, 0x16, 0x00, 0x01};
     public static final byte[] COMMAND_DISABLE_BAND_SCREEN_UNLOCK = new byte[]{ENDPOINT_DISPLAY, 0x16, 0x00, 0x00};
     public static final byte[] COMMAND_NIGHT_MODE_OFF = new byte[]{0x1a, 0x00};
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband3/MiBand3Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband3/MiBand3Support.java
index 2d7117b8f..8fab17d14 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband3/MiBand3Support.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband3/MiBand3Support.java
@@ -86,9 +86,13 @@ public class MiBand3Support extends AmazfitBipSupport {
                 command[1] |= 0x80;
                 command[10] = pos++;
             }
+            if (pages.contains("nfc")) {
+                command[2] |= 0x01;
+                command[11] = pos++;
+            }
         }
 
-        for (int i = 4; i <= 10; i++) {
+        for (int i = 4; i <= 11; i++) {
             if (command[i] == 0) {
                 command[i] = pos++;
             }
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index acf7efcad..c86d9c54f 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -238,6 +238,7 @@
         <item>@string/menuitem_status</item>
         <item>@string/heart_rate</item>
         <item>@string/menuitem_timer</item>
+        <item>@string/menuitem_nfc</item>
     </string-array>
 
     <string-array name="pref_miband3_display_items_values">
@@ -248,6 +249,7 @@
         <item>@string/p_menuitem_status</item>
         <item>@string/p_heart_rate</item>
         <item>@string/p_menuitem_timer</item>
+        <item>@string/p_menuitem_nfc</item>
     </string-array>
 
     <string-array name="pref_miband3_display_items_default">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c67acfef2..20ae4994a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -662,6 +662,7 @@
     <string name="menuitem_alipay">Alipay</string>
     <string name="menuitem_music">Music</string>
     <string name="menuitem_more">More</string>
+    <string name="menuitem_nfc">NFC</string>
     <string name="watch9_time_minutes">Minutes:</string>
     <string name="watch9_time_hours">Hours:</string>
     <string name="watch9_time_seconds">Seconds:</string>
diff --git a/app/src/main/res/values/values.xml b/app/src/main/res/values/values.xml
index 570783715..a9170a503 100644
--- a/app/src/main/res/values/values.xml
+++ b/app/src/main/res/values/values.xml
@@ -32,6 +32,7 @@
     <item name="p_menuitem_notifications" type="string">notifications</item>
     <item name="p_menuitem_music" type="string">music</item>
     <item name="p_menuitem_more" type="string">more</item>
+    <item name="p_menuitem_nfc" type="string">nfc</item>
 
     <item name="p_off" type="string">off</item>
     <item name="p_on" type="string">on</item>