From 9c4458dcd71e62bbf51a7be934f12728f85afdd0 Mon Sep 17 00:00:00 2001
From: Marc Blank <mblank@google.com>
Date: Tue, 21 Dec 2010 12:37:40 -0800
Subject: [PATCH] Don't try to show thumbnail for unloaded attachments

Bug: 3292689
Change-Id: I7575cb891f0b46c4a8564b5d2c4907025d91c639
---
 .../email/activity/MessageViewFragmentBase.java      | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/com/android/email/activity/MessageViewFragmentBase.java b/src/com/android/email/activity/MessageViewFragmentBase.java
index 0fab2e053..d36d3e149 100644
--- a/src/com/android/email/activity/MessageViewFragmentBase.java
+++ b/src/com/android/email/activity/MessageViewFragmentBase.java
@@ -48,8 +48,6 @@ import android.content.Loader;
 import android.database.ContentObserver;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
@@ -1151,6 +1149,11 @@ public abstract class MessageViewFragmentBase extends Fragment implements View.O
             attachmentView.setVisibility(View.VISIBLE);
             attachmentLoad.setVisibility(View.INVISIBLE);
             attachmentCancel.setVisibility(View.GONE);
+
+            Bitmap previewIcon = getPreviewIcon(attachmentInfo);
+            if (previewIcon != null) {
+                attachmentIcon.setImageBitmap(previewIcon);
+            }
         } else {
             // Show "Load"; hide "View" and "Save"
             attachmentSave.setVisibility(View.INVISIBLE);
@@ -1186,11 +1189,6 @@ public abstract class MessageViewFragmentBase extends Fragment implements View.O
         attachmentName.setText(attachmentInfo.name);
         attachmentInfoView.setText(Utility.formatSize(mContext, attachmentInfo.size));
 
-        Bitmap previewIcon = getPreviewIcon(attachmentInfo);
-        if (previewIcon != null) {
-            attachmentIcon.setImageBitmap(previewIcon);
-        }
-
         mAttachments.addView(view);
         mAttachments.setVisibility(View.VISIBLE);
     }