Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit ad16ddb4 authored by Michael Enoma's avatar Michael Enoma 👽
Browse files

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
Loading
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment