From 6cc41e95c612b5709911c8a12cb19af0450fadf1 Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Thu, 15 Jun 2023 12:23:35 -0400
Subject: [PATCH] Remove edit message receive feature flag.

---
 .../messages/MessageContentProcessorV2.kt     | 22 ++++++++-----------
 .../securesms/util/FeatureFlags.java          |  7 ------
 2 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessorV2.kt b/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessorV2.kt
index b49fbb1f58..8a9344ce11 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessorV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessorV2.kt
@@ -415,19 +415,15 @@ open class MessageContentProcessorV2(private val context: Context) {
         handleRetryReceipt(envelope, metadata, content.decryptionErrorMessage!!.toDecryptionErrorMessage(metadata), senderRecipient)
       }
       content.hasEditMessage() -> {
-        if (FeatureFlags.editMessageReceiving()) {
-          EditMessageProcessor.process(
-            context,
-            senderRecipient,
-            threadRecipient,
-            envelope,
-            content,
-            metadata,
-            if (processingEarlyContent) null else EarlyMessageCacheEntry(envelope, content, metadata, serverDeliveredTimestamp)
-          )
-        } else {
-          warn(envelope.timestamp, "Got message edit, but processing is disabled")
-        }
+        EditMessageProcessor.process(
+          context,
+          senderRecipient,
+          threadRecipient,
+          envelope,
+          content,
+          metadata,
+          if (processingEarlyContent) null else EarlyMessageCacheEntry(envelope, content, metadata, serverDeliveredTimestamp)
+        )
       }
       content.hasSenderKeyDistributionMessage() || content.hasPniSignatureMessage() -> {
         // Already handled, here in order to prevent unrecognized message log
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 6f0f0bd889..c3ffafb301 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
@@ -105,7 +105,6 @@ public final class FeatureFlags {
   private static final String TEXT_FORMATTING                   = "android.textFormatting.3";
   private static final String ANY_ADDRESS_PORTS_KILL_SWITCH     = "android.calling.fieldTrial.anyAddressPortsKillSwitch";
   private static final String AD_HOC_CALLING                    = "android.calling.ad.hoc.2";
-  private static final String EDIT_MESSAGE_RECEIVE              = "android.editMessage.receive.2";
   private static final String EDIT_MESSAGE_SEND                 = "android.editMessage.send.2";
   private static final String MAX_ATTACHMENT_COUNT              = "android.attachments.maxCount";
   private static final String MAX_ATTACHMENT_SIZE_MB            = "android.attachments.maxSize";
@@ -166,7 +165,6 @@ public final class FeatureFlags {
       PAYPAL_RECURRING_DONATIONS,
       TEXT_FORMATTING,
       ANY_ADDRESS_PORTS_KILL_SWITCH,
-      EDIT_MESSAGE_RECEIVE,
       EDIT_MESSAGE_SEND,
       MAX_ATTACHMENT_COUNT,
       MAX_ATTACHMENT_SIZE_MB,
@@ -234,7 +232,6 @@ public final class FeatureFlags {
       PAYMENTS_REQUEST_ACTIVATE_FLOW,
       CDS_HARD_LIMIT,
       TEXT_FORMATTING,
-      EDIT_MESSAGE_RECEIVE,
       EDIT_MESSAGE_SEND,
       MAX_ATTACHMENT_COUNT,
       MAX_ATTACHMENT_SIZE_MB
@@ -591,10 +588,6 @@ public final class FeatureFlags {
     return getBoolean(ANY_ADDRESS_PORTS_KILL_SWITCH, false);
   }
 
-  public static boolean editMessageReceiving() {
-    return getBoolean(EDIT_MESSAGE_RECEIVE, false);
-  }
-
   public static boolean editMessageSending() {
     return getBoolean(EDIT_MESSAGE_SEND, false);
   }