marvin.weiler/signal-cli-with-http-logging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Canonicalize recipient addresses

Browse Source
This commit is contained in:
AsamK 2015-07-07 11:42:24 +02:00
parent 0a7a6a5c54
commit 960e97bc12
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,7 @@ import org.whispersystems.textsecure.api.TextSecureMessageSender;
import org.whispersystems.textsecure.api.crypto.UntrustedIdentityException;
import org.whispersystems.textsecure.api.messages.*;
import org.whispersystems.textsecure.api.messages.multidevice.TextSecureSyncMessage;
import org.whispersystems.textsecure.api.push.TextSecureAddress;
import org.whispersystems.textsecure.api.util.InvalidNumberException;
import java.io.File;
import java.io.FileInputStream;
@ -152,9 +152,9 @@ public class Main {
TextSecureDataMessage message = messageBuilder.build();
for (String recipient : ns.<String>getList("recipient")) {
try {
messageSender.sendMessage(new TextSecureAddress(recipient), message);
} catch (UntrustedIdentityException | IOException e) {
System.out.println("Send message: " + e.getMessage());
messageSender.sendMessage(m.getPushAddress(recipient), message);
} catch (UntrustedIdentityException | IOException | InvalidNumberException e) {
System.out.println("Failed to send message to \"" + recipient + "\": " + e.getMessage());
}
}
break;

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

@ -206,4 +206,14 @@ public class Manager {
messagePipe.shutdown();
}
}
public String canonicalizeNumber(String number) throws InvalidNumberException {
String localNumber = username;
return PhoneNumberFormatter.formatNumber(number, localNumber);
}
protected TextSecureAddress getPushAddress(String number) throws InvalidNumberException {
String e164number = canonicalizeNumber(number);
return new TextSecureAddress(e164number);
}
}