diff options
author | Ekin Oguz <ekinoguz@google.com> | 2016-12-06 03:21:01 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-12-06 03:21:01 +0000 |
commit | eb85a2e10eee4f5e46a85ac168f5836b9acaa421 (patch) | |
tree | 7d8c94b565871331c0186aee410caa9821ef576d | |
parent | 1e5ed29349d987aefdbdc0c4177dc92898164ff5 (diff) | |
parent | cce602a7ba0bb91b6db5b12c2e6ba60e28a8ce63 (diff) | |
download | android_packages_apps_UnifiedEmail-eb85a2e10eee4f5e46a85ac168f5836b9acaa421.tar.gz android_packages_apps_UnifiedEmail-eb85a2e10eee4f5e46a85ac168f5836b9acaa421.tar.bz2 android_packages_apps_UnifiedEmail-eb85a2e10eee4f5e46a85ac168f5836b9acaa421.zip |
Don't allow file attachment from /data through GET_CONTENT. am: eace8b43e8 am: d21eae6d32 am: ef87f57acc am: 09e62336e5 am: 15c7da491d am: 7e2e3d56c2 am: c8df179fe7 am: 31240122aa
am: cce602a7ba
Change-Id: I8e946ed1fecd6bff052feccac959919d8475075a
-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(); } } |