Add --ignore-attachments flag to receive and daemon command

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

diff --git a/src/main/java/org/asamk/signal/JsonSignalProtocolStore.java b/src/main/java/org/asamk/signal/JsonSignalProtocolStore.java
index 015707ae5be1c01e6c50e6786b282fadb0b91272..79f49c7f827881d92038ff7c35bd19bd8b34829a 100644 (file)
--- a/src/main/java/org/asamk/signal/JsonSignalProtocolStore.java
+++ b/src/main/java/org/asamk/signal/JsonSignalProtocolStore.java
@@ -13,6 +13,7 @@ import org.whispersystems.libsignal.state.SignalProtocolStore;
 import org.whispersystems.libsignal.state.SignedPreKeyRecord;
 
 import java.util.List;
 import org.whispersystems.libsignal.state.SignedPreKeyRecord;
 
 import java.util.List;

+import java.util.Map;

 
 class JsonSignalProtocolStore implements SignalProtocolStore {
 
 
 class JsonSignalProtocolStore implements SignalProtocolStore {
 


@@ -64,17 +65,25 @@ class JsonSignalProtocolStore implements SignalProtocolStore {
     }
 
     @Override
     }
 
     @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) {
         identityKeyStore.saveIdentity(name, identityKey, trustLevel, null);
     }
 
     }
 
     public void saveIdentity(String name, IdentityKey identityKey, TrustLevel trustLevel) {
         identityKeyStore.saveIdentity(name, identityKey, trustLevel, null);
     }
 

+    public Map<String, List<JsonIdentityKeyStore.Identity>> getIdentities() {
+        return identityKeyStore.getIdentities();
+    }
+
+    public List<JsonIdentityKeyStore.Identity> getIdentities(String name) {
+        return identityKeyStore.getIdentities(name);
+    }
+

     @Override
     @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
     }
 
     @Override