Browse Source

updated AccountSetupController

nayooti 5 years ago
parent
commit
2fdeabe991

+ 2 - 1
deltachat-ios/Controller/AccountSetupController.swift

@@ -73,7 +73,7 @@ class AccountSetupController: UITableViewController, ProgressAlertHandler {
 
     // MARK: - the progress dialog
 
-    var progressAlert: UIAlertController?
+    weak var progressAlert: UIAlertController?
 
     // MARK: - cells
 
@@ -370,6 +370,7 @@ class AccountSetupController: UITableViewController, ProgressAlertHandler {
 
     override func viewWillDisappear(_ animated: Bool) {
         resignFirstResponderOnAllCells()
+        configureProgressObserver = nil
     }
 
     override func viewDidDisappear(_: Bool) {

+ 3 - 1
deltachat-ios/Controller/EditSettingsController.swift

@@ -62,7 +62,9 @@ class EditSettingsController: UITableViewController, MediaPickerDelegate {
     override func viewDidLoad() {
         super.viewDidLoad()
         title = String.localized("pref_profile_info_headline")
-        avatarSelectionCell.onAvatarTapped = onAvatarTapped
+        avatarSelectionCell.onAvatarTapped = { [unowned self] in
+            self.onAvatarTapped()
+        }
     }
 
     override func viewWillDisappear(_ animated: Bool) {

+ 0 - 5
deltachat-ios/Controller/QrCodeReaderController.swift

@@ -28,15 +28,10 @@ class QrCodeReaderController: UIViewController {
         return UIBarButtonItem(title: String.localized("cancel"), style: .done, target: self, action: #selector(closeButtonPressed(_:)))
     }()
 
-
     private let supportedCodeTypes = [
         AVMetadataObject.ObjectType.qr
     ]
 
-    deinit {
-        print("QrCodeReaderController deinit")
-    }
-
     // MARK: - lifecycle
     override func viewDidLoad() {
         super.viewDidLoad()

+ 0 - 1
deltachat-ios/Controller/WelcomeViewController.swift

@@ -29,7 +29,6 @@ class WelcomeViewController: UIViewController, ProgressAlertHandler {
 
     private var qrCordeReader: QrCodeReaderController?
     private var qrCodeReaderNav: UINavigationController?
-
     weak var progressAlert: UIAlertController?
 
     init(dcContext: DcContext) {

+ 2 - 2
deltachat-ios/Handler/ProgressAlertHandler.swift

@@ -2,8 +2,8 @@ import UIKit
 import DcCore
 
 protocol ProgressAlertHandler: UIViewController {
-    var progressAlert: UIAlertController? { get set }
-    var configureProgressObserver: Any? { get set }
+    var progressAlert: UIAlertController? { get set }   // needs to be implemented as weak
+    var configureProgressObserver: Any? { get set } // set to nil in viewDidDisappear
     func showProgressAlert(title: String, dcContext: DcContext)
     func updateProgressAlertValue(value: Int?)
     func updateProgressAlert(error: String?)