Update textescure-java to 1.7

[signal-cli] / src / main / java / cli / JsonSessionStore.java

diff --git a/src/main/java/cli/JsonSessionStore.java b/src/main/java/cli/JsonSessionStore.java
index b070334b31f7ba0ff50e007ef47cd55c4426c435..d2fe0a4a7c428b387f44fa48ff3d4330d28fb49b 100644 (file)
--- a/src/main/java/cli/JsonSessionStore.java
+++ b/src/main/java/cli/JsonSessionStore.java
@@ -7,20 +7,17 @@ import org.whispersystems.libaxolotl.state.SessionRecord;
 import org.whispersystems.libaxolotl.state.SessionStore;
 
 import java.io.IOException;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
-public class JsonSessionStore implements SessionStore {
+class JsonSessionStore implements SessionStore {
 
-    private Map<AxolotlAddress, byte[]> sessions = new HashMap<>();
+    private final Map<AxolotlAddress, byte[]> sessions = new HashMap<>();
 
     public JsonSessionStore() {
 
     }
 
-    public JsonSessionStore(JSONArray list) throws IOException {
+    public JsonSessionStore(JSONArray list) {
         for (int i = 0; i < list.length(); i++) {
             JSONObject k = list.getJSONObject(i);
             try {
@@ -85,7 +82,7 @@ public class JsonSessionStore implements SessionStore {
 
     @Override
     public synchronized void deleteAllSessions(String name) {
-        for (AxolotlAddress key : sessions.keySet()) {
+        for (AxolotlAddress key : new ArrayList<>(sessions.keySet())) {
             if (key.getName().equals(name)) {
                 sessions.remove(key);
             }