moparisthebest
/
k-9
mirror of https://github.com/moparisthebest/k-9
1
0
Fork 0
Code Issues Releases Wiki Activity

continue to extract attachment code out to AttachmentView

This commit is contained in:
Jesse Vincent 2011-01-06 16:56:37 +00:00
parent 19c5324316
commit 39ef6584a8
2 changed files with 24 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1484,30 +1484,6 @@ public class MessageView extends K9Activity implements OnClickListener
mListener);
}
private void onDownloadAttachment(AttachmentView attachment)
{
if (!Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED))
{
/*
* Abort early if there's no place to save the attachment. We don't want to spend
* the time downloading it and then abort.
*/
Toast.makeText(this,
getString(R.string.message_view_status_attachment_not_saved),
Toast.LENGTH_SHORT).show();
return;
}
if (mMessage != null)
{
mController.loadAttachment(
mAccount,
mMessage,
attachment.part,
new Object[] {true, attachment},
mListener);
}
}
private void onShowPictures()
{
// TODO: Download attachments that are used as inline image
@ -1571,7 +1547,7 @@ public class MessageView extends K9Activity implements OnClickListener
onPrevious();
break;
case R.id.download:
onDownloadAttachment((AttachmentView) view);
((AttachmentView)view).saveFile();
break;
case R.id.show_pictures:
onShowPictures();
@ -1974,7 +1950,7 @@ public class MessageView extends K9Activity implements OnClickListener
AttachmentView attachment = (AttachmentView) params[1];
if (download)
{
attachment.saveFile();
attachment.writeFile();
}
else

27
src/com/fsck/k9/view/AttachmentView.java
View File

@ -185,13 +185,10 @@ public class AttachmentView extends FrameLayout
private void onSaveButtonClicked()
{
if (mMessage != null)
{
mController.loadAttachment( mAccount, mMessage, part, new Object[] { true, this }, mListener);
}
saveFile();
}
public void saveFile ()
public void writeFile ()
{
try
{
@ -212,6 +209,26 @@ public class AttachmentView extends FrameLayout
}
}
public void saveFile()
{
if (!Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED))
{
/*
* Abort early if there's no place to save the attachment. We don't want to spend
* the time downloading it and then abort.
*/
Toast.makeText(mContext,
mContext.getString(R.string.message_view_status_attachment_not_saved),
Toast.LENGTH_SHORT).show();
return;
}
if (mMessage != null)
{
mController.loadAttachment( mAccount, mMessage, part, new Object[] {true, this}, mListener);
}
}
public void showFile()
{
Uri uri = AttachmentProvider.getAttachmentUri( mAccount, part.getAttachmentId());