TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-11 04:18:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable reaction sending.

Browse Source
This commit is contained in:
Greyson Parrelli 2020-01-31 12:02:55 -05:00
parent 37f85d6deb
commit 4f921d761d
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
View File

@ -995,8 +995,7 @@ public class ConversationFragment extends Fragment
if (actionMode != null) return; if (actionMode != null) return;
if (FeatureFlags.reactionSending() && if (messageRecord.isSecure() &&
messageRecord.isSecure() &&
!messageRecord.isUpdate() && !messageRecord.isUpdate() &&
((ConversationAdapter) list.getAdapter()).getSelectedItems().isEmpty()) ((ConversationAdapter) list.getAdapter()).getSelectedItems().isEmpty())
{ {

2
app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java
View File

@ -74,7 +74,7 @@ public final class Megaphones {
*/ */
private static Map<Event, MegaphoneSchedule> buildDisplayOrder() { private static Map<Event, MegaphoneSchedule> buildDisplayOrder() {
return new LinkedHashMap<Event, MegaphoneSchedule>() {{ 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()); put(Event.PINS_FOR_ALL, new PinsForAllSchedule());
}}; }};
} }