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

Commit d5c16f2b authored by cketti's avatar cketti
Browse files

Convert between `ServerSettings` variants when necessary 

Currently, `useCompression` and `isSendClientIdEnabled` are not part of `ServerSettings` in `Account` (and storage, and settings files, etc). We need to fix this eventually. But it's a larger change. For now we convert between the `ServerSettings` variants at the edges.
parent fca4ac18

app/k9mail/src/main/java/com/fsck/k9/account/AccountServerSettingsUpdater.kt

+18 −1
Original line number Diff line number Diff line 
package com.fsck.k9.account



import app.k9mail.core.common.mail.Protocols

import app.k9mail.feature.account.edit.AccountEditExternalContract

import app.k9mail.feature.account.edit.AccountEditExternalContract.AccountUpdaterFailure

import app.k9mail.feature.account.edit.AccountEditExternalContract.AccountUpdaterResult

import com.fsck.k9.logging.Timber

import com.fsck.k9.mail.ServerSettings

import com.fsck.k9.mail.store.imap.ImapStoreSettings

import com.fsck.k9.mail.store.imap.ImapStoreSettings.autoDetectNamespace

import com.fsck.k9.mail.store.imap.ImapStoreSettings.isSendClientId

import com.fsck.k9.mail.store.imap.ImapStoreSettings.isUseCompression

import com.fsck.k9.mail.store.imap.ImapStoreSettings.pathPrefix

import com.fsck.k9.preferences.AccountManager

import kotlinx.coroutines.CoroutineDispatcher

import kotlinx.coroutines.Dispatchers
@@ -42,7 +48,18 @@ class AccountServerSettingsUpdater( 
        )



        if (isIncoming) {

            if (serverSettings.type == Protocols.IMAP) {

                account.useCompression = serverSettings.isUseCompression

                account.isSendClientIdEnabled = serverSettings.isSendClientId

                account.incomingServerSettings = serverSettings.copy(

                    extra = ImapStoreSettings.createExtra(

                        autoDetectNamespace = serverSettings.autoDetectNamespace,

                        pathPrefix = serverSettings.pathPrefix,

                    ),

                )

            } else {

                account.incomingServerSettings = serverSettings

            }

        } else {

            account.outgoingServerSettings = serverSettings

        }

app/k9mail/src/main/java/com/fsck/k9/account/AccountStateLoader.kt

+11 −1
Original line number Diff line number Diff line 
package com.fsck.k9.account



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 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
@@ -36,9 +40,15 @@ class AccountStateLoader( 
        return AccountState(

            uuid = account.uuid,

            emailAddress = account.email,

            incomingServerSettings = account.incomingServerSettings,

            incomingServerSettings = account.incomingServerSettingsExtra,

            outgoingServerSettings = account.outgoingServerSettings,

            authorizationState = AuthorizationState(account.oAuthState),

        )

    }

}



private val Account.incomingServerSettingsExtra: ServerSettings

    get() = when (incomingServerSettings.type) {

        Protocols.IMAP -> toImapServerSettings()

        else -> incomingServerSettings

    }

app/k9mail/src/test/java/com/fsck/k9/account/AccountStateLoaderTest.kt

+3 −3
Original line number Diff line number Diff line
@@ -54,9 +54,9 @@ class AccountStateLoaderTest { 


    private companion object {

        val INCOMING_SERVER_SETTINGS = ServerSettings(

            type = "imap",

            host = "imap.example.org",

            port = 143,

            type = "pop3",

            host = "pop.example.org",

            port = 465,

            connectionSecurity = ConnectionSecurity.SSL_TLS_REQUIRED,

            authenticationType = AuthType.PLAIN,

            username = "username",

app/k9mail/src/test/java/com/fsck/k9/account/AccountUpdaterTest.kt

+3 −3
Original line number Diff line number Diff line
@@ -96,9 +96,9 @@ class AccountUpdaterTest { 
        const val ACCOUNT_UUID = "uuid"



        val INCOMING_SERVER_SETTINGS = ServerSettings(

            type = "imap",

            host = "imap.example.org",

            port = 143,

            type = "pop3",

            host = "pop.example.org",

            port = 465,

            connectionSecurity = ConnectionSecurity.SSL_TLS_REQUIRED,

            authenticationType = AuthType.PLAIN,

            username = "username",