am 525eb402: Fix some SharedPreferences issues
* commit '525eb4024539661766ac06432d91ef999206cc0d':
Fix some SharedPreferences issues
diff --git a/src/com/android/mail/persistence/Persistence.java b/src/com/android/mail/persistence/Persistence.java
index f17667a..408a814 100644
--- a/src/com/android/mail/persistence/Persistence.java
+++ b/src/com/android/mail/persistence/Persistence.java
@@ -43,7 +43,7 @@
}
// The name of our shared preferences store
- public static final String SHARED_PREFERENCES_NAME = "UnifiedEmail";
+ private static final String SHARED_PREFERENCES_NAME = "UnifiedEmail";
public static Persistence getInstance() {
if (mInstance == null) {
@@ -53,10 +53,14 @@
return mInstance;
}
- public static SharedPreferences getPreferences(Context context) {
+ public String getSharedPreferencesName() {
+ return SHARED_PREFERENCES_NAME;
+ }
+
+ public SharedPreferences getPreferences(Context context) {
if (sSharedPrefs == null) {
sSharedPrefs = context.getSharedPreferences(
- SHARED_PREFERENCES_NAME, Context.MODE_PRIVATE);
+ getSharedPreferencesName(), Context.MODE_PRIVATE);
}
return sSharedPrefs;
}
diff --git a/src/com/android/mail/widget/BaseWidgetProvider.java b/src/com/android/mail/widget/BaseWidgetProvider.java
index 99b4678..63bd122 100644
--- a/src/com/android/mail/widget/BaseWidgetProvider.java
+++ b/src/com/android/mail/widget/BaseWidgetProvider.java
@@ -70,7 +70,7 @@
super.onDeleted(context, appWidgetIds);
// TODO: (mindyp) save widget information.
- Editor editor = Persistence.getPreferences(context).edit();
+ Editor editor = Persistence.getInstance().getPreferences(context).edit();
for (int i = 0; i < appWidgetIds.length; ++i) {
// Remove the account in the preference
editor.remove(WIDGET_ACCOUNT_PREFIX + appWidgetIds[i]);
@@ -100,8 +100,8 @@
for (int i = 0; i < widgetIds.length; i++) {
// Retrieve the persisted information for this widget from
// preferences.
- final String accountFolder = Persistence.getPreferences(context).getString(
- WIDGET_ACCOUNT_PREFIX + widgetIds[i], null);
+ final String accountFolder = Persistence.getInstance()
+ .getPreferences(context).getString(WIDGET_ACCOUNT_PREFIX + widgetIds[i], null);
// If the account matched, update the widget.
if (accountFolder != null) {
widgetInfo[i] = TextUtils.split(accountFolder, ACCOUNT_FOLDER_PREFERENCE_SEPARATOR);
@@ -144,8 +144,8 @@
for (int id : getCurrentWidgetIds(context)) {
// Retrieve the persisted information for this widget from
// preferences.
- final String accountFolder = Persistence.getPreferences(context).getString(
- WIDGET_ACCOUNT_PREFIX + id, null);
+ final String accountFolder = Persistence.getInstance()
+ .getPreferences(context).getString(WIDGET_ACCOUNT_PREFIX + id, null);
// If the account matched, update the widget.
if (accountFolder != null) {
final String[] parsedInfo = TextUtils.split(accountFolder,
@@ -185,8 +185,8 @@
ContentResolver resolver = context.getContentResolver();
for (int i = 0; i < appWidgetIds.length; ++i) {
// Get the account for this widget from preference
- final String accountFolder = Persistence.getPreferences(context).getString(
- WIDGET_ACCOUNT_PREFIX + appWidgetIds[i], null);
+ final String accountFolder = Persistence.getInstance().getPreferences(context)
+ .getString(WIDGET_ACCOUNT_PREFIX + appWidgetIds[i], null);
String accountUri = null;
Uri folderUri = null;
if (!TextUtils.isEmpty(accountFolder)) {
@@ -322,7 +322,7 @@
}
private boolean isWidgetConfigured(Context context, int widgetId) {
- final SharedPreferences pref = Persistence.getPreferences(context);
+ final SharedPreferences pref = Persistence.getInstance().getPreferences(context);
return pref.getString(WIDGET_ACCOUNT_PREFIX + widgetId, null) != null;
}
diff --git a/src/com/android/mail/widget/WidgetService.java b/src/com/android/mail/widget/WidgetService.java
index ef72354..f662a8f 100644
--- a/src/com/android/mail/widget/WidgetService.java
+++ b/src/com/android/mail/widget/WidgetService.java
@@ -161,7 +161,8 @@
*/
public static void saveWidgetInformation(Context context, int appWidgetId, Account account,
Folder folder) {
- final SharedPreferences.Editor editor = Persistence.getPreferences(context).edit();
+ final SharedPreferences.Editor editor =
+ Persistence.getInstance().getPreferences(context).edit();
editor.putString(WidgetProvider.WIDGET_ACCOUNT_PREFIX + appWidgetId,
createWidgetPreferenceValue(account, folder));
editor.apply();
@@ -179,7 +180,7 @@
public boolean isWidgetConfigured(Context context, int appWidgetId, Account account,
Folder folder) {
if (isAccountValid(context, account)) {
- return Persistence.getPreferences(context).getString(
+ return Persistence.getInstance().getPreferences(context).getString(
BaseWidgetProvider.WIDGET_ACCOUNT_PREFIX + appWidgetId, null) != null;
}
return false;