From ec543ac2252940ca4bbe67036c1da61937e212aa Mon Sep 17 00:00:00 2001
From: ruben beck <ruben.beck@pm.me>
Date: Wed, 4 Oct 2023 10:13:57 +0200
Subject: [PATCH 1/2] fix null issue

---
 .../security_and_backup/security_and_backup_page.dart         | 4 ++--
 lib/widgets/enable_backup_dialog.dart                         | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

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
index c6ba74e19..d4b45ff27 100644
--- 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
index 95ee71a15..08249b473 100644
--- 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),

From 17d036e9c0aafa43d33491c61b3dfdd64dc25a04 Mon Sep 17 00:00:00 2001
From: ruben beck <ruben.beck@pm.me>
Date: Wed, 4 Oct 2023 11:00:38 +0200
Subject: [PATCH 2/2] bump ios version

---
 ios/Runner/Info.plist | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index 8436bbbdb..133e3a5d0 100644
--- 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>