diff --git a/emailcommon/res/values/strings.xml b/emailcommon/res/values/strings.xml
index 91504897b..a13f4c78c 100644
--- a/emailcommon/res/values/strings.xml
+++ b/emailcommon/res/values/strings.xml
@@ -37,4 +37,8 @@
Starred
Unread
+
+
+
+ com.android.email
diff --git a/emailcommon/src/com/android/emailcommon/provider/EmailContent.java b/emailcommon/src/com/android/emailcommon/provider/EmailContent.java
index 0d8525b1f..c77bffd66 100755
--- a/emailcommon/src/com/android/emailcommon/provider/EmailContent.java
+++ b/emailcommon/src/com/android/emailcommon/provider/EmailContent.java
@@ -23,6 +23,7 @@ import android.content.ContentUris;
import android.content.ContentValues;
import android.content.Context;
import android.content.OperationApplicationException;
+import android.content.res.Resources;
import android.database.Cursor;
import android.net.Uri;
import android.os.Environment;
@@ -32,6 +33,7 @@ import android.os.RemoteException;
import com.android.emailcommon.utility.TextUtilities;
import com.android.emailcommon.utility.Utility;
+import com.android.emailcommon.R;
import com.android.mail.providers.UIProvider;
import com.android.mail.utils.LogUtils;
import com.google.common.annotations.VisibleForTesting;
@@ -112,7 +114,6 @@ public abstract class EmailContent {
public abstract void restore (Cursor cursor);
- public static String PACKAGE_NAME;
public static String EMAIL_PACKAGE_NAME;
public static String AUTHORITY;
// The notifier authority is used to send notifications regarding changes to messages (insert,
@@ -131,13 +132,8 @@ public abstract class EmailContent {
public static synchronized void init(Context context) {
if (AUTHORITY == null) {
- PACKAGE_NAME = context.getPackageName();
- EMAIL_PACKAGE_NAME = PACKAGE_NAME;
- // If our package is com...exchange, the provider is com...email.provider
- if (PACKAGE_NAME.endsWith("exchange")) {
- int lastDot = EMAIL_PACKAGE_NAME.lastIndexOf('.');
- EMAIL_PACKAGE_NAME = PACKAGE_NAME.substring(0, lastDot + 1) + "email";
- }
+ final Resources res = context.getResources();
+ EMAIL_PACKAGE_NAME = res.getString(R.string.email_package_name);
AUTHORITY = EMAIL_PACKAGE_NAME + ".provider";
LogUtils.d("EmailContent", "init for " + AUTHORITY);
NOTIFIER_AUTHORITY = EMAIL_PACKAGE_NAME + ".notifier";
diff --git a/emailcommon/src/com/android/emailcommon/provider/Mailbox.java b/emailcommon/src/com/android/emailcommon/provider/Mailbox.java
index 5f21c9d21..c4c8a96dd 100644
--- a/emailcommon/src/com/android/emailcommon/provider/Mailbox.java
+++ b/emailcommon/src/com/android/emailcommon/provider/Mailbox.java
@@ -404,10 +404,10 @@ public class Mailbox extends EmailContent implements MailboxColumns, Parcelable
if (c.moveToFirst()) {
mailbox = getContent(c, Mailbox.class);
if (c.moveToNext()) {
- LogUtils.w(Logging.LOG_TAG, "Multiple mailboxes named \"" + path + "\"");
+ LogUtils.w(Logging.LOG_TAG, "Multiple mailboxes named \"%s\"", path);
}
} else {
- LogUtils.i(Logging.LOG_TAG, "Could not find mailbox at \"" + path + "\"");
+ LogUtils.i(Logging.LOG_TAG, "Could not find mailbox at \"%s\"", path);
}
return mailbox;
} finally {