Skip to content

Commit fb24bf4

Browse files
Fix #184 (#191) - Support null values from Android
1 parent 79d62dd commit fb24bf4

File tree

3 files changed

+19
-15
lines changed

3 files changed

+19
-15
lines changed

packages/device_info_plus_platform_interface/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 1.0.1
2+
3+
- Fix https://github.com/fluttercommunity/plus_plugins/issues/184: Null values on Android
4+
15
## 1.0.0
26

37
- Migrated to null safety

packages/device_info_plus_platform_interface/lib/model/android_device_info.dart

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,18 @@ class AndroidDeviceInfo {
2121
this.manufacturer,
2222
this.model,
2323
this.product,
24-
required List<String> supported32BitAbis,
25-
required List<String> supported64BitAbis,
26-
required List<String> supportedAbis,
24+
required List<String?> supported32BitAbis,
25+
required List<String?> supported64BitAbis,
26+
required List<String?> supportedAbis,
2727
this.tags,
2828
this.type,
2929
this.isPhysicalDevice,
3030
this.androidId,
31-
required List<String> systemFeatures,
32-
}) : supported32BitAbis = List<String>.unmodifiable(supported32BitAbis),
33-
supported64BitAbis = List<String>.unmodifiable(supported64BitAbis),
34-
supportedAbis = List<String>.unmodifiable(supportedAbis),
35-
systemFeatures = List<String>.unmodifiable(systemFeatures);
31+
required List<String?> systemFeatures,
32+
}) : supported32BitAbis = List<String?>.unmodifiable(supported32BitAbis),
33+
supported64BitAbis = List<String?>.unmodifiable(supported64BitAbis),
34+
supportedAbis = List<String?>.unmodifiable(supportedAbis),
35+
systemFeatures = List<String?>.unmodifiable(systemFeatures);
3636

3737
/// Android operating system version values derived from `android.os.Build.VERSION`.
3838
final AndroidBuildVersion version;
@@ -74,13 +74,13 @@ class AndroidDeviceInfo {
7474
final String? product;
7575

7676
/// An ordered list of 32 bit ABIs supported by this device.
77-
final List<String> supported32BitAbis;
77+
final List<String?> supported32BitAbis;
7878

7979
/// An ordered list of 64 bit ABIs supported by this device.
80-
final List<String> supported64BitAbis;
80+
final List<String?> supported64BitAbis;
8181

8282
/// An ordered list of ABIs supported by this device.
83-
final List<String> supportedAbis;
83+
final List<String?> supportedAbis;
8484

8585
/// Comma-separated tags describing the build, like "unsigned,debug".
8686
final String? tags;
@@ -108,7 +108,7 @@ class AndroidDeviceInfo {
108108
/// and many of the common feature strings to look for are available in
109109
/// PackageManager's public documentation:
110110
/// https://developer.android.com/reference/android/content/pm/PackageManager
111-
final List<String> systemFeatures;
111+
final List<String?> systemFeatures;
112112

113113
/// Deserializes from the message received from [_kChannel].
114114
static AndroidDeviceInfo fromMap(Map<String, dynamic> map) {
@@ -139,9 +139,9 @@ class AndroidDeviceInfo {
139139
}
140140

141141
/// Deserializes message as List<String>
142-
static List<String> _fromList(dynamic message) {
142+
static List<String?> _fromList(dynamic message) {
143143
final List<dynamic> list = message;
144-
return List<String>.from(list);
144+
return List<String?>.from(list);
145145
}
146146
}
147147

packages/device_info_plus_platform_interface/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: device_info_plus_platform_interface
22
description: A common platform interface for the device_info_plis plugin.
3-
version: 1.0.0
3+
version: 1.0.1
44
homepage: https://plus.fluttercommunity.dev/
55
repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/
66

0 commit comments

Comments
 (0)