Move Account to :legacy:account module

app-k9mail/src/debug/kotlin/app/k9mail/dev/DemoBackendFactory.kt

@@ -1,7 +1,7 @@
 package app.k9mail.dev
 
 import app.k9mail.backend.demo.DemoBackend
-import com.fsck.k9.Account
+import app.k9mail.legacy.account.Account
 import com.fsck.k9.backend.BackendFactory
 import com.fsck.k9.backend.api.Backend
 import com.fsck.k9.mailstore.K9BackendStorageFactory

app-thunderbird/src/debug/kotlin/net/thunderbird/android/dev/DemoBackendFactory.kt

@@ -1,7 +1,7 @@
 package net.thunderbird.android.dev
 
 import app.k9mail.backend.demo.DemoBackend
-import com.fsck.k9.Account
+import app.k9mail.legacy.account.Account
 import com.fsck.k9.backend.BackendFactory
 import com.fsck.k9.backend.api.Backend
 import com.fsck.k9.mailstore.K9BackendStorageFactory

feature/settings/import/src/main/kotlin/app/k9mail/feature/settings/import/ui/AuthViewModel.kt

@@ -15,7 +15,7 @@ import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.viewModelScope
 import app.k9mail.feature.account.oauth.domain.AccountOAuthDomainContract.UseCase.GetOAuthRequestIntent
 import app.k9mail.feature.account.oauth.domain.entity.AuthorizationIntentResult
-import com.fsck.k9.Account
+import app.k9mail.legacy.account.Account
 import com.fsck.k9.preferences.AccountManager
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow

feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListConfig.kt

@@ -1,6 +1,6 @@
 package app.k9mail.feature.widget.message.list
 
