wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change default to always show delete button in notifications

Browse source
This commit is contained in:
cketti 2020-04-13 16:54:44 +02:00
parent 1ec1a379b2
commit 8786a2f63b
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/core/src/main/java/com/fsck/k9/K9.kt
View file

@ -182,7 +182,7 @@ object K9 : EarlyInit {
var notificationHideSubject = NotificationHideSubject.NEVER
@JvmStatic
var notificationQuickDeleteBehaviour = NotificationQuickDelete.NEVER
var notificationQuickDeleteBehaviour = NotificationQuickDelete.ALWAYS
@JvmStatic
var lockScreenNotificationVisibility = LockScreenNotificationVisibility.MESSAGE_COUNT
@ -374,7 +374,7 @@ object K9 : EarlyInit {
sortAscending[sortType] = sortAscendingSetting
notificationHideSubject = storage.getEnum("notificationHideSubject", NotificationHideSubject.NEVER)
notificationQuickDeleteBehaviour = storage.getEnum("notificationQuickDelete", NotificationQuickDelete.NEVER)
notificationQuickDeleteBehaviour = storage.getEnum("notificationQuickDelete", NotificationQuickDelete.ALWAYS)
lockScreenNotificationVisibility = storage.getEnum("lockScreenNotificationVisibility",
LockScreenNotificationVisibility.MESSAGE_COUNT)

3
app/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsDescriptions.java
View file

@ -254,7 +254,8 @@ public class GeneralSettingsDescriptions {
new V(38, new BooleanSetting(false))
));
s.put("notificationQuickDelete", Settings.versions(
new V(38, new EnumSetting<>(NotificationQuickDelete.class, NotificationQuickDelete.NEVER))
new V(38, new EnumSetting<>(NotificationQuickDelete.class, NotificationQuickDelete.NEVER)),
new V(67, new EnumSetting<>(NotificationQuickDelete.class, NotificationQuickDelete.ALWAYS))
));
s.put("notificationDuringQuietTimeEnabled", Settings.versions(
new V(39, new BooleanSetting(true))

2
app/core/src/main/java/com/fsck/k9/preferences/Settings.java
View file

@ -36,7 +36,7 @@ public class Settings {
*
* @see SettingsExporter
*/
public static final int VERSION = 66;
public static final int VERSION = 67;
static Map<String, Object> validate(int version, Map<String, TreeMap<Integer, SettingsDescription>> settings,
Map<String, String> importedSettings, boolean useDefaultValues) {