Remove `AccountSetupAccountType
This commit is contained in:
Wolf-Martell Montwé
parent
060a376510
commit
04c0418c7a
4 changed files with 0 additions and 188 deletions
|
|
@ -66,11 +66,6 @@
|
|||
android:theme="@style/Theme.K9.Dialog.Translucent.DayNight"
|
||||
/>
|
||||
|
||||
<activity
|
||||
android:name=".activity.setup.AccountSetupAccountType"
|
||||
android:configChanges="locale"
|
||||
android:label="@string/account_setup_account_type_title"/>
|
||||
|
||||
<activity
|
||||
android:name=".activity.setup.AccountSetupIncoming"
|
||||
android:configChanges="locale"
|
||||
|
|
|
|||
|
|
@ -1,131 +0,0 @@
|
|||
package com.fsck.k9.activity.setup
|
||||
|
||||
import android.content.Context
|
||||
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.AccountOAuthDomainContract.UseCase.SuggestServerName
|
||||
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.ui.R
|
||||
import com.fsck.k9.ui.base.K9Activity
|
||||
import org.koin.android.ext.android.inject
|
||||
|
||||
/**
|
||||
* Prompts the user to select an account type. The account type, along with the
|
||||
* passed in email address, password and makeDefault are then passed on to the
|
||||
* AccountSetupIncoming activity.
|
||||
*/
|
||||
class AccountSetupAccountType : K9Activity() {
|
||||
private val preferences: Preferences by inject()
|
||||
private val serverNameSuggester: SuggestServerName by inject()
|
||||
private val localFoldersCreator: SpecialLocalFoldersCreator by inject()
|
||||
|
||||
private lateinit var account: Account
|
||||
private var makeDefault = false
|
||||
private lateinit var initialAccountSettings: InitialAccountSettings
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
setLayout(R.layout.account_setup_account_type)
|
||||
setTitle(R.string.account_setup_account_type_title)
|
||||
|
||||
decodeArguments()
|
||||
|
||||
findViewById<View>(R.id.pop).setOnClickListener { setupPop3Account() }
|
||||
findViewById<View>(R.id.imap).setOnClickListener { setupImapAccount() }
|
||||
}
|
||||
|
||||
private fun decodeArguments() {
|
||||
val accountUuid = intent.getStringExtra(EXTRA_ACCOUNT) ?: error("No account UUID provided")
|
||||
account = preferences.getAccount(accountUuid) ?: error("No account with given UUID found")
|
||||
makeDefault = intent.getBooleanExtra(EXTRA_MAKE_DEFAULT, false)
|
||||
initialAccountSettings = intent.getParcelableExtra(EXTRA_INITIAL_ACCOUNT_SETTINGS)
|
||||
?: error("Initial account settings are missing")
|
||||
}
|
||||
|
||||
private fun setupPop3Account() {
|
||||
setupAccount(Protocols.POP3)
|
||||
}
|
||||
|
||||
private fun setupImapAccount() {
|
||||
setupAccount(Protocols.IMAP)
|
||||
}
|
||||
|
||||
private fun setupAccount(serverType: String) {
|
||||
setupStoreAndSmtpTransport(serverType)
|
||||
createSpecialLocalFolders()
|
||||
returnAccountTypeSelectionResult()
|
||||
}
|
||||
|
||||
private fun setupStoreAndSmtpTransport(serverType: String) {
|
||||
val domainPart = getDomainFromEmailAddress(account.email) ?: error("Couldn't get domain from email address")
|
||||
|
||||
initializeIncomingServerSettings(serverType, domainPart)
|
||||
initializeOutgoingServerSettings(domainPart)
|
||||
}
|
||||
|
||||
private fun initializeIncomingServerSettings(serverType: String, domainPart: String) {
|
||||
val suggestedStoreServerName = serverNameSuggester.suggest(serverType, domainPart)
|
||||
val storeServer = ServerSettings(
|
||||
serverType,
|
||||
suggestedStoreServerName,
|
||||
-1,
|
||||
ConnectionSecurity.SSL_TLS_REQUIRED,
|
||||
initialAccountSettings.authenticationType,
|
||||
initialAccountSettings.email,
|
||||
initialAccountSettings.password,
|
||||
initialAccountSettings.clientCertificateAlias,
|
||||
)
|
||||
account.incomingServerSettings = storeServer
|
||||
}
|
||||
|
||||
private fun initializeOutgoingServerSettings(domainPart: String) {
|
||||
val suggestedTransportServerName = serverNameSuggester.suggest(Protocols.SMTP, domainPart)
|
||||
val transportServer = ServerSettings(
|
||||
Protocols.SMTP,
|
||||
suggestedTransportServerName,
|
||||
-1,
|
||||
ConnectionSecurity.STARTTLS_REQUIRED,
|
||||
initialAccountSettings.authenticationType,
|
||||
initialAccountSettings.email,
|
||||
initialAccountSettings.password,
|
||||
initialAccountSettings.clientCertificateAlias,
|
||||
)
|
||||
account.outgoingServerSettings = transportServer
|
||||
}
|
||||
|
||||
private fun createSpecialLocalFolders() {
|
||||
localFoldersCreator.createSpecialLocalFolders(account)
|
||||
}
|
||||
|
||||
private fun returnAccountTypeSelectionResult() {
|
||||
AccountSetupIncoming.actionIncomingSettings(this, account, makeDefault)
|
||||
}
|
||||
|
||||
companion object {
|
||||
private const val EXTRA_ACCOUNT = "account"
|
||||
private const val EXTRA_MAKE_DEFAULT = "makeDefault"
|
||||
private const val EXTRA_INITIAL_ACCOUNT_SETTINGS = "initialAccountSettings"
|
||||
|
||||
@JvmStatic
|
||||
fun actionSelectAccountType(
|
||||
context: Context,
|
||||
account: Account,
|
||||
makeDefault: Boolean,
|
||||
initialAccountSettings: InitialAccountSettings,
|
||||
) {
|
||||
val intent = Intent(context, AccountSetupAccountType::class.java).apply {
|
||||
putExtra(EXTRA_ACCOUNT, account.uuid)
|
||||
putExtra(EXTRA_MAKE_DEFAULT, makeDefault)
|
||||
putExtra(EXTRA_INITIAL_ACCOUNT_SETTINGS, initialAccountSettings)
|
||||
}
|
||||
context.startActivity(intent)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,47 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:orientation="vertical"
|
||||
tools:context="com.fsck.k9.activity.setup.AccountSetupAccountType">
|
||||
|
||||
<include layout="@layout/toolbar" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="1"
|
||||
android:orientation="vertical"
|
||||
android:padding="6dip">
|
||||
|
||||
<TextView
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:focusable="true"
|
||||
android:paddingBottom="10dip"
|
||||
android:text="@string/account_setup_account_type_instructions"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
android:textColor="?android:attr/textColorPrimary" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/imap"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:minWidth="@dimen/button_minWidth"
|
||||
android:padding="10dip"
|
||||
android:text="@string/account_setup_account_type_imap_action" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/pop"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:minWidth="@dimen/button_minWidth"
|
||||
android:padding="10dip"
|
||||
android:text="@string/account_setup_account_type_pop_action" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
|
@ -359,11 +359,6 @@
|
|||
<string name="account_setup_check_settings_fetch">Fetching account settings\u2026</string>
|
||||
<string name="account_setup_check_settings_canceling_msg">Canceling\u2026</string>
|
||||
|
||||
<string name="account_setup_account_type_title">Account type</string>
|
||||
<string name="account_setup_account_type_instructions">What kind of account is this?</string>
|
||||
<string name="account_setup_account_type_pop_action">POP3</string>
|
||||
<string name="account_setup_account_type_imap_action">IMAP</string>
|
||||
|
||||
<string name="account_setup_auth_type_normal_password">Normal password</string>
|
||||
<string name="account_setup_auth_type_insecure_password">Password, transmitted insecurely</string>
|
||||
<string name="account_setup_auth_type_encrypted_password">Encrypted password</string>
|
||||
|
|
|
|||
Loading…
Reference in a new issue