webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-08-29 18:40:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add support for contact color sync and receiving blocklists and expiring messages

Browse source
This commit is contained in:
AsamK 2016-08-27 13:22:11 +02:00
parent 6597d48ecc
commit e4618456a1
3 changed files with 28 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/org/asamk/signal/ContactInfo.java
View file

@ -8,4 +8,7 @@ public class ContactInfo {
@JsonProperty @JsonProperty
public String number; public String number;
@JsonProperty
public String color;
} }

22
src/main/java/org/asamk/signal/Main.java
View file

@ -28,10 +28,7 @@ import org.freedesktop.dbus.exceptions.DBusExecutionException;
import org.whispersystems.libsignal.InvalidKeyException; import org.whispersystems.libsignal.InvalidKeyException;
import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException; import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
import org.whispersystems.signalservice.api.messages.*; import org.whispersystems.signalservice.api.messages.*;
import org.whispersystems.signalservice.api.messages.multidevice.DeviceInfo; import org.whispersystems.signalservice.api.messages.multidevice.*;
import org.whispersystems.signalservice.api.messages.multidevice.ReadMessage;
import org.whispersystems.signalservice.api.messages.multidevice.SentTranscriptMessage;
import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage;
import org.whispersystems.signalservice.api.push.SignalServiceAddress; import org.whispersystems.signalservice.api.push.SignalServiceAddress;
import org.whispersystems.signalservice.api.push.exceptions.EncapsulatedExceptions; import org.whispersystems.signalservice.api.push.exceptions.EncapsulatedExceptions;
import org.whispersystems.signalservice.api.push.exceptions.NetworkFailureException; import org.whispersystems.signalservice.api.push.exceptions.NetworkFailureException;
@ -837,9 +834,20 @@ public class Main {
to = "Unknown"; to = "Unknown";
} }
System.out.println("To: " + to + " , Message timestamp: " + sentTranscriptMessage.getTimestamp()); System.out.println("To: " + to + " , Message timestamp: " + sentTranscriptMessage.getTimestamp());
if (sentTranscriptMessage.getExpirationStartTimestamp() > 0) {
System.out.println("Expiration started at: " + sentTranscriptMessage.getExpirationStartTimestamp());
}
SignalServiceDataMessage message = sentTranscriptMessage.getMessage(); SignalServiceDataMessage message = sentTranscriptMessage.getMessage();
handleSignalServiceDataMessage(message); handleSignalServiceDataMessage(message);
} }
if (syncMessage.getBlockedList().isPresent()) {
System.out.println("Received sync message with block list");
System.out.println("Blocked numbers:");
final BlockedListMessage blockedList = syncMessage.getBlockedList().get();
for (String number : blockedList.getNumbers()) {
System.out.println(" - " + number);
}
}
} }
} }
} else { } else {
@ -882,6 +890,12 @@ public class Main {
if (message.isEndSession()) { if (message.isEndSession()) {
System.out.println("Is end session"); System.out.println("Is end session");
} }
if (message.isExpirationUpdate()) {
System.out.println("Is Expiration update: " + message.isExpirationUpdate());
}
if (message.getExpiresInSeconds() > 0) {
System.out.println("Expires in: " + message.getExpiresInSeconds() + " seconds");
}
if (message.getAttachments().isPresent()) { if (message.getAttachments().isPresent()) {
System.out.println("Attachments: "); System.out.println("Attachments: ");

8
src/main/java/org/asamk/signal/Manager.java
View file

@ -1017,6 +1017,9 @@ class Manager implements Signal {
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
if (syncMessage.getBlockedList().isPresent()) {
// TODO store list of blocked numbers
}
} }
if (syncMessage.getContacts().isPresent()) { if (syncMessage.getContacts().isPresent()) {
try { try {
@ -1028,6 +1031,9 @@ class Manager implements Signal {
if (c.getName().isPresent()) { if (c.getName().isPresent()) {
contact.name = c.getName().get(); contact.name = c.getName().get();
} }
if (c.getColor().isPresent()) {
contact.color = c.getColor().get();
}
contactStore.updateContact(contact); contactStore.updateContact(contact);
if (c.getAvatar().isPresent()) { if (c.getAvatar().isPresent()) {
@ -1264,7 +1270,7 @@ class Manager implements Signal {
try { try {
for (ContactInfo record : contactStore.getContacts()) { for (ContactInfo record : contactStore.getContacts()) {
out.write(new DeviceContact(record.number, Optional.fromNullable(record.name), out.write(new DeviceContact(record.number, Optional.fromNullable(record.name),
createContactAvatarAttachment(record.number))); createContactAvatarAttachment(record.number), Optional.fromNullable(record.color)));
} }
} finally { } finally {
out.close(); out.close();