initialize security in conversation first

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

View File

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