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

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

Merge pull request #9182 from shamim-emon/fix-issue-9181 

Module :legacy:account migration
parents f6de8aea e231697c

app-common/build.gradle.kts

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ dependencies { 
    api(projects.feature.navigation.drawer.api)



    implementation(projects.legacy.core)

    implementation(projects.legacy.account)

    implementation(projects.core.android.account)



    implementation(projects.core.account)

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

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


import android.content.res.Resources

import app.k9mail.core.ui.legacy.theme2.common.R

import app.k9mail.legacy.account.AccountManager

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



internal class AccountColorPicker(

    private val accountManager: AccountManager,

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

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ import app.k9mail.feature.account.common.domain.entity.SpecialFolderOption 
import app.k9mail.feature.account.common.domain.entity.SpecialFolderSettings

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

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

import app.k9mail.legacy.account.LegacyAccount

import com.fsck.k9.Core

import com.fsck.k9.Preferences

import com.fsck.k9.account.DeletePolicyProvider
@@ -24,6 +23,7 @@ import com.fsck.k9.preferences.UnifiedInboxConfigurator 
import kotlinx.coroutines.CoroutineDispatcher

import kotlinx.coroutines.Dispatchers

import kotlinx.coroutines.withContext

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

import net.thunderbird.core.mail.folder.api.SpecialFolderSelection



// TODO Move to feature/account/setup

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

+2 −2
Original line number Diff line number Diff line 
package net.thunderbird.app.common.account



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

import app.k9mail.legacy.account.AccountDefaultsProvider

import app.k9mail.legacy.account.LegacyAccountWrapperManager

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

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

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

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

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

import net.thunderbird.feature.account.core.featureAccountCoreModule

import org.koin.android.ext.koin.androidApplication

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

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


import app.k9mail.core.featureflag.FeatureFlagProvider

import app.k9mail.core.featureflag.toFeatureFlagKey

import app.k9mail.legacy.account.AccountDefaultsProvider

import app.k9mail.legacy.account.AccountDefaultsProvider.Companion.DEFAULT_MAXIMUM_AUTO_DOWNLOAD_MESSAGE_SIZE

import app.k9mail.legacy.account.AccountDefaultsProvider.Companion.DEFAULT_MESSAGE_FORMAT

import app.k9mail.legacy.account.AccountDefaultsProvider.Companion.DEFAULT_MESSAGE_FORMAT_AUTO

import app.k9mail.legacy.account.AccountDefaultsProvider.Companion.DEFAULT_MESSAGE_READ_RECEIPT

import app.k9mail.legacy.account.AccountDefaultsProvider.Companion.DEFAULT_QUOTED_TEXT_SHOWN

import app.k9mail.legacy.account.AccountDefaultsProvider.Companion.DEFAULT_QUOTE_PREFIX

import app.k9mail.legacy.account.AccountDefaultsProvider.Companion.DEFAULT_QUOTE_STYLE

import app.k9mail.legacy.account.AccountDefaultsProvider.Companion.DEFAULT_REMOTE_SEARCH_NUM_RESULTS

import app.k9mail.legacy.account.AccountDefaultsProvider.Companion.DEFAULT_REPLY_AFTER_QUOTE

import app.k9mail.legacy.account.AccountDefaultsProvider.Companion.DEFAULT_RINGTONE_URI

import app.k9mail.legacy.account.AccountDefaultsProvider.Companion.DEFAULT_SORT_ASCENDING

import app.k9mail.legacy.account.AccountDefaultsProvider.Companion.DEFAULT_SORT_TYPE

import app.k9mail.legacy.account.AccountDefaultsProvider.Companion.DEFAULT_STRIP_SIGNATURE

import app.k9mail.legacy.account.AccountDefaultsProvider.Companion.DEFAULT_SYNC_INTERVAL

import app.k9mail.legacy.account.AccountDefaultsProvider.Companion.NO_OPENPGP_KEY

import app.k9mail.legacy.account.AccountDefaultsProvider.Companion.UNASSIGNED_ACCOUNT_NUMBER

import app.k9mail.legacy.account.Expunge

import app.k9mail.legacy.account.FolderMode

import app.k9mail.legacy.account.Identity

import app.k9mail.legacy.account.LegacyAccount

import app.k9mail.legacy.account.ShowPictures

import com.fsck.k9.CoreResourceProvider

import com.fsck.k9.K9

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

import net.thunderbird.core.android.account.Expunge

import net.thunderbird.core.android.account.FolderMode

import net.thunderbird.core.android.account.Identity

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

import net.thunderbird.core.android.account.ShowPictures

import net.thunderbird.core.mail.folder.api.SpecialFolderSelection

import net.thunderbird.core.preferences.Storage

import net.thunderbird.feature.notification.NotificationLight