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: a03ee3224e

Change-Id: Idd9e9e2306c2f6887ab570affd7dce4fdd67274e

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));
-    }
-  }
 }