From 094215ebe0b7247c44bb71c7d0c3c10d2d901dfb Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Sat, 21 Nov 2009 22:45:14 +0000 Subject: [PATCH] Reindent MessageView.java in advance of refactoring --- .../android/email/activity/MessageView.java | 1049 ++++++++--------- 1 file changed, 506 insertions(+), 543 deletions(-) diff --git a/src/com/android/email/activity/MessageView.java b/src/com/android/email/activity/MessageView.java index 300bb88a4..5799bbf81 100644 --- a/src/com/android/email/activity/MessageView.java +++ b/src/com/android/email/activity/MessageView.java @@ -76,7 +76,7 @@ import java.util.HashMap; import java.util.List; public class MessageView extends K9Activity - implements UrlInterceptHandler, OnClickListener { + implements UrlInterceptHandler, OnClickListener { private static final String EXTRA_ACCOUNT = "com.android.email.MessageView_account"; private static final String EXTRA_FOLDER = "com.android.email.MessageView_folder"; private static final String EXTRA_MESSAGE = "com.android.email.MessageView_message"; @@ -88,7 +88,7 @@ public class MessageView extends K9Activity private static final int ACTIVITY_CHOOSE_FOLDER_MOVE = 1; private static final int ACTIVITY_CHOOSE_FOLDER_COPY = 2; - + private TextView mFromView; private TextView mDateView; private TextView mTimeView; @@ -123,40 +123,33 @@ public class MessageView extends K9Activity private DateFormat dateFormat = null; private DateFormat timeFormat = null; - + private Menu optionsMenu = null; - - private DateFormat getDateFormat() - { - if (dateFormat == null) - { - String dateFormatS = android.provider.Settings.System.getString(getContentResolver(), - android.provider.Settings.System.DATE_FORMAT); - if (dateFormatS != null) { - dateFormat = new java.text.SimpleDateFormat(dateFormatS); + + private DateFormat getDateFormat() { + if (dateFormat == null) { + String dateFormatS = android.provider.Settings.System.getString(getContentResolver(), + android.provider.Settings.System.DATE_FORMAT); + if (dateFormatS != null) { + dateFormat = new java.text.SimpleDateFormat(dateFormatS); + } else { + dateFormat = new java.text.SimpleDateFormat(Email.BACKUP_DATE_FORMAT); + } } - else - { - dateFormat = new java.text.SimpleDateFormat(Email.BACKUP_DATE_FORMAT); + return dateFormat; + } + private DateFormat getTimeFormat() { + if (timeFormat == null) { + String timeFormatS = android.provider.Settings.System.getString(getContentResolver(), + android.provider.Settings.System.TIME_12_24); + boolean b24 = !(timeFormatS == null || timeFormatS.equals("12")); + timeFormat = new java.text.SimpleDateFormat(b24 ? Email.TIME_FORMAT_24 : Email.TIME_FORMAT_12); } - } - return dateFormat; + return timeFormat; } - private DateFormat getTimeFormat() - { - if (timeFormat == null) - { - String timeFormatS = android.provider.Settings.System.getString(getContentResolver(), - android.provider.Settings.System.TIME_12_24); - boolean b24 = !(timeFormatS == null || timeFormatS.equals("12")); - timeFormat = new java.text.SimpleDateFormat(b24 ? Email.TIME_FORMAT_24 : Email.TIME_FORMAT_12); - } - return timeFormat; - } - private void clearFormats() - { - dateFormat = null; - timeFormat = null; + private void clearFormats() { + dateFormat = null; + timeFormat = null; } private Listener mListener = new Listener(); @@ -164,60 +157,87 @@ public class MessageView extends K9Activity @Override - public boolean dispatchKeyEvent(KeyEvent event) { - boolean ret = false; + public boolean dispatchKeyEvent(KeyEvent event) { + boolean ret = false; - if (KeyEvent.ACTION_DOWN == event.getAction()) - { - ret = onKeyDown(event.getKeyCode(), event); - } - if (ret == false) - { - ret = super.dispatchKeyEvent(event); - } - return ret; + if (KeyEvent.ACTION_DOWN == event.getAction()) { + ret = onKeyDown(event.getKeyCode(), event); + } + if (ret == false) { + ret = super.dispatchKeyEvent(event); + } + return ret; } - public boolean onKeyDown(int keyCode, KeyEvent event) { + public boolean onKeyDown(int keyCode, KeyEvent event) { switch (keyCode) { - case KeyEvent.KEYCODE_DEL: { onDelete(); return true;} - case KeyEvent.KEYCODE_D: { onDelete(); return true;} - case KeyEvent.KEYCODE_F: { onForward(); return true;} - case KeyEvent.KEYCODE_A: { onReplyAll(); return true; } - case KeyEvent.KEYCODE_R: { onReply(); return true; } - case KeyEvent.KEYCODE_G: { onFlag(); return true; } + case KeyEvent.KEYCODE_DEL: { + onDelete(); + return true; + } + case KeyEvent.KEYCODE_D: { + onDelete(); + return true; + } + case KeyEvent.KEYCODE_F: { + onForward(); + return true; + } + case KeyEvent.KEYCODE_A: { + onReplyAll(); + return true; + } + case KeyEvent.KEYCODE_R: { + onReply(); + return true; + } + case KeyEvent.KEYCODE_G: { + onFlag(); + return true; + } - case KeyEvent.KEYCODE_M: { onMove(); return true; } - case KeyEvent.KEYCODE_Y: { onCopy(); return true; } - case KeyEvent.KEYCODE_J: - case KeyEvent.KEYCODE_P: - { onPrevious(); return true; } - case KeyEvent.KEYCODE_N: - case KeyEvent.KEYCODE_K: { onNext(); return true; } - case KeyEvent.KEYCODE_Z: { - if (event.isShiftPressed()) { - mHandler.post(new Runnable() { - public void run() { - mMessageContentView.zoomIn(); - } - }); - } else { - mHandler.post(new Runnable() { - public void run() { - mMessageContentView.zoomOut(); - } - }); - } - return true; - } - case KeyEvent.KEYCODE_H: { - Toast toast = Toast.makeText(this, R.string.message_help_key, Toast.LENGTH_LONG); - toast.show(); - return true; - } + case KeyEvent.KEYCODE_M: { + onMove(); + return true; } - return super.onKeyDown(keyCode, event); + case KeyEvent.KEYCODE_Y: { + onCopy(); + return true; } + case KeyEvent.KEYCODE_J: + case KeyEvent.KEYCODE_P: { + onPrevious(); + return true; + } + case KeyEvent.KEYCODE_N: + case KeyEvent.KEYCODE_K: { + onNext(); + return true; + } + case KeyEvent.KEYCODE_Z: { + if (event.isShiftPressed()) { + mHandler.post(new Runnable() { + public void run() { + mMessageContentView.zoomIn(); + } + }); + } else { + mHandler.post(new Runnable() { + public void run() { + mMessageContentView.zoomOut(); + } + }); + } + return true; + } + case KeyEvent.KEYCODE_H: { + Toast toast = Toast.makeText(this, R.string.message_help_key, Toast.LENGTH_LONG); + toast.show(); + return true; + } + } + return super.onKeyDown(keyCode, event); + } class MessageViewHandler extends Handler { private static final int MSG_PROGRESS = 2; @@ -237,90 +257,88 @@ public class MessageView extends K9Activity @Override public void handleMessage(android.os.Message msg) { switch (msg.what) { - case MSG_PROGRESS: - setProgressBarIndeterminateVisibility(msg.arg1 != 0); - break; - case MSG_ADD_ATTACHMENT: - mAttachments.addView((View) msg.obj); - mAttachments.setVisibility(View.VISIBLE); - break; - case MSG_SET_ATTACHMENTS_ENABLED: - for (int i = 0, count = mAttachments.getChildCount(); i < count; i++) { - Attachment attachment = (Attachment) mAttachments.getChildAt(i).getTag(); - attachment.viewButton.setEnabled(msg.arg1 == 1); - attachment.downloadButton.setEnabled(msg.arg1 == 1); - } - break; - case MSG_SET_HEADERS: - String[] values = (String[]) msg.obj; - setTitle(values[0]); - mSubjectView.setText(values[0]); - mFromView.setText(values[1]); - if (values[2]!=null) { - mDateView.setText(values[2]); - mDateView.setVisibility(View.VISIBLE); - } - else { - mDateView.setVisibility(View.GONE); - } - mTimeView.setText(values[3]); - mToView.setText(values[4]); - mCcView.setText(values[5]); - mAttachmentIcon.setVisibility(msg.arg1 == 1 ? View.VISIBLE : View.GONE); - if ((msg.arg2 & FLAG_FLAGGED) != 0) { - mFlagged.setChecked(true); - } else { - mFlagged.setChecked(false); - } - mSubjectView.setTextColor(0xff000000 | defaultSubjectColor ); + case MSG_PROGRESS: + setProgressBarIndeterminateVisibility(msg.arg1 != 0); + break; + case MSG_ADD_ATTACHMENT: + mAttachments.addView((View) msg.obj); + mAttachments.setVisibility(View.VISIBLE); + break; + case MSG_SET_ATTACHMENTS_ENABLED: + for (int i = 0, count = mAttachments.getChildCount(); i < count; i++) { + Attachment attachment = (Attachment) mAttachments.getChildAt(i).getTag(); + attachment.viewButton.setEnabled(msg.arg1 == 1); + attachment.downloadButton.setEnabled(msg.arg1 == 1); + } + break; + case MSG_SET_HEADERS: + String[] values = (String[]) msg.obj; + setTitle(values[0]); + mSubjectView.setText(values[0]); + mFromView.setText(values[1]); + if (values[2]!=null) { + mDateView.setText(values[2]); + mDateView.setVisibility(View.VISIBLE); + } else { + mDateView.setVisibility(View.GONE); + } + mTimeView.setText(values[3]); + mToView.setText(values[4]); + mCcView.setText(values[5]); + mAttachmentIcon.setVisibility(msg.arg1 == 1 ? View.VISIBLE : View.GONE); + if ((msg.arg2 & FLAG_FLAGGED) != 0) { + mFlagged.setChecked(true); + } else { + mFlagged.setChecked(false); + } + mSubjectView.setTextColor(0xff000000 | defaultSubjectColor ); - if ((msg.arg2 & FLAG_ANSWERED) != 0) { - Drawable answeredIcon = getResources().getDrawable( - R.drawable.ic_mms_answered_small); - mSubjectView.setCompoundDrawablesWithIntrinsicBounds( - answeredIcon, // left - null, // top - null, // right - null); // bottom - } - else { - mSubjectView.setCompoundDrawablesWithIntrinsicBounds( - null, // left - null, // top - null, // right - null); // bottom - } - - break; - case MSG_NETWORK_ERROR: - Toast.makeText(MessageView.this, - R.string.status_network_error, Toast.LENGTH_LONG).show(); - break; - case MSG_INVALID_ID_ERROR: - Toast.makeText(MessageView.this, - R.string.status_invalid_id_error, Toast.LENGTH_LONG).show(); - break; - case MSG_ATTACHMENT_SAVED: - Toast.makeText(MessageView.this, String.format( - getString(R.string.message_view_status_attachment_saved), msg.obj), - Toast.LENGTH_LONG).show(); - break; - case MSG_ATTACHMENT_NOT_SAVED: - Toast.makeText(MessageView.this, - getString(R.string.message_view_status_attachment_not_saved), - Toast.LENGTH_LONG).show(); - break; - case MSG_SHOW_SHOW_PICTURES: - mShowPicturesSection.setVisibility(msg.arg1 == 1 ? View.VISIBLE : View.GONE); - break; - case MSG_FETCHING_ATTACHMENT: - Toast.makeText(MessageView.this, - getString(R.string.message_view_fetching_attachment_toast), - Toast.LENGTH_SHORT).show(); - break; - default: - super.handleMessage(msg); + if ((msg.arg2 & FLAG_ANSWERED) != 0) { + Drawable answeredIcon = getResources().getDrawable( + R.drawable.ic_mms_answered_small); + mSubjectView.setCompoundDrawablesWithIntrinsicBounds( + answeredIcon, // left + null, // top + null, // right + null); // bottom + } else { + mSubjectView.setCompoundDrawablesWithIntrinsicBounds( + null, // left + null, // top + null, // right + null); // bottom + } + + break; + case MSG_NETWORK_ERROR: + Toast.makeText(MessageView.this, + R.string.status_network_error, Toast.LENGTH_LONG).show(); + break; + case MSG_INVALID_ID_ERROR: + Toast.makeText(MessageView.this, + R.string.status_invalid_id_error, Toast.LENGTH_LONG).show(); + break; + case MSG_ATTACHMENT_SAVED: + Toast.makeText(MessageView.this, String.format( + getString(R.string.message_view_status_attachment_saved), msg.obj), + Toast.LENGTH_LONG).show(); + break; + case MSG_ATTACHMENT_NOT_SAVED: + Toast.makeText(MessageView.this, + getString(R.string.message_view_status_attachment_not_saved), + Toast.LENGTH_LONG).show(); + break; + case MSG_SHOW_SHOW_PICTURES: + mShowPicturesSection.setVisibility(msg.arg1 == 1 ? View.VISIBLE : View.GONE); + break; + case MSG_FETCHING_ATTACHMENT: + Toast.makeText(MessageView.this, + getString(R.string.message_view_fetching_attachment_toast), + Toast.LENGTH_SHORT).show(); + break; + default: + super.handleMessage(msg); } } @@ -346,21 +364,21 @@ public class MessageView extends K9Activity } public void setHeaders( - String subject, - String from, - String date, - String time, - String to, - String cc, - boolean hasAttachments, - boolean flagged, - boolean seen) { + String subject, + String from, + String date, + String time, + String to, + String cc, + boolean hasAttachments, + boolean flagged, + boolean seen) { android.os.Message msg = new android.os.Message(); msg.what = MSG_SET_HEADERS; msg.arg1 = hasAttachments ? 1 : 0; msg.arg2 += (flagged ? FLAG_FLAGGED : 0); msg.arg2 += (seen ? FLAG_ANSWERED : 0); - + msg.obj = new String[] { subject, from, date, time, to, cc }; sendMessage(msg); } @@ -423,14 +441,14 @@ public class MessageView extends K9Activity i.putExtras(extras); } context.startActivity(i); - } + } public void onCreate(Bundle icicle) { super.onCreate(icicle); requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS); - requestWindowFeature(Window.FEATURE_NO_TITLE); + requestWindowFeature(Window.FEATURE_NO_TITLE); setContentView(R.layout.message_view); @@ -452,7 +470,9 @@ public class MessageView extends K9Activity mFlagged = (CheckBox)findViewById(R.id.flagged); mFlagged.setOnClickListener(new OnClickListener() { - public void onClick(View v) { onFlag(); } + public void onClick(View v) { + onFlag(); + } }); mMessageContentView.setVerticalScrollBarEnabled(true); @@ -475,9 +495,9 @@ public class MessageView extends K9Activity setOnClickListener(R.id.forward); setOnClickListener(R.id.next); setOnClickListener(R.id.previous); - + setOnClickListener(R.id.reply_scrolling); - // setOnClickListener(R.id.reply_all_scrolling); +// setOnClickListener(R.id.reply_all_scrolling); setOnClickListener(R.id.delete_scrolling); setOnClickListener(R.id.forward_scrolling); setOnClickListener(R.id.next_scrolling); @@ -496,8 +516,7 @@ public class MessageView extends K9Activity mFolder = icicle.getString(EXTRA_FOLDER); mMessageUid = icicle.getString(EXTRA_MESSAGE); mMessageUids = icicle.getStringArrayList(EXTRA_MESSAGE_UIDS); - } - else { + } else { if (uri==null) { mAccount = (Account) intent.getSerializableExtra(EXTRA_ACCOUNT); mFolder = intent.getStringExtra(EXTRA_FOLDER); @@ -507,8 +526,7 @@ public class MessageView extends K9Activity Log.v(Email.LOG_TAG, "mAccount number: " + mAccount.getAccountNumber()); Log.v(Email.LOG_TAG, "mFolder: " + mFolder); Log.v(Email.LOG_TAG, "mMessageUid: " + mMessageUid); - } - else { + } else { Log.v(Email.LOG_TAG, "uri: " + uri.toString()); List segmentList = uri.getPathSegments(); Log.v(Email.LOG_TAG, "segmentList size: " + segmentList.size()); @@ -532,9 +550,8 @@ public class MessageView extends K9Activity } mFolder = segmentList.get(1); mMessageUid = segmentList.get(2); - mMessageUids = new ArrayList(); - } - else { + mMessageUids = new ArrayList(); + } else { for (String segment : segmentList) { Log.v(Email.LOG_TAG, "segment: " + segment); } @@ -544,7 +561,7 @@ public class MessageView extends K9Activity } } } - + next = findViewById(R.id.next); previous = findViewById(R.id.previous); @@ -562,44 +579,34 @@ public class MessageView extends K9Activity if (goNext) { next.requestFocus(); } - + Account.HideButtons hideButtons = mAccount.getHideMessageViewButtons(); - + //MessagingController.getInstance(getApplication()).addListener(mListener); - if (Account.HideButtons.ALWAYS == hideButtons) - { - hideButtons(); - } - else if (Account.HideButtons.NEVER == hideButtons) - { - showButtons(); - } - else // Account.HideButtons.KEYBOARD_AVAIL - { + if (Account.HideButtons.ALWAYS == hideButtons) { + hideButtons(); + } else if (Account.HideButtons.NEVER == hideButtons) { + showButtons(); + } else { // Account.HideButtons.KEYBOARD_AVAIL final Configuration config = this.getResources().getConfiguration(); - if (config.hardKeyboardHidden == Configuration.HARDKEYBOARDHIDDEN_NO ) - { - hideButtons(); - } - else - { - showButtons(); + if (config.hardKeyboardHidden == Configuration.HARDKEYBOARDHIDDEN_NO ) { + hideButtons(); + } else { + showButtons(); } } displayMessage(mMessageUid); - } + } @Override - protected void onSaveInstanceState (Bundle outState) - { + protected void onSaveInstanceState (Bundle outState) { outState.putSerializable(EXTRA_ACCOUNT, mAccount); outState.putString(EXTRA_FOLDER, mFolder); outState.putString(EXTRA_MESSAGE, mMessageUid); outState.putStringArrayList(EXTRA_MESSAGE_UIDS, mMessageUids); } - private void displayMessage(String uid) - { + private void displayMessage(String uid) { mMessageUid = uid; mMessageContentView.getSettings().setBlockNetworkImage(true); mAttachments.removeAllViews(); @@ -617,41 +624,37 @@ public class MessageView extends K9Activity mMessageUid, mListener); } - - - private void showButtons() - { - View buttons = findViewById(R.id.scrolling_buttons); - if (buttons != null) { - buttons.setVisibility(View.GONE); + + + private void showButtons() { + View buttons = findViewById(R.id.scrolling_buttons); + if (buttons != null) { + buttons.setVisibility(View.GONE); + } } - } - - private void hideButtons() - { - View buttons = findViewById(R.id.bottom_buttons); - if (buttons != null) { - buttons.setVisibility(View.GONE); + + private void hideButtons() { + View buttons = findViewById(R.id.bottom_buttons); + if (buttons != null) { + buttons.setVisibility(View.GONE); + } } - } - - private void setOnClickListener(int viewCode) - { - View thisView = findViewById(viewCode); - if (thisView != null) - { - thisView.setOnClickListener(this); - } + + private void setOnClickListener(int viewCode) { + View thisView = findViewById(viewCode); + if (thisView != null) { + thisView.setOnClickListener(this); + } } private void findSurroundingMessagesUid() { mNextMessageUid = mPreviousMessageUid = null; int i = mMessageUids.indexOf(mMessageUid); - if(i < 0) + if (i < 0) return; - if(i != 0) + if (i != 0) mNextMessageUid = mMessageUids.get(i - 1); - if(i != (mMessageUids.size() - 1)) + if (i != (mMessageUids.size() - 1)) mPreviousMessageUid = mMessageUids.get(i + 1); } @@ -662,24 +665,23 @@ public class MessageView extends K9Activity private void onDelete() { if (mMessage != null) { - Message messageToDelete = mMessage; - String folderForDelete = mFolder; - Account accountForDelete = mAccount; + Message messageToDelete = mMessage; + String folderForDelete = mFolder; + Account accountForDelete = mAccount; - findSurroundingMessagesUid(); + findSurroundingMessagesUid(); // Remove this message's Uid locally mMessageUids.remove(messageToDelete.getUid()); - + MessagingController.getInstance(getApplication()).deleteMessage( accountForDelete, folderForDelete, messageToDelete, null); if (mNextMessageUid != null) { - onNext(); - } - else if (mPreviousMessageUid != null) { + onNext(); + } else if (mPreviousMessageUid != null) { onPrevious(); } else { finish(); @@ -698,7 +700,7 @@ public class MessageView extends K9Activity // Pass along full E-mail string for possible create dialog contactIntent.putExtra(Contacts.Intents.EXTRA_CREATE_DESCRIPTION, - senderEmail.toString()); + senderEmail.toString()); // Only provide personal name hint if we have one String senderPersonal = senderEmail.getPersonal(); @@ -735,101 +737,91 @@ public class MessageView extends K9Activity finish(); } } - + private void onFlag() { - if (mMessage != null) { - MessagingController.getInstance(getApplication()).setMessageFlag(mAccount, - mMessage.getFolder().getName(), mMessage.getUid(), Flag.FLAGGED, !mMessage.isSet(Flag.FLAGGED)); - try - { - mMessage.setFlag(Flag.FLAGGED, !mMessage.isSet(Flag.FLAGGED)); - setHeaders(mAccount, mMessage.getFolder().getName(), mMessage.getUid(), mMessage); - setMenuFlag(); + if (mMessage != null) { + MessagingController.getInstance(getApplication()).setMessageFlag(mAccount, + mMessage.getFolder().getName(), mMessage.getUid(), Flag.FLAGGED, !mMessage.isSet(Flag.FLAGGED)); + try { + mMessage.setFlag(Flag.FLAGGED, !mMessage.isSet(Flag.FLAGGED)); + setHeaders(mAccount, mMessage.getFolder().getName(), mMessage.getUid(), mMessage); + setMenuFlag(); + } catch (MessagingException me) { + Log.e(Email.LOG_TAG, "Could not set flag on local message", me); + } } - catch (MessagingException me) - { - Log.e(Email.LOG_TAG, "Could not set flag on local message", me); - } - } - } - - private void onMove() - { - if (MessagingController.getInstance(getApplication()).isMoveCapable(mAccount) == false) - { - return; - } - if (MessagingController.getInstance(getApplication()).isMoveCapable(mMessage) == false) - { - Toast toast = Toast.makeText(this, R.string.move_copy_cannot_copy_unsynced_message, Toast.LENGTH_LONG); - toast.show(); - return; - } - Intent intent = new Intent(this, ChooseFolder.class); - intent.putExtra(ChooseFolder.EXTRA_ACCOUNT, mAccount); - intent.putExtra(ChooseFolder.EXTRA_CUR_FOLDER, mFolder); - intent.putExtra(ChooseFolder.EXTRA_MESSAGE_UID, mMessageUid); - startActivityForResult(intent, ACTIVITY_CHOOSE_FOLDER_MOVE); } - - private void onCopy() - { - if (MessagingController.getInstance(getApplication()).isCopyCapable(mAccount) == false) - { - return; - } - if (MessagingController.getInstance(getApplication()).isCopyCapable(mMessage) == false) - { - Toast toast = Toast.makeText(this, R.string.move_copy_cannot_copy_unsynced_message, Toast.LENGTH_LONG); - toast.show(); - return; - } + + private void onMove() { + if (MessagingController.getInstance(getApplication()).isMoveCapable(mAccount) == false) { + return; + } + if (MessagingController.getInstance(getApplication()).isMoveCapable(mMessage) == false) { + Toast toast = Toast.makeText(this, R.string.move_copy_cannot_copy_unsynced_message, Toast.LENGTH_LONG); + toast.show(); + return; + } + Intent intent = new Intent(this, ChooseFolder.class); + intent.putExtra(ChooseFolder.EXTRA_ACCOUNT, mAccount); + intent.putExtra(ChooseFolder.EXTRA_CUR_FOLDER, mFolder); + intent.putExtra(ChooseFolder.EXTRA_MESSAGE_UID, mMessageUid); + startActivityForResult(intent, ACTIVITY_CHOOSE_FOLDER_MOVE); + } + + private void onCopy() { + if (MessagingController.getInstance(getApplication()).isCopyCapable(mAccount) == false) { + return; + } + if (MessagingController.getInstance(getApplication()).isCopyCapable(mMessage) == false) { + Toast toast = Toast.makeText(this, R.string.move_copy_cannot_copy_unsynced_message, Toast.LENGTH_LONG); + toast.show(); + return; + } Intent intent = new Intent(this, ChooseFolder.class); intent.putExtra(ChooseFolder.EXTRA_ACCOUNT, mAccount); intent.putExtra(ChooseFolder.EXTRA_CUR_FOLDER, mFolder); intent.putExtra(ChooseFolder.EXTRA_MESSAGE_UID, mMessageUid); startActivityForResult(intent, ACTIVITY_CHOOSE_FOLDER_COPY); - } - - @Override - protected void onActivityResult(int requestCode, int resultCode, Intent data) { - if(resultCode != RESULT_OK) - return; + } + + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + if (resultCode != RESULT_OK) + return; + + switch (requestCode) { + case ACTIVITY_CHOOSE_FOLDER_MOVE: + case ACTIVITY_CHOOSE_FOLDER_COPY: + if (data == null) + return; + String destFolderName = data.getStringExtra(ChooseFolder.EXTRA_NEW_FOLDER); + String srcFolderName = data.getStringExtra(ChooseFolder.EXTRA_CUR_FOLDER); + String uid = data.getStringExtra(ChooseFolder.EXTRA_MESSAGE_UID); + + if (uid.equals(mMessageUid) && srcFolderName.equals(mFolder)) { + + switch (requestCode) { + case ACTIVITY_CHOOSE_FOLDER_MOVE: + MessagingController.getInstance(getApplication()).moveMessage(mAccount, + srcFolderName, mMessage, destFolderName, null); + break; + case ACTIVITY_CHOOSE_FOLDER_COPY: + MessagingController.getInstance(getApplication()).copyMessage(mAccount, + srcFolderName, mMessage, destFolderName, null); + break; + } + } + } + } + - switch(requestCode) { - case ACTIVITY_CHOOSE_FOLDER_MOVE: - case ACTIVITY_CHOOSE_FOLDER_COPY: - if (data == null) - return; - String destFolderName = data.getStringExtra(ChooseFolder.EXTRA_NEW_FOLDER); - String srcFolderName = data.getStringExtra(ChooseFolder.EXTRA_CUR_FOLDER); - String uid = data.getStringExtra(ChooseFolder.EXTRA_MESSAGE_UID); - - if (uid.equals(mMessageUid) && srcFolderName.equals(mFolder)) - { - - switch (requestCode) { - case ACTIVITY_CHOOSE_FOLDER_MOVE: - MessagingController.getInstance(getApplication()).moveMessage(mAccount, - srcFolderName, mMessage, destFolderName, null); - break; - case ACTIVITY_CHOOSE_FOLDER_COPY: - MessagingController.getInstance(getApplication()).copyMessage(mAccount, - srcFolderName, mMessage, destFolderName, null); - break; - } - } - } - } - - private void onSendAlternate() { - if (mMessage != null) { - MessagingController.getInstance(getApplication()).sendAlternate(this, mAccount, mMessage); + if (mMessage != null) { + MessagingController.getInstance(getApplication()).sendAlternate(this, mAccount, mMessage); - } - } + } + } private void onNext() { if (mNextMessageUid == null) { @@ -850,14 +842,13 @@ public class MessageView extends K9Activity } private void onMarkAsUnread() { - if (mMessage != null) - { - MessagingController.getInstance(getApplication()).markMessageRead( + if (mMessage != null) { + MessagingController.getInstance(getApplication()).markMessageRead( mAccount, mFolder, mMessage.getUid(), false); - } + } } /** @@ -879,8 +870,7 @@ public class MessageView extends K9Activity String name = filename.substring(0, index); String extension = filename.substring(index); format = name + "-%d" + extension; - } - else { + } else { format = filename + "-%d"; } for (int i = 2; i < Integer.MAX_VALUE; i++) { @@ -899,31 +889,29 @@ public class MessageView extends K9Activity * the time downloading it and then abort. */ Toast.makeText(this, - getString(R.string.message_view_status_attachment_not_saved), - Toast.LENGTH_SHORT).show(); + getString(R.string.message_view_status_attachment_not_saved), + Toast.LENGTH_SHORT).show(); return; } - if (mMessage != null) - { - MessagingController.getInstance(getApplication()).loadAttachment( - mAccount, - mMessage, - attachment.part, - new Object[] { true, attachment }, - mListener); + if (mMessage != null) { + MessagingController.getInstance(getApplication()).loadAttachment( + mAccount, + mMessage, + attachment.part, + new Object[] { true, attachment }, + mListener); } } private void onViewAttachment(Attachment attachment) { - if (mMessage != null) - { - MessagingController.getInstance(getApplication()).loadAttachment( + if (mMessage != null) { + MessagingController.getInstance(getApplication()).loadAttachment( mAccount, mMessage, attachment.part, new Object[] { false, attachment }, mListener); - } + } } private void onShowPictures() { @@ -932,82 +920,82 @@ public class MessageView extends K9Activity } @Override - public boolean dispatchTouchEvent(MotionEvent ev){ + public boolean dispatchTouchEvent(MotionEvent ev) { super.dispatchTouchEvent(ev); return gestureDetector.onTouchEvent(ev); } public void onClick(View view) { switch (view.getId()) { - case R.id.from: - onClickSender(); - break; - case R.id.reply: - case R.id.reply_scrolling: - onReply(); - break; - case R.id.reply_all: - onReplyAll(); - break; - case R.id.delete: - case R.id.delete_scrolling: - onDelete(); - break; - case R.id.forward: - case R.id.forward_scrolling: - onForward(); - break; - case R.id.next: - case R.id.next_scrolling: - onNext(); - break; - case R.id.previous: - case R.id.previous_scrolling: - onPrevious(); - break; - case R.id.download: - onDownloadAttachment((Attachment) view.getTag()); - break; - case R.id.view: - onViewAttachment((Attachment) view.getTag()); - break; - case R.id.show_pictures: - onShowPictures(); - break; + case R.id.from: + onClickSender(); + break; + case R.id.reply: + case R.id.reply_scrolling: + onReply(); + break; + case R.id.reply_all: + onReplyAll(); + break; + case R.id.delete: + case R.id.delete_scrolling: + onDelete(); + break; + case R.id.forward: + case R.id.forward_scrolling: + onForward(); + break; + case R.id.next: + case R.id.next_scrolling: + onNext(); + break; + case R.id.previous: + case R.id.previous_scrolling: + onPrevious(); + break; + case R.id.download: + onDownloadAttachment((Attachment) view.getTag()); + break; + case R.id.view: + onViewAttachment((Attachment) view.getTag()); + break; + case R.id.show_pictures: + onShowPictures(); + break; } } public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { - case R.id.delete: - onDelete(); - break; - case R.id.reply: - onReply(); - break; - case R.id.reply_all: - onReplyAll(); - break; - case R.id.forward: - onForward(); - break; - case R.id.send_alternate: - onSendAlternate(); - break; - case R.id.mark_as_unread: - onMarkAsUnread(); - break; - case R.id.flag: - onFlag(); - break; - case R.id.move: - onMove(); - break; - case R.id.copy: - onCopy(); - break; - default: - return super.onOptionsItemSelected(item); + case R.id.delete: + onDelete(); + break; + case R.id.reply: + onReply(); + break; + case R.id.reply_all: + onReplyAll(); + break; + case R.id.forward: + onForward(); + break; + case R.id.send_alternate: + onSendAlternate(); + break; + case R.id.mark_as_unread: + onMarkAsUnread(); + break; + case R.id.flag: + onFlag(); + break; + case R.id.move: + onMove(); + break; + case R.id.copy: + onCopy(); + break; + default: + return super.onOptionsItemSelected(item); } return true; } @@ -1018,14 +1006,12 @@ public class MessageView extends K9Activity getMenuInflater().inflate(R.menu.message_view_option, menu); optionsMenu = menu; setMenuFlag(); - if (MessagingController.getInstance(getApplication()).isCopyCapable(mAccount) == false) - { - menu.findItem(R.id.copy).setVisible(false); + if (MessagingController.getInstance(getApplication()).isCopyCapable(mAccount) == false) { + menu.findItem(R.id.copy).setVisible(false); + } + if (MessagingController.getInstance(getApplication()).isMoveCapable(mAccount) == false) { + menu.findItem(R.id.move).setVisible(false); } - if (MessagingController.getInstance(getApplication()).isMoveCapable(mAccount) == false) - { - menu.findItem(R.id.move).setVisible(false); - } return true; } @@ -1035,19 +1021,16 @@ public class MessageView extends K9Activity return super.onPrepareOptionsMenu(menu); } - private void setMenuFlag() - { - Menu menu = optionsMenu; - if (menu != null) - { - MenuItem flagItem = menu.findItem(R.id.flag); - if (flagItem != null && mMessage != null) - { - flagItem.setTitle((mMessage.isSet(Flag.FLAGGED) ? R.string.unflag_action : R.string.flag_action)); + private void setMenuFlag() { + Menu menu = optionsMenu; + if (menu != null) { + MenuItem flagItem = menu.findItem(R.id.flag); + if (flagItem != null && mMessage != null) { + flagItem.setTitle((mMessage.isSet(Flag.FLAGGED) ? R.string.unflag_action : R.string.flag_action)); + } } - } } - + public CacheResult service(String url, Map headers) { if (url.startsWith(CID_PREFIX) && mMessage != null) { try { @@ -1059,8 +1042,7 @@ public class MessageView extends K9Activity // part.getBody().writeTo(cr.getStream()); return cr; } - } - catch (Exception e) { + } catch (Exception e) { // TODO } } @@ -1084,13 +1066,12 @@ public class MessageView extends K9Activity splittedHeaders.put(headerName, headerValues); } return new PluginData( - part.getBody().getInputStream(), - part.getSize(), - splittedHeaders, - HttpURLConnection.HTTP_OK); + part.getBody().getInputStream(), + part.getSize(), + splittedHeaders, + HttpURLConnection.HTTP_OK); } - } - catch (Exception e) { + } catch (Exception e) { // TODO } } @@ -1100,13 +1081,12 @@ public class MessageView extends K9Activity private Bitmap getPreviewIcon(Attachment attachment) throws MessagingException { try { return BitmapFactory.decodeStream( - getContentResolver().openInputStream( - AttachmentProvider.getAttachmentThumbnailUri(mAccount, - attachment.part.getAttachmentId(), - 62, - 62))); - } - catch (Exception e) { + getContentResolver().openInputStream( + AttachmentProvider.getAttachmentThumbnailUri(mAccount, + attachment.part.getAttachmentId(), + 62, + 62))); + } catch (Exception e) { /* * We don't care what happened, we just return null for the preview icon. */ @@ -1124,14 +1104,11 @@ public class MessageView extends K9Activity long gb = (mb * 1024); if (size < kb) { return String.format("%d bytes", (int) size); - } - else if (size < mb) { + } else if (size < mb) { return String.format("%.1f kB", size / kb); - } - else if (size < gb) { + } else if (size < gb) { return String.format("%.1f MB", size / mb); - } - else { + } else { return String.format("%.1f GB", size / gb); } } @@ -1140,9 +1117,8 @@ public class MessageView extends K9Activity String contentType = MimeUtility.unfoldAndDecode(part.getContentType()); String contentDisposition = MimeUtility.unfoldAndDecode(part.getDisposition()); String name = MimeUtility.getHeaderParameter(contentType, "name"); - if (name == null) - { - name = MimeUtility.getHeaderParameter(contentDisposition, "filename"); + if (name == null) { + name = MimeUtility.getHeaderParameter(contentDisposition, "filename"); } if (name != null) { /* @@ -1166,15 +1142,15 @@ public class MessageView extends K9Activity Button attachmentDownload = (Button)view.findViewById(R.id.download); if ((!MimeUtility.mimeTypeMatches(attachment.contentType, - Email.ACCEPTABLE_ATTACHMENT_VIEW_TYPES)) + Email.ACCEPTABLE_ATTACHMENT_VIEW_TYPES)) || (MimeUtility.mimeTypeMatches(attachment.contentType, - Email.UNACCEPTABLE_ATTACHMENT_VIEW_TYPES))) { + Email.UNACCEPTABLE_ATTACHMENT_VIEW_TYPES))) { attachmentView.setVisibility(View.GONE); } if ((!MimeUtility.mimeTypeMatches(attachment.contentType, - Email.ACCEPTABLE_ATTACHMENT_DOWNLOAD_TYPES)) + Email.ACCEPTABLE_ATTACHMENT_DOWNLOAD_TYPES)) || (MimeUtility.mimeTypeMatches(attachment.contentType, - Email.UNACCEPTABLE_ATTACHMENT_DOWNLOAD_TYPES))) { + Email.UNACCEPTABLE_ATTACHMENT_DOWNLOAD_TYPES))) { attachmentDownload.setVisibility(View.GONE); } @@ -1211,29 +1187,28 @@ public class MessageView extends K9Activity } } } - + private void setHeaders(Account account, String folder, String uid, - final Message message) throws MessagingException - { - String subjectText = message.getSubject(); - String fromText = Address.toFriendly(message.getFrom()); - String dateText = Utility.isDateToday(message.getSentDate()) ? - null : - getDateFormat().format(message.getSentDate()); - String timeText = getTimeFormat().format(message.getSentDate()); - String toText = Address.toFriendly(message.getRecipients(RecipientType.TO)); - String ccText = Address.toFriendly(message.getRecipients(RecipientType.CC)); - Log.d(Email.LOG_TAG, ccText); - boolean hasAttachments = ((LocalMessage) message).getAttachmentCount() > 0; - mHandler.setHeaders(subjectText, - fromText, - dateText, - timeText, - toText, - ccText, - hasAttachments, - message.isSet(Flag.FLAGGED), - message.isSet(Flag.ANSWERED)); + final Message message) throws MessagingException { + String subjectText = message.getSubject(); + String fromText = Address.toFriendly(message.getFrom()); + String dateText = Utility.isDateToday(message.getSentDate()) ? + null : + getDateFormat().format(message.getSentDate()); + String timeText = getTimeFormat().format(message.getSentDate()); + String toText = Address.toFriendly(message.getRecipients(RecipientType.TO)); + String ccText = Address.toFriendly(message.getRecipients(RecipientType.CC)); + Log.d(Email.LOG_TAG, ccText); + boolean hasAttachments = ((LocalMessage) message).getAttachmentCount() > 0; + mHandler.setHeaders(subjectText, + fromText, + dateText, + timeText, + toText, + ccText, + hasAttachments, + message.isSet(Flag.FLAGGED), + message.isSet(Flag.ANSWERED)); } class Listener extends MessagingListener { @@ -1249,14 +1224,13 @@ public class MessageView extends K9Activity if (!message.isSet(Flag.X_DOWNLOADED_FULL)) { mHandler.post(new Runnable() { public void run() { - mMessageContentView.loadUrl("file:///android_asset/downloading.html"); - } + mMessageContentView.loadUrl("file:///android_asset/downloading.html"); + } }); } try { setHeaders(account, folder, uid, message); - } - catch (MessagingException me) { + } catch (MessagingException me) { if (Config.LOGV) { Log.v(Email.LOG_TAG, "loadMessageForViewHeadersAvailable", me); } @@ -1265,11 +1239,11 @@ public class MessageView extends K9Activity @Override public void loadMessageForViewBodyAvailable(Account account, String folder, String uid, - Message message) { + Message message) { if (!mMessageUid.equals(uid)) { return; } - + MessageView.this.mMessage = message; try { String text; @@ -1278,18 +1252,15 @@ public class MessageView extends K9Activity part = MimeUtility.findFirstPartByMimeType(mMessage, "text/plain"); if (part == null) { text = null; - } - else { + } else { LocalTextBody body = (LocalTextBody)part.getBody(); if (body == null) { text = null; - } - else { + } else { text = body.getBodyForDisplay(); } } - } - else { + } else { text = MimeUtility.getTextFromPart(part); } @@ -1305,20 +1276,18 @@ public class MessageView extends K9Activity } }); mHandler.showShowPictures(text.contains(" max_off_path ) - return false; - // right to left swipe - if(e1.getX() - e2.getX() > min_distance && Math.abs(velocityX) > min_velocity ) { - onNext(); - } else if (e2.getX() - e1.getX() > min_distance && Math.abs(velocityX) > min_velocity) { - onPrevious(); + try { + if (Math.abs(e1.getY() - e2.getY()) > max_off_path ) + return false; + // right to left swipe + if (e1.getX() - e2.getX() > min_distance && Math.abs(velocityX) > min_velocity ) { + onNext(); + } else if (e2.getX() - e1.getX() > min_distance && Math.abs(velocityX) > min_velocity) { + onPrevious(); + } + } catch (Exception e) { + // nothing } - } catch (Exception e) { - // nothing + return false; } - return false; + + } } - - -}