Merge pull request #1225 from breez/remote-server-null

fix null issue
breez · Oct 12, 2023 · d30d6f3 · d30d6f3
2 parents 100160f + 17d036e
commit d30d6f3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
@@ -33,7 +33,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.16.4</string>
+	<string>0.16.5</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

diff --git a/lib/routes/security_pin/security_and_backup/security_and_backup_page.dart b/lib/routes/security_pin/security_and_backup/security_and_backup_page.dart
@@ -169,8 +169,8 @@ class SecurityAndBackupPageState extends State<SecurityAndBackupPage>
                   }
 
                   final backupSettings = backupSnapshot.data;
-                  final isRemoteServer =
-                      backupSettings.backupProvider?.isRemoteServer;
+                  final isRemoteServer = (backupSettings != null &&
+                      backupSettings.backupProvider.isRemoteServer);
 
                   return ListView(
                     children: [

diff --git a/lib/widgets/enable_backup_dialog.dart b/lib/widgets/enable_backup_dialog.dart
@@ -48,7 +48,8 @@ class EnableBackupDialogState extends State<EnableBackupDialog> {
           }
 
           final backupSettings = snapshot.data;
-          bool isRemoteServer = backupSettings.backupProvider?.isRemoteServer;
+          bool isRemoteServer = (backupSettings != null &&
+              backupSettings.backupProvider.isRemoteServer);
 
           return AlertDialog(
             titlePadding: const EdgeInsets.fromLTRB(24.0, 22.0, 0.0, 16.0),