From 945636ac5c6fae4ac2c43ded820d72de0af4d4da Mon Sep 17 00:00:00 2001 From: Moxie Marlinspike Date: Thu, 19 Nov 2015 11:43:17 -0800 Subject: [PATCH] Don't show reminder view on quick reply Fixes #4524 // FREEBIE --- src/org/thoughtcrime/securesms/ConversationActivity.java | 4 ++-- .../thoughtcrime/securesms/ConversationPopupActivity.java | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java index 94afb48e66..f678bf8ead 100644 --- a/src/org/thoughtcrime/securesms/ConversationActivity.java +++ b/src/org/thoughtcrime/securesms/ConversationActivity.java @@ -176,7 +176,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity private InputAwareLayout container; private View composePanel; private View composeBubble; - private ReminderView reminderView; + protected ReminderView reminderView; private AttachmentTypeSelector attachmentTypeSelector; private AttachmentManager attachmentManager; @@ -806,7 +806,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity updateInviteReminder(); } - private void updateInviteReminder() { + protected void updateInviteReminder() { if (TextSecurePreferences.isPushRegistered(this) && !isSecureText && recipients.isSingleRecipient() && diff --git a/src/org/thoughtcrime/securesms/ConversationPopupActivity.java b/src/org/thoughtcrime/securesms/ConversationPopupActivity.java index b34efc4239..3c34b85f7a 100644 --- a/src/org/thoughtcrime/securesms/ConversationPopupActivity.java +++ b/src/org/thoughtcrime/securesms/ConversationPopupActivity.java @@ -12,6 +12,7 @@ import android.view.Gravity; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; +import android.view.View; import android.view.WindowManager; import org.thoughtcrime.securesms.crypto.MasterSecret; @@ -118,4 +119,9 @@ public class ConversationPopupActivity extends ConversationActivity { super.sendComplete(threadId); finish(); } + + @Override + protected void updateInviteReminder() { + reminderView.setVisibility(View.GONE); + } }