Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a79b7ea9 authored by cketti's avatar cketti
Browse files

Inlined methods that were extracted to use 

@SuppressWarnings("unchecked"). That's now unnecessary after the
Serializable -> Parcelable switch
parent ff1f9b5f

src/com/fsck/k9/activity/MessageView.java

+4 −12
Original line number Diff line number Diff line
@@ -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<String> 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);