Merge branch '5.8-MAINT' into main (beaefd84) · Commits · e / os / Mail

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -392,7 +392,7 @@ public class MessagingController {
		public void refreshFolderListSynchronous(Account account) {
		try {
		ServerSettings serverSettings = account.getIncomingServerSettings();
		if (serverSettings.password == null) {
		if (serverSettings.isMissingCredentials()) {
		handleAuthenticationFailure(account, true);
		return;
		}
		@@ -651,7 +651,7 @@ public class MessagingController {

		private void syncFolder(Account account, long folderId, MessagingListener listener, Backend backend) {
		ServerSettings serverSettings = account.getIncomingServerSettings();
		if (serverSettings.password == null) {
		if (serverSettings.isMissingCredentials()) {
		handleAuthenticationFailure(account, true);
		return;
		}
		@@ -1512,7 +1512,7 @@ public class MessagingController {
		boolean wasPermanentFailure = false;
		try {
		ServerSettings serverSettings = account.getOutgoingServerSettings();
		if (serverSettings.password == null) {
		if (serverSettings.isMissingCredentials()) {
		handleAuthenticationFailure(account, false);
		return;
		}

+1 −1

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

		if (account.incomingServerSettings.password == null) {
		if (account.incomingServerSettings.isMissingCredentials) {
		Timber.d("Password for this account is missing. Skipping mail sync.")
		return Result.success()
		}

0 → 100644

+10 −0

Original line number	Diff line number	Diff line
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="24dp"
		android:height="24dp"
		android:tint="?attr/colorControlNormal"
		android:viewportWidth="24"
		android:viewportHeight="24">
		<path
		android:fillColor="@android:color/white"
		android:pathData="M5,20h14v-2H5V20zM19,9h-4V3H9v6H5l7,7L19,9z" />
		</vector>

+1 −1

Original line number	Diff line number	Diff line
		@@ -90,7 +90,7 @@
		android:layout_marginBottom="8dp"
		android:background="?attr/selectableItemBackgroundBorderless"
		android:contentDescription="@string/remove_attachment_action"
		app:srcCompat="?attr/iconActionSave"
		app:srcCompat="?attr/iconActionSaveAttachment"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintTop_toBottomOf="@+id/attachment_preview" />

+4 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,10 @@
		Locale-specific versions are kept in res/raw-<locale qualifier>/changelog.xml.
		-->
		<changelog>
		<release version="5.805" versioncode="28005" date="2021-08-21">
		<change>Fixed the check for missing incoming/outgoing server credentials (introduced in K-9 Mail 5.804)</change>
		<change>Changed the 'save attachment' icon (apparently floppy disks are no longer a thing)</change>
		</release>
		<release version="5.804" versioncode="28004" date="2021-08-18">
		<change>Fixed a bug where Push didn't work with some servers</change>
		<change>Don't connect to the incoming or outgoing server when passwords haven't been provided after import</change>