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

28
src/main/java/cli/Main.java
View File

@@ -22,7 +22,9 @@ import org.apache.commons.io.IOUtils;
import org.whispersystems.libaxolotl.InvalidVersionException;
import org.whispersystems.textsecure.api.TextSecureMessageSender;
import org.whispersystems.textsecure.api.crypto.UntrustedIdentityException;
import org.whispersystems.textsecure.api.messages.TextSecureMessage;
import org.whispersystems.textsecure.api.messages.TextSecureContent;
import org.whispersystems.textsecure.api.messages.TextSecureDataMessage;
import org.whispersystems.textsecure.api.messages.multidevice.TextSecureSyncMessage;
import org.whispersystems.textsecure.api.push.TextSecureAddress;
import java.io.IOException;
@@ -117,7 +119,7 @@ public class Main {
System.exit(1);
}
}
TextSecureMessage message = TextSecureMessage.newBuilder().withBody(messageText).build();
TextSecureDataMessage message = TextSecureDataMessage.newBuilder().withBody(messageText).build();
for (String recipient : ns.<String>getList("recipient")) {
try {
messageSender.sendMessage(new TextSecureAddress(recipient), message);
@@ -132,11 +134,23 @@ public class Main {
System.exit(1);
}
try {
message = m.receiveMessage();
if (message == null) {
System.exit(0);
} else {
System.out.println("Received message: " + message.getBody().get());
TextSecureContent content = m.receiveMessage();
if (content.getDataMessage().isPresent()) {
message = content.getDataMessage().get();
if (message == null) {
System.exit(0);
} else {
System.out.println("Received message: " + message.getBody().get());
}
}
if (content.getSyncMessage().isPresent()) {
TextSecureSyncMessage syncMessage = content.getSyncMessage().get();
if (syncMessage == null) {
System.exit(0);
} else {
System.out.println("Received sync message");
}
}
} catch (IOException | InvalidVersionException e) {
System.out.println("Receive message: " + e.getMessage());