Adapt code for new libtextsecure-java version

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

diff --git a/src/main/java/cli/Manager.java b/src/main/java/cli/Manager.java
index 97070c97a2be5aace51a9d6494a7bb20e13dc6dd..1e7f02266554e6b5defdbb183c86e07f1035beac 100644 (file)
--- a/src/main/java/cli/Manager.java
+++ b/src/main/java/cli/Manager.java
@@ -30,12 +30,12 @@ import org.whispersystems.textsecure.api.TextSecureMessagePipe;
 import org.whispersystems.textsecure.api.TextSecureMessageReceiver;
 import org.whispersystems.textsecure.api.TextSecureMessageSender;
 import org.whispersystems.textsecure.api.crypto.TextSecureCipher;
 import org.whispersystems.textsecure.api.TextSecureMessageReceiver;
 import org.whispersystems.textsecure.api.TextSecureMessageSender;
 import org.whispersystems.textsecure.api.crypto.TextSecureCipher;

+import org.whispersystems.textsecure.api.messages.TextSecureContent;

 import org.whispersystems.textsecure.api.messages.TextSecureEnvelope;
 import org.whispersystems.textsecure.api.messages.TextSecureEnvelope;

-import org.whispersystems.textsecure.api.messages.TextSecureMessage;
+import org.whispersystems.textsecure.api.push.TextSecureAddress;

 import org.whispersystems.textsecure.api.push.TrustStore;
 
 import java.io.*;
 import org.whispersystems.textsecure.api.push.TrustStore;
 
 import java.io.*;

-import java.nio.file.Path;

 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;


@@ -151,7 +151,7 @@ public class Manager {
                 axolotlStore, Optional.<TextSecureMessageSender.EventListener>absent());
     }
 
                 axolotlStore, Optional.<TextSecureMessageSender.EventListener>absent());
     }
 

-    public TextSecureMessage receiveMessage() throws IOException, InvalidVersionException {
+    public TextSecureContent receiveMessage() throws IOException, InvalidVersionException {

         TextSecureMessageReceiver messageReceiver = new TextSecureMessageReceiver(URL, TRUST_STORE, username, password, signalingKey);
         TextSecureMessagePipe messagePipe = null;
 
         TextSecureMessageReceiver messageReceiver = new TextSecureMessageReceiver(URL, TRUST_STORE, username, password, signalingKey);
         TextSecureMessagePipe messagePipe = null;
 


@@ -164,8 +164,8 @@ public class Manager {
             } catch (TimeoutException e) {
                 return null;
             }
             } catch (TimeoutException e) {
                 return null;
             }

-            TextSecureCipher cipher = new TextSecureCipher(axolotlStore);
-            TextSecureMessage message = null;
+            TextSecureCipher cipher = new TextSecureCipher(new TextSecureAddress(username), axolotlStore);
+            TextSecureContent message = null;

             try {
                 message = cipher.decrypt(envelope);
             } catch (Exception e) {
             try {
                 message = cipher.decrypt(envelope);
             } catch (Exception e) {