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

Commit 46e28441 authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊 Committed by Nishith Khanna
Browse files

Revert "Disable use of the signature when creating the default identity" 

This reverts commit f229b8ca.
parent 442b222c

app-common/src/main/kotlin/net/thunderbird/app/common/account/CommonAccountDefaultsProvider.kt

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ class CommonAccountDefaultsProvider( 
        identities = ArrayList<Identity>()



        val identity = Identity(

            signatureUse = false,

            signatureUse = true,

            signature = resourceProvider.defaultSignature(),

            description = resourceProvider.defaultIdentityDescription(),

        )

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

+2 −2
Original line number Diff line number Diff line
@@ -232,7 +232,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", false)

            val signatureUse = storage.getBoolean("$accountUuid.signatureUse.$ident", true)

            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)
@@ -254,7 +254,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", false)

            val signatureUse = storage.getBoolean("$accountUuid.signatureUse", true)

            val signature = storage.getString("$accountUuid.signature", null)

            val identity = Identity(

                name = name,

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

+1 −2
Original line number Diff line number Diff line
@@ -32,8 +32,7 @@ class IdentitySettingsDescriptions { 
                new V(1, new SignatureSetting())

        ));

        s.put("signatureUse", Settings.versions(

                new V(1, new BooleanSetting(true)),

                new V(68, new BooleanSetting(false))

                new V(1, new BooleanSetting(true))

        ));

        s.put("replyTo", Settings.versions(

                new V(1, new OptionalEmailAddressSetting())