empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Ensure numbers are properly formatted before giving them to contact discovery service.

Browse source 
We were sending "Unknown" addresses, which would cause the service to
choke.
This commit is contained in:
Greyson Parrelli 2018-09-27 19:59:57 -07:00
parent 946f76a442
commit 6359961a82
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/org/thoughtcrime/securesms/util/DirectoryHelper.java
View file

@ -348,8 +348,9 @@ public class DirectoryHelper {
@NonNull SignalServiceAccountManager accountManager, @NonNull SignalServiceAccountManager accountManager,
@NonNull Set<String> eligibleContactNumbers) @NonNull Set<String> eligibleContactNumbers)
{ {
List<Set<String>> batches = splitIntoBatches(eligibleContactNumbers, CONTACT_DISCOVERY_BATCH_SIZE); Set<String> sanitizedNumbers = sanitizeNumbers(eligibleContactNumbers);
List<Future<Set<String>>> futures = new ArrayList<>(batches.size()); List<Set<String>> batches = splitIntoBatches(sanitizedNumbers, CONTACT_DISCOVERY_BATCH_SIZE);
List<Future<Set<String>>> futures = new ArrayList<>(batches.size());
for (Set<String> batch : batches) { for (Set<String> batch : batches) {
Future<Set<String>> future = SignalExecutors.IO.submit(() -> { Future<Set<String>> future = SignalExecutors.IO.submit(() -> {
@ -360,6 +361,10 @@ public class DirectoryHelper {
return futures; return futures;
} }
private static Set<String> sanitizeNumbers(@NonNull Set<String> numbers) {
return Stream.of(numbers).filter(number -> number.startsWith("+")).collect(Collectors.toSet());
}
private static List<Set<String>> splitIntoBatches(@NonNull Set<String> numbers, int batchSize) { private static List<Set<String>> splitIntoBatches(@NonNull Set<String> numbers, int batchSize) {
List<String> numberList = new ArrayList<>(numbers); List<String> numberList = new ArrayList<>(numbers);
List<Set<String>> batches = new LinkedList<>(); List<Set<String>> batches = new LinkedList<>();