Merge branch 'fix/auto-delete-logic-issue' into 'release/4.9.0'

Fix logic issue preventing auto delete to be enabled See merge request ProtonMail/protonmail-ios!3488 Changelog:
ProtonMail · Oct 17, 2023 · b23fafe · b23fafe
2 parents 6b76d5a + 52876f6
commit b23fafe
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/.../ProtonMail/ViewControllers/APP/Mailbox/MailboxViewController/MailboxViewController.swift b/.../ProtonMail/ViewControllers/APP/Mailbox/MailboxViewController/MailboxViewController.swift
@@ -2557,7 +2557,9 @@ extension MailboxViewController {
             promptBanner.enableButtonAction = { [weak self] in
                 guard let self else { return }
                 let alert = self.viewModel.alertToConfirmEnabling { [weak self] error in
-                    if error == nil {
+                    if let error {
+                        PMAssertionFailure(error)
+                    } else {
                         self?.viewModel.user.isAutoDeleteEnabled = true
                         self?.tableView.reloadData()
                     }
@@ -2566,8 +2568,12 @@ extension MailboxViewController {
             }
             promptBanner.noThanksButtonAction = { [weak self] in
                 guard let self else { return }
-                self.viewModel.updateAutoDeleteSetting(to: false, for: self.viewModel.user, completion: { [weak self] error in
-                    if error == nil {
+                self.viewModel.updateAutoDeleteSetting(to: false, 
+                                                       for: self.viewModel.user,
+                                                       completion: { [weak self] error in
+                    if let error {
+                        PMAssertionFailure(error)
+                    } else {
                         self?.viewModel.user.isAutoDeleteEnabled = false
                         self?.tableView.reloadData()
                     }

diff --git a/...onMail/ViewControllers/APP/Mailbox/MailboxViewController/ViewModel/MailboxViewModel.swift b/...onMail/ViewControllers/APP/Mailbox/MailboxViewController/ViewModel/MailboxViewModel.swift
@@ -1232,13 +1232,13 @@ extension MailboxViewModel {
         let alert = L11n.AutoDeleteSettings.enableAlertMessage.alertController()
         alert.title = L11n.AutoDeleteSettings.enableAlertTitle
         let cancelTitle = LocalString._general_cancel_button
-        let confirm = UIAlertAction(title: L11n.AutoDeleteSettings.enableAlertButton, style: .default) { _ in }
-        let cancel = UIAlertAction(title: cancelTitle, style: .cancel) { [weak self] _ in
+        let confirm = UIAlertAction(title: L11n.AutoDeleteSettings.enableAlertButton, style: .default) { [weak self] _ in
             guard let self else { return }
             self.updateAutoDeleteSetting(to: true, for: self.user, completion: { error in
                 completion(error)
             })
         }
+        let cancel = UIAlertAction(title: cancelTitle, style: .cancel) { _ in }
         [confirm, cancel].forEach(alert.addAction)
         return alert
     }