TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-24 16:57:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't show reminder view on quick reply

Browse Source 
Fixes #4524
// FREEBIE
This commit is contained in:
Moxie Marlinspike 2015-11-19 11:43:17 -08:00
parent ba4ebed59b
commit 945636ac5c
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/org/thoughtcrime/securesms/ConversationActivity.java
View File

@ -176,7 +176,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
private InputAwareLayout container; private InputAwareLayout container;
private View composePanel; private View composePanel;
private View composeBubble; private View composeBubble;
private ReminderView reminderView; protected ReminderView reminderView;
private AttachmentTypeSelector attachmentTypeSelector; private AttachmentTypeSelector attachmentTypeSelector;
private AttachmentManager attachmentManager; private AttachmentManager attachmentManager;
@ -806,7 +806,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
updateInviteReminder(); updateInviteReminder();
} }
private void updateInviteReminder() { protected void updateInviteReminder() {
if (TextSecurePreferences.isPushRegistered(this) && if (TextSecurePreferences.isPushRegistered(this) &&
!isSecureText && !isSecureText &&
recipients.isSingleRecipient() && recipients.isSingleRecipient() &&

6
src/org/thoughtcrime/securesms/ConversationPopupActivity.java
View File

@ -12,6 +12,7 @@ import android.view.Gravity;
import android.view.Menu; import android.view.Menu;
import android.view.MenuInflater; import android.view.MenuInflater;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View;
import android.view.WindowManager; import android.view.WindowManager;
import org.thoughtcrime.securesms.crypto.MasterSecret; import org.thoughtcrime.securesms.crypto.MasterSecret;
@ -118,4 +119,9 @@ public class ConversationPopupActivity extends ConversationActivity {
super.sendComplete(threadId); super.sendComplete(threadId);
finish(); finish();
} }
@Override
protected void updateInviteReminder() {
reminderView.setVisibility(View.GONE);
}
} }