Add feature:account:oauth module and move ServerNameSuggester there

app/core/build.gradle.kts

@@ -10,6 +10,7 @@ dependencies {
     api(projects.core.android.common)
 
     implementation(projects.plugins.openpgpApiLib.openpgpApi)
+    implementation(projects.feature.account.oauth)
 
     api(libs.koin.android)
 

app/core/src/main/java/com/fsck/k9/KoinModule.kt

@@ -2,13 +2,13 @@ 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 com.fsck.k9.helper.Contacts
 import com.fsck.k9.helper.DefaultTrustedSocketFactory
 import com.fsck.k9.mail.ssl.LocalKeyStore
 import com.fsck.k9.mail.ssl.TrustManagerFactory
 import com.fsck.k9.mail.ssl.TrustedSocketFactory
 import com.fsck.k9.mailstore.LocalStoreProvider
-import com.fsck.k9.setup.ServerNameSuggester
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.GlobalScope
 import kotlinx.datetime.Clock

app/ui/legacy/build.gradle.kts

@@ -10,6 +10,7 @@ dependencies {
     implementation(projects.feature.autodiscovery.providersxml)
     implementation(projects.mail.common)
     implementation(projects.uiUtils.toolbarBottomSheet)
+    implementation(projects.feature.account.oauth)
 
     // Remove AccountSetupIncoming's dependency on these
     compileOnly(projects.mail.protocols.imap)

app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupAccountType.kt

@@ -5,13 +5,13 @@ 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 com.fsck.k9.Account
 import com.fsck.k9.Preferences
 import com.fsck.k9.helper.EmailHelper.getDomainFromEmailAddress
 import com.fsck.k9.mail.ConnectionSecurity
 import com.fsck.k9.mail.ServerSettings
 import com.fsck.k9.mailstore.SpecialLocalFoldersCreator
-import com.fsck.k9.setup.ServerNameSuggester
 import com.fsck.k9.ui.R
 import com.fsck.k9.ui.base.K9Activity
 import org.koin.android.ext.android.inject

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 com.fsck.k9.setup.ServerNameSuggester;
+import app.k9mail.feature.account.oauth.domain.usecase.ServerNameSuggester;
 import com.fsck.k9.ui.base.K9Activity;
 import com.fsck.k9.activity.setup.AccountSetupCheckSettings.CheckDirection;
 import com.fsck.k9.helper.Utility;

feature/account/oauth/build.gradle.kts

@@ -0,0 +1,24 @@
+plugins {
+    id(ThunderbirdPlugins.Library.androidCompose)
+}
+
+android {
+    namespace = "app.k9mail.feature.account.oauth"
+    resourcePrefix = "account_oauth_"
+
+    buildTypes {
+        debug {
+            manifestPlaceholders["appAuthRedirectScheme"] = "FIXME: override this in your app project"
+        }
+        release {
+            manifestPlaceholders["appAuthRedirectScheme"] = "FIXME: override this in your app project"
+        }
+    }
+}
+
+dependencies {
+    implementation(projects.core.ui.compose.designsystem)
+    implementation(projects.core.common)
+
+    testImplementation(projects.core.ui.compose.testing)
+}

feature/account/oauth/src/main/kotlin/app/k9mail/feature/account/oauth/domain/usecase/ServerNameSuggester.kt

@@ -1,4 +1,4 @@
-package com.fsck.k9.setup
+package app.k9mail.feature.account.oauth.domain.usecase
 
 import app.k9mail.core.common.mail.Protocols
 

feature/account/oauth/src/test/java/app/k9mail/feature/account/oauth/domain/usecase/ServerNameSuggesterTest.java

@@ -1,4 +1,4 @@
-package com.fsck.k9.setup;
+package app.k9mail.feature.account.oauth.domain.usecase;
 
 
 import app.k9mail.core.common.mail.Protocols;
@@ -11,7 +11,6 @@ import static org.junit.Assert.assertEquals;
 public class ServerNameSuggesterTest {
     private ServerNameSuggester serverNameSuggester;
 
-
     @Before
     public void setUp() throws Exception {
         serverNameSuggester = new ServerNameSuggester();

feature/account/setup/build.gradle.kts

@@ -12,6 +12,7 @@ dependencies {
     implementation(projects.core.common)
 
     implementation(projects.feature.autodiscovery.service)
+    implementation(projects.feature.account.oauth)
 
     testImplementation(projects.core.ui.compose.testing)
 }

settings.gradle.kts

@@ -40,6 +40,7 @@ include(
 
 include(
     ":feature:account:setup",
+    ":feature:account:oauth",
     ":feature:onboarding",
     ":feature:autodiscovery:api",
     ":feature:autodiscovery:providersxml",