From 6cf33897c08a7ddfe21e26864f1ad3bd31779378 Mon Sep 17 00:00:00 2001 From: Alan Evans Date: Fri, 8 May 2020 12:35:57 -0300 Subject: [PATCH] Remove superfluous groups v2 capability checks. --- .../securesms/groups/GroupsV2CapabilityChecker.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupsV2CapabilityChecker.java b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupsV2CapabilityChecker.java index 26d0302d5a..c5b69fd424 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupsV2CapabilityChecker.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupsV2CapabilityChecker.java @@ -1,7 +1,5 @@ package org.thoughtcrime.securesms.groups; -import android.content.Context; - import androidx.annotation.NonNull; import androidx.annotation.WorkerThread; @@ -43,9 +41,8 @@ final class GroupsV2CapabilityChecker { for (RecipientId recipientId : recipientIdsSet) { Recipient member = Recipient.resolved(recipientId); Recipient.Capability gv2Capability = member.getGroupsV2Capability(); - Recipient.Capability uuidCapability = member.getUuidCapability(); - if (gv2Capability == Recipient.Capability.UNKNOWN || uuidCapability == Recipient.Capability.UNKNOWN) { + if (gv2Capability == Recipient.Capability.UNKNOWN) { if (!ApplicationDependencies.getJobManager().runSynchronously(RetrieveProfileJob.forRecipient(member), TimeUnit.SECONDS.toMillis(1000)).isPresent()) { throw new IOException("Recipient capability was not retrieved in time"); } @@ -55,11 +52,6 @@ final class GroupsV2CapabilityChecker { Log.i(TAG, "At least one recipient does not support GV2, capability was " + gv2Capability); return false; } - - if (uuidCapability != Recipient.Capability.SUPPORTED) { - Log.i(TAG, "At least one recipient does not support UUID, capability was " + uuidCapability); - return false; - } } for (RecipientId recipientId : recipientIdsSet) {