Merge pull request #701 from Infomaniak/fix-network-monitor

fix: NWPathMonitor must be recreated
Infomaniak · Apr 18, 2023 · 296dad4 · 296dad4
2 parents 14c7a40 + 0c2a7b8
commit 296dad4
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/Mail/Utils/NetworkMonitor.swift b/Mail/Utils/NetworkMonitor.swift
@@ -23,12 +23,15 @@ class NetworkMonitor: ObservableObject {
     @Published var isConnected = true
     @Published var isCellular = false
 
-    private let monitor = NWPathMonitor()
+    private var monitor: NWPathMonitor?
     private let queue = DispatchQueue.global()
 
     public func start() {
-        monitor.start(queue: queue)
-        monitor.pathUpdateHandler = { [weak self] path in
+        if monitor == nil {
+            monitor = NWPathMonitor()
+            monitor?.start(queue: queue)
+        }
+        monitor?.pathUpdateHandler = { [weak self] path in
             DispatchQueue.main.async {
                 self?.isConnected = path.status == .satisfied
                 self?.isCellular = path.usesInterfaceType(.cellular)
@@ -37,6 +40,7 @@ class NetworkMonitor: ObservableObject {
     }
 
     public func stop() {
-        monitor.cancel()
+        monitor?.cancel()
+        monitor = nil
     }
 }