Merge branch '5113-Update_redirect_to_listPage_logic' into 'main' (4816cb4c) · Commits · e / os / Mail

app/core/src/main/java/com/fsck/k9/setup/AccountManagerConstants.kt

+3 −0

Original line number	Diff line number	Diff line
		@@ -23,4 +23,7 @@ object AccountManagerConstants {
		const val MAIL_CONTENT_AUTHORITY = "foundation.e.mail.provider.AppContentProvider"
		const val AUTH_TOKEN_TYPE = "oauth2-access-token"
		const val KEY_AUTH_STATE = "auth_state"

		const val OPEN_APP_PACKAGE_AFTER_AUTH = "open_app_package_after_auth"
		const val OPEN_APP_ACTIVITY_AFTER_AUTH = "open_app_activity_after_auth"
		}

app/ui/legacy/build.gradle

+0 −1

Original line number	Diff line number	Diff line
		@@ -70,7 +70,6 @@ dependencies {
		implementation "com.squareup.retrofit2:converter-simplexml:${versions.retrofit}"

		implementation "com.github.fahim44:FullScreenLoadingDialog:1.0.7"
		implementation "org.greenrobot:eventbus:3.3.1"
		}

		android {

app/ui/legacy/src/main/java/com/fsck/k9/account/AccountSyncReceiver.kt

+3 −5

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@ import com.fsck.k9.Preferences
		import com.fsck.k9.activity.setup.accountmanager.EeloAccountCreator
		import com.fsck.k9.controller.push.PushController
		import java.util.concurrent.Executors
		import org.greenrobot.eventbus.EventBus
		import org.koin.core.component.KoinComponent
		import org.koin.core.component.inject

		@@ -56,10 +55,9 @@ class AccountSyncReceiver : BroadcastReceiver(), KoinComponent {
		EeloAccountCreator.loadAccountsFromAccountManager(
		it.applicationContext,
		preferences,
		accountRemover
		) {
		EventBus.getDefault().post(AccountCreationAction())
		}
		accountRemover,
		null
		)
		}
		}
		}

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

+6 −24

Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@ import android.app.Activity
		import android.content.Context
		import android.content.Intent
		import android.os.Bundle
		import android.provider.Settings
		import android.text.Editable
		import android.view.View
		import android.view.ViewGroup
		@@ -18,6 +19,7 @@ import com.fsck.k9.EmailAddressValidator
		import com.fsck.k9.Preferences
		import com.fsck.k9.account.AccountCreationAction
		import com.fsck.k9.account.AccountCreator
		import com.fsck.k9.activity.MessageList
		import com.fsck.k9.activity.setup.AccountSetupCheckSettings.CheckDirection
		import com.fsck.k9.activity.setup.accountmanager.MailAutoConfigDiscovery
		import com.fsck.k9.autodiscovery.api.DiscoveredServerSettings
		@@ -42,9 +44,6 @@ import com.lamonjush.fullscreenloadingdialog.FullScreenLoadingDialog
		import com.lamonjush.fullscreenloadingdialog.SpinKitStyle
		import kotlinx.coroutines.Dispatchers
		import kotlinx.coroutines.launch
		import org.greenrobot.eventbus.EventBus
		import org.greenrobot.eventbus.Subscribe
		import org.greenrobot.eventbus.ThreadMode
		import org.koin.android.ext.android.inject

		/**
		@@ -76,7 +75,6 @@ class AccountSetupBasics : K9Activity() {
		private var uiState = UiState.EMAIL_ADDRESS_ONLY
		private var account: Account? = null
		private var checkedIncoming = false
		private var accountManagerAuthRunning = false

		public override fun onCreate(savedInstanceState: Bundle?) {
		super.onCreate(savedInstanceState)
		@@ -108,13 +106,6 @@ class AccountSetupBasics : K9Activity() {
		validateFields()

		updateUi()

		EventBus.getDefault().register(this)
		}

		override fun onDestroy() {
		EventBus.getDefault().unregister(this)
		super.onDestroy()
		}

		private fun initializeViewListeners() {
		@@ -203,8 +194,6 @@ class AccountSetupBasics : K9Activity() {
		}

		private fun attemptAutoSetupUsingOnlyEmailAddress() {
		accountManagerAuthRunning = false

		val email = emailView.text?.toString() ?: error("Email missing")

		val extraConnectionSettings = ExtraAccountDiscovery.discover(email)
		@@ -238,16 +227,11 @@ class AccountSetupBasics : K9Activity() {
		}

		private fun startGoogleOAuthFlow() {
		accountManagerAuthRunning = true
		val osAccountManager = AccountManager.get(this)
		osAccountManager.addAccount(AccountManagerConstants.GOOGLE_ACCOUNT_TYPE, null, null, null, this, null, null)
		}

		@Subscribe(threadMode = ThreadMode.MAIN_ORDERED)
		fun onAccountCreatedViaAccountManager(accountCreationAction: AccountCreationAction) {
		if (accountManagerAuthRunning) {
		finish()
		}
		val options = Bundle()
		options.putString(AccountManagerConstants.OPEN_APP_PACKAGE_AFTER_AUTH, packageName)
		options.putString(AccountManagerConstants.OPEN_APP_ACTIVITY_AFTER_AUTH, MessageList::class.java.name)
		osAccountManager.addAccount(AccountManagerConstants.GOOGLE_ACCOUNT_TYPE, null, null, options, this, null, null)
		}

		private fun startPasswordFlow() {
		@@ -260,8 +244,6 @@ class AccountSetupBasics : K9Activity() {
		}

		private fun attemptAutoSetup() {
		accountManagerAuthRunning = false

		if (clientCertificateCheckBox.isChecked) {
		// Auto-setup doesn't support client certificates.
		onManualSetup()