Merge pull request #65 from inthepocket/feature/reject-promise-instea…

…d-of-native-exception Replace throwing of IllegalStateException with onError
dotintent · Nov 16, 2020 · cb3194c · cb3194c
2 parents d535f70 + a3bf4af
commit cb3194c
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/android/library/src/main/java/com/polidea/multiplatformbleadapter/BleModule.java b/android/library/src/main/java/com/polidea/multiplatformbleadapter/BleModule.java
@@ -360,7 +360,8 @@ public void getKnownDevices(String[] deviceIdentifiers,
                                 OnSuccessCallback<Device[]> onSuccessCallback,
                                 OnErrorCallback onErrorCallback) {
         if (rxBleClient == null) {
-            throw new IllegalStateException("BleManager not created when tried to get known devices");
+            onErrorCallback.onError(new BleError(BleErrorCode.BluetoothManagerDestroyed, "BleManager not created when tried to get known devices", null));
+            return;
         }
 
         List<Device> knownDevices = new ArrayList<>();
@@ -384,7 +385,8 @@ public void getConnectedDevices(String[] serviceUUIDs,
                                     OnSuccessCallback<Device[]> onSuccessCallback,
                                     OnErrorCallback onErrorCallback) {
         if (rxBleClient == null) {
-            throw new IllegalStateException("BleManager not created when tried to get connected devices");
+            onErrorCallback.onError(new BleError(BleErrorCode.BluetoothManagerDestroyed, "BleManager not created when tried to get connected devices", null));
+            return;
         }
 
         if (serviceUUIDs.length == 0) {
@@ -425,7 +427,8 @@ public void connectToDevice(String deviceIdentifier,
                                 OnEventCallback<ConnectionState> onConnectionStateChangedCallback,
                                 OnErrorCallback onErrorCallback) {
         if (rxBleClient == null) {
-            throw new IllegalStateException("BleManager not created when tried to connect to device");
+            onErrorCallback.onError(new BleError(BleErrorCode.BluetoothManagerDestroyed, "BleManager not created when tried to connect to device", null));
+            return;
         }
 
         final RxBleDevice device = rxBleClient.getBleDevice(deviceIdentifier);
@@ -449,7 +452,8 @@ public void cancelDeviceConnection(String deviceIdentifier,
                                        OnSuccessCallback<Device> onSuccessCallback,
                                        OnErrorCallback onErrorCallback) {
         if (rxBleClient == null) {
-            throw new IllegalStateException("BleManager not created when tried to cancel device connection");
+            onErrorCallback.onError(new BleError(BleErrorCode.BluetoothManagerDestroyed, "BleManager not created when tried to cancel device connection", null));
+            return;
         }
 
         final RxBleDevice device = rxBleClient.getBleDevice(deviceIdentifier);
@@ -470,7 +474,8 @@ public void isDeviceConnected(String deviceIdentifier,
                                   OnSuccessCallback<Boolean> onSuccessCallback,
                                   OnErrorCallback onErrorCallback) {
         if (rxBleClient == null) {
-            throw new IllegalStateException("BleManager not created when tried to check if device is connected");
+            onErrorCallback.onError(new BleError(BleErrorCode.BluetoothManagerDestroyed, "BleManager not created when tried to check if device is connected", null));
+            return;
         }
 
         final RxBleDevice device = rxBleClient.getBleDevice(deviceIdentifier);
@@ -1218,7 +1223,8 @@ private void safeStartDeviceScan(final UUID[] uuids,
                                      final OnEventCallback<ScanResult> onEventCallback,
                                      final OnErrorCallback onErrorCallback) {
         if (rxBleClient == null) {
-            throw new IllegalStateException("BleManager not created when tried to start device scan");
+            onErrorCallback.onError(new BleError(BleErrorCode.BluetoothManagerDestroyed, "BleManager not created when tried to start device scan", null));
+            return;
         }
 
         ScanSettings scanSettings = new ScanSettings.Builder()