浏览代码

cleanup unconfigured dc_contexts if user repeatedly triggers account encryption

cyberta 3 年之前
父节点
当前提交
1b7fa18cc0
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      deltachat-ios/Controller/WelcomeViewController.swift

+ 2 - 2
deltachat-ios/Controller/WelcomeViewController.swift

@@ -174,7 +174,7 @@ class WelcomeViewController: UIViewController, ProgressAlertHandler {
     }
     }
 
 
     private func switchToEncrypted(_ action: UIAlertAction) {
     private func switchToEncrypted(_ action: UIAlertAction) {
-        let lastContextId = dcContext.id
+        let lastContextId = dcAccounts.getSelected().id
         let newContextId = dcAccounts.addClosedAccount()
         let newContextId = dcAccounts.addClosedAccount()
         _ = dcAccounts.remove(id: lastContextId)
         _ = dcAccounts.remove(id: lastContextId)
         _ = dcAccounts.select(id: newContextId)
         _ = dcAccounts.select(id: newContextId)
@@ -202,7 +202,7 @@ class WelcomeViewController: UIViewController, ProgressAlertHandler {
         if !selectedAccount.isConfigured() {
         if !selectedAccount.isConfigured() {
             _ = dcAccounts.remove(id: selectedAccount.id)
             _ = dcAccounts.remove(id: selectedAccount.id)
             if self.dcAccounts.getAll().isEmpty {
             if self.dcAccounts.getAll().isEmpty {
-                _ = self.dcAccounts.addClosedAccount()
+                _ = self.dcAccounts.add()
             }
             }
         }
         }