Skip to content

Commit 47d12e1

Browse files
mikolakŁukasz RejmanbartoszwilkpawelByszewski
authored
Release 2.2.3 (dotintent#445)
* Fix capitalization style for UUID and constant names (dotintent#437) * Fix capitalization of UUID in Service * Fix capitalization of UUID in ScanResult * Fix capitalization of UUID in Peripheral * Rename bytes to value * Fix capitalization of UUID in metadata strings in ScanResult * Fix constants capitalization in BleError * Revert "Fix capitalization of UUID in metadata strings in ScanResult" This reverts commit 08516ec. * Fix capitalization of UUID in managers for classes * Fix capitalization of UUID for InternalBleManager * Fix capitalization of UUID in CharacteristicsMixin * Fix capitalization of UUID in DevicesMixin * Rename bytes to value in internal classes * Add unit tests for Service (dotintent#439) * unit test for BleManager * [descriptor] override equals & hashcode functions * [tests] add: mock classes for managers * [service] add: service tests * [tests] create characteristics and descriptors using separate generators * [service][tests] cover generating transactionId when it's not specified * [service][tests] clear mocks interactions after each test * [service][tests] add missing test for getting all descriptors for specified characteristic Co-authored-by: Paweł Byszewski <[email protected]> * Bump MBA and lib version Co-authored-by: Łukasz Rejman <[email protected]> Co-authored-by: Bartosz Wilk <[email protected]> Co-authored-by: Paweł Byszewski <[email protected]>
1 parent 76e6fcf commit 47d12e1

21 files changed

+564
-170
lines changed

‎CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 2.2.3
2+
3+
* Fix issue with duplicated or malformed notification values
4+
15
## 2.2.2
26

37
* Fix issue with invalid characteristic value base64 coding when performing characteristic operations on iOS

‎android/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
group 'com.polidea.flutter_ble_lib'
2-
version '2.2.0'
2+
version '2.2.3'
33

44
buildscript {
55
repositories {
@@ -36,5 +36,5 @@ android {
3636

3737
dependencies {
3838
implementation 'androidx.annotation:annotation:1.1.0'
39-
implementation 'com.github.Polidea:MultiPlatformBleAdapter:0.1.4'
39+
implementation 'com.github.Polidea:MultiPlatformBleAdapter:0.1.5'
4040
}

‎example/ios/Podfile.lock

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
PODS:
22
- Flutter (1.0.0)
3-
- flutter_ble_lib (2.1.0):
3+
- flutter_ble_lib (2.2.3):
44
- Flutter
5-
- MultiplatformBleAdapter (= 0.1.4)
6-
- MultiplatformBleAdapter (0.1.4)
5+
- MultiplatformBleAdapter (= 0.1.5)
6+
- MultiplatformBleAdapter (0.1.5)
77
- "permission_handler (4.2.0+hotfix.3)":
88
- Flutter
99

@@ -26,8 +26,8 @@ EXTERNAL SOURCES:
2626

2727
SPEC CHECKSUMS:
2828
Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
29-
flutter_ble_lib: b2cf6d76a88368075db66966d782630318c6e67d
30-
MultiplatformBleAdapter: 1ef6e0c8d11f753c56cbad1654b36c8e24142648
29+
flutter_ble_lib: 20e79f0b1d78d921d9ed68ab4451e190029bc3d9
30+
MultiplatformBleAdapter: 3c4391d428382738a47662ae1f665a29ce78ff39
3131
permission_handler: 40520ab8ad1bb78a282b832464e995ec87f77ec6
3232

3333
PODFILE CHECKSUM: 1b66dae606f75376c5f2135a8290850eeb09ae83

‎ios/flutter_ble_lib.podspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
Pod::Spec.new do |s|
55
s.name = 'flutter_ble_lib'
6-
s.version = '2.2.0'
6+
s.version = '2.2.3'
77
s.summary = 'A new flutter plugin project.'
88
s.description = <<-DESC
99
A new flutter plugin project.
@@ -16,7 +16,7 @@ A new flutter plugin project.
1616
s.public_header_files = 'Classes/**/*.h'
1717
s.dependency 'Flutter'
1818
s.swift_versions = ['4.0', '4.2', '5.0']
19-
s.dependency 'MultiplatformBleAdapter', '0.1.4'
19+
s.dependency 'MultiplatformBleAdapter', '0.1.5'
2020

2121
s.ios.deployment_target = '8.0'
2222
end

‎lib/ble_manager.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ abstract class BleManager {
4242
}
4343

4444
/// Cancels transaction's return, resulting in [BleError] with
45-
/// [BleError.errorCode] set to [BleErrorCode.OperationCancelled] being returned
45+
/// [BleError.errorCode] set to [BleErrorCode.operationCancelled] being returned
4646
/// from transaction's Future.
4747
///
4848
/// The operation might be cancelled if it hadn't yet started or be run

‎lib/characteristic.dart

+3-2
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ class Characteristic extends InternalCharacteristic {
3636

3737
/// True if this characteristic can be monitored via notifications.
3838
bool isNotifiable;
39+
3940
/// True if this characteristic can be monitored via indications.
4041
bool isIndicatable;
4142

@@ -70,14 +71,14 @@ class Characteristic extends InternalCharacteristic {
7071
/// [isWritableWithoutResponse] is `true` and argument [withResponse] is
7172
/// set accordingly.
7273
Future<void> write(
73-
Uint8List bytes,
74+
Uint8List value,
7475
bool withResponse, {
7576
String transactionId,
7677
}) =>
7778
_manager.writeCharacteristicForIdentifier(
7879
service.peripheral,
7980
this,
80-
bytes,
81+
value,
8182
withResponse,
8283
transactionId ?? TransactionIdGenerator.getNextId(),
8384
);

‎lib/descriptor.dart

+15
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,21 @@ class Descriptor extends InternalDescriptor {
3333
value,
3434
transactionId ?? TransactionIdGenerator.getNextId(),
3535
);
36+
37+
@override
38+
bool operator ==(Object other) =>
39+
identical(this, other) ||
40+
other is Descriptor &&
41+
runtimeType == other.runtimeType &&
42+
_manager == other._manager &&
43+
characteristic == other.characteristic &&
44+
uuid == other.uuid;
45+
46+
@override
47+
int get hashCode =>
48+
_manager.hashCode ^
49+
characteristic.hashCode ^
50+
uuid.hashCode;
3651
}
3752

3853
class DescriptorWithValue extends Descriptor with WithValue {

‎lib/error/ble_error.dart

+63-63
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
part of flutter_ble_lib;
22

33
abstract class _BleErrorMetadata {
4-
static const String ERROR_CODE = "errorCode";
5-
static const String ATT_ERROR_CODE = "attErrorCode";
6-
static const String ANDROID_ERROR_CODE = "androidErrorCode";
7-
static const String REASON = "reason";
8-
static const String DEVICE_ID = "deviceID";
9-
static const String SERVICE_UUID = "serviceUUID";
10-
static const String CHARACTERISTIC_UUID = "characteristicUUID";
11-
static const String DESCRIPTOR_UUID = "descriptorUUID";
12-
static const String INTERNAL_MESSAGE = "internalMessage";
4+
static const String errorCode = "errorCode";
5+
static const String attErrorCode = "attErrorCode";
6+
static const String androidErrorCode = "androidErrorCode";
7+
static const String reason = "reason";
8+
static const String deviceId = "deviceID";
9+
static const String serviceUuid = "serviceUUID";
10+
static const String characteristicUuid = "characteristicUUID";
11+
static const String descriptorUuid = "descriptorUUID";
12+
static const String internalMessage = "internalMessage";
1313
}
1414

1515
class BleError {
@@ -20,21 +20,21 @@ class BleError {
2020
String reason;
2121

2222
String deviceID;
23-
String serviceUUID;
24-
String characteristicUUID;
25-
String descriptorUUID;
23+
String serviceUuid;
24+
String characteristicUuid;
25+
String descriptorUuid;
2626
String internalMessage;
2727

2828
BleError.fromJson(Map<String, dynamic> json)
29-
: errorCode = BleErrorCode(json[_BleErrorMetadata.ERROR_CODE]),
30-
attErrorCode = json[_BleErrorMetadata.ATT_ERROR_CODE],
31-
androidErrorCode = json[_BleErrorMetadata.ANDROID_ERROR_CODE],
32-
reason = json[_BleErrorMetadata.REASON],
33-
deviceID = json[_BleErrorMetadata.DEVICE_ID],
34-
serviceUUID = json[_BleErrorMetadata.SERVICE_UUID],
35-
characteristicUUID = json[_BleErrorMetadata.CHARACTERISTIC_UUID],
36-
descriptorUUID = json[_BleErrorMetadata.DESCRIPTOR_UUID],
37-
internalMessage = json[_BleErrorMetadata.INTERNAL_MESSAGE];
29+
: errorCode = BleErrorCode(json[_BleErrorMetadata.errorCode]),
30+
attErrorCode = json[_BleErrorMetadata.attErrorCode],
31+
androidErrorCode = json[_BleErrorMetadata.androidErrorCode],
32+
reason = json[_BleErrorMetadata.reason],
33+
deviceID = json[_BleErrorMetadata.deviceId],
34+
serviceUuid = json[_BleErrorMetadata.serviceUuid],
35+
characteristicUuid = json[_BleErrorMetadata.characteristicUuid],
36+
descriptorUuid = json[_BleErrorMetadata.descriptorUuid],
37+
internalMessage = json[_BleErrorMetadata.internalMessage];
3838

3939
@override
4040
String toString() => "BleError ("
@@ -45,57 +45,57 @@ class BleError {
4545
"reason: $reason, "
4646
"internal message: $internalMessage, "
4747
"device ID: $deviceID, "
48-
"service UUID: $serviceUUID, "
49-
"characteristic UUID: $characteristicUUID, "
50-
"descriptor UUID: $descriptorUUID)";
48+
"service UUID: $serviceUuid, "
49+
"characteristic UUID: $characteristicUuid, "
50+
"descriptor UUID: $descriptorUuid)";
5151
}
5252

5353
class BleErrorCode {
54-
static const int UnknownError = 0;
55-
static const int BluetoothManagerDestroyed = 1;
56-
static const int OperationCancelled = 2;
57-
static const int OperationTimedOut = 3;
58-
static const int OperationStartFailed = 4;
59-
static const int InvalidIdentifiers = 5;
54+
static const int unknownError = 0;
55+
static const int bluetoothManagerDestroyed = 1;
56+
static const int operationCancelled = 2;
57+
static const int operationTimedOut = 3;
58+
static const int operationStartFailed = 4;
59+
static const int invalidIdentifiers = 5;
6060

61-
static const int BluetoothUnsupported = 100;
62-
static const int BluetoothUnauthorized = 101;
63-
static const int BluetoothPoweredOff = 102;
64-
static const int BluetoothInUnknownState = 103;
65-
static const int BluetoothResetting = 104;
66-
static const int BluetoothStateChangeFailed = 105;
61+
static const int bluetoothUnsupported = 100;
62+
static const int bluetoothUnauthorized = 101;
63+
static const int bluetoothPoweredOff = 102;
64+
static const int bluetoothInUnknownState = 103;
65+
static const int bluetoothResetting = 104;
66+
static const int bluetoothStateChangeFailed = 105;
6767

68-
static const int DeviceConnectionFailed = 200;
69-
static const int DeviceDisconnected = 201;
70-
static const int DeviceRSSIReadFailed = 202;
71-
static const int DeviceAlreadyConnected = 203;
72-
static const int DeviceNotFound = 204;
73-
static const int DeviceNotConnected = 205;
74-
static const int DeviceMTUChangeFailed = 206;
68+
static const int deviceConnectionFailed = 200;
69+
static const int deviceDisconnected = 201;
70+
static const int deviceRSSIReadFailed = 202;
71+
static const int deviceAlreadyConnected = 203;
72+
static const int deviceNotFound = 204;
73+
static const int deviceNotConnected = 205;
74+
static const int deviceMTUChangeFailed = 206;
7575

76-
static const int ServicesDiscoveryFailed = 300;
77-
static const int IncludedServicesDiscoveryFailed = 301;
78-
static const int ServiceNotFound = 302;
79-
static const int ServicesNotDiscovered = 303;
76+
static const int servicesDiscoveryFailed = 300;
77+
static const int includedServicesDiscoveryFailed = 301;
78+
static const int serviceNotFound = 302;
79+
static const int servicesNotDiscovered = 303;
8080

81-
static const int CharacteristicsDiscoveryFailed = 400;
82-
static const int CharacteristicWriteFailed = 401;
83-
static const int CharacteristicReadFailed = 402;
84-
static const int CharacteristicNotifyChangeFailed = 403;
85-
static const int CharacteristicNotFound = 404;
86-
static const int CharacteristicsNotDiscovered = 405;
87-
static const int CharacteristicInvalidDataFormat = 406;
81+
static const int characteristicsDiscoveryFailed = 400;
82+
static const int characteristicWriteFailed = 401;
83+
static const int characteristicReadFailed = 402;
84+
static const int characteristicNotifyChangeFailed = 403;
85+
static const int characteristicNotFound = 404;
86+
static const int characteristicsNotDiscovered = 405;
87+
static const int characteristicInvalidDataFormat = 406;
8888

89-
static const int DescriptorsDiscoveryFailed = 500;
90-
static const int DescriptorWriteFailed = 501;
91-
static const int DescriptorReadFailed = 502;
92-
static const int DescriptorNotFound = 503;
93-
static const int DescriptorsNotDiscovered = 504;
94-
static const int DescriptorInvalidDataFormat = 505;
95-
static const int DescriptorWriteNotAllowed = 506;
89+
static const int descriptorsDiscoveryFailed = 500;
90+
static const int descriptorWriteFailed = 501;
91+
static const int descriptorReadFailed = 502;
92+
static const int descriptorNotFound = 503;
93+
static const int descriptorsNotDiscovered = 504;
94+
static const int descriptorInvalidDataFormat = 505;
95+
static const int descriptorWriteNotAllowed = 506;
9696

97-
static const int ScanStartFailed = 600;
98-
static const int LocationServicesDisabled = 601;
97+
static const int scanStartFailed = 600;
98+
static const int locationServicesDisabled = 601;
9999

100100
int value;
101101

‎lib/peripheral.dart

+17-17
Original file line numberDiff line numberDiff line change
@@ -122,39 +122,39 @@ class Peripheral {
122122

123123
/// Reads value of [Characteristic] matching specified UUIDs.
124124
///
125-
/// Returns value of characteristic with [characteristicUUID] for service with
126-
/// [serviceUUID]. Optional [transactionId] could be used to cancel operation.
125+
/// Returns value of characteristic with [characteristicUuid] for service with
126+
/// [serviceUuid]. Optional [transactionId] could be used to cancel operation.
127127
///
128128
/// Will result in error if discovery was not done during this connection.
129129
Future<CharacteristicWithValue> readCharacteristic(
130-
String serviceUUID,
131-
String characteristicUUID, {
130+
String serviceUuid,
131+
String characteristicUuid, {
132132
String transactionId,
133133
}) =>
134134
_manager.readCharacteristicForDevice(
135135
this,
136-
serviceUUID,
137-
characteristicUUID,
136+
serviceUuid,
137+
characteristicUuid,
138138
transactionId ?? TransactionIdGenerator.getNextId(),
139139
);
140140

141141
/// Writes value of [Characteristic] matching specified UUIDs.
142142
///
143-
/// Writes [value] to characteristic with [characteristicUUID] for service with
144-
/// [serviceUUID]. Optional [transactionId] could be used to cancel operation.
143+
/// Writes [value] to characteristic with [characteristicUuid] for service with
144+
/// [serviceUuid]. Optional [transactionId] could be used to cancel operation.
145145
///
146146
/// Will result in error if discovery was not done during this connection.
147147
Future<Characteristic> writeCharacteristic(
148-
String serviceUUID,
149-
String characteristicUUID,
148+
String serviceUuid,
149+
String characteristicUuid,
150150
Uint8List value,
151151
bool withResponse, {
152152
String transactionId,
153153
}) =>
154154
_manager.writeCharacteristicForDevice(
155155
this,
156-
serviceUUID,
157-
characteristicUUID,
156+
serviceUuid,
157+
characteristicUuid,
158158
value,
159159
withResponse,
160160
transactionId ?? TransactionIdGenerator.getNextId(),
@@ -221,21 +221,21 @@ class Peripheral {
221221
/// matching specified UUIDs.
222222
///
223223
/// Emits [CharacteristicWithValue] for every observed change of the
224-
/// characteristic specified by [serviceUUID] and [characteristicUUID]
224+
/// characteristic specified by [serviceUuid] and [characteristicUuid]
225225
/// If notifications are enabled they will be used in favour of indications.
226226
/// Optional [transactionId] could be used to cancel operation. Unsubscribing
227227
/// from the stream cancels monitoring.
228228
///
229229
/// Will result in error if discovery was not done during this connection.
230230
Stream<CharacteristicWithValue> monitorCharacteristic(
231-
String serviceUUID,
232-
String characteristicUUID, {
231+
String serviceUuid,
232+
String characteristicUuid, {
233233
String transactionId,
234234
}) =>
235235
_manager.monitorCharacteristicForDevice(
236236
this,
237-
serviceUUID,
238-
characteristicUUID,
237+
serviceUuid,
238+
characteristicUuid,
239239
transactionId ?? TransactionIdGenerator.getNextId(),
240240
);
241241

0 commit comments

Comments
 (0)