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

initialize security in conversation first

Browse Source 
Closes #4108
// FREEBIE
This commit is contained in:
Jake McGinty 2015-09-23 11:44:52 -07:00 committed by Moxie Marlinspike
parent 7520af749c
commit e574bcf15c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -214,6 +214,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
initializeActionBar(); initializeActionBar();
initializeViews(); initializeViews();
initializeResources(); initializeResources();
initializeSecurity();
initializeDraft(); initializeDraft();
} }
@ -229,6 +230,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
setIntent(intent); setIntent(intent);
initializeResources(); initializeResources();
initializeSecurity();
initializeDraft(); initializeDraft();
if (fragment != null) { if (fragment != null) {
@ -243,7 +245,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
dynamicLanguage.onResume(this); dynamicLanguage.onResume(this);
quickAttachmentDrawer.onResume(); quickAttachmentDrawer.onResume();
initializeSecurity();
initializeEnabledCheck(); initializeEnabledCheck();
initializeMmsEnabledCheck(); initializeMmsEnabledCheck();
composeText.setTransport(sendButton.getSelectedTransport()); composeText.setTransport(sendButton.getSelectedTransport());