From 61fe6cc961518b6df8906627d5e4f56646dd851c Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 29 May 2020 17:42:23 -0400
Subject: [PATCH] Enable the ability to react with any emoji.

---
 .../conversation/ConversationReactionOverlay.java      |  3 +--
 .../org/thoughtcrime/securesms/util/FeatureFlags.java  | 10 +---------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java
index b42b7f33d86..151bc3fc725 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java
@@ -120,8 +120,7 @@ protected void onFinishInflate() {
                        .map(e -> findViewById(e.viewId))
                        .toArray(EmojiImageView[]::new);
 
-    customEmojiIndex = FeatureFlags.reactWithAnyEmoji() ? ReactionEmoji.values().length - 1
-                                                        : ReactionEmoji.values().length;
+    customEmojiIndex = ReactionEmoji.values().length - 1;
 
     distanceFromTouchDownPointToTopOfScrubberDeadZone    = getResources().getDimensionPixelSize(R.dimen.conversation_reaction_scrub_deadzone_distance_from_touch_top);
     distanceFromTouchDownPointToBottomOfScrubberDeadZone = getResources().getDimensionPixelSize(R.dimen.conversation_reaction_scrub_deadzone_distance_from_touch_bottom);
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 c598a8796d8..9cc3fbcf820 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
@@ -60,7 +60,6 @@ public final class FeatureFlags {
   private static final String REMOTE_DELETE              = "android.remoteDelete";
   private static final String PROFILE_FOR_CALLING        = "android.profileForCalling";
   private static final String CALLING_PIP                = "android.callingPip";
-  private static final String REACT_WITH_ANY_EMOJI       = "android.reactWithAnyEmoji";
   private static final String NEW_GROUP_UI               = "android.newGroupUI";
   private static final String VERSIONED_PROFILES         = "android.versionedProfiles";
   private static final String GROUPS_V2                  = "android.groupsv2";
@@ -85,7 +84,6 @@ public final class FeatureFlags {
       PROFILE_FOR_CALLING,
       CALLING_PIP,
       NEW_GROUP_UI,
-      REACT_WITH_ANY_EMOJI,
       VERSIONED_PROFILES,
       GROUPS_V2,
       GROUPS_V2_CREATE,
@@ -113,8 +111,7 @@ public final class FeatureFlags {
    */
   private static final Set<String> HOT_SWAPPABLE = Sets.newHashSet(
       PINS_MEGAPHONE_KILL_SWITCH,
-      ATTACHMENTS_V3,
-      REACT_WITH_ANY_EMOJI
+      ATTACHMENTS_V3
   );
 
   /**
@@ -267,11 +264,6 @@ public static boolean newGroupUI() {
     return getBoolean(NEW_GROUP_UI, false);
   }
 
-  /** React with Any Emoji */
-  public static boolean reactWithAnyEmoji() {
-    return getBoolean(REACT_WITH_ANY_EMOJI, false);
-  }
-
   /** Read and write versioned profile information. */
   public static boolean versionedProfiles() {
     return getBoolean(VERSIONED_PROFILES, false);