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

Merge "Disambiguate providers between AOSP and EmailGoogle" into ub-mail-master

Browse Source
This commit is contained in:
Tony Mantler 2014-03-10 22:04:32 +00:00 committed by Android (Google) Code Review
commit dfce22eeb1
4 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AndroidManifest.xml
View File

@ -343,7 +343,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" >
@ -351,7 +351,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" >

3
res/values/strings.xml
View File

@ -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>

6
src/com/android/mail/browse/EmailConversationProvider.java
View File

@ -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;
}
}

11
src/com/android/mail/providers/EmailAccountCacheProvider.java
View File

@ -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;
}
}