ensure peripheral is connected when calling startNotification and sto…

…pNotification See #343
don · Jan 5, 2017 · f81c2cd · f81c2cd
1 parent 0d9024a
commit f81c2cd
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/src/android/BLECentralPlugin.java b/src/android/BLECentralPlugin.java
@@ -416,6 +416,11 @@ private void registerNotifyCallback(CallbackContext callbackContext, String macA
         Peripheral peripheral = peripherals.get(macAddress);
         if (peripheral != null) {
 
+            if (!peripheral.isConnected()) {
+                callbackContext.error("Peripheral " + macAddress + " is not connected.");
+                return;
+            }
+
             //peripheral.setOnDataCallback(serviceUUID, characteristicUUID, callbackContext);
             peripheral.queueRegisterNotifyCallback(callbackContext, serviceUUID, characteristicUUID);
 
@@ -432,6 +437,11 @@ private void removeNotifyCallback(CallbackContext callbackContext, String macAdd
         Peripheral peripheral = peripherals.get(macAddress);
         if (peripheral != null) {
 
+            if (!peripheral.isConnected()) {
+                callbackContext.error("Peripheral " + macAddress + " is not connected.");
+                return;
+            }
+
             peripheral.queueRemoveNotifyCallback(callbackContext, serviceUUID, characteristicUUID);
 
         } else {