From 9541a79cfe8c94f4616d3f4396b739ebd7334d9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolf-Martell=20Montw=C3=A9?= Date: Tue, 2 Jul 2024 11:15:45 +0200 Subject: [PATCH 1/3] Rename app module to legacy --- app-common/build.gradle.kts | 2 +- app-k9mail/build.gradle.kts | 4 ++-- app-thunderbird/build.gradle.kts | 4 ++-- ....xml => detekt-baseline-legacy-common.xml} | 0 ...re.xml => detekt-baseline-legacy-core.xml} | 0 ...xml => detekt-baseline-legacy-storage.xml} | 0 ...xml => detekt-baseline-legacy-ui-base.xml} | 0 ...l => detekt-baseline-legacy-ui-legacy.xml} | 0 ...aseline-legacy-ui-message-list-widget.xml} | 0 feature/launcher/build.gradle.kts | 2 +- feature/settings/import/build.gradle.kts | 4 ++-- feature/widget/message-list/build.gradle.kts | 4 ++-- feature/widget/shortcut/build.gradle.kts | 4 ++-- feature/widget/unread/build.gradle.kts | 4 ++-- {app => legacy}/common/build.gradle.kts | 8 +++---- .../common/src/main/AndroidManifest.xml | 0 .../src/main/java/com/fsck/k9/CommonApp.kt | 0 .../main/java/com/fsck/k9/CommonKoinModule.kt | 0 .../com/fsck/k9/MessagingListenerProvider.kt | 0 .../com/fsck/k9/account/AccountActivator.kt | 0 .../com/fsck/k9/account/AccountColorPicker.kt | 0 .../com/fsck/k9/account/AccountCreator.kt | 0 .../java/com/fsck/k9/account/AccountModule.kt | 0 .../k9/account/AccountOwnerNameProvider.kt | 0 .../account/AccountServerSettingsUpdater.kt | 0 .../com/fsck/k9/account/AccountStateLoader.kt | 0 .../com/fsck/k9/account/DeletePolicyHelper.kt | 0 .../k9/backends/AccountAuthStateStorage.kt | 0 .../fsck/k9/backends/AndroidAlarmManager.kt | 0 .../fsck/k9/backends/ImapBackendFactory.kt | 0 .../backends/ImapServerSettingsExtensions.kt | 0 .../java/com/fsck/k9/backends/KoinModule.kt | 0 .../fsck/k9/backends/Pop3BackendFactory.kt | 0 .../k9/backends/RealOAuth2TokenProvider.kt | 0 .../RealOAuth2TokenProviderFactory.kt | 0 .../feature/AccountSetupFinishedLauncher.kt | 0 .../java/com/fsck/k9/feature/FeatureModule.kt | 0 .../featureflag/InMemoryFeatureFlagFactory.kt | 0 .../com/fsck/k9/glide/K9AppGlideModule.java | 0 .../K9NotificationActionCreator.kt | 0 .../K9NotificationResourceProvider.kt | 0 .../k9/notification/K9NotificationStrategy.kt | 0 .../com/fsck/k9/notification/KoinModule.kt | 0 .../k9/resources/K9AutocryptStringProvider.kt | 0 .../k9/resources/K9CoreResourceProvider.kt | 0 .../java/com/fsck/k9/resources/KoinModule.kt | 0 .../src/main/res/values/manifest_values.xml | 0 .../AccountServerSettingsUpdaterTest.kt | 0 .../fsck/k9/account/AccountStateLoaderTest.kt | 0 .../fsck/k9/account/DeletePolicyHelperTest.kt | 0 .../com/fsck/k9/account/FakeAccountManager.kt | 0 {app => legacy}/core/build.gradle.kts | 4 ++-- .../core/src/main/AndroidManifest.xml | 0 .../core/src/main/java/com/fsck/k9/Account.kt | 0 .../fsck/k9/AccountPreferenceSerializer.kt | 0 .../com/fsck/k9/AccountRemovedListener.kt | 0 .../com/fsck/k9/AccountsChangeListener.java | 0 .../src/main/java/com/fsck/k9/AppConfig.kt | 0 .../src/main/java/com/fsck/k9/BaseAccount.kt | 0 .../core/src/main/java/com/fsck/k9/Core.kt | 0 .../main/java/com/fsck/k9/CoreKoinModules.kt | 0 .../java/com/fsck/k9/CoreResourceProvider.kt | 0 .../core/src/main/java/com/fsck/k9/DI.kt | 0 .../java/com/fsck/k9/EmailAddressValidator.kt | 0 .../src/main/java/com/fsck/k9/FontSizes.kt | 0 .../src/main/java/com/fsck/k9/Identity.kt | 0 .../core/src/main/java/com/fsck/k9/K9.kt | 0 .../src/main/java/com/fsck/k9/KoinModule.kt | 0 .../java/com/fsck/k9/LocalKeyStoreManager.kt | 0 .../java/com/fsck/k9/NotificationLight.kt | 0 .../java/com/fsck/k9/NotificationSettings.kt | 0 .../java/com/fsck/k9/NotificationVibration.kt | 0 .../src/main/java/com/fsck/k9/Preferences.kt | 0 .../java/com/fsck/k9/QuietTimeChecker.java | 0 .../com/fsck/k9/ServerSettingsSerializer.kt | 0 .../src/main/java/com/fsck/k9/StrictMode.kt | 0 .../src/main/java/com/fsck/k9/SwipeAction.kt | 0 .../src/main/java/com/fsck/k9/TimberLogger.kt | 0 .../src/main/java/com/fsck/k9/UiDensity.kt | 0 .../k9/autocrypt/AutocryptDraftStateHeader.kt | 0 .../AutocryptDraftStateHeaderParser.kt | 0 .../k9/autocrypt/AutocryptGossipHeader.java | 0 .../AutocryptGossipHeaderParser.java | 0 .../fsck/k9/autocrypt/AutocryptHeader.java | 0 .../k9/autocrypt/AutocryptHeaderParser.java | 0 .../AutocryptOpenPgpApiInteractor.java | 0 .../k9/autocrypt/AutocryptOperations.java | 0 .../k9/autocrypt/AutocryptStringProvider.kt | 0 .../AutocryptTransferMessageCreator.kt | 0 .../java/com/fsck/k9/autocrypt/KoinModule.kt | 0 .../com/fsck/k9/backend/BackendFactory.kt | 0 .../com/fsck/k9/backend/BackendManager.kt | 0 .../fsck/k9/contact/ContactIntentHelper.kt | 0 .../fsck/k9/controller/ControllerExtension.kt | 0 .../com/fsck/k9/controller/DraftOperations.kt | 0 .../java/com/fsck/k9/controller/KoinModule.kt | 0 .../controller/LocalDeleteOperationDecider.kt | 0 .../MemorizingMessagingListener.java | 0 .../k9/controller/MessageCountsProvider.kt | 0 .../fsck/k9/controller/MessageReference.kt | 0 .../k9/controller/MessageReferenceHelper.java | 0 .../k9/controller/MessagingController.java | 0 .../MessagingControllerCommands.java | 0 .../fsck/k9/controller/MessagingListener.java | 0 .../k9/controller/NotificationOperations.kt | 0 .../fsck/k9/controller/NotificationState.kt | 0 .../controller/PendingCommandSerializer.java | 0 .../com/fsck/k9/controller/Preconditions.kt | 0 .../k9/controller/ProgressBodyFactory.java | 0 .../controller/SimpleMessagingListener.java | 0 .../k9/controller/UidReverseComparator.java | 0 .../controller/push/AccountPushController.kt | 0 .../push/AccountPushControllerFactory.kt | 0 .../controller/push/AlarmPermissionManager.kt | 0 .../push/AlarmPermissionManagerApi21.kt | 0 .../push/AlarmPermissionManagerApi31.kt | 0 .../k9/controller/push/AutoSyncManager.kt | 0 .../controller/push/BootCompleteReceiver.kt | 0 .../com/fsck/k9/controller/push/KoinModule.kt | 0 .../fsck/k9/controller/push/PushController.kt | 0 .../fsck/k9/controller/push/PushService.kt | 0 .../k9/controller/push/PushServiceManager.kt | 0 .../com/fsck/k9/crypto/EncryptionExtractor.kt | 0 .../java/com/fsck/k9/crypto/KoinModule.kt | 0 .../MessageCryptoStructureDetector.java | 0 .../com/fsck/k9/crypto/OpenPgpApiHelper.java | 0 .../AndroidKeyStoreDirectoryProvider.kt | 0 .../com/fsck/k9/helper/ClipboardManager.kt | 0 .../fsck/k9/helper/CollectionExtensions.kt | 0 .../com/fsck/k9/helper/ContactNameProvider.kt | 0 .../main/java/com/fsck/k9/helper/Contacts.kt | 0 .../java/com/fsck/k9/helper/CrLfConverter.kt | 0 .../helper/DefaultTrustedSocketFactory.java | 0 .../java/com/fsck/k9/helper/FileHelper.java | 0 .../java/com/fsck/k9/helper/IdentityHelper.kt | 0 .../fsck/k9/helper/KeyChainKeyManager.java | 0 .../java/com/fsck/k9/helper/KoinModule.kt | 0 .../java/com/fsck/k9/helper/ListHeaders.java | 0 .../fsck/k9/helper/ListUnsubscribeHelper.kt | 0 .../main/java/com/fsck/k9/helper/MailTo.java | 0 .../java/com/fsck/k9/helper/MessageHelper.kt | 0 .../java/com/fsck/k9/helper/MimeTypeUtil.java | 0 .../java/com/fsck/k9/helper/MutableBoolean.kt | 0 .../com/fsck/k9/helper/NamedThreadFactory.kt | 0 .../com/fsck/k9/helper/ParcelableUtil.java | 0 .../com/fsck/k9/helper/ReplyToParser.java | 0 .../com/fsck/k9/helper/RetainFragment.java | 0 .../com/fsck/k9/helper/SimpleTextWatcher.java | 0 .../com/fsck/k9/helper/SingleLiveEvent.java | 0 .../java/com/fsck/k9/helper/StringHelper.kt | 0 .../main/java/com/fsck/k9/helper/Timing.kt | 0 .../java/com/fsck/k9/helper/UnsubscribeUri.kt | 0 .../com/fsck/k9/helper/UrlEncodingHelper.java | 0 .../main/java/com/fsck/k9/helper/Utility.java | 0 .../helper/jsoup/AdvancedNodeTraversor.java | 0 .../com/fsck/k9/helper/jsoup/NodeFilter.java | 0 .../main/java/com/fsck/k9/job/K9JobManager.kt | 0 .../java/com/fsck/k9/job/K9WorkerFactory.kt | 0 .../main/java/com/fsck/k9/job/KoinModule.kt | 0 .../java/com/fsck/k9/job/MailSyncWorker.kt | 0 .../com/fsck/k9/job/MailSyncWorkerManager.kt | 0 .../job/WorkManagerConfigurationProvider.kt | 0 .../java/com/fsck/k9/logging/KoinModule.kt | 0 .../java/com/fsck/k9/logging/LogFileWriter.kt | 0 .../com/fsck/k9/logging/ProcessExecutor.kt | 0 .../com/fsck/k9/mail/MailServerDirection.kt | 0 .../fsck/k9/mailstore/AttachmentResolver.java | 0 .../fsck/k9/mailstore/AttachmentViewInfo.java | 0 ...pandFolderBackendFoldersRefreshListener.kt | 0 .../BackendFoldersRefreshListener.kt | 0 .../k9/mailstore/BinaryAttachmentBody.java | 0 .../k9/mailstore/CacheAwareMessageMapper.kt | 0 .../com/fsck/k9/mailstore/CreateFolderInfo.kt | 0 .../k9/mailstore/CryptoResultAnnotation.java | 0 .../k9/mailstore/DatabasePreviewType.java | 0 .../fsck/k9/mailstore/DeferredFileBody.java | 0 .../com/fsck/k9/mailstore/FileBackedBody.java | 0 .../com/fsck/k9/mailstore/FolderMapper.kt | 0 .../k9/mailstore/FolderNotFoundException.kt | 0 .../com/fsck/k9/mailstore/FolderRepository.kt | 0 .../com/fsck/k9/mailstore/FolderSettings.kt | 0 .../k9/mailstore/FolderSettingsProvider.kt | 0 .../fsck/k9/mailstore/FolderTypeConverter.kt | 0 .../com/fsck/k9/mailstore/K9BackendFolder.kt | 0 .../com/fsck/k9/mailstore/K9BackendStorage.kt | 0 .../k9/mailstore/K9BackendStorageFactory.kt | 0 .../java/com/fsck/k9/mailstore/KoinModule.kt | 0 .../k9/mailstore/ListenableMessageStore.kt | 0 .../com/fsck/k9/mailstore/LocalBodyPart.java | 0 .../com/fsck/k9/mailstore/LocalFolder.java | 0 .../com/fsck/k9/mailstore/LocalMessage.java | 0 .../fsck/k9/mailstore/LocalMimeMessage.java | 0 .../java/com/fsck/k9/mailstore/LocalPart.java | 0 .../com/fsck/k9/mailstore/LocalStore.java | 0 .../fsck/k9/mailstore/LocalStoreProvider.kt | 0 .../fsck/k9/mailstore/LockableDatabase.java | 0 .../com/fsck/k9/mailstore/MessageColumns.kt | 0 .../mailstore/MessageCryptoAnnotations.java | 0 .../com/fsck/k9/mailstore/MessageDetails.kt | 0 .../com/fsck/k9/mailstore/MessageHelper.java | 0 .../com/fsck/k9/mailstore/MessageListCache.kt | 0 .../k9/mailstore/MessageListRepository.kt | 0 .../com/fsck/k9/mailstore/MessageMapper.kt | 0 .../k9/mailstore/MessageNotFoundException.kt | 0 .../fsck/k9/mailstore/MessageRepository.kt | 0 .../com/fsck/k9/mailstore/MessageStore.kt | 0 .../fsck/k9/mailstore/MessageStoreFactory.kt | 0 .../fsck/k9/mailstore/MessageStoreManager.kt | 0 .../fsck/k9/mailstore/MessageViewInfo.java | 0 .../mailstore/MessageViewInfoExtractor.java | 0 .../MessageViewInfoExtractorFactory.kt | 0 .../fsck/k9/mailstore/MigrationsHelper.java | 0 .../k9/mailstore/MimePartStreamParser.java | 0 .../com/fsck/k9/mailstore/MoreMessages.java | 0 .../fsck/k9/mailstore/NotificationMessage.kt | 0 .../fsck/k9/mailstore/NotifierMessageStore.kt | 0 .../java/com/fsck/k9/mailstore/OutboxState.kt | 0 .../k9/mailstore/OutboxStateRepository.kt | 0 .../com/fsck/k9/mailstore/SaveMessageData.kt | 0 .../k9/mailstore/SaveMessageDataCreator.kt | 0 .../k9/mailstore/SchemaDefinitionFactory.kt | 0 .../java/com/fsck/k9/mailstore/SendState.kt | 0 ...cialFolderBackendFoldersRefreshListener.kt | 0 .../SpecialFolderSelectionStrategy.kt | 0 .../fsck/k9/mailstore/SpecialFolderUpdater.kt | 0 .../mailstore/SpecialLocalFoldersCreator.kt | 0 .../com/fsck/k9/mailstore/StorageManager.java | 0 .../com/fsck/k9/mailstore/TempFileBody.java | 0 .../util/DeferredFileOutputStream.java | 0 .../fsck/k9/mailstore/util/FileFactory.java | 0 .../java/com/fsck/k9/message/Attachment.kt | 0 .../k9/message/AutocryptStatusInteractor.java | 0 .../ComposePgpEnableByDefaultDecider.java | 0 .../k9/message/ComposePgpInlineDecider.java | 0 .../java/com/fsck/k9/message/CryptoStatus.kt | 0 .../com/fsck/k9/message/IdentityField.java | 0 .../k9/message/IdentityHeaderBuilder.java | 0 .../fsck/k9/message/IdentityHeaderParser.java | 0 .../com/fsck/k9/message/MessageBuilder.java | 0 .../fsck/k9/message/PgpMessageBuilder.java | 0 .../com/fsck/k9/message/QuotedTextMode.java | 0 .../fsck/k9/message/ReplyActionStrategy.kt | 0 .../fsck/k9/message/SimpleMessageBuilder.java | 0 .../fsck/k9/message/SimpleMessageFormat.java | 0 .../com/fsck/k9/message/TextBodyBuilder.java | 0 .../message/extractors/AttachmentCounter.java | 0 .../extractors/AttachmentInfoExtractor.java | 0 .../extractors/BasicPartInfoExtractor.kt | 0 .../message/extractors/BodyTextExtractor.java | 0 .../fsck/k9/message/extractors/KoinModule.kt | 0 .../extractors/MessageFulltextCreator.java | 0 .../extractors/MessagePreviewCreator.java | 0 .../PreviewExtractionException.java | 0 .../k9/message/extractors/PreviewResult.java | 0 .../extractors/PreviewTextExtractor.kt | 0 .../k9/message/extractors/TextPartFinder.kt | 0 .../com/fsck/k9/message/html/DisplayHtml.kt | 0 .../k9/message/html/DisplayHtmlFactory.kt | 0 .../fsck/k9/message/html/DividerReplacer.kt | 0 .../com/fsck/k9/message/html/EmailSection.kt | 0 .../k9/message/html/EmailSectionExtractor.kt | 0 .../fsck/k9/message/html/EmailTextToHtml.kt | 0 .../fsck/k9/message/html/GenericUriParser.kt | 0 .../com/fsck/k9/message/html/HtmlConverter.kt | 0 .../fsck/k9/message/html/HtmlModification.kt | 0 .../k9/message/html/HtmlProcessorFactory.kt | 0 .../com/fsck/k9/message/html/HtmlSettings.kt | 0 .../fsck/k9/message/html/HtmlToPlainText.kt | 0 .../com/fsck/k9/message/html/HttpUriParser.kt | 0 .../com/fsck/k9/message/html/KoinModule.kt | 0 .../fsck/k9/message/html/SignatureWrapper.kt | 0 .../com/fsck/k9/message/html/TextToHtml.kt | 0 .../com/fsck/k9/message/html/UriLinkifier.kt | 0 .../java/com/fsck/k9/message/html/UriMatch.kt | 0 .../com/fsck/k9/message/html/UriMatcher.kt | 0 .../com/fsck/k9/message/html/UriParser.kt | 0 .../k9/message/quote/HtmlQuoteCreator.java | 0 .../message/quote/InsertableHtmlContent.java | 0 .../com/fsck/k9/message/quote/KoinModule.kt | 0 .../k9/message/quote/QuoteDateFormatter.kt | 0 .../fsck/k9/message/quote/TextQuoteCreator.kt | 0 .../message/signature/HtmlSignatureRemover.kt | 0 .../signature/TextSignatureRemover.java | 0 .../fsck/k9/network/ConnectivityManager.kt | 0 .../k9/network/ConnectivityManagerApi21.kt | 0 .../k9/network/ConnectivityManagerApi23.kt | 0 .../k9/network/ConnectivityManagerApi24.kt | 0 .../k9/network/ConnectivityManagerBase.kt | 0 .../java/com/fsck/k9/network/KointModule.kt | 0 .../k9/notification/AddNotificationResult.kt | 0 ...thenticationErrorNotificationController.kt | 0 .../BackgroundWorkNotificationController.kt | 0 .../BaseNotificationDataCreator.kt | 0 .../CertificateErrorNotificationController.kt | 0 .../fsck/k9/notification/CoreKoinModule.kt | 0 .../LockScreenNotificationCreator.kt | 0 .../NewMailNotificationController.kt | 0 .../notification/NewMailNotificationData.kt | 0 .../NewMailNotificationManager.kt | 0 .../notification/NotificationActionCreator.kt | 0 .../notification/NotificationActionService.kt | 0 .../NotificationChannelManager.kt | 0 .../NotificationConfigurationConverter.kt | 0 .../k9/notification/NotificationContent.kt | 0 .../NotificationContentCreator.kt | 0 .../k9/notification/NotificationController.kt | 0 .../fsck/k9/notification/NotificationData.kt | 0 .../k9/notification/NotificationDataStore.kt | 0 .../k9/notification/NotificationGroupKeys.kt | 0 .../k9/notification/NotificationHelper.kt | 0 .../k9/notification/NotificationHolder.kt | 0 .../fsck/k9/notification/NotificationIds.kt | 0 .../notification/NotificationLightDecoder.kt | 0 .../k9/notification/NotificationRepository.kt | 0 .../NotificationResourceProvider.kt | 0 .../NotificationSettingsUpdater.kt | 0 .../fsck/k9/notification/NotificationStore.kt | 0 .../NotificationStoreOperation.kt | 0 .../notification/NotificationStoreProvider.kt | 0 .../k9/notification/NotificationStrategy.kt | 0 .../NotificationVibrationDecoder.kt | 0 .../notification/PushNotificationManager.kt | 0 ...ealBackgroundWorkNotificationController.kt | 0 .../notification/RemoveNotificationsResult.kt | 0 .../SendFailedNotificationController.kt | 0 .../SingleMessageNotificationCreator.kt | 0 .../SingleMessageNotificationDataCreator.kt | 0 .../SummaryNotificationCreator.kt | 0 .../SummaryNotificationDataCreator.kt | 0 .../SyncNotificationController.kt | 0 .../com/fsck/k9/power/AndroidPowerManager.kt | 0 .../main/java/com/fsck/k9/power/KoinModule.kt | 0 .../com/fsck/k9/preferences/AccountManager.kt | 0 .../AccountSettingsDescriptions.java | 0 .../k9/preferences/AccountSettingsUpgrader.kt | 0 .../preferences/AccountSettingsValidator.kt | 0 .../k9/preferences/AccountSettingsWriter.kt | 0 .../FolderSettingsDescriptions.java | 0 .../k9/preferences/FolderSettingsProvider.kt | 0 .../k9/preferences/FolderSettingsUpgrader.kt | 0 .../k9/preferences/FolderSettingsValidator.kt | 0 .../k9/preferences/FolderSettingsWriter.kt | 0 .../fsck/k9/preferences/GeneralSettings.kt | 0 .../GeneralSettingsDescriptions.java | 0 .../k9/preferences/GeneralSettingsManager.kt | 0 .../k9/preferences/GeneralSettingsUpgrader.kt | 0 .../preferences/GeneralSettingsValidator.kt | 0 .../k9/preferences/GeneralSettingsWriter.kt | 0 .../IdentitySettingsDescriptions.java | 0 .../preferences/IdentitySettingsUpgrader.kt | 0 .../preferences/IdentitySettingsValidator.kt | 0 .../k9/preferences/IdentitySettingsWriter.kt | 0 .../com/fsck/k9/preferences/ImportContents.kt | 0 .../com/fsck/k9/preferences/ImportResults.kt | 0 .../com/fsck/k9/preferences/KoinModule.kt | 0 .../preferences/NoDefaultStringEnumSetting.kt | 0 .../preferences/RealGeneralSettingsManager.kt | 0 .../preferences/ServerSettingsDescriptions.kt | 0 .../k9/preferences/ServerSettingsUpgrader.kt | 0 .../k9/preferences/ServerSettingsValidator.kt | 0 .../k9/preferences/ServerSettingsWriter.kt | 0 .../k9/preferences/ServerTypeConverter.kt | 0 .../com/fsck/k9/preferences/Settings.java | 0 .../fsck/k9/preferences/SettingsExporter.kt | 0 .../com/fsck/k9/preferences/SettingsFile.kt | 0 .../fsck/k9/preferences/SettingsFileParser.kt | 0 .../SettingsImportExportException.java | 0 .../fsck/k9/preferences/SettingsImporter.kt | 0 .../k9/preferences/SettingsParserException.kt | 0 .../java/com/fsck/k9/preferences/Storage.java | 0 .../com/fsck/k9/preferences/StorageEditor.kt | 0 .../fsck/k9/preferences/StoragePersister.kt | 0 .../fsck/k9/preferences/StringEnumSetting.kt | 0 .../fsck/k9/preferences/ValidatedSettings.kt | 0 .../upgrader/AccountSettingsUpgraderTo53.java | 0 .../upgrader/AccountSettingsUpgraderTo54.java | 0 .../upgrader/AccountSettingsUpgraderTo74.java | 0 .../upgrader/AccountSettingsUpgraderTo80.java | 0 .../upgrader/AccountSettingsUpgraderTo81.java | 0 .../upgrader/AccountSettingsUpgraderTo91.kt | 0 .../upgrader/GeneralSettingsUpgraderTo24.java | 0 .../upgrader/GeneralSettingsUpgraderTo31.java | 0 .../upgrader/GeneralSettingsUpgraderTo58.java | 0 .../upgrader/GeneralSettingsUpgraderTo69.java | 0 .../upgrader/GeneralSettingsUpgraderTo79.java | 0 .../upgrader/GeneralSettingsUpgraderTo89.kt | 0 .../upgrader/ServerSettingsUpgraderTo92.kt | 0 .../upgrader/ServerSettingsUpgraderTo94.kt | 0 .../upgrader/ServerSettingsUpgraderTo95.kt | 0 .../fsck/k9/provider/AttachmentProvider.java | 0 .../provider/AttachmentTempFileProvider.java | 0 .../k9/provider/DecryptedFileProvider.java | 0 .../fsck/k9/provider/RawMessageProvider.java | 0 .../fsck/k9/search/AccountSearchConditions.kt | 0 .../fsck/k9/search/ConditionsTreeNode.java | 0 .../java/com/fsck/k9/search/LocalSearch.java | 0 .../fsck/k9/search/LocalSearchExtensions.kt | 0 .../java/com/fsck/k9/search/SearchAccount.kt | 0 .../fsck/k9/search/SearchSpecification.java | 0 .../com/fsck/k9/search/SqlQueryBuilder.java | 0 .../k9/service/DatabaseUpgradeService.java | 0 .../values/arrays_account_settings_values.xml | 0 .../src/main/res/values/arrays_drawer.xml | 0 .../values/arrays_general_settings_values.xml | 0 .../src/main/res/values/k9_tonal_palette.xml | 0 .../src/main/res/values/material_colors.xml | 0 .../res/xml/decrypted_file_provider_paths.xml | 0 .../main/res/xml/temp_file_provider_paths.xml | 0 .../com/fsck/k9/EmailAddressValidatorTest.kt | 0 .../java/com/fsck/k9/K9RobolectricTest.kt | 0 .../java/com/fsck/k9/QuietTimeCheckerTest.kt | 0 .../fsck/k9/ServerSettingsSerializerTest.kt | 0 .../core/src/test/java/com/fsck/k9/TestApp.kt | 0 .../com/fsck/k9/TestCoreResourceProvider.kt | 0 .../AutocryptDraftStateHeaderParserTest.kt | 0 .../AutocryptGossipHeaderParserTest.kt | 0 .../autocrypt/AutocryptHeaderParserTest.java | 0 .../k9/autocrypt/AutocryptHeaderTest.java | 0 .../DefaultMessageCountsProviderTest.kt | 0 .../LocalDeleteOperationDeciderTest.kt | 0 .../k9/controller/MessageReferenceTest.kt | 0 .../controller/MessagingControllerTest.java | 0 .../PendingCommandSerializerTest.java | 0 .../controller/UidReverseComparatorTest.java | 0 .../MessageCryptoStructureDetectorTest.java | 0 .../fsck/k9/crypto/OpenPgpApiHelperTest.kt | 0 .../com/fsck/k9/helper/EmailHelperTest.java | 0 .../com/fsck/k9/helper/IdentityHelperTest.kt | 0 .../com/fsck/k9/helper/ListHeadersTest.java | 0 .../k9/helper/ListUnsubscribeHelperTest.kt | 0 .../java/com/fsck/k9/helper/MailToTest.kt | 0 .../com/fsck/k9/helper/MessageHelperTest.kt | 0 .../com/fsck/k9/helper/ReplyToParserTest.java | 0 .../java/com/fsck/k9/helper/UtilityTest.java | 0 .../k9/logging/LogcatLogFileWriterTest.kt | 0 .../k9/mailstore/AttachmentResolverTest.java | 0 .../k9/mailstore/DeferredFileBodyTest.java | 0 .../fsck/k9/mailstore/K9BackendFolderTest.kt | 0 .../fsck/k9/mailstore/K9BackendStorageTest.kt | 0 .../com/fsck/k9/mailstore/LocalStoreTest.java | 0 .../fsck/k9/mailstore/MessageListCacheTest.kt | 0 .../k9/mailstore/MessageListRepositoryTest.kt | 0 .../k9/mailstore/MessageStoreManagerTest.kt | 0 .../MessageViewInfoExtractorTest.java | 0 .../k9/mailstore/MimePartStreamParserTest.kt | 0 .../fsck/k9/mailstore/MoreMessagesTest.java | 0 .../k9/message/IdentityHeaderBuilderTest.kt | 0 .../k9/message/IdentityHeaderParserTest.kt | 0 .../fsck/k9/message/MessageBuilderTest.java | 0 .../k9/message/MessageCreationHelper.java | 0 .../k9/message/ReplyActionStrategyTest.kt | 0 .../fsck/k9/message/TextBodyBuilderTest.kt | 0 .../AttachmentInfoExtractorTest.java | 0 .../extractors/BasicPartInfoExtractorTest.kt | 0 .../extractors/MessagePreviewCreatorTest.java | 0 .../extractors/PreviewTextExtractorTest.kt | 0 .../message/extractors/TextPartFinderTest.kt | 0 .../fsck/k9/message/html/DisplayHtmlTest.kt | 0 .../message/html/EmailSectionExtractorTest.kt | 0 .../fsck/k9/message/html/EmailSectionTest.kt | 0 .../k9/message/html/GenericUriParserTest.kt | 0 .../fsck/k9/message/html/HtmlConverterTest.kt | 0 .../com/fsck/k9/message/html/HtmlHelper.kt | 0 .../fsck/k9/message/html/HttpUriParserTest.kt | 0 .../fsck/k9/message/html/UriMatcherTest.kt | 0 .../message/quote/QuoteDateFormatterTest.kt | 0 .../k9/message/quote/TextQuoteCreatorTest.kt | 0 .../signature/HtmlSignatureRemoverTest.kt | 0 .../signature/TextSignatureRemoverTest.java | 0 ...ticationErrorNotificationControllerTest.kt | 0 .../BaseNotificationDataCreatorTest.kt | 0 ...tificateErrorNotificationControllerTest.kt | 0 .../LockScreenNotificationCreatorTest.kt | 0 .../NewMailNotificationManagerTest.kt | 0 .../NotificationContentCreatorTest.kt | 0 .../notification/NotificationDataStoreTest.kt | 0 .../k9/notification/NotificationIdsTest.kt | 0 .../SendFailedNotificationControllerTest.kt | 0 ...ingleMessageNotificationDataCreatorTest.kt | 0 .../SummaryNotificationDataCreatorTest.kt | 0 .../SyncNotificationControllerTest.kt | 0 .../TestNotificationResourceProvider.kt | 0 .../preferences/ServerSettingsUpgraderTest.kt | 0 .../ServerSettingsValidatorTest.kt | 0 .../k9/preferences/SettingsExporterTest.kt | 0 .../k9/preferences/SettingsFileParserTest.kt | 0 .../k9/preferences/SettingsImporterTest.kt | 0 .../ServerSettingsUpgraderTo92Test.kt | 0 .../ServerSettingsUpgraderTo94Test.kt | 0 .../ServerSettingsUpgraderTo95Test.kt | 0 .../java/com/fsck/k9/sasl/OAuthBearerTest.kt | 0 .../test/resources/autocrypt/no_autocrypt.eml | 0 .../autocrypt/rsa2048-broken-base64.eml | 0 .../autocrypt/rsa2048-explicit-type.eml | 0 .../autocrypt/rsa2048-simple-to-bot.eml | 0 .../resources/autocrypt/rsa2048-simple.eml | 0 .../autocrypt/rsa2048-unknown-critical.eml | 0 .../rsa2048-unknown-non-critical.eml | 0 .../test/resources/autocrypt/unknown-type.eml | 0 .../crypto-openpgp/build.gradle.kts | 2 +- .../k9/crypto/openpgp/EncryptionDetector.java | 0 .../openpgp/OpenPgpEncryptionExtractor.kt | 0 .../openpgp/EncryptionDetectorTest.java | 0 .../crypto/openpgp/MessageCreationHelper.java | 0 {app => legacy}/storage/build.gradle.kts | 4 ++-- .../fsck/k9/preferences/K9StorageEditor.java | 0 .../k9/preferences/K9StoragePersister.java | 0 .../DefaultStorageMigrationHelper.kt | 0 .../migration/StorageMigrationHelper.kt | 0 .../migration/StorageMigrationTo10.kt | 0 .../migration/StorageMigrationTo11.kt | 0 .../migration/StorageMigrationTo12.kt | 0 .../migration/StorageMigrationTo13.kt | 0 .../migration/StorageMigrationTo14.kt | 0 .../migration/StorageMigrationTo15.kt | 0 .../migration/StorageMigrationTo16.kt | 0 .../migration/StorageMigrationTo17.kt | 0 .../migration/StorageMigrationTo18.kt | 0 .../migration/StorageMigrationTo19.kt | 0 .../migration/StorageMigrationTo2.java | 0 .../migration/StorageMigrationTo20.kt | 0 .../migration/StorageMigrationTo21.kt | 0 .../migration/StorageMigrationTo22.kt | 0 .../migration/StorageMigrationTo23.kt | 0 .../migration/StorageMigrationTo24.kt | 0 .../migration/StorageMigrationTo25.kt | 0 .../migration/StorageMigrationTo3.kt | 0 .../migration/StorageMigrationTo4.kt | 0 .../migration/StorageMigrationTo5.kt | 0 .../migration/StorageMigrationTo6.kt | 0 .../migration/StorageMigrationTo7.kt | 0 .../migration/StorageMigrationTo8.kt | 0 .../migration/StorageMigrations.kt | 0 .../migration12/ImapStoreUriDecoder.java | 0 .../migration12/Pop3StoreUriDecoder.java | 0 .../migration12/SmtpTransportUriDecoder.java | 0 .../migration12/WebDavStoreUriDecoder.java | 0 .../k9/storage/K9SchemaDefinitionFactory.kt | 0 .../java/com/fsck/k9/storage/KoinModule.kt | 0 .../k9/storage/StoreSchemaDefinition.java | 0 .../storage/messages/AttachmentFileManager.kt | 0 .../storage/messages/CheckFolderOperations.kt | 0 .../messages/ChunkedDatabaseOperations.kt | 0 .../storage/messages/CopyMessageOperations.kt | 0 .../messages/CreateFolderOperations.kt | 0 .../fsck/k9/storage/messages/DataLocation.kt | 0 .../k9/storage/messages/DatabaseOperations.kt | 0 .../messages/DeleteFolderOperations.kt | 0 .../messages/DeleteMessageOperations.kt | 0 .../storage/messages/FlagMessageOperations.kt | 0 .../k9/storage/messages/K9MessageStore.kt | 0 .../storage/messages/K9MessageStoreFactory.kt | 0 .../messages/KeyValueStoreOperations.kt | 0 .../storage/messages/MoveMessageOperations.kt | 0 .../messages/RetrieveFolderOperations.kt | 0 .../messages/RetrieveMessageListOperations.kt | 0 .../messages/RetrieveMessageOperations.kt | 0 .../storage/messages/SaveMessageOperations.kt | 0 .../messages/ThreadMessageOperations.kt | 0 .../messages/UpdateFolderOperations.kt | 0 .../messages/UpdateMessageOperations.kt | 0 .../migrations/LegacyPendingAppend.java | 0 .../migrations/LegacyPendingCommand.java | 0 .../migrations/LegacyPendingDelete.java | 0 .../migrations/LegacyPendingExpunge.java | 0 .../LegacyPendingMarkAllAsRead.java | 0 .../LegacyPendingMoveAndMarkAsRead.java | 0 .../migrations/LegacyPendingMoveOrCopy.java | 0 .../migrations/LegacyPendingSetFlag.java | 0 .../k9/storage/migrations/MigrationTo62.java | 0 .../k9/storage/migrations/MigrationTo64.kt | 0 .../k9/storage/migrations/MigrationTo65.kt | 0 .../k9/storage/migrations/MigrationTo66.kt | 0 .../k9/storage/migrations/MigrationTo67.kt | 0 .../k9/storage/migrations/MigrationTo68.kt | 0 .../k9/storage/migrations/MigrationTo69.kt | 0 .../k9/storage/migrations/MigrationTo70.kt | 0 .../k9/storage/migrations/MigrationTo71.kt | 0 .../k9/storage/migrations/MigrationTo72.kt | 0 .../k9/storage/migrations/MigrationTo73.kt | 0 .../k9/storage/migrations/MigrationTo74.kt | 0 .../k9/storage/migrations/MigrationTo75.kt | 0 .../k9/storage/migrations/MigrationTo76.kt | 0 .../k9/storage/migrations/MigrationTo78.kt | 0 .../k9/storage/migrations/MigrationTo79.kt | 0 .../k9/storage/migrations/MigrationTo80.kt | 0 .../k9/storage/migrations/MigrationTo81.kt | 0 .../k9/storage/migrations/MigrationTo82.kt | 0 .../k9/storage/migrations/MigrationTo83.kt | 0 .../k9/storage/migrations/MigrationTo84.kt | 0 .../fsck/k9/storage/migrations/Migrations.kt | 0 .../notifications/K9NotificationStore.kt | 0 .../K9NotificationStoreProvider.kt | 0 .../PreferencesDatabaseTestHelper.kt | 0 .../fsck/k9/preferences/StorageEditorTest.kt | 0 .../k9/preferences/StoragePersisterTest.kt | 0 .../migration/StorageMigrationTo22Test.kt | 0 .../migration/StorageMigrationTo24Test.kt | 0 .../migration/StorageMigrationTo25Test.kt | 0 .../com/fsck/k9/storage/K9RobolectricTest.kt | 0 .../com/fsck/k9/storage/RobolectricTest.kt | 0 .../k9/storage/StoreSchemaDefinitionTest.java | 0 .../test/java/com/fsck/k9/storage/TestApp.kt | 0 .../messages/CheckFolderOperationsTest.kt | 0 .../messages/ChunkedDatabaseOperationsTest.kt | 0 .../messages/CopyMessageOperationsTest.kt | 0 .../messages/CreateFolderOperationsTest.kt | 0 .../messages/DeleteFolderOperationsTest.kt | 0 .../messages/DeleteMessageOperationsTest.kt | 0 .../fsck/k9/storage/messages/FileHelpers.kt | 0 .../messages/FlagMessageOperationsTest.kt | 0 .../fsck/k9/storage/messages/FolderHelpers.kt | 0 .../k9/storage/messages/KeyValueHelpers.kt | 0 .../messages/KeyValueStoreOperationsTest.kt | 0 .../messages/MessageDatabaseHelpers.kt | 0 .../messages/MessagePartDatabaseHelpers.kt | 0 .../messages/MoveMessageOperationsTest.kt | 0 .../messages/RetrieveFolderOperationsTest.kt | 0 .../RetrieveMessageListOperationsTest.kt | 0 .../messages/RetrieveMessageOperationsTest.kt | 0 .../messages/SaveMessageOperationsTest.kt | 0 .../storage/messages/ThreadDatabaseHelpers.kt | 0 .../messages/ThreadMessageOperationsTest.kt | 0 .../messages/UpdateFolderOperationsTest.kt | 0 .../messages/UpdateMessageOperationsTest.kt | 0 .../notifications/K9NotificationStoreTest.kt | 0 .../NotificationsTableHelpers.kt | 0 .../src/test/resources/attach/k9small.png | Bin {app => legacy}/testing/build.gradle.kts | 2 +- .../preferences/InMemoryStoragePersister.kt | 0 .../java/com/fsck/k9/testing/MockHelper.kt | 0 .../com/fsck/k9/testing/StringExtensions.kt | 0 {app => legacy}/ui/base/build.gradle.kts | 2 +- .../ui/base/src/main/AndroidManifest.xml | 0 .../com/fsck/k9/ui/base/AppLanguageManager.kt | 0 .../java/com/fsck/k9/ui/base/K9Activity.kt | 0 .../java/com/fsck/k9/ui/base/KoinModule.kt | 0 .../fsck/k9/ui/base/LocaleContextWrapper.kt | 0 .../java/com/fsck/k9/ui/base/ThemeManager.kt | 0 .../java/com/fsck/k9/ui/base/ThemeProvider.kt | 0 .../k9/ui/base/bundle/BundleExtensions.kt | 0 .../extensions/ConfigurationExtensions.kt | 0 .../ui/base/extensions/FragmentExtensions.kt | 0 .../base/extensions/NavigationExtensions.kt | 0 .../k9/ui/base/livedata/LiveDataExtensions.kt | 0 .../fsck/k9/ui/base/loader/LiveDataLoader.kt | 0 .../k9/ui/base/loader/LoaderStateObserver.kt | 0 .../ui/base/locale/LocaleBroadcastReceiver.kt | 0 .../k9/ui/base/locale/SystemLocaleManager.kt | 0 .../ui/base/src/main/res/layout/toolbar.xml | 0 .../base/src/main/res/values-ar/strings.xml | 0 .../base/src/main/res/values-az/strings.xml | 0 .../base/src/main/res/values-be/strings.xml | 0 .../base/src/main/res/values-bg/strings.xml | 0 .../base/src/main/res/values-br/strings.xml | 0 .../base/src/main/res/values-bs/strings.xml | 0 .../base/src/main/res/values-ca/strings.xml | 0 .../base/src/main/res/values-co/strings.xml | 0 .../base/src/main/res/values-cs/strings.xml | 0 .../base/src/main/res/values-cy/strings.xml | 0 .../base/src/main/res/values-da/strings.xml | 0 .../base/src/main/res/values-de/strings.xml | 0 .../base/src/main/res/values-el/strings.xml | 0 .../src/main/res/values-en-rGB/strings.xml | 0 .../base/src/main/res/values-eo/strings.xml | 0 .../base/src/main/res/values-es/strings.xml | 0 .../base/src/main/res/values-et/strings.xml | 0 .../base/src/main/res/values-eu/strings.xml | 0 .../base/src/main/res/values-fa/strings.xml | 0 .../base/src/main/res/values-fi/strings.xml | 0 .../base/src/main/res/values-fr/strings.xml | 0 .../base/src/main/res/values-fy/strings.xml | 0 .../base/src/main/res/values-gd/strings.xml | 0 .../base/src/main/res/values-gl/strings.xml | 0 .../base/src/main/res/values-hi/strings.xml | 0 .../base/src/main/res/values-hr/strings.xml | 0 .../base/src/main/res/values-hu/strings.xml | 0 .../base/src/main/res/values-hy/strings.xml | 0 .../base/src/main/res/values-in/strings.xml | 0 .../base/src/main/res/values-is/strings.xml | 0 .../base/src/main/res/values-it/strings.xml | 0 .../base/src/main/res/values-iw/strings.xml | 0 .../base/src/main/res/values-ja/strings.xml | 0 .../base/src/main/res/values-ka/strings.xml | 0 .../base/src/main/res/values-ko/strings.xml | 0 .../base/src/main/res/values-lt/strings.xml | 0 .../base/src/main/res/values-lv/strings.xml | 0 .../base/src/main/res/values-ml/strings.xml | 0 .../base/src/main/res/values-nb/strings.xml | 0 .../base/src/main/res/values-nl/strings.xml | 0 .../base/src/main/res/values-nn/strings.xml | 0 .../base/src/main/res/values-pl/strings.xml | 0 .../src/main/res/values-pt-rBR/strings.xml | 0 .../src/main/res/values-pt-rPT/strings.xml | 0 .../base/src/main/res/values-ro/strings.xml | 0 .../base/src/main/res/values-ru/strings.xml | 0 .../base/src/main/res/values-sk/strings.xml | 0 .../base/src/main/res/values-sl/strings.xml | 0 .../base/src/main/res/values-sq/strings.xml | 0 .../base/src/main/res/values-sr/strings.xml | 0 .../base/src/main/res/values-sv/strings.xml | 0 .../src/main/res/values-ta-rIN/strings.xml | 0 .../base/src/main/res/values-tr/strings.xml | 0 .../base/src/main/res/values-uk/strings.xml | 0 .../base/src/main/res/values-vi/strings.xml | 0 .../src/main/res/values-zh-rCN/strings.xml | 0 .../src/main/res/values-zh-rTW/strings.xml | 0 .../base/src/main/res/values/dimensions.xml | 0 .../ui/base/src/main/res/values/strings.xml | 0 {app => legacy}/ui/legacy/build.gradle.kts | 10 ++++----- .../ui/legacy/src/main/AndroidManifest.xml | 0 .../main/java/com/fsck/k9/UiKoinModules.kt | 0 .../com/fsck/k9/account/AccountRemover.kt | 0 .../fsck/k9/account/AccountRemoverWorker.kt | 0 .../k9/account/BackgroundAccountRemover.kt | 0 .../java/com/fsck/k9/account/KoinModule.kt | 0 .../java/com/fsck/k9/activity/AccountList.kt | 0 .../activity/AlternateRecipientAdapter.java | 0 .../com/fsck/k9/activity/ChooseIdentity.java | 0 .../java/com/fsck/k9/activity/EditIdentity.kt | 0 .../com/fsck/k9/activity/FolderInfoHolder.kt | 0 .../com/fsck/k9/activity/K9ListActivity.java | 0 .../java/com/fsck/k9/activity/KoinModule.kt | 0 .../fsck/k9/activity/ManageIdentities.java | 0 .../com/fsck/k9/activity/MessageCompose.java | 0 .../java/com/fsck/k9/activity/MessageList.kt | 0 .../k9/activity/MessageListActivityConfig.kt | 0 .../fsck/k9/activity/MessageLoaderHelper.java | 0 .../k9/activity/MessageLoaderHelperFactory.kt | 0 .../java/com/fsck/k9/activity/Search.java | 0 .../fsck/k9/activity/UpgradeDatabases.java | 0 .../activity/compose/AttachmentPresenter.java | 0 .../activity/compose/ComposeCryptoStatus.kt | 0 .../k9/activity/compose/IdentityAdapter.java | 0 .../k9/activity/compose/MessageActions.java | 0 .../compose/PgpEnabledErrorDialog.java | 0 .../compose/PgpEncryptDescriptionDialog.java | 0 .../k9/activity/compose/PgpInlineDialog.java | 0 .../activity/compose/PgpSignOnlyDialog.java | 0 .../k9/activity/compose/RecipientAdapter.java | 0 .../k9/activity/compose/RecipientLoader.java | 0 .../k9/activity/compose/RecipientMvpView.kt | 0 .../k9/activity/compose/RecipientPresenter.kt | 0 .../k9/activity/compose/ReplyToPresenter.kt | 0 .../fsck/k9/activity/compose/ReplyToView.kt | 0 .../k9/activity/compose/SaveMessageTask.java | 0 .../loader/AttachmentContentLoader.java | 0 .../activity/loader/AttachmentInfoLoader.java | 0 .../com/fsck/k9/activity/misc/Attachment.java | 0 .../fsck/k9/activity/misc/ContactPicture.java | 0 .../fsck/k9/activity/misc/InlineAttachment.kt | 0 .../setup/AccountSetupComposition.java | 0 .../java/com/fsck/k9/contacts/ContactImage.kt | 0 .../k9/contacts/ContactImageBitmapDecoder.kt | 0 .../k9/contacts/ContactImageModelLoader.kt | 0 .../k9/contacts/ContactLetterBitmapConfig.kt | 0 .../k9/contacts/ContactLetterBitmapCreator.kt | 0 .../k9/contacts/ContactLetterExtractor.kt | 0 .../fsck/k9/contacts/ContactPhotoLoader.kt | 0 .../contacts/ContactPictureGlideModule.java | 0 .../fsck/k9/contacts/ContactPictureLoader.kt | 0 .../java/com/fsck/k9/contacts/KoinModule.kt | 0 .../AttachmentDownloadDialogFragment.java | 0 .../fragment/ConfirmationDialogFragment.java | 0 .../k9/fragment/ProgressDialogFragment.java | 0 .../java/com/fsck/k9/ui/ContactBadge.java | 0 .../java/com/fsck/k9/ui/FlowExtensions.kt | 0 .../src/main/java/com/fsck/k9/ui/K9Drawer.kt | 0 .../java/com/fsck/k9/ui/K9ThemeProvider.kt | 0 .../main/java/com/fsck/k9/ui/KoinModule.kt | 0 .../java/com/fsck/k9/ui/ThemeExtensions.kt | 0 .../account/AccountFallbackImageProvider.kt | 0 .../fsck/k9/ui/account/AccountImageLoader.kt | 0 .../k9/ui/account/AccountImageModelLoader.kt | 0 .../fsck/k9/ui/account/AccountsViewModel.kt | 0 .../com/fsck/k9/ui/account/DisplayAccount.kt | 0 .../java/com/fsck/k9/ui/account/KoinModule.kt | 0 .../fsck/k9/ui/changelog/ChangeLogManager.kt | 0 .../fsck/k9/ui/changelog/ChangelogFragment.kt | 0 .../k9/ui/changelog/ChangelogViewModel.kt | 0 .../com/fsck/k9/ui/changelog/KoinModule.kt | 0 .../k9/ui/changelog/RecentChangesActivity.kt | 0 .../k9/ui/changelog/RecentChangesViewModel.kt | 0 .../ui/choosefolder/ChooseFolderActivity.kt | 0 .../ui/choosefolder/ChooseFolderViewModel.kt | 0 .../fsck/k9/ui/choosefolder/FolderListItem.kt | 0 .../com/fsck/k9/ui/choosefolder/KoinModule.kt | 0 .../k9/ui/compose/QuotedMessageMvpView.java | 0 .../k9/ui/compose/QuotedMessagePresenter.java | 0 .../k9/ui/compose/RecipientCircleImageView.kt | 0 .../compose/RecipientTokenConstraintLayout.kt | 0 .../fsck/k9/ui/compose/SimpleHighlightView.kt | 0 .../fsck/k9/ui/compose/WrapUriTextWatcher.kt | 0 .../k9/ui/crypto/MessageCryptoCallback.java | 0 .../k9/ui/crypto/MessageCryptoHelper.java | 0 .../fsck/k9/ui/crypto/OpenPgpApiFactory.java | 0 .../endtoend/AutocryptKeyTransferActivity.kt | 0 .../endtoend/AutocryptKeyTransferPresenter.kt | 0 .../endtoend/AutocryptKeyTransferViewModel.kt | 0 .../AutocryptSetupMessageLiveEvent.kt | 0 .../AutocryptSetupTransferLiveEvent.kt | 0 .../com/fsck/k9/ui/endtoend/KoinModule.kt | 0 .../fsck/k9/ui/fab/HideFabOnScrollBehavior.kt | 0 .../fsck/k9/ui/folders/FolderIconProvider.kt | 0 .../fsck/k9/ui/folders/FolderNameFormatter.kt | 0 .../fsck/k9/ui/folders/FoldersViewModel.kt | 0 .../java/com/fsck/k9/ui/folders/KoinModule.kt | 0 .../k9/ui/helper/BottomBaselineTextView.kt | 0 .../fsck/k9/ui/helper/ContextExtensions.kt | 0 .../fsck/k9/ui/helper/DisplayAddressHelper.kt | 0 .../fsck/k9/ui/helper/DisplayHtmlUiFactory.kt | 0 .../fsck/k9/ui/helper/HtmlSettingsProvider.kt | 0 .../k9/ui/helper/RelativeDateTimeFormatter.kt | 0 .../com/fsck/k9/ui/helper/SizeFormatter.kt | 0 .../fsck/k9/ui/identity/IdentityFormatter.kt | 0 .../com/fsck/k9/ui/identity/KoinModule.kt | 0 .../k9/ui/managefolders/FolderListItem.kt | 0 .../managefolders/FolderSettingsDataStore.kt | 0 .../managefolders/FolderSettingsFragment.kt | 0 .../managefolders/FolderSettingsViewModel.kt | 0 .../fsck/k9/ui/managefolders/KoinModule.kt | 0 .../ui/managefolders/ManageFoldersActivity.kt | 0 .../ui/managefolders/ManageFoldersFragment.kt | 0 .../managefolders/ManageFoldersViewModel.kt | 0 .../message/LocalMessageExtractorLoader.java | 0 .../k9/ui/message/LocalMessageLoader.java | 0 .../messagedetails/AddToContactsLauncher.kt | 0 .../messagedetails/ContactSettingsProvider.kt | 0 .../k9/ui/messagedetails/CryptoStatusItem.kt | 0 .../fsck/k9/ui/messagedetails/EmptyItem.kt | 0 .../k9/ui/messagedetails/FolderNameItem.kt | 0 .../fsck/k9/ui/messagedetails/KoinModule.kt | 0 .../k9/ui/messagedetails/MessageDateItem.kt | 0 .../MessageDetailsAppearance.kt | 0 .../MessageDetailsDividerItem.kt | 0 .../messagedetails/MessageDetailsFragment.kt | 0 .../MessageDetailsParticipantFormatter.kt | 0 .../k9/ui/messagedetails/MessageDetailsUi.kt | 0 .../messagedetails/MessageDetailsViewModel.kt | 0 .../k9/ui/messagedetails/ParticipantItem.kt | 0 .../k9/ui/messagedetails/SectionHeaderItem.kt | 0 .../ui/messagedetails/ShowContactLauncher.kt | 0 .../ui/messagelist/DefaultFolderProvider.kt | 0 .../com/fsck/k9/ui/messagelist/KoinModule.kt | 0 .../k9/ui/messagelist/MessageListAdapter.kt | 0 .../ui/messagelist/MessageListAppearance.kt | 0 .../k9/ui/messagelist/MessageListConfig.kt | 0 .../k9/ui/messagelist/MessageListFragment.kt | 0 .../k9/ui/messagelist/MessageListHandler.java | 0 .../fsck/k9/ui/messagelist/MessageListItem.kt | 0 .../ui/messagelist/MessageListItemAnimator.kt | 0 .../ui/messagelist/MessageListItemMapper.kt | 0 .../k9/ui/messagelist/MessageListLiveData.kt | 0 .../messagelist/MessageListLiveDataFactory.kt | 0 .../k9/ui/messagelist/MessageListLoader.kt | 0 .../messagelist/MessageListSwipeCallback.kt | 0 .../ui/messagelist/MessageListViewHolder.kt | 0 .../k9/ui/messagelist/MessageListViewModel.kt | 0 .../com/fsck/k9/ui/messagelist/MlfUtils.java | 0 .../ui/messagelist/SortTypeToastProvider.kt | 0 .../ui/messagelist/SwipeResourceProvider.kt | 0 .../fsck/k9/ui/messagesource/KoinModule.kt | 0 .../messagesource/MessageHeadersFragment.kt | 0 .../messagesource/MessageHeadersViewModel.kt | 0 .../ui/messagesource/MessageSourceActivity.kt | 0 .../ui/messageview/AttachmentController.java | 0 .../k9/ui/messageview/AttachmentView.java | 0 .../messageview/AttachmentViewCallback.java | 0 .../messageview/DisplayRecipientsExtractor.kt | 0 .../com/fsck/k9/ui/messageview/KoinModule.kt | 0 .../fsck/k9/ui/messageview/LinkTextHandler.kt | 0 .../ui/messageview/LockedAttachmentView.java | 0 .../k9/ui/messageview/MessageContainerView.kt | 0 .../messageview/MessageCryptoPresenter.java | 0 .../messageview/MessageHeaderClickListener.kt | 0 .../fsck/k9/ui/messageview/MessageTopView.kt | 0 .../MessageViewContainerFragment.kt | 0 .../k9/ui/messageview/MessageViewFragment.kt | 0 .../MessageViewRecipientFormatter.kt | 0 .../k9/ui/messageview/PlaceholderFragment.kt | 0 .../ui/messageview/RecipientLayoutCreator.kt | 0 .../k9/ui/messageview/RecipientNamesView.kt | 0 .../k9/ui/messageview/TouchInterceptView.kt | 0 .../DeleteConfirmationActivity.kt | 0 .../com/fsck/k9/ui/push/PushInfoActivity.kt | 0 .../com/fsck/k9/ui/push/PushInfoFragment.kt | 0 .../com/fsck/k9/ui/settings/AboutFragment.kt | 0 .../com/fsck/k9/ui/settings/AccountItem.kt | 0 .../com/fsck/k9/ui/settings/KoinModule.kt | 0 .../fsck/k9/ui/settings/PreferenceExtras.kt | 0 .../fsck/k9/ui/settings/SettingsActionItem.kt | 0 .../fsck/k9/ui/settings/SettingsActivity.kt | 0 .../k9/ui/settings/SettingsDividerItem.kt | 0 .../k9/ui/settings/SettingsListFragment.kt | 0 .../fsck/k9/ui/settings/SettingsViewModel.kt | 0 .../com/fsck/k9/ui/settings/UrlActionItem.kt | 0 .../account/AccountSelectionSpinner.kt | 0 .../account/AccountSettingsActivity.kt | 0 .../account/AccountSettingsDataStore.kt | 0 .../AccountSettingsDataStoreFactory.kt | 0 .../account/AccountSettingsFragment.kt | 0 .../account/AccountSettingsViewModel.kt | 0 .../AutocryptPreferEncryptDialogFragment.kt | 0 .../AutocryptPreferEncryptPreference.kt | 0 .../settings/account/FolderListPreference.kt | 0 .../account/NotificationSoundPreference.kt | 0 .../account/NotificationsPreference.kt | 0 .../account/OpenPgpAppSelectDialog.java | 0 .../account/VibrationDialogFragment.kt | 0 .../settings/account/VibrationPreference.kt | 0 .../fsck/k9/ui/settings/account/Vibrator.kt | 0 .../k9/ui/settings/export/CheckBoxItem.kt | 0 .../settings/export/SettingsExportFragment.kt | 0 .../export/SettingsExportListItems.kt | 0 .../settings/export/SettingsExportUiModel.kt | 0 .../export/SettingsExportViewModel.kt | 0 .../general/GeneralSettingsActivity.kt | 0 .../general/GeneralSettingsDataStore.kt | 0 .../general/GeneralSettingsFragment.kt | 0 .../general/GeneralSettingsViewModel.kt | 0 .../ui/settings/general/LanguagePreference.kt | 0 .../fsck/k9/ui/share/ShareIntentBuilder.kt | 0 .../com/fsck/k9/view/DraggableFrameLayout.kt | 0 .../fsck/k9/view/HighlightDialogFragment.java | 0 .../java/com/fsck/k9/view/K9WebViewClient.kt | 0 .../main/java/com/fsck/k9/view/KoinModule.kt | 0 .../com/fsck/k9/view/LinearViewAnimator.java | 0 .../k9/view/MessageCryptoDisplayStatus.kt | 0 .../java/com/fsck/k9/view/MessageHeader.java | 0 .../java/com/fsck/k9/view/MessageWebView.kt | 0 .../fsck/k9/view/NonLockingScrollView.java | 0 .../com/fsck/k9/view/RecipientSelectView.java | 0 .../com/fsck/k9/view/StatusIndicator.java | 0 .../java/com/fsck/k9/view/ThemeUtils.java | 0 .../fsck/k9/view/ToolableViewAnimator.java | 0 .../k9/view/UserInputEmailAddressParser.kt | 0 .../java/com/fsck/k9/view/ViewSwitcher.java | 0 .../com/fsck/k9/view/WebViewClientFactory.kt | 0 .../java/com/fsck/k9/view/WebViewConfig.kt | 0 .../com/fsck/k9/view/WebViewConfigProvider.kt | 0 .../ui/legacy/src/main/res/anim/fade_in.xml | 0 .../ui/legacy/src/main/res/anim/fade_out.xml | 0 .../src/main/res/anim/slide_in_left.xml | 0 .../src/main/res/anim/slide_in_right.xml | 0 .../src/main/res/anim/slide_out_left.xml | 0 .../src/main/res/anim/slide_out_right.xml | 0 .../animator/draggable_state_list_anim.xml | 0 .../drawer_header_background.png | Bin .../ic_action_request_read_receipt_light.png | Bin .../notification_icon_check_mail_anim_0.png | Bin .../notification_icon_check_mail_anim_1.png | Bin .../notification_icon_check_mail_anim_2.png | Bin .../notification_icon_check_mail_anim_3.png | Bin .../notification_icon_check_mail_anim_4.png | Bin .../notification_icon_check_mail_anim_5.png | Bin .../drawer_header_background.png | Bin .../ic_action_request_read_receipt_light.png | Bin .../notification_icon_check_mail_anim_0.png | Bin .../notification_icon_check_mail_anim_1.png | Bin .../notification_icon_check_mail_anim_2.png | Bin .../notification_icon_check_mail_anim_3.png | Bin .../notification_icon_check_mail_anim_4.png | Bin .../notification_icon_check_mail_anim_5.png | Bin .../drawer_header_background.png | Bin .../ic_action_request_read_receipt_light.png | Bin .../notification_icon_check_mail_anim_0.png | Bin .../notification_icon_check_mail_anim_1.png | Bin .../notification_icon_check_mail_anim_2.png | Bin .../notification_icon_check_mail_anim_3.png | Bin .../notification_icon_check_mail_anim_4.png | Bin .../notification_icon_check_mail_anim_5.png | Bin .../drawer_header_background.png | Bin .../src/main/res/drawable/btn_select_star.xml | 0 .../main/res/drawable/ic_account_color.xml | 0 .../main/res/drawable/ic_status_corner.xml | 0 ...message_list_item_selection_background.xml | 0 .../drawable/notification_icon_check_mail.xml | 0 .../src/main/res/drawable/rounded_corners.xml | 0 .../src/main/res/drawable/status_dots.xml | 0 .../src/main/res/drawable/status_dots_1.xml | 0 .../src/main/res/drawable/status_dots_2.xml | 0 .../src/main/res/drawable/status_dots_3.xml | 0 .../drawable/status_lock_disabled_dots_1.xml | 0 .../main/res/drawable/status_lock_dots_2.xml | 0 .../main/res/drawable/status_lock_dots_3.xml | 0 .../main/res/drawable/status_lock_error.xml | 0 .../res/drawable/status_signature_dots_3.xml | 0 .../res/drawable/thread_count_box_light.xml | 0 .../src/main/res/layout/about_library.xml | 0 .../src/main/res/layout/account_list.xml | 0 .../src/main/res/layout/account_list_item.xml | 0 .../res/layout/account_setup_composition.xml | 0 .../layout/account_spinner_dropdown_item.xml | 0 .../main/res/layout/account_spinner_item.xml | 0 .../src/main/res/layout/accounts_item.xml | 0 .../res/layout/activity_account_settings.xml | 0 .../res/layout/activity_manage_folders.xml | 0 .../main/res/layout/activity_push_info.xml | 0 .../res/layout/activity_recent_changes.xml | 0 .../src/main/res/layout/activity_settings.xml | 0 .../res/layout/changelog_list_change_item.xml | 0 .../layout/changelog_list_release_item.xml | 0 .../main/res/layout/choose_account_item.xml | 0 .../main/res/layout/choose_identity_item.xml | 0 .../main/res/layout/crypto_key_transfer.xml | 0 .../dialog_autocrypt_prefer_encrypt.xml | 0 .../res/layout/dialog_openkeychain_info.xml | 0 .../src/main/res/layout/drawer_contents.xml | 0 .../res/layout/drawer_folder_list_item.xml | 0 .../src/main/res/layout/edit_identity.xml | 0 .../main/res/layout/empty_message_view.xml | 0 .../src/main/res/layout/folder_list.xml | 0 .../src/main/res/layout/folder_list_item.xml | 0 .../src/main/res/layout/fragment_about.xml | 0 .../main/res/layout/fragment_changelog.xml | 0 .../res/layout/fragment_manage_folders.xml | 0 .../main/res/layout/fragment_push_info.xml | 0 .../res/layout/fragment_settings_export.xml | 0 .../res/layout/fragment_settings_list.xml | 0 .../src/main/res/layout/general_settings.xml | 0 .../main/res/layout/list_content_simple.xml | 0 .../ui/legacy/src/main/res/layout/message.xml | 0 .../main/res/layout/message_bottom_sheet.xml | 0 .../src/main/res/layout/message_compose.xml | 0 .../res/layout/message_compose_attachment.xml | 0 .../res/layout/message_compose_content.xml | 0 .../res/layout/message_compose_recipients.xml | 0 .../src/main/res/layout/message_container.xml | 0 .../message_content_crypto_cancelled.xml | 0 .../layout/message_content_crypto_error.xml | 0 .../message_content_crypto_incomplete.xml | 0 .../message_content_crypto_no_provider.xml | 0 .../message_details_crypto_status_item.xml | 0 .../res/layout/message_details_date_item.xml | 0 .../layout/message_details_divider_item.xml | 0 .../message_details_folder_name_item.xml | 0 .../message_details_participant_item.xml | 0 .../message_details_section_header_item.xml | 0 .../src/main/res/layout/message_list.xml | 0 .../main/res/layout/message_list_error.xml | 0 .../main/res/layout/message_list_fragment.xml | 0 .../src/main/res/layout/message_list_item.xml | 0 .../res/layout/message_list_item_footer.xml | 0 .../main/res/layout/message_list_toolbar.xml | 0 .../res/layout/message_view_attachment.xml | 0 .../layout/message_view_attachment_locked.xml | 0 .../res/layout/message_view_container.xml | 0 .../main/res/layout/message_view_header.xml | 0 .../main/res/layout/message_view_headers.xml | 0 .../layout/message_view_headers_activity.xml | 0 .../layout/openpgp_enabled_error_dialog.xml | 0 .../openpgp_encrypt_description_dialog.xml | 0 .../main/res/layout/openpgp_inline_dialog.xml | 0 .../res/layout/openpgp_sign_only_dialog.xml | 0 .../preference_vibration_pattern_item.xml | 0 .../preference_vibration_switch_item.xml | 0 .../preference_vibration_times_item.xml | 0 .../res/layout/recipient_alternate_item.xml | 0 .../res/layout/recipient_dropdown_item.xml | 0 .../src/main/res/layout/recipient_names.xml | 0 .../main/res/layout/recipient_token_item.xml | 0 .../res/layout/select_openpgp_app_item.xml | 0 .../settings_export_account_list_item.xml | 0 .../settings_export_general_list_item.xml | 0 .../main/res/layout/split_message_list.xml | 0 .../src/main/res/layout/status_indicator.xml | 0 .../src/main/res/layout/swipe_left_action.xml | 0 .../main/res/layout/swipe_right_action.xml | 0 .../res/layout/text_divider_list_item.xml | 0 .../main/res/layout/text_icon_list_item.xml | 0 .../src/main/res/layout/upgrade_databases.xml | 0 .../main/res/menu/account_settings_option.xml | 0 .../main/res/menu/choose_folder_option.xml | 0 .../main/res/menu/debug_settings_option.xml | 0 .../src/main/res/menu/edit_identity_menu.xml | 0 .../src/main/res/menu/folder_list_option.xml | 0 .../main/res/menu/folder_settings_option.xml | 0 .../main/res/menu/general_settings_option.xml | 0 .../res/menu/manage_identities_context.xml | 0 .../res/menu/manage_identities_option.xml | 0 .../main/res/menu/message_compose_option.xml | 0 .../res/menu/message_list_context_menu.xml | 0 .../res/menu/message_list_option_menu.xml | 0 .../res/menu/participant_overflow_menu.xml | 0 .../main/res/menu/single_message_options.xml | 0 .../navigation/navigation_manage_folders.xml | 0 .../res/navigation/navigation_settings.xml | 0 .../legacy/src/main/res/raw-ja/changelog.xml | 0 .../src/main/res/raw/changelog_master.xml | 0 .../res/transition/transfer_transitions.xml | 0 .../legacy/src/main/res/values-ar/strings.xml | 0 .../legacy/src/main/res/values-az/strings.xml | 0 .../legacy/src/main/res/values-be/strings.xml | 0 .../legacy/src/main/res/values-bg/strings.xml | 0 .../legacy/src/main/res/values-br/strings.xml | 0 .../legacy/src/main/res/values-bs/strings.xml | 0 .../legacy/src/main/res/values-ca/strings.xml | 0 .../legacy/src/main/res/values-co/strings.xml | 0 .../legacy/src/main/res/values-cs/strings.xml | 0 .../legacy/src/main/res/values-cy/strings.xml | 0 .../legacy/src/main/res/values-da/strings.xml | 0 .../legacy/src/main/res/values-de/strings.xml | 0 .../legacy/src/main/res/values-el/strings.xml | 0 .../src/main/res/values-en-rGB/strings.xml | 0 .../legacy/src/main/res/values-eo/strings.xml | 0 .../legacy/src/main/res/values-es/strings.xml | 0 .../legacy/src/main/res/values-et/strings.xml | 0 .../legacy/src/main/res/values-eu/strings.xml | 0 .../legacy/src/main/res/values-fa/strings.xml | 0 .../legacy/src/main/res/values-fi/strings.xml | 0 .../legacy/src/main/res/values-fr/strings.xml | 0 .../legacy/src/main/res/values-fy/strings.xml | 0 .../legacy/src/main/res/values-gd/strings.xml | 0 .../legacy/src/main/res/values-gl/strings.xml | 0 .../legacy/src/main/res/values-hi/strings.xml | 0 .../legacy/src/main/res/values-hr/strings.xml | 0 .../legacy/src/main/res/values-hu/strings.xml | 0 .../legacy/src/main/res/values-hy/strings.xml | 0 .../legacy/src/main/res/values-in/strings.xml | 0 .../legacy/src/main/res/values-is/strings.xml | 0 .../legacy/src/main/res/values-it/strings.xml | 0 .../legacy/src/main/res/values-iw/strings.xml | 0 .../legacy/src/main/res/values-ja/strings.xml | 0 .../legacy/src/main/res/values-ka/strings.xml | 0 .../legacy/src/main/res/values-ko/strings.xml | 0 .../legacy/src/main/res/values-lt/strings.xml | 0 .../legacy/src/main/res/values-lv/strings.xml | 0 .../legacy/src/main/res/values-ml/strings.xml | 0 .../legacy/src/main/res/values-nb/strings.xml | 0 .../src/main/res/values-night/themes.xml | 0 .../legacy/src/main/res/values-nl/strings.xml | 0 .../legacy/src/main/res/values-nn/strings.xml | 0 .../legacy/src/main/res/values-pl/strings.xml | 0 .../src/main/res/values-pt-rBR/strings.xml | 0 .../src/main/res/values-pt-rPT/strings.xml | 0 .../legacy/src/main/res/values-ro/strings.xml | 0 .../legacy/src/main/res/values-ru/strings.xml | 0 .../legacy/src/main/res/values-sk/strings.xml | 0 .../legacy/src/main/res/values-sl/strings.xml | 0 .../legacy/src/main/res/values-sq/strings.xml | 0 .../legacy/src/main/res/values-sr/strings.xml | 0 .../legacy/src/main/res/values-sv/strings.xml | 0 .../res/values-sw360dp/values-preference.xml | 0 .../src/main/res/values-ta-rIN/strings.xml | 0 .../legacy/src/main/res/values-tr/strings.xml | 0 .../legacy/src/main/res/values-uk/strings.xml | 0 .../legacy/src/main/res/values-vi/strings.xml | 0 .../src/main/res/values-w360dp/styles.xml | 0 .../src/main/res/values-zh-rCN/strings.xml | 0 .../src/main/res/values-zh-rTW/strings.xml | 0 .../ui/legacy/src/main/res/values/arrays.xml | 0 .../arrays_account_settings_strings.xml | 0 .../arrays_general_settings_strings.xml | 0 .../ui/legacy/src/main/res/values/attrs.xml | 0 .../ui/legacy/src/main/res/values/colors.xml | 0 .../legacy/src/main/res/values/constants.xml | 0 .../contact_picture_fallback_colors.xml | 0 .../legacy/src/main/res/values/dimensions.xml | 0 .../ui/legacy/src/main/res/values/ids.xml | 0 .../main/res/values/message_details_ids.xml | 0 .../ui/legacy/src/main/res/values/strings.xml | 0 .../ui/legacy/src/main/res/values/styles.xml | 0 .../ui/legacy/src/main/res/values/themes.xml | 0 .../src/main/res/xml/account_settings.xml | 0 .../src/main/res/xml/empty_preferences.xml | 0 .../res/xml/folder_settings_preferences.xml | 0 .../src/main/res/xml/general_settings.xml | 0 .../ui/legacy/src/test/AndroidManifest.xml | 0 .../java/com/fsck/k9/K9RobolectricTest.kt | 0 .../test/java/com/fsck/k9/RobolectricTest.kt | 0 .../src/test/java/com/fsck/k9/TestApp.kt | 0 .../com/fsck/k9/TestCoreResourceProvider.kt | 0 .../compose/AttachmentPresenterTest.kt | 0 .../activity/compose/RecipientLoaderTest.java | 0 .../compose/RecipientPresenterTest.kt | 0 .../activity/compose/ReplyToPresenterTest.kt | 0 .../autocrypt/AutocryptOperationsHelper.java | 0 .../k9/contacts/ContactLetterExtractorTest.kt | 0 .../fsck/k9/message/PgpMessageBuilderTest.kt | 0 .../test/java/com/fsck/k9/ui/K9DrawerTest.kt | 0 .../k9/ui/crypto/MessageCryptoHelperTest.java | 0 .../helper/RelativeDateTimeFormatterTest.kt | 0 .../fsck/k9/ui/helper/SizeFormatterTest.kt | 0 .../k9/ui/identity/IdentityFormatterTest.kt | 0 .../MessageDetailsParticipantFormatterTest.kt | 0 .../ui/messagelist/MessageListAdapterTest.kt | 0 .../DisplayRecipientsExtractorTest.kt | 0 .../MessageViewRecipientFormatterTest.kt | 0 .../messageview/RecipientLayoutCreatorTest.kt | 0 .../general/GeneralSettingsViewModelTest.kt | 0 .../view/UserInputEmailAddressParserTest.kt | 0 .../ui/message-list-widget/build.gradle.kts | 0 settings.gradle.kts | 20 +++++++++--------- 1193 files changed, 40 insertions(+), 40 deletions(-) rename config/detekt/{detekt-baseline-app-common.xml => detekt-baseline-legacy-common.xml} (100%) rename config/detekt/{detekt-baseline-app-core.xml => detekt-baseline-legacy-core.xml} (100%) rename config/detekt/{detekt-baseline-app-storage.xml => detekt-baseline-legacy-storage.xml} (100%) rename config/detekt/{detekt-baseline-app-ui-base.xml => detekt-baseline-legacy-ui-base.xml} (100%) rename config/detekt/{detekt-baseline-app-ui-legacy.xml => detekt-baseline-legacy-ui-legacy.xml} (100%) rename config/detekt/{detekt-baseline-app-ui-message-list-widget.xml => detekt-baseline-legacy-ui-message-list-widget.xml} (100%) rename {app => legacy}/common/build.gradle.kts (87%) rename {app => legacy}/common/src/main/AndroidManifest.xml (100%) rename {app => legacy}/common/src/main/java/com/fsck/k9/CommonApp.kt (100%) rename {app => legacy}/common/src/main/java/com/fsck/k9/CommonKoinModule.kt (100%) rename {app => legacy}/common/src/main/java/com/fsck/k9/MessagingListenerProvider.kt (100%) rename {app => legacy}/common/src/main/java/com/fsck/k9/account/AccountActivator.kt (100%) rename {app => legacy}/common/src/main/java/com/fsck/k9/account/AccountColorPicker.kt (100%) rename {app => legacy}/common/src/main/java/com/fsck/k9/account/AccountCreator.kt (100%) rename {app => legacy}/common/src/main/java/com/fsck/k9/account/AccountModule.kt (100%) rename {app => legacy}/common/src/main/java/com/fsck/k9/account/AccountOwnerNameProvider.kt (100%) rename {app => legacy}/common/src/main/java/com/fsck/k9/account/AccountServerSettingsUpdater.kt (100%) rename {app => legacy}/common/src/main/java/com/fsck/k9/account/AccountStateLoader.kt (100%) rename {app => legacy}/common/src/main/java/com/fsck/k9/account/DeletePolicyHelper.kt (100%) rename {app => legacy}/common/src/main/java/com/fsck/k9/backends/AccountAuthStateStorage.kt (100%) rename {app => legacy}/common/src/main/java/com/fsck/k9/backends/AndroidAlarmManager.kt (100%) rename {app => legacy}/common/src/main/java/com/fsck/k9/backends/ImapBackendFactory.kt (100%) rename {app => legacy}/common/src/main/java/com/fsck/k9/backends/ImapServerSettingsExtensions.kt (100%) rename {app => legacy}/common/src/main/java/com/fsck/k9/backends/KoinModule.kt (100%) rename {app => legacy}/common/src/main/java/com/fsck/k9/backends/Pop3BackendFactory.kt (100%) rename {app => legacy}/common/src/main/java/com/fsck/k9/backends/RealOAuth2TokenProvider.kt (100%) rename {app => legacy}/common/src/main/java/com/fsck/k9/backends/RealOAuth2TokenProviderFactory.kt (100%) rename {app => legacy}/common/src/main/java/com/fsck/k9/feature/AccountSetupFinishedLauncher.kt (100%) rename {app => legacy}/common/src/main/java/com/fsck/k9/feature/FeatureModule.kt (100%) rename {app => legacy}/common/src/main/java/com/fsck/k9/featureflag/InMemoryFeatureFlagFactory.kt (100%) rename {app => legacy}/common/src/main/java/com/fsck/k9/glide/K9AppGlideModule.java (100%) rename {app => legacy}/common/src/main/java/com/fsck/k9/notification/K9NotificationActionCreator.kt (100%) rename {app => legacy}/common/src/main/java/com/fsck/k9/notification/K9NotificationResourceProvider.kt (100%) rename {app => legacy}/common/src/main/java/com/fsck/k9/notification/K9NotificationStrategy.kt (100%) rename {app => legacy}/common/src/main/java/com/fsck/k9/notification/KoinModule.kt (100%) rename {app => legacy}/common/src/main/java/com/fsck/k9/resources/K9AutocryptStringProvider.kt (100%) rename {app => legacy}/common/src/main/java/com/fsck/k9/resources/K9CoreResourceProvider.kt (100%) rename {app => legacy}/common/src/main/java/com/fsck/k9/resources/KoinModule.kt (100%) rename {app => legacy}/common/src/main/res/values/manifest_values.xml (100%) rename {app => legacy}/common/src/test/java/com/fsck/k9/account/AccountServerSettingsUpdaterTest.kt (100%) rename {app => legacy}/common/src/test/java/com/fsck/k9/account/AccountStateLoaderTest.kt (100%) rename {app => legacy}/common/src/test/java/com/fsck/k9/account/DeletePolicyHelperTest.kt (100%) rename {app => legacy}/common/src/test/java/com/fsck/k9/account/FakeAccountManager.kt (100%) rename {app => legacy}/core/build.gradle.kts (93%) rename {app => legacy}/core/src/main/AndroidManifest.xml (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/Account.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/AccountPreferenceSerializer.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/AccountRemovedListener.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/AccountsChangeListener.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/AppConfig.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/BaseAccount.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/Core.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/CoreKoinModules.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/CoreResourceProvider.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/DI.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/EmailAddressValidator.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/FontSizes.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/Identity.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/K9.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/KoinModule.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/LocalKeyStoreManager.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/NotificationLight.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/NotificationSettings.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/NotificationVibration.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/Preferences.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/QuietTimeChecker.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/ServerSettingsSerializer.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/StrictMode.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/SwipeAction.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/TimberLogger.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/UiDensity.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/autocrypt/AutocryptDraftStateHeader.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/autocrypt/AutocryptDraftStateHeaderParser.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/autocrypt/AutocryptGossipHeader.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/autocrypt/AutocryptGossipHeaderParser.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/autocrypt/AutocryptHeader.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/autocrypt/AutocryptHeaderParser.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/autocrypt/AutocryptOpenPgpApiInteractor.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/autocrypt/AutocryptOperations.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/autocrypt/AutocryptStringProvider.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/autocrypt/AutocryptTransferMessageCreator.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/autocrypt/KoinModule.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/backend/BackendFactory.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/backend/BackendManager.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/contact/ContactIntentHelper.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/controller/ControllerExtension.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/controller/DraftOperations.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/controller/KoinModule.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/controller/LocalDeleteOperationDecider.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/controller/MemorizingMessagingListener.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/controller/MessageCountsProvider.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/controller/MessageReference.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/controller/MessageReferenceHelper.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/controller/MessagingController.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/controller/MessagingControllerCommands.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/controller/MessagingListener.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/controller/NotificationOperations.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/controller/NotificationState.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/controller/PendingCommandSerializer.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/controller/Preconditions.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/controller/ProgressBodyFactory.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/controller/SimpleMessagingListener.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/controller/UidReverseComparator.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/controller/push/AccountPushController.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/controller/push/AccountPushControllerFactory.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/controller/push/AlarmPermissionManager.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/controller/push/AlarmPermissionManagerApi21.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/controller/push/AlarmPermissionManagerApi31.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/controller/push/AutoSyncManager.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/controller/push/BootCompleteReceiver.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/controller/push/KoinModule.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/controller/push/PushController.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/controller/push/PushService.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/controller/push/PushServiceManager.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/crypto/EncryptionExtractor.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/crypto/KoinModule.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/crypto/MessageCryptoStructureDetector.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/crypto/OpenPgpApiHelper.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/helper/AndroidKeyStoreDirectoryProvider.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/helper/ClipboardManager.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/helper/CollectionExtensions.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/helper/ContactNameProvider.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/helper/Contacts.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/helper/CrLfConverter.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/helper/DefaultTrustedSocketFactory.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/helper/FileHelper.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/helper/IdentityHelper.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/helper/KeyChainKeyManager.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/helper/KoinModule.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/helper/ListHeaders.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/helper/ListUnsubscribeHelper.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/helper/MailTo.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/helper/MessageHelper.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/helper/MimeTypeUtil.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/helper/MutableBoolean.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/helper/NamedThreadFactory.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/helper/ParcelableUtil.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/helper/ReplyToParser.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/helper/RetainFragment.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/helper/SimpleTextWatcher.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/helper/SingleLiveEvent.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/helper/StringHelper.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/helper/Timing.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/helper/UnsubscribeUri.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/helper/UrlEncodingHelper.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/helper/Utility.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/helper/jsoup/AdvancedNodeTraversor.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/helper/jsoup/NodeFilter.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/job/K9JobManager.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/job/K9WorkerFactory.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/job/KoinModule.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/job/MailSyncWorker.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/job/MailSyncWorkerManager.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/job/WorkManagerConfigurationProvider.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/logging/KoinModule.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/logging/LogFileWriter.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/logging/ProcessExecutor.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mail/MailServerDirection.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/AttachmentResolver.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/AttachmentViewInfo.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/AutoExpandFolderBackendFoldersRefreshListener.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/BackendFoldersRefreshListener.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/BinaryAttachmentBody.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/CacheAwareMessageMapper.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/CreateFolderInfo.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/CryptoResultAnnotation.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/DatabasePreviewType.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/DeferredFileBody.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/FileBackedBody.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/FolderMapper.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/FolderNotFoundException.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/FolderRepository.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/FolderSettings.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/FolderSettingsProvider.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/FolderTypeConverter.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/K9BackendFolder.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/K9BackendStorage.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/K9BackendStorageFactory.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/KoinModule.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/ListenableMessageStore.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/LocalBodyPart.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/LocalFolder.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/LocalMessage.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/LocalMimeMessage.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/LocalPart.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/LocalStore.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/LocalStoreProvider.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/LockableDatabase.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/MessageColumns.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/MessageCryptoAnnotations.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/MessageDetails.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/MessageHelper.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/MessageListCache.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/MessageListRepository.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/MessageMapper.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/MessageNotFoundException.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/MessageRepository.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/MessageStore.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/MessageStoreFactory.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/MessageStoreManager.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/MessageViewInfo.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/MessageViewInfoExtractor.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/MessageViewInfoExtractorFactory.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/MigrationsHelper.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/MimePartStreamParser.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/MoreMessages.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/NotificationMessage.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/NotifierMessageStore.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/OutboxState.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/OutboxStateRepository.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/SaveMessageData.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/SaveMessageDataCreator.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/SchemaDefinitionFactory.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/SendState.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/SpecialFolderBackendFoldersRefreshListener.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/SpecialFolderSelectionStrategy.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/SpecialFolderUpdater.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/SpecialLocalFoldersCreator.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/StorageManager.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/TempFileBody.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/util/DeferredFileOutputStream.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/mailstore/util/FileFactory.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/Attachment.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/AutocryptStatusInteractor.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/ComposePgpEnableByDefaultDecider.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/ComposePgpInlineDecider.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/CryptoStatus.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/IdentityField.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/IdentityHeaderBuilder.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/IdentityHeaderParser.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/MessageBuilder.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/PgpMessageBuilder.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/QuotedTextMode.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/ReplyActionStrategy.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/SimpleMessageBuilder.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/SimpleMessageFormat.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/TextBodyBuilder.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/extractors/AttachmentCounter.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/extractors/AttachmentInfoExtractor.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/extractors/BasicPartInfoExtractor.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/extractors/BodyTextExtractor.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/extractors/KoinModule.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/extractors/MessageFulltextCreator.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/extractors/MessagePreviewCreator.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/extractors/PreviewExtractionException.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/extractors/PreviewResult.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/extractors/PreviewTextExtractor.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/extractors/TextPartFinder.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/html/DisplayHtml.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/html/DisplayHtmlFactory.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/html/DividerReplacer.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/html/EmailSection.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/html/EmailSectionExtractor.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/html/EmailTextToHtml.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/html/GenericUriParser.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/html/HtmlConverter.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/html/HtmlModification.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/html/HtmlProcessorFactory.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/html/HtmlSettings.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/html/HtmlToPlainText.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/html/HttpUriParser.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/html/KoinModule.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/html/SignatureWrapper.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/html/TextToHtml.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/html/UriLinkifier.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/html/UriMatch.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/html/UriMatcher.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/html/UriParser.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/quote/HtmlQuoteCreator.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/quote/InsertableHtmlContent.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/quote/KoinModule.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/quote/QuoteDateFormatter.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/quote/TextQuoteCreator.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/signature/HtmlSignatureRemover.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/message/signature/TextSignatureRemover.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/network/ConnectivityManager.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi21.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi23.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi24.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/network/ConnectivityManagerBase.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/network/KointModule.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/notification/AddNotificationResult.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/notification/AuthenticationErrorNotificationController.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/notification/BackgroundWorkNotificationController.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/notification/BaseNotificationDataCreator.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/notification/CertificateErrorNotificationController.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/notification/CoreKoinModule.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/notification/LockScreenNotificationCreator.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/notification/NewMailNotificationController.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/notification/NewMailNotificationData.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/notification/NewMailNotificationManager.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/notification/NotificationActionCreator.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/notification/NotificationActionService.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/notification/NotificationChannelManager.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/notification/NotificationConfigurationConverter.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/notification/NotificationContent.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/notification/NotificationContentCreator.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/notification/NotificationController.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/notification/NotificationData.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/notification/NotificationDataStore.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/notification/NotificationGroupKeys.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/notification/NotificationHelper.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/notification/NotificationHolder.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/notification/NotificationIds.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/notification/NotificationLightDecoder.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/notification/NotificationRepository.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/notification/NotificationResourceProvider.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/notification/NotificationSettingsUpdater.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/notification/NotificationStore.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/notification/NotificationStoreOperation.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/notification/NotificationStoreProvider.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/notification/NotificationStrategy.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/notification/NotificationVibrationDecoder.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/notification/PushNotificationManager.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/notification/RealBackgroundWorkNotificationController.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/notification/RemoveNotificationsResult.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/notification/SendFailedNotificationController.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/notification/SingleMessageNotificationCreator.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/notification/SingleMessageNotificationDataCreator.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/notification/SummaryNotificationCreator.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/notification/SummaryNotificationDataCreator.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/notification/SyncNotificationController.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/power/AndroidPowerManager.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/power/KoinModule.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/AccountManager.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/AccountSettingsDescriptions.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/AccountSettingsUpgrader.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/AccountSettingsValidator.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/AccountSettingsWriter.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/FolderSettingsDescriptions.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/FolderSettingsProvider.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/FolderSettingsUpgrader.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/FolderSettingsValidator.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/FolderSettingsWriter.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/GeneralSettings.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsDescriptions.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsManager.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsUpgrader.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsValidator.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsWriter.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/IdentitySettingsDescriptions.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/IdentitySettingsUpgrader.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/IdentitySettingsValidator.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/IdentitySettingsWriter.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/ImportContents.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/ImportResults.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/KoinModule.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/NoDefaultStringEnumSetting.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/RealGeneralSettingsManager.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/ServerSettingsDescriptions.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/ServerSettingsUpgrader.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/ServerSettingsValidator.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/ServerSettingsWriter.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/ServerTypeConverter.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/Settings.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/SettingsExporter.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/SettingsFile.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/SettingsFileParser.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/SettingsImportExportException.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/SettingsImporter.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/SettingsParserException.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/Storage.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/StorageEditor.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/StoragePersister.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/StringEnumSetting.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/ValidatedSettings.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/upgrader/AccountSettingsUpgraderTo53.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/upgrader/AccountSettingsUpgraderTo54.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/upgrader/AccountSettingsUpgraderTo74.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/upgrader/AccountSettingsUpgraderTo80.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/upgrader/AccountSettingsUpgraderTo81.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/upgrader/AccountSettingsUpgraderTo91.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/upgrader/GeneralSettingsUpgraderTo24.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/upgrader/GeneralSettingsUpgraderTo31.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/upgrader/GeneralSettingsUpgraderTo58.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/upgrader/GeneralSettingsUpgraderTo69.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/upgrader/GeneralSettingsUpgraderTo79.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/upgrader/GeneralSettingsUpgraderTo89.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/upgrader/ServerSettingsUpgraderTo92.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/upgrader/ServerSettingsUpgraderTo94.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/preferences/upgrader/ServerSettingsUpgraderTo95.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/provider/AttachmentProvider.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/provider/AttachmentTempFileProvider.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/provider/DecryptedFileProvider.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/provider/RawMessageProvider.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/search/AccountSearchConditions.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/search/ConditionsTreeNode.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/search/LocalSearch.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/search/LocalSearchExtensions.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/search/SearchAccount.kt (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/search/SearchSpecification.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/search/SqlQueryBuilder.java (100%) rename {app => legacy}/core/src/main/java/com/fsck/k9/service/DatabaseUpgradeService.java (100%) rename {app => legacy}/core/src/main/res/values/arrays_account_settings_values.xml (100%) rename {app => legacy}/core/src/main/res/values/arrays_drawer.xml (100%) rename {app => legacy}/core/src/main/res/values/arrays_general_settings_values.xml (100%) rename {app => legacy}/core/src/main/res/values/k9_tonal_palette.xml (100%) rename {app => legacy}/core/src/main/res/values/material_colors.xml (100%) rename {app => legacy}/core/src/main/res/xml/decrypted_file_provider_paths.xml (100%) rename {app => legacy}/core/src/main/res/xml/temp_file_provider_paths.xml (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/EmailAddressValidatorTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/K9RobolectricTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/QuietTimeCheckerTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/ServerSettingsSerializerTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/TestApp.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/TestCoreResourceProvider.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/autocrypt/AutocryptDraftStateHeaderParserTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/autocrypt/AutocryptGossipHeaderParserTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/autocrypt/AutocryptHeaderParserTest.java (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/autocrypt/AutocryptHeaderTest.java (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/controller/DefaultMessageCountsProviderTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/controller/LocalDeleteOperationDeciderTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/controller/MessageReferenceTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/controller/MessagingControllerTest.java (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/controller/PendingCommandSerializerTest.java (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/controller/UidReverseComparatorTest.java (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/crypto/MessageCryptoStructureDetectorTest.java (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/crypto/OpenPgpApiHelperTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/helper/EmailHelperTest.java (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/helper/IdentityHelperTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/helper/ListHeadersTest.java (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/helper/ListUnsubscribeHelperTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/helper/MailToTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/helper/MessageHelperTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/helper/ReplyToParserTest.java (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/helper/UtilityTest.java (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/logging/LogcatLogFileWriterTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/mailstore/AttachmentResolverTest.java (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/mailstore/DeferredFileBodyTest.java (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/mailstore/K9BackendFolderTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/mailstore/K9BackendStorageTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/mailstore/LocalStoreTest.java (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/mailstore/MessageListCacheTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/mailstore/MessageListRepositoryTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/mailstore/MessageStoreManagerTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/mailstore/MessageViewInfoExtractorTest.java (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/mailstore/MimePartStreamParserTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/mailstore/MoreMessagesTest.java (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/message/IdentityHeaderBuilderTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/message/IdentityHeaderParserTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/message/MessageBuilderTest.java (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/message/MessageCreationHelper.java (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/message/ReplyActionStrategyTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/message/TextBodyBuilderTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/message/extractors/AttachmentInfoExtractorTest.java (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/message/extractors/BasicPartInfoExtractorTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/message/extractors/MessagePreviewCreatorTest.java (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/message/extractors/PreviewTextExtractorTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/message/extractors/TextPartFinderTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/message/html/DisplayHtmlTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/message/html/EmailSectionExtractorTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/message/html/EmailSectionTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/message/html/GenericUriParserTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/message/html/HtmlConverterTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/message/html/HtmlHelper.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/message/html/HttpUriParserTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/message/html/UriMatcherTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/message/quote/QuoteDateFormatterTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/message/quote/TextQuoteCreatorTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/message/signature/HtmlSignatureRemoverTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/message/signature/TextSignatureRemoverTest.java (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/notification/AuthenticationErrorNotificationControllerTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/notification/BaseNotificationDataCreatorTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/notification/CertificateErrorNotificationControllerTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/notification/LockScreenNotificationCreatorTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/notification/NewMailNotificationManagerTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/notification/NotificationContentCreatorTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/notification/NotificationDataStoreTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/notification/NotificationIdsTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/notification/SendFailedNotificationControllerTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/notification/SingleMessageNotificationDataCreatorTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/notification/SummaryNotificationDataCreatorTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/notification/SyncNotificationControllerTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/notification/TestNotificationResourceProvider.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/preferences/ServerSettingsUpgraderTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/preferences/ServerSettingsValidatorTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/preferences/SettingsExporterTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/preferences/SettingsFileParserTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/preferences/SettingsImporterTest.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/preferences/upgrader/ServerSettingsUpgraderTo92Test.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/preferences/upgrader/ServerSettingsUpgraderTo94Test.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/preferences/upgrader/ServerSettingsUpgraderTo95Test.kt (100%) rename {app => legacy}/core/src/test/java/com/fsck/k9/sasl/OAuthBearerTest.kt (100%) rename {app => legacy}/core/src/test/resources/autocrypt/no_autocrypt.eml (100%) rename {app => legacy}/core/src/test/resources/autocrypt/rsa2048-broken-base64.eml (100%) rename {app => legacy}/core/src/test/resources/autocrypt/rsa2048-explicit-type.eml (100%) rename {app => legacy}/core/src/test/resources/autocrypt/rsa2048-simple-to-bot.eml (100%) rename {app => legacy}/core/src/test/resources/autocrypt/rsa2048-simple.eml (100%) rename {app => legacy}/core/src/test/resources/autocrypt/rsa2048-unknown-critical.eml (100%) rename {app => legacy}/core/src/test/resources/autocrypt/rsa2048-unknown-non-critical.eml (100%) rename {app => legacy}/core/src/test/resources/autocrypt/unknown-type.eml (100%) rename {app => legacy}/crypto-openpgp/build.gradle.kts (76%) rename {app => legacy}/crypto-openpgp/src/main/java/com/fsck/k9/crypto/openpgp/EncryptionDetector.java (100%) rename {app => legacy}/crypto-openpgp/src/main/java/com/fsck/k9/crypto/openpgp/OpenPgpEncryptionExtractor.kt (100%) rename {app => legacy}/crypto-openpgp/src/test/java/com/fsck/k9/crypto/openpgp/EncryptionDetectorTest.java (100%) rename {app => legacy}/crypto-openpgp/src/test/java/com/fsck/k9/crypto/openpgp/MessageCreationHelper.java (100%) rename {app => legacy}/storage/build.gradle.kts (83%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/preferences/K9StorageEditor.java (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/preferences/K9StoragePersister.java (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/preferences/migration/DefaultStorageMigrationHelper.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationHelper.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo10.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo11.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo12.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo13.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo14.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo15.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo16.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo17.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo18.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo19.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo2.java (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo20.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo21.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo22.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo23.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo24.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo25.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo3.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo4.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo5.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo6.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo7.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo8.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrations.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/preferences/migration/migration12/ImapStoreUriDecoder.java (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/preferences/migration/migration12/Pop3StoreUriDecoder.java (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/preferences/migration/migration12/SmtpTransportUriDecoder.java (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/preferences/migration/migration12/WebDavStoreUriDecoder.java (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/K9SchemaDefinitionFactory.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/KoinModule.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/StoreSchemaDefinition.java (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/messages/AttachmentFileManager.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/messages/CheckFolderOperations.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/messages/ChunkedDatabaseOperations.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/messages/CopyMessageOperations.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/messages/CreateFolderOperations.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/messages/DataLocation.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/messages/DatabaseOperations.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/messages/DeleteFolderOperations.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/messages/DeleteMessageOperations.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/messages/FlagMessageOperations.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/messages/K9MessageStore.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/messages/K9MessageStoreFactory.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/messages/KeyValueStoreOperations.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/messages/MoveMessageOperations.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/messages/RetrieveFolderOperations.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/messages/RetrieveMessageListOperations.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/messages/RetrieveMessageOperations.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/messages/SaveMessageOperations.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/messages/ThreadMessageOperations.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/messages/UpdateFolderOperations.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/messages/UpdateMessageOperations.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/migrations/LegacyPendingAppend.java (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/migrations/LegacyPendingCommand.java (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/migrations/LegacyPendingDelete.java (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/migrations/LegacyPendingExpunge.java (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/migrations/LegacyPendingMarkAllAsRead.java (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/migrations/LegacyPendingMoveAndMarkAsRead.java (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/migrations/LegacyPendingMoveOrCopy.java (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/migrations/LegacyPendingSetFlag.java (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo62.java (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo64.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo65.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo66.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo67.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo68.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo69.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo70.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo71.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo72.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo73.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo74.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo75.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo76.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo78.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo79.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo80.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo81.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo82.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo83.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo84.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/migrations/Migrations.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/notifications/K9NotificationStore.kt (100%) rename {app => legacy}/storage/src/main/java/com/fsck/k9/storage/notifications/K9NotificationStoreProvider.kt (100%) rename {app => legacy}/storage/src/test/java/com/fsck/k9/preferences/PreferencesDatabaseTestHelper.kt (100%) rename {app => legacy}/storage/src/test/java/com/fsck/k9/preferences/StorageEditorTest.kt (100%) rename {app => legacy}/storage/src/test/java/com/fsck/k9/preferences/StoragePersisterTest.kt (100%) rename {app => legacy}/storage/src/test/java/com/fsck/k9/preferences/migration/StorageMigrationTo22Test.kt (100%) rename {app => legacy}/storage/src/test/java/com/fsck/k9/preferences/migration/StorageMigrationTo24Test.kt (100%) rename {app => legacy}/storage/src/test/java/com/fsck/k9/preferences/migration/StorageMigrationTo25Test.kt (100%) rename {app => legacy}/storage/src/test/java/com/fsck/k9/storage/K9RobolectricTest.kt (100%) rename {app => legacy}/storage/src/test/java/com/fsck/k9/storage/RobolectricTest.kt (100%) rename {app => legacy}/storage/src/test/java/com/fsck/k9/storage/StoreSchemaDefinitionTest.java (100%) rename {app => legacy}/storage/src/test/java/com/fsck/k9/storage/TestApp.kt (100%) rename {app => legacy}/storage/src/test/java/com/fsck/k9/storage/messages/CheckFolderOperationsTest.kt (100%) rename {app => legacy}/storage/src/test/java/com/fsck/k9/storage/messages/ChunkedDatabaseOperationsTest.kt (100%) rename {app => legacy}/storage/src/test/java/com/fsck/k9/storage/messages/CopyMessageOperationsTest.kt (100%) rename {app => legacy}/storage/src/test/java/com/fsck/k9/storage/messages/CreateFolderOperationsTest.kt (100%) rename {app => legacy}/storage/src/test/java/com/fsck/k9/storage/messages/DeleteFolderOperationsTest.kt (100%) rename {app => legacy}/storage/src/test/java/com/fsck/k9/storage/messages/DeleteMessageOperationsTest.kt (100%) rename {app => legacy}/storage/src/test/java/com/fsck/k9/storage/messages/FileHelpers.kt (100%) rename {app => legacy}/storage/src/test/java/com/fsck/k9/storage/messages/FlagMessageOperationsTest.kt (100%) rename {app => legacy}/storage/src/test/java/com/fsck/k9/storage/messages/FolderHelpers.kt (100%) rename {app => legacy}/storage/src/test/java/com/fsck/k9/storage/messages/KeyValueHelpers.kt (100%) rename {app => legacy}/storage/src/test/java/com/fsck/k9/storage/messages/KeyValueStoreOperationsTest.kt (100%) rename {app => legacy}/storage/src/test/java/com/fsck/k9/storage/messages/MessageDatabaseHelpers.kt (100%) rename {app => legacy}/storage/src/test/java/com/fsck/k9/storage/messages/MessagePartDatabaseHelpers.kt (100%) rename {app => legacy}/storage/src/test/java/com/fsck/k9/storage/messages/MoveMessageOperationsTest.kt (100%) rename {app => legacy}/storage/src/test/java/com/fsck/k9/storage/messages/RetrieveFolderOperationsTest.kt (100%) rename {app => legacy}/storage/src/test/java/com/fsck/k9/storage/messages/RetrieveMessageListOperationsTest.kt (100%) rename {app => legacy}/storage/src/test/java/com/fsck/k9/storage/messages/RetrieveMessageOperationsTest.kt (100%) rename {app => legacy}/storage/src/test/java/com/fsck/k9/storage/messages/SaveMessageOperationsTest.kt (100%) rename {app => legacy}/storage/src/test/java/com/fsck/k9/storage/messages/ThreadDatabaseHelpers.kt (100%) rename {app => legacy}/storage/src/test/java/com/fsck/k9/storage/messages/ThreadMessageOperationsTest.kt (100%) rename {app => legacy}/storage/src/test/java/com/fsck/k9/storage/messages/UpdateFolderOperationsTest.kt (100%) rename {app => legacy}/storage/src/test/java/com/fsck/k9/storage/messages/UpdateMessageOperationsTest.kt (100%) rename {app => legacy}/storage/src/test/java/com/fsck/k9/storage/notifications/K9NotificationStoreTest.kt (100%) rename {app => legacy}/storage/src/test/java/com/fsck/k9/storage/notifications/NotificationsTableHelpers.kt (100%) rename {app => legacy}/storage/src/test/resources/attach/k9small.png (100%) rename {app => legacy}/testing/build.gradle.kts (85%) rename {app => legacy}/testing/src/main/java/com/fsck/k9/preferences/InMemoryStoragePersister.kt (100%) rename {app => legacy}/testing/src/main/java/com/fsck/k9/testing/MockHelper.kt (100%) rename {app => legacy}/testing/src/main/java/com/fsck/k9/testing/StringExtensions.kt (100%) rename {app => legacy}/ui/base/build.gradle.kts (92%) rename {app => legacy}/ui/base/src/main/AndroidManifest.xml (100%) rename {app => legacy}/ui/base/src/main/java/com/fsck/k9/ui/base/AppLanguageManager.kt (100%) rename {app => legacy}/ui/base/src/main/java/com/fsck/k9/ui/base/K9Activity.kt (100%) rename {app => legacy}/ui/base/src/main/java/com/fsck/k9/ui/base/KoinModule.kt (100%) rename {app => legacy}/ui/base/src/main/java/com/fsck/k9/ui/base/LocaleContextWrapper.kt (100%) rename {app => legacy}/ui/base/src/main/java/com/fsck/k9/ui/base/ThemeManager.kt (100%) rename {app => legacy}/ui/base/src/main/java/com/fsck/k9/ui/base/ThemeProvider.kt (100%) rename {app => legacy}/ui/base/src/main/java/com/fsck/k9/ui/base/bundle/BundleExtensions.kt (100%) rename {app => legacy}/ui/base/src/main/java/com/fsck/k9/ui/base/extensions/ConfigurationExtensions.kt (100%) rename {app => legacy}/ui/base/src/main/java/com/fsck/k9/ui/base/extensions/FragmentExtensions.kt (100%) rename {app => legacy}/ui/base/src/main/java/com/fsck/k9/ui/base/extensions/NavigationExtensions.kt (100%) rename {app => legacy}/ui/base/src/main/java/com/fsck/k9/ui/base/livedata/LiveDataExtensions.kt (100%) rename {app => legacy}/ui/base/src/main/java/com/fsck/k9/ui/base/loader/LiveDataLoader.kt (100%) rename {app => legacy}/ui/base/src/main/java/com/fsck/k9/ui/base/loader/LoaderStateObserver.kt (100%) rename {app => legacy}/ui/base/src/main/java/com/fsck/k9/ui/base/locale/LocaleBroadcastReceiver.kt (100%) rename {app => legacy}/ui/base/src/main/java/com/fsck/k9/ui/base/locale/SystemLocaleManager.kt (100%) rename {app => legacy}/ui/base/src/main/res/layout/toolbar.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-ar/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-az/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-be/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-bg/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-br/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-bs/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-ca/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-co/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-cs/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-cy/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-da/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-de/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-el/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-en-rGB/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-eo/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-es/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-et/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-eu/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-fa/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-fi/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-fr/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-fy/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-gd/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-gl/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-hi/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-hr/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-hu/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-hy/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-in/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-is/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-it/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-iw/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-ja/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-ka/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-ko/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-lt/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-lv/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-ml/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-nb/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-nl/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-nn/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-pl/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-pt-rBR/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-pt-rPT/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-ro/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-ru/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-sk/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-sl/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-sq/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-sr/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-sv/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-ta-rIN/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-tr/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-uk/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-vi/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-zh-rCN/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values-zh-rTW/strings.xml (100%) rename {app => legacy}/ui/base/src/main/res/values/dimensions.xml (100%) rename {app => legacy}/ui/base/src/main/res/values/strings.xml (100%) rename {app => legacy}/ui/legacy/build.gradle.kts (92%) rename {app => legacy}/ui/legacy/src/main/AndroidManifest.xml (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/UiKoinModules.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/account/AccountRemover.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/account/AccountRemoverWorker.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/account/BackgroundAccountRemover.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/account/KoinModule.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/activity/AccountList.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/activity/AlternateRecipientAdapter.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/activity/ChooseIdentity.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/activity/EditIdentity.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/activity/FolderInfoHolder.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/activity/K9ListActivity.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/activity/KoinModule.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/activity/ManageIdentities.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/activity/MessageCompose.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/activity/MessageListActivityConfig.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/activity/MessageLoaderHelper.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/activity/MessageLoaderHelperFactory.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/activity/Search.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/activity/UpgradeDatabases.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/activity/compose/AttachmentPresenter.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/activity/compose/ComposeCryptoStatus.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/activity/compose/IdentityAdapter.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/activity/compose/MessageActions.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/activity/compose/PgpEnabledErrorDialog.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/activity/compose/PgpEncryptDescriptionDialog.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/activity/compose/PgpInlineDialog.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/activity/compose/PgpSignOnlyDialog.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientAdapter.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientLoader.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientMvpView.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientPresenter.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/activity/compose/ReplyToPresenter.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/activity/compose/ReplyToView.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/activity/compose/SaveMessageTask.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/activity/loader/AttachmentContentLoader.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/activity/loader/AttachmentInfoLoader.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/activity/misc/Attachment.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/activity/misc/ContactPicture.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/activity/misc/InlineAttachment.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupComposition.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactImage.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactImageBitmapDecoder.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactImageModelLoader.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactLetterBitmapConfig.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactLetterBitmapCreator.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactLetterExtractor.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactPhotoLoader.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactPictureGlideModule.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactPictureLoader.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/contacts/KoinModule.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/fragment/AttachmentDownloadDialogFragment.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/fragment/ConfirmationDialogFragment.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/fragment/ProgressDialogFragment.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/ContactBadge.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/FlowExtensions.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/K9ThemeProvider.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/KoinModule.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/ThemeExtensions.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountFallbackImageProvider.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountImageLoader.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountImageModelLoader.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountsViewModel.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/account/DisplayAccount.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/account/KoinModule.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/ChangeLogManager.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/ChangelogFragment.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/ChangelogViewModel.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/KoinModule.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/RecentChangesActivity.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/RecentChangesViewModel.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/choosefolder/ChooseFolderActivity.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/choosefolder/ChooseFolderViewModel.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/choosefolder/FolderListItem.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/choosefolder/KoinModule.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/compose/QuotedMessageMvpView.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/compose/QuotedMessagePresenter.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/compose/RecipientCircleImageView.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/compose/RecipientTokenConstraintLayout.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/compose/SimpleHighlightView.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/compose/WrapUriTextWatcher.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoCallback.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoHelper.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/crypto/OpenPgpApiFactory.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptKeyTransferActivity.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptKeyTransferPresenter.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptKeyTransferViewModel.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptSetupMessageLiveEvent.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptSetupTransferLiveEvent.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/KoinModule.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/fab/HideFabOnScrollBehavior.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/folders/FolderIconProvider.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/folders/FolderNameFormatter.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/folders/FoldersViewModel.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/folders/KoinModule.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/helper/BottomBaselineTextView.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/helper/ContextExtensions.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/helper/DisplayAddressHelper.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/helper/DisplayHtmlUiFactory.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/helper/HtmlSettingsProvider.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/helper/RelativeDateTimeFormatter.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/helper/SizeFormatter.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/identity/IdentityFormatter.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/identity/KoinModule.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderListItem.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderSettingsDataStore.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderSettingsFragment.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderSettingsViewModel.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/KoinModule.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/ManageFoldersActivity.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/ManageFoldersFragment.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/ManageFoldersViewModel.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/message/LocalMessageExtractorLoader.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/message/LocalMessageLoader.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/AddToContactsLauncher.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/ContactSettingsProvider.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/CryptoStatusItem.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/EmptyItem.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/FolderNameItem.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/KoinModule.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDateItem.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsAppearance.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsDividerItem.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsFragment.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsParticipantFormatter.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsUi.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsViewModel.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/ParticipantItem.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/SectionHeaderItem.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/ShowContactLauncher.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/DefaultFolderProvider.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/KoinModule.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListAdapter.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListAppearance.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListConfig.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListFragment.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListHandler.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListItem.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListItemAnimator.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListItemMapper.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListLiveData.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListLiveDataFactory.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListLoader.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListSwipeCallback.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListViewHolder.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListViewModel.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MlfUtils.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/SortTypeToastProvider.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/SwipeResourceProvider.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messagesource/KoinModule.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messagesource/MessageHeadersFragment.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messagesource/MessageHeadersViewModel.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messagesource/MessageSourceActivity.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/AttachmentController.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/AttachmentView.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/AttachmentViewCallback.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/DisplayRecipientsExtractor.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/KoinModule.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/LinkTextHandler.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/LockedAttachmentView.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageContainerView.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageCryptoPresenter.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageHeaderClickListener.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageTopView.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewContainerFragment.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewRecipientFormatter.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/PlaceholderFragment.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/RecipientLayoutCreator.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/RecipientNamesView.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/TouchInterceptView.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/notification/DeleteConfirmationActivity.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/push/PushInfoActivity.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/push/PushInfoFragment.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/settings/AboutFragment.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/settings/AccountItem.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/settings/KoinModule.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/settings/PreferenceExtras.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsActionItem.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsActivity.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsDividerItem.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsListFragment.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsViewModel.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/settings/UrlActionItem.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSelectionSpinner.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsActivity.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsDataStore.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsDataStoreFactory.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsFragment.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsViewModel.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AutocryptPreferEncryptDialogFragment.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AutocryptPreferEncryptPreference.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/FolderListPreference.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/NotificationSoundPreference.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/NotificationsPreference.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/OpenPgpAppSelectDialog.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/VibrationDialogFragment.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/VibrationPreference.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/Vibrator.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/CheckBoxItem.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/SettingsExportFragment.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/SettingsExportListItems.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/SettingsExportUiModel.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/SettingsExportViewModel.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsActivity.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsDataStore.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsFragment.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsViewModel.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/LanguagePreference.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/ui/share/ShareIntentBuilder.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/view/DraggableFrameLayout.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/view/HighlightDialogFragment.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/view/K9WebViewClient.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/view/KoinModule.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/view/LinearViewAnimator.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/view/MessageCryptoDisplayStatus.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/view/MessageHeader.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/view/MessageWebView.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/view/NonLockingScrollView.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/view/RecipientSelectView.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/view/StatusIndicator.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/view/ThemeUtils.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/view/ToolableViewAnimator.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/view/UserInputEmailAddressParser.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/view/ViewSwitcher.java (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/view/WebViewClientFactory.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/view/WebViewConfig.kt (100%) rename {app => legacy}/ui/legacy/src/main/java/com/fsck/k9/view/WebViewConfigProvider.kt (100%) rename {app => legacy}/ui/legacy/src/main/res/anim/fade_in.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/anim/fade_out.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/anim/slide_in_left.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/anim/slide_in_right.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/anim/slide_out_left.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/anim/slide_out_right.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/animator/draggable_state_list_anim.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/drawable-hdpi/drawer_header_background.png (100%) rename {app => legacy}/ui/legacy/src/main/res/drawable-hdpi/ic_action_request_read_receipt_light.png (100%) rename {app => legacy}/ui/legacy/src/main/res/drawable-hdpi/notification_icon_check_mail_anim_0.png (100%) rename {app => legacy}/ui/legacy/src/main/res/drawable-hdpi/notification_icon_check_mail_anim_1.png (100%) rename {app => legacy}/ui/legacy/src/main/res/drawable-hdpi/notification_icon_check_mail_anim_2.png (100%) rename {app => legacy}/ui/legacy/src/main/res/drawable-hdpi/notification_icon_check_mail_anim_3.png (100%) rename {app => legacy}/ui/legacy/src/main/res/drawable-hdpi/notification_icon_check_mail_anim_4.png (100%) rename {app => legacy}/ui/legacy/src/main/res/drawable-hdpi/notification_icon_check_mail_anim_5.png (100%) rename {app => legacy}/ui/legacy/src/main/res/drawable-mdpi/drawer_header_background.png (100%) rename {app => legacy}/ui/legacy/src/main/res/drawable-mdpi/ic_action_request_read_receipt_light.png (100%) rename {app => legacy}/ui/legacy/src/main/res/drawable-mdpi/notification_icon_check_mail_anim_0.png (100%) rename {app => legacy}/ui/legacy/src/main/res/drawable-mdpi/notification_icon_check_mail_anim_1.png (100%) rename {app => legacy}/ui/legacy/src/main/res/drawable-mdpi/notification_icon_check_mail_anim_2.png (100%) rename {app => legacy}/ui/legacy/src/main/res/drawable-mdpi/notification_icon_check_mail_anim_3.png (100%) rename {app => legacy}/ui/legacy/src/main/res/drawable-mdpi/notification_icon_check_mail_anim_4.png (100%) rename {app => legacy}/ui/legacy/src/main/res/drawable-mdpi/notification_icon_check_mail_anim_5.png (100%) rename {app => legacy}/ui/legacy/src/main/res/drawable-xhdpi/drawer_header_background.png (100%) rename {app => legacy}/ui/legacy/src/main/res/drawable-xhdpi/ic_action_request_read_receipt_light.png (100%) rename {app => legacy}/ui/legacy/src/main/res/drawable-xhdpi/notification_icon_check_mail_anim_0.png (100%) rename {app => legacy}/ui/legacy/src/main/res/drawable-xhdpi/notification_icon_check_mail_anim_1.png (100%) rename {app => legacy}/ui/legacy/src/main/res/drawable-xhdpi/notification_icon_check_mail_anim_2.png (100%) rename {app => legacy}/ui/legacy/src/main/res/drawable-xhdpi/notification_icon_check_mail_anim_3.png (100%) rename {app => legacy}/ui/legacy/src/main/res/drawable-xhdpi/notification_icon_check_mail_anim_4.png (100%) rename {app => legacy}/ui/legacy/src/main/res/drawable-xhdpi/notification_icon_check_mail_anim_5.png (100%) rename {app => legacy}/ui/legacy/src/main/res/drawable-xxhdpi/drawer_header_background.png (100%) rename {app => legacy}/ui/legacy/src/main/res/drawable/btn_select_star.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/drawable/ic_account_color.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/drawable/ic_status_corner.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/drawable/message_list_item_selection_background.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/drawable/notification_icon_check_mail.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/drawable/rounded_corners.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/drawable/status_dots.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/drawable/status_dots_1.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/drawable/status_dots_2.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/drawable/status_dots_3.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/drawable/status_lock_disabled_dots_1.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/drawable/status_lock_dots_2.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/drawable/status_lock_dots_3.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/drawable/status_lock_error.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/drawable/status_signature_dots_3.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/drawable/thread_count_box_light.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/about_library.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/account_list.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/account_list_item.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/account_setup_composition.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/account_spinner_dropdown_item.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/account_spinner_item.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/accounts_item.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/activity_account_settings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/activity_manage_folders.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/activity_push_info.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/activity_recent_changes.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/activity_settings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/changelog_list_change_item.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/changelog_list_release_item.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/choose_account_item.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/choose_identity_item.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/crypto_key_transfer.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/dialog_autocrypt_prefer_encrypt.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/dialog_openkeychain_info.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/drawer_contents.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/drawer_folder_list_item.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/edit_identity.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/empty_message_view.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/folder_list.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/folder_list_item.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/fragment_about.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/fragment_changelog.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/fragment_manage_folders.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/fragment_push_info.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/fragment_settings_export.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/fragment_settings_list.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/general_settings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/list_content_simple.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/message.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/message_bottom_sheet.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/message_compose.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/message_compose_attachment.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/message_compose_content.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/message_compose_recipients.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/message_container.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/message_content_crypto_cancelled.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/message_content_crypto_error.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/message_content_crypto_incomplete.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/message_content_crypto_no_provider.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/message_details_crypto_status_item.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/message_details_date_item.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/message_details_divider_item.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/message_details_folder_name_item.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/message_details_participant_item.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/message_details_section_header_item.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/message_list.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/message_list_error.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/message_list_fragment.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/message_list_item.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/message_list_item_footer.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/message_list_toolbar.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/message_view_attachment.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/message_view_attachment_locked.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/message_view_container.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/message_view_header.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/message_view_headers.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/message_view_headers_activity.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/openpgp_enabled_error_dialog.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/openpgp_encrypt_description_dialog.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/openpgp_inline_dialog.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/openpgp_sign_only_dialog.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/preference_vibration_pattern_item.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/preference_vibration_switch_item.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/preference_vibration_times_item.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/recipient_alternate_item.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/recipient_dropdown_item.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/recipient_names.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/recipient_token_item.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/select_openpgp_app_item.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/settings_export_account_list_item.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/settings_export_general_list_item.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/split_message_list.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/status_indicator.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/swipe_left_action.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/swipe_right_action.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/text_divider_list_item.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/text_icon_list_item.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/layout/upgrade_databases.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/menu/account_settings_option.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/menu/choose_folder_option.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/menu/debug_settings_option.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/menu/edit_identity_menu.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/menu/folder_list_option.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/menu/folder_settings_option.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/menu/general_settings_option.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/menu/manage_identities_context.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/menu/manage_identities_option.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/menu/message_compose_option.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/menu/message_list_context_menu.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/menu/message_list_option_menu.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/menu/participant_overflow_menu.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/menu/single_message_options.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/navigation/navigation_manage_folders.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/navigation/navigation_settings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/raw-ja/changelog.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/raw/changelog_master.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/transition/transfer_transitions.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-ar/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-az/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-be/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-bg/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-br/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-bs/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-ca/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-co/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-cs/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-cy/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-da/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-de/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-el/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-en-rGB/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-eo/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-es/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-et/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-eu/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-fa/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-fi/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-fr/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-fy/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-gd/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-gl/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-hi/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-hr/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-hu/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-hy/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-in/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-is/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-it/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-iw/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-ja/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-ka/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-ko/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-lt/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-lv/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-ml/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-nb/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-night/themes.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-nl/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-nn/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-pl/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-pt-rBR/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-pt-rPT/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-ro/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-ru/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-sk/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-sl/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-sq/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-sr/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-sv/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-sw360dp/values-preference.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-ta-rIN/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-tr/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-uk/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-vi/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-w360dp/styles.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-zh-rCN/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values-zh-rTW/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values/arrays.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values/arrays_account_settings_strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values/arrays_general_settings_strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values/attrs.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values/colors.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values/constants.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values/contact_picture_fallback_colors.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values/dimensions.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values/ids.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values/message_details_ids.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values/strings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values/styles.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/values/themes.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/xml/account_settings.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/xml/empty_preferences.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/xml/folder_settings_preferences.xml (100%) rename {app => legacy}/ui/legacy/src/main/res/xml/general_settings.xml (100%) rename {app => legacy}/ui/legacy/src/test/AndroidManifest.xml (100%) rename {app => legacy}/ui/legacy/src/test/java/com/fsck/k9/K9RobolectricTest.kt (100%) rename {app => legacy}/ui/legacy/src/test/java/com/fsck/k9/RobolectricTest.kt (100%) rename {app => legacy}/ui/legacy/src/test/java/com/fsck/k9/TestApp.kt (100%) rename {app => legacy}/ui/legacy/src/test/java/com/fsck/k9/TestCoreResourceProvider.kt (100%) rename {app => legacy}/ui/legacy/src/test/java/com/fsck/k9/activity/compose/AttachmentPresenterTest.kt (100%) rename {app => legacy}/ui/legacy/src/test/java/com/fsck/k9/activity/compose/RecipientLoaderTest.java (100%) rename {app => legacy}/ui/legacy/src/test/java/com/fsck/k9/activity/compose/RecipientPresenterTest.kt (100%) rename {app => legacy}/ui/legacy/src/test/java/com/fsck/k9/activity/compose/ReplyToPresenterTest.kt (100%) rename {app => legacy}/ui/legacy/src/test/java/com/fsck/k9/autocrypt/AutocryptOperationsHelper.java (100%) rename {app => legacy}/ui/legacy/src/test/java/com/fsck/k9/contacts/ContactLetterExtractorTest.kt (100%) rename {app => legacy}/ui/legacy/src/test/java/com/fsck/k9/message/PgpMessageBuilderTest.kt (100%) rename {app => legacy}/ui/legacy/src/test/java/com/fsck/k9/ui/K9DrawerTest.kt (100%) rename {app => legacy}/ui/legacy/src/test/java/com/fsck/k9/ui/crypto/MessageCryptoHelperTest.java (100%) rename {app => legacy}/ui/legacy/src/test/java/com/fsck/k9/ui/helper/RelativeDateTimeFormatterTest.kt (100%) rename {app => legacy}/ui/legacy/src/test/java/com/fsck/k9/ui/helper/SizeFormatterTest.kt (100%) rename {app => legacy}/ui/legacy/src/test/java/com/fsck/k9/ui/identity/IdentityFormatterTest.kt (100%) rename {app => legacy}/ui/legacy/src/test/java/com/fsck/k9/ui/messagedetails/MessageDetailsParticipantFormatterTest.kt (100%) rename {app => legacy}/ui/legacy/src/test/java/com/fsck/k9/ui/messagelist/MessageListAdapterTest.kt (100%) rename {app => legacy}/ui/legacy/src/test/java/com/fsck/k9/ui/messageview/DisplayRecipientsExtractorTest.kt (100%) rename {app => legacy}/ui/legacy/src/test/java/com/fsck/k9/ui/messageview/MessageViewRecipientFormatterTest.kt (100%) rename {app => legacy}/ui/legacy/src/test/java/com/fsck/k9/ui/messageview/RecipientLayoutCreatorTest.kt (100%) rename {app => legacy}/ui/legacy/src/test/java/com/fsck/k9/ui/settings/general/GeneralSettingsViewModelTest.kt (100%) rename {app => legacy}/ui/legacy/src/test/java/com/fsck/k9/view/UserInputEmailAddressParserTest.kt (100%) rename {app => legacy}/ui/message-list-widget/build.gradle.kts (100%) diff --git a/app-common/build.gradle.kts b/app-common/build.gradle.kts index 9b00174d6a..952208a075 100644 --- a/app-common/build.gradle.kts +++ b/app-common/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api(projects.app.common) + api(projects.legacy.common) } android { diff --git a/app-k9mail/build.gradle.kts b/app-k9mail/build.gradle.kts index 630982468e..a5769fba83 100644 --- a/app-k9mail/build.gradle.kts +++ b/app-k9mail/build.gradle.kts @@ -15,8 +15,8 @@ dependencies { implementation(projects.core.ui.legacy.theme2.k9mail) implementation(projects.feature.launcher) - implementation(projects.app.core) - implementation(projects.app.ui.legacy) + implementation(projects.legacy.core) + implementation(projects.legacy.ui.legacy) implementation(projects.feature.widget.messageList) implementation(projects.feature.widget.shortcut) diff --git a/app-thunderbird/build.gradle.kts b/app-thunderbird/build.gradle.kts index e68dac3b40..656357edc2 100644 --- a/app-thunderbird/build.gradle.kts +++ b/app-thunderbird/build.gradle.kts @@ -15,8 +15,8 @@ dependencies { implementation(projects.core.ui.legacy.theme2.thunderbird) implementation(projects.feature.launcher) - implementation(projects.app.core) - implementation(projects.app.ui.legacy) + implementation(projects.legacy.core) + implementation(projects.legacy.ui.legacy) implementation(projects.feature.widget.messageList) implementation(projects.feature.widget.shortcut) diff --git a/config/detekt/detekt-baseline-app-common.xml b/config/detekt/detekt-baseline-legacy-common.xml similarity index 100% rename from config/detekt/detekt-baseline-app-common.xml rename to config/detekt/detekt-baseline-legacy-common.xml diff --git a/config/detekt/detekt-baseline-app-core.xml b/config/detekt/detekt-baseline-legacy-core.xml similarity index 100% rename from config/detekt/detekt-baseline-app-core.xml rename to config/detekt/detekt-baseline-legacy-core.xml diff --git a/config/detekt/detekt-baseline-app-storage.xml b/config/detekt/detekt-baseline-legacy-storage.xml similarity index 100% rename from config/detekt/detekt-baseline-app-storage.xml rename to config/detekt/detekt-baseline-legacy-storage.xml diff --git a/config/detekt/detekt-baseline-app-ui-base.xml b/config/detekt/detekt-baseline-legacy-ui-base.xml similarity index 100% rename from config/detekt/detekt-baseline-app-ui-base.xml rename to config/detekt/detekt-baseline-legacy-ui-base.xml diff --git a/config/detekt/detekt-baseline-app-ui-legacy.xml b/config/detekt/detekt-baseline-legacy-ui-legacy.xml similarity index 100% rename from config/detekt/detekt-baseline-app-ui-legacy.xml rename to config/detekt/detekt-baseline-legacy-ui-legacy.xml diff --git a/config/detekt/detekt-baseline-app-ui-message-list-widget.xml b/config/detekt/detekt-baseline-legacy-ui-message-list-widget.xml similarity index 100% rename from config/detekt/detekt-baseline-app-ui-message-list-widget.xml rename to config/detekt/detekt-baseline-legacy-ui-message-list-widget.xml diff --git a/feature/launcher/build.gradle.kts b/feature/launcher/build.gradle.kts index 88117f85d9..57a913c373 100644 --- a/feature/launcher/build.gradle.kts +++ b/feature/launcher/build.gradle.kts @@ -9,7 +9,7 @@ android { dependencies { implementation(projects.core.ui.compose.designsystem) - implementation(projects.app.ui.base) + implementation(projects.legacy.ui.base) implementation(projects.feature.onboarding.main) implementation(projects.feature.settings.import) implementation(projects.feature.account.setup) diff --git a/feature/settings/import/build.gradle.kts b/feature/settings/import/build.gradle.kts index 5b005178d5..893c499fc7 100644 --- a/feature/settings/import/build.gradle.kts +++ b/feature/settings/import/build.gradle.kts @@ -14,8 +14,8 @@ android { } dependencies { - implementation(projects.app.core) - implementation(projects.app.ui.base) + implementation(projects.legacy.core) + implementation(projects.legacy.ui.base) implementation(projects.core.ui.compose.designsystem) implementation(projects.core.ui.legacy.designsystem) diff --git a/feature/widget/message-list/build.gradle.kts b/feature/widget/message-list/build.gradle.kts index 249a35a915..8c6cc63a25 100644 --- a/feature/widget/message-list/build.gradle.kts +++ b/feature/widget/message-list/build.gradle.kts @@ -3,8 +3,8 @@ plugins { } dependencies { - implementation(projects.app.ui.legacy) - implementation(projects.app.core) + implementation(projects.legacy.ui.legacy) + implementation(projects.legacy.core) implementation(libs.timber) } diff --git a/feature/widget/shortcut/build.gradle.kts b/feature/widget/shortcut/build.gradle.kts index a3026b07b6..9415989fa1 100644 --- a/feature/widget/shortcut/build.gradle.kts +++ b/feature/widget/shortcut/build.gradle.kts @@ -3,8 +3,8 @@ plugins { } dependencies { - implementation(projects.app.ui.legacy) - implementation(projects.app.core) + implementation(projects.legacy.ui.legacy) + implementation(projects.legacy.core) } android { diff --git a/feature/widget/unread/build.gradle.kts b/feature/widget/unread/build.gradle.kts index eade08e2d6..cd6241843a 100644 --- a/feature/widget/unread/build.gradle.kts +++ b/feature/widget/unread/build.gradle.kts @@ -3,8 +3,8 @@ plugins { } dependencies { - implementation(projects.app.ui.legacy) - implementation(projects.app.core) + implementation(projects.legacy.ui.legacy) + implementation(projects.legacy.core) implementation(libs.preferencex) implementation(libs.timber) diff --git a/app/common/build.gradle.kts b/legacy/common/build.gradle.kts similarity index 87% rename from app/common/build.gradle.kts rename to legacy/common/build.gradle.kts index e581e086ee..9eaf6c8c6c 100644 --- a/app/common/build.gradle.kts +++ b/legacy/common/build.gradle.kts @@ -3,10 +3,10 @@ plugins { } dependencies { - implementation(projects.app.ui.legacy) - implementation(projects.app.core) - implementation(projects.app.storage) - implementation(projects.app.cryptoOpenpgp) + implementation(projects.legacy.ui.legacy) + implementation(projects.legacy.core) + implementation(projects.legacy.storage) + implementation(projects.legacy.cryptoOpenpgp) implementation(projects.backend.imap) implementation(projects.backend.pop3) diff --git a/app/common/src/main/AndroidManifest.xml b/legacy/common/src/main/AndroidManifest.xml similarity index 100% rename from app/common/src/main/AndroidManifest.xml rename to legacy/common/src/main/AndroidManifest.xml diff --git a/app/common/src/main/java/com/fsck/k9/CommonApp.kt b/legacy/common/src/main/java/com/fsck/k9/CommonApp.kt similarity index 100% rename from app/common/src/main/java/com/fsck/k9/CommonApp.kt rename to legacy/common/src/main/java/com/fsck/k9/CommonApp.kt diff --git a/app/common/src/main/java/com/fsck/k9/CommonKoinModule.kt b/legacy/common/src/main/java/com/fsck/k9/CommonKoinModule.kt similarity index 100% rename from app/common/src/main/java/com/fsck/k9/CommonKoinModule.kt rename to legacy/common/src/main/java/com/fsck/k9/CommonKoinModule.kt diff --git a/app/common/src/main/java/com/fsck/k9/MessagingListenerProvider.kt b/legacy/common/src/main/java/com/fsck/k9/MessagingListenerProvider.kt similarity index 100% rename from app/common/src/main/java/com/fsck/k9/MessagingListenerProvider.kt rename to legacy/common/src/main/java/com/fsck/k9/MessagingListenerProvider.kt diff --git a/app/common/src/main/java/com/fsck/k9/account/AccountActivator.kt b/legacy/common/src/main/java/com/fsck/k9/account/AccountActivator.kt similarity index 100% rename from app/common/src/main/java/com/fsck/k9/account/AccountActivator.kt rename to legacy/common/src/main/java/com/fsck/k9/account/AccountActivator.kt diff --git a/app/common/src/main/java/com/fsck/k9/account/AccountColorPicker.kt b/legacy/common/src/main/java/com/fsck/k9/account/AccountColorPicker.kt similarity index 100% rename from app/common/src/main/java/com/fsck/k9/account/AccountColorPicker.kt rename to legacy/common/src/main/java/com/fsck/k9/account/AccountColorPicker.kt diff --git a/app/common/src/main/java/com/fsck/k9/account/AccountCreator.kt b/legacy/common/src/main/java/com/fsck/k9/account/AccountCreator.kt similarity index 100% rename from app/common/src/main/java/com/fsck/k9/account/AccountCreator.kt rename to legacy/common/src/main/java/com/fsck/k9/account/AccountCreator.kt diff --git a/app/common/src/main/java/com/fsck/k9/account/AccountModule.kt b/legacy/common/src/main/java/com/fsck/k9/account/AccountModule.kt similarity index 100% rename from app/common/src/main/java/com/fsck/k9/account/AccountModule.kt rename to legacy/common/src/main/java/com/fsck/k9/account/AccountModule.kt diff --git a/app/common/src/main/java/com/fsck/k9/account/AccountOwnerNameProvider.kt b/legacy/common/src/main/java/com/fsck/k9/account/AccountOwnerNameProvider.kt similarity index 100% rename from app/common/src/main/java/com/fsck/k9/account/AccountOwnerNameProvider.kt rename to legacy/common/src/main/java/com/fsck/k9/account/AccountOwnerNameProvider.kt diff --git a/app/common/src/main/java/com/fsck/k9/account/AccountServerSettingsUpdater.kt b/legacy/common/src/main/java/com/fsck/k9/account/AccountServerSettingsUpdater.kt similarity index 100% rename from app/common/src/main/java/com/fsck/k9/account/AccountServerSettingsUpdater.kt rename to legacy/common/src/main/java/com/fsck/k9/account/AccountServerSettingsUpdater.kt diff --git a/app/common/src/main/java/com/fsck/k9/account/AccountStateLoader.kt b/legacy/common/src/main/java/com/fsck/k9/account/AccountStateLoader.kt similarity index 100% rename from app/common/src/main/java/com/fsck/k9/account/AccountStateLoader.kt rename to legacy/common/src/main/java/com/fsck/k9/account/AccountStateLoader.kt diff --git a/app/common/src/main/java/com/fsck/k9/account/DeletePolicyHelper.kt b/legacy/common/src/main/java/com/fsck/k9/account/DeletePolicyHelper.kt similarity index 100% rename from app/common/src/main/java/com/fsck/k9/account/DeletePolicyHelper.kt rename to legacy/common/src/main/java/com/fsck/k9/account/DeletePolicyHelper.kt diff --git a/app/common/src/main/java/com/fsck/k9/backends/AccountAuthStateStorage.kt b/legacy/common/src/main/java/com/fsck/k9/backends/AccountAuthStateStorage.kt similarity index 100% rename from app/common/src/main/java/com/fsck/k9/backends/AccountAuthStateStorage.kt rename to legacy/common/src/main/java/com/fsck/k9/backends/AccountAuthStateStorage.kt diff --git a/app/common/src/main/java/com/fsck/k9/backends/AndroidAlarmManager.kt b/legacy/common/src/main/java/com/fsck/k9/backends/AndroidAlarmManager.kt similarity index 100% rename from app/common/src/main/java/com/fsck/k9/backends/AndroidAlarmManager.kt rename to legacy/common/src/main/java/com/fsck/k9/backends/AndroidAlarmManager.kt diff --git a/app/common/src/main/java/com/fsck/k9/backends/ImapBackendFactory.kt b/legacy/common/src/main/java/com/fsck/k9/backends/ImapBackendFactory.kt similarity index 100% rename from app/common/src/main/java/com/fsck/k9/backends/ImapBackendFactory.kt rename to legacy/common/src/main/java/com/fsck/k9/backends/ImapBackendFactory.kt diff --git a/app/common/src/main/java/com/fsck/k9/backends/ImapServerSettingsExtensions.kt b/legacy/common/src/main/java/com/fsck/k9/backends/ImapServerSettingsExtensions.kt similarity index 100% rename from app/common/src/main/java/com/fsck/k9/backends/ImapServerSettingsExtensions.kt rename to legacy/common/src/main/java/com/fsck/k9/backends/ImapServerSettingsExtensions.kt diff --git a/app/common/src/main/java/com/fsck/k9/backends/KoinModule.kt b/legacy/common/src/main/java/com/fsck/k9/backends/KoinModule.kt similarity index 100% rename from app/common/src/main/java/com/fsck/k9/backends/KoinModule.kt rename to legacy/common/src/main/java/com/fsck/k9/backends/KoinModule.kt diff --git a/app/common/src/main/java/com/fsck/k9/backends/Pop3BackendFactory.kt b/legacy/common/src/main/java/com/fsck/k9/backends/Pop3BackendFactory.kt similarity index 100% rename from app/common/src/main/java/com/fsck/k9/backends/Pop3BackendFactory.kt rename to legacy/common/src/main/java/com/fsck/k9/backends/Pop3BackendFactory.kt diff --git a/app/common/src/main/java/com/fsck/k9/backends/RealOAuth2TokenProvider.kt b/legacy/common/src/main/java/com/fsck/k9/backends/RealOAuth2TokenProvider.kt similarity index 100% rename from app/common/src/main/java/com/fsck/k9/backends/RealOAuth2TokenProvider.kt rename to legacy/common/src/main/java/com/fsck/k9/backends/RealOAuth2TokenProvider.kt diff --git a/app/common/src/main/java/com/fsck/k9/backends/RealOAuth2TokenProviderFactory.kt b/legacy/common/src/main/java/com/fsck/k9/backends/RealOAuth2TokenProviderFactory.kt similarity index 100% rename from app/common/src/main/java/com/fsck/k9/backends/RealOAuth2TokenProviderFactory.kt rename to legacy/common/src/main/java/com/fsck/k9/backends/RealOAuth2TokenProviderFactory.kt diff --git a/app/common/src/main/java/com/fsck/k9/feature/AccountSetupFinishedLauncher.kt b/legacy/common/src/main/java/com/fsck/k9/feature/AccountSetupFinishedLauncher.kt similarity index 100% rename from app/common/src/main/java/com/fsck/k9/feature/AccountSetupFinishedLauncher.kt rename to legacy/common/src/main/java/com/fsck/k9/feature/AccountSetupFinishedLauncher.kt diff --git a/app/common/src/main/java/com/fsck/k9/feature/FeatureModule.kt b/legacy/common/src/main/java/com/fsck/k9/feature/FeatureModule.kt similarity index 100% rename from app/common/src/main/java/com/fsck/k9/feature/FeatureModule.kt rename to legacy/common/src/main/java/com/fsck/k9/feature/FeatureModule.kt diff --git a/app/common/src/main/java/com/fsck/k9/featureflag/InMemoryFeatureFlagFactory.kt b/legacy/common/src/main/java/com/fsck/k9/featureflag/InMemoryFeatureFlagFactory.kt similarity index 100% rename from app/common/src/main/java/com/fsck/k9/featureflag/InMemoryFeatureFlagFactory.kt rename to legacy/common/src/main/java/com/fsck/k9/featureflag/InMemoryFeatureFlagFactory.kt diff --git a/app/common/src/main/java/com/fsck/k9/glide/K9AppGlideModule.java b/legacy/common/src/main/java/com/fsck/k9/glide/K9AppGlideModule.java similarity index 100% rename from app/common/src/main/java/com/fsck/k9/glide/K9AppGlideModule.java rename to legacy/common/src/main/java/com/fsck/k9/glide/K9AppGlideModule.java diff --git a/app/common/src/main/java/com/fsck/k9/notification/K9NotificationActionCreator.kt b/legacy/common/src/main/java/com/fsck/k9/notification/K9NotificationActionCreator.kt similarity index 100% rename from app/common/src/main/java/com/fsck/k9/notification/K9NotificationActionCreator.kt rename to legacy/common/src/main/java/com/fsck/k9/notification/K9NotificationActionCreator.kt diff --git a/app/common/src/main/java/com/fsck/k9/notification/K9NotificationResourceProvider.kt b/legacy/common/src/main/java/com/fsck/k9/notification/K9NotificationResourceProvider.kt similarity index 100% rename from app/common/src/main/java/com/fsck/k9/notification/K9NotificationResourceProvider.kt rename to legacy/common/src/main/java/com/fsck/k9/notification/K9NotificationResourceProvider.kt diff --git a/app/common/src/main/java/com/fsck/k9/notification/K9NotificationStrategy.kt b/legacy/common/src/main/java/com/fsck/k9/notification/K9NotificationStrategy.kt similarity index 100% rename from app/common/src/main/java/com/fsck/k9/notification/K9NotificationStrategy.kt rename to legacy/common/src/main/java/com/fsck/k9/notification/K9NotificationStrategy.kt diff --git a/app/common/src/main/java/com/fsck/k9/notification/KoinModule.kt b/legacy/common/src/main/java/com/fsck/k9/notification/KoinModule.kt similarity index 100% rename from app/common/src/main/java/com/fsck/k9/notification/KoinModule.kt rename to legacy/common/src/main/java/com/fsck/k9/notification/KoinModule.kt diff --git a/app/common/src/main/java/com/fsck/k9/resources/K9AutocryptStringProvider.kt b/legacy/common/src/main/java/com/fsck/k9/resources/K9AutocryptStringProvider.kt similarity index 100% rename from app/common/src/main/java/com/fsck/k9/resources/K9AutocryptStringProvider.kt rename to legacy/common/src/main/java/com/fsck/k9/resources/K9AutocryptStringProvider.kt diff --git a/app/common/src/main/java/com/fsck/k9/resources/K9CoreResourceProvider.kt b/legacy/common/src/main/java/com/fsck/k9/resources/K9CoreResourceProvider.kt similarity index 100% rename from app/common/src/main/java/com/fsck/k9/resources/K9CoreResourceProvider.kt rename to legacy/common/src/main/java/com/fsck/k9/resources/K9CoreResourceProvider.kt diff --git a/app/common/src/main/java/com/fsck/k9/resources/KoinModule.kt b/legacy/common/src/main/java/com/fsck/k9/resources/KoinModule.kt similarity index 100% rename from app/common/src/main/java/com/fsck/k9/resources/KoinModule.kt rename to legacy/common/src/main/java/com/fsck/k9/resources/KoinModule.kt diff --git a/app/common/src/main/res/values/manifest_values.xml b/legacy/common/src/main/res/values/manifest_values.xml similarity index 100% rename from app/common/src/main/res/values/manifest_values.xml rename to legacy/common/src/main/res/values/manifest_values.xml diff --git a/app/common/src/test/java/com/fsck/k9/account/AccountServerSettingsUpdaterTest.kt b/legacy/common/src/test/java/com/fsck/k9/account/AccountServerSettingsUpdaterTest.kt similarity index 100% rename from app/common/src/test/java/com/fsck/k9/account/AccountServerSettingsUpdaterTest.kt rename to legacy/common/src/test/java/com/fsck/k9/account/AccountServerSettingsUpdaterTest.kt diff --git a/app/common/src/test/java/com/fsck/k9/account/AccountStateLoaderTest.kt b/legacy/common/src/test/java/com/fsck/k9/account/AccountStateLoaderTest.kt similarity index 100% rename from app/common/src/test/java/com/fsck/k9/account/AccountStateLoaderTest.kt rename to legacy/common/src/test/java/com/fsck/k9/account/AccountStateLoaderTest.kt diff --git a/app/common/src/test/java/com/fsck/k9/account/DeletePolicyHelperTest.kt b/legacy/common/src/test/java/com/fsck/k9/account/DeletePolicyHelperTest.kt similarity index 100% rename from app/common/src/test/java/com/fsck/k9/account/DeletePolicyHelperTest.kt rename to legacy/common/src/test/java/com/fsck/k9/account/DeletePolicyHelperTest.kt diff --git a/app/common/src/test/java/com/fsck/k9/account/FakeAccountManager.kt b/legacy/common/src/test/java/com/fsck/k9/account/FakeAccountManager.kt similarity index 100% rename from app/common/src/test/java/com/fsck/k9/account/FakeAccountManager.kt rename to legacy/common/src/test/java/com/fsck/k9/account/FakeAccountManager.kt diff --git a/app/core/build.gradle.kts b/legacy/core/build.gradle.kts similarity index 93% rename from app/core/build.gradle.kts rename to legacy/core/build.gradle.kts index 3f99465f5e..f07c71b3a4 100644 --- a/app/core/build.gradle.kts +++ b/legacy/core/build.gradle.kts @@ -32,8 +32,8 @@ dependencies { testImplementation(projects.mail.testing) testImplementation(projects.backend.imap) testImplementation(projects.mail.protocols.smtp) - testImplementation(projects.app.storage) - testImplementation(projects.app.testing) + testImplementation(projects.legacy.storage) + testImplementation(projects.legacy.testing) testImplementation(libs.kotlin.test) testImplementation(libs.kotlin.reflect) diff --git a/app/core/src/main/AndroidManifest.xml b/legacy/core/src/main/AndroidManifest.xml similarity index 100% rename from app/core/src/main/AndroidManifest.xml rename to legacy/core/src/main/AndroidManifest.xml diff --git a/app/core/src/main/java/com/fsck/k9/Account.kt b/legacy/core/src/main/java/com/fsck/k9/Account.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/Account.kt rename to legacy/core/src/main/java/com/fsck/k9/Account.kt diff --git a/app/core/src/main/java/com/fsck/k9/AccountPreferenceSerializer.kt b/legacy/core/src/main/java/com/fsck/k9/AccountPreferenceSerializer.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/AccountPreferenceSerializer.kt rename to legacy/core/src/main/java/com/fsck/k9/AccountPreferenceSerializer.kt diff --git a/app/core/src/main/java/com/fsck/k9/AccountRemovedListener.kt b/legacy/core/src/main/java/com/fsck/k9/AccountRemovedListener.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/AccountRemovedListener.kt rename to legacy/core/src/main/java/com/fsck/k9/AccountRemovedListener.kt diff --git a/app/core/src/main/java/com/fsck/k9/AccountsChangeListener.java b/legacy/core/src/main/java/com/fsck/k9/AccountsChangeListener.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/AccountsChangeListener.java rename to legacy/core/src/main/java/com/fsck/k9/AccountsChangeListener.java diff --git a/app/core/src/main/java/com/fsck/k9/AppConfig.kt b/legacy/core/src/main/java/com/fsck/k9/AppConfig.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/AppConfig.kt rename to legacy/core/src/main/java/com/fsck/k9/AppConfig.kt diff --git a/app/core/src/main/java/com/fsck/k9/BaseAccount.kt b/legacy/core/src/main/java/com/fsck/k9/BaseAccount.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/BaseAccount.kt rename to legacy/core/src/main/java/com/fsck/k9/BaseAccount.kt diff --git a/app/core/src/main/java/com/fsck/k9/Core.kt b/legacy/core/src/main/java/com/fsck/k9/Core.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/Core.kt rename to legacy/core/src/main/java/com/fsck/k9/Core.kt diff --git a/app/core/src/main/java/com/fsck/k9/CoreKoinModules.kt b/legacy/core/src/main/java/com/fsck/k9/CoreKoinModules.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/CoreKoinModules.kt rename to legacy/core/src/main/java/com/fsck/k9/CoreKoinModules.kt diff --git a/app/core/src/main/java/com/fsck/k9/CoreResourceProvider.kt b/legacy/core/src/main/java/com/fsck/k9/CoreResourceProvider.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/CoreResourceProvider.kt rename to legacy/core/src/main/java/com/fsck/k9/CoreResourceProvider.kt diff --git a/app/core/src/main/java/com/fsck/k9/DI.kt b/legacy/core/src/main/java/com/fsck/k9/DI.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/DI.kt rename to legacy/core/src/main/java/com/fsck/k9/DI.kt diff --git a/app/core/src/main/java/com/fsck/k9/EmailAddressValidator.kt b/legacy/core/src/main/java/com/fsck/k9/EmailAddressValidator.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/EmailAddressValidator.kt rename to legacy/core/src/main/java/com/fsck/k9/EmailAddressValidator.kt diff --git a/app/core/src/main/java/com/fsck/k9/FontSizes.kt b/legacy/core/src/main/java/com/fsck/k9/FontSizes.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/FontSizes.kt rename to legacy/core/src/main/java/com/fsck/k9/FontSizes.kt diff --git a/app/core/src/main/java/com/fsck/k9/Identity.kt b/legacy/core/src/main/java/com/fsck/k9/Identity.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/Identity.kt rename to legacy/core/src/main/java/com/fsck/k9/Identity.kt diff --git a/app/core/src/main/java/com/fsck/k9/K9.kt b/legacy/core/src/main/java/com/fsck/k9/K9.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/K9.kt rename to legacy/core/src/main/java/com/fsck/k9/K9.kt diff --git a/app/core/src/main/java/com/fsck/k9/KoinModule.kt b/legacy/core/src/main/java/com/fsck/k9/KoinModule.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/KoinModule.kt rename to legacy/core/src/main/java/com/fsck/k9/KoinModule.kt diff --git a/app/core/src/main/java/com/fsck/k9/LocalKeyStoreManager.kt b/legacy/core/src/main/java/com/fsck/k9/LocalKeyStoreManager.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/LocalKeyStoreManager.kt rename to legacy/core/src/main/java/com/fsck/k9/LocalKeyStoreManager.kt diff --git a/app/core/src/main/java/com/fsck/k9/NotificationLight.kt b/legacy/core/src/main/java/com/fsck/k9/NotificationLight.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/NotificationLight.kt rename to legacy/core/src/main/java/com/fsck/k9/NotificationLight.kt diff --git a/app/core/src/main/java/com/fsck/k9/NotificationSettings.kt b/legacy/core/src/main/java/com/fsck/k9/NotificationSettings.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/NotificationSettings.kt rename to legacy/core/src/main/java/com/fsck/k9/NotificationSettings.kt diff --git a/app/core/src/main/java/com/fsck/k9/NotificationVibration.kt b/legacy/core/src/main/java/com/fsck/k9/NotificationVibration.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/NotificationVibration.kt rename to legacy/core/src/main/java/com/fsck/k9/NotificationVibration.kt diff --git a/app/core/src/main/java/com/fsck/k9/Preferences.kt b/legacy/core/src/main/java/com/fsck/k9/Preferences.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/Preferences.kt rename to legacy/core/src/main/java/com/fsck/k9/Preferences.kt diff --git a/app/core/src/main/java/com/fsck/k9/QuietTimeChecker.java b/legacy/core/src/main/java/com/fsck/k9/QuietTimeChecker.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/QuietTimeChecker.java rename to legacy/core/src/main/java/com/fsck/k9/QuietTimeChecker.java diff --git a/app/core/src/main/java/com/fsck/k9/ServerSettingsSerializer.kt b/legacy/core/src/main/java/com/fsck/k9/ServerSettingsSerializer.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/ServerSettingsSerializer.kt rename to legacy/core/src/main/java/com/fsck/k9/ServerSettingsSerializer.kt diff --git a/app/core/src/main/java/com/fsck/k9/StrictMode.kt b/legacy/core/src/main/java/com/fsck/k9/StrictMode.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/StrictMode.kt rename to legacy/core/src/main/java/com/fsck/k9/StrictMode.kt diff --git a/app/core/src/main/java/com/fsck/k9/SwipeAction.kt b/legacy/core/src/main/java/com/fsck/k9/SwipeAction.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/SwipeAction.kt rename to legacy/core/src/main/java/com/fsck/k9/SwipeAction.kt diff --git a/app/core/src/main/java/com/fsck/k9/TimberLogger.kt b/legacy/core/src/main/java/com/fsck/k9/TimberLogger.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/TimberLogger.kt rename to legacy/core/src/main/java/com/fsck/k9/TimberLogger.kt diff --git a/app/core/src/main/java/com/fsck/k9/UiDensity.kt b/legacy/core/src/main/java/com/fsck/k9/UiDensity.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/UiDensity.kt rename to legacy/core/src/main/java/com/fsck/k9/UiDensity.kt diff --git a/app/core/src/main/java/com/fsck/k9/autocrypt/AutocryptDraftStateHeader.kt b/legacy/core/src/main/java/com/fsck/k9/autocrypt/AutocryptDraftStateHeader.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/autocrypt/AutocryptDraftStateHeader.kt rename to legacy/core/src/main/java/com/fsck/k9/autocrypt/AutocryptDraftStateHeader.kt diff --git a/app/core/src/main/java/com/fsck/k9/autocrypt/AutocryptDraftStateHeaderParser.kt b/legacy/core/src/main/java/com/fsck/k9/autocrypt/AutocryptDraftStateHeaderParser.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/autocrypt/AutocryptDraftStateHeaderParser.kt rename to legacy/core/src/main/java/com/fsck/k9/autocrypt/AutocryptDraftStateHeaderParser.kt diff --git a/app/core/src/main/java/com/fsck/k9/autocrypt/AutocryptGossipHeader.java b/legacy/core/src/main/java/com/fsck/k9/autocrypt/AutocryptGossipHeader.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/autocrypt/AutocryptGossipHeader.java rename to legacy/core/src/main/java/com/fsck/k9/autocrypt/AutocryptGossipHeader.java diff --git a/app/core/src/main/java/com/fsck/k9/autocrypt/AutocryptGossipHeaderParser.java b/legacy/core/src/main/java/com/fsck/k9/autocrypt/AutocryptGossipHeaderParser.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/autocrypt/AutocryptGossipHeaderParser.java rename to legacy/core/src/main/java/com/fsck/k9/autocrypt/AutocryptGossipHeaderParser.java diff --git a/app/core/src/main/java/com/fsck/k9/autocrypt/AutocryptHeader.java b/legacy/core/src/main/java/com/fsck/k9/autocrypt/AutocryptHeader.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/autocrypt/AutocryptHeader.java rename to legacy/core/src/main/java/com/fsck/k9/autocrypt/AutocryptHeader.java diff --git a/app/core/src/main/java/com/fsck/k9/autocrypt/AutocryptHeaderParser.java b/legacy/core/src/main/java/com/fsck/k9/autocrypt/AutocryptHeaderParser.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/autocrypt/AutocryptHeaderParser.java rename to legacy/core/src/main/java/com/fsck/k9/autocrypt/AutocryptHeaderParser.java diff --git a/app/core/src/main/java/com/fsck/k9/autocrypt/AutocryptOpenPgpApiInteractor.java b/legacy/core/src/main/java/com/fsck/k9/autocrypt/AutocryptOpenPgpApiInteractor.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/autocrypt/AutocryptOpenPgpApiInteractor.java rename to legacy/core/src/main/java/com/fsck/k9/autocrypt/AutocryptOpenPgpApiInteractor.java diff --git a/app/core/src/main/java/com/fsck/k9/autocrypt/AutocryptOperations.java b/legacy/core/src/main/java/com/fsck/k9/autocrypt/AutocryptOperations.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/autocrypt/AutocryptOperations.java rename to legacy/core/src/main/java/com/fsck/k9/autocrypt/AutocryptOperations.java diff --git a/app/core/src/main/java/com/fsck/k9/autocrypt/AutocryptStringProvider.kt b/legacy/core/src/main/java/com/fsck/k9/autocrypt/AutocryptStringProvider.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/autocrypt/AutocryptStringProvider.kt rename to legacy/core/src/main/java/com/fsck/k9/autocrypt/AutocryptStringProvider.kt diff --git a/app/core/src/main/java/com/fsck/k9/autocrypt/AutocryptTransferMessageCreator.kt b/legacy/core/src/main/java/com/fsck/k9/autocrypt/AutocryptTransferMessageCreator.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/autocrypt/AutocryptTransferMessageCreator.kt rename to legacy/core/src/main/java/com/fsck/k9/autocrypt/AutocryptTransferMessageCreator.kt diff --git a/app/core/src/main/java/com/fsck/k9/autocrypt/KoinModule.kt b/legacy/core/src/main/java/com/fsck/k9/autocrypt/KoinModule.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/autocrypt/KoinModule.kt rename to legacy/core/src/main/java/com/fsck/k9/autocrypt/KoinModule.kt diff --git a/app/core/src/main/java/com/fsck/k9/backend/BackendFactory.kt b/legacy/core/src/main/java/com/fsck/k9/backend/BackendFactory.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/backend/BackendFactory.kt rename to legacy/core/src/main/java/com/fsck/k9/backend/BackendFactory.kt diff --git a/app/core/src/main/java/com/fsck/k9/backend/BackendManager.kt b/legacy/core/src/main/java/com/fsck/k9/backend/BackendManager.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/backend/BackendManager.kt rename to legacy/core/src/main/java/com/fsck/k9/backend/BackendManager.kt diff --git a/app/core/src/main/java/com/fsck/k9/contact/ContactIntentHelper.kt b/legacy/core/src/main/java/com/fsck/k9/contact/ContactIntentHelper.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/contact/ContactIntentHelper.kt rename to legacy/core/src/main/java/com/fsck/k9/contact/ContactIntentHelper.kt diff --git a/app/core/src/main/java/com/fsck/k9/controller/ControllerExtension.kt b/legacy/core/src/main/java/com/fsck/k9/controller/ControllerExtension.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/controller/ControllerExtension.kt rename to legacy/core/src/main/java/com/fsck/k9/controller/ControllerExtension.kt diff --git a/app/core/src/main/java/com/fsck/k9/controller/DraftOperations.kt b/legacy/core/src/main/java/com/fsck/k9/controller/DraftOperations.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/controller/DraftOperations.kt rename to legacy/core/src/main/java/com/fsck/k9/controller/DraftOperations.kt diff --git a/app/core/src/main/java/com/fsck/k9/controller/KoinModule.kt b/legacy/core/src/main/java/com/fsck/k9/controller/KoinModule.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/controller/KoinModule.kt rename to legacy/core/src/main/java/com/fsck/k9/controller/KoinModule.kt diff --git a/app/core/src/main/java/com/fsck/k9/controller/LocalDeleteOperationDecider.kt b/legacy/core/src/main/java/com/fsck/k9/controller/LocalDeleteOperationDecider.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/controller/LocalDeleteOperationDecider.kt rename to legacy/core/src/main/java/com/fsck/k9/controller/LocalDeleteOperationDecider.kt diff --git a/app/core/src/main/java/com/fsck/k9/controller/MemorizingMessagingListener.java b/legacy/core/src/main/java/com/fsck/k9/controller/MemorizingMessagingListener.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/controller/MemorizingMessagingListener.java rename to legacy/core/src/main/java/com/fsck/k9/controller/MemorizingMessagingListener.java diff --git a/app/core/src/main/java/com/fsck/k9/controller/MessageCountsProvider.kt b/legacy/core/src/main/java/com/fsck/k9/controller/MessageCountsProvider.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/controller/MessageCountsProvider.kt rename to legacy/core/src/main/java/com/fsck/k9/controller/MessageCountsProvider.kt diff --git a/app/core/src/main/java/com/fsck/k9/controller/MessageReference.kt b/legacy/core/src/main/java/com/fsck/k9/controller/MessageReference.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/controller/MessageReference.kt rename to legacy/core/src/main/java/com/fsck/k9/controller/MessageReference.kt diff --git a/app/core/src/main/java/com/fsck/k9/controller/MessageReferenceHelper.java b/legacy/core/src/main/java/com/fsck/k9/controller/MessageReferenceHelper.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/controller/MessageReferenceHelper.java rename to legacy/core/src/main/java/com/fsck/k9/controller/MessageReferenceHelper.java diff --git a/app/core/src/main/java/com/fsck/k9/controller/MessagingController.java b/legacy/core/src/main/java/com/fsck/k9/controller/MessagingController.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/controller/MessagingController.java rename to legacy/core/src/main/java/com/fsck/k9/controller/MessagingController.java diff --git a/app/core/src/main/java/com/fsck/k9/controller/MessagingControllerCommands.java b/legacy/core/src/main/java/com/fsck/k9/controller/MessagingControllerCommands.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/controller/MessagingControllerCommands.java rename to legacy/core/src/main/java/com/fsck/k9/controller/MessagingControllerCommands.java diff --git a/app/core/src/main/java/com/fsck/k9/controller/MessagingListener.java b/legacy/core/src/main/java/com/fsck/k9/controller/MessagingListener.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/controller/MessagingListener.java rename to legacy/core/src/main/java/com/fsck/k9/controller/MessagingListener.java diff --git a/app/core/src/main/java/com/fsck/k9/controller/NotificationOperations.kt b/legacy/core/src/main/java/com/fsck/k9/controller/NotificationOperations.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/controller/NotificationOperations.kt rename to legacy/core/src/main/java/com/fsck/k9/controller/NotificationOperations.kt diff --git a/app/core/src/main/java/com/fsck/k9/controller/NotificationState.kt b/legacy/core/src/main/java/com/fsck/k9/controller/NotificationState.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/controller/NotificationState.kt rename to legacy/core/src/main/java/com/fsck/k9/controller/NotificationState.kt diff --git a/app/core/src/main/java/com/fsck/k9/controller/PendingCommandSerializer.java b/legacy/core/src/main/java/com/fsck/k9/controller/PendingCommandSerializer.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/controller/PendingCommandSerializer.java rename to legacy/core/src/main/java/com/fsck/k9/controller/PendingCommandSerializer.java diff --git a/app/core/src/main/java/com/fsck/k9/controller/Preconditions.kt b/legacy/core/src/main/java/com/fsck/k9/controller/Preconditions.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/controller/Preconditions.kt rename to legacy/core/src/main/java/com/fsck/k9/controller/Preconditions.kt diff --git a/app/core/src/main/java/com/fsck/k9/controller/ProgressBodyFactory.java b/legacy/core/src/main/java/com/fsck/k9/controller/ProgressBodyFactory.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/controller/ProgressBodyFactory.java rename to legacy/core/src/main/java/com/fsck/k9/controller/ProgressBodyFactory.java diff --git a/app/core/src/main/java/com/fsck/k9/controller/SimpleMessagingListener.java b/legacy/core/src/main/java/com/fsck/k9/controller/SimpleMessagingListener.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/controller/SimpleMessagingListener.java rename to legacy/core/src/main/java/com/fsck/k9/controller/SimpleMessagingListener.java diff --git a/app/core/src/main/java/com/fsck/k9/controller/UidReverseComparator.java b/legacy/core/src/main/java/com/fsck/k9/controller/UidReverseComparator.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/controller/UidReverseComparator.java rename to legacy/core/src/main/java/com/fsck/k9/controller/UidReverseComparator.java diff --git a/app/core/src/main/java/com/fsck/k9/controller/push/AccountPushController.kt b/legacy/core/src/main/java/com/fsck/k9/controller/push/AccountPushController.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/controller/push/AccountPushController.kt rename to legacy/core/src/main/java/com/fsck/k9/controller/push/AccountPushController.kt diff --git a/app/core/src/main/java/com/fsck/k9/controller/push/AccountPushControllerFactory.kt b/legacy/core/src/main/java/com/fsck/k9/controller/push/AccountPushControllerFactory.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/controller/push/AccountPushControllerFactory.kt rename to legacy/core/src/main/java/com/fsck/k9/controller/push/AccountPushControllerFactory.kt diff --git a/app/core/src/main/java/com/fsck/k9/controller/push/AlarmPermissionManager.kt b/legacy/core/src/main/java/com/fsck/k9/controller/push/AlarmPermissionManager.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/controller/push/AlarmPermissionManager.kt rename to legacy/core/src/main/java/com/fsck/k9/controller/push/AlarmPermissionManager.kt diff --git a/app/core/src/main/java/com/fsck/k9/controller/push/AlarmPermissionManagerApi21.kt b/legacy/core/src/main/java/com/fsck/k9/controller/push/AlarmPermissionManagerApi21.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/controller/push/AlarmPermissionManagerApi21.kt rename to legacy/core/src/main/java/com/fsck/k9/controller/push/AlarmPermissionManagerApi21.kt diff --git a/app/core/src/main/java/com/fsck/k9/controller/push/AlarmPermissionManagerApi31.kt b/legacy/core/src/main/java/com/fsck/k9/controller/push/AlarmPermissionManagerApi31.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/controller/push/AlarmPermissionManagerApi31.kt rename to legacy/core/src/main/java/com/fsck/k9/controller/push/AlarmPermissionManagerApi31.kt diff --git a/app/core/src/main/java/com/fsck/k9/controller/push/AutoSyncManager.kt b/legacy/core/src/main/java/com/fsck/k9/controller/push/AutoSyncManager.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/controller/push/AutoSyncManager.kt rename to legacy/core/src/main/java/com/fsck/k9/controller/push/AutoSyncManager.kt diff --git a/app/core/src/main/java/com/fsck/k9/controller/push/BootCompleteReceiver.kt b/legacy/core/src/main/java/com/fsck/k9/controller/push/BootCompleteReceiver.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/controller/push/BootCompleteReceiver.kt rename to legacy/core/src/main/java/com/fsck/k9/controller/push/BootCompleteReceiver.kt diff --git a/app/core/src/main/java/com/fsck/k9/controller/push/KoinModule.kt b/legacy/core/src/main/java/com/fsck/k9/controller/push/KoinModule.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/controller/push/KoinModule.kt rename to legacy/core/src/main/java/com/fsck/k9/controller/push/KoinModule.kt diff --git a/app/core/src/main/java/com/fsck/k9/controller/push/PushController.kt b/legacy/core/src/main/java/com/fsck/k9/controller/push/PushController.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/controller/push/PushController.kt rename to legacy/core/src/main/java/com/fsck/k9/controller/push/PushController.kt diff --git a/app/core/src/main/java/com/fsck/k9/controller/push/PushService.kt b/legacy/core/src/main/java/com/fsck/k9/controller/push/PushService.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/controller/push/PushService.kt rename to legacy/core/src/main/java/com/fsck/k9/controller/push/PushService.kt diff --git a/app/core/src/main/java/com/fsck/k9/controller/push/PushServiceManager.kt b/legacy/core/src/main/java/com/fsck/k9/controller/push/PushServiceManager.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/controller/push/PushServiceManager.kt rename to legacy/core/src/main/java/com/fsck/k9/controller/push/PushServiceManager.kt diff --git a/app/core/src/main/java/com/fsck/k9/crypto/EncryptionExtractor.kt b/legacy/core/src/main/java/com/fsck/k9/crypto/EncryptionExtractor.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/crypto/EncryptionExtractor.kt rename to legacy/core/src/main/java/com/fsck/k9/crypto/EncryptionExtractor.kt diff --git a/app/core/src/main/java/com/fsck/k9/crypto/KoinModule.kt b/legacy/core/src/main/java/com/fsck/k9/crypto/KoinModule.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/crypto/KoinModule.kt rename to legacy/core/src/main/java/com/fsck/k9/crypto/KoinModule.kt diff --git a/app/core/src/main/java/com/fsck/k9/crypto/MessageCryptoStructureDetector.java b/legacy/core/src/main/java/com/fsck/k9/crypto/MessageCryptoStructureDetector.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/crypto/MessageCryptoStructureDetector.java rename to legacy/core/src/main/java/com/fsck/k9/crypto/MessageCryptoStructureDetector.java diff --git a/app/core/src/main/java/com/fsck/k9/crypto/OpenPgpApiHelper.java b/legacy/core/src/main/java/com/fsck/k9/crypto/OpenPgpApiHelper.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/crypto/OpenPgpApiHelper.java rename to legacy/core/src/main/java/com/fsck/k9/crypto/OpenPgpApiHelper.java diff --git a/app/core/src/main/java/com/fsck/k9/helper/AndroidKeyStoreDirectoryProvider.kt b/legacy/core/src/main/java/com/fsck/k9/helper/AndroidKeyStoreDirectoryProvider.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/helper/AndroidKeyStoreDirectoryProvider.kt rename to legacy/core/src/main/java/com/fsck/k9/helper/AndroidKeyStoreDirectoryProvider.kt diff --git a/app/core/src/main/java/com/fsck/k9/helper/ClipboardManager.kt b/legacy/core/src/main/java/com/fsck/k9/helper/ClipboardManager.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/helper/ClipboardManager.kt rename to legacy/core/src/main/java/com/fsck/k9/helper/ClipboardManager.kt diff --git a/app/core/src/main/java/com/fsck/k9/helper/CollectionExtensions.kt b/legacy/core/src/main/java/com/fsck/k9/helper/CollectionExtensions.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/helper/CollectionExtensions.kt rename to legacy/core/src/main/java/com/fsck/k9/helper/CollectionExtensions.kt diff --git a/app/core/src/main/java/com/fsck/k9/helper/ContactNameProvider.kt b/legacy/core/src/main/java/com/fsck/k9/helper/ContactNameProvider.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/helper/ContactNameProvider.kt rename to legacy/core/src/main/java/com/fsck/k9/helper/ContactNameProvider.kt diff --git a/app/core/src/main/java/com/fsck/k9/helper/Contacts.kt b/legacy/core/src/main/java/com/fsck/k9/helper/Contacts.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/helper/Contacts.kt rename to legacy/core/src/main/java/com/fsck/k9/helper/Contacts.kt diff --git a/app/core/src/main/java/com/fsck/k9/helper/CrLfConverter.kt b/legacy/core/src/main/java/com/fsck/k9/helper/CrLfConverter.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/helper/CrLfConverter.kt rename to legacy/core/src/main/java/com/fsck/k9/helper/CrLfConverter.kt diff --git a/app/core/src/main/java/com/fsck/k9/helper/DefaultTrustedSocketFactory.java b/legacy/core/src/main/java/com/fsck/k9/helper/DefaultTrustedSocketFactory.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/helper/DefaultTrustedSocketFactory.java rename to legacy/core/src/main/java/com/fsck/k9/helper/DefaultTrustedSocketFactory.java diff --git a/app/core/src/main/java/com/fsck/k9/helper/FileHelper.java b/legacy/core/src/main/java/com/fsck/k9/helper/FileHelper.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/helper/FileHelper.java rename to legacy/core/src/main/java/com/fsck/k9/helper/FileHelper.java diff --git a/app/core/src/main/java/com/fsck/k9/helper/IdentityHelper.kt b/legacy/core/src/main/java/com/fsck/k9/helper/IdentityHelper.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/helper/IdentityHelper.kt rename to legacy/core/src/main/java/com/fsck/k9/helper/IdentityHelper.kt diff --git a/app/core/src/main/java/com/fsck/k9/helper/KeyChainKeyManager.java b/legacy/core/src/main/java/com/fsck/k9/helper/KeyChainKeyManager.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/helper/KeyChainKeyManager.java rename to legacy/core/src/main/java/com/fsck/k9/helper/KeyChainKeyManager.java diff --git a/app/core/src/main/java/com/fsck/k9/helper/KoinModule.kt b/legacy/core/src/main/java/com/fsck/k9/helper/KoinModule.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/helper/KoinModule.kt rename to legacy/core/src/main/java/com/fsck/k9/helper/KoinModule.kt diff --git a/app/core/src/main/java/com/fsck/k9/helper/ListHeaders.java b/legacy/core/src/main/java/com/fsck/k9/helper/ListHeaders.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/helper/ListHeaders.java rename to legacy/core/src/main/java/com/fsck/k9/helper/ListHeaders.java diff --git a/app/core/src/main/java/com/fsck/k9/helper/ListUnsubscribeHelper.kt b/legacy/core/src/main/java/com/fsck/k9/helper/ListUnsubscribeHelper.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/helper/ListUnsubscribeHelper.kt rename to legacy/core/src/main/java/com/fsck/k9/helper/ListUnsubscribeHelper.kt diff --git a/app/core/src/main/java/com/fsck/k9/helper/MailTo.java b/legacy/core/src/main/java/com/fsck/k9/helper/MailTo.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/helper/MailTo.java rename to legacy/core/src/main/java/com/fsck/k9/helper/MailTo.java diff --git a/app/core/src/main/java/com/fsck/k9/helper/MessageHelper.kt b/legacy/core/src/main/java/com/fsck/k9/helper/MessageHelper.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/helper/MessageHelper.kt rename to legacy/core/src/main/java/com/fsck/k9/helper/MessageHelper.kt diff --git a/app/core/src/main/java/com/fsck/k9/helper/MimeTypeUtil.java b/legacy/core/src/main/java/com/fsck/k9/helper/MimeTypeUtil.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/helper/MimeTypeUtil.java rename to legacy/core/src/main/java/com/fsck/k9/helper/MimeTypeUtil.java diff --git a/app/core/src/main/java/com/fsck/k9/helper/MutableBoolean.kt b/legacy/core/src/main/java/com/fsck/k9/helper/MutableBoolean.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/helper/MutableBoolean.kt rename to legacy/core/src/main/java/com/fsck/k9/helper/MutableBoolean.kt diff --git a/app/core/src/main/java/com/fsck/k9/helper/NamedThreadFactory.kt b/legacy/core/src/main/java/com/fsck/k9/helper/NamedThreadFactory.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/helper/NamedThreadFactory.kt rename to legacy/core/src/main/java/com/fsck/k9/helper/NamedThreadFactory.kt diff --git a/app/core/src/main/java/com/fsck/k9/helper/ParcelableUtil.java b/legacy/core/src/main/java/com/fsck/k9/helper/ParcelableUtil.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/helper/ParcelableUtil.java rename to legacy/core/src/main/java/com/fsck/k9/helper/ParcelableUtil.java diff --git a/app/core/src/main/java/com/fsck/k9/helper/ReplyToParser.java b/legacy/core/src/main/java/com/fsck/k9/helper/ReplyToParser.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/helper/ReplyToParser.java rename to legacy/core/src/main/java/com/fsck/k9/helper/ReplyToParser.java diff --git a/app/core/src/main/java/com/fsck/k9/helper/RetainFragment.java b/legacy/core/src/main/java/com/fsck/k9/helper/RetainFragment.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/helper/RetainFragment.java rename to legacy/core/src/main/java/com/fsck/k9/helper/RetainFragment.java diff --git a/app/core/src/main/java/com/fsck/k9/helper/SimpleTextWatcher.java b/legacy/core/src/main/java/com/fsck/k9/helper/SimpleTextWatcher.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/helper/SimpleTextWatcher.java rename to legacy/core/src/main/java/com/fsck/k9/helper/SimpleTextWatcher.java diff --git a/app/core/src/main/java/com/fsck/k9/helper/SingleLiveEvent.java b/legacy/core/src/main/java/com/fsck/k9/helper/SingleLiveEvent.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/helper/SingleLiveEvent.java rename to legacy/core/src/main/java/com/fsck/k9/helper/SingleLiveEvent.java diff --git a/app/core/src/main/java/com/fsck/k9/helper/StringHelper.kt b/legacy/core/src/main/java/com/fsck/k9/helper/StringHelper.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/helper/StringHelper.kt rename to legacy/core/src/main/java/com/fsck/k9/helper/StringHelper.kt diff --git a/app/core/src/main/java/com/fsck/k9/helper/Timing.kt b/legacy/core/src/main/java/com/fsck/k9/helper/Timing.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/helper/Timing.kt rename to legacy/core/src/main/java/com/fsck/k9/helper/Timing.kt diff --git a/app/core/src/main/java/com/fsck/k9/helper/UnsubscribeUri.kt b/legacy/core/src/main/java/com/fsck/k9/helper/UnsubscribeUri.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/helper/UnsubscribeUri.kt rename to legacy/core/src/main/java/com/fsck/k9/helper/UnsubscribeUri.kt diff --git a/app/core/src/main/java/com/fsck/k9/helper/UrlEncodingHelper.java b/legacy/core/src/main/java/com/fsck/k9/helper/UrlEncodingHelper.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/helper/UrlEncodingHelper.java rename to legacy/core/src/main/java/com/fsck/k9/helper/UrlEncodingHelper.java diff --git a/app/core/src/main/java/com/fsck/k9/helper/Utility.java b/legacy/core/src/main/java/com/fsck/k9/helper/Utility.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/helper/Utility.java rename to legacy/core/src/main/java/com/fsck/k9/helper/Utility.java diff --git a/app/core/src/main/java/com/fsck/k9/helper/jsoup/AdvancedNodeTraversor.java b/legacy/core/src/main/java/com/fsck/k9/helper/jsoup/AdvancedNodeTraversor.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/helper/jsoup/AdvancedNodeTraversor.java rename to legacy/core/src/main/java/com/fsck/k9/helper/jsoup/AdvancedNodeTraversor.java diff --git a/app/core/src/main/java/com/fsck/k9/helper/jsoup/NodeFilter.java b/legacy/core/src/main/java/com/fsck/k9/helper/jsoup/NodeFilter.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/helper/jsoup/NodeFilter.java rename to legacy/core/src/main/java/com/fsck/k9/helper/jsoup/NodeFilter.java diff --git a/app/core/src/main/java/com/fsck/k9/job/K9JobManager.kt b/legacy/core/src/main/java/com/fsck/k9/job/K9JobManager.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/job/K9JobManager.kt rename to legacy/core/src/main/java/com/fsck/k9/job/K9JobManager.kt diff --git a/app/core/src/main/java/com/fsck/k9/job/K9WorkerFactory.kt b/legacy/core/src/main/java/com/fsck/k9/job/K9WorkerFactory.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/job/K9WorkerFactory.kt rename to legacy/core/src/main/java/com/fsck/k9/job/K9WorkerFactory.kt diff --git a/app/core/src/main/java/com/fsck/k9/job/KoinModule.kt b/legacy/core/src/main/java/com/fsck/k9/job/KoinModule.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/job/KoinModule.kt rename to legacy/core/src/main/java/com/fsck/k9/job/KoinModule.kt diff --git a/app/core/src/main/java/com/fsck/k9/job/MailSyncWorker.kt b/legacy/core/src/main/java/com/fsck/k9/job/MailSyncWorker.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/job/MailSyncWorker.kt rename to legacy/core/src/main/java/com/fsck/k9/job/MailSyncWorker.kt diff --git a/app/core/src/main/java/com/fsck/k9/job/MailSyncWorkerManager.kt b/legacy/core/src/main/java/com/fsck/k9/job/MailSyncWorkerManager.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/job/MailSyncWorkerManager.kt rename to legacy/core/src/main/java/com/fsck/k9/job/MailSyncWorkerManager.kt diff --git a/app/core/src/main/java/com/fsck/k9/job/WorkManagerConfigurationProvider.kt b/legacy/core/src/main/java/com/fsck/k9/job/WorkManagerConfigurationProvider.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/job/WorkManagerConfigurationProvider.kt rename to legacy/core/src/main/java/com/fsck/k9/job/WorkManagerConfigurationProvider.kt diff --git a/app/core/src/main/java/com/fsck/k9/logging/KoinModule.kt b/legacy/core/src/main/java/com/fsck/k9/logging/KoinModule.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/logging/KoinModule.kt rename to legacy/core/src/main/java/com/fsck/k9/logging/KoinModule.kt diff --git a/app/core/src/main/java/com/fsck/k9/logging/LogFileWriter.kt b/legacy/core/src/main/java/com/fsck/k9/logging/LogFileWriter.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/logging/LogFileWriter.kt rename to legacy/core/src/main/java/com/fsck/k9/logging/LogFileWriter.kt diff --git a/app/core/src/main/java/com/fsck/k9/logging/ProcessExecutor.kt b/legacy/core/src/main/java/com/fsck/k9/logging/ProcessExecutor.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/logging/ProcessExecutor.kt rename to legacy/core/src/main/java/com/fsck/k9/logging/ProcessExecutor.kt diff --git a/app/core/src/main/java/com/fsck/k9/mail/MailServerDirection.kt b/legacy/core/src/main/java/com/fsck/k9/mail/MailServerDirection.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mail/MailServerDirection.kt rename to legacy/core/src/main/java/com/fsck/k9/mail/MailServerDirection.kt diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/AttachmentResolver.java b/legacy/core/src/main/java/com/fsck/k9/mailstore/AttachmentResolver.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/AttachmentResolver.java rename to legacy/core/src/main/java/com/fsck/k9/mailstore/AttachmentResolver.java diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/AttachmentViewInfo.java b/legacy/core/src/main/java/com/fsck/k9/mailstore/AttachmentViewInfo.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/AttachmentViewInfo.java rename to legacy/core/src/main/java/com/fsck/k9/mailstore/AttachmentViewInfo.java diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/AutoExpandFolderBackendFoldersRefreshListener.kt b/legacy/core/src/main/java/com/fsck/k9/mailstore/AutoExpandFolderBackendFoldersRefreshListener.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/AutoExpandFolderBackendFoldersRefreshListener.kt rename to legacy/core/src/main/java/com/fsck/k9/mailstore/AutoExpandFolderBackendFoldersRefreshListener.kt diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/BackendFoldersRefreshListener.kt b/legacy/core/src/main/java/com/fsck/k9/mailstore/BackendFoldersRefreshListener.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/BackendFoldersRefreshListener.kt rename to legacy/core/src/main/java/com/fsck/k9/mailstore/BackendFoldersRefreshListener.kt diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/BinaryAttachmentBody.java b/legacy/core/src/main/java/com/fsck/k9/mailstore/BinaryAttachmentBody.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/BinaryAttachmentBody.java rename to legacy/core/src/main/java/com/fsck/k9/mailstore/BinaryAttachmentBody.java diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/CacheAwareMessageMapper.kt b/legacy/core/src/main/java/com/fsck/k9/mailstore/CacheAwareMessageMapper.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/CacheAwareMessageMapper.kt rename to legacy/core/src/main/java/com/fsck/k9/mailstore/CacheAwareMessageMapper.kt diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/CreateFolderInfo.kt b/legacy/core/src/main/java/com/fsck/k9/mailstore/CreateFolderInfo.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/CreateFolderInfo.kt rename to legacy/core/src/main/java/com/fsck/k9/mailstore/CreateFolderInfo.kt diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/CryptoResultAnnotation.java b/legacy/core/src/main/java/com/fsck/k9/mailstore/CryptoResultAnnotation.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/CryptoResultAnnotation.java rename to legacy/core/src/main/java/com/fsck/k9/mailstore/CryptoResultAnnotation.java diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/DatabasePreviewType.java b/legacy/core/src/main/java/com/fsck/k9/mailstore/DatabasePreviewType.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/DatabasePreviewType.java rename to legacy/core/src/main/java/com/fsck/k9/mailstore/DatabasePreviewType.java diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/DeferredFileBody.java b/legacy/core/src/main/java/com/fsck/k9/mailstore/DeferredFileBody.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/DeferredFileBody.java rename to legacy/core/src/main/java/com/fsck/k9/mailstore/DeferredFileBody.java diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/FileBackedBody.java b/legacy/core/src/main/java/com/fsck/k9/mailstore/FileBackedBody.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/FileBackedBody.java rename to legacy/core/src/main/java/com/fsck/k9/mailstore/FileBackedBody.java diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/FolderMapper.kt b/legacy/core/src/main/java/com/fsck/k9/mailstore/FolderMapper.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/FolderMapper.kt rename to legacy/core/src/main/java/com/fsck/k9/mailstore/FolderMapper.kt diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/FolderNotFoundException.kt b/legacy/core/src/main/java/com/fsck/k9/mailstore/FolderNotFoundException.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/FolderNotFoundException.kt rename to legacy/core/src/main/java/com/fsck/k9/mailstore/FolderNotFoundException.kt diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/FolderRepository.kt b/legacy/core/src/main/java/com/fsck/k9/mailstore/FolderRepository.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/FolderRepository.kt rename to legacy/core/src/main/java/com/fsck/k9/mailstore/FolderRepository.kt diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/FolderSettings.kt b/legacy/core/src/main/java/com/fsck/k9/mailstore/FolderSettings.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/FolderSettings.kt rename to legacy/core/src/main/java/com/fsck/k9/mailstore/FolderSettings.kt diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/FolderSettingsProvider.kt b/legacy/core/src/main/java/com/fsck/k9/mailstore/FolderSettingsProvider.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/FolderSettingsProvider.kt rename to legacy/core/src/main/java/com/fsck/k9/mailstore/FolderSettingsProvider.kt diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/FolderTypeConverter.kt b/legacy/core/src/main/java/com/fsck/k9/mailstore/FolderTypeConverter.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/FolderTypeConverter.kt rename to legacy/core/src/main/java/com/fsck/k9/mailstore/FolderTypeConverter.kt diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/K9BackendFolder.kt b/legacy/core/src/main/java/com/fsck/k9/mailstore/K9BackendFolder.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/K9BackendFolder.kt rename to legacy/core/src/main/java/com/fsck/k9/mailstore/K9BackendFolder.kt diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/K9BackendStorage.kt b/legacy/core/src/main/java/com/fsck/k9/mailstore/K9BackendStorage.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/K9BackendStorage.kt rename to legacy/core/src/main/java/com/fsck/k9/mailstore/K9BackendStorage.kt diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/K9BackendStorageFactory.kt b/legacy/core/src/main/java/com/fsck/k9/mailstore/K9BackendStorageFactory.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/K9BackendStorageFactory.kt rename to legacy/core/src/main/java/com/fsck/k9/mailstore/K9BackendStorageFactory.kt diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/KoinModule.kt b/legacy/core/src/main/java/com/fsck/k9/mailstore/KoinModule.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/KoinModule.kt rename to legacy/core/src/main/java/com/fsck/k9/mailstore/KoinModule.kt diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/ListenableMessageStore.kt b/legacy/core/src/main/java/com/fsck/k9/mailstore/ListenableMessageStore.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/ListenableMessageStore.kt rename to legacy/core/src/main/java/com/fsck/k9/mailstore/ListenableMessageStore.kt diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/LocalBodyPart.java b/legacy/core/src/main/java/com/fsck/k9/mailstore/LocalBodyPart.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/LocalBodyPart.java rename to legacy/core/src/main/java/com/fsck/k9/mailstore/LocalBodyPart.java diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/LocalFolder.java b/legacy/core/src/main/java/com/fsck/k9/mailstore/LocalFolder.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/LocalFolder.java rename to legacy/core/src/main/java/com/fsck/k9/mailstore/LocalFolder.java diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/LocalMessage.java b/legacy/core/src/main/java/com/fsck/k9/mailstore/LocalMessage.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/LocalMessage.java rename to legacy/core/src/main/java/com/fsck/k9/mailstore/LocalMessage.java diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/LocalMimeMessage.java b/legacy/core/src/main/java/com/fsck/k9/mailstore/LocalMimeMessage.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/LocalMimeMessage.java rename to legacy/core/src/main/java/com/fsck/k9/mailstore/LocalMimeMessage.java diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/LocalPart.java b/legacy/core/src/main/java/com/fsck/k9/mailstore/LocalPart.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/LocalPart.java rename to legacy/core/src/main/java/com/fsck/k9/mailstore/LocalPart.java diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/LocalStore.java b/legacy/core/src/main/java/com/fsck/k9/mailstore/LocalStore.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/LocalStore.java rename to legacy/core/src/main/java/com/fsck/k9/mailstore/LocalStore.java diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/LocalStoreProvider.kt b/legacy/core/src/main/java/com/fsck/k9/mailstore/LocalStoreProvider.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/LocalStoreProvider.kt rename to legacy/core/src/main/java/com/fsck/k9/mailstore/LocalStoreProvider.kt diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/LockableDatabase.java b/legacy/core/src/main/java/com/fsck/k9/mailstore/LockableDatabase.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/LockableDatabase.java rename to legacy/core/src/main/java/com/fsck/k9/mailstore/LockableDatabase.java diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/MessageColumns.kt b/legacy/core/src/main/java/com/fsck/k9/mailstore/MessageColumns.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/MessageColumns.kt rename to legacy/core/src/main/java/com/fsck/k9/mailstore/MessageColumns.kt diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/MessageCryptoAnnotations.java b/legacy/core/src/main/java/com/fsck/k9/mailstore/MessageCryptoAnnotations.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/MessageCryptoAnnotations.java rename to legacy/core/src/main/java/com/fsck/k9/mailstore/MessageCryptoAnnotations.java diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/MessageDetails.kt b/legacy/core/src/main/java/com/fsck/k9/mailstore/MessageDetails.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/MessageDetails.kt rename to legacy/core/src/main/java/com/fsck/k9/mailstore/MessageDetails.kt diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/MessageHelper.java b/legacy/core/src/main/java/com/fsck/k9/mailstore/MessageHelper.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/MessageHelper.java rename to legacy/core/src/main/java/com/fsck/k9/mailstore/MessageHelper.java diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/MessageListCache.kt b/legacy/core/src/main/java/com/fsck/k9/mailstore/MessageListCache.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/MessageListCache.kt rename to legacy/core/src/main/java/com/fsck/k9/mailstore/MessageListCache.kt diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/MessageListRepository.kt b/legacy/core/src/main/java/com/fsck/k9/mailstore/MessageListRepository.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/MessageListRepository.kt rename to legacy/core/src/main/java/com/fsck/k9/mailstore/MessageListRepository.kt diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/MessageMapper.kt b/legacy/core/src/main/java/com/fsck/k9/mailstore/MessageMapper.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/MessageMapper.kt rename to legacy/core/src/main/java/com/fsck/k9/mailstore/MessageMapper.kt diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/MessageNotFoundException.kt b/legacy/core/src/main/java/com/fsck/k9/mailstore/MessageNotFoundException.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/MessageNotFoundException.kt rename to legacy/core/src/main/java/com/fsck/k9/mailstore/MessageNotFoundException.kt diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/MessageRepository.kt b/legacy/core/src/main/java/com/fsck/k9/mailstore/MessageRepository.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/MessageRepository.kt rename to legacy/core/src/main/java/com/fsck/k9/mailstore/MessageRepository.kt diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/MessageStore.kt b/legacy/core/src/main/java/com/fsck/k9/mailstore/MessageStore.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/MessageStore.kt rename to legacy/core/src/main/java/com/fsck/k9/mailstore/MessageStore.kt diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/MessageStoreFactory.kt b/legacy/core/src/main/java/com/fsck/k9/mailstore/MessageStoreFactory.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/MessageStoreFactory.kt rename to legacy/core/src/main/java/com/fsck/k9/mailstore/MessageStoreFactory.kt diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/MessageStoreManager.kt b/legacy/core/src/main/java/com/fsck/k9/mailstore/MessageStoreManager.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/MessageStoreManager.kt rename to legacy/core/src/main/java/com/fsck/k9/mailstore/MessageStoreManager.kt diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/MessageViewInfo.java b/legacy/core/src/main/java/com/fsck/k9/mailstore/MessageViewInfo.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/MessageViewInfo.java rename to legacy/core/src/main/java/com/fsck/k9/mailstore/MessageViewInfo.java diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/MessageViewInfoExtractor.java b/legacy/core/src/main/java/com/fsck/k9/mailstore/MessageViewInfoExtractor.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/MessageViewInfoExtractor.java rename to legacy/core/src/main/java/com/fsck/k9/mailstore/MessageViewInfoExtractor.java diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/MessageViewInfoExtractorFactory.kt b/legacy/core/src/main/java/com/fsck/k9/mailstore/MessageViewInfoExtractorFactory.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/MessageViewInfoExtractorFactory.kt rename to legacy/core/src/main/java/com/fsck/k9/mailstore/MessageViewInfoExtractorFactory.kt diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/MigrationsHelper.java b/legacy/core/src/main/java/com/fsck/k9/mailstore/MigrationsHelper.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/MigrationsHelper.java rename to legacy/core/src/main/java/com/fsck/k9/mailstore/MigrationsHelper.java diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/MimePartStreamParser.java b/legacy/core/src/main/java/com/fsck/k9/mailstore/MimePartStreamParser.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/MimePartStreamParser.java rename to legacy/core/src/main/java/com/fsck/k9/mailstore/MimePartStreamParser.java diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/MoreMessages.java b/legacy/core/src/main/java/com/fsck/k9/mailstore/MoreMessages.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/MoreMessages.java rename to legacy/core/src/main/java/com/fsck/k9/mailstore/MoreMessages.java diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/NotificationMessage.kt b/legacy/core/src/main/java/com/fsck/k9/mailstore/NotificationMessage.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/NotificationMessage.kt rename to legacy/core/src/main/java/com/fsck/k9/mailstore/NotificationMessage.kt diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/NotifierMessageStore.kt b/legacy/core/src/main/java/com/fsck/k9/mailstore/NotifierMessageStore.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/NotifierMessageStore.kt rename to legacy/core/src/main/java/com/fsck/k9/mailstore/NotifierMessageStore.kt diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/OutboxState.kt b/legacy/core/src/main/java/com/fsck/k9/mailstore/OutboxState.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/OutboxState.kt rename to legacy/core/src/main/java/com/fsck/k9/mailstore/OutboxState.kt diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/OutboxStateRepository.kt b/legacy/core/src/main/java/com/fsck/k9/mailstore/OutboxStateRepository.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/OutboxStateRepository.kt rename to legacy/core/src/main/java/com/fsck/k9/mailstore/OutboxStateRepository.kt diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/SaveMessageData.kt b/legacy/core/src/main/java/com/fsck/k9/mailstore/SaveMessageData.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/SaveMessageData.kt rename to legacy/core/src/main/java/com/fsck/k9/mailstore/SaveMessageData.kt diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/SaveMessageDataCreator.kt b/legacy/core/src/main/java/com/fsck/k9/mailstore/SaveMessageDataCreator.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/SaveMessageDataCreator.kt rename to legacy/core/src/main/java/com/fsck/k9/mailstore/SaveMessageDataCreator.kt diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/SchemaDefinitionFactory.kt b/legacy/core/src/main/java/com/fsck/k9/mailstore/SchemaDefinitionFactory.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/SchemaDefinitionFactory.kt rename to legacy/core/src/main/java/com/fsck/k9/mailstore/SchemaDefinitionFactory.kt diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/SendState.kt b/legacy/core/src/main/java/com/fsck/k9/mailstore/SendState.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/SendState.kt rename to legacy/core/src/main/java/com/fsck/k9/mailstore/SendState.kt diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/SpecialFolderBackendFoldersRefreshListener.kt b/legacy/core/src/main/java/com/fsck/k9/mailstore/SpecialFolderBackendFoldersRefreshListener.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/SpecialFolderBackendFoldersRefreshListener.kt rename to legacy/core/src/main/java/com/fsck/k9/mailstore/SpecialFolderBackendFoldersRefreshListener.kt diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/SpecialFolderSelectionStrategy.kt b/legacy/core/src/main/java/com/fsck/k9/mailstore/SpecialFolderSelectionStrategy.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/SpecialFolderSelectionStrategy.kt rename to legacy/core/src/main/java/com/fsck/k9/mailstore/SpecialFolderSelectionStrategy.kt diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/SpecialFolderUpdater.kt b/legacy/core/src/main/java/com/fsck/k9/mailstore/SpecialFolderUpdater.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/SpecialFolderUpdater.kt rename to legacy/core/src/main/java/com/fsck/k9/mailstore/SpecialFolderUpdater.kt diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/SpecialLocalFoldersCreator.kt b/legacy/core/src/main/java/com/fsck/k9/mailstore/SpecialLocalFoldersCreator.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/SpecialLocalFoldersCreator.kt rename to legacy/core/src/main/java/com/fsck/k9/mailstore/SpecialLocalFoldersCreator.kt diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/StorageManager.java b/legacy/core/src/main/java/com/fsck/k9/mailstore/StorageManager.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/StorageManager.java rename to legacy/core/src/main/java/com/fsck/k9/mailstore/StorageManager.java diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/TempFileBody.java b/legacy/core/src/main/java/com/fsck/k9/mailstore/TempFileBody.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/TempFileBody.java rename to legacy/core/src/main/java/com/fsck/k9/mailstore/TempFileBody.java diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/util/DeferredFileOutputStream.java b/legacy/core/src/main/java/com/fsck/k9/mailstore/util/DeferredFileOutputStream.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/util/DeferredFileOutputStream.java rename to legacy/core/src/main/java/com/fsck/k9/mailstore/util/DeferredFileOutputStream.java diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/util/FileFactory.java b/legacy/core/src/main/java/com/fsck/k9/mailstore/util/FileFactory.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/mailstore/util/FileFactory.java rename to legacy/core/src/main/java/com/fsck/k9/mailstore/util/FileFactory.java diff --git a/app/core/src/main/java/com/fsck/k9/message/Attachment.kt b/legacy/core/src/main/java/com/fsck/k9/message/Attachment.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/Attachment.kt rename to legacy/core/src/main/java/com/fsck/k9/message/Attachment.kt diff --git a/app/core/src/main/java/com/fsck/k9/message/AutocryptStatusInteractor.java b/legacy/core/src/main/java/com/fsck/k9/message/AutocryptStatusInteractor.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/AutocryptStatusInteractor.java rename to legacy/core/src/main/java/com/fsck/k9/message/AutocryptStatusInteractor.java diff --git a/app/core/src/main/java/com/fsck/k9/message/ComposePgpEnableByDefaultDecider.java b/legacy/core/src/main/java/com/fsck/k9/message/ComposePgpEnableByDefaultDecider.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/ComposePgpEnableByDefaultDecider.java rename to legacy/core/src/main/java/com/fsck/k9/message/ComposePgpEnableByDefaultDecider.java diff --git a/app/core/src/main/java/com/fsck/k9/message/ComposePgpInlineDecider.java b/legacy/core/src/main/java/com/fsck/k9/message/ComposePgpInlineDecider.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/ComposePgpInlineDecider.java rename to legacy/core/src/main/java/com/fsck/k9/message/ComposePgpInlineDecider.java diff --git a/app/core/src/main/java/com/fsck/k9/message/CryptoStatus.kt b/legacy/core/src/main/java/com/fsck/k9/message/CryptoStatus.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/CryptoStatus.kt rename to legacy/core/src/main/java/com/fsck/k9/message/CryptoStatus.kt diff --git a/app/core/src/main/java/com/fsck/k9/message/IdentityField.java b/legacy/core/src/main/java/com/fsck/k9/message/IdentityField.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/IdentityField.java rename to legacy/core/src/main/java/com/fsck/k9/message/IdentityField.java diff --git a/app/core/src/main/java/com/fsck/k9/message/IdentityHeaderBuilder.java b/legacy/core/src/main/java/com/fsck/k9/message/IdentityHeaderBuilder.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/IdentityHeaderBuilder.java rename to legacy/core/src/main/java/com/fsck/k9/message/IdentityHeaderBuilder.java diff --git a/app/core/src/main/java/com/fsck/k9/message/IdentityHeaderParser.java b/legacy/core/src/main/java/com/fsck/k9/message/IdentityHeaderParser.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/IdentityHeaderParser.java rename to legacy/core/src/main/java/com/fsck/k9/message/IdentityHeaderParser.java diff --git a/app/core/src/main/java/com/fsck/k9/message/MessageBuilder.java b/legacy/core/src/main/java/com/fsck/k9/message/MessageBuilder.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/MessageBuilder.java rename to legacy/core/src/main/java/com/fsck/k9/message/MessageBuilder.java diff --git a/app/core/src/main/java/com/fsck/k9/message/PgpMessageBuilder.java b/legacy/core/src/main/java/com/fsck/k9/message/PgpMessageBuilder.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/PgpMessageBuilder.java rename to legacy/core/src/main/java/com/fsck/k9/message/PgpMessageBuilder.java diff --git a/app/core/src/main/java/com/fsck/k9/message/QuotedTextMode.java b/legacy/core/src/main/java/com/fsck/k9/message/QuotedTextMode.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/QuotedTextMode.java rename to legacy/core/src/main/java/com/fsck/k9/message/QuotedTextMode.java diff --git a/app/core/src/main/java/com/fsck/k9/message/ReplyActionStrategy.kt b/legacy/core/src/main/java/com/fsck/k9/message/ReplyActionStrategy.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/ReplyActionStrategy.kt rename to legacy/core/src/main/java/com/fsck/k9/message/ReplyActionStrategy.kt diff --git a/app/core/src/main/java/com/fsck/k9/message/SimpleMessageBuilder.java b/legacy/core/src/main/java/com/fsck/k9/message/SimpleMessageBuilder.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/SimpleMessageBuilder.java rename to legacy/core/src/main/java/com/fsck/k9/message/SimpleMessageBuilder.java diff --git a/app/core/src/main/java/com/fsck/k9/message/SimpleMessageFormat.java b/legacy/core/src/main/java/com/fsck/k9/message/SimpleMessageFormat.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/SimpleMessageFormat.java rename to legacy/core/src/main/java/com/fsck/k9/message/SimpleMessageFormat.java diff --git a/app/core/src/main/java/com/fsck/k9/message/TextBodyBuilder.java b/legacy/core/src/main/java/com/fsck/k9/message/TextBodyBuilder.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/TextBodyBuilder.java rename to legacy/core/src/main/java/com/fsck/k9/message/TextBodyBuilder.java diff --git a/app/core/src/main/java/com/fsck/k9/message/extractors/AttachmentCounter.java b/legacy/core/src/main/java/com/fsck/k9/message/extractors/AttachmentCounter.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/extractors/AttachmentCounter.java rename to legacy/core/src/main/java/com/fsck/k9/message/extractors/AttachmentCounter.java diff --git a/app/core/src/main/java/com/fsck/k9/message/extractors/AttachmentInfoExtractor.java b/legacy/core/src/main/java/com/fsck/k9/message/extractors/AttachmentInfoExtractor.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/extractors/AttachmentInfoExtractor.java rename to legacy/core/src/main/java/com/fsck/k9/message/extractors/AttachmentInfoExtractor.java diff --git a/app/core/src/main/java/com/fsck/k9/message/extractors/BasicPartInfoExtractor.kt b/legacy/core/src/main/java/com/fsck/k9/message/extractors/BasicPartInfoExtractor.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/extractors/BasicPartInfoExtractor.kt rename to legacy/core/src/main/java/com/fsck/k9/message/extractors/BasicPartInfoExtractor.kt diff --git a/app/core/src/main/java/com/fsck/k9/message/extractors/BodyTextExtractor.java b/legacy/core/src/main/java/com/fsck/k9/message/extractors/BodyTextExtractor.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/extractors/BodyTextExtractor.java rename to legacy/core/src/main/java/com/fsck/k9/message/extractors/BodyTextExtractor.java diff --git a/app/core/src/main/java/com/fsck/k9/message/extractors/KoinModule.kt b/legacy/core/src/main/java/com/fsck/k9/message/extractors/KoinModule.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/extractors/KoinModule.kt rename to legacy/core/src/main/java/com/fsck/k9/message/extractors/KoinModule.kt diff --git a/app/core/src/main/java/com/fsck/k9/message/extractors/MessageFulltextCreator.java b/legacy/core/src/main/java/com/fsck/k9/message/extractors/MessageFulltextCreator.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/extractors/MessageFulltextCreator.java rename to legacy/core/src/main/java/com/fsck/k9/message/extractors/MessageFulltextCreator.java diff --git a/app/core/src/main/java/com/fsck/k9/message/extractors/MessagePreviewCreator.java b/legacy/core/src/main/java/com/fsck/k9/message/extractors/MessagePreviewCreator.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/extractors/MessagePreviewCreator.java rename to legacy/core/src/main/java/com/fsck/k9/message/extractors/MessagePreviewCreator.java diff --git a/app/core/src/main/java/com/fsck/k9/message/extractors/PreviewExtractionException.java b/legacy/core/src/main/java/com/fsck/k9/message/extractors/PreviewExtractionException.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/extractors/PreviewExtractionException.java rename to legacy/core/src/main/java/com/fsck/k9/message/extractors/PreviewExtractionException.java diff --git a/app/core/src/main/java/com/fsck/k9/message/extractors/PreviewResult.java b/legacy/core/src/main/java/com/fsck/k9/message/extractors/PreviewResult.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/extractors/PreviewResult.java rename to legacy/core/src/main/java/com/fsck/k9/message/extractors/PreviewResult.java diff --git a/app/core/src/main/java/com/fsck/k9/message/extractors/PreviewTextExtractor.kt b/legacy/core/src/main/java/com/fsck/k9/message/extractors/PreviewTextExtractor.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/extractors/PreviewTextExtractor.kt rename to legacy/core/src/main/java/com/fsck/k9/message/extractors/PreviewTextExtractor.kt diff --git a/app/core/src/main/java/com/fsck/k9/message/extractors/TextPartFinder.kt b/legacy/core/src/main/java/com/fsck/k9/message/extractors/TextPartFinder.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/extractors/TextPartFinder.kt rename to legacy/core/src/main/java/com/fsck/k9/message/extractors/TextPartFinder.kt diff --git a/app/core/src/main/java/com/fsck/k9/message/html/DisplayHtml.kt b/legacy/core/src/main/java/com/fsck/k9/message/html/DisplayHtml.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/html/DisplayHtml.kt rename to legacy/core/src/main/java/com/fsck/k9/message/html/DisplayHtml.kt diff --git a/app/core/src/main/java/com/fsck/k9/message/html/DisplayHtmlFactory.kt b/legacy/core/src/main/java/com/fsck/k9/message/html/DisplayHtmlFactory.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/html/DisplayHtmlFactory.kt rename to legacy/core/src/main/java/com/fsck/k9/message/html/DisplayHtmlFactory.kt diff --git a/app/core/src/main/java/com/fsck/k9/message/html/DividerReplacer.kt b/legacy/core/src/main/java/com/fsck/k9/message/html/DividerReplacer.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/html/DividerReplacer.kt rename to legacy/core/src/main/java/com/fsck/k9/message/html/DividerReplacer.kt diff --git a/app/core/src/main/java/com/fsck/k9/message/html/EmailSection.kt b/legacy/core/src/main/java/com/fsck/k9/message/html/EmailSection.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/html/EmailSection.kt rename to legacy/core/src/main/java/com/fsck/k9/message/html/EmailSection.kt diff --git a/app/core/src/main/java/com/fsck/k9/message/html/EmailSectionExtractor.kt b/legacy/core/src/main/java/com/fsck/k9/message/html/EmailSectionExtractor.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/html/EmailSectionExtractor.kt rename to legacy/core/src/main/java/com/fsck/k9/message/html/EmailSectionExtractor.kt diff --git a/app/core/src/main/java/com/fsck/k9/message/html/EmailTextToHtml.kt b/legacy/core/src/main/java/com/fsck/k9/message/html/EmailTextToHtml.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/html/EmailTextToHtml.kt rename to legacy/core/src/main/java/com/fsck/k9/message/html/EmailTextToHtml.kt diff --git a/app/core/src/main/java/com/fsck/k9/message/html/GenericUriParser.kt b/legacy/core/src/main/java/com/fsck/k9/message/html/GenericUriParser.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/html/GenericUriParser.kt rename to legacy/core/src/main/java/com/fsck/k9/message/html/GenericUriParser.kt diff --git a/app/core/src/main/java/com/fsck/k9/message/html/HtmlConverter.kt b/legacy/core/src/main/java/com/fsck/k9/message/html/HtmlConverter.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/html/HtmlConverter.kt rename to legacy/core/src/main/java/com/fsck/k9/message/html/HtmlConverter.kt diff --git a/app/core/src/main/java/com/fsck/k9/message/html/HtmlModification.kt b/legacy/core/src/main/java/com/fsck/k9/message/html/HtmlModification.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/html/HtmlModification.kt rename to legacy/core/src/main/java/com/fsck/k9/message/html/HtmlModification.kt diff --git a/app/core/src/main/java/com/fsck/k9/message/html/HtmlProcessorFactory.kt b/legacy/core/src/main/java/com/fsck/k9/message/html/HtmlProcessorFactory.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/html/HtmlProcessorFactory.kt rename to legacy/core/src/main/java/com/fsck/k9/message/html/HtmlProcessorFactory.kt diff --git a/app/core/src/main/java/com/fsck/k9/message/html/HtmlSettings.kt b/legacy/core/src/main/java/com/fsck/k9/message/html/HtmlSettings.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/html/HtmlSettings.kt rename to legacy/core/src/main/java/com/fsck/k9/message/html/HtmlSettings.kt diff --git a/app/core/src/main/java/com/fsck/k9/message/html/HtmlToPlainText.kt b/legacy/core/src/main/java/com/fsck/k9/message/html/HtmlToPlainText.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/html/HtmlToPlainText.kt rename to legacy/core/src/main/java/com/fsck/k9/message/html/HtmlToPlainText.kt diff --git a/app/core/src/main/java/com/fsck/k9/message/html/HttpUriParser.kt b/legacy/core/src/main/java/com/fsck/k9/message/html/HttpUriParser.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/html/HttpUriParser.kt rename to legacy/core/src/main/java/com/fsck/k9/message/html/HttpUriParser.kt diff --git a/app/core/src/main/java/com/fsck/k9/message/html/KoinModule.kt b/legacy/core/src/main/java/com/fsck/k9/message/html/KoinModule.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/html/KoinModule.kt rename to legacy/core/src/main/java/com/fsck/k9/message/html/KoinModule.kt diff --git a/app/core/src/main/java/com/fsck/k9/message/html/SignatureWrapper.kt b/legacy/core/src/main/java/com/fsck/k9/message/html/SignatureWrapper.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/html/SignatureWrapper.kt rename to legacy/core/src/main/java/com/fsck/k9/message/html/SignatureWrapper.kt diff --git a/app/core/src/main/java/com/fsck/k9/message/html/TextToHtml.kt b/legacy/core/src/main/java/com/fsck/k9/message/html/TextToHtml.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/html/TextToHtml.kt rename to legacy/core/src/main/java/com/fsck/k9/message/html/TextToHtml.kt diff --git a/app/core/src/main/java/com/fsck/k9/message/html/UriLinkifier.kt b/legacy/core/src/main/java/com/fsck/k9/message/html/UriLinkifier.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/html/UriLinkifier.kt rename to legacy/core/src/main/java/com/fsck/k9/message/html/UriLinkifier.kt diff --git a/app/core/src/main/java/com/fsck/k9/message/html/UriMatch.kt b/legacy/core/src/main/java/com/fsck/k9/message/html/UriMatch.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/html/UriMatch.kt rename to legacy/core/src/main/java/com/fsck/k9/message/html/UriMatch.kt diff --git a/app/core/src/main/java/com/fsck/k9/message/html/UriMatcher.kt b/legacy/core/src/main/java/com/fsck/k9/message/html/UriMatcher.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/html/UriMatcher.kt rename to legacy/core/src/main/java/com/fsck/k9/message/html/UriMatcher.kt diff --git a/app/core/src/main/java/com/fsck/k9/message/html/UriParser.kt b/legacy/core/src/main/java/com/fsck/k9/message/html/UriParser.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/html/UriParser.kt rename to legacy/core/src/main/java/com/fsck/k9/message/html/UriParser.kt diff --git a/app/core/src/main/java/com/fsck/k9/message/quote/HtmlQuoteCreator.java b/legacy/core/src/main/java/com/fsck/k9/message/quote/HtmlQuoteCreator.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/quote/HtmlQuoteCreator.java rename to legacy/core/src/main/java/com/fsck/k9/message/quote/HtmlQuoteCreator.java diff --git a/app/core/src/main/java/com/fsck/k9/message/quote/InsertableHtmlContent.java b/legacy/core/src/main/java/com/fsck/k9/message/quote/InsertableHtmlContent.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/quote/InsertableHtmlContent.java rename to legacy/core/src/main/java/com/fsck/k9/message/quote/InsertableHtmlContent.java diff --git a/app/core/src/main/java/com/fsck/k9/message/quote/KoinModule.kt b/legacy/core/src/main/java/com/fsck/k9/message/quote/KoinModule.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/quote/KoinModule.kt rename to legacy/core/src/main/java/com/fsck/k9/message/quote/KoinModule.kt diff --git a/app/core/src/main/java/com/fsck/k9/message/quote/QuoteDateFormatter.kt b/legacy/core/src/main/java/com/fsck/k9/message/quote/QuoteDateFormatter.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/quote/QuoteDateFormatter.kt rename to legacy/core/src/main/java/com/fsck/k9/message/quote/QuoteDateFormatter.kt diff --git a/app/core/src/main/java/com/fsck/k9/message/quote/TextQuoteCreator.kt b/legacy/core/src/main/java/com/fsck/k9/message/quote/TextQuoteCreator.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/quote/TextQuoteCreator.kt rename to legacy/core/src/main/java/com/fsck/k9/message/quote/TextQuoteCreator.kt diff --git a/app/core/src/main/java/com/fsck/k9/message/signature/HtmlSignatureRemover.kt b/legacy/core/src/main/java/com/fsck/k9/message/signature/HtmlSignatureRemover.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/signature/HtmlSignatureRemover.kt rename to legacy/core/src/main/java/com/fsck/k9/message/signature/HtmlSignatureRemover.kt diff --git a/app/core/src/main/java/com/fsck/k9/message/signature/TextSignatureRemover.java b/legacy/core/src/main/java/com/fsck/k9/message/signature/TextSignatureRemover.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/message/signature/TextSignatureRemover.java rename to legacy/core/src/main/java/com/fsck/k9/message/signature/TextSignatureRemover.java diff --git a/app/core/src/main/java/com/fsck/k9/network/ConnectivityManager.kt b/legacy/core/src/main/java/com/fsck/k9/network/ConnectivityManager.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/network/ConnectivityManager.kt rename to legacy/core/src/main/java/com/fsck/k9/network/ConnectivityManager.kt diff --git a/app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi21.kt b/legacy/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi21.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi21.kt rename to legacy/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi21.kt diff --git a/app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi23.kt b/legacy/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi23.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi23.kt rename to legacy/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi23.kt diff --git a/app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi24.kt b/legacy/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi24.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi24.kt rename to legacy/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi24.kt diff --git a/app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerBase.kt b/legacy/core/src/main/java/com/fsck/k9/network/ConnectivityManagerBase.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerBase.kt rename to legacy/core/src/main/java/com/fsck/k9/network/ConnectivityManagerBase.kt diff --git a/app/core/src/main/java/com/fsck/k9/network/KointModule.kt b/legacy/core/src/main/java/com/fsck/k9/network/KointModule.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/network/KointModule.kt rename to legacy/core/src/main/java/com/fsck/k9/network/KointModule.kt diff --git a/app/core/src/main/java/com/fsck/k9/notification/AddNotificationResult.kt b/legacy/core/src/main/java/com/fsck/k9/notification/AddNotificationResult.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/notification/AddNotificationResult.kt rename to legacy/core/src/main/java/com/fsck/k9/notification/AddNotificationResult.kt diff --git a/app/core/src/main/java/com/fsck/k9/notification/AuthenticationErrorNotificationController.kt b/legacy/core/src/main/java/com/fsck/k9/notification/AuthenticationErrorNotificationController.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/notification/AuthenticationErrorNotificationController.kt rename to legacy/core/src/main/java/com/fsck/k9/notification/AuthenticationErrorNotificationController.kt diff --git a/app/core/src/main/java/com/fsck/k9/notification/BackgroundWorkNotificationController.kt b/legacy/core/src/main/java/com/fsck/k9/notification/BackgroundWorkNotificationController.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/notification/BackgroundWorkNotificationController.kt rename to legacy/core/src/main/java/com/fsck/k9/notification/BackgroundWorkNotificationController.kt diff --git a/app/core/src/main/java/com/fsck/k9/notification/BaseNotificationDataCreator.kt b/legacy/core/src/main/java/com/fsck/k9/notification/BaseNotificationDataCreator.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/notification/BaseNotificationDataCreator.kt rename to legacy/core/src/main/java/com/fsck/k9/notification/BaseNotificationDataCreator.kt diff --git a/app/core/src/main/java/com/fsck/k9/notification/CertificateErrorNotificationController.kt b/legacy/core/src/main/java/com/fsck/k9/notification/CertificateErrorNotificationController.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/notification/CertificateErrorNotificationController.kt rename to legacy/core/src/main/java/com/fsck/k9/notification/CertificateErrorNotificationController.kt diff --git a/app/core/src/main/java/com/fsck/k9/notification/CoreKoinModule.kt b/legacy/core/src/main/java/com/fsck/k9/notification/CoreKoinModule.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/notification/CoreKoinModule.kt rename to legacy/core/src/main/java/com/fsck/k9/notification/CoreKoinModule.kt diff --git a/app/core/src/main/java/com/fsck/k9/notification/LockScreenNotificationCreator.kt b/legacy/core/src/main/java/com/fsck/k9/notification/LockScreenNotificationCreator.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/notification/LockScreenNotificationCreator.kt rename to legacy/core/src/main/java/com/fsck/k9/notification/LockScreenNotificationCreator.kt diff --git a/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationController.kt b/legacy/core/src/main/java/com/fsck/k9/notification/NewMailNotificationController.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationController.kt rename to legacy/core/src/main/java/com/fsck/k9/notification/NewMailNotificationController.kt diff --git a/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationData.kt b/legacy/core/src/main/java/com/fsck/k9/notification/NewMailNotificationData.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationData.kt rename to legacy/core/src/main/java/com/fsck/k9/notification/NewMailNotificationData.kt diff --git a/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationManager.kt b/legacy/core/src/main/java/com/fsck/k9/notification/NewMailNotificationManager.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationManager.kt rename to legacy/core/src/main/java/com/fsck/k9/notification/NewMailNotificationManager.kt diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationActionCreator.kt b/legacy/core/src/main/java/com/fsck/k9/notification/NotificationActionCreator.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/notification/NotificationActionCreator.kt rename to legacy/core/src/main/java/com/fsck/k9/notification/NotificationActionCreator.kt diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationActionService.kt b/legacy/core/src/main/java/com/fsck/k9/notification/NotificationActionService.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/notification/NotificationActionService.kt rename to legacy/core/src/main/java/com/fsck/k9/notification/NotificationActionService.kt diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationChannelManager.kt b/legacy/core/src/main/java/com/fsck/k9/notification/NotificationChannelManager.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/notification/NotificationChannelManager.kt rename to legacy/core/src/main/java/com/fsck/k9/notification/NotificationChannelManager.kt diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationConfigurationConverter.kt b/legacy/core/src/main/java/com/fsck/k9/notification/NotificationConfigurationConverter.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/notification/NotificationConfigurationConverter.kt rename to legacy/core/src/main/java/com/fsck/k9/notification/NotificationConfigurationConverter.kt diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationContent.kt b/legacy/core/src/main/java/com/fsck/k9/notification/NotificationContent.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/notification/NotificationContent.kt rename to legacy/core/src/main/java/com/fsck/k9/notification/NotificationContent.kt diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationContentCreator.kt b/legacy/core/src/main/java/com/fsck/k9/notification/NotificationContentCreator.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/notification/NotificationContentCreator.kt rename to legacy/core/src/main/java/com/fsck/k9/notification/NotificationContentCreator.kt diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationController.kt b/legacy/core/src/main/java/com/fsck/k9/notification/NotificationController.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/notification/NotificationController.kt rename to legacy/core/src/main/java/com/fsck/k9/notification/NotificationController.kt diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationData.kt b/legacy/core/src/main/java/com/fsck/k9/notification/NotificationData.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/notification/NotificationData.kt rename to legacy/core/src/main/java/com/fsck/k9/notification/NotificationData.kt diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationDataStore.kt b/legacy/core/src/main/java/com/fsck/k9/notification/NotificationDataStore.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/notification/NotificationDataStore.kt rename to legacy/core/src/main/java/com/fsck/k9/notification/NotificationDataStore.kt diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationGroupKeys.kt b/legacy/core/src/main/java/com/fsck/k9/notification/NotificationGroupKeys.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/notification/NotificationGroupKeys.kt rename to legacy/core/src/main/java/com/fsck/k9/notification/NotificationGroupKeys.kt diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationHelper.kt b/legacy/core/src/main/java/com/fsck/k9/notification/NotificationHelper.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/notification/NotificationHelper.kt rename to legacy/core/src/main/java/com/fsck/k9/notification/NotificationHelper.kt diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationHolder.kt b/legacy/core/src/main/java/com/fsck/k9/notification/NotificationHolder.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/notification/NotificationHolder.kt rename to legacy/core/src/main/java/com/fsck/k9/notification/NotificationHolder.kt diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationIds.kt b/legacy/core/src/main/java/com/fsck/k9/notification/NotificationIds.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/notification/NotificationIds.kt rename to legacy/core/src/main/java/com/fsck/k9/notification/NotificationIds.kt diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationLightDecoder.kt b/legacy/core/src/main/java/com/fsck/k9/notification/NotificationLightDecoder.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/notification/NotificationLightDecoder.kt rename to legacy/core/src/main/java/com/fsck/k9/notification/NotificationLightDecoder.kt diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationRepository.kt b/legacy/core/src/main/java/com/fsck/k9/notification/NotificationRepository.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/notification/NotificationRepository.kt rename to legacy/core/src/main/java/com/fsck/k9/notification/NotificationRepository.kt diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationResourceProvider.kt b/legacy/core/src/main/java/com/fsck/k9/notification/NotificationResourceProvider.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/notification/NotificationResourceProvider.kt rename to legacy/core/src/main/java/com/fsck/k9/notification/NotificationResourceProvider.kt diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationSettingsUpdater.kt b/legacy/core/src/main/java/com/fsck/k9/notification/NotificationSettingsUpdater.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/notification/NotificationSettingsUpdater.kt rename to legacy/core/src/main/java/com/fsck/k9/notification/NotificationSettingsUpdater.kt diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationStore.kt b/legacy/core/src/main/java/com/fsck/k9/notification/NotificationStore.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/notification/NotificationStore.kt rename to legacy/core/src/main/java/com/fsck/k9/notification/NotificationStore.kt diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationStoreOperation.kt b/legacy/core/src/main/java/com/fsck/k9/notification/NotificationStoreOperation.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/notification/NotificationStoreOperation.kt rename to legacy/core/src/main/java/com/fsck/k9/notification/NotificationStoreOperation.kt diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationStoreProvider.kt b/legacy/core/src/main/java/com/fsck/k9/notification/NotificationStoreProvider.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/notification/NotificationStoreProvider.kt rename to legacy/core/src/main/java/com/fsck/k9/notification/NotificationStoreProvider.kt diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationStrategy.kt b/legacy/core/src/main/java/com/fsck/k9/notification/NotificationStrategy.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/notification/NotificationStrategy.kt rename to legacy/core/src/main/java/com/fsck/k9/notification/NotificationStrategy.kt diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationVibrationDecoder.kt b/legacy/core/src/main/java/com/fsck/k9/notification/NotificationVibrationDecoder.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/notification/NotificationVibrationDecoder.kt rename to legacy/core/src/main/java/com/fsck/k9/notification/NotificationVibrationDecoder.kt diff --git a/app/core/src/main/java/com/fsck/k9/notification/PushNotificationManager.kt b/legacy/core/src/main/java/com/fsck/k9/notification/PushNotificationManager.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/notification/PushNotificationManager.kt rename to legacy/core/src/main/java/com/fsck/k9/notification/PushNotificationManager.kt diff --git a/app/core/src/main/java/com/fsck/k9/notification/RealBackgroundWorkNotificationController.kt b/legacy/core/src/main/java/com/fsck/k9/notification/RealBackgroundWorkNotificationController.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/notification/RealBackgroundWorkNotificationController.kt rename to legacy/core/src/main/java/com/fsck/k9/notification/RealBackgroundWorkNotificationController.kt diff --git a/app/core/src/main/java/com/fsck/k9/notification/RemoveNotificationsResult.kt b/legacy/core/src/main/java/com/fsck/k9/notification/RemoveNotificationsResult.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/notification/RemoveNotificationsResult.kt rename to legacy/core/src/main/java/com/fsck/k9/notification/RemoveNotificationsResult.kt diff --git a/app/core/src/main/java/com/fsck/k9/notification/SendFailedNotificationController.kt b/legacy/core/src/main/java/com/fsck/k9/notification/SendFailedNotificationController.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/notification/SendFailedNotificationController.kt rename to legacy/core/src/main/java/com/fsck/k9/notification/SendFailedNotificationController.kt diff --git a/app/core/src/main/java/com/fsck/k9/notification/SingleMessageNotificationCreator.kt b/legacy/core/src/main/java/com/fsck/k9/notification/SingleMessageNotificationCreator.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/notification/SingleMessageNotificationCreator.kt rename to legacy/core/src/main/java/com/fsck/k9/notification/SingleMessageNotificationCreator.kt diff --git a/app/core/src/main/java/com/fsck/k9/notification/SingleMessageNotificationDataCreator.kt b/legacy/core/src/main/java/com/fsck/k9/notification/SingleMessageNotificationDataCreator.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/notification/SingleMessageNotificationDataCreator.kt rename to legacy/core/src/main/java/com/fsck/k9/notification/SingleMessageNotificationDataCreator.kt diff --git a/app/core/src/main/java/com/fsck/k9/notification/SummaryNotificationCreator.kt b/legacy/core/src/main/java/com/fsck/k9/notification/SummaryNotificationCreator.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/notification/SummaryNotificationCreator.kt rename to legacy/core/src/main/java/com/fsck/k9/notification/SummaryNotificationCreator.kt diff --git a/app/core/src/main/java/com/fsck/k9/notification/SummaryNotificationDataCreator.kt b/legacy/core/src/main/java/com/fsck/k9/notification/SummaryNotificationDataCreator.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/notification/SummaryNotificationDataCreator.kt rename to legacy/core/src/main/java/com/fsck/k9/notification/SummaryNotificationDataCreator.kt diff --git a/app/core/src/main/java/com/fsck/k9/notification/SyncNotificationController.kt b/legacy/core/src/main/java/com/fsck/k9/notification/SyncNotificationController.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/notification/SyncNotificationController.kt rename to legacy/core/src/main/java/com/fsck/k9/notification/SyncNotificationController.kt diff --git a/app/core/src/main/java/com/fsck/k9/power/AndroidPowerManager.kt b/legacy/core/src/main/java/com/fsck/k9/power/AndroidPowerManager.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/power/AndroidPowerManager.kt rename to legacy/core/src/main/java/com/fsck/k9/power/AndroidPowerManager.kt diff --git a/app/core/src/main/java/com/fsck/k9/power/KoinModule.kt b/legacy/core/src/main/java/com/fsck/k9/power/KoinModule.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/power/KoinModule.kt rename to legacy/core/src/main/java/com/fsck/k9/power/KoinModule.kt diff --git a/app/core/src/main/java/com/fsck/k9/preferences/AccountManager.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/AccountManager.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/AccountManager.kt rename to legacy/core/src/main/java/com/fsck/k9/preferences/AccountManager.kt diff --git a/app/core/src/main/java/com/fsck/k9/preferences/AccountSettingsDescriptions.java b/legacy/core/src/main/java/com/fsck/k9/preferences/AccountSettingsDescriptions.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/AccountSettingsDescriptions.java rename to legacy/core/src/main/java/com/fsck/k9/preferences/AccountSettingsDescriptions.java diff --git a/app/core/src/main/java/com/fsck/k9/preferences/AccountSettingsUpgrader.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/AccountSettingsUpgrader.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/AccountSettingsUpgrader.kt rename to legacy/core/src/main/java/com/fsck/k9/preferences/AccountSettingsUpgrader.kt diff --git a/app/core/src/main/java/com/fsck/k9/preferences/AccountSettingsValidator.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/AccountSettingsValidator.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/AccountSettingsValidator.kt rename to legacy/core/src/main/java/com/fsck/k9/preferences/AccountSettingsValidator.kt diff --git a/app/core/src/main/java/com/fsck/k9/preferences/AccountSettingsWriter.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/AccountSettingsWriter.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/AccountSettingsWriter.kt rename to legacy/core/src/main/java/com/fsck/k9/preferences/AccountSettingsWriter.kt diff --git a/app/core/src/main/java/com/fsck/k9/preferences/FolderSettingsDescriptions.java b/legacy/core/src/main/java/com/fsck/k9/preferences/FolderSettingsDescriptions.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/FolderSettingsDescriptions.java rename to legacy/core/src/main/java/com/fsck/k9/preferences/FolderSettingsDescriptions.java diff --git a/app/core/src/main/java/com/fsck/k9/preferences/FolderSettingsProvider.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/FolderSettingsProvider.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/FolderSettingsProvider.kt rename to legacy/core/src/main/java/com/fsck/k9/preferences/FolderSettingsProvider.kt diff --git a/app/core/src/main/java/com/fsck/k9/preferences/FolderSettingsUpgrader.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/FolderSettingsUpgrader.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/FolderSettingsUpgrader.kt rename to legacy/core/src/main/java/com/fsck/k9/preferences/FolderSettingsUpgrader.kt diff --git a/app/core/src/main/java/com/fsck/k9/preferences/FolderSettingsValidator.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/FolderSettingsValidator.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/FolderSettingsValidator.kt rename to legacy/core/src/main/java/com/fsck/k9/preferences/FolderSettingsValidator.kt diff --git a/app/core/src/main/java/com/fsck/k9/preferences/FolderSettingsWriter.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/FolderSettingsWriter.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/FolderSettingsWriter.kt rename to legacy/core/src/main/java/com/fsck/k9/preferences/FolderSettingsWriter.kt diff --git a/app/core/src/main/java/com/fsck/k9/preferences/GeneralSettings.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/GeneralSettings.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/GeneralSettings.kt rename to legacy/core/src/main/java/com/fsck/k9/preferences/GeneralSettings.kt diff --git a/app/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsDescriptions.java b/legacy/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsDescriptions.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsDescriptions.java rename to legacy/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsDescriptions.java diff --git a/app/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsManager.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsManager.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsManager.kt rename to legacy/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsManager.kt diff --git a/app/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsUpgrader.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsUpgrader.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsUpgrader.kt rename to legacy/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsUpgrader.kt diff --git a/app/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsValidator.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsValidator.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsValidator.kt rename to legacy/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsValidator.kt diff --git a/app/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsWriter.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsWriter.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsWriter.kt rename to legacy/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsWriter.kt diff --git a/app/core/src/main/java/com/fsck/k9/preferences/IdentitySettingsDescriptions.java b/legacy/core/src/main/java/com/fsck/k9/preferences/IdentitySettingsDescriptions.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/IdentitySettingsDescriptions.java rename to legacy/core/src/main/java/com/fsck/k9/preferences/IdentitySettingsDescriptions.java diff --git a/app/core/src/main/java/com/fsck/k9/preferences/IdentitySettingsUpgrader.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/IdentitySettingsUpgrader.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/IdentitySettingsUpgrader.kt rename to legacy/core/src/main/java/com/fsck/k9/preferences/IdentitySettingsUpgrader.kt diff --git a/app/core/src/main/java/com/fsck/k9/preferences/IdentitySettingsValidator.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/IdentitySettingsValidator.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/IdentitySettingsValidator.kt rename to legacy/core/src/main/java/com/fsck/k9/preferences/IdentitySettingsValidator.kt diff --git a/app/core/src/main/java/com/fsck/k9/preferences/IdentitySettingsWriter.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/IdentitySettingsWriter.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/IdentitySettingsWriter.kt rename to legacy/core/src/main/java/com/fsck/k9/preferences/IdentitySettingsWriter.kt diff --git a/app/core/src/main/java/com/fsck/k9/preferences/ImportContents.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/ImportContents.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/ImportContents.kt rename to legacy/core/src/main/java/com/fsck/k9/preferences/ImportContents.kt diff --git a/app/core/src/main/java/com/fsck/k9/preferences/ImportResults.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/ImportResults.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/ImportResults.kt rename to legacy/core/src/main/java/com/fsck/k9/preferences/ImportResults.kt diff --git a/app/core/src/main/java/com/fsck/k9/preferences/KoinModule.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/KoinModule.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/KoinModule.kt rename to legacy/core/src/main/java/com/fsck/k9/preferences/KoinModule.kt diff --git a/app/core/src/main/java/com/fsck/k9/preferences/NoDefaultStringEnumSetting.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/NoDefaultStringEnumSetting.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/NoDefaultStringEnumSetting.kt rename to legacy/core/src/main/java/com/fsck/k9/preferences/NoDefaultStringEnumSetting.kt diff --git a/app/core/src/main/java/com/fsck/k9/preferences/RealGeneralSettingsManager.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/RealGeneralSettingsManager.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/RealGeneralSettingsManager.kt rename to legacy/core/src/main/java/com/fsck/k9/preferences/RealGeneralSettingsManager.kt diff --git a/app/core/src/main/java/com/fsck/k9/preferences/ServerSettingsDescriptions.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/ServerSettingsDescriptions.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/ServerSettingsDescriptions.kt rename to legacy/core/src/main/java/com/fsck/k9/preferences/ServerSettingsDescriptions.kt diff --git a/app/core/src/main/java/com/fsck/k9/preferences/ServerSettingsUpgrader.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/ServerSettingsUpgrader.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/ServerSettingsUpgrader.kt rename to legacy/core/src/main/java/com/fsck/k9/preferences/ServerSettingsUpgrader.kt diff --git a/app/core/src/main/java/com/fsck/k9/preferences/ServerSettingsValidator.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/ServerSettingsValidator.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/ServerSettingsValidator.kt rename to legacy/core/src/main/java/com/fsck/k9/preferences/ServerSettingsValidator.kt diff --git a/app/core/src/main/java/com/fsck/k9/preferences/ServerSettingsWriter.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/ServerSettingsWriter.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/ServerSettingsWriter.kt rename to legacy/core/src/main/java/com/fsck/k9/preferences/ServerSettingsWriter.kt diff --git a/app/core/src/main/java/com/fsck/k9/preferences/ServerTypeConverter.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/ServerTypeConverter.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/ServerTypeConverter.kt rename to legacy/core/src/main/java/com/fsck/k9/preferences/ServerTypeConverter.kt diff --git a/app/core/src/main/java/com/fsck/k9/preferences/Settings.java b/legacy/core/src/main/java/com/fsck/k9/preferences/Settings.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/Settings.java rename to legacy/core/src/main/java/com/fsck/k9/preferences/Settings.java diff --git a/app/core/src/main/java/com/fsck/k9/preferences/SettingsExporter.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/SettingsExporter.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/SettingsExporter.kt rename to legacy/core/src/main/java/com/fsck/k9/preferences/SettingsExporter.kt diff --git a/app/core/src/main/java/com/fsck/k9/preferences/SettingsFile.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/SettingsFile.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/SettingsFile.kt rename to legacy/core/src/main/java/com/fsck/k9/preferences/SettingsFile.kt diff --git a/app/core/src/main/java/com/fsck/k9/preferences/SettingsFileParser.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/SettingsFileParser.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/SettingsFileParser.kt rename to legacy/core/src/main/java/com/fsck/k9/preferences/SettingsFileParser.kt diff --git a/app/core/src/main/java/com/fsck/k9/preferences/SettingsImportExportException.java b/legacy/core/src/main/java/com/fsck/k9/preferences/SettingsImportExportException.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/SettingsImportExportException.java rename to legacy/core/src/main/java/com/fsck/k9/preferences/SettingsImportExportException.java diff --git a/app/core/src/main/java/com/fsck/k9/preferences/SettingsImporter.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/SettingsImporter.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/SettingsImporter.kt rename to legacy/core/src/main/java/com/fsck/k9/preferences/SettingsImporter.kt diff --git a/app/core/src/main/java/com/fsck/k9/preferences/SettingsParserException.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/SettingsParserException.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/SettingsParserException.kt rename to legacy/core/src/main/java/com/fsck/k9/preferences/SettingsParserException.kt diff --git a/app/core/src/main/java/com/fsck/k9/preferences/Storage.java b/legacy/core/src/main/java/com/fsck/k9/preferences/Storage.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/Storage.java rename to legacy/core/src/main/java/com/fsck/k9/preferences/Storage.java diff --git a/app/core/src/main/java/com/fsck/k9/preferences/StorageEditor.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/StorageEditor.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/StorageEditor.kt rename to legacy/core/src/main/java/com/fsck/k9/preferences/StorageEditor.kt diff --git a/app/core/src/main/java/com/fsck/k9/preferences/StoragePersister.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/StoragePersister.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/StoragePersister.kt rename to legacy/core/src/main/java/com/fsck/k9/preferences/StoragePersister.kt diff --git a/app/core/src/main/java/com/fsck/k9/preferences/StringEnumSetting.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/StringEnumSetting.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/StringEnumSetting.kt rename to legacy/core/src/main/java/com/fsck/k9/preferences/StringEnumSetting.kt diff --git a/app/core/src/main/java/com/fsck/k9/preferences/ValidatedSettings.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/ValidatedSettings.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/ValidatedSettings.kt rename to legacy/core/src/main/java/com/fsck/k9/preferences/ValidatedSettings.kt diff --git a/app/core/src/main/java/com/fsck/k9/preferences/upgrader/AccountSettingsUpgraderTo53.java b/legacy/core/src/main/java/com/fsck/k9/preferences/upgrader/AccountSettingsUpgraderTo53.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/upgrader/AccountSettingsUpgraderTo53.java rename to legacy/core/src/main/java/com/fsck/k9/preferences/upgrader/AccountSettingsUpgraderTo53.java diff --git a/app/core/src/main/java/com/fsck/k9/preferences/upgrader/AccountSettingsUpgraderTo54.java b/legacy/core/src/main/java/com/fsck/k9/preferences/upgrader/AccountSettingsUpgraderTo54.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/upgrader/AccountSettingsUpgraderTo54.java rename to legacy/core/src/main/java/com/fsck/k9/preferences/upgrader/AccountSettingsUpgraderTo54.java diff --git a/app/core/src/main/java/com/fsck/k9/preferences/upgrader/AccountSettingsUpgraderTo74.java b/legacy/core/src/main/java/com/fsck/k9/preferences/upgrader/AccountSettingsUpgraderTo74.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/upgrader/AccountSettingsUpgraderTo74.java rename to legacy/core/src/main/java/com/fsck/k9/preferences/upgrader/AccountSettingsUpgraderTo74.java diff --git a/app/core/src/main/java/com/fsck/k9/preferences/upgrader/AccountSettingsUpgraderTo80.java b/legacy/core/src/main/java/com/fsck/k9/preferences/upgrader/AccountSettingsUpgraderTo80.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/upgrader/AccountSettingsUpgraderTo80.java rename to legacy/core/src/main/java/com/fsck/k9/preferences/upgrader/AccountSettingsUpgraderTo80.java diff --git a/app/core/src/main/java/com/fsck/k9/preferences/upgrader/AccountSettingsUpgraderTo81.java b/legacy/core/src/main/java/com/fsck/k9/preferences/upgrader/AccountSettingsUpgraderTo81.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/upgrader/AccountSettingsUpgraderTo81.java rename to legacy/core/src/main/java/com/fsck/k9/preferences/upgrader/AccountSettingsUpgraderTo81.java diff --git a/app/core/src/main/java/com/fsck/k9/preferences/upgrader/AccountSettingsUpgraderTo91.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/upgrader/AccountSettingsUpgraderTo91.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/upgrader/AccountSettingsUpgraderTo91.kt rename to legacy/core/src/main/java/com/fsck/k9/preferences/upgrader/AccountSettingsUpgraderTo91.kt diff --git a/app/core/src/main/java/com/fsck/k9/preferences/upgrader/GeneralSettingsUpgraderTo24.java b/legacy/core/src/main/java/com/fsck/k9/preferences/upgrader/GeneralSettingsUpgraderTo24.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/upgrader/GeneralSettingsUpgraderTo24.java rename to legacy/core/src/main/java/com/fsck/k9/preferences/upgrader/GeneralSettingsUpgraderTo24.java diff --git a/app/core/src/main/java/com/fsck/k9/preferences/upgrader/GeneralSettingsUpgraderTo31.java b/legacy/core/src/main/java/com/fsck/k9/preferences/upgrader/GeneralSettingsUpgraderTo31.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/upgrader/GeneralSettingsUpgraderTo31.java rename to legacy/core/src/main/java/com/fsck/k9/preferences/upgrader/GeneralSettingsUpgraderTo31.java diff --git a/app/core/src/main/java/com/fsck/k9/preferences/upgrader/GeneralSettingsUpgraderTo58.java b/legacy/core/src/main/java/com/fsck/k9/preferences/upgrader/GeneralSettingsUpgraderTo58.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/upgrader/GeneralSettingsUpgraderTo58.java rename to legacy/core/src/main/java/com/fsck/k9/preferences/upgrader/GeneralSettingsUpgraderTo58.java diff --git a/app/core/src/main/java/com/fsck/k9/preferences/upgrader/GeneralSettingsUpgraderTo69.java b/legacy/core/src/main/java/com/fsck/k9/preferences/upgrader/GeneralSettingsUpgraderTo69.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/upgrader/GeneralSettingsUpgraderTo69.java rename to legacy/core/src/main/java/com/fsck/k9/preferences/upgrader/GeneralSettingsUpgraderTo69.java diff --git a/app/core/src/main/java/com/fsck/k9/preferences/upgrader/GeneralSettingsUpgraderTo79.java b/legacy/core/src/main/java/com/fsck/k9/preferences/upgrader/GeneralSettingsUpgraderTo79.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/upgrader/GeneralSettingsUpgraderTo79.java rename to legacy/core/src/main/java/com/fsck/k9/preferences/upgrader/GeneralSettingsUpgraderTo79.java diff --git a/app/core/src/main/java/com/fsck/k9/preferences/upgrader/GeneralSettingsUpgraderTo89.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/upgrader/GeneralSettingsUpgraderTo89.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/upgrader/GeneralSettingsUpgraderTo89.kt rename to legacy/core/src/main/java/com/fsck/k9/preferences/upgrader/GeneralSettingsUpgraderTo89.kt diff --git a/app/core/src/main/java/com/fsck/k9/preferences/upgrader/ServerSettingsUpgraderTo92.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/upgrader/ServerSettingsUpgraderTo92.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/upgrader/ServerSettingsUpgraderTo92.kt rename to legacy/core/src/main/java/com/fsck/k9/preferences/upgrader/ServerSettingsUpgraderTo92.kt diff --git a/app/core/src/main/java/com/fsck/k9/preferences/upgrader/ServerSettingsUpgraderTo94.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/upgrader/ServerSettingsUpgraderTo94.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/upgrader/ServerSettingsUpgraderTo94.kt rename to legacy/core/src/main/java/com/fsck/k9/preferences/upgrader/ServerSettingsUpgraderTo94.kt diff --git a/app/core/src/main/java/com/fsck/k9/preferences/upgrader/ServerSettingsUpgraderTo95.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/upgrader/ServerSettingsUpgraderTo95.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/preferences/upgrader/ServerSettingsUpgraderTo95.kt rename to legacy/core/src/main/java/com/fsck/k9/preferences/upgrader/ServerSettingsUpgraderTo95.kt diff --git a/app/core/src/main/java/com/fsck/k9/provider/AttachmentProvider.java b/legacy/core/src/main/java/com/fsck/k9/provider/AttachmentProvider.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/provider/AttachmentProvider.java rename to legacy/core/src/main/java/com/fsck/k9/provider/AttachmentProvider.java diff --git a/app/core/src/main/java/com/fsck/k9/provider/AttachmentTempFileProvider.java b/legacy/core/src/main/java/com/fsck/k9/provider/AttachmentTempFileProvider.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/provider/AttachmentTempFileProvider.java rename to legacy/core/src/main/java/com/fsck/k9/provider/AttachmentTempFileProvider.java diff --git a/app/core/src/main/java/com/fsck/k9/provider/DecryptedFileProvider.java b/legacy/core/src/main/java/com/fsck/k9/provider/DecryptedFileProvider.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/provider/DecryptedFileProvider.java rename to legacy/core/src/main/java/com/fsck/k9/provider/DecryptedFileProvider.java diff --git a/app/core/src/main/java/com/fsck/k9/provider/RawMessageProvider.java b/legacy/core/src/main/java/com/fsck/k9/provider/RawMessageProvider.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/provider/RawMessageProvider.java rename to legacy/core/src/main/java/com/fsck/k9/provider/RawMessageProvider.java diff --git a/app/core/src/main/java/com/fsck/k9/search/AccountSearchConditions.kt b/legacy/core/src/main/java/com/fsck/k9/search/AccountSearchConditions.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/search/AccountSearchConditions.kt rename to legacy/core/src/main/java/com/fsck/k9/search/AccountSearchConditions.kt diff --git a/app/core/src/main/java/com/fsck/k9/search/ConditionsTreeNode.java b/legacy/core/src/main/java/com/fsck/k9/search/ConditionsTreeNode.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/search/ConditionsTreeNode.java rename to legacy/core/src/main/java/com/fsck/k9/search/ConditionsTreeNode.java diff --git a/app/core/src/main/java/com/fsck/k9/search/LocalSearch.java b/legacy/core/src/main/java/com/fsck/k9/search/LocalSearch.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/search/LocalSearch.java rename to legacy/core/src/main/java/com/fsck/k9/search/LocalSearch.java diff --git a/app/core/src/main/java/com/fsck/k9/search/LocalSearchExtensions.kt b/legacy/core/src/main/java/com/fsck/k9/search/LocalSearchExtensions.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/search/LocalSearchExtensions.kt rename to legacy/core/src/main/java/com/fsck/k9/search/LocalSearchExtensions.kt diff --git a/app/core/src/main/java/com/fsck/k9/search/SearchAccount.kt b/legacy/core/src/main/java/com/fsck/k9/search/SearchAccount.kt similarity index 100% rename from app/core/src/main/java/com/fsck/k9/search/SearchAccount.kt rename to legacy/core/src/main/java/com/fsck/k9/search/SearchAccount.kt diff --git a/app/core/src/main/java/com/fsck/k9/search/SearchSpecification.java b/legacy/core/src/main/java/com/fsck/k9/search/SearchSpecification.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/search/SearchSpecification.java rename to legacy/core/src/main/java/com/fsck/k9/search/SearchSpecification.java diff --git a/app/core/src/main/java/com/fsck/k9/search/SqlQueryBuilder.java b/legacy/core/src/main/java/com/fsck/k9/search/SqlQueryBuilder.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/search/SqlQueryBuilder.java rename to legacy/core/src/main/java/com/fsck/k9/search/SqlQueryBuilder.java diff --git a/app/core/src/main/java/com/fsck/k9/service/DatabaseUpgradeService.java b/legacy/core/src/main/java/com/fsck/k9/service/DatabaseUpgradeService.java similarity index 100% rename from app/core/src/main/java/com/fsck/k9/service/DatabaseUpgradeService.java rename to legacy/core/src/main/java/com/fsck/k9/service/DatabaseUpgradeService.java diff --git a/app/core/src/main/res/values/arrays_account_settings_values.xml b/legacy/core/src/main/res/values/arrays_account_settings_values.xml similarity index 100% rename from app/core/src/main/res/values/arrays_account_settings_values.xml rename to legacy/core/src/main/res/values/arrays_account_settings_values.xml diff --git a/app/core/src/main/res/values/arrays_drawer.xml b/legacy/core/src/main/res/values/arrays_drawer.xml similarity index 100% rename from app/core/src/main/res/values/arrays_drawer.xml rename to legacy/core/src/main/res/values/arrays_drawer.xml diff --git a/app/core/src/main/res/values/arrays_general_settings_values.xml b/legacy/core/src/main/res/values/arrays_general_settings_values.xml similarity index 100% rename from app/core/src/main/res/values/arrays_general_settings_values.xml rename to legacy/core/src/main/res/values/arrays_general_settings_values.xml diff --git a/app/core/src/main/res/values/k9_tonal_palette.xml b/legacy/core/src/main/res/values/k9_tonal_palette.xml similarity index 100% rename from app/core/src/main/res/values/k9_tonal_palette.xml rename to legacy/core/src/main/res/values/k9_tonal_palette.xml diff --git a/app/core/src/main/res/values/material_colors.xml b/legacy/core/src/main/res/values/material_colors.xml similarity index 100% rename from app/core/src/main/res/values/material_colors.xml rename to legacy/core/src/main/res/values/material_colors.xml diff --git a/app/core/src/main/res/xml/decrypted_file_provider_paths.xml b/legacy/core/src/main/res/xml/decrypted_file_provider_paths.xml similarity index 100% rename from app/core/src/main/res/xml/decrypted_file_provider_paths.xml rename to legacy/core/src/main/res/xml/decrypted_file_provider_paths.xml diff --git a/app/core/src/main/res/xml/temp_file_provider_paths.xml b/legacy/core/src/main/res/xml/temp_file_provider_paths.xml similarity index 100% rename from app/core/src/main/res/xml/temp_file_provider_paths.xml rename to legacy/core/src/main/res/xml/temp_file_provider_paths.xml diff --git a/app/core/src/test/java/com/fsck/k9/EmailAddressValidatorTest.kt b/legacy/core/src/test/java/com/fsck/k9/EmailAddressValidatorTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/EmailAddressValidatorTest.kt rename to legacy/core/src/test/java/com/fsck/k9/EmailAddressValidatorTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/K9RobolectricTest.kt b/legacy/core/src/test/java/com/fsck/k9/K9RobolectricTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/K9RobolectricTest.kt rename to legacy/core/src/test/java/com/fsck/k9/K9RobolectricTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/QuietTimeCheckerTest.kt b/legacy/core/src/test/java/com/fsck/k9/QuietTimeCheckerTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/QuietTimeCheckerTest.kt rename to legacy/core/src/test/java/com/fsck/k9/QuietTimeCheckerTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/ServerSettingsSerializerTest.kt b/legacy/core/src/test/java/com/fsck/k9/ServerSettingsSerializerTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/ServerSettingsSerializerTest.kt rename to legacy/core/src/test/java/com/fsck/k9/ServerSettingsSerializerTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/TestApp.kt b/legacy/core/src/test/java/com/fsck/k9/TestApp.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/TestApp.kt rename to legacy/core/src/test/java/com/fsck/k9/TestApp.kt diff --git a/app/core/src/test/java/com/fsck/k9/TestCoreResourceProvider.kt b/legacy/core/src/test/java/com/fsck/k9/TestCoreResourceProvider.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/TestCoreResourceProvider.kt rename to legacy/core/src/test/java/com/fsck/k9/TestCoreResourceProvider.kt diff --git a/app/core/src/test/java/com/fsck/k9/autocrypt/AutocryptDraftStateHeaderParserTest.kt b/legacy/core/src/test/java/com/fsck/k9/autocrypt/AutocryptDraftStateHeaderParserTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/autocrypt/AutocryptDraftStateHeaderParserTest.kt rename to legacy/core/src/test/java/com/fsck/k9/autocrypt/AutocryptDraftStateHeaderParserTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/autocrypt/AutocryptGossipHeaderParserTest.kt b/legacy/core/src/test/java/com/fsck/k9/autocrypt/AutocryptGossipHeaderParserTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/autocrypt/AutocryptGossipHeaderParserTest.kt rename to legacy/core/src/test/java/com/fsck/k9/autocrypt/AutocryptGossipHeaderParserTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/autocrypt/AutocryptHeaderParserTest.java b/legacy/core/src/test/java/com/fsck/k9/autocrypt/AutocryptHeaderParserTest.java similarity index 100% rename from app/core/src/test/java/com/fsck/k9/autocrypt/AutocryptHeaderParserTest.java rename to legacy/core/src/test/java/com/fsck/k9/autocrypt/AutocryptHeaderParserTest.java diff --git a/app/core/src/test/java/com/fsck/k9/autocrypt/AutocryptHeaderTest.java b/legacy/core/src/test/java/com/fsck/k9/autocrypt/AutocryptHeaderTest.java similarity index 100% rename from app/core/src/test/java/com/fsck/k9/autocrypt/AutocryptHeaderTest.java rename to legacy/core/src/test/java/com/fsck/k9/autocrypt/AutocryptHeaderTest.java diff --git a/app/core/src/test/java/com/fsck/k9/controller/DefaultMessageCountsProviderTest.kt b/legacy/core/src/test/java/com/fsck/k9/controller/DefaultMessageCountsProviderTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/controller/DefaultMessageCountsProviderTest.kt rename to legacy/core/src/test/java/com/fsck/k9/controller/DefaultMessageCountsProviderTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/controller/LocalDeleteOperationDeciderTest.kt b/legacy/core/src/test/java/com/fsck/k9/controller/LocalDeleteOperationDeciderTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/controller/LocalDeleteOperationDeciderTest.kt rename to legacy/core/src/test/java/com/fsck/k9/controller/LocalDeleteOperationDeciderTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/controller/MessageReferenceTest.kt b/legacy/core/src/test/java/com/fsck/k9/controller/MessageReferenceTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/controller/MessageReferenceTest.kt rename to legacy/core/src/test/java/com/fsck/k9/controller/MessageReferenceTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/controller/MessagingControllerTest.java b/legacy/core/src/test/java/com/fsck/k9/controller/MessagingControllerTest.java similarity index 100% rename from app/core/src/test/java/com/fsck/k9/controller/MessagingControllerTest.java rename to legacy/core/src/test/java/com/fsck/k9/controller/MessagingControllerTest.java diff --git a/app/core/src/test/java/com/fsck/k9/controller/PendingCommandSerializerTest.java b/legacy/core/src/test/java/com/fsck/k9/controller/PendingCommandSerializerTest.java similarity index 100% rename from app/core/src/test/java/com/fsck/k9/controller/PendingCommandSerializerTest.java rename to legacy/core/src/test/java/com/fsck/k9/controller/PendingCommandSerializerTest.java diff --git a/app/core/src/test/java/com/fsck/k9/controller/UidReverseComparatorTest.java b/legacy/core/src/test/java/com/fsck/k9/controller/UidReverseComparatorTest.java similarity index 100% rename from app/core/src/test/java/com/fsck/k9/controller/UidReverseComparatorTest.java rename to legacy/core/src/test/java/com/fsck/k9/controller/UidReverseComparatorTest.java diff --git a/app/core/src/test/java/com/fsck/k9/crypto/MessageCryptoStructureDetectorTest.java b/legacy/core/src/test/java/com/fsck/k9/crypto/MessageCryptoStructureDetectorTest.java similarity index 100% rename from app/core/src/test/java/com/fsck/k9/crypto/MessageCryptoStructureDetectorTest.java rename to legacy/core/src/test/java/com/fsck/k9/crypto/MessageCryptoStructureDetectorTest.java diff --git a/app/core/src/test/java/com/fsck/k9/crypto/OpenPgpApiHelperTest.kt b/legacy/core/src/test/java/com/fsck/k9/crypto/OpenPgpApiHelperTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/crypto/OpenPgpApiHelperTest.kt rename to legacy/core/src/test/java/com/fsck/k9/crypto/OpenPgpApiHelperTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/helper/EmailHelperTest.java b/legacy/core/src/test/java/com/fsck/k9/helper/EmailHelperTest.java similarity index 100% rename from app/core/src/test/java/com/fsck/k9/helper/EmailHelperTest.java rename to legacy/core/src/test/java/com/fsck/k9/helper/EmailHelperTest.java diff --git a/app/core/src/test/java/com/fsck/k9/helper/IdentityHelperTest.kt b/legacy/core/src/test/java/com/fsck/k9/helper/IdentityHelperTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/helper/IdentityHelperTest.kt rename to legacy/core/src/test/java/com/fsck/k9/helper/IdentityHelperTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/helper/ListHeadersTest.java b/legacy/core/src/test/java/com/fsck/k9/helper/ListHeadersTest.java similarity index 100% rename from app/core/src/test/java/com/fsck/k9/helper/ListHeadersTest.java rename to legacy/core/src/test/java/com/fsck/k9/helper/ListHeadersTest.java diff --git a/app/core/src/test/java/com/fsck/k9/helper/ListUnsubscribeHelperTest.kt b/legacy/core/src/test/java/com/fsck/k9/helper/ListUnsubscribeHelperTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/helper/ListUnsubscribeHelperTest.kt rename to legacy/core/src/test/java/com/fsck/k9/helper/ListUnsubscribeHelperTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/helper/MailToTest.kt b/legacy/core/src/test/java/com/fsck/k9/helper/MailToTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/helper/MailToTest.kt rename to legacy/core/src/test/java/com/fsck/k9/helper/MailToTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/helper/MessageHelperTest.kt b/legacy/core/src/test/java/com/fsck/k9/helper/MessageHelperTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/helper/MessageHelperTest.kt rename to legacy/core/src/test/java/com/fsck/k9/helper/MessageHelperTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/helper/ReplyToParserTest.java b/legacy/core/src/test/java/com/fsck/k9/helper/ReplyToParserTest.java similarity index 100% rename from app/core/src/test/java/com/fsck/k9/helper/ReplyToParserTest.java rename to legacy/core/src/test/java/com/fsck/k9/helper/ReplyToParserTest.java diff --git a/app/core/src/test/java/com/fsck/k9/helper/UtilityTest.java b/legacy/core/src/test/java/com/fsck/k9/helper/UtilityTest.java similarity index 100% rename from app/core/src/test/java/com/fsck/k9/helper/UtilityTest.java rename to legacy/core/src/test/java/com/fsck/k9/helper/UtilityTest.java diff --git a/app/core/src/test/java/com/fsck/k9/logging/LogcatLogFileWriterTest.kt b/legacy/core/src/test/java/com/fsck/k9/logging/LogcatLogFileWriterTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/logging/LogcatLogFileWriterTest.kt rename to legacy/core/src/test/java/com/fsck/k9/logging/LogcatLogFileWriterTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/mailstore/AttachmentResolverTest.java b/legacy/core/src/test/java/com/fsck/k9/mailstore/AttachmentResolverTest.java similarity index 100% rename from app/core/src/test/java/com/fsck/k9/mailstore/AttachmentResolverTest.java rename to legacy/core/src/test/java/com/fsck/k9/mailstore/AttachmentResolverTest.java diff --git a/app/core/src/test/java/com/fsck/k9/mailstore/DeferredFileBodyTest.java b/legacy/core/src/test/java/com/fsck/k9/mailstore/DeferredFileBodyTest.java similarity index 100% rename from app/core/src/test/java/com/fsck/k9/mailstore/DeferredFileBodyTest.java rename to legacy/core/src/test/java/com/fsck/k9/mailstore/DeferredFileBodyTest.java diff --git a/app/core/src/test/java/com/fsck/k9/mailstore/K9BackendFolderTest.kt b/legacy/core/src/test/java/com/fsck/k9/mailstore/K9BackendFolderTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/mailstore/K9BackendFolderTest.kt rename to legacy/core/src/test/java/com/fsck/k9/mailstore/K9BackendFolderTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/mailstore/K9BackendStorageTest.kt b/legacy/core/src/test/java/com/fsck/k9/mailstore/K9BackendStorageTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/mailstore/K9BackendStorageTest.kt rename to legacy/core/src/test/java/com/fsck/k9/mailstore/K9BackendStorageTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/mailstore/LocalStoreTest.java b/legacy/core/src/test/java/com/fsck/k9/mailstore/LocalStoreTest.java similarity index 100% rename from app/core/src/test/java/com/fsck/k9/mailstore/LocalStoreTest.java rename to legacy/core/src/test/java/com/fsck/k9/mailstore/LocalStoreTest.java diff --git a/app/core/src/test/java/com/fsck/k9/mailstore/MessageListCacheTest.kt b/legacy/core/src/test/java/com/fsck/k9/mailstore/MessageListCacheTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/mailstore/MessageListCacheTest.kt rename to legacy/core/src/test/java/com/fsck/k9/mailstore/MessageListCacheTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/mailstore/MessageListRepositoryTest.kt b/legacy/core/src/test/java/com/fsck/k9/mailstore/MessageListRepositoryTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/mailstore/MessageListRepositoryTest.kt rename to legacy/core/src/test/java/com/fsck/k9/mailstore/MessageListRepositoryTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/mailstore/MessageStoreManagerTest.kt b/legacy/core/src/test/java/com/fsck/k9/mailstore/MessageStoreManagerTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/mailstore/MessageStoreManagerTest.kt rename to legacy/core/src/test/java/com/fsck/k9/mailstore/MessageStoreManagerTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/mailstore/MessageViewInfoExtractorTest.java b/legacy/core/src/test/java/com/fsck/k9/mailstore/MessageViewInfoExtractorTest.java similarity index 100% rename from app/core/src/test/java/com/fsck/k9/mailstore/MessageViewInfoExtractorTest.java rename to legacy/core/src/test/java/com/fsck/k9/mailstore/MessageViewInfoExtractorTest.java diff --git a/app/core/src/test/java/com/fsck/k9/mailstore/MimePartStreamParserTest.kt b/legacy/core/src/test/java/com/fsck/k9/mailstore/MimePartStreamParserTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/mailstore/MimePartStreamParserTest.kt rename to legacy/core/src/test/java/com/fsck/k9/mailstore/MimePartStreamParserTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/mailstore/MoreMessagesTest.java b/legacy/core/src/test/java/com/fsck/k9/mailstore/MoreMessagesTest.java similarity index 100% rename from app/core/src/test/java/com/fsck/k9/mailstore/MoreMessagesTest.java rename to legacy/core/src/test/java/com/fsck/k9/mailstore/MoreMessagesTest.java diff --git a/app/core/src/test/java/com/fsck/k9/message/IdentityHeaderBuilderTest.kt b/legacy/core/src/test/java/com/fsck/k9/message/IdentityHeaderBuilderTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/message/IdentityHeaderBuilderTest.kt rename to legacy/core/src/test/java/com/fsck/k9/message/IdentityHeaderBuilderTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/message/IdentityHeaderParserTest.kt b/legacy/core/src/test/java/com/fsck/k9/message/IdentityHeaderParserTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/message/IdentityHeaderParserTest.kt rename to legacy/core/src/test/java/com/fsck/k9/message/IdentityHeaderParserTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/message/MessageBuilderTest.java b/legacy/core/src/test/java/com/fsck/k9/message/MessageBuilderTest.java similarity index 100% rename from app/core/src/test/java/com/fsck/k9/message/MessageBuilderTest.java rename to legacy/core/src/test/java/com/fsck/k9/message/MessageBuilderTest.java diff --git a/app/core/src/test/java/com/fsck/k9/message/MessageCreationHelper.java b/legacy/core/src/test/java/com/fsck/k9/message/MessageCreationHelper.java similarity index 100% rename from app/core/src/test/java/com/fsck/k9/message/MessageCreationHelper.java rename to legacy/core/src/test/java/com/fsck/k9/message/MessageCreationHelper.java diff --git a/app/core/src/test/java/com/fsck/k9/message/ReplyActionStrategyTest.kt b/legacy/core/src/test/java/com/fsck/k9/message/ReplyActionStrategyTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/message/ReplyActionStrategyTest.kt rename to legacy/core/src/test/java/com/fsck/k9/message/ReplyActionStrategyTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/message/TextBodyBuilderTest.kt b/legacy/core/src/test/java/com/fsck/k9/message/TextBodyBuilderTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/message/TextBodyBuilderTest.kt rename to legacy/core/src/test/java/com/fsck/k9/message/TextBodyBuilderTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/message/extractors/AttachmentInfoExtractorTest.java b/legacy/core/src/test/java/com/fsck/k9/message/extractors/AttachmentInfoExtractorTest.java similarity index 100% rename from app/core/src/test/java/com/fsck/k9/message/extractors/AttachmentInfoExtractorTest.java rename to legacy/core/src/test/java/com/fsck/k9/message/extractors/AttachmentInfoExtractorTest.java diff --git a/app/core/src/test/java/com/fsck/k9/message/extractors/BasicPartInfoExtractorTest.kt b/legacy/core/src/test/java/com/fsck/k9/message/extractors/BasicPartInfoExtractorTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/message/extractors/BasicPartInfoExtractorTest.kt rename to legacy/core/src/test/java/com/fsck/k9/message/extractors/BasicPartInfoExtractorTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/message/extractors/MessagePreviewCreatorTest.java b/legacy/core/src/test/java/com/fsck/k9/message/extractors/MessagePreviewCreatorTest.java similarity index 100% rename from app/core/src/test/java/com/fsck/k9/message/extractors/MessagePreviewCreatorTest.java rename to legacy/core/src/test/java/com/fsck/k9/message/extractors/MessagePreviewCreatorTest.java diff --git a/app/core/src/test/java/com/fsck/k9/message/extractors/PreviewTextExtractorTest.kt b/legacy/core/src/test/java/com/fsck/k9/message/extractors/PreviewTextExtractorTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/message/extractors/PreviewTextExtractorTest.kt rename to legacy/core/src/test/java/com/fsck/k9/message/extractors/PreviewTextExtractorTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/message/extractors/TextPartFinderTest.kt b/legacy/core/src/test/java/com/fsck/k9/message/extractors/TextPartFinderTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/message/extractors/TextPartFinderTest.kt rename to legacy/core/src/test/java/com/fsck/k9/message/extractors/TextPartFinderTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/message/html/DisplayHtmlTest.kt b/legacy/core/src/test/java/com/fsck/k9/message/html/DisplayHtmlTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/message/html/DisplayHtmlTest.kt rename to legacy/core/src/test/java/com/fsck/k9/message/html/DisplayHtmlTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/message/html/EmailSectionExtractorTest.kt b/legacy/core/src/test/java/com/fsck/k9/message/html/EmailSectionExtractorTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/message/html/EmailSectionExtractorTest.kt rename to legacy/core/src/test/java/com/fsck/k9/message/html/EmailSectionExtractorTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/message/html/EmailSectionTest.kt b/legacy/core/src/test/java/com/fsck/k9/message/html/EmailSectionTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/message/html/EmailSectionTest.kt rename to legacy/core/src/test/java/com/fsck/k9/message/html/EmailSectionTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/message/html/GenericUriParserTest.kt b/legacy/core/src/test/java/com/fsck/k9/message/html/GenericUriParserTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/message/html/GenericUriParserTest.kt rename to legacy/core/src/test/java/com/fsck/k9/message/html/GenericUriParserTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/message/html/HtmlConverterTest.kt b/legacy/core/src/test/java/com/fsck/k9/message/html/HtmlConverterTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/message/html/HtmlConverterTest.kt rename to legacy/core/src/test/java/com/fsck/k9/message/html/HtmlConverterTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/message/html/HtmlHelper.kt b/legacy/core/src/test/java/com/fsck/k9/message/html/HtmlHelper.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/message/html/HtmlHelper.kt rename to legacy/core/src/test/java/com/fsck/k9/message/html/HtmlHelper.kt diff --git a/app/core/src/test/java/com/fsck/k9/message/html/HttpUriParserTest.kt b/legacy/core/src/test/java/com/fsck/k9/message/html/HttpUriParserTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/message/html/HttpUriParserTest.kt rename to legacy/core/src/test/java/com/fsck/k9/message/html/HttpUriParserTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/message/html/UriMatcherTest.kt b/legacy/core/src/test/java/com/fsck/k9/message/html/UriMatcherTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/message/html/UriMatcherTest.kt rename to legacy/core/src/test/java/com/fsck/k9/message/html/UriMatcherTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/message/quote/QuoteDateFormatterTest.kt b/legacy/core/src/test/java/com/fsck/k9/message/quote/QuoteDateFormatterTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/message/quote/QuoteDateFormatterTest.kt rename to legacy/core/src/test/java/com/fsck/k9/message/quote/QuoteDateFormatterTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/message/quote/TextQuoteCreatorTest.kt b/legacy/core/src/test/java/com/fsck/k9/message/quote/TextQuoteCreatorTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/message/quote/TextQuoteCreatorTest.kt rename to legacy/core/src/test/java/com/fsck/k9/message/quote/TextQuoteCreatorTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/message/signature/HtmlSignatureRemoverTest.kt b/legacy/core/src/test/java/com/fsck/k9/message/signature/HtmlSignatureRemoverTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/message/signature/HtmlSignatureRemoverTest.kt rename to legacy/core/src/test/java/com/fsck/k9/message/signature/HtmlSignatureRemoverTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/message/signature/TextSignatureRemoverTest.java b/legacy/core/src/test/java/com/fsck/k9/message/signature/TextSignatureRemoverTest.java similarity index 100% rename from app/core/src/test/java/com/fsck/k9/message/signature/TextSignatureRemoverTest.java rename to legacy/core/src/test/java/com/fsck/k9/message/signature/TextSignatureRemoverTest.java diff --git a/app/core/src/test/java/com/fsck/k9/notification/AuthenticationErrorNotificationControllerTest.kt b/legacy/core/src/test/java/com/fsck/k9/notification/AuthenticationErrorNotificationControllerTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/notification/AuthenticationErrorNotificationControllerTest.kt rename to legacy/core/src/test/java/com/fsck/k9/notification/AuthenticationErrorNotificationControllerTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/notification/BaseNotificationDataCreatorTest.kt b/legacy/core/src/test/java/com/fsck/k9/notification/BaseNotificationDataCreatorTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/notification/BaseNotificationDataCreatorTest.kt rename to legacy/core/src/test/java/com/fsck/k9/notification/BaseNotificationDataCreatorTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/notification/CertificateErrorNotificationControllerTest.kt b/legacy/core/src/test/java/com/fsck/k9/notification/CertificateErrorNotificationControllerTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/notification/CertificateErrorNotificationControllerTest.kt rename to legacy/core/src/test/java/com/fsck/k9/notification/CertificateErrorNotificationControllerTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/notification/LockScreenNotificationCreatorTest.kt b/legacy/core/src/test/java/com/fsck/k9/notification/LockScreenNotificationCreatorTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/notification/LockScreenNotificationCreatorTest.kt rename to legacy/core/src/test/java/com/fsck/k9/notification/LockScreenNotificationCreatorTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/notification/NewMailNotificationManagerTest.kt b/legacy/core/src/test/java/com/fsck/k9/notification/NewMailNotificationManagerTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/notification/NewMailNotificationManagerTest.kt rename to legacy/core/src/test/java/com/fsck/k9/notification/NewMailNotificationManagerTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/notification/NotificationContentCreatorTest.kt b/legacy/core/src/test/java/com/fsck/k9/notification/NotificationContentCreatorTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/notification/NotificationContentCreatorTest.kt rename to legacy/core/src/test/java/com/fsck/k9/notification/NotificationContentCreatorTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/notification/NotificationDataStoreTest.kt b/legacy/core/src/test/java/com/fsck/k9/notification/NotificationDataStoreTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/notification/NotificationDataStoreTest.kt rename to legacy/core/src/test/java/com/fsck/k9/notification/NotificationDataStoreTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/notification/NotificationIdsTest.kt b/legacy/core/src/test/java/com/fsck/k9/notification/NotificationIdsTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/notification/NotificationIdsTest.kt rename to legacy/core/src/test/java/com/fsck/k9/notification/NotificationIdsTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/notification/SendFailedNotificationControllerTest.kt b/legacy/core/src/test/java/com/fsck/k9/notification/SendFailedNotificationControllerTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/notification/SendFailedNotificationControllerTest.kt rename to legacy/core/src/test/java/com/fsck/k9/notification/SendFailedNotificationControllerTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/notification/SingleMessageNotificationDataCreatorTest.kt b/legacy/core/src/test/java/com/fsck/k9/notification/SingleMessageNotificationDataCreatorTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/notification/SingleMessageNotificationDataCreatorTest.kt rename to legacy/core/src/test/java/com/fsck/k9/notification/SingleMessageNotificationDataCreatorTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/notification/SummaryNotificationDataCreatorTest.kt b/legacy/core/src/test/java/com/fsck/k9/notification/SummaryNotificationDataCreatorTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/notification/SummaryNotificationDataCreatorTest.kt rename to legacy/core/src/test/java/com/fsck/k9/notification/SummaryNotificationDataCreatorTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/notification/SyncNotificationControllerTest.kt b/legacy/core/src/test/java/com/fsck/k9/notification/SyncNotificationControllerTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/notification/SyncNotificationControllerTest.kt rename to legacy/core/src/test/java/com/fsck/k9/notification/SyncNotificationControllerTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/notification/TestNotificationResourceProvider.kt b/legacy/core/src/test/java/com/fsck/k9/notification/TestNotificationResourceProvider.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/notification/TestNotificationResourceProvider.kt rename to legacy/core/src/test/java/com/fsck/k9/notification/TestNotificationResourceProvider.kt diff --git a/app/core/src/test/java/com/fsck/k9/preferences/ServerSettingsUpgraderTest.kt b/legacy/core/src/test/java/com/fsck/k9/preferences/ServerSettingsUpgraderTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/preferences/ServerSettingsUpgraderTest.kt rename to legacy/core/src/test/java/com/fsck/k9/preferences/ServerSettingsUpgraderTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/preferences/ServerSettingsValidatorTest.kt b/legacy/core/src/test/java/com/fsck/k9/preferences/ServerSettingsValidatorTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/preferences/ServerSettingsValidatorTest.kt rename to legacy/core/src/test/java/com/fsck/k9/preferences/ServerSettingsValidatorTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/preferences/SettingsExporterTest.kt b/legacy/core/src/test/java/com/fsck/k9/preferences/SettingsExporterTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/preferences/SettingsExporterTest.kt rename to legacy/core/src/test/java/com/fsck/k9/preferences/SettingsExporterTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/preferences/SettingsFileParserTest.kt b/legacy/core/src/test/java/com/fsck/k9/preferences/SettingsFileParserTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/preferences/SettingsFileParserTest.kt rename to legacy/core/src/test/java/com/fsck/k9/preferences/SettingsFileParserTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/preferences/SettingsImporterTest.kt b/legacy/core/src/test/java/com/fsck/k9/preferences/SettingsImporterTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/preferences/SettingsImporterTest.kt rename to legacy/core/src/test/java/com/fsck/k9/preferences/SettingsImporterTest.kt diff --git a/app/core/src/test/java/com/fsck/k9/preferences/upgrader/ServerSettingsUpgraderTo92Test.kt b/legacy/core/src/test/java/com/fsck/k9/preferences/upgrader/ServerSettingsUpgraderTo92Test.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/preferences/upgrader/ServerSettingsUpgraderTo92Test.kt rename to legacy/core/src/test/java/com/fsck/k9/preferences/upgrader/ServerSettingsUpgraderTo92Test.kt diff --git a/app/core/src/test/java/com/fsck/k9/preferences/upgrader/ServerSettingsUpgraderTo94Test.kt b/legacy/core/src/test/java/com/fsck/k9/preferences/upgrader/ServerSettingsUpgraderTo94Test.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/preferences/upgrader/ServerSettingsUpgraderTo94Test.kt rename to legacy/core/src/test/java/com/fsck/k9/preferences/upgrader/ServerSettingsUpgraderTo94Test.kt diff --git a/app/core/src/test/java/com/fsck/k9/preferences/upgrader/ServerSettingsUpgraderTo95Test.kt b/legacy/core/src/test/java/com/fsck/k9/preferences/upgrader/ServerSettingsUpgraderTo95Test.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/preferences/upgrader/ServerSettingsUpgraderTo95Test.kt rename to legacy/core/src/test/java/com/fsck/k9/preferences/upgrader/ServerSettingsUpgraderTo95Test.kt diff --git a/app/core/src/test/java/com/fsck/k9/sasl/OAuthBearerTest.kt b/legacy/core/src/test/java/com/fsck/k9/sasl/OAuthBearerTest.kt similarity index 100% rename from app/core/src/test/java/com/fsck/k9/sasl/OAuthBearerTest.kt rename to legacy/core/src/test/java/com/fsck/k9/sasl/OAuthBearerTest.kt diff --git a/app/core/src/test/resources/autocrypt/no_autocrypt.eml b/legacy/core/src/test/resources/autocrypt/no_autocrypt.eml similarity index 100% rename from app/core/src/test/resources/autocrypt/no_autocrypt.eml rename to legacy/core/src/test/resources/autocrypt/no_autocrypt.eml diff --git a/app/core/src/test/resources/autocrypt/rsa2048-broken-base64.eml b/legacy/core/src/test/resources/autocrypt/rsa2048-broken-base64.eml similarity index 100% rename from app/core/src/test/resources/autocrypt/rsa2048-broken-base64.eml rename to legacy/core/src/test/resources/autocrypt/rsa2048-broken-base64.eml diff --git a/app/core/src/test/resources/autocrypt/rsa2048-explicit-type.eml b/legacy/core/src/test/resources/autocrypt/rsa2048-explicit-type.eml similarity index 100% rename from app/core/src/test/resources/autocrypt/rsa2048-explicit-type.eml rename to legacy/core/src/test/resources/autocrypt/rsa2048-explicit-type.eml diff --git a/app/core/src/test/resources/autocrypt/rsa2048-simple-to-bot.eml b/legacy/core/src/test/resources/autocrypt/rsa2048-simple-to-bot.eml similarity index 100% rename from app/core/src/test/resources/autocrypt/rsa2048-simple-to-bot.eml rename to legacy/core/src/test/resources/autocrypt/rsa2048-simple-to-bot.eml diff --git a/app/core/src/test/resources/autocrypt/rsa2048-simple.eml b/legacy/core/src/test/resources/autocrypt/rsa2048-simple.eml similarity index 100% rename from app/core/src/test/resources/autocrypt/rsa2048-simple.eml rename to legacy/core/src/test/resources/autocrypt/rsa2048-simple.eml diff --git a/app/core/src/test/resources/autocrypt/rsa2048-unknown-critical.eml b/legacy/core/src/test/resources/autocrypt/rsa2048-unknown-critical.eml similarity index 100% rename from app/core/src/test/resources/autocrypt/rsa2048-unknown-critical.eml rename to legacy/core/src/test/resources/autocrypt/rsa2048-unknown-critical.eml diff --git a/app/core/src/test/resources/autocrypt/rsa2048-unknown-non-critical.eml b/legacy/core/src/test/resources/autocrypt/rsa2048-unknown-non-critical.eml similarity index 100% rename from app/core/src/test/resources/autocrypt/rsa2048-unknown-non-critical.eml rename to legacy/core/src/test/resources/autocrypt/rsa2048-unknown-non-critical.eml diff --git a/app/core/src/test/resources/autocrypt/unknown-type.eml b/legacy/core/src/test/resources/autocrypt/unknown-type.eml similarity index 100% rename from app/core/src/test/resources/autocrypt/unknown-type.eml rename to legacy/core/src/test/resources/autocrypt/unknown-type.eml diff --git a/app/crypto-openpgp/build.gradle.kts b/legacy/crypto-openpgp/build.gradle.kts similarity index 76% rename from app/crypto-openpgp/build.gradle.kts rename to legacy/crypto-openpgp/build.gradle.kts index 615e1beb27..5c51339607 100644 --- a/app/crypto-openpgp/build.gradle.kts +++ b/legacy/crypto-openpgp/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation(projects.app.core) + implementation(projects.legacy.core) } android { diff --git a/app/crypto-openpgp/src/main/java/com/fsck/k9/crypto/openpgp/EncryptionDetector.java b/legacy/crypto-openpgp/src/main/java/com/fsck/k9/crypto/openpgp/EncryptionDetector.java similarity index 100% rename from app/crypto-openpgp/src/main/java/com/fsck/k9/crypto/openpgp/EncryptionDetector.java rename to legacy/crypto-openpgp/src/main/java/com/fsck/k9/crypto/openpgp/EncryptionDetector.java diff --git a/app/crypto-openpgp/src/main/java/com/fsck/k9/crypto/openpgp/OpenPgpEncryptionExtractor.kt b/legacy/crypto-openpgp/src/main/java/com/fsck/k9/crypto/openpgp/OpenPgpEncryptionExtractor.kt similarity index 100% rename from app/crypto-openpgp/src/main/java/com/fsck/k9/crypto/openpgp/OpenPgpEncryptionExtractor.kt rename to legacy/crypto-openpgp/src/main/java/com/fsck/k9/crypto/openpgp/OpenPgpEncryptionExtractor.kt diff --git a/app/crypto-openpgp/src/test/java/com/fsck/k9/crypto/openpgp/EncryptionDetectorTest.java b/legacy/crypto-openpgp/src/test/java/com/fsck/k9/crypto/openpgp/EncryptionDetectorTest.java similarity index 100% rename from app/crypto-openpgp/src/test/java/com/fsck/k9/crypto/openpgp/EncryptionDetectorTest.java rename to legacy/crypto-openpgp/src/test/java/com/fsck/k9/crypto/openpgp/EncryptionDetectorTest.java diff --git a/app/crypto-openpgp/src/test/java/com/fsck/k9/crypto/openpgp/MessageCreationHelper.java b/legacy/crypto-openpgp/src/test/java/com/fsck/k9/crypto/openpgp/MessageCreationHelper.java similarity index 100% rename from app/crypto-openpgp/src/test/java/com/fsck/k9/crypto/openpgp/MessageCreationHelper.java rename to legacy/crypto-openpgp/src/test/java/com/fsck/k9/crypto/openpgp/MessageCreationHelper.java diff --git a/app/storage/build.gradle.kts b/legacy/storage/build.gradle.kts similarity index 83% rename from app/storage/build.gradle.kts rename to legacy/storage/build.gradle.kts index 977e383881..462725e9e7 100644 --- a/app/storage/build.gradle.kts +++ b/legacy/storage/build.gradle.kts @@ -5,7 +5,7 @@ plugins { dependencies { api(libs.koin.core) - implementation(projects.app.core) + implementation(projects.legacy.core) implementation(libs.androidx.core.ktx) implementation(libs.timber) implementation(libs.mime4j.core) @@ -13,7 +13,7 @@ dependencies { implementation(libs.moshi) testImplementation(projects.mail.testing) - testImplementation(projects.app.testing) + testImplementation(projects.legacy.testing) testImplementation(libs.robolectric) testImplementation(libs.commons.io) } diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/K9StorageEditor.java b/legacy/storage/src/main/java/com/fsck/k9/preferences/K9StorageEditor.java similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/preferences/K9StorageEditor.java rename to legacy/storage/src/main/java/com/fsck/k9/preferences/K9StorageEditor.java diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/K9StoragePersister.java b/legacy/storage/src/main/java/com/fsck/k9/preferences/K9StoragePersister.java similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/preferences/K9StoragePersister.java rename to legacy/storage/src/main/java/com/fsck/k9/preferences/K9StoragePersister.java diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migration/DefaultStorageMigrationHelper.kt b/legacy/storage/src/main/java/com/fsck/k9/preferences/migration/DefaultStorageMigrationHelper.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/preferences/migration/DefaultStorageMigrationHelper.kt rename to legacy/storage/src/main/java/com/fsck/k9/preferences/migration/DefaultStorageMigrationHelper.kt diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationHelper.kt b/legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationHelper.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationHelper.kt rename to legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationHelper.kt diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo10.kt b/legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo10.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo10.kt rename to legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo10.kt diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo11.kt b/legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo11.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo11.kt rename to legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo11.kt diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo12.kt b/legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo12.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo12.kt rename to legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo12.kt diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo13.kt b/legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo13.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo13.kt rename to legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo13.kt diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo14.kt b/legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo14.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo14.kt rename to legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo14.kt diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo15.kt b/legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo15.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo15.kt rename to legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo15.kt diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo16.kt b/legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo16.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo16.kt rename to legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo16.kt diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo17.kt b/legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo17.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo17.kt rename to legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo17.kt diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo18.kt b/legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo18.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo18.kt rename to legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo18.kt diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo19.kt b/legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo19.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo19.kt rename to legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo19.kt diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo2.java b/legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo2.java similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo2.java rename to legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo2.java diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo20.kt b/legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo20.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo20.kt rename to legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo20.kt diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo21.kt b/legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo21.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo21.kt rename to legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo21.kt diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo22.kt b/legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo22.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo22.kt rename to legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo22.kt diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo23.kt b/legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo23.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo23.kt rename to legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo23.kt diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo24.kt b/legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo24.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo24.kt rename to legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo24.kt diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo25.kt b/legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo25.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo25.kt rename to legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo25.kt diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo3.kt b/legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo3.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo3.kt rename to legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo3.kt diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo4.kt b/legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo4.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo4.kt rename to legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo4.kt diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo5.kt b/legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo5.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo5.kt rename to legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo5.kt diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo6.kt b/legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo6.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo6.kt rename to legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo6.kt diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo7.kt b/legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo7.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo7.kt rename to legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo7.kt diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo8.kt b/legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo8.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo8.kt rename to legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrationTo8.kt diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrations.kt b/legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrations.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrations.kt rename to legacy/storage/src/main/java/com/fsck/k9/preferences/migration/StorageMigrations.kt diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migration/migration12/ImapStoreUriDecoder.java b/legacy/storage/src/main/java/com/fsck/k9/preferences/migration/migration12/ImapStoreUriDecoder.java similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/preferences/migration/migration12/ImapStoreUriDecoder.java rename to legacy/storage/src/main/java/com/fsck/k9/preferences/migration/migration12/ImapStoreUriDecoder.java diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migration/migration12/Pop3StoreUriDecoder.java b/legacy/storage/src/main/java/com/fsck/k9/preferences/migration/migration12/Pop3StoreUriDecoder.java similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/preferences/migration/migration12/Pop3StoreUriDecoder.java rename to legacy/storage/src/main/java/com/fsck/k9/preferences/migration/migration12/Pop3StoreUriDecoder.java diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migration/migration12/SmtpTransportUriDecoder.java b/legacy/storage/src/main/java/com/fsck/k9/preferences/migration/migration12/SmtpTransportUriDecoder.java similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/preferences/migration/migration12/SmtpTransportUriDecoder.java rename to legacy/storage/src/main/java/com/fsck/k9/preferences/migration/migration12/SmtpTransportUriDecoder.java diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migration/migration12/WebDavStoreUriDecoder.java b/legacy/storage/src/main/java/com/fsck/k9/preferences/migration/migration12/WebDavStoreUriDecoder.java similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/preferences/migration/migration12/WebDavStoreUriDecoder.java rename to legacy/storage/src/main/java/com/fsck/k9/preferences/migration/migration12/WebDavStoreUriDecoder.java diff --git a/app/storage/src/main/java/com/fsck/k9/storage/K9SchemaDefinitionFactory.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/K9SchemaDefinitionFactory.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/K9SchemaDefinitionFactory.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/K9SchemaDefinitionFactory.kt diff --git a/app/storage/src/main/java/com/fsck/k9/storage/KoinModule.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/KoinModule.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/KoinModule.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/KoinModule.kt diff --git a/app/storage/src/main/java/com/fsck/k9/storage/StoreSchemaDefinition.java b/legacy/storage/src/main/java/com/fsck/k9/storage/StoreSchemaDefinition.java similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/StoreSchemaDefinition.java rename to legacy/storage/src/main/java/com/fsck/k9/storage/StoreSchemaDefinition.java diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/AttachmentFileManager.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/messages/AttachmentFileManager.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/messages/AttachmentFileManager.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/messages/AttachmentFileManager.kt diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/CheckFolderOperations.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/messages/CheckFolderOperations.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/messages/CheckFolderOperations.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/messages/CheckFolderOperations.kt diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/ChunkedDatabaseOperations.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/messages/ChunkedDatabaseOperations.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/messages/ChunkedDatabaseOperations.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/messages/ChunkedDatabaseOperations.kt diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/CopyMessageOperations.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/messages/CopyMessageOperations.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/messages/CopyMessageOperations.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/messages/CopyMessageOperations.kt diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/CreateFolderOperations.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/messages/CreateFolderOperations.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/messages/CreateFolderOperations.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/messages/CreateFolderOperations.kt diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/DataLocation.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/messages/DataLocation.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/messages/DataLocation.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/messages/DataLocation.kt diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/DatabaseOperations.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/messages/DatabaseOperations.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/messages/DatabaseOperations.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/messages/DatabaseOperations.kt diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/DeleteFolderOperations.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/messages/DeleteFolderOperations.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/messages/DeleteFolderOperations.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/messages/DeleteFolderOperations.kt diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/DeleteMessageOperations.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/messages/DeleteMessageOperations.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/messages/DeleteMessageOperations.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/messages/DeleteMessageOperations.kt diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/FlagMessageOperations.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/messages/FlagMessageOperations.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/messages/FlagMessageOperations.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/messages/FlagMessageOperations.kt diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/K9MessageStore.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/messages/K9MessageStore.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/messages/K9MessageStore.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/messages/K9MessageStore.kt diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/K9MessageStoreFactory.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/messages/K9MessageStoreFactory.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/messages/K9MessageStoreFactory.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/messages/K9MessageStoreFactory.kt diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/KeyValueStoreOperations.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/messages/KeyValueStoreOperations.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/messages/KeyValueStoreOperations.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/messages/KeyValueStoreOperations.kt diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/MoveMessageOperations.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/messages/MoveMessageOperations.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/messages/MoveMessageOperations.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/messages/MoveMessageOperations.kt diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/RetrieveFolderOperations.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/messages/RetrieveFolderOperations.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/messages/RetrieveFolderOperations.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/messages/RetrieveFolderOperations.kt diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/RetrieveMessageListOperations.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/messages/RetrieveMessageListOperations.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/messages/RetrieveMessageListOperations.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/messages/RetrieveMessageListOperations.kt diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/RetrieveMessageOperations.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/messages/RetrieveMessageOperations.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/messages/RetrieveMessageOperations.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/messages/RetrieveMessageOperations.kt diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/SaveMessageOperations.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/messages/SaveMessageOperations.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/messages/SaveMessageOperations.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/messages/SaveMessageOperations.kt diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/ThreadMessageOperations.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/messages/ThreadMessageOperations.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/messages/ThreadMessageOperations.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/messages/ThreadMessageOperations.kt diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/UpdateFolderOperations.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/messages/UpdateFolderOperations.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/messages/UpdateFolderOperations.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/messages/UpdateFolderOperations.kt diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/UpdateMessageOperations.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/messages/UpdateMessageOperations.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/messages/UpdateMessageOperations.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/messages/UpdateMessageOperations.kt diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/LegacyPendingAppend.java b/legacy/storage/src/main/java/com/fsck/k9/storage/migrations/LegacyPendingAppend.java similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/migrations/LegacyPendingAppend.java rename to legacy/storage/src/main/java/com/fsck/k9/storage/migrations/LegacyPendingAppend.java diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/LegacyPendingCommand.java b/legacy/storage/src/main/java/com/fsck/k9/storage/migrations/LegacyPendingCommand.java similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/migrations/LegacyPendingCommand.java rename to legacy/storage/src/main/java/com/fsck/k9/storage/migrations/LegacyPendingCommand.java diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/LegacyPendingDelete.java b/legacy/storage/src/main/java/com/fsck/k9/storage/migrations/LegacyPendingDelete.java similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/migrations/LegacyPendingDelete.java rename to legacy/storage/src/main/java/com/fsck/k9/storage/migrations/LegacyPendingDelete.java diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/LegacyPendingExpunge.java b/legacy/storage/src/main/java/com/fsck/k9/storage/migrations/LegacyPendingExpunge.java similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/migrations/LegacyPendingExpunge.java rename to legacy/storage/src/main/java/com/fsck/k9/storage/migrations/LegacyPendingExpunge.java diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/LegacyPendingMarkAllAsRead.java b/legacy/storage/src/main/java/com/fsck/k9/storage/migrations/LegacyPendingMarkAllAsRead.java similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/migrations/LegacyPendingMarkAllAsRead.java rename to legacy/storage/src/main/java/com/fsck/k9/storage/migrations/LegacyPendingMarkAllAsRead.java diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/LegacyPendingMoveAndMarkAsRead.java b/legacy/storage/src/main/java/com/fsck/k9/storage/migrations/LegacyPendingMoveAndMarkAsRead.java similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/migrations/LegacyPendingMoveAndMarkAsRead.java rename to legacy/storage/src/main/java/com/fsck/k9/storage/migrations/LegacyPendingMoveAndMarkAsRead.java diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/LegacyPendingMoveOrCopy.java b/legacy/storage/src/main/java/com/fsck/k9/storage/migrations/LegacyPendingMoveOrCopy.java similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/migrations/LegacyPendingMoveOrCopy.java rename to legacy/storage/src/main/java/com/fsck/k9/storage/migrations/LegacyPendingMoveOrCopy.java diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/LegacyPendingSetFlag.java b/legacy/storage/src/main/java/com/fsck/k9/storage/migrations/LegacyPendingSetFlag.java similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/migrations/LegacyPendingSetFlag.java rename to legacy/storage/src/main/java/com/fsck/k9/storage/migrations/LegacyPendingSetFlag.java diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo62.java b/legacy/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo62.java similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo62.java rename to legacy/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo62.java diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo64.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo64.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo64.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo64.kt diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo65.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo65.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo65.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo65.kt diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo66.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo66.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo66.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo66.kt diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo67.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo67.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo67.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo67.kt diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo68.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo68.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo68.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo68.kt diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo69.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo69.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo69.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo69.kt diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo70.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo70.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo70.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo70.kt diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo71.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo71.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo71.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo71.kt diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo72.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo72.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo72.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo72.kt diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo73.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo73.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo73.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo73.kt diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo74.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo74.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo74.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo74.kt diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo75.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo75.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo75.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo75.kt diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo76.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo76.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo76.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo76.kt diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo78.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo78.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo78.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo78.kt diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo79.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo79.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo79.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo79.kt diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo80.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo80.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo80.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo80.kt diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo81.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo81.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo81.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo81.kt diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo82.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo82.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo82.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo82.kt diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo83.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo83.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo83.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo83.kt diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo84.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo84.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo84.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo84.kt diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/Migrations.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/migrations/Migrations.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/migrations/Migrations.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/migrations/Migrations.kt diff --git a/app/storage/src/main/java/com/fsck/k9/storage/notifications/K9NotificationStore.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/notifications/K9NotificationStore.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/notifications/K9NotificationStore.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/notifications/K9NotificationStore.kt diff --git a/app/storage/src/main/java/com/fsck/k9/storage/notifications/K9NotificationStoreProvider.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/notifications/K9NotificationStoreProvider.kt similarity index 100% rename from app/storage/src/main/java/com/fsck/k9/storage/notifications/K9NotificationStoreProvider.kt rename to legacy/storage/src/main/java/com/fsck/k9/storage/notifications/K9NotificationStoreProvider.kt diff --git a/app/storage/src/test/java/com/fsck/k9/preferences/PreferencesDatabaseTestHelper.kt b/legacy/storage/src/test/java/com/fsck/k9/preferences/PreferencesDatabaseTestHelper.kt similarity index 100% rename from app/storage/src/test/java/com/fsck/k9/preferences/PreferencesDatabaseTestHelper.kt rename to legacy/storage/src/test/java/com/fsck/k9/preferences/PreferencesDatabaseTestHelper.kt diff --git a/app/storage/src/test/java/com/fsck/k9/preferences/StorageEditorTest.kt b/legacy/storage/src/test/java/com/fsck/k9/preferences/StorageEditorTest.kt similarity index 100% rename from app/storage/src/test/java/com/fsck/k9/preferences/StorageEditorTest.kt rename to legacy/storage/src/test/java/com/fsck/k9/preferences/StorageEditorTest.kt diff --git a/app/storage/src/test/java/com/fsck/k9/preferences/StoragePersisterTest.kt b/legacy/storage/src/test/java/com/fsck/k9/preferences/StoragePersisterTest.kt similarity index 100% rename from app/storage/src/test/java/com/fsck/k9/preferences/StoragePersisterTest.kt rename to legacy/storage/src/test/java/com/fsck/k9/preferences/StoragePersisterTest.kt diff --git a/app/storage/src/test/java/com/fsck/k9/preferences/migration/StorageMigrationTo22Test.kt b/legacy/storage/src/test/java/com/fsck/k9/preferences/migration/StorageMigrationTo22Test.kt similarity index 100% rename from app/storage/src/test/java/com/fsck/k9/preferences/migration/StorageMigrationTo22Test.kt rename to legacy/storage/src/test/java/com/fsck/k9/preferences/migration/StorageMigrationTo22Test.kt diff --git a/app/storage/src/test/java/com/fsck/k9/preferences/migration/StorageMigrationTo24Test.kt b/legacy/storage/src/test/java/com/fsck/k9/preferences/migration/StorageMigrationTo24Test.kt similarity index 100% rename from app/storage/src/test/java/com/fsck/k9/preferences/migration/StorageMigrationTo24Test.kt rename to legacy/storage/src/test/java/com/fsck/k9/preferences/migration/StorageMigrationTo24Test.kt diff --git a/app/storage/src/test/java/com/fsck/k9/preferences/migration/StorageMigrationTo25Test.kt b/legacy/storage/src/test/java/com/fsck/k9/preferences/migration/StorageMigrationTo25Test.kt similarity index 100% rename from app/storage/src/test/java/com/fsck/k9/preferences/migration/StorageMigrationTo25Test.kt rename to legacy/storage/src/test/java/com/fsck/k9/preferences/migration/StorageMigrationTo25Test.kt diff --git a/app/storage/src/test/java/com/fsck/k9/storage/K9RobolectricTest.kt b/legacy/storage/src/test/java/com/fsck/k9/storage/K9RobolectricTest.kt similarity index 100% rename from app/storage/src/test/java/com/fsck/k9/storage/K9RobolectricTest.kt rename to legacy/storage/src/test/java/com/fsck/k9/storage/K9RobolectricTest.kt diff --git a/app/storage/src/test/java/com/fsck/k9/storage/RobolectricTest.kt b/legacy/storage/src/test/java/com/fsck/k9/storage/RobolectricTest.kt similarity index 100% rename from app/storage/src/test/java/com/fsck/k9/storage/RobolectricTest.kt rename to legacy/storage/src/test/java/com/fsck/k9/storage/RobolectricTest.kt diff --git a/app/storage/src/test/java/com/fsck/k9/storage/StoreSchemaDefinitionTest.java b/legacy/storage/src/test/java/com/fsck/k9/storage/StoreSchemaDefinitionTest.java similarity index 100% rename from app/storage/src/test/java/com/fsck/k9/storage/StoreSchemaDefinitionTest.java rename to legacy/storage/src/test/java/com/fsck/k9/storage/StoreSchemaDefinitionTest.java diff --git a/app/storage/src/test/java/com/fsck/k9/storage/TestApp.kt b/legacy/storage/src/test/java/com/fsck/k9/storage/TestApp.kt similarity index 100% rename from app/storage/src/test/java/com/fsck/k9/storage/TestApp.kt rename to legacy/storage/src/test/java/com/fsck/k9/storage/TestApp.kt diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/CheckFolderOperationsTest.kt b/legacy/storage/src/test/java/com/fsck/k9/storage/messages/CheckFolderOperationsTest.kt similarity index 100% rename from app/storage/src/test/java/com/fsck/k9/storage/messages/CheckFolderOperationsTest.kt rename to legacy/storage/src/test/java/com/fsck/k9/storage/messages/CheckFolderOperationsTest.kt diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/ChunkedDatabaseOperationsTest.kt b/legacy/storage/src/test/java/com/fsck/k9/storage/messages/ChunkedDatabaseOperationsTest.kt similarity index 100% rename from app/storage/src/test/java/com/fsck/k9/storage/messages/ChunkedDatabaseOperationsTest.kt rename to legacy/storage/src/test/java/com/fsck/k9/storage/messages/ChunkedDatabaseOperationsTest.kt diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/CopyMessageOperationsTest.kt b/legacy/storage/src/test/java/com/fsck/k9/storage/messages/CopyMessageOperationsTest.kt similarity index 100% rename from app/storage/src/test/java/com/fsck/k9/storage/messages/CopyMessageOperationsTest.kt rename to legacy/storage/src/test/java/com/fsck/k9/storage/messages/CopyMessageOperationsTest.kt diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/CreateFolderOperationsTest.kt b/legacy/storage/src/test/java/com/fsck/k9/storage/messages/CreateFolderOperationsTest.kt similarity index 100% rename from app/storage/src/test/java/com/fsck/k9/storage/messages/CreateFolderOperationsTest.kt rename to legacy/storage/src/test/java/com/fsck/k9/storage/messages/CreateFolderOperationsTest.kt diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/DeleteFolderOperationsTest.kt b/legacy/storage/src/test/java/com/fsck/k9/storage/messages/DeleteFolderOperationsTest.kt similarity index 100% rename from app/storage/src/test/java/com/fsck/k9/storage/messages/DeleteFolderOperationsTest.kt rename to legacy/storage/src/test/java/com/fsck/k9/storage/messages/DeleteFolderOperationsTest.kt diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/DeleteMessageOperationsTest.kt b/legacy/storage/src/test/java/com/fsck/k9/storage/messages/DeleteMessageOperationsTest.kt similarity index 100% rename from app/storage/src/test/java/com/fsck/k9/storage/messages/DeleteMessageOperationsTest.kt rename to legacy/storage/src/test/java/com/fsck/k9/storage/messages/DeleteMessageOperationsTest.kt diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/FileHelpers.kt b/legacy/storage/src/test/java/com/fsck/k9/storage/messages/FileHelpers.kt similarity index 100% rename from app/storage/src/test/java/com/fsck/k9/storage/messages/FileHelpers.kt rename to legacy/storage/src/test/java/com/fsck/k9/storage/messages/FileHelpers.kt diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/FlagMessageOperationsTest.kt b/legacy/storage/src/test/java/com/fsck/k9/storage/messages/FlagMessageOperationsTest.kt similarity index 100% rename from app/storage/src/test/java/com/fsck/k9/storage/messages/FlagMessageOperationsTest.kt rename to legacy/storage/src/test/java/com/fsck/k9/storage/messages/FlagMessageOperationsTest.kt diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/FolderHelpers.kt b/legacy/storage/src/test/java/com/fsck/k9/storage/messages/FolderHelpers.kt similarity index 100% rename from app/storage/src/test/java/com/fsck/k9/storage/messages/FolderHelpers.kt rename to legacy/storage/src/test/java/com/fsck/k9/storage/messages/FolderHelpers.kt diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/KeyValueHelpers.kt b/legacy/storage/src/test/java/com/fsck/k9/storage/messages/KeyValueHelpers.kt similarity index 100% rename from app/storage/src/test/java/com/fsck/k9/storage/messages/KeyValueHelpers.kt rename to legacy/storage/src/test/java/com/fsck/k9/storage/messages/KeyValueHelpers.kt diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/KeyValueStoreOperationsTest.kt b/legacy/storage/src/test/java/com/fsck/k9/storage/messages/KeyValueStoreOperationsTest.kt similarity index 100% rename from app/storage/src/test/java/com/fsck/k9/storage/messages/KeyValueStoreOperationsTest.kt rename to legacy/storage/src/test/java/com/fsck/k9/storage/messages/KeyValueStoreOperationsTest.kt diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/MessageDatabaseHelpers.kt b/legacy/storage/src/test/java/com/fsck/k9/storage/messages/MessageDatabaseHelpers.kt similarity index 100% rename from app/storage/src/test/java/com/fsck/k9/storage/messages/MessageDatabaseHelpers.kt rename to legacy/storage/src/test/java/com/fsck/k9/storage/messages/MessageDatabaseHelpers.kt diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/MessagePartDatabaseHelpers.kt b/legacy/storage/src/test/java/com/fsck/k9/storage/messages/MessagePartDatabaseHelpers.kt similarity index 100% rename from app/storage/src/test/java/com/fsck/k9/storage/messages/MessagePartDatabaseHelpers.kt rename to legacy/storage/src/test/java/com/fsck/k9/storage/messages/MessagePartDatabaseHelpers.kt diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/MoveMessageOperationsTest.kt b/legacy/storage/src/test/java/com/fsck/k9/storage/messages/MoveMessageOperationsTest.kt similarity index 100% rename from app/storage/src/test/java/com/fsck/k9/storage/messages/MoveMessageOperationsTest.kt rename to legacy/storage/src/test/java/com/fsck/k9/storage/messages/MoveMessageOperationsTest.kt diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/RetrieveFolderOperationsTest.kt b/legacy/storage/src/test/java/com/fsck/k9/storage/messages/RetrieveFolderOperationsTest.kt similarity index 100% rename from app/storage/src/test/java/com/fsck/k9/storage/messages/RetrieveFolderOperationsTest.kt rename to legacy/storage/src/test/java/com/fsck/k9/storage/messages/RetrieveFolderOperationsTest.kt diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/RetrieveMessageListOperationsTest.kt b/legacy/storage/src/test/java/com/fsck/k9/storage/messages/RetrieveMessageListOperationsTest.kt similarity index 100% rename from app/storage/src/test/java/com/fsck/k9/storage/messages/RetrieveMessageListOperationsTest.kt rename to legacy/storage/src/test/java/com/fsck/k9/storage/messages/RetrieveMessageListOperationsTest.kt diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/RetrieveMessageOperationsTest.kt b/legacy/storage/src/test/java/com/fsck/k9/storage/messages/RetrieveMessageOperationsTest.kt similarity index 100% rename from app/storage/src/test/java/com/fsck/k9/storage/messages/RetrieveMessageOperationsTest.kt rename to legacy/storage/src/test/java/com/fsck/k9/storage/messages/RetrieveMessageOperationsTest.kt diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/SaveMessageOperationsTest.kt b/legacy/storage/src/test/java/com/fsck/k9/storage/messages/SaveMessageOperationsTest.kt similarity index 100% rename from app/storage/src/test/java/com/fsck/k9/storage/messages/SaveMessageOperationsTest.kt rename to legacy/storage/src/test/java/com/fsck/k9/storage/messages/SaveMessageOperationsTest.kt diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/ThreadDatabaseHelpers.kt b/legacy/storage/src/test/java/com/fsck/k9/storage/messages/ThreadDatabaseHelpers.kt similarity index 100% rename from app/storage/src/test/java/com/fsck/k9/storage/messages/ThreadDatabaseHelpers.kt rename to legacy/storage/src/test/java/com/fsck/k9/storage/messages/ThreadDatabaseHelpers.kt diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/ThreadMessageOperationsTest.kt b/legacy/storage/src/test/java/com/fsck/k9/storage/messages/ThreadMessageOperationsTest.kt similarity index 100% rename from app/storage/src/test/java/com/fsck/k9/storage/messages/ThreadMessageOperationsTest.kt rename to legacy/storage/src/test/java/com/fsck/k9/storage/messages/ThreadMessageOperationsTest.kt diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/UpdateFolderOperationsTest.kt b/legacy/storage/src/test/java/com/fsck/k9/storage/messages/UpdateFolderOperationsTest.kt similarity index 100% rename from app/storage/src/test/java/com/fsck/k9/storage/messages/UpdateFolderOperationsTest.kt rename to legacy/storage/src/test/java/com/fsck/k9/storage/messages/UpdateFolderOperationsTest.kt diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/UpdateMessageOperationsTest.kt b/legacy/storage/src/test/java/com/fsck/k9/storage/messages/UpdateMessageOperationsTest.kt similarity index 100% rename from app/storage/src/test/java/com/fsck/k9/storage/messages/UpdateMessageOperationsTest.kt rename to legacy/storage/src/test/java/com/fsck/k9/storage/messages/UpdateMessageOperationsTest.kt diff --git a/app/storage/src/test/java/com/fsck/k9/storage/notifications/K9NotificationStoreTest.kt b/legacy/storage/src/test/java/com/fsck/k9/storage/notifications/K9NotificationStoreTest.kt similarity index 100% rename from app/storage/src/test/java/com/fsck/k9/storage/notifications/K9NotificationStoreTest.kt rename to legacy/storage/src/test/java/com/fsck/k9/storage/notifications/K9NotificationStoreTest.kt diff --git a/app/storage/src/test/java/com/fsck/k9/storage/notifications/NotificationsTableHelpers.kt b/legacy/storage/src/test/java/com/fsck/k9/storage/notifications/NotificationsTableHelpers.kt similarity index 100% rename from app/storage/src/test/java/com/fsck/k9/storage/notifications/NotificationsTableHelpers.kt rename to legacy/storage/src/test/java/com/fsck/k9/storage/notifications/NotificationsTableHelpers.kt diff --git a/app/storage/src/test/resources/attach/k9small.png b/legacy/storage/src/test/resources/attach/k9small.png similarity index 100% rename from app/storage/src/test/resources/attach/k9small.png rename to legacy/storage/src/test/resources/attach/k9small.png diff --git a/app/testing/build.gradle.kts b/legacy/testing/build.gradle.kts similarity index 85% rename from app/testing/build.gradle.kts rename to legacy/testing/build.gradle.kts index 3271ad754c..524d486413 100644 --- a/app/testing/build.gradle.kts +++ b/legacy/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation(projects.app.core) + implementation(projects.legacy.core) api(projects.core.android.testing) diff --git a/app/testing/src/main/java/com/fsck/k9/preferences/InMemoryStoragePersister.kt b/legacy/testing/src/main/java/com/fsck/k9/preferences/InMemoryStoragePersister.kt similarity index 100% rename from app/testing/src/main/java/com/fsck/k9/preferences/InMemoryStoragePersister.kt rename to legacy/testing/src/main/java/com/fsck/k9/preferences/InMemoryStoragePersister.kt diff --git a/app/testing/src/main/java/com/fsck/k9/testing/MockHelper.kt b/legacy/testing/src/main/java/com/fsck/k9/testing/MockHelper.kt similarity index 100% rename from app/testing/src/main/java/com/fsck/k9/testing/MockHelper.kt rename to legacy/testing/src/main/java/com/fsck/k9/testing/MockHelper.kt diff --git a/app/testing/src/main/java/com/fsck/k9/testing/StringExtensions.kt b/legacy/testing/src/main/java/com/fsck/k9/testing/StringExtensions.kt similarity index 100% rename from app/testing/src/main/java/com/fsck/k9/testing/StringExtensions.kt rename to legacy/testing/src/main/java/com/fsck/k9/testing/StringExtensions.kt diff --git a/app/ui/base/build.gradle.kts b/legacy/ui/base/build.gradle.kts similarity index 92% rename from app/ui/base/build.gradle.kts rename to legacy/ui/base/build.gradle.kts index a8cd49b19f..557cc2417c 100644 --- a/app/ui/base/build.gradle.kts +++ b/legacy/ui/base/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation(projects.app.core) + implementation(projects.legacy.core) api(libs.androidx.appcompat) api(libs.androidx.activity) diff --git a/app/ui/base/src/main/AndroidManifest.xml b/legacy/ui/base/src/main/AndroidManifest.xml similarity index 100% rename from app/ui/base/src/main/AndroidManifest.xml rename to legacy/ui/base/src/main/AndroidManifest.xml diff --git a/app/ui/base/src/main/java/com/fsck/k9/ui/base/AppLanguageManager.kt b/legacy/ui/base/src/main/java/com/fsck/k9/ui/base/AppLanguageManager.kt similarity index 100% rename from app/ui/base/src/main/java/com/fsck/k9/ui/base/AppLanguageManager.kt rename to legacy/ui/base/src/main/java/com/fsck/k9/ui/base/AppLanguageManager.kt diff --git a/app/ui/base/src/main/java/com/fsck/k9/ui/base/K9Activity.kt b/legacy/ui/base/src/main/java/com/fsck/k9/ui/base/K9Activity.kt similarity index 100% rename from app/ui/base/src/main/java/com/fsck/k9/ui/base/K9Activity.kt rename to legacy/ui/base/src/main/java/com/fsck/k9/ui/base/K9Activity.kt diff --git a/app/ui/base/src/main/java/com/fsck/k9/ui/base/KoinModule.kt b/legacy/ui/base/src/main/java/com/fsck/k9/ui/base/KoinModule.kt similarity index 100% rename from app/ui/base/src/main/java/com/fsck/k9/ui/base/KoinModule.kt rename to legacy/ui/base/src/main/java/com/fsck/k9/ui/base/KoinModule.kt diff --git a/app/ui/base/src/main/java/com/fsck/k9/ui/base/LocaleContextWrapper.kt b/legacy/ui/base/src/main/java/com/fsck/k9/ui/base/LocaleContextWrapper.kt similarity index 100% rename from app/ui/base/src/main/java/com/fsck/k9/ui/base/LocaleContextWrapper.kt rename to legacy/ui/base/src/main/java/com/fsck/k9/ui/base/LocaleContextWrapper.kt diff --git a/app/ui/base/src/main/java/com/fsck/k9/ui/base/ThemeManager.kt b/legacy/ui/base/src/main/java/com/fsck/k9/ui/base/ThemeManager.kt similarity index 100% rename from app/ui/base/src/main/java/com/fsck/k9/ui/base/ThemeManager.kt rename to legacy/ui/base/src/main/java/com/fsck/k9/ui/base/ThemeManager.kt diff --git a/app/ui/base/src/main/java/com/fsck/k9/ui/base/ThemeProvider.kt b/legacy/ui/base/src/main/java/com/fsck/k9/ui/base/ThemeProvider.kt similarity index 100% rename from app/ui/base/src/main/java/com/fsck/k9/ui/base/ThemeProvider.kt rename to legacy/ui/base/src/main/java/com/fsck/k9/ui/base/ThemeProvider.kt diff --git a/app/ui/base/src/main/java/com/fsck/k9/ui/base/bundle/BundleExtensions.kt b/legacy/ui/base/src/main/java/com/fsck/k9/ui/base/bundle/BundleExtensions.kt similarity index 100% rename from app/ui/base/src/main/java/com/fsck/k9/ui/base/bundle/BundleExtensions.kt rename to legacy/ui/base/src/main/java/com/fsck/k9/ui/base/bundle/BundleExtensions.kt diff --git a/app/ui/base/src/main/java/com/fsck/k9/ui/base/extensions/ConfigurationExtensions.kt b/legacy/ui/base/src/main/java/com/fsck/k9/ui/base/extensions/ConfigurationExtensions.kt similarity index 100% rename from app/ui/base/src/main/java/com/fsck/k9/ui/base/extensions/ConfigurationExtensions.kt rename to legacy/ui/base/src/main/java/com/fsck/k9/ui/base/extensions/ConfigurationExtensions.kt diff --git a/app/ui/base/src/main/java/com/fsck/k9/ui/base/extensions/FragmentExtensions.kt b/legacy/ui/base/src/main/java/com/fsck/k9/ui/base/extensions/FragmentExtensions.kt similarity index 100% rename from app/ui/base/src/main/java/com/fsck/k9/ui/base/extensions/FragmentExtensions.kt rename to legacy/ui/base/src/main/java/com/fsck/k9/ui/base/extensions/FragmentExtensions.kt diff --git a/app/ui/base/src/main/java/com/fsck/k9/ui/base/extensions/NavigationExtensions.kt b/legacy/ui/base/src/main/java/com/fsck/k9/ui/base/extensions/NavigationExtensions.kt similarity index 100% rename from app/ui/base/src/main/java/com/fsck/k9/ui/base/extensions/NavigationExtensions.kt rename to legacy/ui/base/src/main/java/com/fsck/k9/ui/base/extensions/NavigationExtensions.kt diff --git a/app/ui/base/src/main/java/com/fsck/k9/ui/base/livedata/LiveDataExtensions.kt b/legacy/ui/base/src/main/java/com/fsck/k9/ui/base/livedata/LiveDataExtensions.kt similarity index 100% rename from app/ui/base/src/main/java/com/fsck/k9/ui/base/livedata/LiveDataExtensions.kt rename to legacy/ui/base/src/main/java/com/fsck/k9/ui/base/livedata/LiveDataExtensions.kt diff --git a/app/ui/base/src/main/java/com/fsck/k9/ui/base/loader/LiveDataLoader.kt b/legacy/ui/base/src/main/java/com/fsck/k9/ui/base/loader/LiveDataLoader.kt similarity index 100% rename from app/ui/base/src/main/java/com/fsck/k9/ui/base/loader/LiveDataLoader.kt rename to legacy/ui/base/src/main/java/com/fsck/k9/ui/base/loader/LiveDataLoader.kt diff --git a/app/ui/base/src/main/java/com/fsck/k9/ui/base/loader/LoaderStateObserver.kt b/legacy/ui/base/src/main/java/com/fsck/k9/ui/base/loader/LoaderStateObserver.kt similarity index 100% rename from app/ui/base/src/main/java/com/fsck/k9/ui/base/loader/LoaderStateObserver.kt rename to legacy/ui/base/src/main/java/com/fsck/k9/ui/base/loader/LoaderStateObserver.kt diff --git a/app/ui/base/src/main/java/com/fsck/k9/ui/base/locale/LocaleBroadcastReceiver.kt b/legacy/ui/base/src/main/java/com/fsck/k9/ui/base/locale/LocaleBroadcastReceiver.kt similarity index 100% rename from app/ui/base/src/main/java/com/fsck/k9/ui/base/locale/LocaleBroadcastReceiver.kt rename to legacy/ui/base/src/main/java/com/fsck/k9/ui/base/locale/LocaleBroadcastReceiver.kt diff --git a/app/ui/base/src/main/java/com/fsck/k9/ui/base/locale/SystemLocaleManager.kt b/legacy/ui/base/src/main/java/com/fsck/k9/ui/base/locale/SystemLocaleManager.kt similarity index 100% rename from app/ui/base/src/main/java/com/fsck/k9/ui/base/locale/SystemLocaleManager.kt rename to legacy/ui/base/src/main/java/com/fsck/k9/ui/base/locale/SystemLocaleManager.kt diff --git a/app/ui/base/src/main/res/layout/toolbar.xml b/legacy/ui/base/src/main/res/layout/toolbar.xml similarity index 100% rename from app/ui/base/src/main/res/layout/toolbar.xml rename to legacy/ui/base/src/main/res/layout/toolbar.xml diff --git a/app/ui/base/src/main/res/values-ar/strings.xml b/legacy/ui/base/src/main/res/values-ar/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-ar/strings.xml rename to legacy/ui/base/src/main/res/values-ar/strings.xml diff --git a/app/ui/base/src/main/res/values-az/strings.xml b/legacy/ui/base/src/main/res/values-az/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-az/strings.xml rename to legacy/ui/base/src/main/res/values-az/strings.xml diff --git a/app/ui/base/src/main/res/values-be/strings.xml b/legacy/ui/base/src/main/res/values-be/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-be/strings.xml rename to legacy/ui/base/src/main/res/values-be/strings.xml diff --git a/app/ui/base/src/main/res/values-bg/strings.xml b/legacy/ui/base/src/main/res/values-bg/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-bg/strings.xml rename to legacy/ui/base/src/main/res/values-bg/strings.xml diff --git a/app/ui/base/src/main/res/values-br/strings.xml b/legacy/ui/base/src/main/res/values-br/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-br/strings.xml rename to legacy/ui/base/src/main/res/values-br/strings.xml diff --git a/app/ui/base/src/main/res/values-bs/strings.xml b/legacy/ui/base/src/main/res/values-bs/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-bs/strings.xml rename to legacy/ui/base/src/main/res/values-bs/strings.xml diff --git a/app/ui/base/src/main/res/values-ca/strings.xml b/legacy/ui/base/src/main/res/values-ca/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-ca/strings.xml rename to legacy/ui/base/src/main/res/values-ca/strings.xml diff --git a/app/ui/base/src/main/res/values-co/strings.xml b/legacy/ui/base/src/main/res/values-co/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-co/strings.xml rename to legacy/ui/base/src/main/res/values-co/strings.xml diff --git a/app/ui/base/src/main/res/values-cs/strings.xml b/legacy/ui/base/src/main/res/values-cs/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-cs/strings.xml rename to legacy/ui/base/src/main/res/values-cs/strings.xml diff --git a/app/ui/base/src/main/res/values-cy/strings.xml b/legacy/ui/base/src/main/res/values-cy/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-cy/strings.xml rename to legacy/ui/base/src/main/res/values-cy/strings.xml diff --git a/app/ui/base/src/main/res/values-da/strings.xml b/legacy/ui/base/src/main/res/values-da/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-da/strings.xml rename to legacy/ui/base/src/main/res/values-da/strings.xml diff --git a/app/ui/base/src/main/res/values-de/strings.xml b/legacy/ui/base/src/main/res/values-de/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-de/strings.xml rename to legacy/ui/base/src/main/res/values-de/strings.xml diff --git a/app/ui/base/src/main/res/values-el/strings.xml b/legacy/ui/base/src/main/res/values-el/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-el/strings.xml rename to legacy/ui/base/src/main/res/values-el/strings.xml diff --git a/app/ui/base/src/main/res/values-en-rGB/strings.xml b/legacy/ui/base/src/main/res/values-en-rGB/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-en-rGB/strings.xml rename to legacy/ui/base/src/main/res/values-en-rGB/strings.xml diff --git a/app/ui/base/src/main/res/values-eo/strings.xml b/legacy/ui/base/src/main/res/values-eo/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-eo/strings.xml rename to legacy/ui/base/src/main/res/values-eo/strings.xml diff --git a/app/ui/base/src/main/res/values-es/strings.xml b/legacy/ui/base/src/main/res/values-es/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-es/strings.xml rename to legacy/ui/base/src/main/res/values-es/strings.xml diff --git a/app/ui/base/src/main/res/values-et/strings.xml b/legacy/ui/base/src/main/res/values-et/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-et/strings.xml rename to legacy/ui/base/src/main/res/values-et/strings.xml diff --git a/app/ui/base/src/main/res/values-eu/strings.xml b/legacy/ui/base/src/main/res/values-eu/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-eu/strings.xml rename to legacy/ui/base/src/main/res/values-eu/strings.xml diff --git a/app/ui/base/src/main/res/values-fa/strings.xml b/legacy/ui/base/src/main/res/values-fa/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-fa/strings.xml rename to legacy/ui/base/src/main/res/values-fa/strings.xml diff --git a/app/ui/base/src/main/res/values-fi/strings.xml b/legacy/ui/base/src/main/res/values-fi/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-fi/strings.xml rename to legacy/ui/base/src/main/res/values-fi/strings.xml diff --git a/app/ui/base/src/main/res/values-fr/strings.xml b/legacy/ui/base/src/main/res/values-fr/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-fr/strings.xml rename to legacy/ui/base/src/main/res/values-fr/strings.xml diff --git a/app/ui/base/src/main/res/values-fy/strings.xml b/legacy/ui/base/src/main/res/values-fy/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-fy/strings.xml rename to legacy/ui/base/src/main/res/values-fy/strings.xml diff --git a/app/ui/base/src/main/res/values-gd/strings.xml b/legacy/ui/base/src/main/res/values-gd/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-gd/strings.xml rename to legacy/ui/base/src/main/res/values-gd/strings.xml diff --git a/app/ui/base/src/main/res/values-gl/strings.xml b/legacy/ui/base/src/main/res/values-gl/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-gl/strings.xml rename to legacy/ui/base/src/main/res/values-gl/strings.xml diff --git a/app/ui/base/src/main/res/values-hi/strings.xml b/legacy/ui/base/src/main/res/values-hi/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-hi/strings.xml rename to legacy/ui/base/src/main/res/values-hi/strings.xml diff --git a/app/ui/base/src/main/res/values-hr/strings.xml b/legacy/ui/base/src/main/res/values-hr/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-hr/strings.xml rename to legacy/ui/base/src/main/res/values-hr/strings.xml diff --git a/app/ui/base/src/main/res/values-hu/strings.xml b/legacy/ui/base/src/main/res/values-hu/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-hu/strings.xml rename to legacy/ui/base/src/main/res/values-hu/strings.xml diff --git a/app/ui/base/src/main/res/values-hy/strings.xml b/legacy/ui/base/src/main/res/values-hy/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-hy/strings.xml rename to legacy/ui/base/src/main/res/values-hy/strings.xml diff --git a/app/ui/base/src/main/res/values-in/strings.xml b/legacy/ui/base/src/main/res/values-in/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-in/strings.xml rename to legacy/ui/base/src/main/res/values-in/strings.xml diff --git a/app/ui/base/src/main/res/values-is/strings.xml b/legacy/ui/base/src/main/res/values-is/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-is/strings.xml rename to legacy/ui/base/src/main/res/values-is/strings.xml diff --git a/app/ui/base/src/main/res/values-it/strings.xml b/legacy/ui/base/src/main/res/values-it/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-it/strings.xml rename to legacy/ui/base/src/main/res/values-it/strings.xml diff --git a/app/ui/base/src/main/res/values-iw/strings.xml b/legacy/ui/base/src/main/res/values-iw/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-iw/strings.xml rename to legacy/ui/base/src/main/res/values-iw/strings.xml diff --git a/app/ui/base/src/main/res/values-ja/strings.xml b/legacy/ui/base/src/main/res/values-ja/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-ja/strings.xml rename to legacy/ui/base/src/main/res/values-ja/strings.xml diff --git a/app/ui/base/src/main/res/values-ka/strings.xml b/legacy/ui/base/src/main/res/values-ka/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-ka/strings.xml rename to legacy/ui/base/src/main/res/values-ka/strings.xml diff --git a/app/ui/base/src/main/res/values-ko/strings.xml b/legacy/ui/base/src/main/res/values-ko/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-ko/strings.xml rename to legacy/ui/base/src/main/res/values-ko/strings.xml diff --git a/app/ui/base/src/main/res/values-lt/strings.xml b/legacy/ui/base/src/main/res/values-lt/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-lt/strings.xml rename to legacy/ui/base/src/main/res/values-lt/strings.xml diff --git a/app/ui/base/src/main/res/values-lv/strings.xml b/legacy/ui/base/src/main/res/values-lv/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-lv/strings.xml rename to legacy/ui/base/src/main/res/values-lv/strings.xml diff --git a/app/ui/base/src/main/res/values-ml/strings.xml b/legacy/ui/base/src/main/res/values-ml/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-ml/strings.xml rename to legacy/ui/base/src/main/res/values-ml/strings.xml diff --git a/app/ui/base/src/main/res/values-nb/strings.xml b/legacy/ui/base/src/main/res/values-nb/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-nb/strings.xml rename to legacy/ui/base/src/main/res/values-nb/strings.xml diff --git a/app/ui/base/src/main/res/values-nl/strings.xml b/legacy/ui/base/src/main/res/values-nl/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-nl/strings.xml rename to legacy/ui/base/src/main/res/values-nl/strings.xml diff --git a/app/ui/base/src/main/res/values-nn/strings.xml b/legacy/ui/base/src/main/res/values-nn/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-nn/strings.xml rename to legacy/ui/base/src/main/res/values-nn/strings.xml diff --git a/app/ui/base/src/main/res/values-pl/strings.xml b/legacy/ui/base/src/main/res/values-pl/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-pl/strings.xml rename to legacy/ui/base/src/main/res/values-pl/strings.xml diff --git a/app/ui/base/src/main/res/values-pt-rBR/strings.xml b/legacy/ui/base/src/main/res/values-pt-rBR/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-pt-rBR/strings.xml rename to legacy/ui/base/src/main/res/values-pt-rBR/strings.xml diff --git a/app/ui/base/src/main/res/values-pt-rPT/strings.xml b/legacy/ui/base/src/main/res/values-pt-rPT/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-pt-rPT/strings.xml rename to legacy/ui/base/src/main/res/values-pt-rPT/strings.xml diff --git a/app/ui/base/src/main/res/values-ro/strings.xml b/legacy/ui/base/src/main/res/values-ro/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-ro/strings.xml rename to legacy/ui/base/src/main/res/values-ro/strings.xml diff --git a/app/ui/base/src/main/res/values-ru/strings.xml b/legacy/ui/base/src/main/res/values-ru/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-ru/strings.xml rename to legacy/ui/base/src/main/res/values-ru/strings.xml diff --git a/app/ui/base/src/main/res/values-sk/strings.xml b/legacy/ui/base/src/main/res/values-sk/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-sk/strings.xml rename to legacy/ui/base/src/main/res/values-sk/strings.xml diff --git a/app/ui/base/src/main/res/values-sl/strings.xml b/legacy/ui/base/src/main/res/values-sl/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-sl/strings.xml rename to legacy/ui/base/src/main/res/values-sl/strings.xml diff --git a/app/ui/base/src/main/res/values-sq/strings.xml b/legacy/ui/base/src/main/res/values-sq/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-sq/strings.xml rename to legacy/ui/base/src/main/res/values-sq/strings.xml diff --git a/app/ui/base/src/main/res/values-sr/strings.xml b/legacy/ui/base/src/main/res/values-sr/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-sr/strings.xml rename to legacy/ui/base/src/main/res/values-sr/strings.xml diff --git a/app/ui/base/src/main/res/values-sv/strings.xml b/legacy/ui/base/src/main/res/values-sv/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-sv/strings.xml rename to legacy/ui/base/src/main/res/values-sv/strings.xml diff --git a/app/ui/base/src/main/res/values-ta-rIN/strings.xml b/legacy/ui/base/src/main/res/values-ta-rIN/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-ta-rIN/strings.xml rename to legacy/ui/base/src/main/res/values-ta-rIN/strings.xml diff --git a/app/ui/base/src/main/res/values-tr/strings.xml b/legacy/ui/base/src/main/res/values-tr/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-tr/strings.xml rename to legacy/ui/base/src/main/res/values-tr/strings.xml diff --git a/app/ui/base/src/main/res/values-uk/strings.xml b/legacy/ui/base/src/main/res/values-uk/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-uk/strings.xml rename to legacy/ui/base/src/main/res/values-uk/strings.xml diff --git a/app/ui/base/src/main/res/values-vi/strings.xml b/legacy/ui/base/src/main/res/values-vi/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-vi/strings.xml rename to legacy/ui/base/src/main/res/values-vi/strings.xml diff --git a/app/ui/base/src/main/res/values-zh-rCN/strings.xml b/legacy/ui/base/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-zh-rCN/strings.xml rename to legacy/ui/base/src/main/res/values-zh-rCN/strings.xml diff --git a/app/ui/base/src/main/res/values-zh-rTW/strings.xml b/legacy/ui/base/src/main/res/values-zh-rTW/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values-zh-rTW/strings.xml rename to legacy/ui/base/src/main/res/values-zh-rTW/strings.xml diff --git a/app/ui/base/src/main/res/values/dimensions.xml b/legacy/ui/base/src/main/res/values/dimensions.xml similarity index 100% rename from app/ui/base/src/main/res/values/dimensions.xml rename to legacy/ui/base/src/main/res/values/dimensions.xml diff --git a/app/ui/base/src/main/res/values/strings.xml b/legacy/ui/base/src/main/res/values/strings.xml similarity index 100% rename from app/ui/base/src/main/res/values/strings.xml rename to legacy/ui/base/src/main/res/values/strings.xml diff --git a/app/ui/legacy/build.gradle.kts b/legacy/ui/legacy/build.gradle.kts similarity index 92% rename from app/ui/legacy/build.gradle.kts rename to legacy/ui/legacy/build.gradle.kts index 04ad71f8f0..b3486d2aba 100644 --- a/app/ui/legacy/build.gradle.kts +++ b/legacy/ui/legacy/build.gradle.kts @@ -4,12 +4,12 @@ plugins { } dependencies { - api(projects.app.ui.base) + api(projects.legacy.ui.base) api(projects.core.ui.legacy.designsystem) // TODO: Remove once Theme2 is fully migrated api(projects.core.ui.legacy.theme2.k9mail) - implementation(projects.app.core) + implementation(projects.legacy.core) implementation(projects.mail.common) implementation(projects.uiUtils.toolbarBottomSheet) @@ -60,11 +60,11 @@ dependencies { annotationProcessor(libs.glide.compiler) // This is necessary as RecipientPresenterTest fails to inject - testImplementation(projects.app.common) + testImplementation(projects.legacy.common) testImplementation(projects.core.testing) testImplementation(projects.mail.testing) - testImplementation(projects.app.storage) - testImplementation(projects.app.testing) + testImplementation(projects.legacy.storage) + testImplementation(projects.legacy.testing) testImplementation(libs.robolectric) testImplementation(libs.androidx.test.core) testImplementation(libs.kotlin.test) diff --git a/app/ui/legacy/src/main/AndroidManifest.xml b/legacy/ui/legacy/src/main/AndroidManifest.xml similarity index 100% rename from app/ui/legacy/src/main/AndroidManifest.xml rename to legacy/ui/legacy/src/main/AndroidManifest.xml diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/UiKoinModules.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/UiKoinModules.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/UiKoinModules.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/UiKoinModules.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/account/AccountRemover.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/account/AccountRemover.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/account/AccountRemover.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/account/AccountRemover.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/account/AccountRemoverWorker.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/account/AccountRemoverWorker.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/account/AccountRemoverWorker.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/account/AccountRemoverWorker.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/account/BackgroundAccountRemover.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/account/BackgroundAccountRemover.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/account/BackgroundAccountRemover.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/account/BackgroundAccountRemover.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/account/KoinModule.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/account/KoinModule.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/account/KoinModule.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/account/KoinModule.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/AccountList.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/AccountList.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/activity/AccountList.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/activity/AccountList.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/AlternateRecipientAdapter.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/AlternateRecipientAdapter.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/activity/AlternateRecipientAdapter.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/activity/AlternateRecipientAdapter.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/ChooseIdentity.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/ChooseIdentity.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/activity/ChooseIdentity.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/activity/ChooseIdentity.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/EditIdentity.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/EditIdentity.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/activity/EditIdentity.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/activity/EditIdentity.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/FolderInfoHolder.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/FolderInfoHolder.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/activity/FolderInfoHolder.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/activity/FolderInfoHolder.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/K9ListActivity.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/K9ListActivity.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/activity/K9ListActivity.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/activity/K9ListActivity.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/KoinModule.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/KoinModule.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/activity/KoinModule.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/activity/KoinModule.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/ManageIdentities.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/ManageIdentities.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/activity/ManageIdentities.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/activity/ManageIdentities.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageCompose.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/MessageCompose.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageCompose.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/activity/MessageCompose.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageListActivityConfig.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/MessageListActivityConfig.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageListActivityConfig.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/activity/MessageListActivityConfig.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageLoaderHelper.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/MessageLoaderHelper.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageLoaderHelper.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/activity/MessageLoaderHelper.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageLoaderHelperFactory.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/MessageLoaderHelperFactory.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageLoaderHelperFactory.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/activity/MessageLoaderHelperFactory.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/Search.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/Search.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/activity/Search.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/activity/Search.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/UpgradeDatabases.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/UpgradeDatabases.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/activity/UpgradeDatabases.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/activity/UpgradeDatabases.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/AttachmentPresenter.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/compose/AttachmentPresenter.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/AttachmentPresenter.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/activity/compose/AttachmentPresenter.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/ComposeCryptoStatus.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/compose/ComposeCryptoStatus.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/ComposeCryptoStatus.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/activity/compose/ComposeCryptoStatus.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/IdentityAdapter.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/compose/IdentityAdapter.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/IdentityAdapter.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/activity/compose/IdentityAdapter.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/MessageActions.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/compose/MessageActions.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/MessageActions.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/activity/compose/MessageActions.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/PgpEnabledErrorDialog.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/compose/PgpEnabledErrorDialog.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/PgpEnabledErrorDialog.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/activity/compose/PgpEnabledErrorDialog.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/PgpEncryptDescriptionDialog.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/compose/PgpEncryptDescriptionDialog.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/PgpEncryptDescriptionDialog.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/activity/compose/PgpEncryptDescriptionDialog.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/PgpInlineDialog.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/compose/PgpInlineDialog.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/PgpInlineDialog.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/activity/compose/PgpInlineDialog.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/PgpSignOnlyDialog.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/compose/PgpSignOnlyDialog.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/PgpSignOnlyDialog.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/activity/compose/PgpSignOnlyDialog.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientAdapter.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientAdapter.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientAdapter.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientAdapter.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientLoader.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientLoader.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientLoader.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientLoader.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientMvpView.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientMvpView.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientMvpView.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientMvpView.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientPresenter.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientPresenter.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientPresenter.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientPresenter.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/ReplyToPresenter.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/compose/ReplyToPresenter.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/ReplyToPresenter.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/activity/compose/ReplyToPresenter.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/ReplyToView.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/compose/ReplyToView.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/ReplyToView.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/activity/compose/ReplyToView.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/SaveMessageTask.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/compose/SaveMessageTask.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/SaveMessageTask.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/activity/compose/SaveMessageTask.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/loader/AttachmentContentLoader.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/loader/AttachmentContentLoader.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/activity/loader/AttachmentContentLoader.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/activity/loader/AttachmentContentLoader.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/loader/AttachmentInfoLoader.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/loader/AttachmentInfoLoader.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/activity/loader/AttachmentInfoLoader.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/activity/loader/AttachmentInfoLoader.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/misc/Attachment.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/misc/Attachment.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/activity/misc/Attachment.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/activity/misc/Attachment.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/misc/ContactPicture.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/misc/ContactPicture.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/activity/misc/ContactPicture.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/activity/misc/ContactPicture.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/misc/InlineAttachment.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/misc/InlineAttachment.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/activity/misc/InlineAttachment.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/activity/misc/InlineAttachment.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupComposition.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupComposition.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupComposition.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupComposition.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactImage.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactImage.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactImage.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactImage.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactImageBitmapDecoder.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactImageBitmapDecoder.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactImageBitmapDecoder.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactImageBitmapDecoder.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactImageModelLoader.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactImageModelLoader.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactImageModelLoader.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactImageModelLoader.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactLetterBitmapConfig.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactLetterBitmapConfig.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactLetterBitmapConfig.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactLetterBitmapConfig.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactLetterBitmapCreator.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactLetterBitmapCreator.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactLetterBitmapCreator.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactLetterBitmapCreator.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactLetterExtractor.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactLetterExtractor.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactLetterExtractor.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactLetterExtractor.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactPhotoLoader.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactPhotoLoader.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactPhotoLoader.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactPhotoLoader.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactPictureGlideModule.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactPictureGlideModule.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactPictureGlideModule.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactPictureGlideModule.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactPictureLoader.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactPictureLoader.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactPictureLoader.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactPictureLoader.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/contacts/KoinModule.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/contacts/KoinModule.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/contacts/KoinModule.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/contacts/KoinModule.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/fragment/AttachmentDownloadDialogFragment.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/fragment/AttachmentDownloadDialogFragment.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/fragment/AttachmentDownloadDialogFragment.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/fragment/AttachmentDownloadDialogFragment.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/fragment/ConfirmationDialogFragment.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/fragment/ConfirmationDialogFragment.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/fragment/ConfirmationDialogFragment.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/fragment/ConfirmationDialogFragment.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/fragment/ProgressDialogFragment.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/fragment/ProgressDialogFragment.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/fragment/ProgressDialogFragment.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/fragment/ProgressDialogFragment.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/ContactBadge.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/ContactBadge.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/ContactBadge.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/ContactBadge.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/FlowExtensions.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/FlowExtensions.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/FlowExtensions.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/FlowExtensions.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/K9ThemeProvider.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/K9ThemeProvider.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/K9ThemeProvider.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/K9ThemeProvider.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/KoinModule.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/KoinModule.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/KoinModule.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/KoinModule.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/ThemeExtensions.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/ThemeExtensions.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/ThemeExtensions.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/ThemeExtensions.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountFallbackImageProvider.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountFallbackImageProvider.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountFallbackImageProvider.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountFallbackImageProvider.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountImageLoader.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountImageLoader.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountImageLoader.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountImageLoader.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountImageModelLoader.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountImageModelLoader.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountImageModelLoader.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountImageModelLoader.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountsViewModel.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountsViewModel.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountsViewModel.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountsViewModel.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/DisplayAccount.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/account/DisplayAccount.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/account/DisplayAccount.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/account/DisplayAccount.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/KoinModule.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/account/KoinModule.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/account/KoinModule.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/account/KoinModule.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/ChangeLogManager.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/ChangeLogManager.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/ChangeLogManager.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/ChangeLogManager.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/ChangelogFragment.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/ChangelogFragment.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/ChangelogFragment.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/ChangelogFragment.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/ChangelogViewModel.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/ChangelogViewModel.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/ChangelogViewModel.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/ChangelogViewModel.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/KoinModule.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/KoinModule.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/KoinModule.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/KoinModule.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/RecentChangesActivity.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/RecentChangesActivity.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/RecentChangesActivity.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/RecentChangesActivity.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/RecentChangesViewModel.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/RecentChangesViewModel.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/RecentChangesViewModel.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/RecentChangesViewModel.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/choosefolder/ChooseFolderActivity.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/choosefolder/ChooseFolderActivity.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/choosefolder/ChooseFolderActivity.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/choosefolder/ChooseFolderActivity.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/choosefolder/ChooseFolderViewModel.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/choosefolder/ChooseFolderViewModel.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/choosefolder/ChooseFolderViewModel.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/choosefolder/ChooseFolderViewModel.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/choosefolder/FolderListItem.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/choosefolder/FolderListItem.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/choosefolder/FolderListItem.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/choosefolder/FolderListItem.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/choosefolder/KoinModule.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/choosefolder/KoinModule.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/choosefolder/KoinModule.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/choosefolder/KoinModule.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/compose/QuotedMessageMvpView.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/compose/QuotedMessageMvpView.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/compose/QuotedMessageMvpView.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/compose/QuotedMessageMvpView.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/compose/QuotedMessagePresenter.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/compose/QuotedMessagePresenter.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/compose/QuotedMessagePresenter.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/compose/QuotedMessagePresenter.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/compose/RecipientCircleImageView.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/compose/RecipientCircleImageView.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/compose/RecipientCircleImageView.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/compose/RecipientCircleImageView.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/compose/RecipientTokenConstraintLayout.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/compose/RecipientTokenConstraintLayout.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/compose/RecipientTokenConstraintLayout.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/compose/RecipientTokenConstraintLayout.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/compose/SimpleHighlightView.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/compose/SimpleHighlightView.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/compose/SimpleHighlightView.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/compose/SimpleHighlightView.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/compose/WrapUriTextWatcher.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/compose/WrapUriTextWatcher.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/compose/WrapUriTextWatcher.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/compose/WrapUriTextWatcher.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoCallback.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoCallback.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoCallback.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoCallback.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoHelper.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoHelper.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoHelper.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoHelper.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/crypto/OpenPgpApiFactory.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/crypto/OpenPgpApiFactory.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/crypto/OpenPgpApiFactory.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/crypto/OpenPgpApiFactory.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptKeyTransferActivity.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptKeyTransferActivity.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptKeyTransferActivity.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptKeyTransferActivity.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptKeyTransferPresenter.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptKeyTransferPresenter.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptKeyTransferPresenter.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptKeyTransferPresenter.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptKeyTransferViewModel.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptKeyTransferViewModel.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptKeyTransferViewModel.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptKeyTransferViewModel.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptSetupMessageLiveEvent.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptSetupMessageLiveEvent.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptSetupMessageLiveEvent.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptSetupMessageLiveEvent.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptSetupTransferLiveEvent.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptSetupTransferLiveEvent.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptSetupTransferLiveEvent.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptSetupTransferLiveEvent.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/KoinModule.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/KoinModule.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/KoinModule.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/KoinModule.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/fab/HideFabOnScrollBehavior.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/fab/HideFabOnScrollBehavior.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/fab/HideFabOnScrollBehavior.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/fab/HideFabOnScrollBehavior.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/folders/FolderIconProvider.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/folders/FolderIconProvider.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/folders/FolderIconProvider.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/folders/FolderIconProvider.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/folders/FolderNameFormatter.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/folders/FolderNameFormatter.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/folders/FolderNameFormatter.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/folders/FolderNameFormatter.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/folders/FoldersViewModel.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/folders/FoldersViewModel.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/folders/FoldersViewModel.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/folders/FoldersViewModel.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/folders/KoinModule.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/folders/KoinModule.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/folders/KoinModule.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/folders/KoinModule.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/helper/BottomBaselineTextView.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/helper/BottomBaselineTextView.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/helper/BottomBaselineTextView.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/helper/BottomBaselineTextView.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/helper/ContextExtensions.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/helper/ContextExtensions.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/helper/ContextExtensions.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/helper/ContextExtensions.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/helper/DisplayAddressHelper.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/helper/DisplayAddressHelper.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/helper/DisplayAddressHelper.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/helper/DisplayAddressHelper.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/helper/DisplayHtmlUiFactory.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/helper/DisplayHtmlUiFactory.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/helper/DisplayHtmlUiFactory.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/helper/DisplayHtmlUiFactory.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/helper/HtmlSettingsProvider.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/helper/HtmlSettingsProvider.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/helper/HtmlSettingsProvider.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/helper/HtmlSettingsProvider.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/helper/RelativeDateTimeFormatter.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/helper/RelativeDateTimeFormatter.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/helper/RelativeDateTimeFormatter.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/helper/RelativeDateTimeFormatter.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/helper/SizeFormatter.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/helper/SizeFormatter.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/helper/SizeFormatter.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/helper/SizeFormatter.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/identity/IdentityFormatter.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/identity/IdentityFormatter.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/identity/IdentityFormatter.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/identity/IdentityFormatter.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/identity/KoinModule.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/identity/KoinModule.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/identity/KoinModule.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/identity/KoinModule.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderListItem.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderListItem.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderListItem.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderListItem.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderSettingsDataStore.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderSettingsDataStore.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderSettingsDataStore.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderSettingsDataStore.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderSettingsFragment.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderSettingsFragment.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderSettingsFragment.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderSettingsFragment.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderSettingsViewModel.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderSettingsViewModel.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderSettingsViewModel.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderSettingsViewModel.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/KoinModule.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/KoinModule.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/KoinModule.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/KoinModule.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/ManageFoldersActivity.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/ManageFoldersActivity.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/ManageFoldersActivity.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/ManageFoldersActivity.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/ManageFoldersFragment.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/ManageFoldersFragment.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/ManageFoldersFragment.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/ManageFoldersFragment.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/ManageFoldersViewModel.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/ManageFoldersViewModel.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/ManageFoldersViewModel.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/ManageFoldersViewModel.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/message/LocalMessageExtractorLoader.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/message/LocalMessageExtractorLoader.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/message/LocalMessageExtractorLoader.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/message/LocalMessageExtractorLoader.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/message/LocalMessageLoader.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/message/LocalMessageLoader.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/message/LocalMessageLoader.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/message/LocalMessageLoader.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/AddToContactsLauncher.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/AddToContactsLauncher.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/AddToContactsLauncher.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/AddToContactsLauncher.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/ContactSettingsProvider.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/ContactSettingsProvider.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/ContactSettingsProvider.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/ContactSettingsProvider.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/CryptoStatusItem.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/CryptoStatusItem.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/CryptoStatusItem.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/CryptoStatusItem.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/EmptyItem.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/EmptyItem.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/EmptyItem.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/EmptyItem.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/FolderNameItem.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/FolderNameItem.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/FolderNameItem.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/FolderNameItem.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/KoinModule.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/KoinModule.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/KoinModule.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/KoinModule.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDateItem.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDateItem.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDateItem.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDateItem.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsAppearance.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsAppearance.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsAppearance.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsAppearance.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsDividerItem.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsDividerItem.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsDividerItem.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsDividerItem.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsFragment.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsFragment.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsFragment.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsFragment.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsParticipantFormatter.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsParticipantFormatter.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsParticipantFormatter.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsParticipantFormatter.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsUi.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsUi.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsUi.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsUi.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsViewModel.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsViewModel.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsViewModel.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsViewModel.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/ParticipantItem.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/ParticipantItem.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/ParticipantItem.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/ParticipantItem.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/SectionHeaderItem.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/SectionHeaderItem.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/SectionHeaderItem.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/SectionHeaderItem.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/ShowContactLauncher.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/ShowContactLauncher.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/ShowContactLauncher.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/ShowContactLauncher.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/DefaultFolderProvider.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/DefaultFolderProvider.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/DefaultFolderProvider.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/DefaultFolderProvider.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/KoinModule.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/KoinModule.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/KoinModule.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/KoinModule.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListAdapter.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListAdapter.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListAdapter.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListAdapter.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListAppearance.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListAppearance.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListAppearance.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListAppearance.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListConfig.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListConfig.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListConfig.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListConfig.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListFragment.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListFragment.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListFragment.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListFragment.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListHandler.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListHandler.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListHandler.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListHandler.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListItem.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListItem.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListItem.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListItem.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListItemAnimator.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListItemAnimator.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListItemAnimator.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListItemAnimator.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListItemMapper.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListItemMapper.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListItemMapper.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListItemMapper.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListLiveData.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListLiveData.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListLiveData.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListLiveData.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListLiveDataFactory.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListLiveDataFactory.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListLiveDataFactory.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListLiveDataFactory.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListLoader.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListLoader.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListLoader.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListLoader.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListSwipeCallback.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListSwipeCallback.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListSwipeCallback.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListSwipeCallback.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListViewHolder.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListViewHolder.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListViewHolder.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListViewHolder.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListViewModel.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListViewModel.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListViewModel.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListViewModel.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MlfUtils.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MlfUtils.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MlfUtils.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MlfUtils.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/SortTypeToastProvider.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/SortTypeToastProvider.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/SortTypeToastProvider.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/SortTypeToastProvider.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/SwipeResourceProvider.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/SwipeResourceProvider.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/SwipeResourceProvider.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/SwipeResourceProvider.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagesource/KoinModule.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagesource/KoinModule.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messagesource/KoinModule.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagesource/KoinModule.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagesource/MessageHeadersFragment.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagesource/MessageHeadersFragment.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messagesource/MessageHeadersFragment.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagesource/MessageHeadersFragment.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagesource/MessageHeadersViewModel.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagesource/MessageHeadersViewModel.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messagesource/MessageHeadersViewModel.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagesource/MessageHeadersViewModel.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagesource/MessageSourceActivity.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagesource/MessageSourceActivity.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messagesource/MessageSourceActivity.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagesource/MessageSourceActivity.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/AttachmentController.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/AttachmentController.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/AttachmentController.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/AttachmentController.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/AttachmentView.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/AttachmentView.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/AttachmentView.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/AttachmentView.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/AttachmentViewCallback.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/AttachmentViewCallback.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/AttachmentViewCallback.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/AttachmentViewCallback.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/DisplayRecipientsExtractor.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/DisplayRecipientsExtractor.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/DisplayRecipientsExtractor.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/DisplayRecipientsExtractor.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/KoinModule.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/KoinModule.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/KoinModule.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/KoinModule.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/LinkTextHandler.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/LinkTextHandler.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/LinkTextHandler.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/LinkTextHandler.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/LockedAttachmentView.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/LockedAttachmentView.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/LockedAttachmentView.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/LockedAttachmentView.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageContainerView.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageContainerView.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageContainerView.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageContainerView.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageCryptoPresenter.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageCryptoPresenter.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageCryptoPresenter.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageCryptoPresenter.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageHeaderClickListener.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageHeaderClickListener.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageHeaderClickListener.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageHeaderClickListener.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageTopView.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageTopView.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageTopView.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageTopView.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewContainerFragment.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewContainerFragment.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewContainerFragment.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewContainerFragment.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewRecipientFormatter.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewRecipientFormatter.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewRecipientFormatter.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewRecipientFormatter.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/PlaceholderFragment.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/PlaceholderFragment.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/PlaceholderFragment.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/PlaceholderFragment.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/RecipientLayoutCreator.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/RecipientLayoutCreator.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/RecipientLayoutCreator.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/RecipientLayoutCreator.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/RecipientNamesView.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/RecipientNamesView.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/RecipientNamesView.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/RecipientNamesView.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/TouchInterceptView.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/TouchInterceptView.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/TouchInterceptView.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/TouchInterceptView.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/notification/DeleteConfirmationActivity.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/notification/DeleteConfirmationActivity.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/notification/DeleteConfirmationActivity.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/notification/DeleteConfirmationActivity.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/push/PushInfoActivity.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/push/PushInfoActivity.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/push/PushInfoActivity.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/push/PushInfoActivity.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/push/PushInfoFragment.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/push/PushInfoFragment.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/push/PushInfoFragment.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/push/PushInfoFragment.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/AboutFragment.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/AboutFragment.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/AboutFragment.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/AboutFragment.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/AccountItem.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/AccountItem.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/AccountItem.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/AccountItem.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/KoinModule.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/KoinModule.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/KoinModule.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/KoinModule.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/PreferenceExtras.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/PreferenceExtras.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/PreferenceExtras.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/PreferenceExtras.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsActionItem.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsActionItem.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsActionItem.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsActionItem.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsActivity.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsActivity.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsActivity.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsActivity.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsDividerItem.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsDividerItem.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsDividerItem.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsDividerItem.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsListFragment.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsListFragment.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsListFragment.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsListFragment.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsViewModel.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsViewModel.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsViewModel.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsViewModel.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/UrlActionItem.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/UrlActionItem.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/UrlActionItem.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/UrlActionItem.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSelectionSpinner.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSelectionSpinner.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSelectionSpinner.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSelectionSpinner.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsActivity.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsActivity.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsActivity.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsActivity.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsDataStore.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsDataStore.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsDataStore.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsDataStore.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsDataStoreFactory.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsDataStoreFactory.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsDataStoreFactory.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsDataStoreFactory.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsFragment.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsFragment.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsFragment.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsFragment.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsViewModel.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsViewModel.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsViewModel.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsViewModel.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AutocryptPreferEncryptDialogFragment.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AutocryptPreferEncryptDialogFragment.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AutocryptPreferEncryptDialogFragment.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AutocryptPreferEncryptDialogFragment.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AutocryptPreferEncryptPreference.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AutocryptPreferEncryptPreference.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AutocryptPreferEncryptPreference.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AutocryptPreferEncryptPreference.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/FolderListPreference.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/FolderListPreference.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/FolderListPreference.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/FolderListPreference.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/NotificationSoundPreference.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/NotificationSoundPreference.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/NotificationSoundPreference.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/NotificationSoundPreference.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/NotificationsPreference.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/NotificationsPreference.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/NotificationsPreference.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/NotificationsPreference.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/OpenPgpAppSelectDialog.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/OpenPgpAppSelectDialog.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/OpenPgpAppSelectDialog.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/OpenPgpAppSelectDialog.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/VibrationDialogFragment.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/VibrationDialogFragment.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/VibrationDialogFragment.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/VibrationDialogFragment.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/VibrationPreference.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/VibrationPreference.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/VibrationPreference.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/VibrationPreference.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/Vibrator.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/Vibrator.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/Vibrator.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/Vibrator.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/CheckBoxItem.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/CheckBoxItem.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/CheckBoxItem.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/CheckBoxItem.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/SettingsExportFragment.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/SettingsExportFragment.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/SettingsExportFragment.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/SettingsExportFragment.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/SettingsExportListItems.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/SettingsExportListItems.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/SettingsExportListItems.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/SettingsExportListItems.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/SettingsExportUiModel.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/SettingsExportUiModel.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/SettingsExportUiModel.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/SettingsExportUiModel.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/SettingsExportViewModel.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/SettingsExportViewModel.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/SettingsExportViewModel.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/SettingsExportViewModel.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsActivity.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsActivity.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsActivity.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsActivity.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsDataStore.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsDataStore.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsDataStore.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsDataStore.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsFragment.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsFragment.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsFragment.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsFragment.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsViewModel.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsViewModel.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsViewModel.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsViewModel.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/LanguagePreference.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/LanguagePreference.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/LanguagePreference.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/LanguagePreference.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/share/ShareIntentBuilder.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/share/ShareIntentBuilder.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/ui/share/ShareIntentBuilder.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/ui/share/ShareIntentBuilder.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/view/DraggableFrameLayout.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/view/DraggableFrameLayout.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/view/DraggableFrameLayout.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/view/DraggableFrameLayout.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/view/HighlightDialogFragment.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/view/HighlightDialogFragment.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/view/HighlightDialogFragment.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/view/HighlightDialogFragment.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/view/K9WebViewClient.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/view/K9WebViewClient.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/view/K9WebViewClient.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/view/K9WebViewClient.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/view/KoinModule.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/view/KoinModule.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/view/KoinModule.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/view/KoinModule.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/view/LinearViewAnimator.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/view/LinearViewAnimator.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/view/LinearViewAnimator.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/view/LinearViewAnimator.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/view/MessageCryptoDisplayStatus.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/view/MessageCryptoDisplayStatus.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/view/MessageCryptoDisplayStatus.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/view/MessageCryptoDisplayStatus.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/view/MessageHeader.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/view/MessageHeader.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/view/MessageHeader.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/view/MessageHeader.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/view/MessageWebView.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/view/MessageWebView.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/view/MessageWebView.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/view/MessageWebView.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/view/NonLockingScrollView.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/view/NonLockingScrollView.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/view/NonLockingScrollView.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/view/NonLockingScrollView.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/view/RecipientSelectView.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/view/RecipientSelectView.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/view/RecipientSelectView.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/view/RecipientSelectView.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/view/StatusIndicator.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/view/StatusIndicator.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/view/StatusIndicator.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/view/StatusIndicator.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/view/ThemeUtils.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/view/ThemeUtils.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/view/ThemeUtils.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/view/ThemeUtils.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/view/ToolableViewAnimator.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/view/ToolableViewAnimator.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/view/ToolableViewAnimator.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/view/ToolableViewAnimator.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/view/UserInputEmailAddressParser.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/view/UserInputEmailAddressParser.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/view/UserInputEmailAddressParser.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/view/UserInputEmailAddressParser.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/view/ViewSwitcher.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/view/ViewSwitcher.java similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/view/ViewSwitcher.java rename to legacy/ui/legacy/src/main/java/com/fsck/k9/view/ViewSwitcher.java diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/view/WebViewClientFactory.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/view/WebViewClientFactory.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/view/WebViewClientFactory.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/view/WebViewClientFactory.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/view/WebViewConfig.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/view/WebViewConfig.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/view/WebViewConfig.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/view/WebViewConfig.kt diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/view/WebViewConfigProvider.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/view/WebViewConfigProvider.kt similarity index 100% rename from app/ui/legacy/src/main/java/com/fsck/k9/view/WebViewConfigProvider.kt rename to legacy/ui/legacy/src/main/java/com/fsck/k9/view/WebViewConfigProvider.kt diff --git a/app/ui/legacy/src/main/res/anim/fade_in.xml b/legacy/ui/legacy/src/main/res/anim/fade_in.xml similarity index 100% rename from app/ui/legacy/src/main/res/anim/fade_in.xml rename to legacy/ui/legacy/src/main/res/anim/fade_in.xml diff --git a/app/ui/legacy/src/main/res/anim/fade_out.xml b/legacy/ui/legacy/src/main/res/anim/fade_out.xml similarity index 100% rename from app/ui/legacy/src/main/res/anim/fade_out.xml rename to legacy/ui/legacy/src/main/res/anim/fade_out.xml diff --git a/app/ui/legacy/src/main/res/anim/slide_in_left.xml b/legacy/ui/legacy/src/main/res/anim/slide_in_left.xml similarity index 100% rename from app/ui/legacy/src/main/res/anim/slide_in_left.xml rename to legacy/ui/legacy/src/main/res/anim/slide_in_left.xml diff --git a/app/ui/legacy/src/main/res/anim/slide_in_right.xml b/legacy/ui/legacy/src/main/res/anim/slide_in_right.xml similarity index 100% rename from app/ui/legacy/src/main/res/anim/slide_in_right.xml rename to legacy/ui/legacy/src/main/res/anim/slide_in_right.xml diff --git a/app/ui/legacy/src/main/res/anim/slide_out_left.xml b/legacy/ui/legacy/src/main/res/anim/slide_out_left.xml similarity index 100% rename from app/ui/legacy/src/main/res/anim/slide_out_left.xml rename to legacy/ui/legacy/src/main/res/anim/slide_out_left.xml diff --git a/app/ui/legacy/src/main/res/anim/slide_out_right.xml b/legacy/ui/legacy/src/main/res/anim/slide_out_right.xml similarity index 100% rename from app/ui/legacy/src/main/res/anim/slide_out_right.xml rename to legacy/ui/legacy/src/main/res/anim/slide_out_right.xml diff --git a/app/ui/legacy/src/main/res/animator/draggable_state_list_anim.xml b/legacy/ui/legacy/src/main/res/animator/draggable_state_list_anim.xml similarity index 100% rename from app/ui/legacy/src/main/res/animator/draggable_state_list_anim.xml rename to legacy/ui/legacy/src/main/res/animator/draggable_state_list_anim.xml diff --git a/app/ui/legacy/src/main/res/drawable-hdpi/drawer_header_background.png b/legacy/ui/legacy/src/main/res/drawable-hdpi/drawer_header_background.png similarity index 100% rename from app/ui/legacy/src/main/res/drawable-hdpi/drawer_header_background.png rename to legacy/ui/legacy/src/main/res/drawable-hdpi/drawer_header_background.png diff --git a/app/ui/legacy/src/main/res/drawable-hdpi/ic_action_request_read_receipt_light.png b/legacy/ui/legacy/src/main/res/drawable-hdpi/ic_action_request_read_receipt_light.png similarity index 100% rename from app/ui/legacy/src/main/res/drawable-hdpi/ic_action_request_read_receipt_light.png rename to legacy/ui/legacy/src/main/res/drawable-hdpi/ic_action_request_read_receipt_light.png diff --git a/app/ui/legacy/src/main/res/drawable-hdpi/notification_icon_check_mail_anim_0.png b/legacy/ui/legacy/src/main/res/drawable-hdpi/notification_icon_check_mail_anim_0.png similarity index 100% rename from app/ui/legacy/src/main/res/drawable-hdpi/notification_icon_check_mail_anim_0.png rename to legacy/ui/legacy/src/main/res/drawable-hdpi/notification_icon_check_mail_anim_0.png diff --git a/app/ui/legacy/src/main/res/drawable-hdpi/notification_icon_check_mail_anim_1.png b/legacy/ui/legacy/src/main/res/drawable-hdpi/notification_icon_check_mail_anim_1.png similarity index 100% rename from app/ui/legacy/src/main/res/drawable-hdpi/notification_icon_check_mail_anim_1.png rename to legacy/ui/legacy/src/main/res/drawable-hdpi/notification_icon_check_mail_anim_1.png diff --git a/app/ui/legacy/src/main/res/drawable-hdpi/notification_icon_check_mail_anim_2.png b/legacy/ui/legacy/src/main/res/drawable-hdpi/notification_icon_check_mail_anim_2.png similarity index 100% rename from app/ui/legacy/src/main/res/drawable-hdpi/notification_icon_check_mail_anim_2.png rename to legacy/ui/legacy/src/main/res/drawable-hdpi/notification_icon_check_mail_anim_2.png diff --git a/app/ui/legacy/src/main/res/drawable-hdpi/notification_icon_check_mail_anim_3.png b/legacy/ui/legacy/src/main/res/drawable-hdpi/notification_icon_check_mail_anim_3.png similarity index 100% rename from app/ui/legacy/src/main/res/drawable-hdpi/notification_icon_check_mail_anim_3.png rename to legacy/ui/legacy/src/main/res/drawable-hdpi/notification_icon_check_mail_anim_3.png diff --git a/app/ui/legacy/src/main/res/drawable-hdpi/notification_icon_check_mail_anim_4.png b/legacy/ui/legacy/src/main/res/drawable-hdpi/notification_icon_check_mail_anim_4.png similarity index 100% rename from app/ui/legacy/src/main/res/drawable-hdpi/notification_icon_check_mail_anim_4.png rename to legacy/ui/legacy/src/main/res/drawable-hdpi/notification_icon_check_mail_anim_4.png diff --git a/app/ui/legacy/src/main/res/drawable-hdpi/notification_icon_check_mail_anim_5.png b/legacy/ui/legacy/src/main/res/drawable-hdpi/notification_icon_check_mail_anim_5.png similarity index 100% rename from app/ui/legacy/src/main/res/drawable-hdpi/notification_icon_check_mail_anim_5.png rename to legacy/ui/legacy/src/main/res/drawable-hdpi/notification_icon_check_mail_anim_5.png diff --git a/app/ui/legacy/src/main/res/drawable-mdpi/drawer_header_background.png b/legacy/ui/legacy/src/main/res/drawable-mdpi/drawer_header_background.png similarity index 100% rename from app/ui/legacy/src/main/res/drawable-mdpi/drawer_header_background.png rename to legacy/ui/legacy/src/main/res/drawable-mdpi/drawer_header_background.png diff --git a/app/ui/legacy/src/main/res/drawable-mdpi/ic_action_request_read_receipt_light.png b/legacy/ui/legacy/src/main/res/drawable-mdpi/ic_action_request_read_receipt_light.png similarity index 100% rename from app/ui/legacy/src/main/res/drawable-mdpi/ic_action_request_read_receipt_light.png rename to legacy/ui/legacy/src/main/res/drawable-mdpi/ic_action_request_read_receipt_light.png diff --git a/app/ui/legacy/src/main/res/drawable-mdpi/notification_icon_check_mail_anim_0.png b/legacy/ui/legacy/src/main/res/drawable-mdpi/notification_icon_check_mail_anim_0.png similarity index 100% rename from app/ui/legacy/src/main/res/drawable-mdpi/notification_icon_check_mail_anim_0.png rename to legacy/ui/legacy/src/main/res/drawable-mdpi/notification_icon_check_mail_anim_0.png diff --git a/app/ui/legacy/src/main/res/drawable-mdpi/notification_icon_check_mail_anim_1.png b/legacy/ui/legacy/src/main/res/drawable-mdpi/notification_icon_check_mail_anim_1.png similarity index 100% rename from app/ui/legacy/src/main/res/drawable-mdpi/notification_icon_check_mail_anim_1.png rename to legacy/ui/legacy/src/main/res/drawable-mdpi/notification_icon_check_mail_anim_1.png diff --git a/app/ui/legacy/src/main/res/drawable-mdpi/notification_icon_check_mail_anim_2.png b/legacy/ui/legacy/src/main/res/drawable-mdpi/notification_icon_check_mail_anim_2.png similarity index 100% rename from app/ui/legacy/src/main/res/drawable-mdpi/notification_icon_check_mail_anim_2.png rename to legacy/ui/legacy/src/main/res/drawable-mdpi/notification_icon_check_mail_anim_2.png diff --git a/app/ui/legacy/src/main/res/drawable-mdpi/notification_icon_check_mail_anim_3.png b/legacy/ui/legacy/src/main/res/drawable-mdpi/notification_icon_check_mail_anim_3.png similarity index 100% rename from app/ui/legacy/src/main/res/drawable-mdpi/notification_icon_check_mail_anim_3.png rename to legacy/ui/legacy/src/main/res/drawable-mdpi/notification_icon_check_mail_anim_3.png diff --git a/app/ui/legacy/src/main/res/drawable-mdpi/notification_icon_check_mail_anim_4.png b/legacy/ui/legacy/src/main/res/drawable-mdpi/notification_icon_check_mail_anim_4.png similarity index 100% rename from app/ui/legacy/src/main/res/drawable-mdpi/notification_icon_check_mail_anim_4.png rename to legacy/ui/legacy/src/main/res/drawable-mdpi/notification_icon_check_mail_anim_4.png diff --git a/app/ui/legacy/src/main/res/drawable-mdpi/notification_icon_check_mail_anim_5.png b/legacy/ui/legacy/src/main/res/drawable-mdpi/notification_icon_check_mail_anim_5.png similarity index 100% rename from app/ui/legacy/src/main/res/drawable-mdpi/notification_icon_check_mail_anim_5.png rename to legacy/ui/legacy/src/main/res/drawable-mdpi/notification_icon_check_mail_anim_5.png diff --git a/app/ui/legacy/src/main/res/drawable-xhdpi/drawer_header_background.png b/legacy/ui/legacy/src/main/res/drawable-xhdpi/drawer_header_background.png similarity index 100% rename from app/ui/legacy/src/main/res/drawable-xhdpi/drawer_header_background.png rename to legacy/ui/legacy/src/main/res/drawable-xhdpi/drawer_header_background.png diff --git a/app/ui/legacy/src/main/res/drawable-xhdpi/ic_action_request_read_receipt_light.png b/legacy/ui/legacy/src/main/res/drawable-xhdpi/ic_action_request_read_receipt_light.png similarity index 100% rename from app/ui/legacy/src/main/res/drawable-xhdpi/ic_action_request_read_receipt_light.png rename to legacy/ui/legacy/src/main/res/drawable-xhdpi/ic_action_request_read_receipt_light.png diff --git a/app/ui/legacy/src/main/res/drawable-xhdpi/notification_icon_check_mail_anim_0.png b/legacy/ui/legacy/src/main/res/drawable-xhdpi/notification_icon_check_mail_anim_0.png similarity index 100% rename from app/ui/legacy/src/main/res/drawable-xhdpi/notification_icon_check_mail_anim_0.png rename to legacy/ui/legacy/src/main/res/drawable-xhdpi/notification_icon_check_mail_anim_0.png diff --git a/app/ui/legacy/src/main/res/drawable-xhdpi/notification_icon_check_mail_anim_1.png b/legacy/ui/legacy/src/main/res/drawable-xhdpi/notification_icon_check_mail_anim_1.png similarity index 100% rename from app/ui/legacy/src/main/res/drawable-xhdpi/notification_icon_check_mail_anim_1.png rename to legacy/ui/legacy/src/main/res/drawable-xhdpi/notification_icon_check_mail_anim_1.png diff --git a/app/ui/legacy/src/main/res/drawable-xhdpi/notification_icon_check_mail_anim_2.png b/legacy/ui/legacy/src/main/res/drawable-xhdpi/notification_icon_check_mail_anim_2.png similarity index 100% rename from app/ui/legacy/src/main/res/drawable-xhdpi/notification_icon_check_mail_anim_2.png rename to legacy/ui/legacy/src/main/res/drawable-xhdpi/notification_icon_check_mail_anim_2.png diff --git a/app/ui/legacy/src/main/res/drawable-xhdpi/notification_icon_check_mail_anim_3.png b/legacy/ui/legacy/src/main/res/drawable-xhdpi/notification_icon_check_mail_anim_3.png similarity index 100% rename from app/ui/legacy/src/main/res/drawable-xhdpi/notification_icon_check_mail_anim_3.png rename to legacy/ui/legacy/src/main/res/drawable-xhdpi/notification_icon_check_mail_anim_3.png diff --git a/app/ui/legacy/src/main/res/drawable-xhdpi/notification_icon_check_mail_anim_4.png b/legacy/ui/legacy/src/main/res/drawable-xhdpi/notification_icon_check_mail_anim_4.png similarity index 100% rename from app/ui/legacy/src/main/res/drawable-xhdpi/notification_icon_check_mail_anim_4.png rename to legacy/ui/legacy/src/main/res/drawable-xhdpi/notification_icon_check_mail_anim_4.png diff --git a/app/ui/legacy/src/main/res/drawable-xhdpi/notification_icon_check_mail_anim_5.png b/legacy/ui/legacy/src/main/res/drawable-xhdpi/notification_icon_check_mail_anim_5.png similarity index 100% rename from app/ui/legacy/src/main/res/drawable-xhdpi/notification_icon_check_mail_anim_5.png rename to legacy/ui/legacy/src/main/res/drawable-xhdpi/notification_icon_check_mail_anim_5.png diff --git a/app/ui/legacy/src/main/res/drawable-xxhdpi/drawer_header_background.png b/legacy/ui/legacy/src/main/res/drawable-xxhdpi/drawer_header_background.png similarity index 100% rename from app/ui/legacy/src/main/res/drawable-xxhdpi/drawer_header_background.png rename to legacy/ui/legacy/src/main/res/drawable-xxhdpi/drawer_header_background.png diff --git a/app/ui/legacy/src/main/res/drawable/btn_select_star.xml b/legacy/ui/legacy/src/main/res/drawable/btn_select_star.xml similarity index 100% rename from app/ui/legacy/src/main/res/drawable/btn_select_star.xml rename to legacy/ui/legacy/src/main/res/drawable/btn_select_star.xml diff --git a/app/ui/legacy/src/main/res/drawable/ic_account_color.xml b/legacy/ui/legacy/src/main/res/drawable/ic_account_color.xml similarity index 100% rename from app/ui/legacy/src/main/res/drawable/ic_account_color.xml rename to legacy/ui/legacy/src/main/res/drawable/ic_account_color.xml diff --git a/app/ui/legacy/src/main/res/drawable/ic_status_corner.xml b/legacy/ui/legacy/src/main/res/drawable/ic_status_corner.xml similarity index 100% rename from app/ui/legacy/src/main/res/drawable/ic_status_corner.xml rename to legacy/ui/legacy/src/main/res/drawable/ic_status_corner.xml diff --git a/app/ui/legacy/src/main/res/drawable/message_list_item_selection_background.xml b/legacy/ui/legacy/src/main/res/drawable/message_list_item_selection_background.xml similarity index 100% rename from app/ui/legacy/src/main/res/drawable/message_list_item_selection_background.xml rename to legacy/ui/legacy/src/main/res/drawable/message_list_item_selection_background.xml diff --git a/app/ui/legacy/src/main/res/drawable/notification_icon_check_mail.xml b/legacy/ui/legacy/src/main/res/drawable/notification_icon_check_mail.xml similarity index 100% rename from app/ui/legacy/src/main/res/drawable/notification_icon_check_mail.xml rename to legacy/ui/legacy/src/main/res/drawable/notification_icon_check_mail.xml diff --git a/app/ui/legacy/src/main/res/drawable/rounded_corners.xml b/legacy/ui/legacy/src/main/res/drawable/rounded_corners.xml similarity index 100% rename from app/ui/legacy/src/main/res/drawable/rounded_corners.xml rename to legacy/ui/legacy/src/main/res/drawable/rounded_corners.xml diff --git a/app/ui/legacy/src/main/res/drawable/status_dots.xml b/legacy/ui/legacy/src/main/res/drawable/status_dots.xml similarity index 100% rename from app/ui/legacy/src/main/res/drawable/status_dots.xml rename to legacy/ui/legacy/src/main/res/drawable/status_dots.xml diff --git a/app/ui/legacy/src/main/res/drawable/status_dots_1.xml b/legacy/ui/legacy/src/main/res/drawable/status_dots_1.xml similarity index 100% rename from app/ui/legacy/src/main/res/drawable/status_dots_1.xml rename to legacy/ui/legacy/src/main/res/drawable/status_dots_1.xml diff --git a/app/ui/legacy/src/main/res/drawable/status_dots_2.xml b/legacy/ui/legacy/src/main/res/drawable/status_dots_2.xml similarity index 100% rename from app/ui/legacy/src/main/res/drawable/status_dots_2.xml rename to legacy/ui/legacy/src/main/res/drawable/status_dots_2.xml diff --git a/app/ui/legacy/src/main/res/drawable/status_dots_3.xml b/legacy/ui/legacy/src/main/res/drawable/status_dots_3.xml similarity index 100% rename from app/ui/legacy/src/main/res/drawable/status_dots_3.xml rename to legacy/ui/legacy/src/main/res/drawable/status_dots_3.xml diff --git a/app/ui/legacy/src/main/res/drawable/status_lock_disabled_dots_1.xml b/legacy/ui/legacy/src/main/res/drawable/status_lock_disabled_dots_1.xml similarity index 100% rename from app/ui/legacy/src/main/res/drawable/status_lock_disabled_dots_1.xml rename to legacy/ui/legacy/src/main/res/drawable/status_lock_disabled_dots_1.xml diff --git a/app/ui/legacy/src/main/res/drawable/status_lock_dots_2.xml b/legacy/ui/legacy/src/main/res/drawable/status_lock_dots_2.xml similarity index 100% rename from app/ui/legacy/src/main/res/drawable/status_lock_dots_2.xml rename to legacy/ui/legacy/src/main/res/drawable/status_lock_dots_2.xml diff --git a/app/ui/legacy/src/main/res/drawable/status_lock_dots_3.xml b/legacy/ui/legacy/src/main/res/drawable/status_lock_dots_3.xml similarity index 100% rename from app/ui/legacy/src/main/res/drawable/status_lock_dots_3.xml rename to legacy/ui/legacy/src/main/res/drawable/status_lock_dots_3.xml diff --git a/app/ui/legacy/src/main/res/drawable/status_lock_error.xml b/legacy/ui/legacy/src/main/res/drawable/status_lock_error.xml similarity index 100% rename from app/ui/legacy/src/main/res/drawable/status_lock_error.xml rename to legacy/ui/legacy/src/main/res/drawable/status_lock_error.xml diff --git a/app/ui/legacy/src/main/res/drawable/status_signature_dots_3.xml b/legacy/ui/legacy/src/main/res/drawable/status_signature_dots_3.xml similarity index 100% rename from app/ui/legacy/src/main/res/drawable/status_signature_dots_3.xml rename to legacy/ui/legacy/src/main/res/drawable/status_signature_dots_3.xml diff --git a/app/ui/legacy/src/main/res/drawable/thread_count_box_light.xml b/legacy/ui/legacy/src/main/res/drawable/thread_count_box_light.xml similarity index 100% rename from app/ui/legacy/src/main/res/drawable/thread_count_box_light.xml rename to legacy/ui/legacy/src/main/res/drawable/thread_count_box_light.xml diff --git a/app/ui/legacy/src/main/res/layout/about_library.xml b/legacy/ui/legacy/src/main/res/layout/about_library.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/about_library.xml rename to legacy/ui/legacy/src/main/res/layout/about_library.xml diff --git a/app/ui/legacy/src/main/res/layout/account_list.xml b/legacy/ui/legacy/src/main/res/layout/account_list.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/account_list.xml rename to legacy/ui/legacy/src/main/res/layout/account_list.xml diff --git a/app/ui/legacy/src/main/res/layout/account_list_item.xml b/legacy/ui/legacy/src/main/res/layout/account_list_item.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/account_list_item.xml rename to legacy/ui/legacy/src/main/res/layout/account_list_item.xml diff --git a/app/ui/legacy/src/main/res/layout/account_setup_composition.xml b/legacy/ui/legacy/src/main/res/layout/account_setup_composition.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/account_setup_composition.xml rename to legacy/ui/legacy/src/main/res/layout/account_setup_composition.xml diff --git a/app/ui/legacy/src/main/res/layout/account_spinner_dropdown_item.xml b/legacy/ui/legacy/src/main/res/layout/account_spinner_dropdown_item.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/account_spinner_dropdown_item.xml rename to legacy/ui/legacy/src/main/res/layout/account_spinner_dropdown_item.xml diff --git a/app/ui/legacy/src/main/res/layout/account_spinner_item.xml b/legacy/ui/legacy/src/main/res/layout/account_spinner_item.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/account_spinner_item.xml rename to legacy/ui/legacy/src/main/res/layout/account_spinner_item.xml diff --git a/app/ui/legacy/src/main/res/layout/accounts_item.xml b/legacy/ui/legacy/src/main/res/layout/accounts_item.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/accounts_item.xml rename to legacy/ui/legacy/src/main/res/layout/accounts_item.xml diff --git a/app/ui/legacy/src/main/res/layout/activity_account_settings.xml b/legacy/ui/legacy/src/main/res/layout/activity_account_settings.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/activity_account_settings.xml rename to legacy/ui/legacy/src/main/res/layout/activity_account_settings.xml diff --git a/app/ui/legacy/src/main/res/layout/activity_manage_folders.xml b/legacy/ui/legacy/src/main/res/layout/activity_manage_folders.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/activity_manage_folders.xml rename to legacy/ui/legacy/src/main/res/layout/activity_manage_folders.xml diff --git a/app/ui/legacy/src/main/res/layout/activity_push_info.xml b/legacy/ui/legacy/src/main/res/layout/activity_push_info.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/activity_push_info.xml rename to legacy/ui/legacy/src/main/res/layout/activity_push_info.xml diff --git a/app/ui/legacy/src/main/res/layout/activity_recent_changes.xml b/legacy/ui/legacy/src/main/res/layout/activity_recent_changes.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/activity_recent_changes.xml rename to legacy/ui/legacy/src/main/res/layout/activity_recent_changes.xml diff --git a/app/ui/legacy/src/main/res/layout/activity_settings.xml b/legacy/ui/legacy/src/main/res/layout/activity_settings.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/activity_settings.xml rename to legacy/ui/legacy/src/main/res/layout/activity_settings.xml diff --git a/app/ui/legacy/src/main/res/layout/changelog_list_change_item.xml b/legacy/ui/legacy/src/main/res/layout/changelog_list_change_item.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/changelog_list_change_item.xml rename to legacy/ui/legacy/src/main/res/layout/changelog_list_change_item.xml diff --git a/app/ui/legacy/src/main/res/layout/changelog_list_release_item.xml b/legacy/ui/legacy/src/main/res/layout/changelog_list_release_item.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/changelog_list_release_item.xml rename to legacy/ui/legacy/src/main/res/layout/changelog_list_release_item.xml diff --git a/app/ui/legacy/src/main/res/layout/choose_account_item.xml b/legacy/ui/legacy/src/main/res/layout/choose_account_item.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/choose_account_item.xml rename to legacy/ui/legacy/src/main/res/layout/choose_account_item.xml diff --git a/app/ui/legacy/src/main/res/layout/choose_identity_item.xml b/legacy/ui/legacy/src/main/res/layout/choose_identity_item.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/choose_identity_item.xml rename to legacy/ui/legacy/src/main/res/layout/choose_identity_item.xml diff --git a/app/ui/legacy/src/main/res/layout/crypto_key_transfer.xml b/legacy/ui/legacy/src/main/res/layout/crypto_key_transfer.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/crypto_key_transfer.xml rename to legacy/ui/legacy/src/main/res/layout/crypto_key_transfer.xml diff --git a/app/ui/legacy/src/main/res/layout/dialog_autocrypt_prefer_encrypt.xml b/legacy/ui/legacy/src/main/res/layout/dialog_autocrypt_prefer_encrypt.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/dialog_autocrypt_prefer_encrypt.xml rename to legacy/ui/legacy/src/main/res/layout/dialog_autocrypt_prefer_encrypt.xml diff --git a/app/ui/legacy/src/main/res/layout/dialog_openkeychain_info.xml b/legacy/ui/legacy/src/main/res/layout/dialog_openkeychain_info.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/dialog_openkeychain_info.xml rename to legacy/ui/legacy/src/main/res/layout/dialog_openkeychain_info.xml diff --git a/app/ui/legacy/src/main/res/layout/drawer_contents.xml b/legacy/ui/legacy/src/main/res/layout/drawer_contents.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/drawer_contents.xml rename to legacy/ui/legacy/src/main/res/layout/drawer_contents.xml diff --git a/app/ui/legacy/src/main/res/layout/drawer_folder_list_item.xml b/legacy/ui/legacy/src/main/res/layout/drawer_folder_list_item.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/drawer_folder_list_item.xml rename to legacy/ui/legacy/src/main/res/layout/drawer_folder_list_item.xml diff --git a/app/ui/legacy/src/main/res/layout/edit_identity.xml b/legacy/ui/legacy/src/main/res/layout/edit_identity.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/edit_identity.xml rename to legacy/ui/legacy/src/main/res/layout/edit_identity.xml diff --git a/app/ui/legacy/src/main/res/layout/empty_message_view.xml b/legacy/ui/legacy/src/main/res/layout/empty_message_view.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/empty_message_view.xml rename to legacy/ui/legacy/src/main/res/layout/empty_message_view.xml diff --git a/app/ui/legacy/src/main/res/layout/folder_list.xml b/legacy/ui/legacy/src/main/res/layout/folder_list.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/folder_list.xml rename to legacy/ui/legacy/src/main/res/layout/folder_list.xml diff --git a/app/ui/legacy/src/main/res/layout/folder_list_item.xml b/legacy/ui/legacy/src/main/res/layout/folder_list_item.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/folder_list_item.xml rename to legacy/ui/legacy/src/main/res/layout/folder_list_item.xml diff --git a/app/ui/legacy/src/main/res/layout/fragment_about.xml b/legacy/ui/legacy/src/main/res/layout/fragment_about.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/fragment_about.xml rename to legacy/ui/legacy/src/main/res/layout/fragment_about.xml diff --git a/app/ui/legacy/src/main/res/layout/fragment_changelog.xml b/legacy/ui/legacy/src/main/res/layout/fragment_changelog.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/fragment_changelog.xml rename to legacy/ui/legacy/src/main/res/layout/fragment_changelog.xml diff --git a/app/ui/legacy/src/main/res/layout/fragment_manage_folders.xml b/legacy/ui/legacy/src/main/res/layout/fragment_manage_folders.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/fragment_manage_folders.xml rename to legacy/ui/legacy/src/main/res/layout/fragment_manage_folders.xml diff --git a/app/ui/legacy/src/main/res/layout/fragment_push_info.xml b/legacy/ui/legacy/src/main/res/layout/fragment_push_info.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/fragment_push_info.xml rename to legacy/ui/legacy/src/main/res/layout/fragment_push_info.xml diff --git a/app/ui/legacy/src/main/res/layout/fragment_settings_export.xml b/legacy/ui/legacy/src/main/res/layout/fragment_settings_export.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/fragment_settings_export.xml rename to legacy/ui/legacy/src/main/res/layout/fragment_settings_export.xml diff --git a/app/ui/legacy/src/main/res/layout/fragment_settings_list.xml b/legacy/ui/legacy/src/main/res/layout/fragment_settings_list.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/fragment_settings_list.xml rename to legacy/ui/legacy/src/main/res/layout/fragment_settings_list.xml diff --git a/app/ui/legacy/src/main/res/layout/general_settings.xml b/legacy/ui/legacy/src/main/res/layout/general_settings.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/general_settings.xml rename to legacy/ui/legacy/src/main/res/layout/general_settings.xml diff --git a/app/ui/legacy/src/main/res/layout/list_content_simple.xml b/legacy/ui/legacy/src/main/res/layout/list_content_simple.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/list_content_simple.xml rename to legacy/ui/legacy/src/main/res/layout/list_content_simple.xml diff --git a/app/ui/legacy/src/main/res/layout/message.xml b/legacy/ui/legacy/src/main/res/layout/message.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/message.xml rename to legacy/ui/legacy/src/main/res/layout/message.xml diff --git a/app/ui/legacy/src/main/res/layout/message_bottom_sheet.xml b/legacy/ui/legacy/src/main/res/layout/message_bottom_sheet.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/message_bottom_sheet.xml rename to legacy/ui/legacy/src/main/res/layout/message_bottom_sheet.xml diff --git a/app/ui/legacy/src/main/res/layout/message_compose.xml b/legacy/ui/legacy/src/main/res/layout/message_compose.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/message_compose.xml rename to legacy/ui/legacy/src/main/res/layout/message_compose.xml diff --git a/app/ui/legacy/src/main/res/layout/message_compose_attachment.xml b/legacy/ui/legacy/src/main/res/layout/message_compose_attachment.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/message_compose_attachment.xml rename to legacy/ui/legacy/src/main/res/layout/message_compose_attachment.xml diff --git a/app/ui/legacy/src/main/res/layout/message_compose_content.xml b/legacy/ui/legacy/src/main/res/layout/message_compose_content.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/message_compose_content.xml rename to legacy/ui/legacy/src/main/res/layout/message_compose_content.xml diff --git a/app/ui/legacy/src/main/res/layout/message_compose_recipients.xml b/legacy/ui/legacy/src/main/res/layout/message_compose_recipients.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/message_compose_recipients.xml rename to legacy/ui/legacy/src/main/res/layout/message_compose_recipients.xml diff --git a/app/ui/legacy/src/main/res/layout/message_container.xml b/legacy/ui/legacy/src/main/res/layout/message_container.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/message_container.xml rename to legacy/ui/legacy/src/main/res/layout/message_container.xml diff --git a/app/ui/legacy/src/main/res/layout/message_content_crypto_cancelled.xml b/legacy/ui/legacy/src/main/res/layout/message_content_crypto_cancelled.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/message_content_crypto_cancelled.xml rename to legacy/ui/legacy/src/main/res/layout/message_content_crypto_cancelled.xml diff --git a/app/ui/legacy/src/main/res/layout/message_content_crypto_error.xml b/legacy/ui/legacy/src/main/res/layout/message_content_crypto_error.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/message_content_crypto_error.xml rename to legacy/ui/legacy/src/main/res/layout/message_content_crypto_error.xml diff --git a/app/ui/legacy/src/main/res/layout/message_content_crypto_incomplete.xml b/legacy/ui/legacy/src/main/res/layout/message_content_crypto_incomplete.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/message_content_crypto_incomplete.xml rename to legacy/ui/legacy/src/main/res/layout/message_content_crypto_incomplete.xml diff --git a/app/ui/legacy/src/main/res/layout/message_content_crypto_no_provider.xml b/legacy/ui/legacy/src/main/res/layout/message_content_crypto_no_provider.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/message_content_crypto_no_provider.xml rename to legacy/ui/legacy/src/main/res/layout/message_content_crypto_no_provider.xml diff --git a/app/ui/legacy/src/main/res/layout/message_details_crypto_status_item.xml b/legacy/ui/legacy/src/main/res/layout/message_details_crypto_status_item.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/message_details_crypto_status_item.xml rename to legacy/ui/legacy/src/main/res/layout/message_details_crypto_status_item.xml diff --git a/app/ui/legacy/src/main/res/layout/message_details_date_item.xml b/legacy/ui/legacy/src/main/res/layout/message_details_date_item.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/message_details_date_item.xml rename to legacy/ui/legacy/src/main/res/layout/message_details_date_item.xml diff --git a/app/ui/legacy/src/main/res/layout/message_details_divider_item.xml b/legacy/ui/legacy/src/main/res/layout/message_details_divider_item.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/message_details_divider_item.xml rename to legacy/ui/legacy/src/main/res/layout/message_details_divider_item.xml diff --git a/app/ui/legacy/src/main/res/layout/message_details_folder_name_item.xml b/legacy/ui/legacy/src/main/res/layout/message_details_folder_name_item.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/message_details_folder_name_item.xml rename to legacy/ui/legacy/src/main/res/layout/message_details_folder_name_item.xml diff --git a/app/ui/legacy/src/main/res/layout/message_details_participant_item.xml b/legacy/ui/legacy/src/main/res/layout/message_details_participant_item.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/message_details_participant_item.xml rename to legacy/ui/legacy/src/main/res/layout/message_details_participant_item.xml diff --git a/app/ui/legacy/src/main/res/layout/message_details_section_header_item.xml b/legacy/ui/legacy/src/main/res/layout/message_details_section_header_item.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/message_details_section_header_item.xml rename to legacy/ui/legacy/src/main/res/layout/message_details_section_header_item.xml diff --git a/app/ui/legacy/src/main/res/layout/message_list.xml b/legacy/ui/legacy/src/main/res/layout/message_list.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/message_list.xml rename to legacy/ui/legacy/src/main/res/layout/message_list.xml diff --git a/app/ui/legacy/src/main/res/layout/message_list_error.xml b/legacy/ui/legacy/src/main/res/layout/message_list_error.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/message_list_error.xml rename to legacy/ui/legacy/src/main/res/layout/message_list_error.xml diff --git a/app/ui/legacy/src/main/res/layout/message_list_fragment.xml b/legacy/ui/legacy/src/main/res/layout/message_list_fragment.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/message_list_fragment.xml rename to legacy/ui/legacy/src/main/res/layout/message_list_fragment.xml diff --git a/app/ui/legacy/src/main/res/layout/message_list_item.xml b/legacy/ui/legacy/src/main/res/layout/message_list_item.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/message_list_item.xml rename to legacy/ui/legacy/src/main/res/layout/message_list_item.xml diff --git a/app/ui/legacy/src/main/res/layout/message_list_item_footer.xml b/legacy/ui/legacy/src/main/res/layout/message_list_item_footer.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/message_list_item_footer.xml rename to legacy/ui/legacy/src/main/res/layout/message_list_item_footer.xml diff --git a/app/ui/legacy/src/main/res/layout/message_list_toolbar.xml b/legacy/ui/legacy/src/main/res/layout/message_list_toolbar.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/message_list_toolbar.xml rename to legacy/ui/legacy/src/main/res/layout/message_list_toolbar.xml diff --git a/app/ui/legacy/src/main/res/layout/message_view_attachment.xml b/legacy/ui/legacy/src/main/res/layout/message_view_attachment.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/message_view_attachment.xml rename to legacy/ui/legacy/src/main/res/layout/message_view_attachment.xml diff --git a/app/ui/legacy/src/main/res/layout/message_view_attachment_locked.xml b/legacy/ui/legacy/src/main/res/layout/message_view_attachment_locked.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/message_view_attachment_locked.xml rename to legacy/ui/legacy/src/main/res/layout/message_view_attachment_locked.xml diff --git a/app/ui/legacy/src/main/res/layout/message_view_container.xml b/legacy/ui/legacy/src/main/res/layout/message_view_container.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/message_view_container.xml rename to legacy/ui/legacy/src/main/res/layout/message_view_container.xml diff --git a/app/ui/legacy/src/main/res/layout/message_view_header.xml b/legacy/ui/legacy/src/main/res/layout/message_view_header.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/message_view_header.xml rename to legacy/ui/legacy/src/main/res/layout/message_view_header.xml diff --git a/app/ui/legacy/src/main/res/layout/message_view_headers.xml b/legacy/ui/legacy/src/main/res/layout/message_view_headers.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/message_view_headers.xml rename to legacy/ui/legacy/src/main/res/layout/message_view_headers.xml diff --git a/app/ui/legacy/src/main/res/layout/message_view_headers_activity.xml b/legacy/ui/legacy/src/main/res/layout/message_view_headers_activity.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/message_view_headers_activity.xml rename to legacy/ui/legacy/src/main/res/layout/message_view_headers_activity.xml diff --git a/app/ui/legacy/src/main/res/layout/openpgp_enabled_error_dialog.xml b/legacy/ui/legacy/src/main/res/layout/openpgp_enabled_error_dialog.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/openpgp_enabled_error_dialog.xml rename to legacy/ui/legacy/src/main/res/layout/openpgp_enabled_error_dialog.xml diff --git a/app/ui/legacy/src/main/res/layout/openpgp_encrypt_description_dialog.xml b/legacy/ui/legacy/src/main/res/layout/openpgp_encrypt_description_dialog.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/openpgp_encrypt_description_dialog.xml rename to legacy/ui/legacy/src/main/res/layout/openpgp_encrypt_description_dialog.xml diff --git a/app/ui/legacy/src/main/res/layout/openpgp_inline_dialog.xml b/legacy/ui/legacy/src/main/res/layout/openpgp_inline_dialog.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/openpgp_inline_dialog.xml rename to legacy/ui/legacy/src/main/res/layout/openpgp_inline_dialog.xml diff --git a/app/ui/legacy/src/main/res/layout/openpgp_sign_only_dialog.xml b/legacy/ui/legacy/src/main/res/layout/openpgp_sign_only_dialog.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/openpgp_sign_only_dialog.xml rename to legacy/ui/legacy/src/main/res/layout/openpgp_sign_only_dialog.xml diff --git a/app/ui/legacy/src/main/res/layout/preference_vibration_pattern_item.xml b/legacy/ui/legacy/src/main/res/layout/preference_vibration_pattern_item.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/preference_vibration_pattern_item.xml rename to legacy/ui/legacy/src/main/res/layout/preference_vibration_pattern_item.xml diff --git a/app/ui/legacy/src/main/res/layout/preference_vibration_switch_item.xml b/legacy/ui/legacy/src/main/res/layout/preference_vibration_switch_item.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/preference_vibration_switch_item.xml rename to legacy/ui/legacy/src/main/res/layout/preference_vibration_switch_item.xml diff --git a/app/ui/legacy/src/main/res/layout/preference_vibration_times_item.xml b/legacy/ui/legacy/src/main/res/layout/preference_vibration_times_item.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/preference_vibration_times_item.xml rename to legacy/ui/legacy/src/main/res/layout/preference_vibration_times_item.xml diff --git a/app/ui/legacy/src/main/res/layout/recipient_alternate_item.xml b/legacy/ui/legacy/src/main/res/layout/recipient_alternate_item.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/recipient_alternate_item.xml rename to legacy/ui/legacy/src/main/res/layout/recipient_alternate_item.xml diff --git a/app/ui/legacy/src/main/res/layout/recipient_dropdown_item.xml b/legacy/ui/legacy/src/main/res/layout/recipient_dropdown_item.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/recipient_dropdown_item.xml rename to legacy/ui/legacy/src/main/res/layout/recipient_dropdown_item.xml diff --git a/app/ui/legacy/src/main/res/layout/recipient_names.xml b/legacy/ui/legacy/src/main/res/layout/recipient_names.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/recipient_names.xml rename to legacy/ui/legacy/src/main/res/layout/recipient_names.xml diff --git a/app/ui/legacy/src/main/res/layout/recipient_token_item.xml b/legacy/ui/legacy/src/main/res/layout/recipient_token_item.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/recipient_token_item.xml rename to legacy/ui/legacy/src/main/res/layout/recipient_token_item.xml diff --git a/app/ui/legacy/src/main/res/layout/select_openpgp_app_item.xml b/legacy/ui/legacy/src/main/res/layout/select_openpgp_app_item.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/select_openpgp_app_item.xml rename to legacy/ui/legacy/src/main/res/layout/select_openpgp_app_item.xml diff --git a/app/ui/legacy/src/main/res/layout/settings_export_account_list_item.xml b/legacy/ui/legacy/src/main/res/layout/settings_export_account_list_item.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/settings_export_account_list_item.xml rename to legacy/ui/legacy/src/main/res/layout/settings_export_account_list_item.xml diff --git a/app/ui/legacy/src/main/res/layout/settings_export_general_list_item.xml b/legacy/ui/legacy/src/main/res/layout/settings_export_general_list_item.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/settings_export_general_list_item.xml rename to legacy/ui/legacy/src/main/res/layout/settings_export_general_list_item.xml diff --git a/app/ui/legacy/src/main/res/layout/split_message_list.xml b/legacy/ui/legacy/src/main/res/layout/split_message_list.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/split_message_list.xml rename to legacy/ui/legacy/src/main/res/layout/split_message_list.xml diff --git a/app/ui/legacy/src/main/res/layout/status_indicator.xml b/legacy/ui/legacy/src/main/res/layout/status_indicator.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/status_indicator.xml rename to legacy/ui/legacy/src/main/res/layout/status_indicator.xml diff --git a/app/ui/legacy/src/main/res/layout/swipe_left_action.xml b/legacy/ui/legacy/src/main/res/layout/swipe_left_action.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/swipe_left_action.xml rename to legacy/ui/legacy/src/main/res/layout/swipe_left_action.xml diff --git a/app/ui/legacy/src/main/res/layout/swipe_right_action.xml b/legacy/ui/legacy/src/main/res/layout/swipe_right_action.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/swipe_right_action.xml rename to legacy/ui/legacy/src/main/res/layout/swipe_right_action.xml diff --git a/app/ui/legacy/src/main/res/layout/text_divider_list_item.xml b/legacy/ui/legacy/src/main/res/layout/text_divider_list_item.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/text_divider_list_item.xml rename to legacy/ui/legacy/src/main/res/layout/text_divider_list_item.xml diff --git a/app/ui/legacy/src/main/res/layout/text_icon_list_item.xml b/legacy/ui/legacy/src/main/res/layout/text_icon_list_item.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/text_icon_list_item.xml rename to legacy/ui/legacy/src/main/res/layout/text_icon_list_item.xml diff --git a/app/ui/legacy/src/main/res/layout/upgrade_databases.xml b/legacy/ui/legacy/src/main/res/layout/upgrade_databases.xml similarity index 100% rename from app/ui/legacy/src/main/res/layout/upgrade_databases.xml rename to legacy/ui/legacy/src/main/res/layout/upgrade_databases.xml diff --git a/app/ui/legacy/src/main/res/menu/account_settings_option.xml b/legacy/ui/legacy/src/main/res/menu/account_settings_option.xml similarity index 100% rename from app/ui/legacy/src/main/res/menu/account_settings_option.xml rename to legacy/ui/legacy/src/main/res/menu/account_settings_option.xml diff --git a/app/ui/legacy/src/main/res/menu/choose_folder_option.xml b/legacy/ui/legacy/src/main/res/menu/choose_folder_option.xml similarity index 100% rename from app/ui/legacy/src/main/res/menu/choose_folder_option.xml rename to legacy/ui/legacy/src/main/res/menu/choose_folder_option.xml diff --git a/app/ui/legacy/src/main/res/menu/debug_settings_option.xml b/legacy/ui/legacy/src/main/res/menu/debug_settings_option.xml similarity index 100% rename from app/ui/legacy/src/main/res/menu/debug_settings_option.xml rename to legacy/ui/legacy/src/main/res/menu/debug_settings_option.xml diff --git a/app/ui/legacy/src/main/res/menu/edit_identity_menu.xml b/legacy/ui/legacy/src/main/res/menu/edit_identity_menu.xml similarity index 100% rename from app/ui/legacy/src/main/res/menu/edit_identity_menu.xml rename to legacy/ui/legacy/src/main/res/menu/edit_identity_menu.xml diff --git a/app/ui/legacy/src/main/res/menu/folder_list_option.xml b/legacy/ui/legacy/src/main/res/menu/folder_list_option.xml similarity index 100% rename from app/ui/legacy/src/main/res/menu/folder_list_option.xml rename to legacy/ui/legacy/src/main/res/menu/folder_list_option.xml diff --git a/app/ui/legacy/src/main/res/menu/folder_settings_option.xml b/legacy/ui/legacy/src/main/res/menu/folder_settings_option.xml similarity index 100% rename from app/ui/legacy/src/main/res/menu/folder_settings_option.xml rename to legacy/ui/legacy/src/main/res/menu/folder_settings_option.xml diff --git a/app/ui/legacy/src/main/res/menu/general_settings_option.xml b/legacy/ui/legacy/src/main/res/menu/general_settings_option.xml similarity index 100% rename from app/ui/legacy/src/main/res/menu/general_settings_option.xml rename to legacy/ui/legacy/src/main/res/menu/general_settings_option.xml diff --git a/app/ui/legacy/src/main/res/menu/manage_identities_context.xml b/legacy/ui/legacy/src/main/res/menu/manage_identities_context.xml similarity index 100% rename from app/ui/legacy/src/main/res/menu/manage_identities_context.xml rename to legacy/ui/legacy/src/main/res/menu/manage_identities_context.xml diff --git a/app/ui/legacy/src/main/res/menu/manage_identities_option.xml b/legacy/ui/legacy/src/main/res/menu/manage_identities_option.xml similarity index 100% rename from app/ui/legacy/src/main/res/menu/manage_identities_option.xml rename to legacy/ui/legacy/src/main/res/menu/manage_identities_option.xml diff --git a/app/ui/legacy/src/main/res/menu/message_compose_option.xml b/legacy/ui/legacy/src/main/res/menu/message_compose_option.xml similarity index 100% rename from app/ui/legacy/src/main/res/menu/message_compose_option.xml rename to legacy/ui/legacy/src/main/res/menu/message_compose_option.xml diff --git a/app/ui/legacy/src/main/res/menu/message_list_context_menu.xml b/legacy/ui/legacy/src/main/res/menu/message_list_context_menu.xml similarity index 100% rename from app/ui/legacy/src/main/res/menu/message_list_context_menu.xml rename to legacy/ui/legacy/src/main/res/menu/message_list_context_menu.xml diff --git a/app/ui/legacy/src/main/res/menu/message_list_option_menu.xml b/legacy/ui/legacy/src/main/res/menu/message_list_option_menu.xml similarity index 100% rename from app/ui/legacy/src/main/res/menu/message_list_option_menu.xml rename to legacy/ui/legacy/src/main/res/menu/message_list_option_menu.xml diff --git a/app/ui/legacy/src/main/res/menu/participant_overflow_menu.xml b/legacy/ui/legacy/src/main/res/menu/participant_overflow_menu.xml similarity index 100% rename from app/ui/legacy/src/main/res/menu/participant_overflow_menu.xml rename to legacy/ui/legacy/src/main/res/menu/participant_overflow_menu.xml diff --git a/app/ui/legacy/src/main/res/menu/single_message_options.xml b/legacy/ui/legacy/src/main/res/menu/single_message_options.xml similarity index 100% rename from app/ui/legacy/src/main/res/menu/single_message_options.xml rename to legacy/ui/legacy/src/main/res/menu/single_message_options.xml diff --git a/app/ui/legacy/src/main/res/navigation/navigation_manage_folders.xml b/legacy/ui/legacy/src/main/res/navigation/navigation_manage_folders.xml similarity index 100% rename from app/ui/legacy/src/main/res/navigation/navigation_manage_folders.xml rename to legacy/ui/legacy/src/main/res/navigation/navigation_manage_folders.xml diff --git a/app/ui/legacy/src/main/res/navigation/navigation_settings.xml b/legacy/ui/legacy/src/main/res/navigation/navigation_settings.xml similarity index 100% rename from app/ui/legacy/src/main/res/navigation/navigation_settings.xml rename to legacy/ui/legacy/src/main/res/navigation/navigation_settings.xml diff --git a/app/ui/legacy/src/main/res/raw-ja/changelog.xml b/legacy/ui/legacy/src/main/res/raw-ja/changelog.xml similarity index 100% rename from app/ui/legacy/src/main/res/raw-ja/changelog.xml rename to legacy/ui/legacy/src/main/res/raw-ja/changelog.xml diff --git a/app/ui/legacy/src/main/res/raw/changelog_master.xml b/legacy/ui/legacy/src/main/res/raw/changelog_master.xml similarity index 100% rename from app/ui/legacy/src/main/res/raw/changelog_master.xml rename to legacy/ui/legacy/src/main/res/raw/changelog_master.xml diff --git a/app/ui/legacy/src/main/res/transition/transfer_transitions.xml b/legacy/ui/legacy/src/main/res/transition/transfer_transitions.xml similarity index 100% rename from app/ui/legacy/src/main/res/transition/transfer_transitions.xml rename to legacy/ui/legacy/src/main/res/transition/transfer_transitions.xml diff --git a/app/ui/legacy/src/main/res/values-ar/strings.xml b/legacy/ui/legacy/src/main/res/values-ar/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-ar/strings.xml rename to legacy/ui/legacy/src/main/res/values-ar/strings.xml diff --git a/app/ui/legacy/src/main/res/values-az/strings.xml b/legacy/ui/legacy/src/main/res/values-az/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-az/strings.xml rename to legacy/ui/legacy/src/main/res/values-az/strings.xml diff --git a/app/ui/legacy/src/main/res/values-be/strings.xml b/legacy/ui/legacy/src/main/res/values-be/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-be/strings.xml rename to legacy/ui/legacy/src/main/res/values-be/strings.xml diff --git a/app/ui/legacy/src/main/res/values-bg/strings.xml b/legacy/ui/legacy/src/main/res/values-bg/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-bg/strings.xml rename to legacy/ui/legacy/src/main/res/values-bg/strings.xml diff --git a/app/ui/legacy/src/main/res/values-br/strings.xml b/legacy/ui/legacy/src/main/res/values-br/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-br/strings.xml rename to legacy/ui/legacy/src/main/res/values-br/strings.xml diff --git a/app/ui/legacy/src/main/res/values-bs/strings.xml b/legacy/ui/legacy/src/main/res/values-bs/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-bs/strings.xml rename to legacy/ui/legacy/src/main/res/values-bs/strings.xml diff --git a/app/ui/legacy/src/main/res/values-ca/strings.xml b/legacy/ui/legacy/src/main/res/values-ca/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-ca/strings.xml rename to legacy/ui/legacy/src/main/res/values-ca/strings.xml diff --git a/app/ui/legacy/src/main/res/values-co/strings.xml b/legacy/ui/legacy/src/main/res/values-co/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-co/strings.xml rename to legacy/ui/legacy/src/main/res/values-co/strings.xml diff --git a/app/ui/legacy/src/main/res/values-cs/strings.xml b/legacy/ui/legacy/src/main/res/values-cs/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-cs/strings.xml rename to legacy/ui/legacy/src/main/res/values-cs/strings.xml diff --git a/app/ui/legacy/src/main/res/values-cy/strings.xml b/legacy/ui/legacy/src/main/res/values-cy/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-cy/strings.xml rename to legacy/ui/legacy/src/main/res/values-cy/strings.xml diff --git a/app/ui/legacy/src/main/res/values-da/strings.xml b/legacy/ui/legacy/src/main/res/values-da/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-da/strings.xml rename to legacy/ui/legacy/src/main/res/values-da/strings.xml diff --git a/app/ui/legacy/src/main/res/values-de/strings.xml b/legacy/ui/legacy/src/main/res/values-de/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-de/strings.xml rename to legacy/ui/legacy/src/main/res/values-de/strings.xml diff --git a/app/ui/legacy/src/main/res/values-el/strings.xml b/legacy/ui/legacy/src/main/res/values-el/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-el/strings.xml rename to legacy/ui/legacy/src/main/res/values-el/strings.xml diff --git a/app/ui/legacy/src/main/res/values-en-rGB/strings.xml b/legacy/ui/legacy/src/main/res/values-en-rGB/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-en-rGB/strings.xml rename to legacy/ui/legacy/src/main/res/values-en-rGB/strings.xml diff --git a/app/ui/legacy/src/main/res/values-eo/strings.xml b/legacy/ui/legacy/src/main/res/values-eo/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-eo/strings.xml rename to legacy/ui/legacy/src/main/res/values-eo/strings.xml diff --git a/app/ui/legacy/src/main/res/values-es/strings.xml b/legacy/ui/legacy/src/main/res/values-es/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-es/strings.xml rename to legacy/ui/legacy/src/main/res/values-es/strings.xml diff --git a/app/ui/legacy/src/main/res/values-et/strings.xml b/legacy/ui/legacy/src/main/res/values-et/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-et/strings.xml rename to legacy/ui/legacy/src/main/res/values-et/strings.xml diff --git a/app/ui/legacy/src/main/res/values-eu/strings.xml b/legacy/ui/legacy/src/main/res/values-eu/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-eu/strings.xml rename to legacy/ui/legacy/src/main/res/values-eu/strings.xml diff --git a/app/ui/legacy/src/main/res/values-fa/strings.xml b/legacy/ui/legacy/src/main/res/values-fa/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-fa/strings.xml rename to legacy/ui/legacy/src/main/res/values-fa/strings.xml diff --git a/app/ui/legacy/src/main/res/values-fi/strings.xml b/legacy/ui/legacy/src/main/res/values-fi/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-fi/strings.xml rename to legacy/ui/legacy/src/main/res/values-fi/strings.xml diff --git a/app/ui/legacy/src/main/res/values-fr/strings.xml b/legacy/ui/legacy/src/main/res/values-fr/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-fr/strings.xml rename to legacy/ui/legacy/src/main/res/values-fr/strings.xml diff --git a/app/ui/legacy/src/main/res/values-fy/strings.xml b/legacy/ui/legacy/src/main/res/values-fy/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-fy/strings.xml rename to legacy/ui/legacy/src/main/res/values-fy/strings.xml diff --git a/app/ui/legacy/src/main/res/values-gd/strings.xml b/legacy/ui/legacy/src/main/res/values-gd/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-gd/strings.xml rename to legacy/ui/legacy/src/main/res/values-gd/strings.xml diff --git a/app/ui/legacy/src/main/res/values-gl/strings.xml b/legacy/ui/legacy/src/main/res/values-gl/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-gl/strings.xml rename to legacy/ui/legacy/src/main/res/values-gl/strings.xml diff --git a/app/ui/legacy/src/main/res/values-hi/strings.xml b/legacy/ui/legacy/src/main/res/values-hi/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-hi/strings.xml rename to legacy/ui/legacy/src/main/res/values-hi/strings.xml diff --git a/app/ui/legacy/src/main/res/values-hr/strings.xml b/legacy/ui/legacy/src/main/res/values-hr/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-hr/strings.xml rename to legacy/ui/legacy/src/main/res/values-hr/strings.xml diff --git a/app/ui/legacy/src/main/res/values-hu/strings.xml b/legacy/ui/legacy/src/main/res/values-hu/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-hu/strings.xml rename to legacy/ui/legacy/src/main/res/values-hu/strings.xml diff --git a/app/ui/legacy/src/main/res/values-hy/strings.xml b/legacy/ui/legacy/src/main/res/values-hy/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-hy/strings.xml rename to legacy/ui/legacy/src/main/res/values-hy/strings.xml diff --git a/app/ui/legacy/src/main/res/values-in/strings.xml b/legacy/ui/legacy/src/main/res/values-in/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-in/strings.xml rename to legacy/ui/legacy/src/main/res/values-in/strings.xml diff --git a/app/ui/legacy/src/main/res/values-is/strings.xml b/legacy/ui/legacy/src/main/res/values-is/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-is/strings.xml rename to legacy/ui/legacy/src/main/res/values-is/strings.xml diff --git a/app/ui/legacy/src/main/res/values-it/strings.xml b/legacy/ui/legacy/src/main/res/values-it/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-it/strings.xml rename to legacy/ui/legacy/src/main/res/values-it/strings.xml diff --git a/app/ui/legacy/src/main/res/values-iw/strings.xml b/legacy/ui/legacy/src/main/res/values-iw/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-iw/strings.xml rename to legacy/ui/legacy/src/main/res/values-iw/strings.xml diff --git a/app/ui/legacy/src/main/res/values-ja/strings.xml b/legacy/ui/legacy/src/main/res/values-ja/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-ja/strings.xml rename to legacy/ui/legacy/src/main/res/values-ja/strings.xml diff --git a/app/ui/legacy/src/main/res/values-ka/strings.xml b/legacy/ui/legacy/src/main/res/values-ka/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-ka/strings.xml rename to legacy/ui/legacy/src/main/res/values-ka/strings.xml diff --git a/app/ui/legacy/src/main/res/values-ko/strings.xml b/legacy/ui/legacy/src/main/res/values-ko/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-ko/strings.xml rename to legacy/ui/legacy/src/main/res/values-ko/strings.xml diff --git a/app/ui/legacy/src/main/res/values-lt/strings.xml b/legacy/ui/legacy/src/main/res/values-lt/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-lt/strings.xml rename to legacy/ui/legacy/src/main/res/values-lt/strings.xml diff --git a/app/ui/legacy/src/main/res/values-lv/strings.xml b/legacy/ui/legacy/src/main/res/values-lv/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-lv/strings.xml rename to legacy/ui/legacy/src/main/res/values-lv/strings.xml diff --git a/app/ui/legacy/src/main/res/values-ml/strings.xml b/legacy/ui/legacy/src/main/res/values-ml/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-ml/strings.xml rename to legacy/ui/legacy/src/main/res/values-ml/strings.xml diff --git a/app/ui/legacy/src/main/res/values-nb/strings.xml b/legacy/ui/legacy/src/main/res/values-nb/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-nb/strings.xml rename to legacy/ui/legacy/src/main/res/values-nb/strings.xml diff --git a/app/ui/legacy/src/main/res/values-night/themes.xml b/legacy/ui/legacy/src/main/res/values-night/themes.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-night/themes.xml rename to legacy/ui/legacy/src/main/res/values-night/themes.xml diff --git a/app/ui/legacy/src/main/res/values-nl/strings.xml b/legacy/ui/legacy/src/main/res/values-nl/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-nl/strings.xml rename to legacy/ui/legacy/src/main/res/values-nl/strings.xml diff --git a/app/ui/legacy/src/main/res/values-nn/strings.xml b/legacy/ui/legacy/src/main/res/values-nn/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-nn/strings.xml rename to legacy/ui/legacy/src/main/res/values-nn/strings.xml diff --git a/app/ui/legacy/src/main/res/values-pl/strings.xml b/legacy/ui/legacy/src/main/res/values-pl/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-pl/strings.xml rename to legacy/ui/legacy/src/main/res/values-pl/strings.xml diff --git a/app/ui/legacy/src/main/res/values-pt-rBR/strings.xml b/legacy/ui/legacy/src/main/res/values-pt-rBR/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-pt-rBR/strings.xml rename to legacy/ui/legacy/src/main/res/values-pt-rBR/strings.xml diff --git a/app/ui/legacy/src/main/res/values-pt-rPT/strings.xml b/legacy/ui/legacy/src/main/res/values-pt-rPT/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-pt-rPT/strings.xml rename to legacy/ui/legacy/src/main/res/values-pt-rPT/strings.xml diff --git a/app/ui/legacy/src/main/res/values-ro/strings.xml b/legacy/ui/legacy/src/main/res/values-ro/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-ro/strings.xml rename to legacy/ui/legacy/src/main/res/values-ro/strings.xml diff --git a/app/ui/legacy/src/main/res/values-ru/strings.xml b/legacy/ui/legacy/src/main/res/values-ru/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-ru/strings.xml rename to legacy/ui/legacy/src/main/res/values-ru/strings.xml diff --git a/app/ui/legacy/src/main/res/values-sk/strings.xml b/legacy/ui/legacy/src/main/res/values-sk/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-sk/strings.xml rename to legacy/ui/legacy/src/main/res/values-sk/strings.xml diff --git a/app/ui/legacy/src/main/res/values-sl/strings.xml b/legacy/ui/legacy/src/main/res/values-sl/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-sl/strings.xml rename to legacy/ui/legacy/src/main/res/values-sl/strings.xml diff --git a/app/ui/legacy/src/main/res/values-sq/strings.xml b/legacy/ui/legacy/src/main/res/values-sq/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-sq/strings.xml rename to legacy/ui/legacy/src/main/res/values-sq/strings.xml diff --git a/app/ui/legacy/src/main/res/values-sr/strings.xml b/legacy/ui/legacy/src/main/res/values-sr/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-sr/strings.xml rename to legacy/ui/legacy/src/main/res/values-sr/strings.xml diff --git a/app/ui/legacy/src/main/res/values-sv/strings.xml b/legacy/ui/legacy/src/main/res/values-sv/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-sv/strings.xml rename to legacy/ui/legacy/src/main/res/values-sv/strings.xml diff --git a/app/ui/legacy/src/main/res/values-sw360dp/values-preference.xml b/legacy/ui/legacy/src/main/res/values-sw360dp/values-preference.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-sw360dp/values-preference.xml rename to legacy/ui/legacy/src/main/res/values-sw360dp/values-preference.xml diff --git a/app/ui/legacy/src/main/res/values-ta-rIN/strings.xml b/legacy/ui/legacy/src/main/res/values-ta-rIN/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-ta-rIN/strings.xml rename to legacy/ui/legacy/src/main/res/values-ta-rIN/strings.xml diff --git a/app/ui/legacy/src/main/res/values-tr/strings.xml b/legacy/ui/legacy/src/main/res/values-tr/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-tr/strings.xml rename to legacy/ui/legacy/src/main/res/values-tr/strings.xml diff --git a/app/ui/legacy/src/main/res/values-uk/strings.xml b/legacy/ui/legacy/src/main/res/values-uk/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-uk/strings.xml rename to legacy/ui/legacy/src/main/res/values-uk/strings.xml diff --git a/app/ui/legacy/src/main/res/values-vi/strings.xml b/legacy/ui/legacy/src/main/res/values-vi/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-vi/strings.xml rename to legacy/ui/legacy/src/main/res/values-vi/strings.xml diff --git a/app/ui/legacy/src/main/res/values-w360dp/styles.xml b/legacy/ui/legacy/src/main/res/values-w360dp/styles.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-w360dp/styles.xml rename to legacy/ui/legacy/src/main/res/values-w360dp/styles.xml diff --git a/app/ui/legacy/src/main/res/values-zh-rCN/strings.xml b/legacy/ui/legacy/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-zh-rCN/strings.xml rename to legacy/ui/legacy/src/main/res/values-zh-rCN/strings.xml diff --git a/app/ui/legacy/src/main/res/values-zh-rTW/strings.xml b/legacy/ui/legacy/src/main/res/values-zh-rTW/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values-zh-rTW/strings.xml rename to legacy/ui/legacy/src/main/res/values-zh-rTW/strings.xml diff --git a/app/ui/legacy/src/main/res/values/arrays.xml b/legacy/ui/legacy/src/main/res/values/arrays.xml similarity index 100% rename from app/ui/legacy/src/main/res/values/arrays.xml rename to legacy/ui/legacy/src/main/res/values/arrays.xml diff --git a/app/ui/legacy/src/main/res/values/arrays_account_settings_strings.xml b/legacy/ui/legacy/src/main/res/values/arrays_account_settings_strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values/arrays_account_settings_strings.xml rename to legacy/ui/legacy/src/main/res/values/arrays_account_settings_strings.xml diff --git a/app/ui/legacy/src/main/res/values/arrays_general_settings_strings.xml b/legacy/ui/legacy/src/main/res/values/arrays_general_settings_strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values/arrays_general_settings_strings.xml rename to legacy/ui/legacy/src/main/res/values/arrays_general_settings_strings.xml diff --git a/app/ui/legacy/src/main/res/values/attrs.xml b/legacy/ui/legacy/src/main/res/values/attrs.xml similarity index 100% rename from app/ui/legacy/src/main/res/values/attrs.xml rename to legacy/ui/legacy/src/main/res/values/attrs.xml diff --git a/app/ui/legacy/src/main/res/values/colors.xml b/legacy/ui/legacy/src/main/res/values/colors.xml similarity index 100% rename from app/ui/legacy/src/main/res/values/colors.xml rename to legacy/ui/legacy/src/main/res/values/colors.xml diff --git a/app/ui/legacy/src/main/res/values/constants.xml b/legacy/ui/legacy/src/main/res/values/constants.xml similarity index 100% rename from app/ui/legacy/src/main/res/values/constants.xml rename to legacy/ui/legacy/src/main/res/values/constants.xml diff --git a/app/ui/legacy/src/main/res/values/contact_picture_fallback_colors.xml b/legacy/ui/legacy/src/main/res/values/contact_picture_fallback_colors.xml similarity index 100% rename from app/ui/legacy/src/main/res/values/contact_picture_fallback_colors.xml rename to legacy/ui/legacy/src/main/res/values/contact_picture_fallback_colors.xml diff --git a/app/ui/legacy/src/main/res/values/dimensions.xml b/legacy/ui/legacy/src/main/res/values/dimensions.xml similarity index 100% rename from app/ui/legacy/src/main/res/values/dimensions.xml rename to legacy/ui/legacy/src/main/res/values/dimensions.xml diff --git a/app/ui/legacy/src/main/res/values/ids.xml b/legacy/ui/legacy/src/main/res/values/ids.xml similarity index 100% rename from app/ui/legacy/src/main/res/values/ids.xml rename to legacy/ui/legacy/src/main/res/values/ids.xml diff --git a/app/ui/legacy/src/main/res/values/message_details_ids.xml b/legacy/ui/legacy/src/main/res/values/message_details_ids.xml similarity index 100% rename from app/ui/legacy/src/main/res/values/message_details_ids.xml rename to legacy/ui/legacy/src/main/res/values/message_details_ids.xml diff --git a/app/ui/legacy/src/main/res/values/strings.xml b/legacy/ui/legacy/src/main/res/values/strings.xml similarity index 100% rename from app/ui/legacy/src/main/res/values/strings.xml rename to legacy/ui/legacy/src/main/res/values/strings.xml diff --git a/app/ui/legacy/src/main/res/values/styles.xml b/legacy/ui/legacy/src/main/res/values/styles.xml similarity index 100% rename from app/ui/legacy/src/main/res/values/styles.xml rename to legacy/ui/legacy/src/main/res/values/styles.xml diff --git a/app/ui/legacy/src/main/res/values/themes.xml b/legacy/ui/legacy/src/main/res/values/themes.xml similarity index 100% rename from app/ui/legacy/src/main/res/values/themes.xml rename to legacy/ui/legacy/src/main/res/values/themes.xml diff --git a/app/ui/legacy/src/main/res/xml/account_settings.xml b/legacy/ui/legacy/src/main/res/xml/account_settings.xml similarity index 100% rename from app/ui/legacy/src/main/res/xml/account_settings.xml rename to legacy/ui/legacy/src/main/res/xml/account_settings.xml diff --git a/app/ui/legacy/src/main/res/xml/empty_preferences.xml b/legacy/ui/legacy/src/main/res/xml/empty_preferences.xml similarity index 100% rename from app/ui/legacy/src/main/res/xml/empty_preferences.xml rename to legacy/ui/legacy/src/main/res/xml/empty_preferences.xml diff --git a/app/ui/legacy/src/main/res/xml/folder_settings_preferences.xml b/legacy/ui/legacy/src/main/res/xml/folder_settings_preferences.xml similarity index 100% rename from app/ui/legacy/src/main/res/xml/folder_settings_preferences.xml rename to legacy/ui/legacy/src/main/res/xml/folder_settings_preferences.xml diff --git a/app/ui/legacy/src/main/res/xml/general_settings.xml b/legacy/ui/legacy/src/main/res/xml/general_settings.xml similarity index 100% rename from app/ui/legacy/src/main/res/xml/general_settings.xml rename to legacy/ui/legacy/src/main/res/xml/general_settings.xml diff --git a/app/ui/legacy/src/test/AndroidManifest.xml b/legacy/ui/legacy/src/test/AndroidManifest.xml similarity index 100% rename from app/ui/legacy/src/test/AndroidManifest.xml rename to legacy/ui/legacy/src/test/AndroidManifest.xml diff --git a/app/ui/legacy/src/test/java/com/fsck/k9/K9RobolectricTest.kt b/legacy/ui/legacy/src/test/java/com/fsck/k9/K9RobolectricTest.kt similarity index 100% rename from app/ui/legacy/src/test/java/com/fsck/k9/K9RobolectricTest.kt rename to legacy/ui/legacy/src/test/java/com/fsck/k9/K9RobolectricTest.kt diff --git a/app/ui/legacy/src/test/java/com/fsck/k9/RobolectricTest.kt b/legacy/ui/legacy/src/test/java/com/fsck/k9/RobolectricTest.kt similarity index 100% rename from app/ui/legacy/src/test/java/com/fsck/k9/RobolectricTest.kt rename to legacy/ui/legacy/src/test/java/com/fsck/k9/RobolectricTest.kt diff --git a/app/ui/legacy/src/test/java/com/fsck/k9/TestApp.kt b/legacy/ui/legacy/src/test/java/com/fsck/k9/TestApp.kt similarity index 100% rename from app/ui/legacy/src/test/java/com/fsck/k9/TestApp.kt rename to legacy/ui/legacy/src/test/java/com/fsck/k9/TestApp.kt diff --git a/app/ui/legacy/src/test/java/com/fsck/k9/TestCoreResourceProvider.kt b/legacy/ui/legacy/src/test/java/com/fsck/k9/TestCoreResourceProvider.kt similarity index 100% rename from app/ui/legacy/src/test/java/com/fsck/k9/TestCoreResourceProvider.kt rename to legacy/ui/legacy/src/test/java/com/fsck/k9/TestCoreResourceProvider.kt diff --git a/app/ui/legacy/src/test/java/com/fsck/k9/activity/compose/AttachmentPresenterTest.kt b/legacy/ui/legacy/src/test/java/com/fsck/k9/activity/compose/AttachmentPresenterTest.kt similarity index 100% rename from app/ui/legacy/src/test/java/com/fsck/k9/activity/compose/AttachmentPresenterTest.kt rename to legacy/ui/legacy/src/test/java/com/fsck/k9/activity/compose/AttachmentPresenterTest.kt diff --git a/app/ui/legacy/src/test/java/com/fsck/k9/activity/compose/RecipientLoaderTest.java b/legacy/ui/legacy/src/test/java/com/fsck/k9/activity/compose/RecipientLoaderTest.java similarity index 100% rename from app/ui/legacy/src/test/java/com/fsck/k9/activity/compose/RecipientLoaderTest.java rename to legacy/ui/legacy/src/test/java/com/fsck/k9/activity/compose/RecipientLoaderTest.java diff --git a/app/ui/legacy/src/test/java/com/fsck/k9/activity/compose/RecipientPresenterTest.kt b/legacy/ui/legacy/src/test/java/com/fsck/k9/activity/compose/RecipientPresenterTest.kt similarity index 100% rename from app/ui/legacy/src/test/java/com/fsck/k9/activity/compose/RecipientPresenterTest.kt rename to legacy/ui/legacy/src/test/java/com/fsck/k9/activity/compose/RecipientPresenterTest.kt diff --git a/app/ui/legacy/src/test/java/com/fsck/k9/activity/compose/ReplyToPresenterTest.kt b/legacy/ui/legacy/src/test/java/com/fsck/k9/activity/compose/ReplyToPresenterTest.kt similarity index 100% rename from app/ui/legacy/src/test/java/com/fsck/k9/activity/compose/ReplyToPresenterTest.kt rename to legacy/ui/legacy/src/test/java/com/fsck/k9/activity/compose/ReplyToPresenterTest.kt diff --git a/app/ui/legacy/src/test/java/com/fsck/k9/autocrypt/AutocryptOperationsHelper.java b/legacy/ui/legacy/src/test/java/com/fsck/k9/autocrypt/AutocryptOperationsHelper.java similarity index 100% rename from app/ui/legacy/src/test/java/com/fsck/k9/autocrypt/AutocryptOperationsHelper.java rename to legacy/ui/legacy/src/test/java/com/fsck/k9/autocrypt/AutocryptOperationsHelper.java diff --git a/app/ui/legacy/src/test/java/com/fsck/k9/contacts/ContactLetterExtractorTest.kt b/legacy/ui/legacy/src/test/java/com/fsck/k9/contacts/ContactLetterExtractorTest.kt similarity index 100% rename from app/ui/legacy/src/test/java/com/fsck/k9/contacts/ContactLetterExtractorTest.kt rename to legacy/ui/legacy/src/test/java/com/fsck/k9/contacts/ContactLetterExtractorTest.kt diff --git a/app/ui/legacy/src/test/java/com/fsck/k9/message/PgpMessageBuilderTest.kt b/legacy/ui/legacy/src/test/java/com/fsck/k9/message/PgpMessageBuilderTest.kt similarity index 100% rename from app/ui/legacy/src/test/java/com/fsck/k9/message/PgpMessageBuilderTest.kt rename to legacy/ui/legacy/src/test/java/com/fsck/k9/message/PgpMessageBuilderTest.kt diff --git a/app/ui/legacy/src/test/java/com/fsck/k9/ui/K9DrawerTest.kt b/legacy/ui/legacy/src/test/java/com/fsck/k9/ui/K9DrawerTest.kt similarity index 100% rename from app/ui/legacy/src/test/java/com/fsck/k9/ui/K9DrawerTest.kt rename to legacy/ui/legacy/src/test/java/com/fsck/k9/ui/K9DrawerTest.kt diff --git a/app/ui/legacy/src/test/java/com/fsck/k9/ui/crypto/MessageCryptoHelperTest.java b/legacy/ui/legacy/src/test/java/com/fsck/k9/ui/crypto/MessageCryptoHelperTest.java similarity index 100% rename from app/ui/legacy/src/test/java/com/fsck/k9/ui/crypto/MessageCryptoHelperTest.java rename to legacy/ui/legacy/src/test/java/com/fsck/k9/ui/crypto/MessageCryptoHelperTest.java diff --git a/app/ui/legacy/src/test/java/com/fsck/k9/ui/helper/RelativeDateTimeFormatterTest.kt b/legacy/ui/legacy/src/test/java/com/fsck/k9/ui/helper/RelativeDateTimeFormatterTest.kt similarity index 100% rename from app/ui/legacy/src/test/java/com/fsck/k9/ui/helper/RelativeDateTimeFormatterTest.kt rename to legacy/ui/legacy/src/test/java/com/fsck/k9/ui/helper/RelativeDateTimeFormatterTest.kt diff --git a/app/ui/legacy/src/test/java/com/fsck/k9/ui/helper/SizeFormatterTest.kt b/legacy/ui/legacy/src/test/java/com/fsck/k9/ui/helper/SizeFormatterTest.kt similarity index 100% rename from app/ui/legacy/src/test/java/com/fsck/k9/ui/helper/SizeFormatterTest.kt rename to legacy/ui/legacy/src/test/java/com/fsck/k9/ui/helper/SizeFormatterTest.kt diff --git a/app/ui/legacy/src/test/java/com/fsck/k9/ui/identity/IdentityFormatterTest.kt b/legacy/ui/legacy/src/test/java/com/fsck/k9/ui/identity/IdentityFormatterTest.kt similarity index 100% rename from app/ui/legacy/src/test/java/com/fsck/k9/ui/identity/IdentityFormatterTest.kt rename to legacy/ui/legacy/src/test/java/com/fsck/k9/ui/identity/IdentityFormatterTest.kt diff --git a/app/ui/legacy/src/test/java/com/fsck/k9/ui/messagedetails/MessageDetailsParticipantFormatterTest.kt b/legacy/ui/legacy/src/test/java/com/fsck/k9/ui/messagedetails/MessageDetailsParticipantFormatterTest.kt similarity index 100% rename from app/ui/legacy/src/test/java/com/fsck/k9/ui/messagedetails/MessageDetailsParticipantFormatterTest.kt rename to legacy/ui/legacy/src/test/java/com/fsck/k9/ui/messagedetails/MessageDetailsParticipantFormatterTest.kt diff --git a/app/ui/legacy/src/test/java/com/fsck/k9/ui/messagelist/MessageListAdapterTest.kt b/legacy/ui/legacy/src/test/java/com/fsck/k9/ui/messagelist/MessageListAdapterTest.kt similarity index 100% rename from app/ui/legacy/src/test/java/com/fsck/k9/ui/messagelist/MessageListAdapterTest.kt rename to legacy/ui/legacy/src/test/java/com/fsck/k9/ui/messagelist/MessageListAdapterTest.kt diff --git a/app/ui/legacy/src/test/java/com/fsck/k9/ui/messageview/DisplayRecipientsExtractorTest.kt b/legacy/ui/legacy/src/test/java/com/fsck/k9/ui/messageview/DisplayRecipientsExtractorTest.kt similarity index 100% rename from app/ui/legacy/src/test/java/com/fsck/k9/ui/messageview/DisplayRecipientsExtractorTest.kt rename to legacy/ui/legacy/src/test/java/com/fsck/k9/ui/messageview/DisplayRecipientsExtractorTest.kt diff --git a/app/ui/legacy/src/test/java/com/fsck/k9/ui/messageview/MessageViewRecipientFormatterTest.kt b/legacy/ui/legacy/src/test/java/com/fsck/k9/ui/messageview/MessageViewRecipientFormatterTest.kt similarity index 100% rename from app/ui/legacy/src/test/java/com/fsck/k9/ui/messageview/MessageViewRecipientFormatterTest.kt rename to legacy/ui/legacy/src/test/java/com/fsck/k9/ui/messageview/MessageViewRecipientFormatterTest.kt diff --git a/app/ui/legacy/src/test/java/com/fsck/k9/ui/messageview/RecipientLayoutCreatorTest.kt b/legacy/ui/legacy/src/test/java/com/fsck/k9/ui/messageview/RecipientLayoutCreatorTest.kt similarity index 100% rename from app/ui/legacy/src/test/java/com/fsck/k9/ui/messageview/RecipientLayoutCreatorTest.kt rename to legacy/ui/legacy/src/test/java/com/fsck/k9/ui/messageview/RecipientLayoutCreatorTest.kt diff --git a/app/ui/legacy/src/test/java/com/fsck/k9/ui/settings/general/GeneralSettingsViewModelTest.kt b/legacy/ui/legacy/src/test/java/com/fsck/k9/ui/settings/general/GeneralSettingsViewModelTest.kt similarity index 100% rename from app/ui/legacy/src/test/java/com/fsck/k9/ui/settings/general/GeneralSettingsViewModelTest.kt rename to legacy/ui/legacy/src/test/java/com/fsck/k9/ui/settings/general/GeneralSettingsViewModelTest.kt diff --git a/app/ui/legacy/src/test/java/com/fsck/k9/view/UserInputEmailAddressParserTest.kt b/legacy/ui/legacy/src/test/java/com/fsck/k9/view/UserInputEmailAddressParserTest.kt similarity index 100% rename from app/ui/legacy/src/test/java/com/fsck/k9/view/UserInputEmailAddressParserTest.kt rename to legacy/ui/legacy/src/test/java/com/fsck/k9/view/UserInputEmailAddressParserTest.kt diff --git a/app/ui/message-list-widget/build.gradle.kts b/legacy/ui/message-list-widget/build.gradle.kts similarity index 100% rename from app/ui/message-list-widget/build.gradle.kts rename to legacy/ui/message-list-widget/build.gradle.kts diff --git a/settings.gradle.kts b/settings.gradle.kts index ad68dc75d2..790e1b6193 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -30,16 +30,6 @@ include( ":app-common", ) -include( - ":app:common", - ":app:ui:base", - ":app:ui:legacy", - ":app:core", - ":app:storage", - ":app:crypto-openpgp", - ":app:testing", -) - include( ":feature:launcher", ) @@ -96,6 +86,16 @@ include( ":core:ui:legacy:theme2:thunderbird", ) +include( + ":legacy:common", + ":legacy:ui:base", + ":legacy:ui:legacy", + ":legacy:core", + ":legacy:storage", + ":legacy:crypto-openpgp", + ":legacy:testing", +) + include( ":ui-utils:LinearLayoutManager", ":ui-utils:ItemTouchHelper", -- GitLab From 85d45f6fd1f3bd73cb61ca70010b7c64e01c163b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolf-Martell=20Montw=C3=A9?= Date: Tue, 2 Jul 2024 15:40:13 +0200 Subject: [PATCH 2/3] Remove old message-list-widget --- legacy/ui/message-list-widget/build.gradle.kts | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 legacy/ui/message-list-widget/build.gradle.kts diff --git a/legacy/ui/message-list-widget/build.gradle.kts b/legacy/ui/message-list-widget/build.gradle.kts deleted file mode 100644 index cbe5034f9c..0000000000 --- a/legacy/ui/message-list-widget/build.gradle.kts +++ /dev/null @@ -1,18 +0,0 @@ -plugins { - id(ThunderbirdPlugins.Library.android) -} - -dependencies { - implementation(projects.app.ui.legacy) - implementation(projects.app.core) - - implementation(libs.timber) -} - -android { - namespace = "app.k9mail.ui.widget.list" - - buildFeatures { - buildConfig = true - } -} -- GitLab From 282ddb96dd667d16322ffd689da0a634513cbc02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolf-Martell=20Montw=C3=A9?= Date: Tue, 2 Jul 2024 15:44:52 +0200 Subject: [PATCH 3/3] Add legacy readme --- legacy/README.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 legacy/README.md diff --git a/legacy/README.md b/legacy/README.md new file mode 100644 index 0000000000..f344f134d3 --- /dev/null +++ b/legacy/README.md @@ -0,0 +1,8 @@ +## Legacy + +The submodules within this module are considered legacy code that will still be maintained for the purpose of supporting the existing implementation. Over time, the legacy code will be replaced with new features and improvements and will be removed. + +> [!WARNING] +> It's not suggested to use the contained modules for new features! +> +> Please consider writing new features within the feature modules and migrate existing functionality there. -- GitLab