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

Show the contact name when receiving messages

Browse source 
Works only if the contact is stored in the config file already
This commit is contained in:
AsamK 2016-06-19 15:40:32 +02:00
parent 03c6f84fc2
commit d9b082a59e
2 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -667,7 +667,8 @@ public class Main {
@Override
public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, GroupInfo group) {
SignalServiceAddress source = envelope.getSourceAddress();
System.out.println(String.format("Envelope from: %s (device: %d)", source.getNumber(), envelope.getSourceDevice()));
ContactInfo sourceContact = m.getContact(source.getNumber());
System.out.println(String.format("Envelope from: %s (device: %d)", (sourceContact == null ? "" : "“" + sourceContact.name + "” ") + source.getNumber(), envelope.getSourceDevice()));
if (source.getRelay().isPresent()) {
System.out.println("Relayed by: " + source.getRelay().get());
}
@ -698,7 +699,8 @@ public class Main {
if (syncMessage.getRead().isPresent()) {
System.out.println("Received sync read messages list");
for (ReadMessage rm : syncMessage.getRead().get()) {
System.out.println("From: " + rm.getSender() + " Message timestamp: " + rm.getTimestamp());
ContactInfo fromContact = m.getContact(rm.getSender());
System.out.println("From: " + (fromContact == null ? "" : "“" + fromContact.name + "” ") + rm.getSender() + " Message timestamp: " + rm.getTimestamp());
}
}
if (syncMessage.getRequest().isPresent()) {
@ -713,7 +715,15 @@ public class Main {
if (syncMessage.getSent().isPresent()) {
System.out.println("Received sync sent message");
final SentTranscriptMessage sentTranscriptMessage = syncMessage.getSent().get();
System.out.println("To: " + (sentTranscriptMessage.getDestination().isPresent() ? sentTranscriptMessage.getDestination().get() : "Unknown") + " , Message timestamp: " + sentTranscriptMessage.getTimestamp());
String to;
if (sentTranscriptMessage.getDestination().isPresent()) {
String dest = sentTranscriptMessage.getDestination().get();
ContactInfo destContact = m.getContact(dest);
to = (destContact == null ? "" : "“" + destContact.name + "” ") + dest;
} else {
to = "Unknown";
}
System.out.println("To: " + to + " , Message timestamp: " + sentTranscriptMessage.getTimestamp());
SignalServiceDataMessage message = sentTranscriptMessage.getMessage();
handleSignalServiceDataMessage(message, null);
}

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

@ -942,4 +942,8 @@ class Manager implements Signal {
contactsFile.delete();
}
}
public ContactInfo getContact(String number) {
return contactStore.getContact(number);
}
}