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

Merge pull request #2127 from k9mail/global-setting-pgpSignOnlyDialogCounter

Browse source 
Add missing pgpSignOnlyDialogCounter to GlobalSettings
This commit is contained in:
cketti 2017-01-24 14:54:57 +01:00 committed by GitHub
commit cd0075a77a
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
k9mail/src/main/java/com/fsck/k9/preferences/GlobalSettings.java
View file

@ -279,6 +279,9 @@ public class GlobalSettings {
s.put("pgpInlineDialogCounter", Settings.versions( s.put("pgpInlineDialogCounter", Settings.versions(
new V(43, new IntegerRangeSetting(0, Integer.MAX_VALUE, 0)) new V(43, new IntegerRangeSetting(0, Integer.MAX_VALUE, 0))
)); ));
s.put("pgpSignOnlyDialogCounter", Settings.versions(
new V(45, new IntegerRangeSetting(0, Integer.MAX_VALUE, 0))
));
SETTINGS = Collections.unmodifiableMap(s); SETTINGS = Collections.unmodifiableMap(s);

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

@ -35,7 +35,7 @@ public class Settings {
* *
* @see SettingsExporter * @see SettingsExporter
*/ */
public static final int VERSION = 44; public static final int VERSION = 45;
public static Map<String, Object> validate(int version, Map<String, public static Map<String, Object> validate(int version, Map<String,
TreeMap<Integer, SettingsDescription>> settings, TreeMap<Integer, SettingsDescription>> settings,