moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-12-11 02:12:27 -05:00
Code Issues Releases Wiki Activity

Upgrade from "keyguardPrivacy" to "notificationHideSubject"

Browse Source 
Make sure existing installations aren't reset to the default value when
the new setting can't be found.
This commit is contained in:
cketti 2012-08-02 03:09:26 +02:00
parent 3e6d161c18
commit 592ed3ef38
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/fsck/k9/K9.java
View File

@ -639,9 +639,15 @@ public class K9 extends Application {
boolean sortAscending = sprefs.getBoolean("sortAscending", Account.DEFAULT_SORT_ASCENDING); boolean sortAscending = sprefs.getBoolean("sortAscending", Account.DEFAULT_SORT_ASCENDING);
mSortAscending.put(mSortType, sortAscending); mSortAscending.put(mSortType, sortAscending);
String notificationHideSubject = sprefs.getString("notificationHideSubject", String notificationHideSubject = sprefs.getString("notificationHideSubject", null);
NotificationHideSubject.NEVER.toString()); if (notificationHideSubject == null) {
// If the "notificationHideSubject" setting couldn't be found, the app was probably
// updated. Look for the old "keyguardPrivacy" setting and map it to the new enum.
sNotificationHideSubject = (sprefs.getBoolean("keyguardPrivacy", false)) ?
NotificationHideSubject.WHEN_LOCKED : NotificationHideSubject.NEVER;
} else {
sNotificationHideSubject = NotificationHideSubject.valueOf(notificationHideSubject); sNotificationHideSubject = NotificationHideSubject.valueOf(notificationHideSubject);
}
compactLayouts = sprefs.getBoolean("compactLayouts", false); compactLayouts = sprefs.getBoolean("compactLayouts", false);
mAttachmentDefaultPath = sprefs.getString("attachmentdefaultpath", Environment.getExternalStorageDirectory().toString()); mAttachmentDefaultPath = sprefs.getString("attachmentdefaultpath", Environment.getExternalStorageDirectory().toString());