aljaz/signal-cli
1
0
Fork 0
mirror of https://github.com/aljazceru/signal-cli.git synced 2025-12-26 02:24:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adapt code for new libtextsecure-java version

Browse Source
This commit is contained in:
AsamK
2015-07-06 10:41:19 +02:00
parent 067d14e1ca
commit 73e8c4cabf
3 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/cli/Manager.java
View File

@@ -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.messages.TextSecureContent;
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 java.nio.file.Path;
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());
}
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;
@@ -164,8 +164,8 @@ public class Manager {
} 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) {