Commit ad16ddb4 authored Nov 28, 2021 by Michael Enoma

Merge branch 'upstream/master' into import_update_5.9051

# Conflicts:
#	app/core/src/main/java/com/fsck/k9/K9.kt
#	app/core/src/main/java/com/fsck/k9/controller/MessageCountsProvider.kt
#	app/core/src/main/java/com/fsck/k9/controller/MessagingController.java
#	app/core/src/main/java/com/fsck/k9/controller/NotificationState.kt
#	app/core/src/main/java/com/fsck/k9/controller/push/AccountPushController.kt
#	app/core/src/main/java/com/fsck/k9/controller/push/AccountPushControllerFactory.kt
#	app/core/src/main/java/com/fsck/k9/mailstore/LocalFolder.java
#	app/core/src/main/java/com/fsck/k9/mailstore/LocalMessage.java
#	app/core/src/main/java/com/fsck/k9/mailstore/LocalStore.java
#	app/core/src/main/java/com/fsck/k9/mailstore/LockableDatabase.java
#	app/core/src/main/java/com/fsck/k9/mailstore/MessageStore.kt
#	app/core/src/main/java/com/fsck/k9/mailstore/StorageManager.java
#	app/core/src/main/java/com/fsck/k9/message/IdentityHeaderBuilder.java
#	app/core/src/main/java/com/fsck/k9/notification/NotificationActionCreator.kt
#	app/core/src/main/java/com/fsck/k9/notification/NotificationActionService.kt
#	app/core/src/main/java/com/fsck/k9/notification/NotificationContent.kt
#	app/core/src/main/java/com/fsck/k9/notification/NotificationContentCreator.kt
#	app/core/src/main/java/com/fsck/k9/notification/NotificationController.kt
#	app/core/src/main/java/com/fsck/k9/notification/NotificationData.kt
#	app/core/src/main/java/com/fsck/k9/notification/NotificationGroupKeys.kt
#	app/core/src/main/java/com/fsck/k9/notification/NotificationHelper.kt
#	app/core/src/main/java/com/fsck/k9/notification/NotificationHolder.kt
#	app/core/src/main/java/com/fsck/k9/notification/NotificationIds.kt
#	app/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsDescriptions.java
#	app/core/src/main/java/com/fsck/k9/preferences/SettingsImporter.java
#	app/core/src/main/java/com/fsck/k9/service/DatabaseUpgradeService.java
#	app/core/src/test/java/com/fsck/k9/controller/MessagingControllerTest.java
#	app/core/src/test/java/com/fsck/k9/message/IdentityHeaderBuilderTest.kt
#	app/core/src/test/java/com/fsck/k9/notification/AddNotificationResultTest.kt
#	app/core/src/test/java/com/fsck/k9/notification/NotificationContentCreatorTest.kt
#	app/core/src/test/java/com/fsck/k9/notification/NotificationDataTest.kt
#	app/core/src/test/java/com/fsck/k9/notification/RemoveNotificationResultTest.kt
#	app/core/src/test/java/com/fsck/k9/preferences/SettingsExporterTest.kt
#	app/k9mail-jmap/src/main/AndroidManifest.xml
#	app/k9mail-jmap/src/main/java/com/fsck/k9/notification/K9NotificationActionCreator.kt
#	app/k9mail/build.gradle
#	app/k9mail/src/main/AndroidManifest.xml
#	app/k9mail/src/main/java/com/fsck/k9/backends/WebDavBackendFactory.kt
#	app/k9mail/src/main/java/com/fsck/k9/notification/K9NotificationActionCreator.kt
#	app/k9mail/src/main/java/com/fsck/k9/widget/unread/KoinModule.kt
#	app/k9mail/src/test/java/com/fsck/k9/widget/unread/UnreadWidgetDataProviderTest.kt
#	app/storage/src/main/java/com/fsck/k9/storage/messages/DatabaseOperations.kt
#	app/storage/src/main/java/com/fsck/k9/storage/messages/K9MessageStore.kt
#	app/storage/src/main/java/com/fsck/k9/storage/messages/RetrieveFolderOperations.kt
#	app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo80.kt
#	app/storage/src/test/java/com/fsck/k9/storage/messages/RetrieveFolderOperationsTest.kt
#	app/testing/src/main/java/com/fsck/k9/testing/MockHelper.kt
#	app/ui/base/build.gradle
#	app/ui/legacy/src/main/AndroidManifest.xml
#	app/ui/legacy/src/main/java/com/fsck/k9/account/AccountCreator.kt
#	app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageCompose.java
#	app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt
#	app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientMvpView.kt
#	app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientPresenter.kt
#	app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/ReplyToPresenter.kt
#	app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/ReplyToView.kt
#	app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupOutgoing.java
#	app/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt
#	app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountImageLoader.kt
#	app/ui/legacy/src/main/java/com/fsck/k9/ui/account/DisplayAccount.kt
#	app/ui/legacy/src/main/java/com/fsck/k9/ui/choosefolder/ChooseFolderViewModel.kt
#	app/ui/legacy/src/main/java/com/fsck/k9/ui/folders/FoldersViewModel.kt
#	app/ui/legacy/src/main/java/com/fsck/k9/ui/folders/KoinModule.kt
#	app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderSettingsDataStore.kt
#	app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/AttachmentView.java
#	app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsFragment.kt
#	app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsViewModel.kt
#	app/ui/legacy/src/main/java/com/fsck/k9/view/MessageCryptoDisplayStatus.kt
#	app/ui/legacy/src/main/java/com/fsck/k9/view/MessageHeader.java
#	app/ui/legacy/src/main/res/drawable/ic_download.xml
#	app/ui/legacy/src/main/res/drawable/ic_folder_manage.xml
#	app/ui/legacy/src/main/res/drawable/ic_mark_new.xml
#	app/ui/legacy/src/main/res/drawable/ic_refresh_all.xml
#	app/ui/legacy/src/main/res/drawable/ic_star.xml
#	app/ui/legacy/src/main/res/layout/account_setup_incoming.xml
#	app/ui/legacy/src/main/res/layout/accounts_item.xml
#	app/ui/legacy/src/main/res/layout/activity_onboarding.xml
#	app/ui/legacy/src/main/res/layout/drawer_contents.xml
#	app/ui/legacy/src/main/res/layout/fragment_welcome_message.xml
#	app/ui/legacy/src/main/res/layout/message.xml
#	app/ui/legacy/src/main/res/layout/message_compose_recipients.xml
#	app/ui/legacy/src/main/res/layout/message_list.xml
#	app/ui/legacy/src/main/res/layout/message_list_item.xml
#	app/ui/legacy/src/main/res/layout/message_view_attachment.xml
#	app/ui/legacy/src/main/res/layout/message_view_header.xml
#	app/ui/legacy/src/main/res/layout/split_message_list.xml
#	app/ui/legacy/src/main/res/raw/changelog_master.xml
#	app/ui/legacy/src/main/res/values-ar/strings.xml
#	app/ui/legacy/src/main/res/values-bg/strings.xml
#	app/ui/legacy/src/main/res/values-ca/strings.xml
#	app/ui/legacy/src/main/res/values-cs/strings.xml
#	app/ui/legacy/src/main/res/values-de/strings.xml
#	app/ui/legacy/src/main/res/values-es/strings.xml
#	app/ui/legacy/src/main/res/values-gd/strings.xml
#	app/ui/legacy/src/main/res/values-gl-rES/strings.xml
#	app/ui/legacy/src/main/res/values-hu/strings.xml
#	app/ui/legacy/src/main/res/values-nl/strings.xml
#	app/ui/legacy/src/main/res/values-ru/strings.xml
#	app/ui/legacy/src/main/res/values-sv/strings.xml
#	app/ui/legacy/src/main/res/values-uk/strings.xml
#	app/ui/legacy/src/main/res/values-w360dp/styles.xml
#	app/ui/legacy/src/main/res/values-zh-rTW/strings.xml
#	app/ui/legacy/src/main/res/values/arrays_general_settings_strings.xml
#	app/ui/legacy/src/main/res/values/strings.xml
#	app/ui/legacy/src/main/res/values/styles.xml
#	app/ui/legacy/src/main/res/xml/account_settings.xml
#	app/ui/legacy/src/test/java/com/fsck/k9/activity/compose/RecipientPresenterTest.kt
#	app/ui/legacy/src/test/java/com/fsck/k9/activity/compose/ReplyToPresenterTest.kt
#	backend/imap/src/main/java/com/fsck/k9/backend/imap/ImapPusherCallback.kt
#	build.gradle
#	mail/common/src/main/java/com/fsck/k9/mail/ServerSettings.kt
#	mail/common/src/main/java/com/fsck/k9/mail/internet/FormatFlowedHelper.kt
#	mail/common/src/main/java/com/fsck/k9/mail/internet/MessageExtractor.java
#	mail/common/src/main/java/com/fsck/k9/mail/internet/MimeExtensions.kt
#	mail/common/src/main/java/com/fsck/k9/mail/internet/Viewable.java
#	mail/common/src/test/java/com/fsck/k9/mail/internet/FormatFlowedHelperTest.kt

