Prevent sendProviderMessage calls when not necessary

duckduckgo · Jun 21, 2024 · b0997a0 · b0997a0
1 parent 5362ffc
commit b0997a0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/...workProtection/Status/ConnectionErrorObserver/ConnectionErrorObserverThroughSession.swift b/...workProtection/Status/ConnectionErrorObserver/ConnectionErrorObserverThroughSession.swift
@@ -88,7 +88,9 @@ public class ConnectionErrorObserverThroughSession: ConnectionErrorObserver {
 
     private func handleStatusChangeNotification(_ notification: Notification) {
         do {
-            guard let session = ConnectionSessionUtilities.session(from: notification) else {
+            guard let session = ConnectionSessionUtilities.session(from: notification),
+                session.status == .disconnected else {
+
                 return
             }
 

diff --git a/...tion/Status/ConnectionServerInfoObserver/ConnectionServerInfoObserverThroughSession.swift b/...tion/Status/ConnectionServerInfoObserver/ConnectionServerInfoObserverThroughSession.swift
@@ -98,6 +98,10 @@ public class ConnectionServerInfoObserverThroughSession: ConnectionServerInfoObs
     // MARK: - Obtaining the NetP VPN status
 
     private func updateServerInfo(session: NETunnelProviderSession) async {
+        guard session.status == .connected else {
+            return
+        }
+
         let serverAddress = await self.serverAddress(from: session)
         let serverLocation = await self.serverLocation(from: session)
 

diff --git a/Sources/NetworkProtection/Status/DataVolumeObserver/DataVolumeObserverThroughSession.swift b/Sources/NetworkProtection/Status/DataVolumeObserver/DataVolumeObserverThroughSession.swift
@@ -99,7 +99,9 @@ public class DataVolumeObserverThroughSession: DataVolumeObserver {
 
     private func updateDataVolume() {
         Task {
-            guard let session = await tunnelSessionProvider.activeSession() else {
+            guard let session = await tunnelSessionProvider.activeSession(),
+                session.status == .connected else {
+
                 return
             }