ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 2d9a2186: am d6fbab1e: Merge "Prevent logging about "attachment with null contentUri"" into honeycomb

Browse Source 
* commit '2d9a2186b883863a34378e0d62799ea1338ac2ce':
  Prevent logging about "attachment with null contentUri"
This commit is contained in:
Marc Blank 2011-01-23 17:00:21 -08:00 committed by Android Git Automerger
commit 8818e4f472
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/email/AttachmentInfo.java
View File

@ -113,11 +113,10 @@ public class AttachmentInfo {
} }
} }
// Check to see if any activities can view this attachment // Check to see if any activities can view this attachment; if none, we can't view it
// If not, we can't view it
Intent intent = getAttachmentIntent(context, 0); Intent intent = getAttachmentIntent(context, 0);
PackageManager pm = context.getPackageManager(); PackageManager pm = context.getPackageManager();
List<ResolveInfo> activityList = pm.queryIntentActivities(intent, 0); List<ResolveInfo> activityList = pm.queryIntentActivities(intent, 0 /*no account*/);
if (activityList.isEmpty()) { if (activityList.isEmpty()) {
canView = false; canView = false;
canSave = false; canSave = false;
@ -129,15 +128,21 @@ public class AttachmentInfo {
/** /**
* Returns an <code>Intent</code> to load the given attachment. * Returns an <code>Intent</code> to load the given attachment.
* @param context the caller's context
* @param accountId the account associated with the attachment (or 0 if we don't need to
* resolve from attachmentUri to contentUri)
* @return an Intent suitable for loading the attachment
*/ */
public Intent getAttachmentIntent(Context context, long accountId) { public Intent getAttachmentIntent(Context context, long accountId) {
Uri attachmentUri = AttachmentProvider.getAttachmentUri(accountId, mId); Uri contentUri = AttachmentProvider.getAttachmentUri(accountId, mId);
Uri contentUri = AttachmentProvider.resolveAttachmentIdToContentUri( if (accountId > 0) {
context.getContentResolver(), attachmentUri); contentUri = AttachmentProvider.resolveAttachmentIdToContentUri(
context.getContentResolver(), contentUri);
}
Intent intent = new Intent(Intent.ACTION_VIEW); Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setData(contentUri); intent.setData(contentUri);
intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION
| Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET); | Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
return intent; return intent;
} }