moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-02 00:25:10 -04:00
Code Issues Releases Wiki Activity

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

Browse Source 
Fixes issue 1621.
This commit is contained in:
cketti 2010-06-14 13:46:08 +00:00
parent d56f786f88
commit 4f7ab92985
1 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/com/fsck/k9/activity/MessageView.java
View File

@ -863,40 +863,41 @@ public class MessageView extends K9Activity implements OnClickListener
{ {
Message messageToDelete = mMessage; Message messageToDelete = mMessage;
findSurroundingMessagesUid(); showNextMessage();
mMessageReferences.remove(mMessageReference);
MessagingController.getInstance(getApplication()).deleteMessages( MessagingController.getInstance(getApplication()).deleteMessages(
new Message[] { messageToDelete }, new Message[] { messageToDelete },
null); null);
if (mLastDirection == NEXT && mNextMessage != null)
{
onNext(K9.isAnimations());
}
else if (mLastDirection == PREVIOUS && mPreviousMessage != null)
{
onPrevious(K9.isAnimations());
}
else if (mNextMessage != null)
{
onNext(K9.isAnimations());
}
else if (mPreviousMessage != null)
{
onPrevious(K9.isAnimations());
}
else
{
finish();
}
} }
} }
private void showNextMessage()
{
findSurroundingMessagesUid();
mMessageReferences.remove(mMessageReference);
if (mLastDirection == NEXT && mNextMessage != null)
{
onNext(K9.isAnimations());
}
else if (mLastDirection == PREVIOUS && mPreviousMessage != null)
{
onPrevious(K9.isAnimations());
}
else if (mNextMessage != null)
{
onNext(K9.isAnimations());
}
else if (mPreviousMessage != null)
{
onPrevious(K9.isAnimations());
}
else
{
finish();
}
}
private void onClickSender() private void onClickSender()
{ {
if (mMessage != null) if (mMessage != null)
@ -1075,8 +1076,12 @@ public class MessageView extends K9Activity implements OnClickListener
switch (requestCode) switch (requestCode)
{ {
case ACTIVITY_CHOOSE_FOLDER_MOVE: case ACTIVITY_CHOOSE_FOLDER_MOVE:
Message messageToMove = mMessage;
showNextMessage();
MessagingController.getInstance(getApplication()).moveMessage(mAccount, MessagingController.getInstance(getApplication()).moveMessage(mAccount,
srcFolderName, mMessage, destFolderName, null); srcFolderName, messageToMove, destFolderName, null);
break; break;
case ACTIVITY_CHOOSE_FOLDER_COPY: case ACTIVITY_CHOOSE_FOLDER_COPY:
MessagingController.getInstance(getApplication()).copyMessage(mAccount, MessagingController.getInstance(getApplication()).copyMessage(mAccount,