1
0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-24 02:12:15 -05:00

Restore instance state in correct order

Fixes issue 5968
This commit is contained in:
cketti 2014-01-23 01:35:21 +01:00
parent f24c298791
commit 1a16dbf295

View File

@ -1173,9 +1173,6 @@ public class MessageCompose extends K9Activity implements OnClickListener,
// So compute the visibility of the "Add Cc/Bcc" menu item again. // So compute the visibility of the "Add Cc/Bcc" menu item again.
computeAddCcBccVisibility(); computeAddCcBccVisibility();
showOrHideQuotedText(
(QuotedTextMode) savedInstanceState.getSerializable(STATE_KEY_QUOTED_TEXT_MODE));
mQuotedHtmlContent = mQuotedHtmlContent =
(InsertableHtmlContent) savedInstanceState.getSerializable(STATE_KEY_HTML_QUOTE); (InsertableHtmlContent) savedInstanceState.getSerializable(STATE_KEY_HTML_QUOTE);
if (mQuotedHtmlContent != null && mQuotedHtmlContent.getQuotedContent() != null) { if (mQuotedHtmlContent != null && mQuotedHtmlContent.getQuotedContent() != null) {
@ -1193,6 +1190,9 @@ public class MessageCompose extends K9Activity implements OnClickListener,
mQuotedTextFormat = (SimpleMessageFormat) savedInstanceState.getSerializable( mQuotedTextFormat = (SimpleMessageFormat) savedInstanceState.getSerializable(
STATE_KEY_QUOTED_TEXT_FORMAT); STATE_KEY_QUOTED_TEXT_FORMAT);
showOrHideQuotedText(
(QuotedTextMode) savedInstanceState.getSerializable(STATE_KEY_QUOTED_TEXT_MODE));
initializeCrypto(); initializeCrypto();
updateFrom(); updateFrom();
updateSignature(); updateSignature();