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

Check if number is registered on Signal before adding to group

Browse source 
Fixes #15
This commit is contained in:
AsamK 2016-08-13 13:42:56 +02:00
parent 1efdf04394
commit 6a9f791f0d
1 changed files with 30 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -44,6 +44,7 @@ import org.whispersystems.signalservice.api.crypto.SignalServiceCipher;
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.*; import org.whispersystems.signalservice.api.messages.multidevice.*;
import org.whispersystems.signalservice.api.push.ContactTokenDetails;
import org.whispersystems.signalservice.api.push.SignalServiceAddress; import org.whispersystems.signalservice.api.push.SignalServiceAddress;
import org.whispersystems.signalservice.api.push.TrustStore; import org.whispersystems.signalservice.api.push.TrustStore;
import org.whispersystems.signalservice.api.push.exceptions.*; import org.whispersystems.signalservice.api.push.exceptions.*;
@ -568,6 +569,18 @@ class Manager implements Signal {
sendMessage(message, g.members); sendMessage(message, g.members);
} }
private static String join(CharSequence separator, Iterable<? extends CharSequence> list) {
StringBuilder buf = new StringBuilder();
for (CharSequence str : list) {
if (buf.length() > 0) {
buf.append(separator);
}
buf.append(str);
}
return buf.toString();
}
public byte[] sendUpdateGroupMessage(byte[] groupId, String name, Collection<String> members, String avatarFile) throws IOException, EncapsulatedExceptions, GroupNotFoundException, AttachmentInvalidException { public byte[] sendUpdateGroupMessage(byte[] groupId, String name, Collection<String> members, String avatarFile) throws IOException, EncapsulatedExceptions, GroupNotFoundException, AttachmentInvalidException {
GroupInfo g; GroupInfo g;
if (groupId == null) { if (groupId == null) {
@ -583,14 +596,30 @@ class Manager implements Signal {
} }
if (members != null) { if (members != null) {
Set<String> newMembers = new HashSet<>();
for (String member : members) { for (String member : members) {
try { try {
g.members.add(canonicalizeNumber(member)); member = canonicalizeNumber(member);
} catch (InvalidNumberException e) { } catch (InvalidNumberException e) {
System.err.println("Failed to add member \"" + member + "\" to group: " + e.getMessage()); System.err.println("Failed to add member \"" + member + "\" to group: " + e.getMessage());
System.err.println("Aborting…"); System.err.println("Aborting…");
System.exit(1); System.exit(1);
} }
if (g.members.contains(member)) {
continue;
}
newMembers.add(member);
g.members.add(member);
}
final List<ContactTokenDetails> contacts = accountManager.getContacts(newMembers);
if (contacts.size() != newMembers.size()) {
// Some of the new members are not registered on Signal
for (ContactTokenDetails contact : contacts) {
newMembers.remove(contact.getNumber());
}
System.err.println("Failed to add members " + join(", ", newMembers) + " to group: Not registered on Signal");
System.err.println("Aborting…");
System.exit(1);
} }
} }