Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-23 11:15:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix possible crash with CDSv2 compat.

Browse Source
This commit is contained in:
Greyson Parrelli
2022-09-02 10:52:20 -04:00
parent a45ede9348
commit 135d002f02
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -208,6 +208,7 @@ object ContactDiscoveryRefreshV2 {
@WorkerThread
private fun Set<RecipientId>.removeRegisteredButUnlisted(): Set<RecipientId> {
val futures: List<Future<Pair<RecipientId, Boolean?>>> = Recipient.resolvedList(this)
.filter { it.hasServiceId() }
.filter { hasCommunicatedWith(it) }
.map {
SignalExecutors.UNBOUNDED.submit(

2
app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
View File

@@ -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