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

Fix bug that prevented selecting insecure SMS

Browse Source 
Fixes #6929

// FREEBIE
This commit is contained in:
Moxie Marlinspike
2017-09-06 17:54:32 -07:00
parent af265bc3c2
commit 6455c66a0b
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -238,8 +238,9 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
private int distributionType; private int distributionType;
private boolean archived; private boolean archived;
private boolean isSecureText; private boolean isSecureText;
private boolean isDefaultSms = true; private boolean isDefaultSms = true;
private boolean isMmsEnabled = true; private boolean isMmsEnabled = true;
private boolean isSecurityInitialized = false;
private final IdentityRecordList identityRecords = new IdentityRecordList(); private final IdentityRecordList identityRecords = new IdentityRecordList();
private final DynamicTheme dynamicTheme = new DynamicTheme(); private final DynamicTheme dynamicTheme = new DynamicTheme();
@@ -918,8 +919,13 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
} }
private void handleSecurityChange(boolean isSecureText, boolean isDefaultSms) { private void handleSecurityChange(boolean isSecureText, boolean isDefaultSms) {
this.isSecureText = isSecureText; if (isSecurityInitialized && isSecureText == this.isSecureText && isDefaultSms == this.isDefaultSms) {
this.isDefaultSms = isDefaultSms; return;
}
this.isSecureText = isSecureText;
this.isDefaultSms = isDefaultSms;
this.isSecurityInitialized = true;
boolean isMediaMessage = recipient.isMmsGroupRecipient() || attachmentManager.isAttachmentPresent(); boolean isMediaMessage = recipient.isMmsGroupRecipient() || attachmentManager.isAttachmentPresent();