Only connect to saved networks found nearby

OpenIntelWireless · Mar 2, 2021 · 261499b · 261499b
1 parent 60839e1
commit 261499b
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 5 deletions.
diff --git a/HeliPort/Appearance/StatusMenu.swift b/HeliPort/Appearance/StatusMenu.swift
@@ -383,7 +383,7 @@ final class StatusMenu: NSMenu, NSMenuDelegate {
             get_power_state(&power)
             if get_80211_state(&state) && power &&
                 (state != ITL80211_S_RUN.rawValue || get_station_info(&stationInfo) != KERN_SUCCESS) {
-                NetworkManager.connectSavedNetworks()
+                NetworkManager.scanSavedNetworks()
             }
         }
     }

diff --git a/HeliPort/NetworkManager.swift b/HeliPort/NetworkManager.swift
@@ -109,11 +109,36 @@ final class NetworkManager {
         }
     }
 
-    class func connectSavedNetworks() {
+    class func scanSavedNetworks() {
+        DispatchQueue.global(qos: .background).async {
+            let scanTimer: Timer = Timer.scheduledTimer(withTimeInterval: 5, repeats: true) { timer in
+                let dispatchSemaphore = DispatchSemaphore(value: 0)
+                var targetNetworks: [NetworkInfo]?
+                NetworkManager.scanNetwork { networkList in
+                    targetNetworks = CredentialsManager.instance.getSavedNetworks().filter { networkList.contains($0) }
+                    dispatchSemaphore.signal()
+                }
+                dispatchSemaphore.wait()
+                if targetNetworks != nil, targetNetworks!.count > 0 {
+                    // This will stop the timer completely
+                    timer.invalidate()
+                    Log.debug("Auto connect timer stopped")
+                    connectSavedNetworks(networks: targetNetworks!)
+                }
+            }
+            // Start executing code inside the timer immediately
+            scanTimer.fire()
+            let currentRunLoop = RunLoop.current
+            currentRunLoop.add(scanTimer, forMode: .common)
+            currentRunLoop.run()
+        }
+    }
+
+    private class func connectSavedNetworks(networks: [NetworkInfo]) {
         DispatchQueue.global(qos: .background).async {
             let dispatchSemaphore = DispatchSemaphore(value: 0)
             var connected = false
-            for network in CredentialsManager.instance.getSavedNetworks() where !connected {
+            for network in networks where !connected {
                 connect(networkInfo: network) { (result: Bool) -> Void in
                     connected = result
                     dispatchSemaphore.signal()

diff --git a/HeliPort/Supporting files/Log.swift b/HeliPort/Supporting files/Log.swift
@@ -19,15 +19,15 @@ import os.log
 final class Log {
     static func debug(_ message: String) {
         if #available(OSX 11.0, *) {
-            Logger.heliPort.info("DEBUG: \(message, privacy: .public))")
+            Logger.heliPort.info("DEBUG: \(message, privacy: .public)")
         } else {
             os_log("%{public}@", log: .heliPort, type: .info, "DEBUG: " + message)
         }
     }
 
     static func error(_ message: String) {
         if #available(OSX 11.0, *) {
-            Logger.heliPort.error("ERROR: \(message, privacy: .public))")
+            Logger.heliPort.error("ERROR: \(message, privacy: .public)")
         } else {
             os_log("%{public}@", log: .heliPort, type: .error, "ERROR: " + message)
         }