diff options
author | Raman Tenneti <rtenneti@google.com> | 2019-10-02 13:21:00 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-10-02 13:21:00 -0700 |
commit | b5f6cb50bc50e004fe00495e5559fad210474a05 (patch) | |
tree | 205a7df644a3c041b065d01177eb189795285c8a | |
parent | ac384e719aa47346fd906d52b2dc3433f80c1d98 (diff) | |
parent | a1fe2e84cfabd638e769010aa359049ea6cbf4d1 (diff) | |
download | Email-b5f6cb50bc50e004fe00495e5559fad210474a05.tar.gz |
AOSP/Email - bug fix: do not allow composing message with hidden private data attachments - Switch intent filtering to be blacklist based rather than whitelist based.
am: a1fe2e84cf
Change-Id: I358687c3c52d4841b583f7916262fdefa61b8cc0
-rw-r--r-- | src/com/android/email/activity/ComposeActivityEmailExternal.java | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/src/com/android/email/activity/ComposeActivityEmailExternal.java b/src/com/android/email/activity/ComposeActivityEmailExternal.java index a94313a86..07f6fe160 100644 --- a/src/com/android/email/activity/ComposeActivityEmailExternal.java +++ b/src/com/android/email/activity/ComposeActivityEmailExternal.java @@ -48,24 +48,8 @@ public class ComposeActivityEmailExternal extends ComposeActivityEmail { private void sanitizeIntent() { Intent sanitizedIntent = getIntent(); if (sanitizedIntent != null) { - Bundle originalExtras = sanitizedIntent.getExtras(); - if (originalExtras == null) { - originalExtras = new Bundle(); - } - sanitizedIntent.replaceExtras(new Bundle()); - copyStringExtraIfExists(ComposeActivity.EXTRA_SUBJECT, originalExtras, sanitizedIntent); - copyStringExtraIfExists(ComposeActivity.EXTRA_TO, originalExtras, sanitizedIntent); - copyStringExtraIfExists(ComposeActivity.EXTRA_CC, originalExtras, sanitizedIntent); - copyStringExtraIfExists(ComposeActivity.EXTRA_BCC, originalExtras, sanitizedIntent); - copyStringExtraIfExists(ComposeActivity.EXTRA_BODY, originalExtras, sanitizedIntent); + sanitizedIntent.removeExtra(ComposeActivity.EXTRA_IN_REFERENCE_TO_MESSAGE_URI); setIntent(sanitizedIntent); } } - - private void copyStringExtraIfExists( - String extraKey, Bundle originalExtras, Intent sanitizedIntent) { - if (originalExtras.containsKey(extraKey)) { - sanitizedIntent.putExtra(extraKey, originalExtras.getString(extraKey)); - } - } } |