Add method for checking whether native client exists (#589)

dotintent · Apr 12, 2021 · aaa2009 · aaa2009
1 parent 8e6cf72
commit aaa2009
Show file tree

Hide file tree

Showing 13 changed files with 44 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 2.4.0
+
+* Add `BleManager#isClientCreated()` for checking whether native client exists
+
+
 ## 2.3.2
 
 * Fix lack of disconnection event on iOS if connection failed to be established

diff --git a/android/src/main/java/com/polidea/flutter_ble_lib/FlutterBleLibPlugin.java b/android/src/main/java/com/polidea/flutter_ble_lib/FlutterBleLibPlugin.java
@@ -116,12 +116,22 @@ public void onMethodCall(MethodCall call, Result result) {
             case MethodName.CANCEL_TRANSACTION:
                 cancelTransaction(call, result);
                 break;
+            case MethodName.IS_CLIENT_CREATED:
+                isClientCreated(result);
+                break;
             default:
                 result.notImplemented();
         }
     }
 
+    private void isClientCreated(Result result) {
+        result.success(bleAdapter != null);
+    }
+
     private void createClient(MethodCall call, Result result) {
+        if (bleAdapter != null) {
+            Log.w(TAG, "Overwriting existing native client. Use BleManager#isClientCreated to check whether a client already exists.");
+        }
         setupAdapter(context);
         bleAdapter.createClient(call.<String>argument(ArgumentKey.RESTORE_STATE_IDENTIFIER),
                 new OnEventCallback<String>() {

diff --git a/android/src/main/java/com/polidea/flutter_ble_lib/constant/MethodName.java b/android/src/main/java/com/polidea/flutter_ble_lib/constant/MethodName.java
@@ -1,6 +1,7 @@
 package com.polidea.flutter_ble_lib.constant;
 
 public interface MethodName {
+    String IS_CLIENT_CREATED = "isClientCreated";
     String CREATE_CLIENT = "createClient";
     String DESTROY_CLIENT = "destroyClient";
 

diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj
@@ -228,13 +228,11 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
-				"${PODS_ROOT}/../Flutter/Flutter.framework",
 				"${BUILT_PRODUCTS_DIR}/MultiplatformBleAdapter/MultiplatformBleAdapter.framework",
 				"${BUILT_PRODUCTS_DIR}/flutter_ble_lib/flutter_ble_lib.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MultiplatformBleAdapter.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_ble_lib.framework",
 			);

diff --git a/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/example/lib/devices_list/devices_bloc.dart b/example/lib/devices_list/devices_bloc.dart
@@ -31,8 +31,6 @@ class DevicesBloc {
 
   DevicesBloc(this._deviceRepository, this._bleManager);
 
-  bool clientCreated = false;
-
   void _handlePickedDevice(BleDevice bleDevice) {
     _deviceRepository.pickDevice(bleDevice);
   }
@@ -43,7 +41,6 @@ class DevicesBloc {
     _visibleDevicesController.close();
     _devicePickerController.close();
     _scanSubscription?.cancel();
-    _bleManager.destroyClient();
   }
 
   void init() {
@@ -69,15 +66,16 @@ class DevicesBloc {
     _devicePickerSubscription = _devicePickerController.stream.listen(_handlePickedDevice);
   }
 
-  Future<void> maybeCreateClient() {
-    if (clientCreated) {
-      Fimber.d("Client already exists");
+  Future<void> maybeCreateClient() async {
+    Fimber.d('Checking if client exists...');
+    final clientAlreadyExists = await _bleManager.isClientCreated();
+    Fimber.d('Client exists: $clientAlreadyExists');
 
+    if (clientAlreadyExists) {
+      Fimber.d("Client already exists");
       return Future.value();
     }
 
-    clientCreated = true;
-
     Fimber.d("Create client");
 
     return _bleManager
@@ -90,7 +88,6 @@ class DevicesBloc {
           }
         )
         .catchError((e) {
-          clientCreated = false;
           return Fimber.d("Couldn't create BLE client", ex: e);
         });
   }

diff --git a/ios/Classes/Constants/MethodName.h b/ios/Classes/Constants/MethodName.h
@@ -1,3 +1,4 @@
+extern NSString * const METHOD_NAME_IS_CLIENT_CREATED;
 extern NSString * const METHOD_NAME_CREATE_CLIENT;
 extern NSString * const METHOD_NAME_DESTROY_CLIENT;
 

diff --git a/ios/Classes/Constants/MethodName.m b/ios/Classes/Constants/MethodName.m
@@ -1,3 +1,4 @@
+NSString * const METHOD_NAME_IS_CLIENT_CREATED = @"isClientCreated";
 NSString * const METHOD_NAME_CREATE_CLIENT = @"createClient";
 NSString * const METHOD_NAME_DESTROY_CLIENT = @"destroyClient";
 

diff --git a/ios/Classes/FlutterBleLibPlugin.m b/ios/Classes/FlutterBleLibPlugin.m
@@ -71,6 +71,8 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
         [self createClient:call result:result];
     } else if ([METHOD_NAME_DESTROY_CLIENT isEqualToString:call.method]) {
         [self destroyClient];
+    } else if ([METHOD_NAME_IS_CLIENT_CREATED isEqualToString:call.method]) {
+        [self isClientCreated:call result:result];
     } else if ([METHOD_NAME_ENABLE_RADIO isEqualToString:call.method]) {
         [self enable:call result:result];
     } else if ([METHOD_NAME_DISABLE_RADIO isEqualToString:call.method]) {
@@ -158,7 +160,14 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
 
 // MARK: - MBA Methods - BleClient lifecycle
 
+- (void)isClientCreated:(FlutterMethodCall *)call result:(FlutterResult)result {
+    result([NSNumber numberWithBool:_adapter != nil]);
+}
+
 - (void)createClient:(FlutterMethodCall *)call result:(FlutterResult)result {
+    if (_adapter != nil) {
+        NSLog(@"Overwriting existing native client. Use BleManager#isClientCreated to check whether a client already exists.");
+    }
     _adapter = [BleAdapterFactory getNewAdapterWithQueue:dispatch_get_main_queue()
                                     restoreIdentifierKey:[ArgumentHandler stringOrNil:call.arguments[ARGUMENT_KEY_RESTORE_STATE_IDENTIFIER]]];
     _adapter.delegate = self;

diff --git a/lib/ble_manager.dart b/lib/ble_manager.dart
@@ -49,6 +49,9 @@ abstract class BleManager {
   /// for example, the result is no longer useful due to user's actions.
   Future<void> cancelTransaction(String transactionId);
 
+  /// Checks whether the native client exists.
+  Future<bool> isClientCreated();
+
   /// Allocates native resources.
   ///
   /// [restoreStateIdentifier] and [restoreStateAction] are iOS-specific.

diff --git a/lib/src/_constants.dart b/lib/src/_constants.dart
@@ -1,4 +1,5 @@
 abstract class MethodName {
+  static const String isClientCreated = "isClientCreated";
   static const String createClient = "createClient";
   static const String destroyClient = "destroyClient";
 

diff --git a/lib/src/bridge/lib_core.dart b/lib/src/bridge/lib_core.dart
@@ -51,6 +51,9 @@ class FlutterBleLib extends FlutterBLE
       .take(1)
       .single;
 
+  Future<bool> isClientCreated() =>
+      _methodChannel.invokeMethod<bool>(MethodName.isClientCreated);
+
   Future<void> createClient(String restoreStateIdentifier) async {
     await _methodChannel.invokeMethod(MethodName.createClient, <String, String>{
       ArgumentName.restoreStateIdentifier: restoreStateIdentifier

diff --git a/lib/src/internal_ble_manager.dart b/lib/src/internal_ble_manager.dart
@@ -14,6 +14,9 @@ class InternalBleManager
     _bleLib.registerManager(this);
   }
 
+  @override
+  Future<bool> isClientCreated() => _bleLib.isClientCreated();
+
   @override
   Future<void> createClient({
     String restoreStateIdentifier,