From 3f795925882e05131736d2e837ec1d306a0f0d43 Mon Sep 17 00:00:00 2001
From: dakhnod <dakhnod@gmail.com>
Date: Thu, 25 Jul 2019 10:52:27 +0200
Subject: [PATCH] reworked init process

---
 .../devices/qhybrid/QHybridSupport.java       | 45 ++++++-------------
 1 file changed, 13 insertions(+), 32 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/QHybridSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/QHybridSupport.java
index 3169b2e44..dbbf374b0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/QHybridSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/QHybridSupport.java
@@ -121,6 +121,8 @@ public class QHybridSupport extends QHybridBaseSupport {
     public QHybridSupport() {
         super(logger);
         addSupportedService(UUID.fromString("3dda0001-957f-7d4a-34a6-74696673696d"));
+        addSupportedService(UUID.fromString("0000180a-0000-1000-8000-00805f9b34fb"));
+        addSupportedService(UUID.fromString("00001800-0000-1000-8000-00805f9b34fb"));
         IntentFilter commandFilter = new IntentFilter(QHYBRID_COMMAND_CONTROL);
         commandFilter.addAction(QHYBRID_COMMAND_UNCONTROL);
         commandFilter.addAction(QHYBRID_COMMAND_SET);
@@ -200,6 +202,12 @@ public class QHybridSupport extends QHybridBaseSupport {
     protected TransactionBuilder initializeDevice(TransactionBuilder builder) {
         builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.INITIALIZING, getContext()));
 
+        for (int i = 2; i <= 7; i++)
+            builder.notify(getCharacteristic(UUID.fromString("3dda000" + i + "-957f-7d4a-34a6-74696673696d")), true);
+
+        builder.read(getCharacteristic(UUID.fromString("00002a00-0000-1000-8000-00805f9b34fb")));
+        builder.read(getCharacteristic(UUID.fromString("00002a24-0000-1000-8000-00805f9b34fb")));
+        builder.read(getCharacteristic(UUID.fromString("00002a26-0000-1000-8000-00805f9b34fb")));
 
         helper = new PackageConfigHelper(getContext());
 
@@ -219,23 +227,6 @@ public class QHybridSupport extends QHybridBaseSupport {
         return builder;
     }
 
-    @Override
-    public void onServicesDiscovered(BluetoothGatt gatt) {
-        super.onServicesDiscovered(gatt);
-
-
-
-        for (int i = 2; i <= 7; i++)
-            gatt.setCharacteristicNotification(getCharacteristic(UUID.fromString("3dda000" + i + "-957f-7d4a-34a6-74696673696d")), true);
-
-        BluetoothGattService deviceInfo = gatt.getService(UUID.fromString("0000180a-0000-1000-8000-00805f9b34fb"));
-        BluetoothGattCharacteristic modelNumber = deviceInfo.getCharacteristic(UUID.fromString("00002a24-0000-1000-8000-00805f9b34fb"));
-
-        gatt.readCharacteristic(modelNumber);
-
-        logger.debug("onServicesDiscovered");
-    }
-
     @Override
     public void onNotification(NotificationSpec notificationSpec) {
         Log.d("Service", "notif from " + notificationSpec.sourceAppId + "  " + notificationSpec.sender + "   " + notificationSpec.phoneNumber);
@@ -362,24 +353,14 @@ public class QHybridSupport extends QHybridBaseSupport {
     @Override
     public boolean onCharacteristicRead(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic, int status) {
         switch (characteristic.getUuid().toString()){
-            case "00002a24-0000-1000-8000-00805f9b34fb":{
-                modelNumber = characteristic.getStringValue(0);
-                gbDevice.setModel(modelNumber);
-
-                BluetoothGattService genericAccess = gatt.getService(UUID.fromString("00001800-0000-1000-8000-00805f9b34fb"));
-                BluetoothGattCharacteristic deviceName = genericAccess.getCharacteristic(UUID.fromString("00002a00-0000-1000-8000-00805f9b34fb"));
-
-                gatt.readCharacteristic(deviceName);
-                break;
-            }
             case "00002a00-0000-1000-8000-00805f9b34fb":{
                 String deviceName = characteristic.getStringValue(0);
                 gbDevice.setName(deviceName);
-
-                BluetoothGattService genericAccess = gatt.getService(UUID.fromString("0000180a-0000-1000-8000-00805f9b34fb"));
-                BluetoothGattCharacteristic firmwareVersion = genericAccess.getCharacteristic(UUID.fromString("00002a26-0000-1000-8000-00805f9b34fb"));
-
-                gatt.readCharacteristic(firmwareVersion);
+                break;
+            }
+            case "00002a24-0000-1000-8000-00805f9b34fb":{
+                modelNumber = characteristic.getStringValue(0);
+                gbDevice.setModel(modelNumber);
                 break;
             }
             case "00002a26-0000-1000-8000-00805f9b34fb":{