moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-30 13:12:25 -05:00
Code Issues Releases Wiki Activity

reformatting

Browse Source
This commit is contained in:
Jesse Vincent 2011-02-14 20:45:08 -05:00
parent fb663508e0
commit 8a778a0222
1 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -470,7 +470,6 @@ public class MessageView extends K9Activity implements OnClickListener {
disableMoveButtons(); disableMoveButtons();
} }
} }
private void staticButtons() { private void staticButtons() {
View buttons = findViewById(R.id.scrolling_buttons); View buttons = findViewById(R.id.scrolling_buttons);
if (buttons != null) { if (buttons != null) {
@ -609,9 +608,7 @@ public class MessageView extends K9Activity implements OnClickListener {
disableButtons(); disableButtons();
Message messageToDelete = mMessage; Message messageToDelete = mMessage;
showNextMessageOrReturn(); showNextMessageOrReturn();
mController.deleteMessages( mController.deleteMessages(new Message[] {messageToDelete}, null);
new Message[] {messageToDelete},
null);
} }
} }
@ -630,8 +627,7 @@ public class MessageView extends K9Activity implements OnClickListener {
return; return;
} }
showNextMessageOrReturn(); showNextMessageOrReturn();
mController mController.moveMessage(mAccount, srcFolder, messageToMove, dstFolder, null);
.moveMessage(mAccount, srcFolder, messageToMove, dstFolder, null);
} }
@ -754,12 +750,10 @@ public class MessageView extends K9Activity implements OnClickListener {
case ACTIVITY_CHOOSE_FOLDER_MOVE: case ACTIVITY_CHOOSE_FOLDER_MOVE:
Message messageToMove = mMessage; Message messageToMove = mMessage;
showNextMessageOrReturn(); showNextMessageOrReturn();
mController.moveMessage(mAccount, mController.moveMessage(mAccount, srcFolderName, messageToMove, destFolderName, null);
srcFolderName, messageToMove, destFolderName, null);
break; break;
case ACTIVITY_CHOOSE_FOLDER_COPY: case ACTIVITY_CHOOSE_FOLDER_COPY:
mController.copyMessage(mAccount, mController.copyMessage(mAccount, srcFolderName, mMessage, destFolderName, null);
srcFolderName, mMessage, destFolderName, null);
break; break;
} }
} }
@ -805,12 +799,7 @@ public class MessageView extends K9Activity implements OnClickListener {
private void onMarkAsUnread() { private void onMarkAsUnread() {
if (mMessage != null) { if (mMessage != null) {
mController.setFlag( mController.setFlag(mAccount, mMessageReference.folderName, new String[] { mMessage.getUid() }, Flag.SEEN, false);
mAccount,
mMessageReference.folderName,
new String[] { mMessage.getUid() },
Flag.SEEN,
false);
try { try {
mMessage.setFlag(Flag.SEEN, false); mMessage.setFlag(Flag.SEEN, false);
mMessageView.setHeaders(mMessage, mAccount); mMessageView.setHeaders(mMessage, mAccount);
@ -1050,8 +1039,7 @@ public class MessageView extends K9Activity implements OnClickListener {
@Override @Override
public void loadMessageForViewFailed(Account account, String folder, String uid, public void loadMessageForViewFailed(Account account, String folder, String uid, final Throwable t) {
final Throwable t) {
if (!mMessageReference.uid.equals(uid) || !mMessageReference.folderName.equals(folder) if (!mMessageReference.uid.equals(uid) || !mMessageReference.folderName.equals(folder)
|| !mMessageReference.accountUuid.equals(account.getUuid())) { || !mMessageReference.accountUuid.equals(account.getUuid())) {
return; return;
@ -1073,8 +1061,7 @@ public class MessageView extends K9Activity implements OnClickListener {
} }
@Override @Override
public void loadMessageForViewFinished(Account account, String folder, String uid, public void loadMessageForViewFinished(Account account, String folder, String uid, final Message message) {
final Message message) {
if (!mMessageReference.uid.equals(uid) || !mMessageReference.folderName.equals(folder) if (!mMessageReference.uid.equals(uid) || !mMessageReference.folderName.equals(folder)
|| !mMessageReference.accountUuid.equals(account.getUuid())) { || !mMessageReference.accountUuid.equals(account.getUuid())) {
return; return;
@ -1101,8 +1088,7 @@ public class MessageView extends K9Activity implements OnClickListener {
} }
@Override @Override
public void loadAttachmentStarted(Account account, Message message, public void loadAttachmentStarted(Account account, Message message, Part part, Object tag, boolean requiresDownload) {
Part part, Object tag, boolean requiresDownload) {
if (mMessage != message) { if (mMessage != message) {
return; return;
} }
@ -1125,15 +1111,13 @@ public class MessageView extends K9Activity implements OnClickListener {
AttachmentView attachment = (AttachmentView) params[1]; AttachmentView attachment = (AttachmentView) params[1];
if (download) { if (download) {
attachment.writeFile(); attachment.writeFile();
} else { } else {
attachment.showFile(); attachment.showFile();
} }
} }
@Override @Override
public void loadAttachmentFailed(Account account, Message message, Part part, public void loadAttachmentFailed(Account account, Message message, Part part, Object tag, String reason) {
Object tag, String reason) {
if (mMessage != message) { if (mMessage != message) {
return; return;
} }