moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2025-01-12 06:08:25 -05:00
Code Issues Releases Wiki Activity

Revert the active part of "Update issue 848"

Browse Source 
This reverts commit 9fc94115adb58dcd8a64227a93d0e6e707d7752d.

It turns out that disabling the "View attachment" button (rather than
giving a useful error message telling the user what mime type the app
needs to support) was confusing to users.
This commit is contained in:
Jesse Vincent 2011-01-28 03:33:49 +00:00
parent f60e662db2
commit 4a558c5ac5
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -380,11 +380,6 @@ public class MessageView extends K9Activity implements OnClickListener
AttachmentView attachment = (AttachmentView) mAttachments.getChildAt(i); AttachmentView attachment = (AttachmentView) mAttachments.getChildAt(i);
attachment.viewButton.setEnabled(enabled); attachment.viewButton.setEnabled(enabled);
attachment.downloadButton.setEnabled(enabled); attachment.downloadButton.setEnabled(enabled);
if (enabled)
{
attachment.checkViewable();
}
} }
} }
}); });

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

@ -2,7 +2,6 @@ package com.fsck.k9.view;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.BitmapFactory; import android.graphics.BitmapFactory;
import android.net.Uri; import android.net.Uri;
@ -102,10 +101,6 @@ public class AttachmentView extends FrameLayout
{ {
viewButton.setVisibility(View.GONE); viewButton.setVisibility(View.GONE);
} }
else
{
checkViewable();
}
if ((!MimeUtility.mimeTypeMatches(contentType, K9.ACCEPTABLE_ATTACHMENT_DOWNLOAD_TYPES)) if ((!MimeUtility.mimeTypeMatches(contentType, K9.ACCEPTABLE_ATTACHMENT_DOWNLOAD_TYPES))
|| (MimeUtility.mimeTypeMatches(contentType, K9.UNACCEPTABLE_ATTACHMENT_DOWNLOAD_TYPES))) || (MimeUtility.mimeTypeMatches(contentType, K9.UNACCEPTABLE_ATTACHMENT_DOWNLOAD_TYPES)))
{ {