Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-24 02:39:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix partial contact syncs and ignore your own contact info.

Browse Source
This commit is contained in:
Greyson Parrelli
2022-04-22 13:16:56 -04:00
committed by Cody Henthorne
parent 4a6569fa1c
commit 70b0a120f0
2 changed files with 46 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscovery.kt
View File

@@ -9,6 +9,8 @@ import android.text.TextUtils
import androidx.annotation.WorkerThread
import org.signal.contacts.ContactLinkConfiguration
import org.signal.contacts.SystemContactsRepository
import org.signal.contacts.SystemContactsRepository.ContactIterator
import org.signal.contacts.SystemContactsRepository.ContactPhoneDetails
import org.signal.core.util.StringUtil
import org.signal.core.util.logging.Log
import org.thoughtcrime.securesms.BuildConfig
@@ -130,7 +132,11 @@ object ContactDiscovery {
@JvmStatic
@WorkerThread
fun syncRecipientInfoWithSystemContacts(context: Context) {
syncRecipientsWithSystemContacts(context, emptyMap())
syncRecipientsWithSystemContacts(
context = context,
rewrites = emptyMap(),
clearInfoForMissingContacts = true
)
}
private fun phoneNumberFormatter(context: Context): (String) -> String {
@@ -156,22 +162,24 @@ object ContactDiscovery {
addSystemContactLinks(context, result.registeredIds, removeSystemContactLinksIfMissing)
stopwatch.split("contact-links")
val useFullSync = removeSystemContactLinksIfMissing && result.registeredIds.size > FULL_SYSTEM_CONTACT_SYNC_THRESHOLD
syncRecipientsWithSystemContacts(
context = context,
rewrites = result.rewrites,
contactsProvider = {
if (result.registeredIds.size > FULL_SYSTEM_CONTACT_SYNC_THRESHOLD) {
Log.d(TAG, "Doing a full system contact sync because there are ${result.registeredIds.size} contacts to get info for.")
if (useFullSync) {
Log.d(TAG, "Doing a full system contact sync. There are ${result.registeredIds.size} contacts to get info for.")
SystemContactsRepository.getAllSystemContacts(context, phoneNumberFormatter(context))
} else {
Log.d(TAG, "Doing a partial system contact sync because there are ${result.registeredIds.size} contacts to get info for.")
Log.d(TAG, "Doing a partial system contact sync. There are ${result.registeredIds.size} contacts to get info for.")
SystemContactsRepository.getContactDetailsByQueries(
context = context,
queries = Recipient.resolvedList(result.registeredIds).mapNotNull { it.e164.orElse(null) },
e164Formatter = phoneNumberFormatter(context)
)
}
}
},
clearInfoForMissingContacts = useFullSync
)
stopwatch.split("contact-sync")
@@ -282,15 +290,18 @@ object ContactDiscovery {
private fun syncRecipientsWithSystemContacts(
context: Context,
rewrites: Map<String, String>,
contactsProvider: () -> SystemContactsRepository.ContactIterator = { SystemContactsRepository.getAllSystemContacts(context, phoneNumberFormatter(context)) }
contactsProvider: () -> ContactIterator = { SystemContactsRepository.getAllSystemContacts(context, phoneNumberFormatter(context)) },
clearInfoForMissingContacts: Boolean
) {
val handle = SignalDatabase.recipients.beginBulkSystemContactUpdate()
val localNumber: String = SignalStore.account().e164 ?: ""
val handle = SignalDatabase.recipients.beginBulkSystemContactUpdate(clearInfoForMissingContacts)
try {
contactsProvider().use { iterator ->
while (iterator.hasNext()) {
val details = iterator.next()
val phoneDetailsWithoutSelf: List<ContactPhoneDetails> = details.numbers.filter { it.number != localNumber }
for (phoneDetails in details.numbers) {
for (phoneDetails in phoneDetailsWithoutSelf) {
val realNumber: String = Util.getFirstNonEmpty(rewrites[phoneDetails.number], phoneDetails.number)
val profileName: ProfileName = if (!StringUtil.isEmpty(details.givenName)) {