From 006a23dfe8e42427757bc1734dac709a2f18832d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joa=CC=83o=20Paulo=20Barraca?= <jpbarraca@gmail.com>
Date: Fri, 3 Feb 2017 19:30:59 +0000
Subject: [PATCH] HPlus: Fix time sync and Time format (12/24)

---
 .../gadgetbridge/devices/hplus/HPlusConstants.java         | 4 ++--
 .../gadgetbridge/service/devices/hplus/HPlusSupport.java   | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusConstants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusConstants.java
index 892b8c72..2fe12b9d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusConstants.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusConstants.java
@@ -18,8 +18,8 @@ public final class HPlusConstants {
     public static final byte ARG_LANGUAGE_CN = 1;
     public static final byte ARG_LANGUAGE_EN = 2;
 
-    public static final byte ARG_TIMEMODE_24H = 0;
-    public static final byte ARG_TIMEMODE_12H = 1;
+    public static final byte ARG_TIMEMODE_24H = 1;
+    public static final byte ARG_TIMEMODE_12H = 0;
 
     public static final byte ARG_UNIT_METRIC = 0;
     public static final byte ARG_UNIT_IMPERIAL = 1;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusSupport.java
index 6daec55f..6ddffffb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusSupport.java
@@ -141,15 +141,20 @@ public class HPlusSupport extends AbstractBTLEDeviceSupport {
             setSIT(transaction);          //Sync SIT Interval
         }
 
+        setCurrentDate(transaction);
+        setCurrentTime(transaction);
+        setDayOfWeek(transaction);
+        setTimeMode(transaction);
+
         setGender(transaction);
         setAge(transaction);
         setWeight(transaction);
         setHeight(transaction);
+
         setGoal(transaction);
         setLanguage(transaction);
         setScreenTime(transaction);
         setUnit(transaction);
-        setTimeMode(transaction);
         setAllDayHeart(transaction);
 
         return this;