From 59638432163923231c6a76ae8478643c4f03b8c1 Mon Sep 17 00:00:00 2001
From: cpfeiffer <cpfeiffer@users.noreply.github.com>
Date: Sun, 15 May 2016 00:15:31 +0200
Subject: [PATCH] Experimental support for #274 (untested yet)

---
 .../gadgetbridge/devices/miband/MiBandConst.java           | 1 +
 .../gadgetbridge/devices/miband/UserInfo.java              | 2 +-
 .../gadgetbridge/service/devices/miband/DeviceInfo.java    | 7 +++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandConst.java
index 6853b3714..8379d75bd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandConst.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandConst.java
@@ -26,6 +26,7 @@ public final class MiBandConst {
     public static final String MI_1 = "1";
     public static final String MI_1A = "1A";
     public static final String MI_1S = "1S";
+    public static final String MI_AMAZFIT = "Amazfit";
 
     public static int getNotificationPrefIntValue(String pref, String origin, Prefs prefs, int defaultValue) {
         String key = getNotificationPrefKey(pref, origin);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/UserInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/UserInfo.java
index 5bb901b3d..4bc728c4c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/UserInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/UserInfo.java
@@ -85,7 +85,7 @@ public class UserInfo {
         sequence[8] = (byte) (type & 0xff);
 
         int aliasFrom = 9;
-        if (mDeviceInfo.isMili1A() || mDeviceInfo.isMili1S()) {
+        if (!mDeviceInfo.isMili1()) {
             sequence[9] = (byte) (mDeviceInfo.feature & 255);
             sequence[10] = (byte) (mDeviceInfo.appearance & 255);
             aliasFrom = 11;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/DeviceInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/DeviceInfo.java
index 1072ff50c..3ba149df6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/DeviceInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/DeviceInfo.java
@@ -112,6 +112,10 @@ public class DeviceInfo extends AbstractInfo {
         return (feature == 4 && appearance == 0) || hwVersion == 4;
     }
 
+    public boolean isAmazFit() {
+        return hwVersion == 6;
+    }
+
     public String getHwVersion() {
         if (isMili1()) {
             return MiBandConst.MI_1;
@@ -122,6 +126,9 @@ public class DeviceInfo extends AbstractInfo {
         if (isMili1S()) {
             return MiBandConst.MI_1S;
         }
+        if (isAmazFit()) {
+            return MiBandConst.MI_AMAZFIT;
+        }
         return "?";
     }
 }