From 135d002f021e610f348bae4c939ee808f547f05d Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Fri, 2 Sep 2022 10:52:20 -0400 Subject: [PATCH] Fix possible crash with CDSv2 compat. --- .../securesms/contacts/sync/ContactDiscoveryRefreshV2.kt | 1 + .../main/java/org/thoughtcrime/securesms/util/FeatureFlags.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 753308a859..3835ba379b 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 @@ -208,6 +208,7 @@ object ContactDiscoveryRefreshV2 { @WorkerThread private fun Set.removeRegisteredButUnlisted(): Set { val futures: List>> = Recipient.resolvedList(this) + .filter { it.hasServiceId() } .filter { hasCommunicatedWith(it) } .map { SignalExecutors.UNBOUNDED.submit( diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java index 8fb5a1e992..fccea55463 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java @@ -103,7 +103,7 @@ public final class FeatureFlags { private static final String RECIPIENT_MERGE_V2 = "android.recipientMergeV2"; private static final String CDS_V2_LOAD_TEST = "android.cdsV2LoadTest"; private static final String SMS_EXPORTER = "android.sms.exporter"; - private static final String CDS_V2_COMPAT = "android.cdsV2Compat"; + private static final String CDS_V2_COMPAT = "android.cdsV2Compat.2"; /** * We will only store remote values for flags in this set. If you want a flag to be controllable