Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-22 20:18:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove deprecated ignoreResults parameter.

Browse Source
This commit is contained in:
Greyson Parrelli
2023-07-06 13:44:54 -04:00
committed by Clark Chen
parent 5ea4cbf9ca
commit 4429145cdf
2 changed files with 48 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,7 +66,7 @@ object ContactDiscovery {
context = context, context = context,
descriptor = "refresh-all", descriptor = "refresh-all",
refresh = { refresh = {
ContactDiscoveryRefreshV2.refreshAll(context, useCompat = !FeatureFlags.phoneNumberPrivacy(), ignoreResults = false) ContactDiscoveryRefreshV2.refreshAll(context, useCompat = !FeatureFlags.phoneNumberPrivacy())
}, },
removeSystemContactLinksIfMissing = true, removeSystemContactLinksIfMissing = true,
notifyOfNewUsers = notifyOfNewUsers notifyOfNewUsers = notifyOfNewUsers
@@ -83,7 +83,7 @@ object ContactDiscovery {
context = context, context = context,
descriptor = "refresh-multiple", descriptor = "refresh-multiple",
refresh = { refresh = {
ContactDiscoveryRefreshV2.refresh(context, recipients, useCompat = !FeatureFlags.phoneNumberPrivacy(), ignoreResults = false) ContactDiscoveryRefreshV2.refresh(context, recipients, useCompat = !FeatureFlags.phoneNumberPrivacy())
}, },
removeSystemContactLinksIfMissing = false, removeSystemContactLinksIfMissing = false,
notifyOfNewUsers = notifyOfNewUsers notifyOfNewUsers = notifyOfNewUsers
@@ -99,7 +99,7 @@ object ContactDiscovery {
context = context, context = context,
descriptor = "refresh-single", descriptor = "refresh-single",
refresh = { refresh = {
ContactDiscoveryRefreshV2.refresh(context, listOf(recipient), useCompat = !FeatureFlags.phoneNumberPrivacy(), ignoreResults = false, timeoutMs = timeoutMs) ContactDiscoveryRefreshV2.refresh(context, listOf(recipient), useCompat = !FeatureFlags.phoneNumberPrivacy(), timeoutMs = timeoutMs)
}, },
removeSystemContactLinksIfMissing = false, removeSystemContactLinksIfMissing = false,
notifyOfNewUsers = notifyOfNewUsers notifyOfNewUsers = notifyOfNewUsers

13
app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscoveryRefreshV2.kt
View File

@@ -49,7 +49,7 @@ object ContactDiscoveryRefreshV2 {
@WorkerThread @WorkerThread
@Synchronized @Synchronized
@JvmStatic @JvmStatic
fun refreshAll(context: Context, useCompat: Boolean, ignoreResults: Boolean, timeoutMs: Long? = null): ContactDiscovery.RefreshResult { fun refreshAll(context: Context, useCompat: Boolean, timeoutMs: Long? = null): ContactDiscovery.RefreshResult {
val recipientE164s: Set<String> = SignalDatabase.recipients.getAllE164s().sanitize() val recipientE164s: Set<String> = SignalDatabase.recipients.getAllE164s().sanitize()
val systemE164s: Set<String> = SystemContactsRepository.getAllDisplayNumbers(context).toE164s(context).sanitize() val systemE164s: Set<String> = SystemContactsRepository.getAllDisplayNumbers(context).toE164s(context).sanitize()
@@ -59,7 +59,6 @@ object ContactDiscoveryRefreshV2 {
inputPreviousE164s = SignalDatabase.cds.getAllE164s(), inputPreviousE164s = SignalDatabase.cds.getAllE164s(),
isPartialRefresh = false, isPartialRefresh = false,
useCompat = useCompat, useCompat = useCompat,
ignoreResults = ignoreResults,
timeoutMs = timeoutMs timeoutMs = timeoutMs
) )
} }
@@ -68,14 +67,14 @@ object ContactDiscoveryRefreshV2 {
@WorkerThread @WorkerThread
@Synchronized @Synchronized
@JvmStatic @JvmStatic
fun refresh(context: Context, inputRecipients: List<Recipient>, useCompat: Boolean, ignoreResults: Boolean, timeoutMs: Long? = null): ContactDiscovery.RefreshResult { fun refresh(context: Context, inputRecipients: List<Recipient>, useCompat: Boolean, timeoutMs: Long? = null): ContactDiscovery.RefreshResult {
val recipients: List<Recipient> = inputRecipients.map { it.resolve() } val recipients: List<Recipient> = inputRecipients.map { it.resolve() }
val inputE164s: Set<String> = recipients.mapNotNull { it.e164.orElse(null) }.toSet().sanitize() val inputE164s: Set<String> = recipients.mapNotNull { it.e164.orElse(null) }.toSet().sanitize()
return if (inputE164s.size > MAXIMUM_ONE_OFF_REQUEST_SIZE) { return if (inputE164s.size > MAXIMUM_ONE_OFF_REQUEST_SIZE) {
Log.i(TAG, "List of specific recipients to refresh is too large! (Size: ${recipients.size}). Doing a full refresh instead.") Log.i(TAG, "List of specific recipients to refresh is too large! (Size: ${recipients.size}). Doing a full refresh instead.")
val fullResult: ContactDiscovery.RefreshResult = refreshAll(context, useCompat = useCompat, ignoreResults = ignoreResults, timeoutMs = timeoutMs) val fullResult: ContactDiscovery.RefreshResult = refreshAll(context, useCompat = useCompat, timeoutMs = timeoutMs)
val inputIds: Set<RecipientId> = recipients.map { it.id }.toSet() val inputIds: Set<RecipientId> = recipients.map { it.id }.toSet()
ContactDiscovery.RefreshResult( ContactDiscovery.RefreshResult(
@@ -89,7 +88,6 @@ object ContactDiscoveryRefreshV2 {
inputPreviousE164s = emptySet(), inputPreviousE164s = emptySet(),
isPartialRefresh = true, isPartialRefresh = true,
useCompat = useCompat, useCompat = useCompat,
ignoreResults = ignoreResults,
timeoutMs = timeoutMs timeoutMs = timeoutMs
) )
} }
@@ -102,7 +100,6 @@ object ContactDiscoveryRefreshV2 {
inputPreviousE164s: Set<String>, inputPreviousE164s: Set<String>,
isPartialRefresh: Boolean, isPartialRefresh: Boolean,
useCompat: Boolean, useCompat: Boolean,
ignoreResults: Boolean,
timeoutMs: Long? = null timeoutMs: Long? = null
): ContactDiscovery.RefreshResult { ): ContactDiscovery.RefreshResult {
val tag = "refreshInternal-${if (useCompat) "compat" else "v2"}" val tag = "refreshInternal-${if (useCompat) "compat" else "v2"}"
@@ -173,9 +170,6 @@ object ContactDiscoveryRefreshV2 {
val registeredIds: MutableSet<RecipientId> = mutableSetOf() val registeredIds: MutableSet<RecipientId> = mutableSetOf()
val rewrites: MutableMap<String, String> = mutableMapOf() val rewrites: MutableMap<String, String> = mutableMapOf()
if (ignoreResults) {
Log.w(TAG, "[$tag] Ignoring CDSv2 results.")
} else {
if (useCompat) { if (useCompat) {
val transformed: Map<String, ACI?> = response.results.mapValues { entry -> entry.value.aci.orElse(null) } val transformed: Map<String, ACI?> = response.results.mapValues { entry -> entry.value.aci.orElse(null) }
val fuzzyOutput: OutputResult<ACI> = FuzzyPhoneNumberHelper.generateOutput(transformed, fuzzyInput) val fuzzyOutput: OutputResult<ACI> = FuzzyPhoneNumberHelper.generateOutput(transformed, fuzzyInput)
@@ -221,7 +215,6 @@ object ContactDiscoveryRefreshV2 {
SignalDatabase.recipients.bulkUpdatedRegisteredStatusV2(registeredIds, inactiveIds) SignalDatabase.recipients.bulkUpdatedRegisteredStatusV2(registeredIds, inactiveIds)
stopwatch.split("update-registered") stopwatch.split("update-registered")
} }
}
stopwatch.stop(TAG) stopwatch.stop(TAG)