Merge pull request #491 from Polidea/release/2.2.6

Release 2.2.6

Author: mikolak

.gitignore

@@ -13,4 +13,5 @@ res/values/strings_en.arb
 lib/generated/
 example/lib/generated/
 example/.flutter-plugins-dependencies
-.dart_tool/
+.dart_tool/
+example/ios/Podfile.lock

.travis.yml

@@ -47,7 +47,7 @@ _android_job_template: &android_job_template
 _ios_job_template: &ios_job_template
   language: objective-c
   os: osx
-  osx_image: xcode11
+  osx_image: xcode11.6
   xcode_workspave: example/ios/Runner.xcworkspace
   xcode_scheme: Runner
   before_script:

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.2.6
+
+* Fixed scan quick failures not being reported to the listener (race condition in scanning_mixin.dart)
+
 ## 2.2.5
 
 * add missing handling of destroyClient call on iOS

android/build.gradle

@@ -1,5 +1,5 @@
 group 'com.polidea.flutter_ble_lib'
-version '2.2.5'
+version '2.2.6'
 
 buildscript {
     repositories {

example/ios/Podfile.lock

@@ -19,6 +19,7 @@ class DevicesListScreen extends StatefulWidget {
 class DeviceListScreenState extends State<DevicesListScreen> {
   DevicesBloc _devicesBloc;
   StreamSubscription _appStateSubscription;
+  bool _shouldRunOnResume = true;
 
   @override
   void didUpdateWidget(DevicesListScreen oldWidget) {
@@ -39,13 +40,13 @@ class DeviceListScreenState extends State<DevicesListScreen> {
       Fimber.d("navigate to details");
       _onPause();
       await Navigator.pushNamed(context, "/details");
-      _shouldRunOnResume = true;
+      setState(() {
+        _shouldRunOnResume = true;
+      });
       Fimber.d("back from details");
     });
   }
 
-  bool _shouldRunOnResume = true;
-
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();

example/lib/devices_list/devices_list_view.dart

@@ -3,7 +3,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'flutter_ble_lib'
-  s.version          = '2.2.5'
+  s.version          = '2.2.6'
   s.summary          = 'A new flutter plugin project.'
   s.description      = <<-DESC
 A new flutter plugin project.

ios/flutter_ble_lib.podspec

@@ -1,42 +1,49 @@
 part of _internal;
 
 mixin ScanningMixin on FlutterBLE {
-  Stream<dynamic> _scanEvents;
+  Stream<ScanResult> _scanEvents;
 
   void _prepareScanEventsStream() {
-    _scanEvents =
-        const EventChannel(ChannelName.scanningEvents).receiveBroadcastStream();
+    _scanEvents = const EventChannel(ChannelName.scanningEvents)
+        .receiveBroadcastStream()
+        .handleError(
+          (errorJson) => throw BleError.fromJson(jsonDecode(errorJson.details)),
+          test: (error) => error is PlatformException,
+        )
+        .map(
+          (scanResultJson) =>
+              ScanResult.fromJson(jsonDecode(scanResultJson), _manager),
+        );
   }
 
   Stream<ScanResult> startDeviceScan(
     int scanMode,
     int callbackType,
     List<String> uuids,
     bool allowDuplicates,
-  ) async* {
-    _methodChannel.invokeMethod(
-      MethodName.startDeviceScan,
-      <String, dynamic>{
-        ArgumentName.scanMode: scanMode,
-        ArgumentName.callbackType: callbackType,
-        ArgumentName.uuids: uuids,
-        ArgumentName.allowDuplicates: allowDuplicates,
-      },
-    );
-
+  ) {
     if (_scanEvents == null) {
       _prepareScanEventsStream();
     }
 
-    yield* _scanEvents.handleError(
-      (errorJson) {
-        throw BleError.fromJson(jsonDecode(errorJson.details));
-      },
-      test: (error) => error is PlatformException,
-    ).map((scanResultJson) => ScanResult.fromJson(
-          jsonDecode(scanResultJson),
-          _manager,
-        ));
+    StreamController<ScanResult> streamController = StreamController.broadcast(
+      onListen: () => _methodChannel.invokeMethod(
+        MethodName.startDeviceScan,
+        <String, dynamic>{
+          ArgumentName.scanMode: scanMode,
+          ArgumentName.callbackType: callbackType,
+          ArgumentName.uuids: uuids,
+          ArgumentName.allowDuplicates: allowDuplicates,
+        },
+      ),
+      onCancel: () => stopDeviceScan(),
+    );
+
+    streamController
+        .addStream(_scanEvents, cancelOnError: true)
+        .then((_) => streamController?.close());
+
+    return streamController.stream;
   }
 
   Future<void> stopDeviceScan() async {

lib/src/bridge/scanning_mixin.dart

@@ -1,6 +1,6 @@
 name: flutter_ble_lib
 description: FlutterBle Library is a flutter library that supports BLE operations. It uses MultiPlatformBleAdapter as a native backend..
-version: 2.2.5
+version: 2.2.6
 homepage: https://github.com/Polidea/FlutterBleLib
 
 environment: