diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f595a79f8..3c66dc818 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -193,7 +193,7 @@ - + @@ -348,11 +348,11 @@ - + - + @@ -380,7 +380,7 @@ - + diff --git a/build/res/values/strings.xml b/build/res/values/strings.xml index 99bb9c228..5451e6fa6 100644 --- a/build/res/values/strings.xml +++ b/build/res/values/strings.xml @@ -15,6 +15,7 @@ --> + com.android.exchange com.android.pop3 com.android.imap @@ -22,4 +23,5 @@ com.android.email.provider imap pop3 + application/email-ls diff --git a/src/com/android/email/provider/EmailProvider.java b/src/com/android/email/provider/EmailProvider.java index 336308552..7e9de819f 100644 --- a/src/com/android/email/provider/EmailProvider.java +++ b/src/com/android/email/provider/EmailProvider.java @@ -113,7 +113,7 @@ public class EmailProvider extends ContentProvider { private static final String TAG = "EmailProvider"; - public static final String EMAIL_APP_MIME_TYPE = "application/email-ls"; + public static String EMAIL_APP_MIME_TYPE; protected static final String DATABASE_NAME = "EmailProvider.db"; protected static final String BODY_DATABASE_NAME = "EmailProviderBody.db"; @@ -1056,6 +1056,7 @@ public class EmailProvider extends ContentProvider { Uri.parse("content://" + EmailContent.AUTHORITY + "/status"); FOLDER_REFRESH_URI = Uri.parse("content://" + EmailContent.AUTHORITY + "/refresh"); + EMAIL_APP_MIME_TYPE = context.getString(R.string.application_mime_type); } MailActivityEmail.setServicesEnabledAsync(context); checkDatabases();