From 03772c6a5c6c3d8ec440f96c04abcd692ca06228 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolf-Martell=20Montwe=CC=81?= Date: Fri, 23 Jun 2023 11:21:03 +0200 Subject: [PATCH] Rename to SuggestServerName --- app/core/src/main/java/com/fsck/k9/KoinModule.kt | 4 ++-- .../com/fsck/k9/activity/setup/AccountSetupAccountType.kt | 4 ++-- .../com/fsck/k9/activity/setup/AccountSetupIncoming.java | 4 ++-- .../{ServerNameSuggester.kt => SuggestServerName.kt} | 2 +- .../account/oauth/domain/usecase/SuggestServerNameTest.kt} | 7 ++++--- 5 files changed, 11 insertions(+), 10 deletions(-) rename feature/account/oauth/src/main/kotlin/app/k9mail/feature/account/oauth/domain/usecase/{ServerNameSuggester.kt => SuggestServerName.kt} (93%) rename feature/account/oauth/src/test/{java/app/k9mail/feature/account/oauth/domain/usecase/ServerNameSuggesterTest.kt => kotlin/app/k9mail/feature/account/oauth/domain/usecase/SuggestServerNameTest.kt} (84%) diff --git a/app/core/src/main/java/com/fsck/k9/KoinModule.kt b/app/core/src/main/java/com/fsck/k9/KoinModule.kt index e147151ddf..88d732a257 100644 --- a/app/core/src/main/java/com/fsck/k9/KoinModule.kt +++ b/app/core/src/main/java/com/fsck/k9/KoinModule.kt @@ -2,7 +2,7 @@ package com.fsck.k9 import android.content.Context import app.k9mail.core.android.common.coreCommonAndroidModule -import app.k9mail.feature.account.oauth.domain.usecase.ServerNameSuggester +import app.k9mail.feature.account.oauth.domain.usecase.SuggestServerName import com.fsck.k9.helper.Contacts import com.fsck.k9.helper.DefaultTrustedSocketFactory import com.fsck.k9.mail.ssl.LocalKeyStore @@ -34,7 +34,7 @@ val mainModule = module { single { LocalKeyStoreManager(get()) } single { DefaultTrustedSocketFactory(get(), get()) } single { Clock.System } - factory { ServerNameSuggester() } + factory { SuggestServerName() } factory { EmailAddressValidator() } factory { ServerSettingsSerializer() } } diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupAccountType.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupAccountType.kt index cc71b11e47..4e28a3781a 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupAccountType.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupAccountType.kt @@ -5,7 +5,7 @@ import android.content.Intent import android.os.Bundle import android.view.View import app.k9mail.core.common.mail.Protocols -import app.k9mail.feature.account.oauth.domain.usecase.ServerNameSuggester +import app.k9mail.feature.account.oauth.domain.usecase.SuggestServerName import com.fsck.k9.Account import com.fsck.k9.Preferences import com.fsck.k9.helper.EmailHelper.getDomainFromEmailAddress @@ -23,7 +23,7 @@ import org.koin.android.ext.android.inject */ class AccountSetupAccountType : K9Activity() { private val preferences: Preferences by inject() - private val serverNameSuggester: ServerNameSuggester by inject() + private val serverNameSuggester: SuggestServerName by inject() private val localFoldersCreator: SpecialLocalFoldersCreator by inject() private lateinit var account: Account diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupIncoming.java b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupIncoming.java index 79e360e447..eb24a7bf7a 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupIncoming.java +++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupIncoming.java @@ -29,7 +29,7 @@ import com.fsck.k9.LocalKeyStoreManager; import com.fsck.k9.Preferences; import com.fsck.k9.account.AccountCreator; import com.fsck.k9.helper.EmailHelper; -import app.k9mail.feature.account.oauth.domain.usecase.ServerNameSuggester; +import app.k9mail.feature.account.oauth.domain.usecase.SuggestServerName; import com.fsck.k9.ui.base.K9Activity; import com.fsck.k9.activity.setup.AccountSetupCheckSettings.CheckDirection; import com.fsck.k9.helper.Utility; @@ -61,7 +61,7 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener private static final String STATE_AUTH_TYPE_POSITION = "authTypePosition"; private final AccountCreator accountCreator = DI.get(AccountCreator.class); - private final ServerNameSuggester serverNameSuggester = DI.get(ServerNameSuggester.class); + private final SuggestServerName serverNameSuggester = DI.get(SuggestServerName.class); private String mStoreType; private TextInputEditText mUsernameView; diff --git a/feature/account/oauth/src/main/kotlin/app/k9mail/feature/account/oauth/domain/usecase/ServerNameSuggester.kt b/feature/account/oauth/src/main/kotlin/app/k9mail/feature/account/oauth/domain/usecase/SuggestServerName.kt similarity index 93% rename from feature/account/oauth/src/main/kotlin/app/k9mail/feature/account/oauth/domain/usecase/ServerNameSuggester.kt rename to feature/account/oauth/src/main/kotlin/app/k9mail/feature/account/oauth/domain/usecase/SuggestServerName.kt index 410ee6d9cd..bbd27a0283 100644 --- a/feature/account/oauth/src/main/kotlin/app/k9mail/feature/account/oauth/domain/usecase/ServerNameSuggester.kt +++ b/feature/account/oauth/src/main/kotlin/app/k9mail/feature/account/oauth/domain/usecase/SuggestServerName.kt @@ -2,7 +2,7 @@ package app.k9mail.feature.account.oauth.domain.usecase import app.k9mail.core.common.mail.Protocols -class ServerNameSuggester { +class SuggestServerName { fun suggestServerName(serverType: String, domainPart: String): String = when (serverType) { Protocols.IMAP -> "imap.$domainPart" Protocols.SMTP -> "smtp.$domainPart" diff --git a/feature/account/oauth/src/test/java/app/k9mail/feature/account/oauth/domain/usecase/ServerNameSuggesterTest.kt b/feature/account/oauth/src/test/kotlin/app/k9mail/feature/account/oauth/domain/usecase/SuggestServerNameTest.kt similarity index 84% rename from feature/account/oauth/src/test/java/app/k9mail/feature/account/oauth/domain/usecase/ServerNameSuggesterTest.kt rename to feature/account/oauth/src/test/kotlin/app/k9mail/feature/account/oauth/domain/usecase/SuggestServerNameTest.kt index 0018e6b355..d94f447af3 100644 --- a/feature/account/oauth/src/test/java/app/k9mail/feature/account/oauth/domain/usecase/ServerNameSuggesterTest.kt +++ b/feature/account/oauth/src/test/kotlin/app/k9mail/feature/account/oauth/domain/usecase/SuggestServerNameTest.kt @@ -1,16 +1,17 @@ package app.k9mail.feature.account.oauth.domain.usecase import app.k9mail.core.common.mail.Protocols +import app.k9mail.feature.account.oauth.domain.usecase.SuggestServerName import org.junit.Assert import org.junit.Before import org.junit.Test -class ServerNameSuggesterTest { - private var serverNameSuggester: ServerNameSuggester? = null +class SuggestServerNameTest { + private var serverNameSuggester: SuggestServerName? = null @Before @Throws(Exception::class) fun setUp() { - serverNameSuggester = ServerNameSuggester() + serverNameSuggester = SuggestServerName() } @Test