summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorcyBerta <cyberta@riseup.net>2018-12-11 08:40:46 +0100
committercyBerta <cyberta@riseup.net>2018-12-11 08:40:46 +0100
commit9ca6253f8dc472a6147f55fd928b433d1de804cf (patch)
tree023c3257daf91d86928943625979d651359cb9c4 /app
parent9b832c4386f0f839006df68dd75d98fc173344d0 (diff)
fix concurrent modification exception in vpn status
Diffstat (limited to 'app')
-rw-r--r--app/src/main/java/de/blinkt/openvpn/core/VpnStatus.java27
1 files changed, 9 insertions, 18 deletions
diff --git a/app/src/main/java/de/blinkt/openvpn/core/VpnStatus.java b/app/src/main/java/de/blinkt/openvpn/core/VpnStatus.java
index e7576bb5..0fae6183 100644
--- a/app/src/main/java/de/blinkt/openvpn/core/VpnStatus.java
+++ b/app/src/main/java/de/blinkt/openvpn/core/VpnStatus.java
@@ -15,12 +15,10 @@ import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.LinkedList;
import java.util.Locale;
-import java.util.Queue;
import java.util.Vector;
-import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.CopyOnWriteArrayList;
import se.leap.bitmaskclient.R;
-import de.blinkt.openvpn.VpnProfile;
public class VpnStatus {
@@ -28,7 +26,7 @@ public class VpnStatus {
private static final LinkedList<LogItem> logbuffer;
private static Vector<LogListener> logListener;
- private static Vector<StateListener> stateListener;
+ private static CopyOnWriteArrayList<StateListener> stateListener;
private static Vector<ByteCountListener> byteCountListener;
private static String mLaststatemsg = "";
@@ -200,7 +198,7 @@ public class VpnStatus {
static {
logbuffer = new LinkedList<>();
logListener = new Vector<>();
- stateListener = new Vector<>();
+ stateListener = new CopyOnWriteArrayList<>();
byteCountListener = new Vector<>();
trafficHistory = new TrafficHistory();
@@ -268,12 +266,10 @@ public class VpnStatus {
public synchronized static void addStateListener(StateListener sl) {
- synchronized (stateListener) {
- if (!stateListener.contains(sl)) {
- stateListener.add(sl);
- if (mLaststate != null)
+ if (!stateListener.contains(sl)) {
+ stateListener.add(sl);
+ if (mLaststate != null)
sl.updateState(mLaststate, mLaststatemsg, mLastStateresid, mLastLevel);
- }
}
}
@@ -354,9 +350,7 @@ public class VpnStatus {
public synchronized static void removeStateListener(StateListener sl) {
- synchronized (stateListener) {
- stateListener.remove(sl);
- }
+ stateListener.remove(sl);
}
@@ -388,11 +382,8 @@ public class VpnStatus {
mLastStateresid = resid;
mLastLevel = level;
-
- synchronized (stateListener) {
- for (StateListener sl : stateListener) {
- sl.updateState(state, msg, resid, level);
- }
+ for (StateListener sl : stateListener) {
+ sl.updateState(state, msg, resid, level);
}
//newLogItem(new LogItem((LogLevel.DEBUG), String.format("New OpenVPN Status (%s->%s): %s",state,level.toString(),msg)));
}