Merge pull request #2 from pia-foss/add-preference-to-disconnect-on-sleep

Add preference to disconnect VPN on sleep

PIALibrary/Sources/Core/Persistence/PlainStore.swift

@@ -38,6 +38,8 @@ protocol PlainStore: class {
     
     var vpnType: String? { get set }
     
+    var vpnDisconnectsOnSleep: Bool { get set }
+    
     var vpnCustomConfigurationMaps: [String: [String: Any]]? { get set }
 
     // MARK: Preferences

PIALibrary/Sources/Library/Client+Preferences.swift

@@ -22,6 +22,8 @@ private protocol PreferencesStore: class {
 
     var vpnType: String { get set }
 
+    var vpnDisconnectsOnSleep: Bool { get set }
+    
     var vpnCustomConfigurations: [String: VPNCustomConfiguration] { get set }
 
     func vpnCustomConfiguration(for vpnType: String) -> VPNCustomConfiguration?
@@ -40,6 +42,7 @@ private extension PreferencesStore {
         isPersistentConnection = source.isPersistentConnection
         mace = source.mace
         vpnType = source.vpnType
+        vpnDisconnectsOnSleep = source.vpnDisconnectsOnSleep
         vpnCustomConfigurations = source.vpnCustomConfigurations
     }
 }
@@ -119,6 +122,16 @@ extension Client {
             }
         }
         
+        /// When device sleeps, disconnects from the VPN if `true`.
+        public fileprivate(set) var vpnDisconnectsOnSleep: Bool {
+            get {
+                return accessedDatabase.plain.vpnDisconnectsOnSleep
+            }
+            set {
+                accessedDatabase.plain.vpnDisconnectsOnSleep = newValue
+            }
+        }
+        
         /// A dictionary of custom VPN configurations, mapped by `VPNProfile.vpnType`.
         public fileprivate(set) var vpnCustomConfigurations: [String: VPNCustomConfiguration] {
             get {
@@ -186,6 +199,7 @@ extension Client.Preferences {
             isPersistentConnection = true
             mace = false
             vpnType = IPSecProfile.vpnType
+            vpnDisconnectsOnSleep = false
             vpnCustomConfigurations = [:]
         }
 
@@ -227,6 +241,9 @@ extension Client.Preferences {
         /// :nodoc:
         public var vpnType: String
         
+        /// :nodoc:
+        public var vpnDisconnectsOnSleep: Bool
+        
         /// :nodoc:
         public var vpnCustomConfigurations: [String: VPNCustomConfiguration]
 
@@ -255,6 +272,9 @@ extension Client.Preferences {
             if (isPersistentConnection != target.isPersistentConnection) {
                 queue.append(VPNActionReinstall())
             }
+            if (vpnDisconnectsOnSleep != target.vpnDisconnectsOnSleep) {
+                queue.append(VPNActionReinstall())
+            }
             if (mace != target.mace) {
                 queue.append(VPNActionReconnect())
             }

PIALibrary/Sources/Library/Persistence/UserDefaultsStore.swift

@@ -32,6 +32,8 @@ class UserDefaultsStore: PlainStore, ConfigurationAccess {
         
         static let vpnType = "VPNType"
         
+        static let vpnDisconnectsOnSleep = "VPNDisconnectsOnSleep"
+        
         static let vpnCustomConfigurationMaps = "VPNCustomConfigurationMaps"
 
         static let persistentConnection = "PersistentConnection" // legacy
@@ -186,6 +188,15 @@ class UserDefaultsStore: PlainStore, ConfigurationAccess {
         }
     }
     
+    var vpnDisconnectsOnSleep: Bool {
+        get {
+            return backend.bool(forKey: Entries.vpnDisconnectsOnSleep)
+        }
+        set {
+            backend.set(newValue, forKey: Entries.vpnDisconnectsOnSleep)
+        }
+    }
+    
     var vpnCustomConfigurationMaps: [String: [String : Any]]? {
         get {
             return backend.dictionary(forKey: Entries.vpnCustomConfigurationMaps) as? [String: [String: Any]]

PIALibrary/Sources/Library/VPN/DefaultVPNProvider.swift

@@ -262,7 +262,7 @@ class DefaultVPNProvider: VPNProvider, ConfigurationAccess, DatabaseAccess, Pref
             server: accessedProviders.serverProvider.targetServer,
             port: port,
             isOnDemand: accessedPreferences.isPersistentConnection,
-            disconnectsOnSleep: false,
+            disconnectsOnSleep: accessedPreferences.vpnDisconnectsOnSleep,
             customConfiguration: customConfiguration
         )
     }

PIALibraryTests/VPNTests.swift

@@ -17,6 +17,7 @@ class VPNTests: XCTestCase {
 
         Client.database = Client.Database(group: "group.com.privateinternetaccess")
         Client.providers.vpnProvider = MockVPNProvider()
+        Client.preferences.vpnDisconnectsOnSleep = true
         Client.bootstrap()
     }