diff options
| author | Ekin Oguz <ekinoguz@google.com> | 2016-12-06 03:04:29 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-12-06 03:04:29 +0000 |
| commit | 15c7da491dce69ff8f182cb7bfa496b87a4ece35 (patch) | |
| tree | c729b7cbffb7866c8ccd48d96154d702ae6d2d13 | |
| parent | 2c60f729f2de50c5de1b96bbf53d4b9d0a81b51c (diff) | |
| parent | 09e62336e597525083f047ed445ebc68595fbe3f (diff) | |
| download | android_packages_apps_UnifiedEmail-15c7da491dce69ff8f182cb7bfa496b87a4ece35.tar.gz android_packages_apps_UnifiedEmail-15c7da491dce69ff8f182cb7bfa496b87a4ece35.tar.bz2 android_packages_apps_UnifiedEmail-15c7da491dce69ff8f182cb7bfa496b87a4ece35.zip | |
Don't allow file attachment from /data through GET_CONTENT. am: eace8b43e8 am: d21eae6d32 am: ef87f57acc
am: 09e62336e5
Change-Id: Ic0aa743313b818812171100e54aebb9e629525fa
| -rw-r--r-- | src/com/android/mail/compose/ComposeActivity.java | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/com/android/mail/compose/ComposeActivity.java b/src/com/android/mail/compose/ComposeActivity.java index 2dfac99b9..5f125abe6 100644 --- a/src/com/android/mail/compose/ComposeActivity.java +++ b/src/com/android/mail/compose/ComposeActivity.java @@ -2018,19 +2018,15 @@ public class ComposeActivity extends ActionBarActivity if (contentUri == null) { return; } - try { - if (handleSpecialAttachmentUri(contentUri)) { - return; - } + if (handleSpecialAttachmentUri(contentUri)) { + return; + } - addAttachmentAndUpdateView(mAttachmentsView.generateLocalAttachment(contentUri)); - } catch (AttachmentFailureException e) { - LogUtils.e(LOG_TAG, e, "Error adding attachment"); - showErrorToast(getResources().getString( - e.getErrorRes(), - AttachmentUtils.convertToHumanReadableSize( - getApplicationContext(), mAccount.settings.getMaxAttachmentSize()))); + final long size = handleAttachmentUrisFromIntent(Arrays.asList(contentUri)); + if (size > 0) { + mAttachmentsChanged = true; + updateSaveUi(); } } |