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

Commit 4f7ab929 authored by cketti's avatar cketti
Browse files

Move to next/previous message in message view if a message was moved.

Fixes issue 1621.
parent d56f786f
Loading
Loading
Loading
Loading
+32 −27
Original line number Diff line number Diff line
@@ -863,13 +863,18 @@ public class MessageView extends K9Activity implements OnClickListener
        {
            Message messageToDelete = mMessage;

            findSurroundingMessagesUid();

            mMessageReferences.remove(mMessageReference);
            showNextMessage();

            MessagingController.getInstance(getApplication()).deleteMessages(
                new Message[] { messageToDelete },
                null);
        }
    }

    private void showNextMessage()
    {
        findSurroundingMessagesUid();
        mMessageReferences.remove(mMessageReference);

        if (mLastDirection == NEXT && mNextMessage != null)
        {
@@ -887,15 +892,11 @@ public class MessageView extends K9Activity implements OnClickListener
        {
            onPrevious(K9.isAnimations());
        }



        else
        {
            finish();
        }
    }
    }
    
    private void onClickSender()
    {
@@ -1075,8 +1076,12 @@ public class MessageView extends K9Activity implements OnClickListener
                    switch (requestCode)
                    {
                        case ACTIVITY_CHOOSE_FOLDER_MOVE:
                            Message messageToMove = mMessage;

                            showNextMessage();

                            MessagingController.getInstance(getApplication()).moveMessage(mAccount,
                                    srcFolderName, mMessage, destFolderName, null);
                                    srcFolderName, messageToMove, destFolderName, null);
                            break;
                        case ACTIVITY_CHOOSE_FOLDER_COPY:
                            MessagingController.getInstance(getApplication()).copyMessage(mAccount,