wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Split 'populateFromPart' into multiple methods

Browse source
This commit is contained in:
cketti 2014-10-20 21:06:31 -04:00
parent ca88f59c05
commit b3bc85ba10
1 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/com/fsck/k9/view/AttachmentView.java
View file

@ -111,8 +111,23 @@ public class AttachmentView extends FrameLayout implements OnClickListener, OnLo
*/ */
public boolean populateFromPart(Part inputPart, Message message, Account account, public boolean populateFromPart(Part inputPart, Message message, Account account,
MessagingController controller, MessagingListener listener) throws MessagingException { MessagingController controller, MessagingListener listener) throws MessagingException {
boolean firstClassAttachment = true;
part = (LocalAttachmentBodyPart) inputPart; part = (LocalAttachmentBodyPart) inputPart;
mMessage = message;
mAccount = account;
mController = controller;
mListener = listener;
boolean firstClassAttachment = extractAttachmentInformation(part);
displayAttachmentInformation();
return firstClassAttachment;
}
//TODO: extract this code to a helper class
private boolean extractAttachmentInformation(Part part) throws MessagingException {
boolean firstClassAttachment = true;
contentType = MimeUtility.unfoldAndDecode(part.getContentType()); contentType = MimeUtility.unfoldAndDecode(part.getContentType());
String contentDisposition = MimeUtility.unfoldAndDecode(part.getDisposition()); String contentDisposition = MimeUtility.unfoldAndDecode(part.getDisposition());
@ -137,11 +152,6 @@ public class AttachmentView extends FrameLayout implements OnClickListener, OnLo
firstClassAttachment = false; firstClassAttachment = false;
} }
mAccount = account;
mMessage = message;
mController = controller;
mListener = listener;
String sizeParam = MimeUtility.getHeaderParameter(contentDisposition, "size"); String sizeParam = MimeUtility.getHeaderParameter(contentDisposition, "size");
if (sizeParam != null) { if (sizeParam != null) {
try { try {
@ -150,10 +160,15 @@ public class AttachmentView extends FrameLayout implements OnClickListener, OnLo
} }
contentType = MimeUtility.getMimeTypeForViewing(part.getMimeType(), name); contentType = MimeUtility.getMimeTypeForViewing(part.getMimeType(), name);
return firstClassAttachment;
}
private void displayAttachmentInformation() {
TextView attachmentName = (TextView) findViewById(R.id.attachment_name); TextView attachmentName = (TextView) findViewById(R.id.attachment_name);
TextView attachmentInfo = (TextView) findViewById(R.id.attachment_info); TextView attachmentInfo = (TextView) findViewById(R.id.attachment_info);
viewButton = (Button) findViewById(R.id.view); viewButton = (Button) findViewById(R.id.view);
downloadButton = (Button) findViewById(R.id.download); downloadButton = (Button) findViewById(R.id.download);
if ((!MimeUtility.mimeTypeMatches(contentType, K9.ACCEPTABLE_ATTACHMENT_VIEW_TYPES)) if ((!MimeUtility.mimeTypeMatches(contentType, K9.ACCEPTABLE_ATTACHMENT_VIEW_TYPES))
|| (MimeUtility.mimeTypeMatches(contentType, K9.UNACCEPTABLE_ATTACHMENT_VIEW_TYPES))) { || (MimeUtility.mimeTypeMatches(contentType, K9.UNACCEPTABLE_ATTACHMENT_VIEW_TYPES))) {
viewButton.setVisibility(View.GONE); viewButton.setVisibility(View.GONE);
@ -176,8 +191,6 @@ public class AttachmentView extends FrameLayout implements OnClickListener, OnLo
ImageView thumbnail = (ImageView) findViewById(R.id.attachment_icon); ImageView thumbnail = (ImageView) findViewById(R.id.attachment_icon);
new LoadAndDisplayThumbnailAsyncTask(thumbnail).execute(); new LoadAndDisplayThumbnailAsyncTask(thumbnail).execute();
return firstClassAttachment;
} }
@Override @Override