fix(device_info_plus): device memory null error on Safari and Firefox

fluttercommunity · Dec 17, 2024 · a6beb6c · a6beb6c
1 parent 95a12ee
commit a6beb6c
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/packages/device_info_plus/device_info_plus/lib/src/device_info_plus_web.dart b/packages/device_info_plus/device_info_plus/lib/src/device_info_plus_web.dart
@@ -17,8 +17,7 @@ class DeviceInfoPlusWebPlugin extends DeviceInfoPlatform {
   /// Factory method that initializes the DeviceInfoPlus plugin platform
   /// with an instance of the plugin for the web.
   static void registerWith(Registrar registrar) {
-    DeviceInfoPlatform.instance =
-        DeviceInfoPlusWebPlugin(html.window.navigator);
+    DeviceInfoPlatform.instance = DeviceInfoPlusWebPlugin(html.window.navigator);
   }
 
   @override
@@ -29,7 +28,7 @@ class DeviceInfoPlusWebPlugin extends DeviceInfoPlatform {
           'appCodeName': _navigator.appCodeName,
           'appName': _navigator.appName,
           'appVersion': _navigator.appVersion,
-          'deviceMemory': _navigator.deviceMemory,
+          'deviceMemory': _navigator.safeDeviceMemory(),
           'language': _navigator.language,
           'languages': _navigator.languages.toDart,
           'platform': _navigator.platform,
@@ -45,3 +44,13 @@ class DeviceInfoPlusWebPlugin extends DeviceInfoPlatform {
     );
   }
 }
+
+extension SafeNavigationGetterExtensions on html.Navigator {
+  double? safeDeviceMemory() {
+    try {
+      return deviceMemory;
+    } catch (e) {
+      return 0.0;
+    }
+  }
+}