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

Implemented BACK handling for MessageView

Browse Source 
Implemented because MessageList is now in singleInstance launchMode so
the default behavior may not match user options.
This commit is contained in:
Fiouz 2011-06-08 08:42:40 +02:00
parent 7aae044705
commit 5ee63c47fe
1 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,6 +27,8 @@ import com.fsck.k9.view.SingleMessageView;
import com.fsck.k9.view.AttachmentView.AttachmentFileDownloadCallback; import com.fsck.k9.view.AttachmentView.AttachmentFileDownloadCallback;
import java.io.File; import java.io.File;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.*; import java.util.*;
public class MessageView extends K9Activity implements OnClickListener { public class MessageView extends K9Activity implements OnClickListener {
@ -39,6 +41,27 @@ public class MessageView extends K9Activity implements OnClickListener {
private static final int ACTIVITY_CHOOSE_FOLDER_COPY = 2; private static final int ACTIVITY_CHOOSE_FOLDER_COPY = 2;
private static final int ACTIVITY_CHOOSE_DIRECTORY = 3; private static final int ACTIVITY_CHOOSE_DIRECTORY = 3;
/**
* Whether parent class have the onBackPressed() method (with no argument)
*/
private static final boolean HAS_SUPER_ON_BACK_METHOD;
static {
boolean hasOnBackMethod;
try {
final Class<? super MessageView> superClass = MessageView.class.getSuperclass();
final Method method = superClass.getMethod("onBackPressed", new Class[] {});
hasOnBackMethod = (method.getModifiers() & Modifier.PUBLIC) == Modifier.PUBLIC;
} catch (final SecurityException e) {
if (K9.DEBUG) {
Log.v(K9.LOG_TAG, "Security exception while checking for 'onBackPressed' method", e);
}
hasOnBackMethod = false;
} catch (final NoSuchMethodException e) {
hasOnBackMethod = false;
}
HAS_SUPER_ON_BACK_METHOD = hasOnBackMethod;
}
private SingleMessageView mMessageView; private SingleMessageView mMessageView;
private PgpData mPgpData; private PgpData mPgpData;
@ -127,6 +150,15 @@ public class MessageView extends K9Activity implements OnClickListener {
@Override @Override
public boolean onKeyDown(final int keyCode, final KeyEvent event) { public boolean onKeyDown(final int keyCode, final KeyEvent event) {
if (
// XXX TODO - when we go to android 2.0, uncomment this
// android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.ECLAIR &&
keyCode == KeyEvent.KEYCODE_BACK && event.getRepeatCount() == 0) {
// Take care of calling this method on earlier versions of
// the platform where it doesn't exist.
onBackPressed();
return true;
}
switch (keyCode) { switch (keyCode) {
case KeyEvent.KEYCODE_VOLUME_UP: { case KeyEvent.KEYCODE_VOLUME_UP: {
if (K9.useVolumeKeysForNavigationEnabled()) { if (K9.useVolumeKeysForNavigationEnabled()) {
@ -229,6 +261,21 @@ public class MessageView extends K9Activity implements OnClickListener {
return super.onKeyUp(keyCode, event); return super.onKeyUp(keyCode, event);
} }
@Override
public void onBackPressed() {
// This will be called either automatically for you on 2.0
// or later, or by the code above on earlier versions of the
// platform.
if (K9.manageBack()) {
MessageList.actionHandleFolder(this, mAccount, mMessageReference.folderName);
finish();
} else if (HAS_SUPER_ON_BACK_METHOD) {
super.onBackPressed();
} else {
finish();
}
}
class MessageViewHandler extends Handler { class MessageViewHandler extends Handler {
public void progress(final boolean progress) { public void progress(final boolean progress) {