Update to signal-service-java 2.1.1

[signal-cli] / src / main / java / org / asamk / textsecure / JsonSessionStore.java

diff --git a/src/main/java/org/asamk/textsecure/JsonSessionStore.java b/src/main/java/org/asamk/textsecure/JsonSessionStore.java
index db352d3b0d26234e57d8c6ae266bdbf06f5180ca..2fec85a37e37e88964abf672b01c5cca571cfb0a 100644 (file)
--- a/src/main/java/org/asamk/textsecure/JsonSessionStore.java
+++ b/src/main/java/org/asamk/textsecure/JsonSessionStore.java
@@ -4,28 +4,28 @@ import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.*;

-import org.whispersystems.libaxolotl.AxolotlAddress;
-import org.whispersystems.libaxolotl.state.SessionRecord;
-import org.whispersystems.libaxolotl.state.SessionStore;
+import org.whispersystems.libsignal.SignalProtocolAddress;
+import org.whispersystems.libsignal.state.SessionRecord;
+import org.whispersystems.libsignal.state.SessionStore;

 
 import java.io.IOException;
 import java.util.*;
 
 class JsonSessionStore implements SessionStore {
 
 
 import java.io.IOException;
 import java.util.*;
 
 class JsonSessionStore implements SessionStore {
 

-    private final Map<AxolotlAddress, byte[]> sessions = new HashMap<>();
+    private final Map<SignalProtocolAddress, byte[]> sessions = new HashMap<>();

 
     public JsonSessionStore() {
 
     }
 
 
     public JsonSessionStore() {
 
     }
 

-    public void addSessions(Map<AxolotlAddress, byte[]> sessions) {
+    public void addSessions(Map<SignalProtocolAddress, byte[]> sessions) {

         this.sessions.putAll(sessions);
     }
 
 
     @Override
         this.sessions.putAll(sessions);
     }
 
 
     @Override

-    public synchronized SessionRecord loadSession(AxolotlAddress remoteAddress) {
+    public synchronized SessionRecord loadSession(SignalProtocolAddress remoteAddress) {

         try {
             if (containsSession(remoteAddress)) {
                 return new SessionRecord(sessions.get(remoteAddress));
         try {
             if (containsSession(remoteAddress)) {
                 return new SessionRecord(sessions.get(remoteAddress));


@@ -41,7 +41,7 @@ class JsonSessionStore implements SessionStore {
     public synchronized List<Integer> getSubDeviceSessions(String name) {
         List<Integer> deviceIds = new LinkedList<>();
 
     public synchronized List<Integer> getSubDeviceSessions(String name) {
         List<Integer> deviceIds = new LinkedList<>();
 

-        for (AxolotlAddress key : sessions.keySet()) {
+        for (SignalProtocolAddress key : sessions.keySet()) {

             if (key.getName().equals(name) &&
                     key.getDeviceId() != 1) {
                 deviceIds.add(key.getDeviceId());
             if (key.getName().equals(name) &&
                     key.getDeviceId() != 1) {
                 deviceIds.add(key.getDeviceId());


@@ -52,23 +52,23 @@ class JsonSessionStore implements SessionStore {
     }
 
     @Override
     }
 
     @Override

-    public synchronized void storeSession(AxolotlAddress address, SessionRecord record) {
+    public synchronized void storeSession(SignalProtocolAddress address, SessionRecord record) {

         sessions.put(address, record.serialize());
     }
 
     @Override
         sessions.put(address, record.serialize());
     }
 
     @Override

-    public synchronized boolean containsSession(AxolotlAddress address) {
+    public synchronized boolean containsSession(SignalProtocolAddress address) {

         return sessions.containsKey(address);
     }
 
     @Override
         return sessions.containsKey(address);
     }
 
     @Override

-    public synchronized void deleteSession(AxolotlAddress address) {
+    public synchronized void deleteSession(SignalProtocolAddress address) {

         sessions.remove(address);
     }
 
     @Override
     public synchronized void deleteAllSessions(String name) {
         sessions.remove(address);
     }
 
     @Override
     public synchronized void deleteAllSessions(String name) {

-        for (AxolotlAddress key : new ArrayList<>(sessions.keySet())) {
+        for (SignalProtocolAddress key : new ArrayList<>(sessions.keySet())) {

             if (key.getName().equals(name)) {
                 sessions.remove(key);
             }
             if (key.getName().equals(name)) {
                 sessions.remove(key);
             }


@@ -81,12 +81,12 @@ class JsonSessionStore implements SessionStore {
         public JsonSessionStore deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
             JsonNode node = jsonParser.getCodec().readTree(jsonParser);
 
         public JsonSessionStore deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
             JsonNode node = jsonParser.getCodec().readTree(jsonParser);
 

-            Map<AxolotlAddress, byte[]> sessionMap = new HashMap<>();
+            Map<SignalProtocolAddress, byte[]> sessionMap = new HashMap<>();

             if (node.isArray()) {
                 for (JsonNode session : node) {
                     String sessionName = session.get("name").asText();
                     try {
             if (node.isArray()) {
                 for (JsonNode session : node) {
                     String sessionName = session.get("name").asText();
                     try {

-                        sessionMap.put(new AxolotlAddress(sessionName, session.get("deviceId").asInt()), Base64.decode(session.get("record").asText()));
+                        sessionMap.put(new SignalProtocolAddress(sessionName, session.get("deviceId").asInt()), Base64.decode(session.get("record").asText()));

                     } catch (IOException e) {
                         System.out.println(String.format("Error while decoding session for: %s", sessionName));
                     }
                     } catch (IOException e) {
                         System.out.println(String.format("Error while decoding session for: %s", sessionName));
                     }


@@ -106,7 +106,7 @@ class JsonSessionStore implements SessionStore {
         @Override
         public void serialize(JsonSessionStore jsonSessionStore, JsonGenerator json, SerializerProvider serializerProvider) throws IOException, JsonProcessingException {
             json.writeStartArray();
         @Override
         public void serialize(JsonSessionStore jsonSessionStore, JsonGenerator json, SerializerProvider serializerProvider) throws IOException, JsonProcessingException {
             json.writeStartArray();

-            for (Map.Entry<AxolotlAddress, byte[]> preKey : jsonSessionStore.sessions.entrySet()) {
+            for (Map.Entry<SignalProtocolAddress, byte[]> preKey : jsonSessionStore.sessions.entrySet()) {

                 json.writeStartObject();
                 json.writeStringField("name", preKey.getKey().getName());
                 json.writeNumberField("deviceId", preKey.getKey().getDeviceId());
                 json.writeStartObject();
                 json.writeStringField("name", preKey.getKey().getName());
                 json.writeNumberField("deviceId", preKey.getKey().getDeviceId());