TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-02-20 00:58:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clear invite reminder if recipient isn't a contact

Browse Source 
Fixes #5637
Closes #5640
// FREEBIE
This commit is contained in:
FeuRenard 2016-08-28 22:42:50 +02:00 committed by Moxie Marlinspike
parent 059ff3e2e1
commit 63f7faf5bb
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -884,11 +884,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
} }
private void updateRecipientPreferences() { private void updateRecipientPreferences() {
if (recipients.getPrimaryRecipient() != null && new RecipientPreferencesTask().execute(recipients);
recipients.getPrimaryRecipient().getContactUri() != null)
{
new RecipientPreferencesTask().execute(recipients);
}
} }
protected void updateInviteReminder(boolean seenInvite) { protected void updateInviteReminder(boolean seenInvite) {
@ -896,7 +892,9 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
if (TextSecurePreferences.isPushRegistered(this) && if (TextSecurePreferences.isPushRegistered(this) &&
!isSecureText && !isSecureText &&
!seenInvite && !seenInvite &&
recipients.isSingleRecipient()) recipients.isSingleRecipient() &&
recipients.getPrimaryRecipient() != null &&
recipients.getPrimaryRecipient().getContactUri() != null)
{ {
InviteReminder reminder = new InviteReminder(this, recipients); InviteReminder reminder = new InviteReminder(this, recipients);
reminder.setOkListener(new OnClickListener() { reminder.setOkListener(new OnClickListener() {