parents ddbf6afc e18e6179

app/autodiscovery/providersxml/src/main/res/xml/providers.xml

+10 −0

Original line number	Diff line number	Diff line
		@@ -294,6 +294,16 @@
		<outgoing uri="smtp+ssl+://mail.mailo.com" username="$email" />
		</provider>

		<!-- France -->
		<provider id="mailo.com" label="mailo.com" domain="mailo.com">
		<incoming uri="imap+ssl+://mail.mailo.com" username="$email" />
		<outgoing uri="smtp+ssl+://mail.mailo.com" username="$email" />
		</provider>
		<provider id="net-c.fr" label="net-c.fr" domain="net-c.fr">
		<incoming uri="imap+ssl+://mail.mailo.com" username="$email" />
		<outgoing uri="smtp+ssl+://mail.mailo.com" username="$email" />
		</provider>

		<!-- Germany -->
		<provider id="mailbox.org" label="mailbox.org" domain="mailbox.org">
		<incoming uri="imap+tls+://imap.mailbox.org" username="$email" />

app/core/src/main/AndroidManifest.xml

+13 −3

Original line number	Diff line number	Diff line
		@@ -7,11 +7,21 @@
		<uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />

		<application>

		<provider
		android:name="androidx.work.impl.WorkManagerInitializer"
		android:authorities="${applicationId}.workmanager-init"
		android:name="androidx.startup.InitializationProvider"
		android:authorities="${applicationId}.androidx-startup"
		android:exported="false"
		tools:node="merge">

		<!-- We initialize WorkManager manually -->
		<meta-data
		android:name="androidx.work.WorkManagerInitializer"
		android:value="androidx.startup"
		tools:node="remove" />

		</provider>

		</application>

		</manifest>

