From c468e7f5215d99aa4d9f97f18b9fb7ee3a5d9f94 Mon Sep 17 00:00:00 2001
From: cpfeiffer <cpfeiffer@users.noreply.github.com>
Date: Sat, 2 Sep 2017 22:45:21 +0200
Subject: [PATCH] Mi Bands+Bip: when an operation finishes, unset the gatt
 callback on the BtLEQeue

Otherwise it will continue to receive events until another transaction is being executed.
---
 .../gadgetbridge/service/btle/AbstractBTLEOperation.java       | 3 +++
 .../devices/miband/operations/AbstractMiBandOperation.java     | 1 +
 2 files changed, 4 insertions(+)

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 1c64f025..3b9e847a 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
@@ -85,6 +85,9 @@ public abstract class AbstractBTLEOperation<T extends AbstractBTLEDeviceSupport>
      * You MUST call this method when the operation has finished, either
      * successfully or unsuccessfully.
      *
+     * Subclasses must ensure that the {@link BtLEQueue queue's}'s gatt callback (set on the transaction builder by {@link #performInitialized(String)})
+     * is being unset, otherwise it will continue to receive events until another transaction is being executed by the queue.
+     *
      * @throws IOException
      */
     protected void operationFinished() throws IOException {
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 2c1180e3..4dacf9fb 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
@@ -48,6 +48,7 @@ public abstract class AbstractMiBandOperation<T extends AbstractBTLEDeviceSuppor
             try {
                 TransactionBuilder builder = performInitialized("reenabling disabled notifications");
                 handleFinished(builder);
+                builder.setGattCallback(null); // unset ourselves from being the queue's gatt callback
                 builder.queue(getQueue());
             } catch (IOException ex) {
                 GB.toast(getContext(), "Error enabling Mi Band notifications, you may need to connect and disconnect", Toast.LENGTH_LONG, GB.ERROR, ex);