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

Commit 8afe2960 authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

mail: add signature on creation

parent 5509bd8f

feature/account/setup/build.gradle.kts

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ dependencies { 


    implementation(projects.feature.autodiscovery.service)

    implementation(projects.feature.autodiscovery.demo)

    implementation(projects.feature.account.accountmanager)



    api(projects.feature.account.common)

    implementation(projects.feature.account.oauth)

feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/options/display/DisplayOptionsContent.kt

+7 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import app.k9mail.feature.account.common.ui.item.defaultItemPadding 
import app.k9mail.feature.account.setup.R

import app.k9mail.feature.account.setup.ui.options.display.DisplayOptionsContract.Event

import app.k9mail.feature.account.setup.ui.options.display.DisplayOptionsContract.State

import app.k9mail.feature.account.accountmanager.R as AmR



@Suppress("LongMethod")

@Composable
@@ -89,8 +90,13 @@ internal fun DisplayOptionsContent( 
            }



            item {

                val context = LocalContext.current

                var emailSignature = state.emailSignature.value

                if (emailSignature.isEmpty()) {

                    emailSignature = context.getString(AmR.string.default_signature)

                }

                TextInput(

                    text = state.emailSignature.value,

                    text = emailSignature,

                    errorMessage = state.emailSignature.error?.toResourceString(resources),

                    onTextChange = { onEvent(Event.OnEmailSignatureChanged(it)) },

                    label = stringResource(id = R.string.account_setup_options_email_signature_label),

legacy/account/src/main/java/app/k9mail/legacy/account/Identity.kt

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ data class Identity( 
    val name: String? = null,

    val email: String? = null,

    val signature: String? = null,

    val signatureUse: Boolean = false,

    val signatureUse: Boolean = true,

    val replyTo: String? = null,

) : Parcelable {

    // TODO remove when callers are converted to Kotlin

legacy/common/src/main/java/com/fsck/k9/resources/K9CoreResourceProvider.kt

+4 −2
Original line number Diff line number Diff line 
package com.fsck.k9.resources



import android.content.Context

import app.k9mail.core.common.provider.AppNameProvider

import app.k9mail.core.ui.legacy.designsystem.atom.icon.Icons

import com.fsck.k9.CoreResourceProvider

import com.fsck.k9.notification.PushNotificationState
@@ -9,8 +10,9 @@ import com.fsck.k9.ui.R 


class K9CoreResourceProvider(

    private val context: Context,

    private val appNameProvider: AppNameProvider,

    ) : CoreResourceProvider {

    override fun defaultSignature(): String = context.getString(AmR.string.default_signature)

    override fun defaultSignature(): String = context.getString(AmR.string.default_signature, appNameProvider.appName)

    override fun defaultIdentityDescription(): String = context.getString(R.string.default_identity_description)



    override fun contactDisplayNamePrefix(): String = context.getString(R.string.message_to_label)

legacy/common/src/main/java/com/fsck/k9/resources/KoinModule.kt

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ val resourcesModule = module { 
    single<CoreResourceProvider> {

        K9CoreResourceProvider(

            context = get(),

            appNameProvider = get(),

        )

    }

    single<AutocryptStringProvider> {