Fix VPN state when app re-launch

oschanger · Jan 5, 2017 · f66ba5f · f66ba5f
1 parent 7d556af
commit f66ba5f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/PacketTunnel/PacketTunnelProvider.m b/PacketTunnel/PacketTunnelProvider.m
@@ -63,6 +63,7 @@ - (void)setupWormhole {
         [weakSelf.wormhole passMessageObject:@"ok" identifier:@"tunnelStatus"];
     }];
     [self.wormhole listenForMessageWithIdentifier:@"stopTunnel" listener:^(id  _Nullable messageObject) {
+        NSLog(@"received message: stopTunnel");
         [weakSelf stop];
     }];
     [self.wormhole listenForMessageWithIdentifier:@"getTunnelConnectionRecords" listener:^(id  _Nullable messageObject) {

diff --git a/Potatso/HomeVC.swift b/Potatso/HomeVC.swift
@@ -31,7 +31,8 @@ class HomeVC: FormViewController, UINavigationControllerDelegate, HomePresenterP
     }
 
     override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: NSBundle?) {
-        self.status = .Off
+        self.status = Manager.sharedManager.vpnStatus
+        print ("HomeVC.init: ", self.status.rawValue)
         super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
         presenter.bindToVC(self)
         presenter.delegate = self
@@ -52,7 +53,7 @@ class HomeVC: FormViewController, UINavigationControllerDelegate, HomePresenterP
         self.navigationItem.titleView = titleButton
         // Post an empty message so we could attach to packet tunnel process
         Manager.sharedManager.postMessage()
-        handleRefreshUI(nil)
+//        handleRefreshUI(nil)
         updateForm()
         navigationItem.leftBarButtonItem = UIBarButtonItem(image: "List".templateImage, style: .Plain, target: presenter, action: #selector(HomePresenter.chooseConfigGroups))
         navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .Add, target: self, action: #selector(addProxy(_:)))
@@ -182,16 +183,24 @@ class HomeVC: FormViewController, UINavigationControllerDelegate, HomePresenterP
 
     func generateProxySection() -> Section {
         let proxySection = Section("Connect".localized())
+        var reloading = true
 
         proxySection <<< SwitchRow("connection") {
+            reloading = true
             $0.title = status.hintDescription
             $0.value = status.onOrConnectiong
+            reloading = false
             }.onChange({ [unowned self] (row) in
+                if reloading {
+                    return
+                }
                 self.handleConnectButtonPressed()
                 })
             .cellUpdate ({ cell, row in
+                reloading = true
                 row.title = self.status.hintDescription
                 row.value = self.status.onOrConnectiong
+                reloading = false
             })
         <<< TextRow(kFormDNS) {
             $0.title = "DNS".localized()
@@ -213,7 +222,7 @@ class HomeVC: FormViewController, UINavigationControllerDelegate, HomePresenterP
                     var count = 0
                     if ruleSet.ruleCount > 0 {
                         count = ruleSet.ruleCount
-                    }else {
+                    } else {
                         count = ruleSet.rules.count
                     }
                     if count > 1 {

diff --git a/PotatsoLibrary/Manager.swift b/PotatsoLibrary/Manager.swift
@@ -19,7 +19,7 @@ public enum ManagerError: ErrorType {
     case VPNStartFail
 }
 
-public enum VPNStatus {
+public enum VPNStatus : Int {
     case Off
     case Connecting
     case On
@@ -54,9 +54,14 @@ public class Manager {
         loadProviderManager { (manager) -> Void in
             if let manager = manager {
                 self.updateVPNStatus(manager)
+                if self.vpnStatus == .On {
+                    self.observerAdded = true
+                    NSNotificationCenter.defaultCenter().addObserverForName(NEVPNStatusDidChangeNotification, object: manager.connection, queue: NSOperationQueue.mainQueue(), usingBlock: { [unowned self] (notification) -> Void in
+                        self.updateVPNStatus(manager)
+                        })
+                }
             }
         }
-        addVPNStatusObserver()
     }
 
     func addVPNStatusObserver() {
@@ -78,6 +83,7 @@ public class Manager {
     }
 
     func updateVPNStatus(manager: NEVPNManager) {
+        print("updateVPNStatus:", manager.connection.status.rawValue)
         switch manager.connection.status {
         case .Connected:
             self.vpnStatus = .On