Enable the ability to react with any emoji.

signalapp · May 29, 2020 · 61fe6cc · 61fe6cc
1 parent 70c88b6
commit 61fe6cc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 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
@@ -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
@@ -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);