Merge branch '8607-main-mail_password' into 'main' (d6b474d9) · Commits · e / os / Mail

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

+21 −0

Original line number	Original line	Diff line number	Diff line
	@@ -23,6 +23,8 @@ import android.content.Context
	import app.k9mail.core.android.common.accountmanager.AccountManagerConstants		import app.k9mail.core.android.common.accountmanager.AccountManagerConstants
	import timber.log.Timber		import timber.log.Timber

			import com.fsck.k9.Account as K9Account

	object OsAccountManagerUtil {		object OsAccountManagerUtil {

	/**		/**
	@@ -83,4 +85,23 @@ object OsAccountManagerUtil {

	fun isAccountFound() = this != ACCOUNT_NOT_FOUND		fun isAccountFound() = this != ACCOUNT_NOT_FOUND
	}		}

			fun isMurenaEmailAccount(account: K9Account): Boolean {
			val incoming = account.incomingServerSettings
			val outgoing = account.outgoingServerSettings

			if (incoming.host == null \|\| outgoing.host == null) {
			return false
			}

			return isMurenaMailHost(incoming.host!!) && isMurenaMailHost(outgoing.host!!)
			}

			private fun isMurenaMailHost(host: String): Boolean {
			return "mail.ecloud.global" == host
			}

			fun isMurenaWebHostUrl(host: String): Boolean {
			return host.contains("https://murena.io") \|\| host.contains("http://murena.io")
			}
	}		}

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

+30 −23

Original line number	Original line	Diff line number	Diff line
	@@ -35,6 +35,7 @@ import com.fsck.k9.Account.DeletePolicy;
	import com.fsck.k9.Account.Expunge;		import com.fsck.k9.Account.Expunge;
	import com.fsck.k9.DI;		import com.fsck.k9.DI;
	import com.fsck.k9.K9;		import com.fsck.k9.K9;
			import com.fsck.k9.OsAccountManagerUtil;
	import com.fsck.k9.Preferences;		import com.fsck.k9.Preferences;
	import com.fsck.k9.backend.BackendManager;		import com.fsck.k9.backend.BackendManager;
	import com.fsck.k9.backend.api.Backend;		import com.fsck.k9.backend.api.Backend;
	@@ -671,10 +672,17 @@ public class MessagingController {
	}		}

	private boolean updatePassword(Account account) {		private boolean updatePassword(Account account) {
			if (!OsAccountManagerUtil.INSTANCE.isMurenaEmailAccount(account)) return false;

	AccountManager accountManager = AccountManager.get(context);		AccountManager accountManager = AccountManager.get(context);
			android.accounts.Account[] eeloAccounts =
			accountManager.getAccountsByType(AccountManagerConstants.EELO_ACCOUNT_TYPE);

	for (String accountType : AccountManagerConstants.INSTANCE.getALL_ACCOUNT_TYPES()) {		for (android.accounts.Account deviceAccount : eeloAccounts) {
	for (android.accounts.Account deviceAccount : accountManager.getAccountsByType(accountType)) {		String hostUrl = accountManager.getUserData(deviceAccount, AccountManagerConstants.KEY_OC_BASE_URL);
			if (hostUrl == null \|\| !OsAccountManagerUtil.INSTANCE.isMurenaWebHostUrl(hostUrl)) {
			continue;
			}
	// Check if the account email matches with account manager		// Check if the account email matches with account manager
	String emailId = accountManager.getUserData(deviceAccount,		String emailId = accountManager.getUserData(deviceAccount,
	AccountManagerConstants.ACCOUNT_EMAIL_ADDRESS_KEY);		AccountManagerConstants.ACCOUNT_EMAIL_ADDRESS_KEY);
	@@ -700,7 +708,6 @@ public class MessagingController {
	return true;		return true;
	}		}
	}		}
	}

	return false;		return false;
	}		}

app/k9mail/build.gradle.kts

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -65,8 +65,8 @@ android {
	applicationId = "foundation.e.mail"		applicationId = "foundation.e.mail"
	testApplicationId = "foundation.e.mail.tests"		testApplicationId = "foundation.e.mail.tests"

	versionCode = 37020		versionCode = 37021
	versionName = "6.711-1"		versionName = "6.711-2"

	// Keep in sync with the resource string array "supported_languages"		// Keep in sync with the resource string array "supported_languages"
	resourceConfigurations.addAll(		resourceConfigurations.addAll(

app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/accountmanager/EeloAccountCreator.java

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -37,6 +37,7 @@ import com.fsck.k9.Account;
	import com.fsck.k9.Account.DeletePolicy;		import com.fsck.k9.Account.DeletePolicy;
	import com.fsck.k9.Core;		import com.fsck.k9.Core;
	import com.fsck.k9.DI;		import com.fsck.k9.DI;
			import com.fsck.k9.OsAccountManagerUtil;
	import com.fsck.k9.Preferences;		import com.fsck.k9.Preferences;
	import com.fsck.k9.account.AccountCreatorHelper;		import com.fsck.k9.account.AccountCreatorHelper;
	import com.fsck.k9.account.BackgroundAccountRemover;		import com.fsck.k9.account.BackgroundAccountRemover;
	@@ -140,6 +141,9 @@ public class EeloAccountCreator {
	}		}

	private static void updatePasswordIfChanged(Account account, String password) {		private static void updatePasswordIfChanged(Account account, String password) {
			// Don't update password if its not a murena account
			if (!OsAccountManagerUtil.INSTANCE.isMurenaEmailAccount(account)) return;

	ServerSettings incoming = account.getIncomingServerSettings();		ServerSettings incoming = account.getIncomingServerSettings();
	ServerSettings outgoing = account.getOutgoingServerSettings();		ServerSettings outgoing = account.getOutgoingServerSettings();

	@@ -170,6 +174,11 @@ public class EeloAccountCreator {
	accountManager.getAccountsByType(AccountManagerConstants.EELO_ACCOUNT_TYPE);		accountManager.getAccountsByType(AccountManagerConstants.EELO_ACCOUNT_TYPE);
	for (android.accounts.Account eeloAccount : eeloAccounts) {		for (android.accounts.Account eeloAccount : eeloAccounts) {
	final String emailId = getEmailId(accountManager, eeloAccount);		final String emailId = getEmailId(accountManager, eeloAccount);
			String hostUrl = accountManager.getUserData(eeloAccount, AccountManagerConstants.KEY_OC_BASE_URL);
			// We are trying to add account that are not murena.
			if (hostUrl == null \|\| !OsAccountManagerUtil.INSTANCE.isMurenaWebHostUrl(hostUrl)) {
			continue;
			}

	if (isInvalidEmail(emailId)) {		if (isInvalidEmail(emailId)) {
	continue;		continue;

core/android/common/src/main/kotlin/app/k9mail/core/android/common/accountmanager/AccountManagerConstants.kt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -25,6 +25,7 @@ object AccountManagerConstants {
	const val AUTH_TOKEN_TYPE = "oauth2-access-token"		const val AUTH_TOKEN_TYPE = "oauth2-access-token"
	const val KEY_AUTH_STATE = "auth_state"		const val KEY_AUTH_STATE = "auth_state"
	const val USERNAME_HINT = "userNameHint"		const val USERNAME_HINT = "userNameHint"
			const val KEY_OC_BASE_URL = "oc_base_url"

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