From de7ad81ad9b7c887426526e2add553468e2df8f5 Mon Sep 17 00:00:00 2001
From: Sjoerd Kuster <sjoerdkuster@gmail.com>
Date: Wed, 24 Mar 2021 14:56:28 +0100
Subject: [PATCH 1/2] Update json scan_result parsing

---
 lib/scan_result.dart | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/scan_result.dart b/lib/scan_result.dart
index 3ae7ce6d..6326d831 100644
--- a/lib/scan_result.dart
+++ b/lib/scan_result.dart
@@ -32,7 +32,7 @@ class ScanResult {
       : peripheral = Peripheral.fromJson(json, manager),
         rssi = json[_ScanResultMetadata.rssi],
         isConnectable = json[_ScanResultMetadata.isConnectable],
-        overflowServiceUuids = json[_ScanResultMetadata.overflowServiceUuids],
+        overflowServiceUuids = _mapToListOfStringsOrNull(json[_ScanResultMetadata.overflowServiceUuids]),
         advertisementData = AdvertisementData._fromJson(json);
 }
 
@@ -78,12 +78,12 @@ class AdvertisementData {
   }
 
   static Uint8List _decodeBase64OrNull(String base64Value) {
-    if (base64Value != null)
+    if (base64Value != null) {
       return base64.decode(base64Value);
-    else
+    } else {
       return null;
+    }
   }
-
-  static List<String> _mapToListOfStringsOrNull(List<dynamic> values) =>
-      values?.cast();
 }
+
+List<String> _mapToListOfStringsOrNull(List<dynamic> values) => (values ?? []).cast();
\ No newline at end of file

From f5a4195ca5ad7b2384c267861544731a3470352b Mon Sep 17 00:00:00 2001
From: Sjoerd Kuster <sjoerdkuster@gmail.com>
Date: Wed, 5 May 2021 17:01:30 +0200
Subject: [PATCH 2/2] fix warning

---
 lib/scan_result.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/scan_result.dart b/lib/scan_result.dart
index 0980c91a..2e7d2b79 100644
--- a/lib/scan_result.dart
+++ b/lib/scan_result.dart
@@ -103,5 +103,5 @@ class AdvertisementData {
       values?.cast<String>();
 }
 
-List<String> _mapToListOfStringsOrNull(List<dynamic> values) =>
+List<String> _mapToListOfStringsOrNull(List<dynamic>? values) =>
     (values ?? []).cast();