NetworkConnectivity: ensure all accesses to listeners set are synchro…

…nised
ably · Apr 10, 2019 · 389cd1d · 389cd1d
1 parent 6edf717
commit 389cd1d
Showing 1 changed file with 22 additions and 7 deletions.
diff --git a/lib/src/main/java/io/ably/lib/transport/NetworkConnectivity.java b/lib/src/main/java/io/ably/lib/transport/NetworkConnectivity.java
@@ -13,33 +13,48 @@ public interface NetworkConnectivityListener {
 	}
 
 	public void addListener(NetworkConnectivityListener listener) {
-		boolean wasEmpty = listeners.isEmpty();
-		listeners.add(listener);
+		boolean wasEmpty;
+		synchronized (this) {
+			wasEmpty = listeners.isEmpty();
+			listeners.add(listener);
+		}
 		if(wasEmpty) {
 			onNonempty();
 		}
 	}
 
 	public void removeListener(NetworkConnectivityListener listener) {
-		listeners.remove(listener);
-		if(listeners.isEmpty()) {
+		boolean isEmpty;
+		synchronized (this) {
+			listeners.remove(listener);
+			isEmpty = listeners.isEmpty();
+		}
+		if(isEmpty) {
 			onEmpty();
 		}
 	}
 
 	protected void notifyNetworkAvailable() {
-		for(NetworkConnectivityListener listener: listeners) {
+		NetworkConnectivityListener[] allListeners;
+		synchronized(this) {
+			allListeners = listeners.toArray(new NetworkConnectivityListener[listeners.size()]);
+		}
+		for(NetworkConnectivityListener listener: allListeners) {
 			listener.onNetworkAvailable();
 		}
 	}
 
 	protected void notifyNetworkUnavailable(ErrorInfo reason) {
-		for(NetworkConnectivityListener listener: listeners) {
+		NetworkConnectivityListener[] allListeners;
+		synchronized(this) {
+			allListeners = listeners.toArray(new NetworkConnectivityListener[listeners.size()]);
+		}
+		for(NetworkConnectivityListener listener: allListeners) {
 			listener.onNetworkUnavailable(reason);
 		}
 	}
 
-	protected boolean isEmpty() {
+	protected synchronized boolean isEmpty() {
 		return listeners.isEmpty();
 	}