From 4429145cdfeae6cfda885747945283351aab6add Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Thu, 6 Jul 2023 13:44:54 -0400 Subject: [PATCH] Remove deprecated ignoreResults parameter. --- .../contacts/sync/ContactDiscovery.kt | 6 +- .../sync/ContactDiscoveryRefreshV2.kt | 97 +++++++++---------- 2 files changed, 48 insertions(+), 55 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscovery.kt b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscovery.kt index b08e5935c5..853f3cc1a0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscovery.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscovery.kt @@ -66,7 +66,7 @@ object ContactDiscovery { context = context, descriptor = "refresh-all", refresh = { - ContactDiscoveryRefreshV2.refreshAll(context, useCompat = !FeatureFlags.phoneNumberPrivacy(), ignoreResults = false) + ContactDiscoveryRefreshV2.refreshAll(context, useCompat = !FeatureFlags.phoneNumberPrivacy()) }, removeSystemContactLinksIfMissing = true, notifyOfNewUsers = notifyOfNewUsers @@ -83,7 +83,7 @@ object ContactDiscovery { context = context, descriptor = "refresh-multiple", refresh = { - ContactDiscoveryRefreshV2.refresh(context, recipients, useCompat = !FeatureFlags.phoneNumberPrivacy(), ignoreResults = false) + ContactDiscoveryRefreshV2.refresh(context, recipients, useCompat = !FeatureFlags.phoneNumberPrivacy()) }, removeSystemContactLinksIfMissing = false, notifyOfNewUsers = notifyOfNewUsers @@ -99,7 +99,7 @@ object ContactDiscovery { context = context, descriptor = "refresh-single", 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, notifyOfNewUsers = notifyOfNewUsers diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscoveryRefreshV2.kt b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscoveryRefreshV2.kt index 936f49cda5..716621cfc3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscoveryRefreshV2.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscoveryRefreshV2.kt @@ -49,7 +49,7 @@ object ContactDiscoveryRefreshV2 { @WorkerThread @Synchronized @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 = SignalDatabase.recipients.getAllE164s().sanitize() val systemE164s: Set = SystemContactsRepository.getAllDisplayNumbers(context).toE164s(context).sanitize() @@ -59,7 +59,6 @@ object ContactDiscoveryRefreshV2 { inputPreviousE164s = SignalDatabase.cds.getAllE164s(), isPartialRefresh = false, useCompat = useCompat, - ignoreResults = ignoreResults, timeoutMs = timeoutMs ) } @@ -68,14 +67,14 @@ object ContactDiscoveryRefreshV2 { @WorkerThread @Synchronized @JvmStatic - fun refresh(context: Context, inputRecipients: List, useCompat: Boolean, ignoreResults: Boolean, timeoutMs: Long? = null): ContactDiscovery.RefreshResult { + fun refresh(context: Context, inputRecipients: List, useCompat: Boolean, timeoutMs: Long? = null): ContactDiscovery.RefreshResult { val recipients: List = inputRecipients.map { it.resolve() } val inputE164s: Set = recipients.mapNotNull { it.e164.orElse(null) }.toSet().sanitize() 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.") - 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 = recipients.map { it.id }.toSet() ContactDiscovery.RefreshResult( @@ -89,7 +88,6 @@ object ContactDiscoveryRefreshV2 { inputPreviousE164s = emptySet(), isPartialRefresh = true, useCompat = useCompat, - ignoreResults = ignoreResults, timeoutMs = timeoutMs ) } @@ -102,7 +100,6 @@ object ContactDiscoveryRefreshV2 { inputPreviousE164s: Set, isPartialRefresh: Boolean, useCompat: Boolean, - ignoreResults: Boolean, timeoutMs: Long? = null ): ContactDiscovery.RefreshResult { val tag = "refreshInternal-${if (useCompat) "compat" else "v2"}" @@ -173,54 +170,50 @@ object ContactDiscoveryRefreshV2 { val registeredIds: MutableSet = mutableSetOf() val rewrites: MutableMap = mutableMapOf() - if (ignoreResults) { - Log.w(TAG, "[$tag] Ignoring CDSv2 results.") - } else { - if (useCompat) { - val transformed: Map = response.results.mapValues { entry -> entry.value.aci.orElse(null) } - val fuzzyOutput: OutputResult = FuzzyPhoneNumberHelper.generateOutput(transformed, fuzzyInput) + if (useCompat) { + val transformed: Map = response.results.mapValues { entry -> entry.value.aci.orElse(null) } + val fuzzyOutput: OutputResult = FuzzyPhoneNumberHelper.generateOutput(transformed, fuzzyInput) - if (transformed.values.any { it == null }) { - throw IOException("Unexpected null ACI!") - } - - SignalDatabase.recipients.rewritePhoneNumbers(fuzzyOutput.rewrites) - stopwatch.split("rewrite-e164") - - val aciMap: Map = SignalDatabase.recipients.bulkProcessCdsResult(fuzzyOutput.numbers) - - registeredIds += aciMap.keys - rewrites += fuzzyOutput.rewrites - stopwatch.split("process-result") - - val existingIds: Set = SignalDatabase.recipients.getAllPossiblyRegisteredByE164(recipientE164s + rewrites.values) - stopwatch.split("get-ids") - - val inactiveIds: Set = (existingIds - registeredIds).removeRegisteredButUnlisted() - stopwatch.split("registered-but-unlisted") - - SignalDatabase.recipients.bulkUpdatedRegisteredStatus(aciMap, inactiveIds) - stopwatch.split("update-registered") - } else { - val transformed: Map = response.results.mapValues { entry -> CdsV2Result(entry.value.pni, entry.value.aci.orElse(null)) } - val fuzzyOutput: OutputResult = FuzzyPhoneNumberHelper.generateOutput(transformed, fuzzyInput) - - SignalDatabase.recipients.rewritePhoneNumbers(fuzzyOutput.rewrites) - stopwatch.split("rewrite-e164") - - registeredIds += SignalDatabase.recipients.bulkProcessCdsV2Result(fuzzyOutput.numbers) - rewrites += fuzzyOutput.rewrites - stopwatch.split("process-result") - - val existingIds: Set = SignalDatabase.recipients.getAllPossiblyRegisteredByE164(recipientE164s + rewrites.values) - stopwatch.split("get-ids") - - val inactiveIds: Set = (existingIds - registeredIds).removeRegisteredButUnlisted() - stopwatch.split("registered-but-unlisted") - - SignalDatabase.recipients.bulkUpdatedRegisteredStatusV2(registeredIds, inactiveIds) - stopwatch.split("update-registered") + if (transformed.values.any { it == null }) { + throw IOException("Unexpected null ACI!") } + + SignalDatabase.recipients.rewritePhoneNumbers(fuzzyOutput.rewrites) + stopwatch.split("rewrite-e164") + + val aciMap: Map = SignalDatabase.recipients.bulkProcessCdsResult(fuzzyOutput.numbers) + + registeredIds += aciMap.keys + rewrites += fuzzyOutput.rewrites + stopwatch.split("process-result") + + val existingIds: Set = SignalDatabase.recipients.getAllPossiblyRegisteredByE164(recipientE164s + rewrites.values) + stopwatch.split("get-ids") + + val inactiveIds: Set = (existingIds - registeredIds).removeRegisteredButUnlisted() + stopwatch.split("registered-but-unlisted") + + SignalDatabase.recipients.bulkUpdatedRegisteredStatus(aciMap, inactiveIds) + stopwatch.split("update-registered") + } else { + val transformed: Map = response.results.mapValues { entry -> CdsV2Result(entry.value.pni, entry.value.aci.orElse(null)) } + val fuzzyOutput: OutputResult = FuzzyPhoneNumberHelper.generateOutput(transformed, fuzzyInput) + + SignalDatabase.recipients.rewritePhoneNumbers(fuzzyOutput.rewrites) + stopwatch.split("rewrite-e164") + + registeredIds += SignalDatabase.recipients.bulkProcessCdsV2Result(fuzzyOutput.numbers) + rewrites += fuzzyOutput.rewrites + stopwatch.split("process-result") + + val existingIds: Set = SignalDatabase.recipients.getAllPossiblyRegisteredByE164(recipientE164s + rewrites.values) + stopwatch.split("get-ids") + + val inactiveIds: Set = (existingIds - registeredIds).removeRegisteredButUnlisted() + stopwatch.split("registered-but-unlisted") + + SignalDatabase.recipients.bulkUpdatedRegisteredStatusV2(registeredIds, inactiveIds) + stopwatch.split("update-registered") } stopwatch.stop(TAG)