From dc19529f102848ae37e46fcc3f6c768336e397cb Mon Sep 17 00:00:00 2001
From: Roopesh Chander <roop@roopc.net>
Date: Mon, 12 Nov 2018 16:04:03 +0530
Subject: [PATCH] Tunnels manager: Keep track of NETunnelProviderManager's
 isOnDemandEnabled property

---
 .../UI/iOS/TunnelsListTableViewController.swift       |  4 ++--
 WireGuard/WireGuard/VPN/TunnelsManager.swift          | 11 ++++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift b/WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift
index ba61743..af06eb6 100644
--- a/WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift
+++ b/WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift
@@ -226,10 +226,10 @@ class TunnelsListTableViewController: UIViewController {
 
     func refreshTunnelConnectionStatuses() {
         if let tunnelsManager = tunnelsManager {
-            tunnelsManager.refreshConnectionStatuses()
+            tunnelsManager.refreshStatuses()
         } else {
             onTunnelsManagerReady = { tunnelsManager in
-                tunnelsManager.refreshConnectionStatuses()
+                tunnelsManager.refreshStatuses()
             }
         }
     }
diff --git a/WireGuard/WireGuard/VPN/TunnelsManager.swift b/WireGuard/WireGuard/VPN/TunnelsManager.swift
index d75e6c0..935036d 100644
--- a/WireGuard/WireGuard/VPN/TunnelsManager.swift
+++ b/WireGuard/WireGuard/VPN/TunnelsManager.swift
@@ -158,6 +158,8 @@ class TunnelsManager {
                     tunnel.beginRestart()
                 }
 
+                tunnel.isActivateOnDemandEnabled = tunnelProviderManager.isOnDemandEnabled
+
                 completionHandler(nil)
             }
         }
@@ -215,9 +217,9 @@ class TunnelsManager {
         tunnel.startDeactivation()
     }
 
-    func refreshConnectionStatuses() {
+    func refreshStatuses() {
         for t in tunnels {
-            t.refreshConnectionStatus()
+            t.refreshStatus()
         }
     }
 }
@@ -225,6 +227,7 @@ class TunnelsManager {
 class TunnelContainer: NSObject {
     @objc dynamic var name: String
     @objc dynamic var status: TunnelStatus
+    @objc dynamic var isActivateOnDemandEnabled: Bool
 
     var onDeactivationComplete: (() -> Void)?
 
@@ -235,6 +238,7 @@ class TunnelContainer: NSObject {
         self.name = tunnel.localizedDescription ?? "Unnamed"
         let status = TunnelStatus(from: tunnel.connection.status)
         self.status = status
+        self.isActivateOnDemandEnabled = tunnel.isOnDemandEnabled
         self.tunnelProvider = tunnel
         super.init()
         if (status != .inactive) {
@@ -250,9 +254,10 @@ class TunnelContainer: NSObject {
         return ActivateOnDemandSetting(from: tunnelProvider)
     }
 
-    func refreshConnectionStatus() {
+    func refreshStatus() {
         let status = TunnelStatus(from: self.tunnelProvider.connection.status)
         self.status = status
+        self.isActivateOnDemandEnabled = self.tunnelProvider.isOnDemandEnabled
         if (status != .inactive) {
             startObservingTunnelStatus()
         }