diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/GroupSendUtil.java b/app/src/main/java/org/thoughtcrime/securesms/messages/GroupSendUtil.java index dd0d80a3d1..81308a47cd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/messages/GroupSendUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/messages/GroupSendUtil.java @@ -185,28 +185,22 @@ public final class GroupSendUtil { } } - if (FeatureFlags.senderKey()) { - if (groupId == null) { - Log.i(TAG, "Recipients not in a group. Using legacy."); - legacyTargets.addAll(senderKeyTargets); - senderKeyTargets.clear(); - } else if (Recipient.self().getSenderKeyCapability() != Recipient.Capability.SUPPORTED) { - Log.i(TAG, "All of our devices do not support sender key. Using legacy."); - legacyTargets.addAll(senderKeyTargets); - senderKeyTargets.clear(); - } else if (SignalStore.internalValues().removeSenderKeyMinimum()) { - Log.i(TAG, "Sender key minimum removed. Using for " + senderKeyTargets.size() + " recipients."); - } else if (senderKeyTargets.size() < 2) { - Log.i(TAG, "Too few sender-key-capable users (" + senderKeyTargets.size() + "). Doing all legacy sends."); - legacyTargets.addAll(senderKeyTargets); - senderKeyTargets.clear(); - } else { - Log.i(TAG, "Can use sender key for " + senderKeyTargets.size() + "/" + allTargets.size() + " recipients."); - } - } else { - Log.i(TAG, "Feature flag disabled. Using legacy."); + if (groupId == null) { + Log.i(TAG, "Recipients not in a group. Using legacy."); legacyTargets.addAll(senderKeyTargets); senderKeyTargets.clear(); + } else if (Recipient.self().getSenderKeyCapability() != Recipient.Capability.SUPPORTED) { + Log.i(TAG, "All of our devices do not support sender key. Using legacy."); + legacyTargets.addAll(senderKeyTargets); + senderKeyTargets.clear(); + } else if (SignalStore.internalValues().removeSenderKeyMinimum()) { + Log.i(TAG, "Sender key minimum removed. Using for " + senderKeyTargets.size() + " recipients."); + } else if (senderKeyTargets.size() < 2) { + Log.i(TAG, "Too few sender-key-capable users (" + senderKeyTargets.size() + "). Doing all legacy sends."); + legacyTargets.addAll(senderKeyTargets); + senderKeyTargets.clear(); + } else { + Log.i(TAG, "Can use sender key for " + senderKeyTargets.size() + "/" + allTargets.size() + " recipients."); } if (relatedMessageId != null) { 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 c507a3b7e4..eb87adce7a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java @@ -375,11 +375,6 @@ public final class FeatureFlags { return getLong(RETRY_RESPOND_MAX_AGE, TimeUnit.DAYS.toMillis(14)); } - /** Whether or not sending using sender key is enabled. */ - public static boolean senderKey() { - return getBoolean(SENDER_KEY, true); - } - /** How long a sender key can live before it needs to be rotated. */ public static long senderKeyMaxAge() { return Math.min(getLong(SENDER_KEY_MAX_AGE, TimeUnit.DAYS.toMillis(14)), TimeUnit.DAYS.toMillis(90));