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

Canonicalize number before getting/setting contact info

Browse source
This commit is contained in:
AsamK 2020-01-21 22:00:38 +01:00
parent eca1737d28
commit cfd1e5544d
3 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/main/java/org/asamk/signal/manager/Manager.java
View file

@ -675,8 +675,9 @@ public class Manager implements Signal {
}
@Override
public String getContactName(String number) {
ContactInfo contact = account.getContactStore().getContact(number);
public String getContactName(String number) throws InvalidNumberException {
String canonicalizedNumber = Utils.canonicalizeNumber(number, username);
ContactInfo contact = account.getContactStore().getContact(canonicalizedNumber);
if (contact == null) {
return "";
} else {
@ -685,14 +686,15 @@ public class Manager implements Signal {
}
@Override
public void setContactName(String number, String name) {
ContactInfo contact = account.getContactStore().getContact(number);
public void setContactName(String number, String name) throws InvalidNumberException {
String canonicalizedNumber = Utils.canonicalizeNumber(number, username);
ContactInfo contact = account.getContactStore().getContact(canonicalizedNumber);
if (contact == null) {
contact = new ContactInfo();
contact.number = number;
System.err.println("Add contact " + number + " named " + name);
contact.number = canonicalizedNumber;
System.err.println("Add contact " + canonicalizedNumber + " named " + name);
} else {
System.err.println("Updating contact " + number + " name " + contact.name + " -> " + name);
System.err.println("Updating contact " + canonicalizedNumber + " name " + contact.name + " -> " + name);
}
contact.name = name;
account.getContactStore().updateContact(contact);