Merge pull request dotintent#725 from Polidea/feature/support-for-ble…

…mulator Add support for blemulator
ievolution · Sep 15, 2020 · 881ee88 · 881ee88
2 parents c4fef4c + 4df6425
commit 881ee88
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/android/src/main/java/com/polidea/reactnativeble/BleClientManager.java b/android/src/main/java/com/polidea/reactnativeble/BleClientManager.java
@@ -1,8 +1,5 @@
 package com.polidea.reactnativeble;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
@@ -15,7 +12,7 @@
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.polidea.multiplatformbleadapter.BleAdapter;
-import com.polidea.multiplatformbleadapter.BleModule;
+import com.polidea.multiplatformbleadapter.BleAdapterFactory;
 import com.polidea.multiplatformbleadapter.Characteristic;
 import com.polidea.multiplatformbleadapter.ConnectionOptions;
 import com.polidea.multiplatformbleadapter.ConnectionState;
@@ -41,6 +38,9 @@
 import java.util.List;
 import java.util.Map;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 
 public class BleClientManager extends ReactContextBaseJavaModule {
 
@@ -59,7 +59,6 @@ public class BleClientManager extends ReactContextBaseJavaModule {
 
     public BleClientManager(ReactApplicationContext reactContext) {
         super(reactContext);
-        bleAdapter = new BleModule(reactContext);
     }
 
     @Override
@@ -80,6 +79,7 @@ public Map<String, Object> getConstants() {
 
     @ReactMethod
     public void createClient(String restoreStateIdentifier) {
+        bleAdapter = BleAdapterFactory.getNewAdapter(getReactApplicationContext());
         bleAdapter.createClient(restoreStateIdentifier,
                 new OnEventCallback<String>() {
                     @Override
@@ -97,6 +97,7 @@ public void onEvent(Integer data) {
     @ReactMethod
     public void destroyClient() {
         bleAdapter.destroyClient();
+        bleAdapter = null;
     }
 
     @Override

diff --git a/ios/BleClient.m b/ios/BleClient.m
@@ -53,8 +53,8 @@ + (BOOL)requiresMainQueueSetup {
 }
 
 RCT_EXPORT_METHOD(createClient:(NSString*)restoreIdentifierKey) {
-    _manager = [[BleClientManager alloc] initWithQueue:self.methodQueue
-                                  restoreIdentifierKey:restoreIdentifierKey];
+    _manager = [BleAdapterFactory getNewAdapterWithQueue:self.methodQueue
+                                    restoreIdentifierKey:restoreIdentifierKey];
     _manager.delegate = self;
 }