From 6b3ac62f1352ee4aaf72c993495194ae8357ccad Mon Sep 17 00:00:00 2001
From: oliexdev <olie.xdev@googlemail.com>
Date: Sun, 10 Feb 2019 17:53:55 +0100
Subject: [PATCH] refactored Sennsun scale

---
 .../core/bluetooth/BluetoothSenssun.java      | 25 +++++--------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothSenssun.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothSenssun.java
index 6e5f1014..b616c4d1 100644
--- a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothSenssun.java
+++ b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothSenssun.java
@@ -46,21 +46,6 @@ public class BluetoothSenssun extends BluetoothCommunication {
         return "Senssun";
     }
 
-    @Override
-    public void disconnect() {
-        Timber.i("disconnect(and save Data)");
-        saveUserData();
-        super.disconnect();
-    }
-
-    private void saveUserData(){
-      if ( isBitSet(WeightFatMus,2) ) {
-          addScaleData(measurement);
-          WeightFatMus=0;
-          setBtStatus(BT_STATUS_CODE.BT_CONNECTION_LOST);
-      }
-    }
-
     private void sendUserData(){
         if ( scaleGotUserData ){
           return;
@@ -84,10 +69,11 @@ public class BluetoothSenssun extends BluetoothCommunication {
 
     @Override
     protected boolean nextInitCmd(int stateNr) {
-        Timber.d("Cmd Clean %d",stateNr);
         switch (stateNr) {
             case 0:
                 setNotificationOn(WEIGHT_MEASUREMENT_CHARACTERISTIC);
+                break;
+            case 1:
                 sendUserData();
                 WeightFatMus = 0;
                 scaleGotUserData = false;
@@ -118,9 +104,10 @@ public class BluetoothSenssun extends BluetoothCommunication {
 
         if (data != null && !isBitSet(WeightFatMus, 3)) { //only if not saved
             parseBytes(data);
-            if (WeightFatMus == 0x07) {
-              disconnect();
-            }
+        }
+
+        if (isBitSet(WeightFatMus,2) ) {
+            addScaleData(measurement);
         }
     }