-import com.fsck.k9.Account.SortType
+import app.k9mail.legacy.account.Account.SortType
 import com.fsck.k9.search.LocalSearch
 
 internal data class MessageListConfig(

feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListItemMapper.kt

@@ -1,6 +1,6 @@
 package app.k9mail.feature.widget.message.list
 
-import com.fsck.k9.Account
+import app.k9mail.legacy.account.Account
 import com.fsck.k9.controller.MessageReference
 import com.fsck.k9.helper.MessageHelper
 import com.fsck.k9.mailstore.MessageDetailsAccessor

feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListLoader.kt

@@ -1,7 +1,7 @@
 package app.k9mail.feature.widget.message.list
 
-import com.fsck.k9.Account
-import com.fsck.k9.Account.SortType
+import app.k9mail.legacy.account.Account
+import app.k9mail.legacy.account.Account.SortType
 import com.fsck.k9.Preferences
 import com.fsck.k9.helper.MessageHelper
 import com.fsck.k9.mailstore.MessageColumns

feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListRemoteViewFactory.kt

@@ -8,7 +8,7 @@ import android.view.View
 import android.widget.RemoteViews
 import android.widget.RemoteViewsService.RemoteViewsFactory
 import androidx.core.content.ContextCompat
-import com.fsck.k9.Account.SortType
+import app.k9mail.legacy.account.Account.SortType
 import com.fsck.k9.K9
 import com.fsck.k9.activity.MessageList
 import com.fsck.k9.search.LocalSearch

feature/widget/unread/src/main/kotlin/app/k9mail/feature/widget/unread/UnreadWidgetDataProvider.kt

@@ -2,7 +2,7 @@ package app.k9mail.feature.widget.unread
 
 import android.content.Context
 import android.content.Intent
-import com.fsck.k9.Account
+import app.k9mail.legacy.account.Account
 import com.fsck.k9.Preferences
 import com.fsck.k9.activity.MessageList
 import com.fsck.k9.controller.MessageCountsProvider

feature/widget/unread/src/main/kotlin/app/k9mail/feature/widget/unread/UnreadWidgetUpdateListener.kt

@@ -1,6 +1,6 @@
 package app.k9mail.feature.widget.unread
 
-import com.fsck.k9.Account
+import app.k9mail.legacy.account.Account
 import com.fsck.k9.controller.SimpleMessagingListener
 import com.fsck.k9.mail.Message
 import timber.log.Timber

feature/widget/unread/src/test/kotlin/app/k9mail/feature/widget/unread/UnreadWidgetDataProviderTest.kt

@@ -1,12 +1,12 @@
 package app.k9mail.feature.widget.unread
 
 import android.content.Context
+import app.k9mail.legacy.account.Account
 import app.k9mail.legacy.folder.Folder
 import app.k9mail.legacy.folder.FolderType
 import assertk.assertThat
 import assertk.assertions.isEqualTo
 import assertk.assertions.isNull
-import com.fsck.k9.Account
 import com.fsck.k9.CoreResourceProvider
 import com.fsck.k9.Preferences
 import com.fsck.k9.controller.MessageCounts

legacy/account/build.gradle.kts

@@ -8,5 +8,7 @@ android {
 }
 
 dependencies {
-
+    implementation(projects.legacy.notification)
+    implementation(projects.mail.common)
+    implementation(projects.backend.api)
 }

legacy/core/src/main/java/com/fsck/k9/Account.kt → legacy/account/src/main/java/app/k9mail/legacy/account/Account.kt

@@ -1,7 +1,5 @@
-package com.fsck.k9
+package app.k9mail.legacy.account
 
-import app.k9mail.legacy.account.BaseAccount
-import app.k9mail.legacy.account.Identity
 import app.k9mail.legacy.notification.NotificationSettings
 import com.fsck.k9.backend.api.SyncConfig.ExpungePolicy
 import com.fsck.k9.mail.Address
@@ -15,6 +13,7 @@ const val DEFAULT_VISIBLE_LIMIT = 25
 /**
  * Account stores all of the settings for a single account defined by the user. Each account is defined by a UUID.
  */
+@Suppress("TooManyFunctions")
 class Account(
     override val uuid: String,
     private val isSensitiveDebugLoggingEnabled: () -> Boolean = { false },
@@ -539,6 +538,7 @@ class Account(
         }
     }
 
+    @Suppress("MagicNumber")
     val earliestPollDate: Date?
         get() {
             val age = maximumPolledMessageAge.takeIf { it >= 0 } ?: return null
@@ -651,6 +651,7 @@ class Account(
         }
     }
 
+    @Suppress("MagicNumber")
     enum class DeletePolicy(@JvmField val setting: Int) {
         NEVER(0),
         SEVEN_DAYS(1),

legacy/common/src/main/java/com/fsck/k9/account/AccountActivator.kt

@@ -2,7 +2,7 @@ package com.fsck.k9.account
 
 import android.content.Context
 import app.k9mail.feature.settings.import.SettingsImportExternalContract
-import com.fsck.k9.Account
+import app.k9mail.legacy.account.Account
 import com.fsck.k9.Core
 import com.fsck.k9.Preferences
 import com.fsck.k9.controller.MessagingController

legacy/common/src/main/java/com/fsck/k9/account/AccountCreator.kt

@@ -7,8 +7,8 @@ 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 com.fsck.k9.Account.FolderMode
-import com.fsck.k9.Account.SpecialFolderSelection
+import app.k9mail.legacy.account.Account.FolderMode
+import app.k9mail.legacy.account.Account.SpecialFolderSelection
 import com.fsck.k9.Core
 import com.fsck.k9.Preferences
 import com.fsck.k9.controller.MessagingController
@@ -24,7 +24,7 @@ import com.fsck.k9.mailstore.SpecialLocalFoldersCreator
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import com.fsck.k9.Account as K9Account
+import app.k9mail.legacy.account.Account as K9Account
 
 // TODO Move to feature/account/setup
 class AccountCreator(

legacy/common/src/main/java/com/fsck/k9/account/AccountStateLoader.kt

@@ -4,15 +4,15 @@ import app.k9mail.core.common.mail.Protocols
 import app.k9mail.feature.account.common.AccountCommonExternalContract
 import app.k9mail.feature.account.common.domain.entity.AccountState
 import app.k9mail.feature.account.common.domain.entity.AuthorizationState
-import com.fsck.k9.Account
+import app.k9mail.legacy.account.Account
 import com.fsck.k9.backends.toImapServerSettings
 import com.fsck.k9.logging.Timber
 import com.fsck.k9.mail.ServerSettings
 import com.fsck.k9.preferences.AccountManager
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import com.fsck.k9.Account as K9Account
+import app.k9mail.legacy.account.Account as K9Account
 
 class AccountStateLoader(
     private val accountManager: AccountManager,

legacy/common/src/main/java/com/fsck/k9/account/DeletePolicyHelper.kt

@@ -1,7 +1,7 @@
 package com.fsck.k9.account
 
 import app.k9mail.core.common.mail.Protocols
-import com.fsck.k9.Account
+import app.k9mail.legacy.account.Account
 
 object DeletePolicyHelper {
     fun getDefaultDeletePolicy(type: String): Account.DeletePolicy {

legacy/common/src/main/java/com/fsck/k9/backends/AccountAuthStateStorage.kt

@@ -1,6 +1,6 @@
 package com.fsck.k9.backends
 
-import com.fsck.k9.Account
+import app.k9mail.legacy.account.Account
 import com.fsck.k9.mail.oauth.AuthStateStorage
 import com.fsck.k9.preferences.AccountManager
 

legacy/common/src/main/java/com/fsck/k9/backends/ImapBackendFactory.kt

@@ -1,8 +1,8 @@
 package com.fsck.k9.backends
 
 import android.content.Context
-import com.fsck.k9.Account
-import com.fsck.k9.Account.Expunge
+import app.k9mail.legacy.account.Account
+import app.k9mail.legacy.account.Account.Expunge
 import com.fsck.k9.backend.BackendFactory
 import com.fsck.k9.backend.api.Backend
 import com.fsck.k9.backend.imap.ImapBackend

legacy/common/src/main/java/com/fsck/k9/backends/ImapServerSettingsExtensions.kt

@@ -1,6 +1,6 @@
 package com.fsck.k9.backends
 
-import com.fsck.k9.Account
+import app.k9mail.legacy.account.Account
 import com.fsck.k9.mail.ServerSettings
 import com.fsck.k9.mail.store.imap.ImapStoreSettings
 import com.fsck.k9.mail.store.imap.ImapStoreSettings.autoDetectNamespace

legacy/common/src/main/java/com/fsck/k9/backends/Pop3BackendFactory.kt

@@ -1,6 +1,6 @@
 package com.fsck.k9.backends
 
-import com.fsck.k9.Account
+import app.k9mail.legacy.account.Account
 import com.fsck.k9.backend.BackendFactory
 import com.fsck.k9.backend.api.Backend
 import com.fsck.k9.backend.pop3.Pop3Backend

legacy/common/src/main/java/com/fsck/k9/notification/K9NotificationActionCreator.kt

@@ -8,7 +8,7 @@ import android.content.Intent
 import android.net.Uri
 import androidx.core.app.PendingIntentCompat
 import app.k9mail.feature.launcher.FeatureLauncherActivity
-import com.fsck.k9.Account
+import app.k9mail.legacy.account.Account
 import com.fsck.k9.K9
 import com.fsck.k9.activity.MessageList
 import com.fsck.k9.activity.compose.MessageActions

legacy/common/src/main/java/com/fsck/k9/notification/K9NotificationStrategy.kt

@@ -2,7 +2,7 @@ package com.fsck.k9.notification
 
 import app.k9mail.core.android.common.contact.ContactRepository
 import app.k9mail.core.common.mail.toEmailAddressOrNull
-import com.fsck.k9.Account
+import app.k9mail.legacy.account.Account
 import com.fsck.k9.K9
 import com.fsck.k9.mail.Flag
 import com.fsck.k9.mail.K9MailLib

legacy/common/src/test/java/com/fsck/k9/account/AccountServerSettingsUpdaterTest.kt

@@ -14,7 +14,7 @@ import com.fsck.k9.mail.ConnectionSecurity
 import com.fsck.k9.mail.ServerSettings
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
-import com.fsck.k9.Account as K9Account
+import app.k9mail.legacy.account.Account as K9Account
 
 class AccountServerSettingsUpdaterTest {
 

legacy/common/src/test/java/com/fsck/k9/account/AccountStateLoaderTest.kt

@@ -2,11 +2,11 @@ package com.fsck.k9.account
 
 import app.k9mail.feature.account.common.domain.entity.AccountState
 import app.k9mail.feature.account.common.domain.entity.AuthorizationState
+import app.k9mail.legacy.account.Account
 import app.k9mail.legacy.account.Identity
 import assertk.assertThat
 import assertk.assertions.isEqualTo
 import assertk.assertions.isNull
-import com.fsck.k9.Account
 import com.fsck.k9.mail.AuthType
 import com.fsck.k9.mail.ConnectionSecurity
 import com.fsck.k9.mail.ServerSettings

legacy/common/src/test/java/com/fsck/k9/account/DeletePolicyHelperTest.kt

@@ -1,11 +1,11 @@
 package com.fsck.k9.account
 
 import app.k9mail.core.common.mail.Protocols
+import app.k9mail.legacy.account.Account
 import assertk.assertFailure
 import assertk.assertThat
 import assertk.assertions.isEqualTo
 import assertk.assertions.isInstanceOf
-import com.fsck.k9.Account
 import org.junit.Test
 
 class DeletePolicyHelperTest {

legacy/common/src/test/java/com/fsck/k9/account/FakeAccountManager.kt

@@ -1,6 +1,6 @@
 package com.fsck.k9.account
 
-import com.fsck.k9.Account
+import app.k9mail.legacy.account.Account
 import com.fsck.k9.AccountRemovedListener
 import com.fsck.k9.AccountsChangeListener
 import com.fsck.k9.preferences.AccountManager

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

@@ -1,23 +1,24 @@
 package com.fsck.k9
 
+import app.k9mail.legacy.account.Account
+import app.k9mail.legacy.account.Account.Companion.DEFAULT_SORT_ASCENDING
+import app.k9mail.legacy.account.Account.Companion.DEFAULT_SORT_TYPE
+import app.k9mail.legacy.account.Account.Companion.DEFAULT_SYNC_INTERVAL
+import app.k9mail.legacy.account.Account.Companion.NO_OPENPGP_KEY
+import app.k9mail.legacy.account.Account.Companion.UNASSIGNED_ACCOUNT_NUMBER
+import app.k9mail.legacy.account.Account.DeletePolicy
+import app.k9mail.legacy.account.Account.Expunge
+import app.k9mail.legacy.account.Account.FolderMode
+import app.k9mail.legacy.account.Account.MessageFormat
+import app.k9mail.legacy.account.Account.QuoteStyle
+import app.k9mail.legacy.account.Account.ShowPictures
+import app.k9mail.legacy.account.Account.SortType
+import app.k9mail.legacy.account.Account.SpecialFolderSelection
 import app.k9mail.legacy.account.Identity
 import app.k9mail.legacy.notification.NotificationLight
 import app.k9mail.legacy.notification.NotificationSettings
 import app.k9mail.legacy.notification.NotificationVibration
 import app.k9mail.legacy.notification.VibratePattern
-import com.fsck.k9.Account.Companion.DEFAULT_SORT_ASCENDING
-import com.fsck.k9.Account.Companion.DEFAULT_SORT_TYPE
-import com.fsck.k9.Account.Companion.DEFAULT_SYNC_INTERVAL
-import com.fsck.k9.Account.Companion.NO_OPENPGP_KEY
-import com.fsck.k9.Account.Companion.UNASSIGNED_ACCOUNT_NUMBER
-import com.fsck.k9.Account.DeletePolicy
-import com.fsck.k9.Account.Expunge
-import com.fsck.k9.Account.FolderMode
-import com.fsck.k9.Account.MessageFormat
-import com.fsck.k9.Account.QuoteStyle
-import com.fsck.k9.Account.ShowPictures
-import com.fsck.k9.Account.SortType
-import com.fsck.k9.Account.SpecialFolderSelection
 import com.fsck.k9.helper.Utility
 import com.fsck.k9.mailstore.StorageManager
 import com.fsck.k9.preferences.Storage

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

@@ -1,5 +1,7 @@
 package com.fsck.k9
 
+import app.k9mail.legacy.account.Account
+
 fun interface AccountRemovedListener {
     fun onAccountRemoved(account: Account)
 }

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

@@ -2,10 +2,11 @@ package com.fsck.k9
 
 import android.content.Context
 import android.content.SharedPreferences
+import app.k9mail.legacy.account.Account
+import app.k9mail.legacy.account.Account.SortType
 import app.k9mail.legacy.di.DI
 import app.k9mail.legacy.di.EarlyInit
 import app.k9mail.legacy.di.inject
-import com.fsck.k9.Account.SortType
 import com.fsck.k9.core.BuildConfig
 import com.fsck.k9.mail.K9MailLib
 import com.fsck.k9.mailstore.LocalStore

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

@@ -1,5 +1,6 @@
 package com.fsck.k9
 
+import app.k9mail.legacy.account.Account
 import com.fsck.k9.mail.MailServerDirection
 import com.fsck.k9.mail.ssl.LocalKeyStore
 import java.security.cert.CertificateException

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

@@ -2,6 +2,7 @@ package com.fsck.k9
 
 import androidx.annotation.GuardedBy
 import androidx.annotation.RestrictTo
+import app.k9mail.legacy.account.Account
 import app.k9mail.legacy.di.DI
 import com.fsck.k9.mail.MessagingException
 import com.fsck.k9.mailstore.LocalStoreProvider

legacy/core/src/main/java/com/fsck/k9/backend/BackendFactory.kt

@@ -1,6 +1,6 @@
 package com.fsck.k9.backend
 
-import com.fsck.k9.Account
+import app.k9mail.legacy.account.Account
 import com.fsck.k9.backend.api.Backend
 
 interface BackendFactory {

legacy/core/src/main/java/com/fsck/k9/backend/BackendManager.kt

@@ -1,6 +1,6 @@
 package com.fsck.k9.backend
 
-import com.fsck.k9.Account
+import app.k9mail.legacy.account.Account
 import com.fsck.k9.backend.api.Backend
 import com.fsck.k9.mail.ServerSettings
 import java.util.concurrent.CopyOnWriteArraySet

legacy/core/src/main/java/com/fsck/k9/controller/DraftOperations.kt

@@ -1,6 +1,6 @@
 package com.fsck.k9.controller
 
-import com.fsck.k9.Account
+import app.k9mail.legacy.account.Account
 import com.fsck.k9.K9
 import com.fsck.k9.backend.api.Backend
 import com.fsck.k9.controller.MessagingControllerCommands.PendingAppend

legacy/core/src/main/java/com/fsck/k9/controller/LocalDeleteOperationDecider.kt

@@ -1,6 +1,6 @@
 package com.fsck.k9.controller
 
-import com.fsck.k9.Account
+import app.k9mail.legacy.account.Account
 
 /**
  * Decides whether deleting a message in the app moves it to the trash folder or deletes it immediately.