commit 785fcc792435085229d1216d3394c84a4a1a8b19
author Ekin Oguz <ekinoguz@google.com> Tue Dec 06 03:28:01 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Dec 06 03:28:01 2016 +0000
tree 7d8c94b565871331c0186aee410caa9821ef576d
parent b5fb51165fd44be8e605e91fbe21ac45684f3d0c
parent 7caf02c824998e48292f31ff1d6d2b9198307f08

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 am: eb85a2e10e
am: 7caf02c824

Change-Id: Ic363b26fdae41e8c22c51e94a97cad56eda80e2c

src/com/android/mail/compose/ComposeActivity.java

diff --git a/src/com/android/mail/compose/ComposeActivity.java b/src/com/android/mail/compose/ComposeActivity.java
index 2dfac99..5f125ab 100644
--- a/src/com/android/mail/compose/ComposeActivity.java
+++ b/src/com/android/mail/compose/ComposeActivity.java
@@ -2018,19 +2018,15 @@
         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();
         }
     }