From 7e5df63fc9771c7950d3f95da17cfb112ebbf7f3 Mon Sep 17 00:00:00 2001
From: Marc Blank <mblank@google.com>
Date: Sat, 8 Sep 2012 10:50:40 -0700
Subject: [PATCH] Use resource based mime type for application

Change-Id: I41a3cbf5c810668f9b0885f6614b2e48215901b2
---
 AndroidManifest.xml                               | 8 ++++----
 build/res/values/strings.xml                      | 2 ++
 src/com/android/email/provider/EmailProvider.java | 3 ++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f595a79f8..3c66dc818 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -193,7 +193,7 @@
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:scheme="content"/>
-                <data android:mimeType="application/email-ls" />
+                <data android:mimeType="@string/application_mime_type" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
@@ -348,11 +348,11 @@
             </intent-filter>
             <intent-filter>
                 <action android:name="com.android.mail.ACTION_NOTIFY_DATASET_CHANGED" />
-                <data android:mimeType="application/email-ls" />
+                <data android:mimeType="@string/application_mime_type" />
             </intent-filter>
             <intent-filter>
                 <action android:name="com.android.mail.ACTION_UPDATE_WIDGET" />
-                <data android:mimeType="application/email-ls" />
+                <data android:mimeType="@string/application_mime_type" />
             </intent-filter>
             <meta-data android:name="android.appwidget.provider"
                        android:resource="@xml/widget_info" />
@@ -380,7 +380,7 @@
             <intent-filter>
                 <action android:name="com.android.mail.action.update_notification"
                         android:priority="-10" />
-                <data android:mimeType="application/email-ls" />
+                <data android:mimeType="@string/application_mime_type" />
             </intent-filter>
             <!-- To handle secret code to activate the debug screen. -->
             <intent-filter>
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 @@
 -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- DO NOT TRANSLATE THESE STRINGS -->
     <string name="account_manager_type_exchange">com.android.exchange</string>
     <string name="account_manager_type_pop3">com.android.pop3</string>
     <string name="account_manager_type_imap">com.android.imap</string>
@@ -22,4 +23,5 @@
     <string name="authority_email_provider">com.android.email.provider</string>
     <string name="protocol_imap">imap</string>
     <string name="protocol_pop3">pop3</string>
+    <string name="application_mime_type">application/email-ls</string>
 </resources>
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();