ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 478417a7: Support eml attachments in email.

Browse Source 
* commit '478417a79440904b8a9c45fd3e4ec84db339a755':
  Support eml attachments in email.
This commit is contained in:
Andrew Sapperstein 2013-06-24 11:49:20 -07:00 committed by Android Git Automerger
commit 1a887385fd
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
AndroidManifest.xml
View File

@ -354,6 +354,14 @@
<grant-uri-permission android:pathPattern=".*" />
</provider>
<provider
android:authorities="@string/eml_attachment_provider"
android:multiprocess="false"
android:exported="false"
android:name="com.android.mail.providers.EmlAttachmentProvider" >
<grant-uri-permission android:pathPattern=".*" />
</provider>
<!-- The android:name is the name of the Provider class which is stored in
UnifiedEmail, and has package name com.android.mail.providers and the class is
called SuggestionsProvider. The authority name is specified in the MailAppProvider
@ -698,6 +706,7 @@
</service>
<service android:name="com.android.mail.MailLogService">
</service>
<service android:name="com.android.mail.browse.EmlTempFileDeletionService" />
</application>
<!-- Legacy permissions, etc. can go here -->

3
res/values/strings.xml
View File

@ -1283,4 +1283,7 @@ as <xliff:g id="filename">%s</xliff:g>.</string>
<string name="protocol_pop3" translatable="false">pop3</string>
<string name="protocol_eas" translatable="false">eas</string>
<string name="application_mime_type" translatable="false">application/email-ls</string>
<!-- Content Provider Authority for Eml Attachments -->
<string name="eml_attachment_provider" translatable="false">com.android.email.provider.eml.attachment</string>
</resources>

9
src/com/android/email/provider/EmailProvider.java
View File

@ -2998,7 +2998,10 @@ public class EmailProvider extends ContentProvider {
*/
private static String genQueryAttachments(String[] uiProjection,
List<String> contentTypeQueryParameters) {
StringBuilder sb = genSelect(getAttachmentMap(), uiProjection);
// MAKE SURE THESE VALUES STAY IN SYNC WITH GEN QUERY ATTACHMENT
ContentValues values = new ContentValues(1);
values.put(UIProvider.AttachmentColumns.SUPPORTS_DOWNLOAD_AGAIN, 1);
StringBuilder sb = genSelect(getAttachmentMap(), uiProjection, values);
sb.append(" FROM " + Attachment.TABLE_NAME + " WHERE " + AttachmentColumns.MESSAGE_KEY +
" =? ");
@ -3032,9 +3035,11 @@ public class EmailProvider extends ContentProvider {
private String genQueryAttachment(String[] uiProjection, String idString) {
Long id = Long.parseLong(idString);
Attachment att = Attachment.restoreAttachmentWithId(getContext(), id);
ContentValues values = new ContentValues();
// MAKE SURE THESE VALUES STAY IN SYNC WITH GEN QUERY ATTACHMENTS
ContentValues values = new ContentValues(2);
values.put(AttachmentColumns.CONTENT_URI,
AttachmentUtilities.getAttachmentUri(att.mAccountKey, id).toString());
values.put(UIProvider.AttachmentColumns.SUPPORTS_DOWNLOAD_AGAIN, 1);
StringBuilder sb = genSelect(getAttachmentMap(), uiProjection, values);
sb.append(" FROM " + Attachment.TABLE_NAME + " WHERE " + AttachmentColumns.ID + " =? ");
return sb.toString();