renamed observer

deltachat-ios/Controller/AccountSetupController.swift

@@ -9,7 +9,7 @@ class AccountSetupController: UITableViewController, ProgressAlertHandler {
     private let dcContext: DcContext
     private var skipOauth = false
     private var backupProgressObserver: Any?
-    var configureProgressObserver: Any?
+    var progressObserver: Any?
     var onProgressSuccess: VoidFunction? // not needed here
 
     private var oauth2Observer: Any?
@@ -370,7 +370,7 @@ class AccountSetupController: UITableViewController, ProgressAlertHandler {
 
     override func viewWillDisappear(_ animated: Bool) {
         resignFirstResponderOnAllCells()
-        configureProgressObserver = nil
+        progressObserver = nil
     }
 
     override func viewDidDisappear(_: Bool) {
@@ -379,7 +379,7 @@ class AccountSetupController: UITableViewController, ProgressAlertHandler {
         if let backupProgressObserver = self.backupProgressObserver {
             nc.removeObserver(backupProgressObserver)
         }
-        if let configureProgressObserver = self.configureProgressObserver {
+        if let configureProgressObserver = self.progressObserver {
             nc.removeObserver(configureProgressObserver)
         }
         if let oauth2Observer = self.oauth2Observer {
@@ -652,7 +652,7 @@ class AccountSetupController: UITableViewController, ProgressAlertHandler {
 
     private func addProgressHudLoginListener() {
         let nc = NotificationCenter.default
-        configureProgressObserver = nc.addObserver(
+        progressObserver = nc.addObserver(
             forName: dcNotificationConfigureProgress,
             object: nil,
             queue: nil

deltachat-ios/Controller/QrPageController.swift

@@ -4,8 +4,9 @@ import DcCore
 class QrPageController: UIPageViewController, ProgressAlertHandler {
 
     weak var coordinator: QrViewCoordinator?
-
     private let dcContext: DcContext
+    weak var progressAlert: UIAlertController?
+    var progressObserver: Any?
 
     private var selectedIndex: Int = 0
 
@@ -17,9 +18,6 @@ class QrPageController: UIPageViewController, ProgressAlertHandler {
         return control
     }()
 
-    weak var progressAlert: UIAlertController?
-    var configureProgressObserver: Any?
-
     init(dcContext: DcContext) {
         self.dcContext = dcContext
         super.init(transitionStyle: .scroll, navigationOrientation: .horizontal, options: [:])
@@ -46,7 +44,7 @@ class QrPageController: UIPageViewController, ProgressAlertHandler {
     }
 
     override func viewWillDisappear(_ animated: Bool) {
-        self.configureProgressObserver = nil
+        self.progressObserver = nil
     }
 
     // MARK: - actions
@@ -218,7 +216,7 @@ extension QrPageController: QrCodeReaderDelegate {
 
     private func addSecureJoinProgressListener() {
         let nc = NotificationCenter.default
-        configureProgressObserver = nc.addObserver(
+        progressObserver = nc.addObserver(
             forName: dcNotificationSecureJoinerProgress,
             object: nil,
             queue: nil
@@ -238,8 +236,8 @@ extension QrPageController: QrCodeReaderDelegate {
 
     private func removeSecureJoinProgressListener() {
         let nc = NotificationCenter.default
-        if let secureJoinObserver = self.configureProgressObserver {
-            nc.removeObserver(secureJoinObserver)
+        if let observer = self.progressObserver {
+            nc.removeObserver(observer)
         }
     }
 

deltachat-ios/Controller/WelcomeViewController.swift

@@ -6,7 +6,7 @@ class WelcomeViewController: UIViewController, ProgressAlertHandler {
     weak var coordinator: WelcomeCoordinator?
     private let dcContext: DcContext
     private var scannedQrCode: String?
-    var configureProgressObserver: Any?
+    var progressObserver: Any?
     var onProgressSuccess: VoidFunction?
 
     private lazy var scrollView: UIScrollView = {
@@ -62,9 +62,9 @@ class WelcomeViewController: UIViewController, ProgressAlertHandler {
 
     override func viewDidDisappear(_ animated: Bool) {
         let nc = NotificationCenter.default
-        if let configureProgressObserver = self.configureProgressObserver {
-            nc.removeObserver(configureProgressObserver)
-            self.configureProgressObserver = nil
+        if let observer = self.progressObserver {
+            nc.removeObserver(observer)
+            self.progressObserver = nil
         }
     }
 

deltachat-ios/Handler/ProgressAlertHandler.swift

@@ -3,7 +3,7 @@ import DcCore
 
 protocol ProgressAlertHandler: UIViewController {
     var progressAlert: UIAlertController? { get set }   // needs to be implemented as weak
-    var configureProgressObserver: Any? { get set } // set to nil in viewDidDisappear
+    var progressObserver: Any? { get set } // set to nil in viewDidDisappear
     func showProgressAlert(title: String, dcContext: DcContext)
     func updateProgressAlertValue(value: Int?)
     func updateProgressAlert(error: String?)
@@ -60,7 +60,7 @@ extension ProgressAlertHandler {
 
     func addProgressAlertListener(onSuccess: @escaping VoidFunction) {
         let nc = NotificationCenter.default
-        configureProgressObserver = nc.addObserver(
+        progressObserver = nc.addObserver(
             forName: dcNotificationConfigureProgress,
             object: nil,
             queue: nil