moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-27 19:52:17 -05:00
Code Issues Releases Wiki Activity

Updates to the view need to happen on the UI thread

Browse Source 
Fixes downloading attachments (would just fail silently)

  Also added a ProgressDialog since progress() just asks for
  progress to displayed in the title bar. Since there is no title bar,
  no progress is shown at all.
This commit is contained in:
Jan Berkel 2011-02-20 18:49:55 +01:00
parent ea590cbe39
commit 41378188f9
3 changed files with 45 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
res/values/ids.xml
View File

@ -2,5 +2,6 @@
<resources> <resources>
<item type="id" name="dialog_confirm_delete"/> <item type="id" name="dialog_confirm_delete"/>
<item type="id" name="dialog_attachment_progress"/>
</resources> </resources>

2
res/values/strings.xml
View File

@ -1021,6 +1021,8 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="dialog_confirm_delete_confirm_button">Delete</string> <string name="dialog_confirm_delete_confirm_button">Delete</string>
<string name="dialog_confirm_delete_cancel_button">Do not delete</string> <string name="dialog_confirm_delete_cancel_button">Do not delete</string>
<string name="dialog_attachment_progress_title">Downloading attachment</string>
<string name="debug_logging_enabled">Debug logging to Android logging system enabled</string> <string name="debug_logging_enabled">Debug logging to Android logging system enabled</string>
<string name="messagelist_sent_to_me_sigil">»</string> <string name="messagelist_sent_to_me_sigil">»</string>

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

@ -2,6 +2,7 @@ package com.fsck.k9.activity;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.Dialog; import android.app.Dialog;
import android.app.ProgressDialog;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
@ -942,9 +943,12 @@ public class MessageView extends K9Activity implements OnClickListener {
@Override @Override
protected Dialog onCreateDialog(final int id) { protected Dialog onCreateDialog(final int id) {
switch (id) { switch (id) {
case R.id.dialog_confirm_delete: { case R.id.dialog_confirm_delete: return createConfirmDeleteDialog(id);
return createConfirmDeleteDialog(id); case R.id.dialog_attachment_progress:
} ProgressDialog d = new ProgressDialog(this);
d.setIndeterminate(true);
d.setTitle(R.string.dialog_attachment_progress_title);
return d;
} }
return super.onCreateDialog(id); return super.onCreateDialog(id);
} }
@ -1075,32 +1079,42 @@ public class MessageView extends K9Activity implements OnClickListener {
} }
@Override @Override
public void loadAttachmentStarted(Account account, Message message, Part part, Object tag, boolean requiresDownload) { public void loadAttachmentStarted(Account account, Message message, Part part, Object tag, final boolean requiresDownload) {
if (mMessage != message) { if (mMessage != message) {
return; return;
} }
mMessageView.setAttachmentsEnabled(false); mHandler.post(new Runnable() {
mHandler.progress(true); @Override
if (requiresDownload) { public void run() {
mHandler.fetchingAttachment(); mMessageView.setAttachmentsEnabled(false);
} showDialog(R.id.dialog_attachment_progress);
if (requiresDownload) {
mHandler.fetchingAttachment();
}
}
});
} }
@Override @Override
public void loadAttachmentFinished(Account account, Message message, Part part, Object tag) { public void loadAttachmentFinished(Account account, Message message, Part part, final Object tag) {
if (mMessage != message) { if (mMessage != message) {
return; return;
} }
mMessageView.setAttachmentsEnabled(true); mHandler.post(new Runnable() {
mHandler.progress(false); public void run() {
Object[] params = (Object[]) tag; mMessageView.setAttachmentsEnabled(true);
boolean download = (Boolean) params[0]; removeDialog(R.id.dialog_attachment_progress);
AttachmentView attachment = (AttachmentView) params[1]; Object[] params = (Object[]) tag;
if (download) { boolean download = (Boolean) params[0];
attachment.writeFile(); AttachmentView attachment = (AttachmentView) params[1];
} else { if (download) {
attachment.showFile(); attachment.writeFile();
} } else {
attachment.showFile();
}
}
});
} }
@Override @Override
@ -1108,9 +1122,14 @@ public class MessageView extends K9Activity implements OnClickListener {
if (mMessage != message) { if (mMessage != message) {
return; return;
} }
mMessageView.setAttachmentsEnabled(true); mHandler.post(new Runnable() {
mHandler.progress(false); public void run() {
mHandler.networkError(); mMessageView.setAttachmentsEnabled(true);
removeDialog(R.id.dialog_attachment_progress);
mHandler.networkError();
}
});
} }
} }