From 3dd1929436f1e4a122090bc066af3d66e113c62e Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Thu, 14 Jun 2018 16:30:43 +0200
Subject: [PATCH] Huami devices: Minor refactoring

---
 .../{miband2/MiBand2Const.java => huami/HuamiConst.java}  | 4 ++--
 .../devices/miband/MiBand2SampleProvider.java             | 8 ++++----
 .../service/devices/miband2/MiBand2Support.java           | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/{miband2/MiBand2Const.java => huami/HuamiConst.java} (96%)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband2/MiBand2Const.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiConst.java
similarity index 96%
rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband2/MiBand2Const.java
rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiConst.java
index a153dda97..d02f7cd23 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband2/MiBand2Const.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiConst.java
@@ -1,8 +1,8 @@
-package nodomain.freeyourgadget.gadgetbridge.devices.miband2;
+package nodomain.freeyourgadget.gadgetbridge.devices.huami;
 
 import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind;
 
-public class MiBand2Const {
+public class HuamiConst {
     // observed the following values so far:
     // 00 01 02 09 0a 0b 0c 10 11
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBand2SampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBand2SampleProvider.java
index 0dac10166..16cb2e73c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBand2SampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBand2SampleProvider.java
@@ -20,12 +20,12 @@ package nodomain.freeyourgadget.gadgetbridge.devices.miband;
 import java.util.List;
 
 import de.greenrobot.dao.query.QueryBuilder;
-import nodomain.freeyourgadget.gadgetbridge.devices.miband2.MiBand2Const;
+import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.MiBandActivitySample;
 import nodomain.freeyourgadget.gadgetbridge.entities.MiBandActivitySampleDao;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import static nodomain.freeyourgadget.gadgetbridge.devices.miband2.MiBand2Const.*;
+import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.*;
 
 public class MiBand2SampleProvider extends AbstractMiBandSampleProvider {
 
@@ -88,11 +88,11 @@ public class MiBand2SampleProvider extends AbstractMiBandSampleProvider {
 
     @Override
     public int normalizeType(int rawType) {
-        return MiBand2Const.toActivityKind(rawType);
+        return HuamiConst.toActivityKind(rawType);
     }
 
     @Override
     public int toRawActivityKind(int activityKind) {
-        return MiBand2Const.toRawActivityType(activityKind);
+        return HuamiConst.toRawActivityType(activityKind);
     }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/MiBand2Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/MiBand2Support.java
index a6d236d44..ed53791fc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/MiBand2Support.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/MiBand2Support.java
@@ -69,7 +69,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst;
 import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandService;
 import nodomain.freeyourgadget.gadgetbridge.devices.miband.VibrationProfile;
-import nodomain.freeyourgadget.gadgetbridge.devices.miband2.MiBand2Const;
+import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.entities.MiBandActivitySample;
@@ -1200,7 +1200,7 @@ public class MiBand2Support extends AbstractBTLEDeviceSupport {
                         sample.setHeartRate(getHeartrateBpm());
                         sample.setSteps(getSteps());
                         sample.setRawIntensity(ActivitySample.NOT_MEASURED);
-                        sample.setRawKind(MiBand2Const.TYPE_ACTIVITY); // to make it visible in the charts TODO: add a MANUAL kind for that?
+                        sample.setRawKind(HuamiConst.TYPE_ACTIVITY); // to make it visible in the charts TODO: add a MANUAL kind for that?
 
                         provider.addGBActivitySample(sample);