Update the SDK, minor version, handle API breaks (#1994)

ElementX/Sources/Screens/SecureBackup/SecureBackupLogoutConfirmationScreen/SecureBackupLogoutConfirmationScreenModels.swift

@@ -30,6 +30,15 @@ enum SecureBackupLogoutConfirmationScreenViewMode {
 
 struct SecureBackupLogoutConfirmationScreenViewState: BindableState {
     var mode: SecureBackupLogoutConfirmationScreenViewMode
+    var bindings = SecureBackupLogoutConfirmationScreenBindings()
+}
+
+struct SecureBackupLogoutConfirmationScreenBindings {
+    var alertInfo: AlertInfo<SecureBackupLogoutConfirmationScreenAlertType>?
+}
+
+enum SecureBackupLogoutConfirmationScreenAlertType {
+    case backupUploadFailed
 }
 
 enum SecureBackupLogoutConfirmationScreenViewAction {

ElementX/Sources/Screens/SecureBackup/SecureBackupLogoutConfirmationScreen/SecureBackupLogoutConfirmationScreenViewModel.swift

@@ -77,7 +77,18 @@ class SecureBackupLogoutConfirmationScreenViewModel: SecureBackupLogoutConfirmat
             state.mode = networkMonitor.reachabilityPublisher.value == .reachable ? .backupOngoing : .offline
             
             keyUploadWaitingTask = Task {
-                await secureBackupController.waitForKeyBackup()
+                var result = await secureBackupController.waitForKeyBackupUpload()
+                
+                if case .failure = result {
+                    // Retry the upload first, conditions might have changed.
+                    result = await secureBackupController.waitForKeyBackupUpload()
+                }
+                
+                guard case .success = result else {
+                    MXLog.error("Aborting logout due to failure waiting for backup upload.")
+                    state.bindings.alertInfo = .init(id: .backupUploadFailed)
+                    return
+                }
                 
                 guard !Task.isCancelled else { return }
                 

ElementX/Sources/Screens/SecureBackup/SecureBackupLogoutConfirmationScreen/View/SecureBackupLogoutConfirmationScreen.swift

@@ -33,6 +33,7 @@ struct SecureBackupLogoutConfirmationScreen: View {
             .toolbar { toolbar }
             .background(Color.compound.bgCanvasDefault.ignoresSafeArea())
             .safeAreaInset(edge: .bottom) { footer.padding() }
+            .alert(item: $context.alertInfo)
         }
     }