Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f229b8ca authored by cketti's avatar cketti
Browse files

Disable use of the signature when creating the default identity

parent 46747bf1

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

+3 −3
Original line number Diff line number Diff line
@@ -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()

            )

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

+2 −1
Original line number Diff line number Diff line
@@ -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())

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

+1 −1
Original line number Diff line number Diff line
@@ -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) {