From ae5417b9cc6b97963b0d130f68db2cade4917b92 Mon Sep 17 00:00:00 2001
From: cpfeiffer <cpfeiffer@users.noreply.github.com>
Date: Thu, 7 Jan 2016 00:33:20 +0100
Subject: [PATCH] Avoid NPEs when aborting an erroneous sync #205

---
 .../gadgetbridge/service/btle/AbstractBTLEOperation.java  | 8 ++++++++
 .../miband/operations/AbstractMiBandOperation.java        | 1 +
 .../devices/miband/operations/FetchActivityOperation.java | 6 ++++++
 .../devices/miband/operations/OperationStatus.java        | 8 ++++++++
 4 files changed, 23 insertions(+)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/OperationStatus.java

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEOperation.java
index 746342bf..3c2387c0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEOperation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEOperation.java
@@ -9,6 +9,7 @@ import java.io.IOException;
 import java.util.UUID;
 
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.miband.operations.OperationStatus;
 
 /**
  * Abstract base class for a BTLEOperation, i.e. an operation that does more than
@@ -25,6 +26,7 @@ import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
  */
 public abstract class AbstractBTLEOperation<T extends AbstractBTLEDeviceSupport> implements GattCallback, BTLEOperation {
     private final T mSupport;
+    protected OperationStatus operationStatus = OperationStatus.INITIAL;
 
     protected AbstractBTLEOperation(T support) {
         mSupport = support;
@@ -38,7 +40,9 @@ public abstract class AbstractBTLEOperation<T extends AbstractBTLEDeviceSupport>
      */
     @Override
     public final void perform() throws IOException {
+        operationStatus = OperationStatus.STARTED;
         prePerform();
+        operationStatus = OperationStatus.RUNNING;
         doPerform();
     }
 
@@ -101,6 +105,10 @@ public abstract class AbstractBTLEOperation<T extends AbstractBTLEDeviceSupport>
         getDevice().sendDeviceUpdateIntent(getContext());
     }
 
+    public boolean isOperationRunning() {
+        return operationStatus == OperationStatus.RUNNING;
+    }
+
     public T getSupport() {
         return mSupport;
     }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/AbstractMiBandOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/AbstractMiBandOperation.java
index f346852f..ffabce53 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/AbstractMiBandOperation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/AbstractMiBandOperation.java
@@ -25,6 +25,7 @@ public abstract class AbstractMiBandOperation extends AbstractBTLEOperation<MiBa
 
     @Override
     protected void operationFinished() {
+        operationStatus = OperationStatus.FINISHED;
         if (getDevice() != null && getDevice().isConnected()) {
             try {
                 TransactionBuilder builder = performInitialized("reenabling disabled notifications");
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/FetchActivityOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/FetchActivityOperation.java
index 14f92119..21bc3928 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/FetchActivityOperation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/FetchActivityOperation.java
@@ -174,6 +174,12 @@ public class FetchActivityOperation extends AbstractMiBandOperation {
      * @see #bufferActivityData(byte[])
      */
     private void handleActivityNotif(byte[] value) {
+        if (!isOperationRunning()) {
+            LOG.error("ignoring activity data notification because operation is not running. Data length: " + value.length);
+            getSupport().logMessageContent(value);
+            return;
+        }
+
         if (value.length == activityMetadataLength) {
             handleActivityMetadata(value);
         } else {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/OperationStatus.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/OperationStatus.java
new file mode 100644
index 00000000..93d2fbf0
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/OperationStatus.java
@@ -0,0 +1,8 @@
+package nodomain.freeyourgadget.gadgetbridge.service.devices.miband.operations;
+
+public enum OperationStatus {
+    INITIAL,
+    STARTED,
+    RUNNING,
+    FINISHED
+}