Merge branch 'master' into feature/update_gladdle_8.4

Author: PieterAelse

example/pubspec.lock

@@ -220,7 +220,7 @@ packages:
       path: "../packages/flutter_reactive_ble"
       relative: true
     source: path
-    version: "5.4.0"
+    version: "5.4.1"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -464,14 +464,14 @@ packages:
       path: "../packages/reactive_ble_mobile"
       relative: true
     source: path
-    version: "5.4.0"
+    version: "5.4.1"
   reactive_ble_platform_interface:
     dependency: "direct overridden"
     description:
       path: "../packages/reactive_ble_platform_interface"
       relative: true
     source: path
-    version: "5.4.0"
+    version: "5.4.1"
   shelf:
     dependency: transitive
     description:

example/pubspec.yaml

@@ -1,6 +1,6 @@
 name: flutter_reactive_ble_example
 description: Demonstrates how to use the flutter_reactive_ble plugin.
-version: 5.4.0
+version: 5.4.1
 publish_to: 'none'
 
 environment:
@@ -10,7 +10,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  flutter_reactive_ble: ^5.4.0
+  flutter_reactive_ble: ^5.4.1
   functional_data: ^1.0.0
   intl: ^0.17.0
 

packages/flutter_reactive_ble/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 5.4.1
+
+* Prevent index out of range crash when filtering services and characteristics #919
+* Improve stack trace of exceptions from read(Characteristic) #896
+* Upgraded protobuf to v3 and upgraded the android example to fix the deprecated imperative apply of gradle plugins #871
+
 ## 5.4.0
 
 * Support for MacOS #889

packages/flutter_reactive_ble/pubspec.lock

@@ -433,14 +433,14 @@ packages:
       path: "../reactive_ble_mobile"
       relative: true
     source: path
-    version: "5.4.0"
+    version: "5.4.1"
   reactive_ble_platform_interface:
     dependency: "direct main"
     description:
       path: "../reactive_ble_platform_interface"
       relative: true
     source: path
-    version: "5.4.0"
+    version: "5.4.1"
   shelf:
     dependency: transitive
     description:

packages/flutter_reactive_ble/pubspec.yaml

@@ -1,6 +1,6 @@
 name: flutter_reactive_ble
 description: Reactive Bluetooth Low Energy (BLE) plugin that can communicate with multiple devices
-version: 5.4.0
+version: 5.4.1
 homepage: https://github.com/PhilipsHue/flutter_reactive_ble
 
 environment:
@@ -21,8 +21,8 @@ dependencies:
     sdk: flutter
   functional_data: ^1.0.0
   meta: ^1.3.0
-  reactive_ble_mobile: ^5.4.0
-  reactive_ble_platform_interface: ^5.4.0
+  reactive_ble_mobile: ^5.4.1
+  reactive_ble_platform_interface: ^5.4.1
 
 dependency_overrides:
   reactive_ble_mobile:

packages/reactive_ble_mobile/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 5.4.1
+
+* Prevent index out of range crash when filtering services and characteristics #919
+* Improve stack trace of exceptions from read(Characteristic) #896
+* Upgraded protobuf to v3 and upgraded the android example to fix the deprecated imperative apply of gradle plugins #871
+
 ## 5.4.0
 
 * Support for MacOS #889

packages/reactive_ble_mobile/darwin/Classes/ReactiveBle/Central.swift

@@ -366,13 +366,21 @@ final class Central {
     private func resolve(characteristic characteristicInstance: CharacteristicInstance) throws -> CBCharacteristic {
         let peripheral = try resolve(connected: characteristicInstance.peripheralID)
 
-        guard let service = peripheral.services?.filter({ $0.uuid == characteristicInstance.serviceID })[Int(characteristicInstance.serviceInstanceID) ?? 0]
+        let filteredServices = peripheral.services?.filter { $0.uuid == characteristicInstance.serviceID } ?? []
+        let serviceIndex = Int(characteristicInstance.serviceInstanceID) ?? 0
+
+        guard serviceIndex >= 0, serviceIndex < filteredServices.count
         else { throw Failure.serviceNotFound(characteristicInstance.serviceID, characteristicInstance.peripheralID) }
 
-        guard let characteristic = service.characteristics?.filter({ $0.uuid == characteristicInstance.id })[Int(characteristicInstance.instanceID) ?? 0]
+        let service = filteredServices[serviceIndex]
+
+        let filteredCharacteristics = service.characteristics?.filter {$0.uuid == characteristicInstance.id} ?? []
+        let characteristicsIndex = Int(characteristicInstance.instanceID) ?? 0
+
+        guard characteristicsIndex >= 0, characteristicsIndex < filteredCharacteristics.count
         else { throw Failure.characteristicNotFound(characteristicInstance) }
 
-        return characteristic
+        return filteredCharacteristics[characteristicsIndex]
     }
 
     private enum Failure: Error, CustomStringConvertible {

packages/reactive_ble_mobile/pubspec.lock

@@ -425,7 +425,7 @@ packages:
       path: "../reactive_ble_platform_interface"
       relative: true
     source: path
-    version: "5.4.0"
+    version: "5.4.1"
   shelf:
     dependency: transitive
     description:

packages/reactive_ble_mobile/pubspec.yaml

@@ -1,6 +1,6 @@
 name: reactive_ble_mobile
 description: Official Android and iOS implementation for the flutter_reactive_ble plugin.
-version: 5.4.0
+version: 5.4.1
 homepage: https://github.com/PhilipsHue/flutter_reactive_ble
 
 environment:
@@ -11,7 +11,7 @@ dependencies:
   flutter:
     sdk: flutter
   protobuf: ^3.0.0
-  reactive_ble_platform_interface: ^5.4.0
+  reactive_ble_platform_interface: ^5.4.1
 
 dev_dependencies:
   build_runner: ^2.3.3

packages/reactive_ble_platform_interface/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 5.4.1
+
+* Prevent index out of range crash when filtering services and characteristics #919
+* Improve stack trace of exceptions from read(Characteristic) #896
+* Upgraded protobuf to v3 and upgraded the android example to fix the deprecated imperative apply of gradle plugins #871
+
 ## 5.4.0
 
 * Support for MacOS #889