fix: attempt 2 of fixing null exception when telephonyInfo is null

Zfinix · Jul 9, 2023 · 64b7292 · 64b7292
1 parent 9b654d2
commit 64b7292
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/src/models/android_carrier_data.dart b/lib/src/models/android_carrier_data.dart
@@ -61,7 +61,7 @@ class AndroidCarrierData {
       isMultiSimSupported: map['isMultiSimSupported'] ?? '',
       isSmsCapable: map['isSmsCapable'] ?? false,
       telephonyInfo: List<TelephonyInfo>.from(
-          map['telephonyInfo']?.map((x) => x ?? TelephonyInfo.fromMap(x))),
+          map['telephonyInfo']?.map((x) => TelephonyInfo.fromMap(x))),
     );
   }
 
@@ -379,7 +379,7 @@ class TelephonyInfo {
       displayName: map['displayName'] ?? '',
       simState: map['simState'] ?? '',
       isoCountryCode: map['isoCountryCode'] ?? '',
-      cellId: CellId.fromMap(map['cellId']),
+      cellId: CellId.fromMap(map['cellId'] ?? <dynamic, dynamic>{}),
       phoneNumber: map['phoneNumber'] ?? '',
       carrierName: map['carrierName'] ?? '',
       subscriptionId: map['subscriptionId'] ?? 0,