From 4f921d761d4181973986ac9d52981978bfb243e1 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 31 Jan 2020 12:02:55 -0500
Subject: [PATCH] Enable reaction sending.

---
 .../securesms/conversation/ConversationFragment.java           | 3 +--
 .../java/org/thoughtcrime/securesms/megaphone/Megaphones.java  | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
index 11c94e5b6d..9279f808b6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
@@ -995,8 +995,7 @@ public class ConversationFragment extends Fragment
 
       if (actionMode != null) return;
 
-      if (FeatureFlags.reactionSending() &&
-          messageRecord.isSecure()       &&
+      if (messageRecord.isSecure()       &&
           !messageRecord.isUpdate()      &&
           ((ConversationAdapter) list.getAdapter()).getSelectedItems().isEmpty())
       {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java b/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java
index af50888e74..d7a1517e44 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java
@@ -74,7 +74,7 @@ public final class Megaphones {
    */
   private static Map<Event, MegaphoneSchedule> buildDisplayOrder() {
     return new LinkedHashMap<Event, MegaphoneSchedule>() {{
-      put(Event.REACTIONS, new ForeverSchedule(FeatureFlags.reactionSending()));
+      put(Event.REACTIONS, new ForeverSchedule(true));
       put(Event.PINS_FOR_ALL, new PinsForAllSchedule());
     }};
   }