From 8510cdbb3f58a131009c2216ccbc4ecfe6590c70 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Thu, 7 Apr 2022 22:54:24 +0200
Subject: [PATCH] Amazfit Neo: Allow to disable beeps for email notifications

Fixes #2607
---
 .../gadgetbridge/service/devices/huami/HuamiSupport.java      | 4 ++--
 .../service/devices/huami/amazfitneo/AmazfitNeoSupport.java   | 2 --
 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, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
index 3992990d9..6851f2bea 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
@@ -2817,8 +2817,8 @@ public class HuamiSupport extends AbstractBTLEDeviceSupport {
 
 
         if (sounds != null) {
-            final String[] soundOrder = new String[]{"button", "calls", "alarm", "notifications", "inactivity_warning", "sms", "goal"};
-            byte[] command = new byte[]{0x3c, 0, 0, 0, 1, 0, 0, 2, 0, 0, 3, 0, 0, 4, 0, 0, 5, 0, 0, 7, 0, 0};
+            final String[] soundOrder = new String[]{"button", "calls", "alarm", "notifications", "inactivity_warning", "sms", "email", "goal"};
+            byte[] command = new byte[]{0x3c, 0, 0, 0, 1, 0, 0, 2, 0, 0, 3, 0, 0, 4, 0, 0, 5, 0, 0, 6, 0, 0, 7, 0, 0};
             int i = 3;
             for (String sound : soundOrder) {
                 if (sounds.contains(sound)) {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitneo/AmazfitNeoSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitneo/AmazfitNeoSupport.java
index 51ccc3e2b..d381cf9ff 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitneo/AmazfitNeoSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitneo/AmazfitNeoSupport.java
@@ -32,9 +32,7 @@ import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.miband5.MiBand5Support;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.operations.UpdateFirmwareOperation;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.operations.UpdateFirmwareOperation2020;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.operations.UpdateFirmwareOperationNew;
 
-//import nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitneo.AmazfitBand5FWHelper;
 
 public class AmazfitNeoSupport extends MiBand5Support {
     private static final Logger LOG = LoggerFactory.getLogger(AmazfitNeoSupport.class);
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 36387bf1f..e71a0eaaf 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -1818,6 +1818,7 @@
         <item>@string/menuitem_notifications</item>
         <item>@string/mi2_prefs_inactivity_warnings</item>
         <item>@string/pref_title_notifications_sms</item>
+        <item>@string/menuitem_email</item>
         <item>@string/menuitem_goal</item>
     </string-array>
 
@@ -1828,6 +1829,7 @@
         <item>@string/p_menuitem_notifications</item>
         <item>@string/p_menuitem_inactivity_warning</item>
         <item>@string/p_menuitem_sms</item>
+        <item>@string/p_menuitem_email</item>
         <item>@string/p_menuitem_goal</item>
     </string-array>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c6d82b9f3..8d65c4df6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -994,6 +994,7 @@
     <string name="menuitem_temperature">Temperature</string>
     <string name="menuitem_barometer">Barometer</string>
     <string name="menuitem_flashlight">Flashlight</string>
+    <string name='menuitem_email'>E-mail</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 d8343afb7..7380f9f1c 100644
--- a/app/src/main/res/values/values.xml
+++ b/app/src/main/res/values/values.xml
@@ -61,6 +61,7 @@
     <item name="p_menuitem_calls" type="string">calls</item>
     <item name="p_menuitem_inactivity_warning" type="string">inactivity_warning</item>
     <item name="p_menuitem_sms" type="string">sms</item>
+    <item name="p_menuitem_email" type="string">email</item>
 
     <item name="p_off" type="string">off</item>
     <item name="p_on" type="string">on</item>