Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ public enum AccountManager {
public static final String KEY_ALLOW_REMINDERS = "prefsKeyEnableReminders";
private static final String KEY_REMINDERS_INFO_SHOWN = "prefsKeyRemindersInfoShown";
public static final String KEY_NOTIFICATIONS = "prefsKeyNotifications";
private static final String KEY_NOTIFICATION_DIALOG_SHOWN = "prefsKeyNotificationDialog";
private static final String KEY_NOTIFICATION_DIALOG_SHOWN = "prefsKeyNotificationDialog2";
// Used for the notification dialog through version 73 (2.3.15).
private static final String KEY_DEPRECATED_NOTIFICATION_DIALOG_SHOWN = "prefsKeyNotificationDialog";
private static final String KEY_CALLER_ID = "prefsKeyCallerID";
private static final String KEY_REVIEW_DIALOG_SHOWN = "prefsKeyReviewDialog";
private static final String KEY_NEWSLETTER_PROMPT_DONE = "prefsKeyNewsletterPrompt";
Expand Down Expand Up @@ -168,8 +170,11 @@ public String getNotificationPreference(Context context) {
}

public boolean isNotificationDialogShown(Context context) {
// TODO: Try to upgrade users who had KEY_DEPRECATED_NOTIFICATION_DIALOG_SHOWN set
// but not KEY_NOTIFICATION_DIALOG_SHOWN.
return getSharedPrefs(context).getBoolean(KEY_NOTIFICATION_DIALOG_SHOWN,
/* not seen yet */ false);
/* not seen yet */ false) ||
getSharedPrefs(context).getBoolean(KEY_DEPRECATED_NOTIFICATION_DIALOG_SHOWN, false);
}

public void setNotificationDialogShown(Context context, boolean shown) {
Expand Down