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

Commit 489cf354 authored by Vincent Breitmoser's avatar Vincent Breitmoser
Browse files

don't pass LocalMessage from onMessageViewInfoLoadFinished/Failed

parent 174f99b9

k9mail/src/main/java/com/fsck/k9/activity/MessageCompose.java

+2 −2
Original line number Diff line number Diff line
@@ -1552,13 +1552,13 @@ public class MessageCompose extends K9Activity implements OnClickListener, 
        }



        @Override

        public void onMessageViewInfoLoadFinished(LocalMessage localMessage, MessageViewInfo messageViewInfo) {

        public void onMessageViewInfoLoadFinished(MessageViewInfo messageViewInfo) {

            mHandler.sendEmptyMessage(MSG_PROGRESS_OFF);

            loadLocalMessageForDisplay(messageViewInfo, mAction);

        }



        @Override

        public void onMessageViewInfoLoadFailed(LocalMessage localMessage, MessageViewInfo messageViewInfo) {

        public void onMessageViewInfoLoadFailed(MessageViewInfo messageViewInfo) {

            mHandler.sendEmptyMessage(MSG_PROGRESS_OFF);

            Toast.makeText(MessageCompose.this, R.string.status_invalid_id_error, Toast.LENGTH_LONG).show();

        }

k9mail/src/main/java/com/fsck/k9/activity/MessageLoaderHelper.java

+4 −4
Original line number Diff line number Diff line
@@ -333,11 +333,11 @@ public class MessageLoaderHelper { 


        if (messageViewInfo == null) {

            messageViewInfo = createErrorStateMessageViewInfo();

            callback.onMessageViewInfoLoadFailed(localMessage, messageViewInfo);

            callback.onMessageViewInfoLoadFailed(messageViewInfo);

            return;

        }



        callback.onMessageViewInfoLoadFinished(localMessage, messageViewInfo);

        callback.onMessageViewInfoLoadFinished(messageViewInfo);

    }



    @NonNull
@@ -432,8 +432,8 @@ public class MessageLoaderHelper { 
        void onMessageDataLoadFinished(LocalMessage message);

        void onMessageDataLoadFailed();



        void onMessageViewInfoLoadFinished(LocalMessage localMessage, MessageViewInfo messageViewInfo);

        void onMessageViewInfoLoadFailed(LocalMessage localMessage, MessageViewInfo messageViewInfo);

        void onMessageViewInfoLoadFinished(MessageViewInfo messageViewInfo);

        void onMessageViewInfoLoadFailed(MessageViewInfo messageViewInfo);



        void setLoadingProgress(int current, int max);

k9mail/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.java

+2 −2
Original line number Diff line number Diff line
@@ -722,12 +722,12 @@ public class MessageViewFragment extends Fragment implements ConfirmationDialogF 
        }



        @Override

        public void onMessageViewInfoLoadFinished(LocalMessage localMessage, MessageViewInfo messageViewInfo) {

        public void onMessageViewInfoLoadFinished(MessageViewInfo messageViewInfo) {

            showMessage(messageViewInfo);

        }



        @Override

        public void onMessageViewInfoLoadFailed(LocalMessage localMessage, MessageViewInfo messageViewInfo) {

        public void onMessageViewInfoLoadFailed(MessageViewInfo messageViewInfo) {

            showMessage(messageViewInfo);

        }