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

Address corner case where contact details may not be synced.

Browse source 
Relates to #12293
This commit is contained in:
Greyson Parrelli 2022-06-17 09:54:22 -04:00
parent 008f153b66
commit 2620a8fc51
3 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/org/thoughtcrime/securesms/contacts/ContactsSyncAdapter.java
View file

@ -19,6 +19,7 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore;
import org.thoughtcrime.securesms.phonenumbers.PhoneNumberFormatter; import org.thoughtcrime.securesms.phonenumbers.PhoneNumberFormatter;
import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.Recipient;
import org.signal.core.util.SetUtil; import org.signal.core.util.SetUtil;
import org.thoughtcrime.securesms.util.Util;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
@ -69,13 +70,19 @@ public class ContactsSyncAdapter extends AbstractThreadedSyncAdapter {
Log.w(TAG, e); Log.w(TAG, e);
} }
} else if (unknownSystemE164s.size() > 0) { } else if (unknownSystemE164s.size() > 0) {
Log.i(TAG, "There are " + unknownSystemE164s.size() + " unknown contacts. Doing an individual sync.");
List<Recipient> recipients = Stream.of(unknownSystemE164s) List<Recipient> recipients = Stream.of(unknownSystemE164s)
.filter(s -> s.startsWith("+")) .filter(s -> s.startsWith("+"))
.map(s -> Recipient.external(getContext(), s)) .map(s -> Recipient.external(getContext(), s))
.toList(); .toList();
Log.i(TAG, "There are " + unknownSystemE164s.size() + " unknown E164s, which are now " + recipients.size() + " recipients. Only syncing these specific contacts.");
try { try {
ContactDiscovery.refresh(context, recipients, true); ContactDiscovery.refresh(context, recipients, true);
if (Util.isDefaultSmsProvider(context)) {
ContactDiscovery.syncRecipientInfoWithSystemContacts(context);
}
} catch (IOException e) { } catch (IOException e) {
Log.w(TAG, "Failed to refresh! Scheduling for later.", e); Log.w(TAG, "Failed to refresh! Scheduling for later.", e);
ApplicationDependencies.getJobManager().add(new DirectoryRefreshJob(true)); ApplicationDependencies.getJobManager().add(new DirectoryRefreshJob(true));

5
app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscovery.kt
View file

@ -134,6 +134,11 @@ object ContactDiscovery {
@JvmStatic @JvmStatic
@WorkerThread @WorkerThread
fun syncRecipientInfoWithSystemContacts(context: Context) { fun syncRecipientInfoWithSystemContacts(context: Context) {
if (!hasContactsPermissions(context)) {
Log.w(TAG, "[syncRecipientInfoWithSystemContacts] No contacts permission, skipping.")
return
}
syncRecipientsWithSystemContacts( syncRecipientsWithSystemContacts(
context = context, context = context,
rewrites = emptyMap(), rewrites = emptyMap(),

4
app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscoveryRefreshV1.java
View file

@ -96,6 +96,10 @@ class ContactDiscoveryRefreshV1 {
.map(Recipient::requireE164) .map(Recipient::requireE164)
.collect(Collectors.toSet()); .collect(Collectors.toSet());
if (numbers.size() < recipients.size()) {
Log.w(TAG, "We were asked to refresh " + recipients.size() + " numbers, but filtered that down to " + numbers.size());
}
return refreshNumbers(context, numbers, numbers); return refreshNumbers(context, numbers, numbers);
} }