Merge pull request #22 from ivpn/task/IOS-697-unneeded-notificationce…

…nter-removal-violation Task/IOS-697 Unneeded NotificationCenter Removal Violation
ivpn · Oct 8, 2020 · 42adf72 · 42adf72
2 parents 50ae924 + 2aa2999
commit 42adf72
Show file tree

Hide file tree

Showing 11 changed files with 1 addition and 99 deletions.
diff --git a/IVPNClient/Managers/VPNErrorObserver.swift b/IVPNClient/Managers/VPNErrorObserver.swift
@@ -42,7 +42,6 @@ class VPNErrorObserver {
     }
 
     deinit {
-        NotificationCenter.default.removeObserver(self, name: Notification.Name.VPNConnectError, object: nil)
         wireguardErrorObserver?.invalidate()
         wireguardErrorObserver = nil
     }

diff --git a/IVPNClient/Scenes/AccountScreen/AccountViewController.swift b/IVPNClient/Scenes/AccountScreen/AccountViewController.swift
@@ -69,20 +69,12 @@ class AccountViewController: UITableViewController {
         accountView.initQRCode(viewModel: viewModel)
     }
 
-    deinit {
-        removeObservers()
-    }
-
     // MARK: - Observers -
 
     func addObservers() {
         NotificationCenter.default.addObserver(self, selector: #selector(subscriptionActivated), name: Notification.Name.SubscriptionActivated, object: nil)
     }
 
-    func removeObservers() {
-        NotificationCenter.default.removeObserver(self, name: Notification.Name.SubscriptionActivated, object: nil)
-    }
-
     // MARK: - Private methods -
 
     private func initNavigationBar() {

diff --git a/IVPNClient/Scenes/MainScreen/ControlPanel/ControlPanelViewController.swift b/IVPNClient/Scenes/MainScreen/ControlPanel/ControlPanelViewController.swift
@@ -142,10 +142,6 @@ class ControlPanelViewController: UITableViewController {
         NotificationCenter.default.removeObserver(self, name: Notification.Name.PingDidComplete, object: nil)
     }
 
-    deinit {
-        removeObservers()
-    }
-
     // MARK: - Gestures -
 
     private func setupGestureRecognizers() {
@@ -372,21 +368,6 @@ class ControlPanelViewController: UITableViewController {
         NotificationCenter.default.addObserver(self, selector: #selector(protocolSelected), name: Notification.Name.ProtocolSelected, object: nil)
     }
 
-    private func removeObservers() {
-        NotificationCenter.default.removeObserver(self, name: Notification.Name.UpdateControlPanel, object: nil)
-        NotificationCenter.default.removeObserver(self, name: Notification.Name.ServerSelected, object: nil)
-        NotificationCenter.default.removeObserver(self, name: Notification.Name.Connect, object: nil)
-        NotificationCenter.default.removeObserver(self, name: Notification.Name.Disconnect, object: nil)
-        NotificationCenter.default.removeObserver(self, name: Notification.Name.AuthenticationDismissed, object: nil)
-        NotificationCenter.default.removeObserver(self, name: Notification.Name.SubscriptionDismissed, object: nil)
-        NotificationCenter.default.removeObserver(self, name: Notification.Name.ServiceAuthorized, object: nil)
-        NotificationCenter.default.removeObserver(self, name: Notification.Name.SubscriptionActivated, object: nil)
-        NotificationCenter.default.removeObserver(self, name: Notification.Name.NewSession, object: nil)
-        NotificationCenter.default.removeObserver(self, name: Notification.Name.ForceNewSession, object: nil)
-        NotificationCenter.default.removeObserver(self, name: Notification.Name.ProtocolSelected, object: nil)
-        NotificationCenter.default.removeObserver(self, name: Notification.Name.TermsOfServiceAgreed, object: nil)
-    }
-
     // MARK: - Private methods -
 
     private func initView() {

diff --git a/IVPNClient/Scenes/MainScreen/MainViewController.swift b/IVPNClient/Scenes/MainScreen/MainViewController.swift
@@ -84,7 +84,6 @@ class MainViewController: UIViewController {
     }
 
     deinit {
-        removeObservers()
         updateServersTimer.invalidate()
         Application.shared.connectionManager.removeStatusChangeUpdates()
     }
@@ -172,12 +171,6 @@ class MainViewController: UIViewController {
         NotificationCenter.default.addObserver(self, selector: #selector(subscriptionActivated), name: Notification.Name.SubscriptionActivated, object: nil)
     }
 
-    private func removeObservers() {
-        NotificationCenter.default.removeObserver(self, name: Notification.Name.UpdateFloatingPanelLayout, object: nil)
-        NotificationCenter.default.removeObserver(self, name: Notification.Name.VPNConfigurationDisabled, object: nil)
-        NotificationCenter.default.removeObserver(self, name: Notification.Name.SubscriptionActivated, object: nil)
-    }
-
     // MARK: - Private methods -
 
     @objc private func updateFloatingPanelLayout() {

diff --git a/IVPNClient/Scenes/MainScreen/Map/MapMarkerView.swift b/IVPNClient/Scenes/MainScreen/Map/MapMarkerView.swift
@@ -106,10 +106,6 @@ class MapMarkerView: UIView {
         super.updateConstraints()
     }
 
-    deinit {
-        removeObservers()
-    }
-
     // MARK: - Methods -
 
     func updateCircles(color: UIColor) {
@@ -166,16 +162,6 @@ class MapMarkerView: UIView {
         }
     }
 
-    private func removeObservers() {
-        NotificationCenter.default.removeObserver(self, name: Notification.Name.HideConnectionInfoPopup, object: nil)
-
-        if #available(iOS 13.0, *) {
-            NotificationCenter.default.removeObserver(self, name: UIScene.didActivateNotification, object: nil)
-        } else {
-            NotificationCenter.default.removeObserver(self, name: UIApplication.didBecomeActiveNotification, object: nil)
-        }
-    }
-
     // MARK: - Private methods -
 
     private func setupConstraints() {

diff --git a/IVPNClient/Scenes/MainScreen/Map/MapScrollView.swift b/IVPNClient/Scenes/MainScreen/Map/MapScrollView.swift
@@ -72,10 +72,6 @@ class MapScrollView: UIScrollView {
         addObservers()
     }
 
-    deinit {
-        removeObservers()
-    }
-
     // MARK: - Methods -
 
     func setupConstraints() {
@@ -147,12 +143,6 @@ class MapScrollView: UIScrollView {
         NotificationCenter.default.addObserver(self, selector: #selector(hideConnectToServerPopup), name: Notification.Name.HideConnectToServerPopup, object: nil)
     }
 
-    private func removeObservers() {
-        NotificationCenter.default.removeObserver(self, name: Notification.Name.ServerSelected, object: nil)
-        NotificationCenter.default.removeObserver(self, name: Notification.Name.PingDidComplete, object: nil)
-        NotificationCenter.default.removeObserver(self, name: Notification.Name.HideConnectToServerPopup, object: nil)
-    }
-
     private func initGestures() {
         let tap = UITapGestureRecognizer(target: self, action: #selector(handleTap))
         addGestureRecognizer(tap)

diff --git a/IVPNClient/Scenes/MainScreen/View/MainView.swift b/IVPNClient/Scenes/MainScreen/View/MainView.swift
@@ -65,10 +65,6 @@ class MainView: UIView {
         }
     }
 
-    deinit {
-        removeObservers()
-    }
-
     // MARK: - Methods -
 
     func setupView(animated: Bool = true) {
@@ -99,10 +95,6 @@ class MainView: UIView {
         NotificationCenter.default.addObserver(self, selector: #selector(centerMap), name: Notification.Name.CenterMap, object: nil)
     }
 
-    private func removeObservers() {
-        NotificationCenter.default.removeObserver(self, name: Notification.Name.CenterMap, object: nil)
-    }
-
     private func initSettingsAction() {
         let settingsButton = UIButton()
         addSubview(settingsButton)

diff --git a/IVPNClient/Scenes/Signup/LoginViewController.swift b/IVPNClient/Scenes/Signup/LoginViewController.swift
@@ -122,10 +122,6 @@ class LoginViewController: UIViewController {
         }
     }
 
-    deinit {
-        removeObservers()
-    }
-
     // MARK: - Observers -
 
     func addObservers() {
@@ -134,14 +130,6 @@ class LoginViewController: UIViewController {
         NotificationCenter.default.addObserver(self, selector: #selector(termsOfServiceAgreed), name: Notification.Name.TermsOfServiceAgreed, object: nil)
     }
 
-    func removeObservers() {
-        NotificationCenter.default.removeObserver(self, name: Notification.Name.SubscriptionDismissed, object: nil)
-        NotificationCenter.default.removeObserver(self, name: Notification.Name.SubscriptionActivated, object: nil)
-        NotificationCenter.default.removeObserver(self, name: Notification.Name.NewSession, object: nil)
-        NotificationCenter.default.removeObserver(self, name: Notification.Name.ForceNewSession, object: nil)
-        NotificationCenter.default.removeObserver(self, name: Notification.Name.TermsOfServiceAgreed, object: nil)
-    }
-
     @objc func newSession() {
         startLoginProcess()
     }

diff --git a/IVPNClient/Scenes/Signup/Scanner/ScannerViewController.swift b/IVPNClient/Scenes/Signup/Scanner/ScannerViewController.swift
@@ -67,10 +67,6 @@ class ScannerViewController: UIViewController, AVCaptureMetadataOutputObjectsDel
         stopCaptureSession()
     }
 
-    deinit {
-       NotificationCenter.default.removeObserver(self, name: UIDevice.orientationDidChangeNotification, object: nil)
-    }
-
     // MARK: - Orientation -
 
     override var supportedInterfaceOrientations: UIInterfaceOrientationMask {
@@ -164,7 +160,7 @@ class ScannerViewController: UIViewController, AVCaptureMetadataOutputObjectsDel
     }
 
     private func allowCameraAccessViaSetting() {
-        showActionAlert(title: "Allow Camera", message: "Camera access is required to scan QR code", action: "Open Settings", actionHandler:  { _ in
+        showActionAlert(title: "Allow Camera", message: "Camera access is required to scan QR code", action: "Open Settings", actionHandler: { _ in
             if let url = URL(string: UIApplication.openSettingsURLString) {
                 UIApplication.shared.open(url)
             }

diff --git a/IVPNClient/Scenes/ViewControllers/NetworkProtectionViewController.swift b/IVPNClient/Scenes/ViewControllers/NetworkProtectionViewController.swift
@@ -51,10 +51,6 @@ class NetworkProtectionViewController: UITableViewController {
         NotificationCenter.default.addObserver(self, selector: #selector(loadHandler), name: Notification.Name.NetworkSaved, object: nil)
     }
 
-    deinit {
-        NotificationCenter.default.removeObserver(self)
-    }
-
     // MARK: - Interface Orientations -
 
     override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {

diff --git a/IVPNClient/Scenes/ViewControllers/SettingsViewController.swift b/IVPNClient/Scenes/ViewControllers/SettingsViewController.swift
@@ -236,10 +236,6 @@ class SettingsViewController: UITableViewController {
         NotificationCenter.default.removeObserver(self, name: Notification.Name.PingDidComplete, object: nil)
     }
 
-    deinit {
-        removeObservers()
-    }
-
     // MARK: - Segues -
 
     override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
@@ -304,13 +300,6 @@ class SettingsViewController: UITableViewController {
         NotificationCenter.default.addObserver(self, selector: #selector(authenticationDismissed), name: Notification.Name.AuthenticationDismissed, object: nil)
     }
 
-    func removeObservers() {
-        NotificationCenter.default.removeObserver(self, name: Notification.Name.TurnOffMultiHop, object: nil)
-        NotificationCenter.default.removeObserver(self, name: Notification.Name.TermsOfServiceAgreed, object: nil)
-        NotificationCenter.default.removeObserver(self, name: Notification.Name.ServiceAuthorized, object: nil)
-        NotificationCenter.default.removeObserver(self, name: Notification.Name.AuthenticationDismissed, object: nil)
-    }
-
     @objc func turnOffMultiHop() {
         UserDefaults.shared.set(false, forKey: UserDefaults.Key.isMultiHop)
         multiHopSwitch.setOn(false, animated: false)