fix improved based on the suggestion

KarthikRajaKalaimani · KarthikRajaKalaimani · commit 0360028f1714 · 2026-03-24T13:41:10.000+05:30
diff --git a/src/Essentials/src/Connectivity/Connectivity.ios.tvos.macos.reachability.cs b/src/Essentials/src/Connectivity/Connectivity.ios.tvos.macos.reachability.cs
@@ -109,6 +109,8 @@ class ReachabilityListener : IDisposable
 		const int ConnectionStatusChangeDelayMs = 100;
 
 		NWPathMonitor pathMonitor;
+		CancellationTokenSource cts = new CancellationTokenSource();
+		int pendingCallbacks;
 
 		internal ReachabilityListener()
 		{
@@ -130,6 +132,10 @@ internal ReachabilityListener()
 
 		internal void Dispose()
 		{
+			cts?.Cancel();
+			cts?.Dispose();
+			cts = null;
+
 			if (pathMonitor != null)
 			{
 				pathMonitor.SnapshotHandler = null;
@@ -170,25 +176,45 @@ void OnRestrictedStateChanged(CTCellularDataRestrictedState state)
 
 		async void OnChange(NetworkReachabilityFlags flags)
 		{
-			// This function waits up to 1 second, checking the device’s network status every 100 milliseconds. 
+			// Deduplicate: both watchers may fire for the same network change.
+			// Only the first callback runs the polling loop; subsequent ones are no-ops.
+			if (Interlocked.Increment(ref pendingCallbacks) > 1)
+				return;
+
+			var token = cts?.Token ?? default;
+			if (token.IsCancellationRequested)
+				return;
+
+			// This function waits up to 1 second, checking the device's network status every 100 milliseconds.
 			// If the network status changes, it immediately triggers the ReachabilityChanged event.
 			var initialAccess = Connectivity.NetworkAccess;
 			const int pollingIntervalMs = 100;
 			const int maxWaitTimeMs = 1000;
 			int elapsedTime = 0;
 
-			while (elapsedTime < maxWaitTimeMs)
+			try
 			{
-				await Task.Delay(pollingIntervalMs);
-				elapsedTime += pollingIntervalMs;
-				var currentAccess = Connectivity.NetworkAccess;
-				if (currentAccess != initialAccess)
+				while (elapsedTime < maxWaitTimeMs)
 				{
-					ReachabilityChanged?.Invoke();
-					return;
+					await Task.Delay(pollingIntervalMs, token);
+					elapsedTime += pollingIntervalMs;
+					var currentAccess = Connectivity.NetworkAccess;
+					if (currentAccess != initialAccess)
+					{
+						ReachabilityChanged?.Invoke();
+						return;
+					}
 				}
+				ReachabilityChanged?.Invoke();
+			}
+			catch (OperationCanceledException)
+			{
+				// Listener was disposed during polling, don't fire event
+			}
+			finally
+			{
+				Interlocked.Exchange(ref pendingCallbacks, 0);
 			}
-			ReachabilityChanged?.Invoke();
 		}
 	}
 }
