5356-fix_mail_sync_issue (9d470103) · Commits · e / os / Mail

app/core/src/main/java/com/fsck/k9/controller/MessagingController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -2578,7 +2578,7 @@ public class MessagingController {
		return true;
		}

		EeloAccountHelper.INSTANCE.updateOAuthStateIfMissing(context, preferences, account);
		EeloAccountHelper.INSTANCE.updateOAuthState(context, preferences, account);
		return serverSettings.authenticationType == AuthType.XOAUTH2 && account.getOAuthState() == null;
		}

app/core/src/main/java/com/fsck/k9/job/MailSyncWorker.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@ class MailSyncWorker(
		return Result.success()
		}

		EeloAccountHelper.updateOAuthStateIfMissing(context, preferences, account)
		EeloAccountHelper.updateOAuthState(context, preferences, account)
		if (account.incomingServerSettings.authenticationType == AuthType.XOAUTH2 && account.oAuthState == null) {
		Timber.d("Account requires sign-in. Skipping mail sync.")
		return Result.success()

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

+17 −14

Original line number	Diff line number	Diff line
		@@ -16,44 +16,47 @@

		package com.fsck.k9.setup

		import android.accounts.Account as OsAccount
		import android.accounts.AccountManager as OsAccountManager
		import android.content.Context
		import com.fsck.k9.Account
		import com.fsck.k9.mail.AuthType
		import com.fsck.k9.preferences.AccountManager
		import android.accounts.AccountManager as OsAccountManager
		import android.accounts.Account as OsAccount
		import timber.log.Timber

		object EeloAccountHelper {

		/**
		* to support backward-compatibility.
		* In previous versions google accounts loaded from accountManager doesn't store oAuthState in the db.
		* This method check if the oAuthState is missing or not, if missing, update the oAuthState
		* Update oAuthState for google accounts which is logged in using accountManager
		* @return is the update operation successful or not
		*/
		fun updateOAuthStateIfMissing(context: Context, accountManager: AccountManager, account: Account?) {
		fun updateOAuthState(context: Context, accountManager: AccountManager, account: Account?): Boolean {
		// check params
		if (account == null) {
		Timber.w("updating OAuthState failed, account is null")
		return
		return false
		}

		// validation
		if (account.incomingServerSettings.authenticationType != AuthType.XOAUTH2 \|\| account.oAuthState != null) {
		if (account.incomingServerSettings.authenticationType != AuthType.XOAUTH2) {
		Timber.w("updating oAuthState failed, not oauth2 authType")
		return
		return false
		}

		val osAccountManager = OsAccountManager.get(context)
		val googleAccount = retrieveGoogleAccountFromAccountManager(osAccountManager, account.email) ?: return
		val googleAccount = retrieveGoogleAccountFromAccountManager(osAccountManager, account.email) ?: return false
		account.oAuthState = osAccountManager.getUserData(googleAccount, AccountManagerConstants.KEY_AUTH_STATE)
		if (account.oAuthState != null) {
		accountManager.saveAccount(account)
		}
		return true
		}

		// If token is updated by mail, also update the accountManager
		fun updateAccountInAccountManager(context: Context?, account: OsAccount?, authState: String?, accessToken: String?) {
		fun updateAccountInAccountManager(
		context: Context?,
		account: OsAccount?,
		authState: String?,
		accessToken: String?
		) {
		if (context == null \|\| account == null \|\| authState == null \|\| accessToken == null) {
		Timber.w("updating account for accountManager failed, invalid param.")
		return

app/k9mail/src/main/java/com/fsck/k9/backends/RealOAuth2TokenProvider.kt

+6 −1

Original line number	Diff line number	Diff line
		@@ -25,8 +25,13 @@ class RealOAuth2TokenProvider(
		private var requestFreshToken = false

		override fun getToken(email: String, timeoutMillis: Long): String {
		// if the authState is retrieved from accountManager, then return it. Refresh will be handled by accountManager.
		if (EeloAccountHelper.updateOAuthState(context, accountManager, account)) {
		return account.oAuthState?.let { AuthState.jsonDeserialize(it) }?.accessToken
		?: throw AuthenticationFailedException("Login required")
		}

		val accountManagerAccount = EeloAccountHelper.retrieveGoogleAccountFromAccountManager(context, email)
		EeloAccountHelper.updateOAuthStateIfMissing(context, accountManager, account)

		val latch = CountDownLatch(1)
		var token: String? = null