Revert "KM-16549: remove Reachability library (#366)"

This reverts commit e528d19.

Author: kp-mario-nachbaur

LocalPackages/PIALibrary/Package.swift

@@ -26,14 +26,16 @@ let package = Package(
         .package(url: "git@github.com:pia-foss/mobile-ios-openvpn.git", exact: "2.2.6"),
         .package(url: "git@github.com:pia-foss/mobile-ios-wireguard.git", exact: "1.0.6"),
         .package(url: "https://github.com/apple/swift-algorithms", exact: "1.2.1"),
-        .package(url: "https://github.com/apple/swift-log", exact: "1.13.1")
+        .package(url: "https://github.com/apple/swift-log", exact: "1.13.1"),
+        .package(url: "https://github.com/ashleymills/Reachability.swift.git", exact: "5.2.4")
     ],
     targets: [
         .target(
             name: "PIALibrary",
             dependencies: [
                 .product(name: "Algorithms", package: "swift-algorithms"),
                 .product(name: "Logging", package: "swift-log"),
+                .product(name: "Reachability", package: "Reachability.swift"),
                 .product(name: "PIAKPI", package: "PIAKPI"),
                 .product(name: "PIACSI", package: "PIACSI"),
                 .product(name: "PIARegions", package: "PIARegions"),

LocalPackages/PIALibrary/README.md

@@ -302,6 +302,7 @@ This project is licensed under the [MIT (Expat) license](https://choosealicense.
 
 ## Acknowledgements
 
+- ReachabilitySwift - © 2016 Ashley Mills
 - TunnelKit - © 2018 - Present Davide de Rosa (https://github.com/passepartoutvpn/tunnelkit) - TunnelKit is not MIT software and remains under the terms of the GPL license (https://github.com/passepartoutvpn/tunnelkit/blob/master/LICENSE)
 
 [pia-image]: https://www.privateinternetaccess.com/assets/PIALogo2x-0d1e1094ac909ea4c93df06e2da3db4ee8a73d8b2770f0f7d768a8603c62a82f.png

LocalPackages/PIALibrary/Sources/PIALibrary/Daemons/ConnectivityDaemon.swift

@@ -21,6 +21,7 @@
 //
 
 import Foundation
+import Reachability
 
 private let log = PIALogger.logger(for: ConnectivityDaemon.self)
 
@@ -38,7 +39,7 @@ final class ConnectivityDaemon: Daemon, ConfigurationAccess, DatabaseAccess, Pre
 
     private(set) var hasEnabledUpdates: Bool = false
 
-    private let networkObserver = NetworkObserver()
+    private let reachability = try! Reachability(hostname: "8.8.8.8")
 
     private lazy var checker = ConnectivityChecker(webServices: accessedWebServices)
 
@@ -57,7 +58,7 @@ final class ConnectivityDaemon: Daemon, ConfigurationAccess, DatabaseAccess, Pre
 
         let nc = NotificationCenter.default
         nc.addObserver(self, selector: #selector(vpnStatusDidChange(notification:)), name: .PIADaemonsDidUpdateVPNStatus, object: nil)
-        startNetworkObserver()
+        startReachability()
     }
 
     func enableUpdates() {
@@ -69,13 +70,12 @@ final class ConnectivityDaemon: Daemon, ConfigurationAccess, DatabaseAccess, Pre
         checkConnectivityOrRetry()
     }
 
-    private func startNetworkObserver() {
-        log.debug("Configuring for network observer...")
-        accessedDatabase.transient.isNetworkReachable = networkObserver.isReachable
+    private func startReachability() {
+        log.debug("Configuring for reachability...")
+        accessedDatabase.transient.isNetworkReachable = (reachability.connection != .unavailable)
         log.debug("Initial network state is \(accessedDatabase.transient.isNetworkReachable ? "REACHABLE" : "NOT REACHABLE")")
 
-        networkObserver.whenReachable = { [weak self] in
-            guard let self else { return }
+        reachability.whenReachable = { (reach) in
             DispatchQueue.main.async {
                 guard !self.accessedDatabase.transient.isNetworkReachable else {
                     if (self.accessedDatabase.transient.vpnStatus != .connected) {
@@ -88,8 +88,7 @@ final class ConnectivityDaemon: Daemon, ConfigurationAccess, DatabaseAccess, Pre
                 Macros.postNotification(.ConnectivityDaemonDidGetReachable)
             }
         }
-        networkObserver.whenUnreachable = { [weak self] in
-            guard let self else { return }
+        reachability.whenUnreachable = { (reach) in
             DispatchQueue.main.async {
                 guard self.accessedDatabase.transient.vpnStatus != .connecting else {
                     // while connecting we are unreachable, but expected, skip reporting
@@ -103,9 +102,9 @@ final class ConnectivityDaemon: Daemon, ConfigurationAccess, DatabaseAccess, Pre
                 Macros.postNotification(.ConnectivityDaemonDidGetUnreachable)
             }
         }
+        try? reachability.startNotifier()
 
-        networkObserver.start()
-        log.debug("Network observer started")
+        log.debug("Reachability notifier started")
     }
 
     private func checkConnectivityOrRetry() {

LocalPackages/PIALibrary/Sources/PIALibrary/Daemons/NetworkObserver.swift

@@ -4,6 +4,14 @@
 <dict>
 	<key>Licenses</key>
 	<array>
+		<dict>
+			<key>Name</key>
+			<string>ReachabilitySwift</string>
+			<key>Copyright</key>
+			<string>Copyright (c) 2016 Ashley Mills</string>
+			<key>LicenseURL</key>
+			<string>https://raw.githubusercontent.com/ashleymills/Reachability.swift/master/LICENSE</string>
+		</dict>
 		<dict>
 			<key>Name</key>
 			<string>TunnelKit</string>

PIA VPN-tvOS/Resources/Licences.plist

@@ -39,6 +39,14 @@
 			<key>LicenseURL</key>
 			<string>https://www.openssl.org/source/license.txt</string>
 		</dict>
+		<dict>
+			<key>Name</key>
+			<string>ReachabilitySwift</string>
+			<key>Copyright</key>
+			<string>Copyright (c) 2016 Ashley Mills</string>
+			<key>LicenseURL</key>
+			<string>https://raw.githubusercontent.com/ashleymills/Reachability.swift/master/LICENSE</string>
+		</dict>
 		<dict>
 			<key>Name</key>
 			<string>GradientProgressBar</string>