浏览代码

fixed welcomeController - progressalerthandler retain cycle

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

+ 5 - 14
deltachat-ios/Controller/WelcomeViewController.swift

@@ -17,12 +17,10 @@ class WelcomeViewController: UIViewController, ProgressAlertHandler {
 
 
     private lazy var welcomeView: WelcomeContentView = {
     private lazy var welcomeView: WelcomeContentView = {
         let view = WelcomeContentView()
         let view = WelcomeContentView()
-        view.onLogin = {
-            [unowned self] in
+        view.onLogin = { [unowned self] in
             self.coordinator?.showLogin()
             self.coordinator?.showLogin()
         }
         }
-        view.onScanQRCode = {
-            [unowned self] in
+        view.onScanQRCode  = { [unowned self] in
             self.showQRReader()
             self.showQRReader()
         }
         }
         view.translatesAutoresizingMaskIntoConstraints = false
         view.translatesAutoresizingMaskIntoConstraints = false
@@ -42,10 +40,6 @@ class WelcomeViewController: UIViewController, ProgressAlertHandler {
         }
         }
     }
     }
 
 
-    deinit {
-        print("WelcomeViewController deinit")
-    }
-    
     required init?(coder: NSCoder) {
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
         fatalError("init(coder:) has not been implemented")
     }
     }
@@ -69,9 +63,9 @@ class WelcomeViewController: UIViewController, ProgressAlertHandler {
 
 
     override func viewDidDisappear(_ animated: Bool) {
     override func viewDidDisappear(_ animated: Bool) {
         let nc = NotificationCenter.default
         let nc = NotificationCenter.default
-
         if let configureProgressObserver = self.configureProgressObserver {
         if let configureProgressObserver = self.configureProgressObserver {
             nc.removeObserver(configureProgressObserver)
             nc.removeObserver(configureProgressObserver)
+            self.configureProgressObserver = nil
         }
         }
     }
     }
 
 
@@ -108,15 +102,12 @@ class WelcomeViewController: UIViewController, ProgressAlertHandler {
 
 
     // MARK: - actions
     // MARK: - actions
 
 
-    private func showQRReader(completion onComplete: VoidFunction? = nil) {
-
+    private func showQRReader() {
         let qrReader = makeQRReader()
         let qrReader = makeQRReader()
         self.qrCordeReader = qrReader
         self.qrCordeReader = qrReader
         let nav = UINavigationController(rootViewController: qrReader)
         let nav = UINavigationController(rootViewController: qrReader)
         self.qrCodeReaderNav = nav
         self.qrCodeReaderNav = nav
-        present(nav, animated: true) {
-            onComplete?()
-        }
+        present(nav, animated: true)
     }
     }
 
 
     private func createAccountFromQRCode() {
     private func createAccountFromQRCode() {