moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2025-02-25 23:21:50 -05:00
Code Issues Releases Wiki Activity

Fix "return to list after delete"

Browse Source
This commit is contained in:
cketti 2013-01-29 04:03:15 +01:00
parent 957042a0d0
commit 7332c38bd4
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/com/fsck/k9/activity/MessageList.java
View File

@ -398,10 +398,7 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
case KeyEvent.KEYCODE_VOLUME_UP: { case KeyEvent.KEYCODE_VOLUME_UP: {
if (mMessageViewFragment != null && mDisplayMode != DisplayMode.MESSAGE_LIST && if (mMessageViewFragment != null && mDisplayMode != DisplayMode.MESSAGE_LIST &&
K9.useVolumeKeysForNavigationEnabled()) { K9.useVolumeKeysForNavigationEnabled()) {
MessageReference ref = mMessageViewFragment.getMessageReference(); showPreviousMessage();
if (ref != null) {
mMessageListFragment.openPrevious(ref);
}
return true; return true;
} else if (mDisplayMode != DisplayMode.MESSAGE_VIEW && } else if (mDisplayMode != DisplayMode.MESSAGE_VIEW &&
K9.useVolumeKeysForListNavigationEnabled()) { K9.useVolumeKeysForListNavigationEnabled()) {
@ -414,10 +411,7 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
case KeyEvent.KEYCODE_VOLUME_DOWN: { case KeyEvent.KEYCODE_VOLUME_DOWN: {
if (mMessageViewFragment != null && mDisplayMode != DisplayMode.MESSAGE_LIST && if (mMessageViewFragment != null && mDisplayMode != DisplayMode.MESSAGE_LIST &&
K9.useVolumeKeysForNavigationEnabled()) { K9.useVolumeKeysForNavigationEnabled()) {
MessageReference ref = mMessageViewFragment.getMessageReference(); showNextMessage();
if (ref != null) {
mMessageListFragment.openNext(ref);
}
return true; return true;
} else if (mDisplayMode != DisplayMode.MESSAGE_VIEW && } else if (mDisplayMode != DisplayMode.MESSAGE_VIEW &&
K9.useVolumeKeysForListNavigationEnabled()) { K9.useVolumeKeysForListNavigationEnabled()) {
@ -516,18 +510,12 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
} }
case KeyEvent.KEYCODE_J: case KeyEvent.KEYCODE_J:
case KeyEvent.KEYCODE_P: { case KeyEvent.KEYCODE_P: {
MessageReference ref = mMessageViewFragment.getMessageReference(); showPreviousMessage();
if (ref != null) {
mMessageListFragment.openPrevious(ref);
}
return true; return true;
} }
case KeyEvent.KEYCODE_N: case KeyEvent.KEYCODE_N:
case KeyEvent.KEYCODE_K: { case KeyEvent.KEYCODE_K: {
MessageReference ref = mMessageViewFragment.getMessageReference(); showNextMessage();
if (ref != null) {
mMessageListFragment.openNext(ref);
}
return true; return true;
} }
/* FIXME /* FIXME
@ -1155,7 +1143,11 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
@Override @Override
public void showNextMessageOrReturn() { public void showNextMessageOrReturn() {
if (K9.messageViewReturnToList()) { if (K9.messageViewReturnToList()) {
finish(); if (mDisplayMode == DisplayMode.SPLIT_VIEW) {
showMessageViewPlaceHolder();
} else {
showMessageList();
}
} else { } else {
showNextMessage(); showNextMessage();
} }
@ -1172,7 +1164,17 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
} }
private void showNextMessage() { private void showNextMessage() {
//TODO: implement MessageReference ref = mMessageViewFragment.getMessageReference();
if (ref != null) {
mMessageListFragment.openNext(ref);
}
}
private void showPreviousMessage() {
MessageReference ref = mMessageViewFragment.getMessageReference();
if (ref != null) {
mMessageListFragment.openPrevious(ref);
}
} }
private void showMessageList() { private void showMessageList() {