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

Unverified Commit 87eb4420 authored by Wolf-Martell Montwé's avatar Wolf-Martell Montwé Committed by GitHub
Browse files

Merge pull request #9026 from wmontwe/add-account-name-setting 

Add account name setting
parents df45a073 73f5f71c

app-common/build.gradle.kts

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ android { 
dependencies {

    api(projects.legacy.common)



    implementation(projects.feature.account.core)

    api(projects.feature.account.core)



    implementation(projects.legacy.core)

    implementation(projects.legacy.account)

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

+0 −2
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ import app.k9mail.legacy.account.LegacyAccountWrapperManager 
import kotlinx.coroutines.flow.Flow

import kotlinx.coroutines.flow.firstOrNull

import kotlinx.coroutines.flow.map

import kotlinx.coroutines.flow.onEach

import net.thunderbird.feature.account.api.AccountId

import net.thunderbird.feature.account.api.profile.AccountProfile

import net.thunderbird.feature.account.core.AccountCoreExternalContract.AccountProfileLocalDataSource
@@ -15,7 +14,6 @@ class CommonAccountProfileLocalDataSource( 


    override fun getById(accountId: AccountId): Flow<AccountProfile?> {

        return accountManager.getById(accountId.value)

            .onEach { println("Flow emitted account: $it") }

            .map { account ->

                account?.let {

                    AccountProfile(

app-k9mail/src/test/kotlin/app/k9mail/DependencyInjectionTest.kt

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ import com.fsck.k9.ui.changelog.ChangelogViewModel 
import com.fsck.k9.ui.endtoend.AutocryptKeyTransferActivity

import com.fsck.k9.ui.endtoend.AutocryptKeyTransferPresenter

import com.fsck.k9.ui.helper.SizeFormatter

import net.thunderbird.feature.account.api.AccountId

import org.junit.Test

import org.junit.runner.RunWith

import org.koin.core.annotation.KoinInternalApi
@@ -52,6 +53,7 @@ class DependencyInjectionTest : AutoCloseKoinTest() { 
            withInstance(authStateStorage)

            withInstance(lifecycleOwner)

            withInstance(mock<WorkerParameters>())

            withInstance(AccountId.create())

        }

    }

}

app-thunderbird/src/test/kotlin/net/thunderbird/android/DependencyInjectionTest.kt

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ import com.fsck.k9.ui.changelog.ChangelogViewModel 
import com.fsck.k9.ui.endtoend.AutocryptKeyTransferActivity

import com.fsck.k9.ui.endtoend.AutocryptKeyTransferPresenter

import com.fsck.k9.ui.helper.SizeFormatter

import net.thunderbird.feature.account.api.AccountId

import org.junit.Test

import org.junit.runner.RunWith

import org.koin.core.annotation.KoinInternalApi
@@ -53,6 +54,7 @@ class DependencyInjectionTest : AutoCloseKoinTest() { 
            withInstance(authStateStorage)

            withInstance(lifecycleOwner)

            withInstance(mock<WorkerParameters>())

            withInstance(AccountId.create())

        }

    }

}

core/ui/compose/preference/src/debug/kotlin/net/thunderbird/core/ui/compose/preference/ui/fake/FakePreferenceData.kt

+3 −3
Original line number Diff line number Diff line
@@ -8,9 +8,9 @@ object FakePreferenceData { 


    val textPreference = PreferenceSetting.Text(

        id = "text",

        icon = Icons.Outlined.Delete,

        title = "Title",

        description = "Description",

        icon = { Icons.Outlined.Delete },

        title = { "Title" },

        description = { "Description" },

        value = "Value",

    )