Update dependency

diff --git a/build.gradle b/build.gradle
index ef0b0b36242b1d7caa5b03a3c8c8272b54324e8f..cc762c37962d71fb2c8860658580602be7af7685 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@ repositories {
 }
 
 dependencies {
-    compile 'com.github.turasa:signal-service-java:2.3.1_unofficial_1'
+    compile 'com.github.turasa:signal-service-java:2.4.0_unofficial_1'
     compile 'org.bouncycastle:bcprov-jdk15on:1.55'
     compile 'net.sourceforge.argparse4j:argparse4j:0.7.0'
     compile 'org.freedesktop.dbus:dbus-java:2.7.0'

diff --git a/src/main/java/org/asamk/signal/JsonIdentityKeyStore.java b/src/main/java/org/asamk/signal/JsonIdentityKeyStore.java
index 14c0d11ed7a080b70d378741175ed47fbb900063..d71e3581d6dc18e1f4f6dbd9d77a2d6701aed423 100644 (file)
--- a/src/main/java/org/asamk/signal/JsonIdentityKeyStore.java
+++ b/src/main/java/org/asamk/signal/JsonIdentityKeyStore.java
@@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.*;
 import org.whispersystems.libsignal.IdentityKey;
 import org.whispersystems.libsignal.IdentityKeyPair;
 import org.whispersystems.libsignal.InvalidKeyException;
+import org.whispersystems.libsignal.SignalProtocolAddress;
 import org.whispersystems.libsignal.state.IdentityKeyStore;
 
 import java.io.IOException;
@@ -36,8 +37,8 @@ class JsonIdentityKeyStore implements IdentityKeyStore {
     }
 
     @Override
-    public void saveIdentity(String name, IdentityKey identityKey) {
-        saveIdentity(name, identityKey, TrustLevel.TRUSTED_UNVERIFIED, null);
+    public void saveIdentity(SignalProtocolAddress address, IdentityKey identityKey) {
+        saveIdentity(address.getName(), identityKey, TrustLevel.TRUSTED_UNVERIFIED, null);
     }
 
     /**
@@ -71,8 +72,8 @@ class JsonIdentityKeyStore implements IdentityKeyStore {
     }
 
     @Override
-    public boolean isTrustedIdentity(String name, IdentityKey identityKey) {
-        List<Identity> identities = trustedKeys.get(name);
+    public boolean isTrustedIdentity(SignalProtocolAddress address, IdentityKey identityKey) {
+        List<Identity> identities = trustedKeys.get(address.getName());
         if (identities == null) {
             // Trust on first use
             return true;

diff --git a/src/main/java/org/asamk/signal/JsonSignalProtocolStore.java b/src/main/java/org/asamk/signal/JsonSignalProtocolStore.java
index a3159e48d5bec6a99954a2a169049fd2bb92614b..79f49c7f827881d92038ff7c35bd19bd8b34829a 100644 (file)
--- a/src/main/java/org/asamk/signal/JsonSignalProtocolStore.java
+++ b/src/main/java/org/asamk/signal/JsonSignalProtocolStore.java
@@ -65,8 +65,8 @@ class JsonSignalProtocolStore implements SignalProtocolStore {
     }
 
     @Override
-    public void saveIdentity(String name, IdentityKey identityKey) {
-        identityKeyStore.saveIdentity(name, identityKey);
+    public void saveIdentity(SignalProtocolAddress address, IdentityKey identityKey) {
+        identityKeyStore.saveIdentity(address, identityKey);
     }
 
     public void saveIdentity(String name, IdentityKey identityKey, TrustLevel trustLevel) {
@@ -82,8 +82,8 @@ class JsonSignalProtocolStore implements SignalProtocolStore {
     }
 
     @Override
-    public boolean isTrustedIdentity(String name, IdentityKey identityKey) {
-        return identityKeyStore.isTrustedIdentity(name, identityKey);
+    public boolean isTrustedIdentity(SignalProtocolAddress address, IdentityKey identityKey) {
+        return identityKeyStore.isTrustedIdentity(address, identityKey);
     }
 
     @Override