diff options
| -rw-r--r-- | AndroidManifest.xml | 36 | ||||
| -rw-r--r-- | src/com/android/email/activity/ComposeActivityEmailExternal.java | 18 |
2 files changed, 9 insertions, 45 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 71648e805..d650d446a 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -67,6 +67,14 @@ <uses-permission android:name="android.permission.USE_CREDENTIALS"/> + <!-- Permission to get widget updates. The associated broadcast gives the + account and the characteristics of the folder. --> + <permission + android:name="com.android.email.permission.GET_WIDGET_UPDATE" + android:protectionLevel="signature" + android:label="@string/permission_update_widget_label" + android:description="@string/permission_update_widget_desc"/> + <!-- Grant permission to system apps to access provider (see provider below) --> <permission android:name="com.android.email.permission.ACCESS_PROVIDER" @@ -106,39 +114,11 @@ <category android:name="android.intent.category.BROWSABLE" /> </intent-filter> - <intent-filter - android:label="@string/app_name"> - <action - android:name="android.intent.action.SEND" /> - <data - android:mimeType="*/*" /> - <category - android:name="android.intent.category.DEFAULT" /> - </intent-filter> - <intent-filter - android:label="@string/app_name"> - <action - android:name="android.intent.action.SEND_MULTIPLE" /> - <data - android:mimeType="*/*" /> - <category - android:name="android.intent.category.DEFAULT" /> - </intent-filter> <intent-filter> <action android:name="com.android.email.intent.action.REPLY" /> </intent-filter> <intent-filter> - <action android:name="android.intent.action.SEND" /> - <category - android:name="android.intent.category.DEFAULT" /> - <data - android:scheme="content" - android:host="ui.email2.android.com" - android:pathPrefix="/compose" - /> - </intent-filter> - <intent-filter> <action android:name="android.nfc.action.NDEF_DISCOVERED" /> <category android:name="android.intent.category.DEFAULT" /> <data android:scheme="mailto" /> 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)); - } - } } |