app/core/src/main/java/com/fsck/k9/Account.java

+24 −29

Original line number	Diff line number	Diff line
		@@ -40,12 +40,9 @@ public class Account implements BaseAccount {

		public ExpungePolicy toBackendExpungePolicy() {
		switch (this) {
		case EXPUNGE_IMMEDIATELY:
		return ExpungePolicy.IMMEDIATELY;
		case EXPUNGE_MANUALLY:
		return ExpungePolicy.MANUALLY;
		case EXPUNGE_ON_POLL:
		return ExpungePolicy.ON_POLL;
		case EXPUNGE_IMMEDIATELY: return ExpungePolicy.IMMEDIATELY;
		case EXPUNGE_MANUALLY: return ExpungePolicy.MANUALLY;
		case EXPUNGE_ON_POLL: return ExpungePolicy.ON_POLL;
		}

		throw new AssertionError("Unhandled case: " + this.name());
		@@ -109,7 +106,8 @@ public class Account implements BaseAccount {
		private ServerSettings outgoingServerSettings;

		/**
		* Storage provider ID, used to locate and manage the underlying DB/file storage
		* Storage provider ID, used to locate and manage the underlying DB/file
		* storage
		*/
		private String localStorageProviderId;
		private String description;
		@@ -190,7 +188,7 @@ public class Account implements BaseAccount {

		/**
		* Database ID of the folder that was last selected for a copy or move operation.
		* <p>
		*
		* Note: For now this value isn't persisted. So it will be reset when K-9 Mail is restarted.
		*/
		private Long lastSelectedFolderId = null;
		@@ -824,8 +822,7 @@ public class Account implements BaseAccount {
		now.set(Calendar.MILLISECOND, 0);
		if (age < 28) {
		now.add(Calendar.DATE, age * -1);
		} else {
		switch (age) {
		} else switch (age) {
		case 28:
		now.add(Calendar.MONTH, -1);
		break;
		@@ -842,7 +839,6 @@ public class Account implements BaseAccount {
		now.add(Calendar.YEAR, -1);
		break;
		}
		}

		return now.getTime();
		}
		@@ -1058,7 +1054,6 @@ public class Account implements BaseAccount {
		public synchronized void setAlwaysShowCcBcc(boolean show) {
		alwaysShowCcBcc = show;
		}

		public boolean isRemoteSearchFullText() {
		return false; // Temporarily disabled
		//return remoteSearchFullText;

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -51,6 +51,7 @@ class AccountPreferenceSerializer(
		folderNotifyNewMailMode = getEnumStringPref<FolderMode>(storage, "$accountUuid.folderNotifyNewMailMode", FolderMode.ALL)
		isNotifySelfNewMail = storage.getBoolean("$accountUuid.notifySelfNewMail", true)
		isNotifyContactsMailOnly = storage.getBoolean("$accountUuid.notifyContactsMailOnly", false)
		isIgnoreChatMessages = storage.getBoolean("$accountUuid.ignoreChatMessages", false)
		isNotifySync = storage.getBoolean("$accountUuid.notifyMailCheck", false)
		isIgnoreChatMessages = storage.getBoolean("$accountUuid.ignoreChatMessages", false)
		deletePolicy = DeletePolicy.fromInt(storage.getInt("$accountUuid.deletePolicy", DeletePolicy.NEVER.setting))

app/core/src/main/java/com/fsck/k9/Clock.java

deleted100644 → 0

+0 −32

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2010 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.fsck.k9;

		/**
		* A class provide the current time (like {@link System#currentTimeMillis()}).
		* It's intended to be mocked out for unit tests.
		*/
		public class Clock {
		public static final Clock INSTANCE = new Clock();

		protected Clock() {
		}

		public long getTime() {
		return System.currentTimeMillis();
		}
		}