From 1ddea9268d08edaf4b71c587e6db37017ea55c8b Mon Sep 17 00:00:00 2001
From: cpfeiffer <cpfeiffer@users.noreply.github.com>
Date: Mon, 4 Sep 2017 23:19:53 +0200
Subject: [PATCH] Amazfit Bip: request GPS fw version earlier

(to avoid recreation of DeviceAttributes because fw2 is sometimes available and sometimes not.)
---
 .../gadgetbridge/service/devices/miband2/MiBand2Support.java | 5 ++++-
 .../service/devices/miband2/operations/InitOperation.java    | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

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 321a256b..29074422 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
@@ -1309,8 +1309,11 @@ public class MiBand2Support extends AbstractBTLEDeviceSupport {
 
     public void phase2Initialize(TransactionBuilder builder) {
         LOG.info("phase2Initialize...");
-        enableFurtherNotifications(builder, true);
         requestBatteryInfo(builder);
+    }
+
+    public void phase3Initialize(TransactionBuilder builder) {
+        LOG.info("phase3Initialize...");
         setDateDisplay(builder);
         setTimeFormat(builder);
         setWearLocation(builder);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/operations/InitOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/operations/InitOperation.java
index e07f8a99..e1a5bd7c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/operations/InitOperation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/operations/InitOperation.java
@@ -117,7 +117,9 @@ public class InitOperation extends AbstractBTLEOperation<MiBand2Support> {
                     TransactionBuilder builder = createTransactionBuilder("Authenticated, now initialize phase 2");
                     builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.INITIALIZING, getContext()));
                     getSupport().requestDeviceInfo(builder);
+                    getSupport().enableFurtherNotifications(builder, true);
                     getSupport().phase2Initialize(builder);
+                    getSupport().phase3Initialize(builder);
                     getSupport().setInitialized(builder);
                     getSupport().performImmediately(builder);
                 } else {