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

Unverified Commit c70dce79 authored by Wolf-Martell Montwé's avatar Wolf-Martell Montwé
Browse files

refactor: rename LegacyAccountWrapperManager to LegacyAccountManager

parent 5b75f0d9

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

+4 −4
Original line number Diff line number Diff line
@@ -2,9 +2,9 @@ package net.thunderbird.app.common.account 


import app.k9mail.feature.account.setup.AccountSetupExternalContract

import net.thunderbird.app.common.account.data.DefaultAccountProfileLocalDataSource

import net.thunderbird.app.common.account.data.DefaultLegacyAccountWrapperManager

import net.thunderbird.app.common.account.data.DefaultLegacyAccountManager

import net.thunderbird.core.android.account.AccountDefaultsProvider

import net.thunderbird.core.android.account.LegacyAccountWrapperManager

import net.thunderbird.core.android.account.LegacyAccountManager

import net.thunderbird.feature.account.avatar.AvatarMonogramCreator

import net.thunderbird.feature.account.avatar.DefaultAvatarMonogramCreator

import net.thunderbird.feature.account.core.AccountCoreExternalContract.AccountProfileLocalDataSource
@@ -19,8 +19,8 @@ internal val appCommonAccountModule = module { 
        featureAccountStorageLegacyModule,

    )



    single<LegacyAccountWrapperManager> {

        DefaultLegacyAccountWrapperManager(

    single<LegacyAccountManager> {

        DefaultLegacyAccountManager(

            accountManager = get(),

            accountDataMapper = get(),

        )

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

+2 −2
Original line number Diff line number Diff line
@@ -3,14 +3,14 @@ package net.thunderbird.app.common.account.data 
import kotlinx.coroutines.flow.Flow

import kotlinx.coroutines.flow.firstOrNull

import kotlinx.coroutines.flow.map

import net.thunderbird.core.android.account.LegacyAccountWrapperManager

import net.thunderbird.core.android.account.LegacyAccountManager

import net.thunderbird.feature.account.AccountId

import net.thunderbird.feature.account.core.AccountCoreExternalContract.AccountProfileLocalDataSource

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

import net.thunderbird.feature.account.storage.mapper.AccountProfileDataMapper



internal class DefaultAccountProfileLocalDataSource(

    private val accountManager: LegacyAccountWrapperManager,

    private val accountManager: LegacyAccountManager,

    private val dataMapper: AccountProfileDataMapper,

) : AccountProfileLocalDataSource {

app-common/src/main/kotlin/net/thunderbird/app/common/account/data/DefaultLegacyAccountWrapperManager.kt→app-common/src/main/kotlin/net/thunderbird/app/common/account/data/DefaultLegacyAccountManager.kt

+3 −3
Original line number Diff line number Diff line
@@ -4,14 +4,14 @@ import kotlinx.coroutines.flow.Flow 
import kotlinx.coroutines.flow.map

import net.thunderbird.core.android.account.AccountManager

import net.thunderbird.core.android.account.LegacyAccount

import net.thunderbird.core.android.account.LegacyAccountWrapperManager

import net.thunderbird.core.android.account.LegacyAccountManager

import net.thunderbird.feature.account.AccountId

import net.thunderbird.feature.account.storage.legacy.mapper.DefaultLegacyAccountWrapperDataMapper



internal class DefaultLegacyAccountWrapperManager(

internal class DefaultLegacyAccountManager(

    private val accountManager: AccountManager,

    private val accountDataMapper: DefaultLegacyAccountWrapperDataMapper,

) : LegacyAccountWrapperManager {

) : LegacyAccountManager {



    override fun getAll(): Flow<List<LegacyAccount>> {

        return accountManager.getAccountsFlow()

app-common/src/test/kotlin/net/thunderbird/app/common/account/data/DefaultAccountProfileLocalDataSourceTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ class DefaultAccountProfileLocalDataSourceTest { 
            legacyAccount: LegacyAccount?,

        ): DefaultAccountProfileLocalDataSource {

            return DefaultAccountProfileLocalDataSource(

                accountManager = FakeLegacyAccountWrapperManager(

                accountManager = FakeLegacyAccountManager(

                    initialAccounts = if (legacyAccount != null) {

                        listOf(legacyAccount)

                    } else {

app-common/src/test/kotlin/net/thunderbird/app/common/account/data/FakeLegacyAccountWrapperManager.kt→app-common/src/test/kotlin/net/thunderbird/app/common/account/data/FakeLegacyAccountManager.kt

+3 −3
Original line number Diff line number Diff line
@@ -6,12 +6,12 @@ import kotlinx.coroutines.flow.StateFlow 
import kotlinx.coroutines.flow.map

import kotlinx.coroutines.flow.update

import net.thunderbird.core.android.account.LegacyAccount

import net.thunderbird.core.android.account.LegacyAccountWrapperManager

import net.thunderbird.core.android.account.LegacyAccountManager

import net.thunderbird.feature.account.AccountId



internal class FakeLegacyAccountWrapperManager(

internal class FakeLegacyAccountManager(

    initialAccounts: List<LegacyAccount> = emptyList(),

) : LegacyAccountWrapperManager {

) : LegacyAccountManager {



    private val accountsState = MutableStateFlow(

        initialAccounts,