From 1a21cafe6cdbdf8c12cbfec70409847231b8f537 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Tue, 24 Aug 2021 10:15:11 -0300
Subject: [PATCH] Remove multi-forward feature flag.

---
 .../thoughtcrime/securesms/conversation/MenuState.java   | 2 +-
 .../securesms/conversation/mutiselect/Multiselect.kt     | 5 -----
 .../mutiselect/forward/MultiselectForwardFragment.kt     | 3 ---
 .../org/thoughtcrime/securesms/util/FeatureFlags.java    | 9 +--------
 4 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/MenuState.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/MenuState.java
index d1fcf491b..df76656c9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/MenuState.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/MenuState.java
@@ -116,7 +116,7 @@ final class MenuState {
                                       !viewOnce        &&
                                       !remoteDelete    &&
                                       !hasPendingMedia &&
-                                      ((FeatureFlags.forwardMultipleMessages() && selectedParts.size() <= MAX_FORWARDABLE_COUNT) || selectedParts.size() == 1);
+                                      selectedParts.size() <= MAX_FORWARDABLE_COUNT;
 
     int uniqueRecords = selectedParts.stream()
                                      .map(MultiselectPart::getMessageRecord)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/Multiselect.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/Multiselect.kt
index 18a6cae79..baa5e9274 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/Multiselect.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/Multiselect.kt
@@ -13,7 +13,6 @@ import org.thoughtcrime.securesms.database.model.MmsMessageRecord
 import org.thoughtcrime.securesms.mms.MediaConstraints
 import org.thoughtcrime.securesms.mms.SlideDeck
 import org.thoughtcrime.securesms.mms.TextSlide
-import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.Util
 
 /**
@@ -29,10 +28,6 @@ object Multiselect {
   fun getParts(conversationMessage: ConversationMessage): MultiselectCollection {
     val messageRecord = conversationMessage.messageRecord
 
-    if (!FeatureFlags.forwardMultipleMessages()) {
-      return MultiselectCollection.Single(MultiselectPart.Message(conversationMessage))
-    }
-
     if (messageRecord.isUpdate) {
       return MultiselectCollection.Single(MultiselectPart.Update(conversationMessage))
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragment.kt
index 2fe84675f..55b605ec3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragment.kt
@@ -117,12 +117,9 @@ class MultiselectForwardFragment :
     val shareSelectionRecycler: RecyclerView = bottomBar.findViewById(R.id.selected_list)
     val shareSelectionAdapter = ShareSelectionAdapter()
     val sendButton: View = bottomBar.findViewById(R.id.share_confirm)
-    val addMessageWrapper: View = bottomBar.findViewById(R.id.add_message_wrapper)
 
     addMessage = bottomBar.findViewById(R.id.add_message)
 
-    addMessageWrapper.visible = FeatureFlags.forwardMultipleMessages()
-
     sendButton.setOnClickListener {
       sendButton.isEnabled = false
       viewModel.send(addMessage.text.toString())
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 1b4a60206..72aeae9ad 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
@@ -82,7 +82,6 @@ public final class FeatureFlags {
   private static final String RETRY_RECEIPTS                    = "android.retryReceipts";
   private static final String SUGGEST_SMS_BLACKLIST             = "android.suggestSmsBlacklist";
   private static final String ANNOUNCEMENT_GROUPS               = "android.announcementGroups";
-  private static final String FORWARD_MULTIPLE_MESSAGES         = "android.forward.multiple.messages";
 
   /**
    * We will only store remote values for flags in this set. If you want a flag to be controllable
@@ -118,8 +117,7 @@ public final class FeatureFlags {
       SENDER_KEY,
       RETRY_RECEIPTS,
       SUGGEST_SMS_BLACKLIST,
-      ANNOUNCEMENT_GROUPS,
-      FORWARD_MULTIPLE_MESSAGES
+      ANNOUNCEMENT_GROUPS
   );
 
   @VisibleForTesting
@@ -385,11 +383,6 @@ public final class FeatureFlags {
     return getString(SUGGEST_SMS_BLACKLIST, "");
   }
 
-  /** Whether the user is able to forward multiple messages at once */
-  public static boolean forwardMultipleMessages() {
-    return getBoolean(FORWARD_MULTIPLE_MESSAGES, false);
-  }
-
   /** Only for rendering debug info. */
   public static synchronized @NonNull Map<String, Object> getMemoryValues() {
     return new TreeMap<>(REMOTE_VALUES);