From ca88f59c0550f65182674c9bb86b75e39fd2eafb Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Mon, 20 Oct 2014 20:46:46 -0400
Subject: [PATCH]  Create named class for loading and displaying attachment
 thumbnails

---
 src/com/fsck/k9/view/AttachmentView.java | 71 +++++++++++++-----------
 1 file changed, 39 insertions(+), 32 deletions(-)

diff --git a/src/com/fsck/k9/view/AttachmentView.java b/src/com/fsck/k9/view/AttachmentView.java
index 9a9fbf05e..144ecf40f 100644
--- a/src/com/fsck/k9/view/AttachmentView.java
+++ b/src/com/fsck/k9/view/AttachmentView.java
@@ -152,7 +152,6 @@ public class AttachmentView extends FrameLayout implements OnClickListener, OnLo
         contentType = MimeUtility.getMimeTypeForViewing(part.getMimeType(), name);
         TextView attachmentName = (TextView) findViewById(R.id.attachment_name);
         TextView attachmentInfo = (TextView) findViewById(R.id.attachment_info);
-        final ImageView attachmentIcon = (ImageView) findViewById(R.id.attachment_icon);
         viewButton = (Button) findViewById(R.id.view);
         downloadButton = (Button) findViewById(R.id.download);
         if ((!MimeUtility.mimeTypeMatches(contentType, K9.ACCEPTABLE_ATTACHMENT_VIEW_TYPES))
@@ -174,20 +173,9 @@ public class AttachmentView extends FrameLayout implements OnClickListener, OnLo
 
         attachmentName.setText(name);
         attachmentInfo.setText(SizeFormatter.formatSize(mContext, size));
-        new AsyncTask<Void, Void, Bitmap>() {
-            protected Bitmap doInBackground(Void... asyncTaskArgs) {
-                Bitmap previewIcon = getPreviewIcon();
-                return previewIcon;
-            }
 
-            protected void onPostExecute(Bitmap previewIcon) {
-                if (previewIcon != null) {
-                    attachmentIcon.setImageBitmap(previewIcon);
-                } else {
-                    attachmentIcon.setImageResource(R.drawable.attached_image_placeholder);
-                }
-            }
-        }.execute();
+        ImageView thumbnail = (ImageView) findViewById(R.id.attachment_icon);
+        new LoadAndDisplayThumbnailAsyncTask(thumbnail).execute();
 
         return firstClassAttachment;
     }
@@ -216,24 +204,6 @@ public class AttachmentView extends FrameLayout implements OnClickListener, OnLo
         return false;
     }
 
-    private Bitmap getPreviewIcon() {
-        Bitmap icon = null;
-        try {
-            InputStream input = mContext.getContentResolver().openInputStream(
-                    AttachmentProvider.getAttachmentThumbnailUri(mAccount,
-                            part.getAttachmentId(),
-                            62,
-                            62));
-            icon = BitmapFactory.decodeStream(input);
-            input.close();
-        } catch (Exception e) {
-            /*
-             * We don't care what happened, we just return null for the preview icon.
-             */
-        }
-        return icon;
-    }
-
     private void onViewButtonClicked() {
         if (mMessage != null) {
             mController.loadAttachment(mAccount, mMessage, part, new Object[] {false, this}, mListener);
@@ -331,4 +301,41 @@ public class AttachmentView extends FrameLayout implements OnClickListener, OnLo
     public void setCallback(AttachmentFileDownloadCallback callback) {
         this.callback = callback;
     }
+
+    private class LoadAndDisplayThumbnailAsyncTask extends AsyncTask<Void, Void, Bitmap> {
+        private final ImageView thumbnail;
+
+        public LoadAndDisplayThumbnailAsyncTask(ImageView thumbnail) {
+            this.thumbnail = thumbnail;
+        }
+
+        protected Bitmap doInBackground(Void... asyncTaskArgs) {
+            return getPreviewIcon();
+        }
+
+        private Bitmap getPreviewIcon() {
+            Bitmap icon = null;
+            try {
+                InputStream input = mContext.getContentResolver().openInputStream(
+                        AttachmentProvider.getAttachmentThumbnailUri(mAccount,
+                                part.getAttachmentId(),
+                                62,
+                                62));
+                icon = BitmapFactory.decodeStream(input);
+                input.close();
+            } catch (Exception e) {
+                // We don't care what happened, we just return null for the preview icon.
+            }
+
+            return icon;
+        }
+
+        protected void onPostExecute(Bitmap previewIcon) {
+            if (previewIcon != null) {
+                thumbnail.setImageBitmap(previewIcon);
+            } else {
+                thumbnail.setImageResource(R.drawable.attached_image_placeholder);
+            }
+        }
+    }
 }