From a79b7ea93ca9cb5a066ee415353a4be5c36ea916 Mon Sep 17 00:00:00 2001 From: cketti Date: Sun, 20 Feb 2011 06:23:06 +0100 Subject: [PATCH] Inlined methods that were extracted to use @SuppressWarnings("unchecked"). That's now unnecessary after the Serializable -> Parcelable switch --- src/com/fsck/k9/activity/MessageView.java | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/com/fsck/k9/activity/MessageView.java b/src/com/fsck/k9/activity/MessageView.java index 45e5a9bd5..638aae075 100644 --- a/src/com/fsck/k9/activity/MessageView.java +++ b/src/com/fsck/k9/activity/MessageView.java @@ -296,11 +296,13 @@ public class MessageView extends K9Activity implements OnClickListener { Intent intent = getIntent(); Uri uri = intent.getData(); if (icicle != null) { - restoreMessageReferences(icicle); + mMessageReference = icicle.getParcelable(EXTRA_MESSAGE_REFERENCE); + mMessageReferences = icicle.getParcelableArrayList(EXTRA_MESSAGE_REFERENCES); mPgpData = (PgpData) icicle.getSerializable(STATE_PGP_DATA); } else { if (uri == null) { - restoreMessageReferencesExtra(intent); + mMessageReference = intent.getParcelableExtra(EXTRA_MESSAGE_REFERENCE); + mMessageReferences = intent.getParcelableArrayListExtra(EXTRA_MESSAGE_REFERENCES); } else { List segmentList = uri.getPathSegments(); if (segmentList.size() != 3) { @@ -346,16 +348,6 @@ public class MessageView extends K9Activity implements OnClickListener { displayMessage(mMessageReference); } - private void restoreMessageReferences(Bundle icicle) { - mMessageReference = icicle.getParcelable(EXTRA_MESSAGE_REFERENCE); - mMessageReferences = icicle.getParcelableArrayList(EXTRA_MESSAGE_REFERENCES); - } - - private void restoreMessageReferencesExtra(Intent intent) { - mMessageReference = intent.getParcelableExtra(EXTRA_MESSAGE_REFERENCE); - mMessageReferences = intent.getParcelableArrayListExtra(EXTRA_MESSAGE_REFERENCES); - } - private void setupButtonViews() { setOnClickListener(R.id.from); setOnClickListener(R.id.reply);