From 9ef3c8b3f89970b49fd069634408ea56adcccf72 Mon Sep 17 00:00:00 2001
From: Tony Mantler <nicoya@google.com>
Date: Wed, 5 Mar 2014 11:27:46 -0800
Subject: [PATCH] Disambiguate providers between AOSP and EmailGoogle

b/13323222

Change-Id: I7d10182973b57e4c2c306739a15237952a7e6c95
---
 AndroidManifest.xml                                   |  4 ++--
 res/values/strings.xml                                |  3 +++
 .../mail/browse/EmailConversationProvider.java        |  6 +++++-
 .../mail/providers/EmailAccountCacheProvider.java     | 11 +++++++++--
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 64c8f9b07..eefc00aed 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -332,7 +332,7 @@
         <!-- additional activities -->
 
         <provider
-            android:authorities="com.android.email2.conversation.provider"
+            android:authorities="com.android.email.conversation.provider"
             android:label="@string/conversation_content_provider"
             android:exported="true"
             android:name="com.android.mail.browse.EmailConversationProvider" >
@@ -340,7 +340,7 @@
         </provider>
 
         <provider
-            android:authorities="com.android.email2.accountcache"
+            android:authorities="com.android.email.accountcache"
             android:label="@string/account_cache_provider"
             android:exported="true"
             android:name="com.android.mail.providers.EmailAccountCacheProvider" >
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2382c0e57..a8ee98ceb 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -832,6 +832,9 @@
     <string name="intent_account_manager_entry" translatable="false">com.android.email.activity.setup.ACCOUNT_MANAGER_ENTRY</string>
     <string name="intent_create_account" translatable="false">com.android.email.CREATE_ACCOUNT</string>
     <string name="authority_email_provider" translatable="false">com.android.email.provider</string>
+    <string name="authority_conversation_provider" translatable="false">com.android.email.conversation.provider</string>
+    <string name="authority_account_cache_provider" translatable="false">com.android.email.accountcache</string>
+    <string name="authority_suggestions_provider" translatable="false">com.android.email.suggestionsprovider</string>
     <string name="protocol_legacy_imap" translatable="false">imap</string>
     <string name="protocol_imap" translatable="false">imap</string>
     <string name="protocol_pop3" translatable="false">pop3</string>
diff --git a/src/com/android/mail/browse/EmailConversationProvider.java b/src/com/android/mail/browse/EmailConversationProvider.java
index ebff3137c..edf6ee7ee 100644
--- a/src/com/android/mail/browse/EmailConversationProvider.java
+++ b/src/com/android/mail/browse/EmailConversationProvider.java
@@ -16,6 +16,7 @@
 
 package com.android.mail.browse;
 
+import com.android.email.R;
 import com.android.mail.browse.ConversationCursor.ConversationProvider;
 
 import java.lang.Override;
@@ -23,10 +24,13 @@ import java.lang.Override;
 public class EmailConversationProvider extends ConversationProvider {
     // The authority of our conversation provider (a forwarding provider)
     // This string must match the declaration in AndroidManifest.xml
-    private static final String sAuthority = "com.android.email2.conversation.provider";
+    private static String sAuthority;
 
     @Override
     protected String getAuthority() {
+        if (sAuthority == null) {
+            sAuthority = getContext().getString(R.string.authority_conversation_provider);
+        }
         return sAuthority;
     }
 }
\ No newline at end of file
diff --git a/src/com/android/mail/providers/EmailAccountCacheProvider.java b/src/com/android/mail/providers/EmailAccountCacheProvider.java
index a311e36cb..41a1d2e51 100644
--- a/src/com/android/mail/providers/EmailAccountCacheProvider.java
+++ b/src/com/android/mail/providers/EmailAccountCacheProvider.java
@@ -20,19 +20,23 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 
+import com.android.email.R;
 import com.android.email.activity.setup.AccountSettings;
 
 public class EmailAccountCacheProvider extends MailAppProvider {
     // Content provider for Email
-    private static final String sAuthority = "com.android.email2.accountcache";
+    private static String sAuthority;
     /**
      * Authority for the suggestions provider. This is specified in AndroidManifest.xml and
      * res/xml/searchable.xml.
      */
-    private static final String sSuggestionsAuthority = "com.android.email.suggestionsprovider";
+    private static String sSuggestionsAuthority;
 
     @Override
     protected String getAuthority() {
+        if (sAuthority == null) {
+            sAuthority = getContext().getString(R.string.authority_account_cache_provider);
+        }
         return sAuthority;
     }
 
@@ -47,6 +51,9 @@ public class EmailAccountCacheProvider extends MailAppProvider {
 
     @Override
     public String getSuggestionAuthority() {
+        if (sSuggestionsAuthority == null) {
+            sSuggestionsAuthority = getContext().getString(R.string.authority_suggestions_provider);
+        }
         return sSuggestionsAuthority;
     }
 }