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

Merge pull request #4822 from k9mail/disable_default_signature

Browse source 
Disable default signature when creating new accounts
This commit is contained in:
cketti 2020-06-12 17:03:04 +02:00 committed by GitHub
commit 291695b2d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/core/src/main/java/com/fsck/k9/AccountPreferenceSerializer.kt
View file

@ -182,7 +182,7 @@ class AccountPreferenceSerializer(
gotOne = false
val name = storage.getString("$accountUuid.$IDENTITY_NAME_KEY.$ident", null)
val email = storage.getString("$accountUuid.$IDENTITY_EMAIL_KEY.$ident", null)
val signatureUse = storage.getBoolean("$accountUuid.signatureUse.$ident", true)
val signatureUse = storage.getBoolean("$accountUuid.signatureUse.$ident", false)
val signature = storage.getString("$accountUuid.signature.$ident", null)
val description = storage.getString("$accountUuid.$IDENTITY_DESCRIPTION_KEY.$ident", null)
val replyTo = storage.getString("$accountUuid.replyTo.$ident", null)
@ -204,7 +204,7 @@ class AccountPreferenceSerializer(
if (newIdentities.isEmpty()) {
val name = storage.getString("$accountUuid.name", null)
val email = storage.getString("$accountUuid.email", null)
val signatureUse = storage.getBoolean("$accountUuid.signatureUse", true)
val signatureUse = storage.getBoolean("$accountUuid.signatureUse", false)
val signature = storage.getString("$accountUuid.signature", null)
val identity = Identity(
name = name,
@ -598,7 +598,7 @@ class AccountPreferenceSerializer(
identities = ArrayList<Identity>()
val identity = Identity(
signatureUse = true,
signatureUse = false,
signature = resourceProvider.defaultSignature(),
description = resourceProvider.defaultIdentityDescription()
)

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

@ -34,7 +34,8 @@ class IdentitySettingsDescriptions {
new V(1, new SignatureSetting())
));
s.put("signatureUse", Settings.versions(
new V(1, new BooleanSetting(true))
new V(1, new BooleanSetting(true)),
new V(68, new BooleanSetting(false))
));
s.put("replyTo", Settings.versions(
new V(1, new OptionalEmailAddressSetting())

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 = 67;
public static final int VERSION = 68;
static Map<String, Object> validate(int version, Map<String, TreeMap<Integer, SettingsDescription>> settings,
Map<String, String> importedSettings, boolean useDefaultValues) {