From 29d5220995f7281ad0cffe4c776141361dacc35a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolf=20Montwe=CC=81?= Date: Tue, 14 Feb 2023 10:39:32 +0100 Subject: [PATCH 1/4] Add trailing comma allowance to code style --- .editorconfig | 2 + .../api/ConnectionSettingsDiscovery.kt | 2 +- .../providersxml/ProvidersXmlDiscovery.kt | 4 +- .../providersxml/ProvidersXmlDiscoveryTest.kt | 8 +- .../srvrecords/MiniDnsSrvResolver.kt | 4 +- .../srvrecords/SrvServiceDiscovery.kt | 8 +- .../srvrecords/SrvServiceDiscoveryTest.kt | 50 +++---- .../ThunderbirdAutoconfigUrlProvider.kt | 2 +- .../thunderbird/ThunderbirdDiscovery.kt | 2 +- .../thunderbird/ThunderbirdAutoconfigTest.kt | 8 +- .../ThunderbirdAutoconfigUrlProviderTest.kt | 2 +- app/core/src/main/java/com/fsck/k9/Account.kt | 20 +-- .../fsck/k9/AccountPreferenceSerializer.kt | 30 ++-- .../src/main/java/com/fsck/k9/AppConfig.kt | 2 +- app/core/src/main/java/com/fsck/k9/Core.kt | 2 +- .../main/java/com/fsck/k9/CoreKoinModules.kt | 2 +- app/core/src/main/java/com/fsck/k9/DI.kt | 2 +- .../java/com/fsck/k9/EmailAddressValidator.kt | 2 +- .../src/main/java/com/fsck/k9/Identity.kt | 2 +- app/core/src/main/java/com/fsck/k9/K9.kt | 8 +- .../src/main/java/com/fsck/k9/KoinModule.kt | 2 +- .../java/com/fsck/k9/LocalKeyStoreManager.kt | 2 +- .../java/com/fsck/k9/NotificationLight.kt | 3 +- .../java/com/fsck/k9/NotificationSettings.kt | 2 +- .../java/com/fsck/k9/NotificationVibration.kt | 7 +- .../src/main/java/com/fsck/k9/Preferences.kt | 2 +- .../com/fsck/k9/ServerSettingsSerializer.kt | 4 +- .../src/main/java/com/fsck/k9/SwipeAction.kt | 2 +- .../src/main/java/com/fsck/k9/TimberLogger.kt | 2 +- .../k9/autocrypt/AutocryptDraftStateHeader.kt | 6 +- .../com/fsck/k9/backend/BackendManager.kt | 4 +- .../java/com/fsck/k9/cache/ExpiringCache.kt | 2 +- .../java/com/fsck/k9/cache/InMemoryCache.kt | 2 +- .../com/fsck/k9/cache/SynchronizedCache.kt | 2 +- .../com/fsck/k9/controller/DraftOperations.kt | 12 +- .../java/com/fsck/k9/controller/KoinModule.kt | 4 +- .../k9/controller/MessageCountsProvider.kt | 4 +- .../fsck/k9/controller/MessageReference.kt | 2 +- .../k9/controller/NotificationOperations.kt | 2 +- .../controller/push/AccountPushController.kt | 2 +- .../push/AccountPushControllerFactory.kt | 4 +- .../com/fsck/k9/controller/push/KoinModule.kt | 4 +- .../fsck/k9/controller/push/PushController.kt | 2 +- .../com/fsck/k9/crypto/EncryptionExtractor.kt | 2 +- .../java/com/fsck/k9/helper/IdentityHelper.kt | 2 +- .../main/java/com/fsck/k9/job/K9JobManager.kt | 2 +- .../java/com/fsck/k9/job/K9WorkerFactory.kt | 2 +- .../java/com/fsck/k9/job/MailSyncWorker.kt | 2 +- .../java/com/fsck/k9/logging/LogFileWriter.kt | 2 +- .../com/fsck/k9/mail/MailServerDirection.kt | 2 +- ...pandFolderBackendFoldersRefreshListener.kt | 2 +- .../k9/mailstore/CacheAwareMessageMapper.kt | 4 +- .../com/fsck/k9/mailstore/CreateFolderInfo.kt | 2 +- .../com/fsck/k9/mailstore/FolderRepository.kt | 30 ++-- .../com/fsck/k9/mailstore/FolderSettings.kt | 2 +- .../k9/mailstore/FolderSettingsProvider.kt | 2 +- .../com/fsck/k9/mailstore/K9BackendFolder.kt | 4 +- .../com/fsck/k9/mailstore/K9BackendStorage.kt | 4 +- .../k9/mailstore/K9BackendStorageFactory.kt | 4 +- .../java/com/fsck/k9/mailstore/KoinModule.kt | 4 +- .../com/fsck/k9/mailstore/MessageDetails.kt | 2 +- .../k9/mailstore/MessageListRepository.kt | 8 +- .../fsck/k9/mailstore/MessageRepository.kt | 4 +- .../com/fsck/k9/mailstore/MessageStore.kt | 4 +- .../MessageViewInfoExtractorFactory.kt | 2 +- .../fsck/k9/mailstore/NotificationMessage.kt | 2 +- .../fsck/k9/mailstore/NotifierMessageStore.kt | 2 +- .../java/com/fsck/k9/mailstore/OutboxState.kt | 2 +- .../k9/mailstore/OutboxStateRepository.kt | 8 +- .../com/fsck/k9/mailstore/SaveMessageData.kt | 2 +- .../k9/mailstore/SaveMessageDataCreator.kt | 8 +- .../java/com/fsck/k9/mailstore/SendState.kt | 3 +- ...cialFolderBackendFoldersRefreshListener.kt | 2 +- .../fsck/k9/mailstore/SpecialFolderUpdater.kt | 2 +- .../mailstore/SpecialLocalFoldersCreator.kt | 2 +- .../java/com/fsck/k9/message/Attachment.kt | 2 +- .../fsck/k9/message/ReplyActionStrategy.kt | 4 +- .../extractors/BasicPartInfoExtractor.kt | 4 +- .../fsck/k9/message/html/DividerReplacer.kt | 2 +- .../fsck/k9/message/html/EmailTextToHtml.kt | 2 +- .../k9/message/html/HtmlProcessorFactory.kt | 2 +- .../com/fsck/k9/message/html/HtmlSettings.kt | 2 +- .../com/fsck/k9/message/html/HttpUriParser.kt | 2 +- .../com/fsck/k9/message/html/TextToHtml.kt | 4 +- .../com/fsck/k9/message/html/UriLinkifier.kt | 2 +- .../java/com/fsck/k9/message/html/UriMatch.kt | 2 +- .../com/fsck/k9/message/html/UriMatcher.kt | 4 +- .../fsck/k9/message/quote/TextQuoteCreator.kt | 4 +- .../k9/network/ConnectivityManagerApi21.kt | 2 +- .../k9/network/ConnectivityManagerApi23.kt | 2 +- .../k9/network/ConnectivityManagerApi24.kt | 2 +- .../k9/notification/AddNotificationResult.kt | 10 +- ...thenticationErrorNotificationController.kt | 2 +- .../BaseNotificationDataCreator.kt | 2 +- .../CertificateErrorNotificationController.kt | 2 +- .../fsck/k9/notification/CoreKoinModule.kt | 24 ++-- .../LockScreenNotificationCreator.kt | 4 +- .../NewMailNotificationController.kt | 10 +- .../notification/NewMailNotificationData.kt | 20 +-- .../NewMailNotificationManager.kt | 20 +-- .../notification/NotificationActionService.kt | 12 +- .../NotificationChannelManager.kt | 12 +- .../NotificationConfigurationConverter.kt | 8 +- .../k9/notification/NotificationContent.kt | 2 +- .../NotificationContentCreator.kt | 4 +- .../k9/notification/NotificationController.kt | 4 +- .../fsck/k9/notification/NotificationData.kt | 2 +- .../k9/notification/NotificationDataStore.kt | 30 ++-- .../k9/notification/NotificationHelper.kt | 8 +- .../k9/notification/NotificationHolder.kt | 4 +- .../k9/notification/NotificationRepository.kt | 16 +-- .../NotificationSettingsUpdater.kt | 2 +- .../NotificationStoreOperation.kt | 4 +- .../k9/notification/NotificationStrategy.kt | 2 +- .../notification/PushNotificationManager.kt | 4 +- .../notification/RemoveNotificationsResult.kt | 2 +- .../SendFailedNotificationController.kt | 2 +- .../SingleMessageNotificationCreator.kt | 8 +- .../SingleMessageNotificationDataCreator.kt | 10 +- .../SummaryNotificationCreator.kt | 22 +-- .../SummaryNotificationDataCreator.kt | 8 +- .../SyncNotificationController.kt | 2 +- .../com/fsck/k9/oauth/OAuthConfiguration.kt | 2 +- .../k9/oauth/OAuthConfigurationProvider.kt | 2 +- .../com/fsck/k9/power/AndroidPowerManager.kt | 2 +- .../k9/preferences/FolderSettingsProvider.kt | 4 +- .../fsck/k9/preferences/GeneralSettings.kt | 8 +- .../com/fsck/k9/preferences/KoinModule.kt | 4 +- .../preferences/RealGeneralSettingsManager.kt | 6 +- .../fsck/k9/preferences/SettingsExporter.kt | 26 ++-- .../fsck/k9/search/AccountSearchConditions.kt | 2 +- .../java/com/fsck/k9/search/SearchAccount.kt | 4 +- .../fsck/k9/ServerSettingsSerializerTest.kt | 4 +- .../AutocryptGossipHeaderParserTest.kt | 10 +- .../test/java/com/fsck/k9/cache/CacheTest.kt | 4 +- .../fsck/k9/crypto/OpenPgpApiHelperTest.kt | 4 +- .../com/fsck/k9/helper/IdentityHelperTest.kt | 18 +-- .../k9/helper/ListUnsubscribeHelperTest.kt | 16 +-- .../k9/logging/LogcatLogFileWriterTest.kt | 6 +- .../fsck/k9/mailstore/K9BackendFolderTest.kt | 4 +- .../fsck/k9/mailstore/K9BackendStorageTest.kt | 2 +- .../fsck/k9/mailstore/MessageListCacheTest.kt | 2 +- .../k9/mailstore/MessageListRepositoryTest.kt | 58 ++++---- .../k9/message/IdentityHeaderBuilderTest.kt | 2 +- .../fsck/k9/message/TextBodyBuilderTest.kt | 30 ++-- .../extractors/BasicPartInfoExtractorTest.kt | 12 +- .../message/extractors/TextPartFinderTest.kt | 38 ++--- .../fsck/k9/message/html/DisplayHtmlTest.kt | 2 +- .../fsck/k9/message/html/HtmlConverterTest.kt | 30 ++-- .../k9/message/quote/TextQuoteCreatorTest.kt | 8 +- .../signature/HtmlSignatureRemoverTest.kt | 8 +- ...ticationErrorNotificationControllerTest.kt | 4 +- .../BaseNotificationDataCreatorTest.kt | 10 +- ...tificateErrorNotificationControllerTest.kt | 6 +- .../LockScreenNotificationCreatorTest.kt | 12 +- .../NewMailNotificationManagerTest.kt | 70 ++++----- .../notification/NotificationDataStoreTest.kt | 2 +- .../k9/notification/NotificationIdsTest.kt | 4 +- .../SendFailedNotificationControllerTest.kt | 4 +- ...ingleMessageNotificationDataCreatorTest.kt | 36 ++--- .../SummaryNotificationDataCreatorTest.kt | 34 ++--- .../SyncNotificationControllerTest.kt | 4 +- .../k9/preferences/SettingsExporterTest.kt | 2 +- .../openpgp/OpenPgpEncryptionExtractor.kt | 2 +- .../app/k9mail/html/cleaner/BodyCleaner.kt | 8 +- .../app/k9mail/html/cleaner/HeadCleaner.kt | 2 +- .../k9mail/html/cleaner/HtmlSanitizerTest.kt | 20 +-- .../debug/java/app/k9mail/dev/DebugConfig.kt | 2 +- app/k9mail/src/main/java/com/fsck/k9/App.kt | 4 +- .../src/main/java/com/fsck/k9/Dependencies.kt | 6 +- .../com/fsck/k9/auth/OAuthConfigurations.kt | 12 +- .../fsck/k9/backends/AndroidAlarmManager.kt | 4 +- .../fsck/k9/backends/ImapBackendFactory.kt | 6 +- .../java/com/fsck/k9/backends/KoinModule.kt | 8 +- .../fsck/k9/backends/Pop3BackendFactory.kt | 2 +- .../k9/backends/RealOAuth2TokenProvider.kt | 4 +- .../fsck/k9/backends/WebDavBackendFactory.kt | 2 +- .../K9NotificationActionCreator.kt | 16 +-- .../K9NotificationResourceProvider.kt | 2 +- .../k9/notification/K9NotificationStrategy.kt | 2 +- .../fsck/k9/provider/UnreadWidgetProvider.kt | 2 +- .../com/fsck/k9/widget/unread/KoinModule.kt | 2 +- .../UnreadWidgetConfigurationFragment.kt | 2 +- .../fsck/k9/widget/unread/UnreadWidgetData.kt | 2 +- .../widget/unread/UnreadWidgetDataProvider.kt | 2 +- .../widget/unread/UnreadWidgetMigrations.kt | 2 +- .../widget/unread/UnreadWidgetRepository.kt | 2 +- .../unread/UnreadWidgetDataProviderTest.kt | 8 +- .../migrations/StorageMigrationTo10.kt | 4 +- .../migrations/StorageMigrationTo11.kt | 2 +- .../migrations/StorageMigrationTo12.kt | 2 +- .../migrations/StorageMigrationTo13.kt | 2 +- .../migrations/StorageMigrationTo14.kt | 2 +- .../migrations/StorageMigrationTo15.kt | 2 +- .../migrations/StorageMigrationTo16.kt | 2 +- .../migrations/StorageMigrationTo17.kt | 2 +- .../migrations/StorageMigrationTo18.kt | 2 +- .../migrations/StorageMigrationTo19.kt | 4 +- .../migrations/StorageMigrationTo3.kt | 2 +- .../migrations/StorageMigrationTo4.kt | 2 +- .../migrations/StorageMigrationTo5.kt | 2 +- .../migrations/StorageMigrationTo6.kt | 2 +- .../migrations/StorageMigrationTo7.kt | 2 +- .../migrations/StorageMigrationTo8.kt | 2 +- .../storage/messages/AttachmentFileManager.kt | 2 +- .../storage/messages/CheckFolderOperations.kt | 4 +- .../messages/ChunkedDatabaseOperations.kt | 2 +- .../storage/messages/CopyMessageOperations.kt | 36 ++--- .../k9/storage/messages/DatabaseOperations.kt | 2 +- .../messages/DeleteFolderOperations.kt | 4 +- .../messages/DeleteMessageOperations.kt | 14 +- .../storage/messages/FlagMessageOperations.kt | 8 +- .../k9/storage/messages/K9MessageStore.kt | 10 +- .../storage/messages/K9MessageStoreFactory.kt | 2 +- .../messages/KeyValueStoreOperations.kt | 8 +- .../storage/messages/MoveMessageOperations.kt | 8 +- .../messages/RetrieveFolderOperations.kt | 16 +-- .../messages/RetrieveMessageListOperations.kt | 12 +- .../messages/RetrieveMessageOperations.kt | 18 +-- .../storage/messages/SaveMessageOperations.kt | 26 ++-- .../messages/ThreadMessageOperations.kt | 18 +-- .../messages/UpdateMessageOperations.kt | 2 +- .../k9/storage/migrations/MigrationTo64.kt | 6 +- .../k9/storage/migrations/MigrationTo68.kt | 4 +- .../k9/storage/migrations/MigrationTo70.kt | 6 +- .../k9/storage/migrations/MigrationTo71.kt | 8 +- .../k9/storage/migrations/MigrationTo73.kt | 14 +- .../k9/storage/migrations/MigrationTo74.kt | 4 +- .../k9/storage/migrations/MigrationTo76.kt | 2 +- .../k9/storage/migrations/MigrationTo79.kt | 2 +- .../k9/storage/migrations/MigrationTo81.kt | 2 +- .../k9/storage/migrations/MigrationTo82.kt | 2 +- .../k9/storage/migrations/MigrationTo83.kt | 2 +- .../k9/storage/migrations/MigrationTo84.kt | 6 +- .../notifications/K9NotificationStore.kt | 10 +- .../k9/preferences/StoragePersisterTest.kt | 10 +- .../messages/CheckFolderOperationsTest.kt | 2 +- .../messages/ChunkedDatabaseOperationsTest.kt | 12 +- .../messages/CopyMessageOperationsTest.kt | 48 +++---- .../messages/CreateFolderOperationsTest.kt | 20 +-- .../messages/DeleteMessageOperationsTest.kt | 22 +-- .../fsck/k9/storage/messages/FolderHelpers.kt | 6 +- .../k9/storage/messages/KeyValueHelpers.kt | 12 +- .../messages/KeyValueStoreOperationsTest.kt | 32 ++--- .../messages/MessageDatabaseHelpers.kt | 8 +- .../messages/MessagePartDatabaseHelpers.kt | 6 +- .../messages/MoveMessageOperationsTest.kt | 30 ++-- .../messages/RetrieveFolderOperationsTest.kt | 46 +++--- .../RetrieveMessageListOperationsTest.kt | 14 +- .../messages/RetrieveMessageOperationsTest.kt | 28 ++-- .../messages/SaveMessageOperationsTest.kt | 30 ++-- .../storage/messages/ThreadDatabaseHelpers.kt | 6 +- .../messages/ThreadMessageOperationsTest.kt | 62 ++++---- .../messages/UpdateFolderOperationsTest.kt | 8 +- .../notifications/K9NotificationStoreTest.kt | 14 +- .../NotificationsTableHelpers.kt | 6 +- .../com/fsck/k9/ui/base/AppLanguageManager.kt | 2 +- .../java/com/fsck/k9/ui/base/K9Activity.kt | 2 +- .../java/com/fsck/k9/ui/base/KoinModule.kt | 2 +- .../java/com/fsck/k9/ui/base/ThemeManager.kt | 4 +- .../extensions/TextInputLayoutExtensions.kt | 4 +- .../k9/ui/base/loader/LoaderStateObserver.kt | 4 +- .../k9/ui/base/locale/SystemLocaleManager.kt | 4 +- .../k9/ui/settings/ExtraAccountDiscovery.kt | 2 +- .../com/fsck/k9/ui/settings/NewSetupUiHack.kt | 2 +- .../main/java/com/fsck/k9/UiKoinModules.kt | 2 +- .../com/fsck/k9/account/AccountRemover.kt | 2 +- .../java/com/fsck/k9/account/KoinModule.kt | 2 +- .../java/com/fsck/k9/activity/EditIdentity.kt | 2 +- .../com/fsck/k9/activity/FolderInfoHolder.kt | 4 +- .../java/com/fsck/k9/activity/MessageList.kt | 18 +-- .../k9/activity/MessageListActivityConfig.kt | 4 +- .../k9/activity/MessageLoaderHelperFactory.kt | 6 +- .../activity/compose/ComposeCryptoStatus.kt | 12 +- .../k9/activity/compose/RecipientMvpView.kt | 5 +- .../k9/activity/compose/RecipientPresenter.kt | 6 +- .../activity/setup/AccountSetupAccountType.kt | 6 +- .../k9/activity/setup/AccountSetupBasics.kt | 6 +- .../setup/AccountSetupCheckSettings.kt | 6 +- .../fsck/k9/activity/setup/AuthViewModel.kt | 14 +- .../activity/setup/InitialAccountSettings.kt | 2 +- .../java/com/fsck/k9/contacts/ContactImage.kt | 2 +- .../k9/contacts/ContactImageBitmapDecoder.kt | 2 +- .../k9/contacts/ContactImageModelLoader.kt | 2 +- .../k9/contacts/ContactLetterBitmapCreator.kt | 4 +- .../fsck/k9/contacts/ContactPictureLoader.kt | 4 +- .../java/com/fsck/k9/ui/FragmentExtras.kt | 2 +- .../src/main/java/com/fsck/k9/ui/K9Drawer.kt | 16 +-- .../k9/ui/account/AccountImageModelLoader.kt | 10 +- .../fsck/k9/ui/account/AccountsViewModel.kt | 4 +- .../com/fsck/k9/ui/account/DisplayAccount.kt | 2 +- .../fsck/k9/ui/changelog/ChangeLogManager.kt | 2 +- .../fsck/k9/ui/changelog/ChangelogFragment.kt | 2 +- .../k9/ui/changelog/ChangelogViewModel.kt | 4 +- .../k9/ui/changelog/RecentChangesViewModel.kt | 2 +- .../ui/choosefolder/ChooseFolderActivity.kt | 4 +- .../fsck/k9/ui/choosefolder/FolderListItem.kt | 2 +- .../k9/ui/compose/RecipientCircleImageView.kt | 2 +- .../compose/RecipientTokenConstraintLayout.kt | 2 +- .../fsck/k9/ui/compose/SimpleHighlightView.kt | 4 +- .../endtoend/AutocryptKeyTransferPresenter.kt | 4 +- .../endtoend/AutocryptKeyTransferViewModel.kt | 2 +- .../AutocryptSetupTransferLiveEvent.kt | 2 +- .../com/fsck/k9/ui/endtoend/KoinModule.kt | 2 +- .../fsck/k9/ui/folders/FoldersViewModel.kt | 8 +- .../k9/ui/helper/BottomBaselineTextView.kt | 2 +- .../fsck/k9/ui/helper/HtmlSettingsProvider.kt | 4 +- .../helper/RecyclerViewBackgroundDrawable.kt | 2 +- .../k9/ui/managefolders/FolderListItem.kt | 2 +- .../managefolders/FolderSettingsDataStore.kt | 2 +- .../managefolders/FolderSettingsFragment.kt | 2 +- .../managefolders/FolderSettingsViewModel.kt | 6 +- .../ui/managefolders/ManageFoldersActivity.kt | 2 +- .../ui/managefolders/ManageFoldersFragment.kt | 2 +- .../k9/ui/messagedetails/FolderNameItem.kt | 2 +- .../fsck/k9/ui/messagedetails/KoinModule.kt | 2 +- .../messagedetails/MessageDetailsFragment.kt | 10 +- .../MessageDetailsParticipantFormatter.kt | 6 +- .../k9/ui/messagedetails/MessageDetailsUi.kt | 8 +- .../messagedetails/MessageDetailsViewModel.kt | 14 +- .../k9/ui/messagedetails/ParticipantItem.kt | 2 +- .../k9/ui/messagedetails/SectionHeaderItem.kt | 2 +- .../com/fsck/k9/ui/messagelist/KoinModule.kt | 2 +- .../k9/ui/messagelist/MessageListAdapter.kt | 12 +- .../ui/messagelist/MessageListAppearance.kt | 2 +- .../k9/ui/messagelist/MessageListConfig.kt | 4 +- .../k9/ui/messagelist/MessageListFragment.kt | 49 +++---- .../fsck/k9/ui/messagelist/MessageListItem.kt | 2 +- .../ui/messagelist/MessageListItemAnimator.kt | 2 +- .../ui/messagelist/MessageListItemMapper.kt | 4 +- .../k9/ui/messagelist/MessageListLiveData.kt | 2 +- .../messagelist/MessageListLiveDataFactory.kt | 2 +- .../k9/ui/messagelist/MessageListLoader.kt | 2 +- .../messagelist/MessageListSwipeCallback.kt | 10 +- .../messagesource/MessageHeadersFragment.kt | 4 +- .../com/fsck/k9/ui/messageview/Direction.kt | 2 +- .../messageview/DisplayRecipientsExtractor.kt | 4 +- .../fsck/k9/ui/messageview/LinkTextHandler.kt | 2 +- .../k9/ui/messageview/MessageContainerView.kt | 40 +++--- .../fsck/k9/ui/messageview/MessageTopView.kt | 8 +- .../MessageViewContainerFragment.kt | 8 +- .../k9/ui/messageview/MessageViewFragment.kt | 28 ++-- .../MessageViewRecipientFormatter.kt | 6 +- .../ui/messageview/RecipientLayoutCreator.kt | 14 +- .../k9/ui/messageview/RecipientNamesView.kt | 18 +-- .../DeleteConfirmationActivity.kt | 2 +- .../com/fsck/k9/ui/permissions/Permission.kt | 6 +- .../PermissionRationaleDialogFragment.kt | 2 +- .../com/fsck/k9/ui/push/PushInfoFragment.kt | 2 +- .../com/fsck/k9/ui/settings/AboutFragment.kt | 2 +- .../com/fsck/k9/ui/settings/AccountItem.kt | 4 +- .../com/fsck/k9/ui/settings/KoinModule.kt | 2 +- .../fsck/k9/ui/settings/SettingsActionItem.kt | 2 +- .../k9/ui/settings/SettingsDividerItem.kt | 2 +- .../k9/ui/settings/SettingsListFragment.kt | 16 +-- .../fsck/k9/ui/settings/SettingsViewModel.kt | 2 +- .../com/fsck/k9/ui/settings/UrlActionItem.kt | 2 +- .../account/AccountSettingsActivity.kt | 2 +- .../account/AccountSettingsDataStore.kt | 10 +- .../AccountSettingsDataStoreFactory.kt | 4 +- .../account/AccountSettingsFragment.kt | 6 +- .../account/AccountSettingsViewModel.kt | 8 +- .../AutocryptPreferEncryptPreference.kt | 6 +- .../settings/account/FolderListPreference.kt | 6 +- .../account/NotificationSoundPreference.kt | 6 +- .../account/NotificationsPreference.kt | 6 +- .../account/VibrationDialogFragment.kt | 6 +- .../settings/account/VibrationPreference.kt | 6 +- .../settings/export/SettingsExportFragment.kt | 2 +- .../settings/export/SettingsExportUiModel.kt | 6 +- .../export/SettingsExportViewModel.kt | 8 +- .../general/GeneralSettingsActivity.kt | 2 +- .../general/GeneralSettingsDataStore.kt | 2 +- .../general/GeneralSettingsViewModel.kt | 2 +- .../ui/settings/general/LanguagePreference.kt | 4 +- .../k9/ui/settings/import/AccountActivator.kt | 4 +- .../import/PasswordPromptDialogFragment.kt | 10 +- .../settings/import/PasswordPromptResult.kt | 2 +- .../settings/import/SettingsImportFragment.kt | 6 +- .../import/SettingsImportListItems.kt | 4 +- .../settings/import/SettingsImportUiModel.kt | 8 +- .../import/SettingsImportViewModel.kt | 22 +-- .../fsck/k9/ui/share/ShareIntentBuilder.kt | 2 +- .../com/fsck/k9/view/DraggableFrameLayout.kt | 2 +- .../k9/view/MessageCryptoDisplayStatus.kt | 133 +++++++++++------- .../java/com/fsck/k9/view/MessageWebView.kt | 4 +- .../java/com/fsck/k9/view/WebViewConfig.kt | 2 +- .../com/fsck/k9/view/WebViewConfigProvider.kt | 2 +- .../compose/AttachmentPresenterTest.kt | 14 +- .../compose/RecipientPresenterTest.kt | 14 +- .../fsck/k9/message/PgpMessageBuilderTest.kt | 56 ++++---- .../MessageDetailsParticipantFormatterTest.kt | 4 +- .../ui/messagelist/MessageListAdapterTest.kt | 32 ++--- .../DisplayRecipientsExtractorTest.kt | 22 +-- .../MessageViewRecipientFormatterTest.kt | 10 +- .../messageview/RecipientLayoutCreatorTest.kt | 22 +-- .../ui/widget/list/MessageListConfig.kt | 2 +- .../k9mail/ui/widget/list/MessageListItem.kt | 2 +- .../ui/widget/list/MessageListItemMapper.kt | 4 +- .../ui/widget/list/MessageListLoader.kt | 2 +- .../list/MessageListRemoteViewFactory.kt | 2 +- .../widget/list/MessageListWidgetManager.kt | 2 +- .../widget/list/MessageListWidgetProvider.kt | 4 +- .../java/com/fsck/k9/backend/api/Backend.kt | 8 +- .../com/fsck/k9/backend/api/BackendFolder.kt | 2 +- .../com/fsck/k9/backend/api/SyncConfig.kt | 4 +- .../app/k9mail/backend/demo/DemoBackend.kt | 8 +- .../k9mail/backend/demo/MessageStoreInfo.kt | 2 +- .../backend/imap/BackendIdleRefreshManager.kt | 2 +- .../backend/imap/CommandMoveOrCopyMessages.kt | 10 +- .../backend/imap/CommandRefreshFolderList.kt | 4 +- .../com/fsck/k9/backend/imap/CommandSearch.kt | 2 +- .../com/fsck/k9/backend/imap/ImapBackend.kt | 12 +- .../fsck/k9/backend/imap/ImapBackendPusher.kt | 4 +- .../fsck/k9/backend/imap/ImapFolderPusher.kt | 4 +- .../java/com/fsck/k9/backend/imap/ImapSync.kt | 48 +++---- .../imap/BackendIdleRefreshManagerTest.kt | 2 +- .../com/fsck/k9/backend/imap/ImapSyncTest.kt | 12 +- .../fsck/k9/backend/imap/TestImapFolder.kt | 8 +- .../com/fsck/k9/backend/imap/TestImapStore.kt | 2 +- .../com/fsck/k9/backend/jmap/CommandDelete.kt | 8 +- .../com/fsck/k9/backend/jmap/CommandMove.kt | 4 +- .../backend/jmap/CommandRefreshFolderList.kt | 12 +- .../fsck/k9/backend/jmap/CommandSetFlag.kt | 10 +- .../com/fsck/k9/backend/jmap/CommandSync.kt | 16 +-- .../com/fsck/k9/backend/jmap/CommandUpload.kt | 4 +- .../com/fsck/k9/backend/jmap/JmapBackend.kt | 8 +- .../com/fsck/k9/backend/jmap/JmapConfig.kt | 2 +- .../k9/backend/jmap/JmapUploadResponse.kt | 2 +- .../jmap/CommandRefreshFolderListTest.kt | 14 +- .../fsck/k9/backend/jmap/CommandSyncTest.kt | 38 ++--- .../k9/backend/jmap/LoggingSyncListener.kt | 2 +- .../com/fsck/k9/backend/pop3/Pop3Backend.kt | 10 +- .../webdav/CommandRefreshFolderList.kt | 2 +- .../fsck/k9/backend/webdav/WebDavBackend.kt | 10 +- build.gradle.kts | 2 +- cli/html-cleaner-cli/src/main/kotlin/Main.kt | 2 +- .../k9/mail/AuthenticationFailedException.kt | 2 +- .../com/fsck/k9/mail/BoundaryGenerator.kt | 2 +- .../com/fsck/k9/mail/MessageDownloadState.kt | 2 +- .../main/java/com/fsck/k9/mail/MimeType.kt | 2 +- .../java/com/fsck/k9/mail/ServerSettings.kt | 2 +- .../com/fsck/k9/mail/internet/DecoderUtil.kt | 4 +- .../fsck/k9/mail/internet/MimeExtensions.kt | 2 +- .../fsck/k9/mail/internet/MimeHeaderParser.kt | 2 +- .../k9/mail/internet/MimeParameterDecoder.kt | 10 +- .../com/fsck/k9/mail/internet/MimeValue.kt | 2 +- .../fsck/k9/mail/internet/ParameterSection.kt | 8 +- .../k9/mail/message/MessageHeaderParser.kt | 2 +- .../com/fsck/k9/mail/ssl/LocalKeyStore.kt | 2 +- .../com/fsck/k9/mail/BoundaryGeneratorTest.kt | 2 +- .../test/java/com/fsck/k9/mail/MessageTest.kt | 6 +- .../mail/internet/AddressHeaderBuilderTest.kt | 6 +- .../fsck/k9/mail/internet/EncoderUtilTest.kt | 2 +- .../mail/internet/FlowedMessageUtilsTest.kt | 12 +- .../mail/internet/MessageIdGeneratorTest.kt | 2 +- .../mail/internet/MimeParameterDecoderTest.kt | 36 ++--- .../mail/internet/MimeParameterEncoderTest.kt | 36 ++--- .../fsck/k9/mail/store/imap/FolderListItem.kt | 2 +- .../com/fsck/k9/mail/store/imap/ImapFolder.kt | 8 +- .../k9/mail/store/imap/ImapFolderIdler.kt | 6 +- .../com/fsck/k9/mail/store/imap/ImapStore.kt | 2 +- .../k9/mail/store/imap/ImapStoreSettings.kt | 2 +- .../k9/mail/store/imap/RealImapConnection.kt | 17 +-- .../fsck/k9/mail/store/imap/RealImapFolder.kt | 34 ++--- .../k9/mail/store/imap/RealImapFolderIdler.kt | 4 +- .../fsck/k9/mail/store/imap/RealImapStore.kt | 8 +- .../mail/store/imap/RealImapConnectionTest.kt | 22 +-- .../store/imap/RealImapFolderIdlerTest.kt | 2 +- .../k9/mail/store/imap/RealImapFolderTest.kt | 32 ++--- .../k9/mail/store/imap/RealImapStoreTest.kt | 28 ++-- .../k9/mail/store/imap/SimpleImapSettings.kt | 2 +- .../k9/mail/store/imap/TestImapConnection.kt | 2 +- .../fsck/k9/mail/store/imap/TestImapFolder.kt | 10 +- .../k9/mail/store/pop3/Pop3ConnectionTest.kt | 4 +- .../fsck/k9/mail/store/pop3/Pop3StoreTest.kt | 6 +- .../mail/transport/smtp/EnhancedStatusCode.kt | 2 +- .../smtp/NegativeSmtpReplyException.kt | 4 +- .../k9/mail/transport/smtp/SmtpResponse.kt | 2 +- .../mail/transport/smtp/SmtpResponseParser.kt | 10 +- .../k9/mail/transport/smtp/SmtpTransport.kt | 19 +-- .../k9/mail/transport/smtp/StatusCodeClass.kt | 2 +- .../transport/smtp/SmtpResponseParserTest.kt | 48 +++---- .../mail/transport/smtp/SmtpResponseTest.kt | 28 ++-- .../mail/transport/smtp/SmtpTransportTest.kt | 18 +-- .../k9/mail/transport/smtp/TestSmtpLogger.kt | 2 +- .../bottomsheet/ToolbarBottomSheetDialog.kt | 6 +- 487 files changed, 1923 insertions(+), 1889 deletions(-) diff --git a/.editorconfig b/.editorconfig index 98538ba0f8a..0873c683701 100644 --- a/.editorconfig +++ b/.editorconfig @@ -8,6 +8,8 @@ insert_final_newline = true [*.{kt,kts}] ij_kotlin_imports_layout = *,^* +ij_kotlin_allow_trailing_comma = true +ij_kotlin_allow_trailing_comma_on_call_site = true [*.{yml,yaml,json,toml}] indent_size = 2 diff --git a/app/autodiscovery/api/src/main/java/com/fsck/k9/autodiscovery/api/ConnectionSettingsDiscovery.kt b/app/autodiscovery/api/src/main/java/com/fsck/k9/autodiscovery/api/ConnectionSettingsDiscovery.kt index 4ef3af58005..8f59788a54e 100644 --- a/app/autodiscovery/api/src/main/java/com/fsck/k9/autodiscovery/api/ConnectionSettingsDiscovery.kt +++ b/app/autodiscovery/api/src/main/java/com/fsck/k9/autodiscovery/api/ConnectionSettingsDiscovery.kt @@ -15,5 +15,5 @@ data class DiscoveredServerSettings( val port: Int, val security: ConnectionSecurity, val authType: AuthType?, - val username: String? + val username: String?, ) diff --git a/app/autodiscovery/providersxml/src/main/java/com/fsck/k9/autodiscovery/providersxml/ProvidersXmlDiscovery.kt b/app/autodiscovery/providersxml/src/main/java/com/fsck/k9/autodiscovery/providersxml/ProvidersXmlDiscovery.kt index fa8aff880a8..6c4453078ee 100644 --- a/app/autodiscovery/providersxml/src/main/java/com/fsck/k9/autodiscovery/providersxml/ProvidersXmlDiscovery.kt +++ b/app/autodiscovery/providersxml/src/main/java/com/fsck/k9/autodiscovery/providersxml/ProvidersXmlDiscovery.kt @@ -15,7 +15,7 @@ import timber.log.Timber class ProvidersXmlDiscovery( private val xmlProvider: ProvidersXmlProvider, - private val oAuthConfigurationProvider: OAuthConfigurationProvider + private val oAuthConfigurationProvider: OAuthConfigurationProvider, ) : ConnectionSettingsDiscovery { override fun discover(email: String): DiscoveryResults? { @@ -151,6 +151,6 @@ class ProvidersXmlDiscovery( val incomingUriTemplate: String, val incomingUsernameTemplate: String, val outgoingUriTemplate: String, - val outgoingUsernameTemplate: String + val outgoingUsernameTemplate: String, ) } diff --git a/app/autodiscovery/providersxml/src/test/java/com/fsck/k9/autodiscovery/providersxml/ProvidersXmlDiscoveryTest.kt b/app/autodiscovery/providersxml/src/test/java/com/fsck/k9/autodiscovery/providersxml/ProvidersXmlDiscoveryTest.kt index d37fae5611d..a0fab7042e5 100644 --- a/app/autodiscovery/providersxml/src/test/java/com/fsck/k9/autodiscovery/providersxml/ProvidersXmlDiscoveryTest.kt +++ b/app/autodiscovery/providersxml/src/test/java/com/fsck/k9/autodiscovery/providersxml/ProvidersXmlDiscoveryTest.kt @@ -36,7 +36,7 @@ class ProvidersXmlDiscoveryTest : RobolectricTest() { @Test fun discover_withUnknownDomain_shouldReturnNull() { val connectionSettings = providersXmlDiscovery.discover( - "user@not.present.in.providers.xml.example" + "user@not.present.in.providers.xml.example", ) assertThat(connectionSettings).isNull() @@ -48,14 +48,14 @@ class ProvidersXmlDiscoveryTest : RobolectricTest() { scopes = listOf("irrelevant"), authorizationEndpoint = "irrelevant", tokenEndpoint = "irrelevant", - redirectUri = "irrelevant" + redirectUri = "irrelevant", ) return OAuthConfigurationProvider( configurations = mapOf( - listOf("imap.gmail.com", "smtp.gmail.com") to googleConfig + listOf("imap.gmail.com", "smtp.gmail.com") to googleConfig, ), - googleConfiguration = googleConfig + googleConfiguration = googleConfig, ) } } diff --git a/app/autodiscovery/srvrecords/src/main/java/com/fsck/k9/autodiscovery/srvrecords/MiniDnsSrvResolver.kt b/app/autodiscovery/srvrecords/src/main/java/com/fsck/k9/autodiscovery/srvrecords/MiniDnsSrvResolver.kt index 46bc65aa468..d91a28e8fcc 100644 --- a/app/autodiscovery/srvrecords/src/main/java/com/fsck/k9/autodiscovery/srvrecords/MiniDnsSrvResolver.kt +++ b/app/autodiscovery/srvrecords/src/main/java/com/fsck/k9/autodiscovery/srvrecords/MiniDnsSrvResolver.kt @@ -12,7 +12,7 @@ class MiniDnsSrvResolver : SrvResolver { val result = ResolverApi.INSTANCE.resolveSrv( DnsLabel.from(type.label), SrvProto.tcp.dnsLabel, - DnsName.from(domain) + DnsName.from(domain), ) val security = if (type.assumeTls) SSL_TLS_REQUIRED else STARTTLS_REQUIRED @@ -22,7 +22,7 @@ class MiniDnsSrvResolver : SrvResolver { host = it.target.toString(), port = it.port, priority = it.priority, - security = security + security = security, ) } } diff --git a/app/autodiscovery/srvrecords/src/main/java/com/fsck/k9/autodiscovery/srvrecords/SrvServiceDiscovery.kt b/app/autodiscovery/srvrecords/src/main/java/com/fsck/k9/autodiscovery/srvrecords/SrvServiceDiscovery.kt index 9dbbfdbd76d..d698507fdb2 100644 --- a/app/autodiscovery/srvrecords/src/main/java/com/fsck/k9/autodiscovery/srvrecords/SrvServiceDiscovery.kt +++ b/app/autodiscovery/srvrecords/src/main/java/com/fsck/k9/autodiscovery/srvrecords/SrvServiceDiscovery.kt @@ -8,7 +8,7 @@ import com.fsck.k9.mail.AuthType import com.fsck.k9.mail.ConnectionSecurity class SrvServiceDiscovery( - private val srvResolver: MiniDnsSrvResolver + private val srvResolver: MiniDnsSrvResolver, ) : ConnectionSettingsDiscovery { override fun discover(email: String): DiscoveryResults? { @@ -36,7 +36,7 @@ fun newServerSettings(service: MailService, email: String): DiscoveredServerSett service.port, service.security, AuthType.PLAIN, - email + email, ) } @@ -44,7 +44,7 @@ enum class SrvType(val label: String, val protocol: String, val assumeTls: Boole SUBMISSIONS("_submissions", "smtp", true), SUBMISSION("_submission", "smtp", false), IMAPS("_imaps", "imap", true), - IMAP("_imap", "imap", false) + IMAP("_imap", "imap", false), } data class MailService( @@ -52,5 +52,5 @@ data class MailService( val host: String, val port: Int, val priority: Int, - val security: ConnectionSecurity + val security: ConnectionSecurity, ) diff --git a/app/autodiscovery/srvrecords/src/test/java/com/fsck/k9/autodiscovery/srvrecords/SrvServiceDiscoveryTest.kt b/app/autodiscovery/srvrecords/src/test/java/com/fsck/k9/autodiscovery/srvrecords/SrvServiceDiscoveryTest.kt index 73425a50fff..5e7238104c7 100644 --- a/app/autodiscovery/srvrecords/src/test/java/com/fsck/k9/autodiscovery/srvrecords/SrvServiceDiscoveryTest.kt +++ b/app/autodiscovery/srvrecords/src/test/java/com/fsck/k9/autodiscovery/srvrecords/SrvServiceDiscoveryTest.kt @@ -24,8 +24,8 @@ class SrvServiceDiscoveryTest { val srvResolver = newMockSrvResolver( imapServices = listOf(newMailService(port = 143, srvType = SrvType.IMAP)), imapsServices = listOf( - newMailService(port = 993, srvType = SrvType.IMAPS, security = ConnectionSecurity.SSL_TLS_REQUIRED) - ) + newMailService(port = 993, srvType = SrvType.IMAPS, security = ConnectionSecurity.SSL_TLS_REQUIRED), + ), ) val srvServiceDiscovery = SrvServiceDiscovery(srvResolver) @@ -42,14 +42,14 @@ class SrvServiceDiscoveryTest { newMailService( port = 25, srvType = SrvType.SUBMISSION, - security = ConnectionSecurity.STARTTLS_REQUIRED + security = ConnectionSecurity.STARTTLS_REQUIRED, ), newMailService( port = 465, srvType = SrvType.SUBMISSIONS, - security = ConnectionSecurity.SSL_TLS_REQUIRED - ) - ) + security = ConnectionSecurity.SSL_TLS_REQUIRED, + ), + ), ) val srvServiceDiscovery = SrvServiceDiscovery(srvResolver) @@ -68,15 +68,15 @@ class SrvServiceDiscoveryTest { port = 25, srvType = SrvType.SUBMISSION, security = ConnectionSecurity.STARTTLS_REQUIRED, - priority = 0 + priority = 0, ), newMailService( host = "smtp2.example.com", port = 25, srvType = SrvType.SUBMISSION, security = ConnectionSecurity.STARTTLS_REQUIRED, - priority = 1 - ) + priority = 1, + ), ), submissionsServices = listOf( newMailService( @@ -84,15 +84,15 @@ class SrvServiceDiscoveryTest { port = 465, srvType = SrvType.SUBMISSIONS, security = ConnectionSecurity.SSL_TLS_REQUIRED, - priority = 0 + priority = 0, ), newMailService( host = "smtp4.example.com", port = 465, srvType = SrvType.SUBMISSIONS, security = ConnectionSecurity.SSL_TLS_REQUIRED, - priority = 1 - ) + priority = 1, + ), ), imapServices = listOf( newMailService( @@ -100,15 +100,15 @@ class SrvServiceDiscoveryTest { port = 143, srvType = SrvType.IMAP, security = ConnectionSecurity.STARTTLS_REQUIRED, - priority = 0 + priority = 0, ), newMailService( host = "imap2.example.com", port = 143, srvType = SrvType.IMAP, security = ConnectionSecurity.STARTTLS_REQUIRED, - priority = 1 - ) + priority = 1, + ), ), imapsServices = listOf( newMailService( @@ -116,16 +116,16 @@ class SrvServiceDiscoveryTest { port = 993, srvType = SrvType.IMAPS, security = ConnectionSecurity.SSL_TLS_REQUIRED, - priority = 0 + priority = 0, ), newMailService( host = "imaps2.example.com", port = 993, srvType = SrvType.IMAPS, security = ConnectionSecurity.SSL_TLS_REQUIRED, - priority = 1 - ) - ) + priority = 1, + ), + ), ) val srvServiceDiscovery = SrvServiceDiscovery(srvResolver) @@ -136,18 +136,18 @@ class SrvServiceDiscoveryTest { "smtp3.example.com", "smtp1.example.com", "smtp4.example.com", - "smtp2.example.com" + "smtp2.example.com", ), - result?.outgoing?.map { it.host } + result?.outgoing?.map { it.host }, ) assertEquals( listOf( "imaps1.example.com", "imap1.example.com", "imaps2.example.com", - "imap2.example.com" + "imap2.example.com", ), - result?.incoming?.map { it.host } + result?.incoming?.map { it.host }, ) } @@ -156,7 +156,7 @@ class SrvServiceDiscoveryTest { priority: Int = 0, security: ConnectionSecurity = ConnectionSecurity.STARTTLS_REQUIRED, srvType: SrvType, - port: Int + port: Int, ): MailService { return MailService(srvType, host, port, priority, security) } @@ -166,7 +166,7 @@ class SrvServiceDiscoveryTest { submissionServices: List = listOf(), submissionsServices: List = listOf(), imapServices: List = listOf(), - imapsServices: List = listOf() + imapsServices: List = listOf(), ): MiniDnsSrvResolver { return mock { on { lookup(host, SrvType.SUBMISSION) } doReturn submissionServices diff --git a/app/autodiscovery/thunderbird/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigUrlProvider.kt b/app/autodiscovery/thunderbird/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigUrlProvider.kt index bffb1e20f3f..33f3e41f2ef 100644 --- a/app/autodiscovery/thunderbird/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigUrlProvider.kt +++ b/app/autodiscovery/thunderbird/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigUrlProvider.kt @@ -13,7 +13,7 @@ class ThunderbirdAutoconfigUrlProvider { createProviderUrl(domain, email), createDomainUrl(scheme = "https", domain), createDomainUrl(scheme = "http", domain), - createIspDbUrl(domain) + createIspDbUrl(domain), ) } diff --git a/app/autodiscovery/thunderbird/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdDiscovery.kt b/app/autodiscovery/thunderbird/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdDiscovery.kt index 23d16819ad7..87a3495f165 100644 --- a/app/autodiscovery/thunderbird/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdDiscovery.kt +++ b/app/autodiscovery/thunderbird/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdDiscovery.kt @@ -6,7 +6,7 @@ import com.fsck.k9.autodiscovery.api.DiscoveryResults class ThunderbirdDiscovery( private val urlProvider: ThunderbirdAutoconfigUrlProvider, private val fetcher: ThunderbirdAutoconfigFetcher, - private val parser: ThunderbirdAutoconfigParser + private val parser: ThunderbirdAutoconfigParser, ) : ConnectionSettingsDiscovery { override fun discover(email: String): DiscoveryResults? { diff --git a/app/autodiscovery/thunderbird/src/test/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigTest.kt b/app/autodiscovery/thunderbird/src/test/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigTest.kt index ca7dc0f1c2d..85cf04a52d5 100644 --- a/app/autodiscovery/thunderbird/src/test/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigTest.kt +++ b/app/autodiscovery/thunderbird/src/test/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigTest.kt @@ -162,11 +162,11 @@ class ThunderbirdAutoconfigTest { port = 993, security = ConnectionSecurity.SSL_TLS_REQUIRED, authType = AuthType.PLAIN, - username = "test@metacode.biz" - ) + username = "test@metacode.biz", + ), ), - listOf() - ) + listOf(), + ), ) } } diff --git a/app/autodiscovery/thunderbird/src/test/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigUrlProviderTest.kt b/app/autodiscovery/thunderbird/src/test/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigUrlProviderTest.kt index d285a3ac02f..30f88aee551 100644 --- a/app/autodiscovery/thunderbird/src/test/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigUrlProviderTest.kt +++ b/app/autodiscovery/thunderbird/src/test/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigUrlProviderTest.kt @@ -14,7 +14,7 @@ class ThunderbirdAutoconfigUrlProviderTest { "https://autoconfig.domain.example/mail/config-v1.1.xml?emailaddress=test%40domain.example", "https://domain.example/.well-known/autoconfig/mail/config-v1.1.xml", "http://domain.example/.well-known/autoconfig/mail/config-v1.1.xml", - "https://autoconfig.thunderbird.net/v1.1/domain.example" + "https://autoconfig.thunderbird.net/v1.1/domain.example", ) } } diff --git a/app/core/src/main/java/com/fsck/k9/Account.kt b/app/core/src/main/java/com/fsck/k9/Account.kt index 9dc569a0b8e..b5ad45f9c8d 100644 --- a/app/core/src/main/java/com/fsck/k9/Account.kt +++ b/app/core/src/main/java/com/fsck/k9/Account.kt @@ -613,41 +613,42 @@ class Account(override val uuid: String) : BaseAccount { ALL, FIRST_CLASS, FIRST_AND_SECOND_CLASS, - NOT_SECOND_CLASS + NOT_SECOND_CLASS, } enum class SpecialFolderSelection { AUTOMATIC, - MANUAL + MANUAL, } enum class ShowPictures { NEVER, ALWAYS, - ONLY_FROM_CONTACTS + ONLY_FROM_CONTACTS, } enum class Searchable { ALL, DISPLAYABLE, - NONE + NONE, } enum class QuoteStyle { PREFIX, - HEADER + HEADER, } enum class MessageFormat { TEXT, HTML, - AUTO + AUTO, } enum class Expunge { EXPUNGE_IMMEDIATELY, EXPUNGE_MANUALLY, - EXPUNGE_ON_POLL; + EXPUNGE_ON_POLL, + ; fun toBackendExpungePolicy(): ExpungePolicy = when (this) { EXPUNGE_IMMEDIATELY -> ExpungePolicy.IMMEDIATELY @@ -660,7 +661,8 @@ class Account(override val uuid: String) : BaseAccount { NEVER(0), SEVEN_DAYS(1), ON_DELETE(2), - MARK_AS_READ(3); + MARK_AS_READ(3), + ; companion object { fun fromInt(initialSetting: Int): DeletePolicy { @@ -676,7 +678,7 @@ class Account(override val uuid: String) : BaseAccount { SORT_SENDER(true), SORT_UNREAD(true), SORT_FLAGGED(true), - SORT_ATTACHMENT(true); + SORT_ATTACHMENT(true), } companion object { diff --git a/app/core/src/main/java/com/fsck/k9/AccountPreferenceSerializer.kt b/app/core/src/main/java/com/fsck/k9/AccountPreferenceSerializer.kt index 851bf8d9e34..8bb1a21c636 100644 --- a/app/core/src/main/java/com/fsck/k9/AccountPreferenceSerializer.kt +++ b/app/core/src/main/java/com/fsck/k9/AccountPreferenceSerializer.kt @@ -23,7 +23,7 @@ import timber.log.Timber class AccountPreferenceSerializer( private val storageManager: StorageManager, private val resourceProvider: CoreResourceProvider, - private val serverSettingsSerializer: ServerSettingsSerializer + private val serverSettingsSerializer: ServerSettingsSerializer, ) { @Synchronized @@ -31,10 +31,10 @@ class AccountPreferenceSerializer( val accountUuid = account.uuid with(account) { incomingServerSettings = serverSettingsSerializer.deserialize( - storage.getString("$accountUuid.$INCOMING_SERVER_SETTINGS_KEY", "") + storage.getString("$accountUuid.$INCOMING_SERVER_SETTINGS_KEY", ""), ) outgoingServerSettings = serverSettingsSerializer.deserialize( - storage.getString("$accountUuid.$OUTGOING_SERVER_SETTINGS_KEY", "") + storage.getString("$accountUuid.$OUTGOING_SERVER_SETTINGS_KEY", ""), ) oAuthState = storage.getString("$accountUuid.oAuthState", null) localStorageProviderId = storage.getString("$accountUuid.localStorageProvider", storageManager.defaultProviderId) @@ -69,7 +69,7 @@ class AccountPreferenceSerializer( val draftsFolderSelection = getEnumStringPref( storage, "$accountUuid.draftsFolderSelection", - SpecialFolderSelection.AUTOMATIC + SpecialFolderSelection.AUTOMATIC, ) setDraftsFolderId(draftsFolderId, draftsFolderSelection) @@ -77,7 +77,7 @@ class AccountPreferenceSerializer( val sentFolderSelection = getEnumStringPref( storage, "$accountUuid.sentFolderSelection", - SpecialFolderSelection.AUTOMATIC + SpecialFolderSelection.AUTOMATIC, ) setSentFolderId(sentFolderId, sentFolderSelection) @@ -85,7 +85,7 @@ class AccountPreferenceSerializer( val trashFolderSelection = getEnumStringPref( storage, "$accountUuid.trashFolderSelection", - SpecialFolderSelection.AUTOMATIC + SpecialFolderSelection.AUTOMATIC, ) setTrashFolderId(trashFolderId, trashFolderSelection) @@ -93,7 +93,7 @@ class AccountPreferenceSerializer( val archiveFolderSelection = getEnumStringPref( storage, "$accountUuid.archiveFolderSelection", - SpecialFolderSelection.AUTOMATIC + SpecialFolderSelection.AUTOMATIC, ) setArchiveFolderId(archiveFolderId, archiveFolderSelection) @@ -101,7 +101,7 @@ class AccountPreferenceSerializer( val spamFolderSelection = getEnumStringPref( storage, "$accountUuid.spamFolderSelection", - SpecialFolderSelection.AUTOMATIC + SpecialFolderSelection.AUTOMATIC, ) setSpamFolderId(spamFolderId, spamFolderSelection) @@ -147,8 +147,8 @@ class AccountPreferenceSerializer( vibration = NotificationVibration( isEnabled = storage.getBoolean("$accountUuid.vibrate", false), pattern = VibratePattern.deserialize(storage.getInt("$accountUuid.vibratePattern", 0)), - repeatCount = storage.getInt("$accountUuid.vibrateTimes", 5) - ) + repeatCount = storage.getInt("$accountUuid.vibrateTimes", 5), + ), ) } @@ -210,7 +210,7 @@ class AccountPreferenceSerializer( signatureUse = signatureUse, signature = signature, description = description, - replyTo = replyTo + replyTo = replyTo, ) newIdentities.add(identity) gotOne = true @@ -228,7 +228,7 @@ class AccountPreferenceSerializer( email = email, signatureUse = signatureUse, signature = signature, - description = email + description = email, ) newIdentities.add(identity) } @@ -533,7 +533,7 @@ class AccountPreferenceSerializer( "Unable to convert preference key [%s] value [%s] to enum of type %s", key, stringPref, - defaultEnum.declaringJavaClass + defaultEnum.declaringJavaClass, ) defaultEnum @@ -603,7 +603,7 @@ class AccountPreferenceSerializer( val identity = Identity( signatureUse = false, signature = resourceProvider.defaultSignature(), - description = resourceProvider.defaultIdentityDescription() + description = resourceProvider.defaultIdentityDescription(), ) identities.add(identity) @@ -612,7 +612,7 @@ class AccountPreferenceSerializer( isRingEnabled = true, ringtone = DEFAULT_RINGTONE_URI, light = NotificationLight.Disabled, - vibration = NotificationVibration.DEFAULT + vibration = NotificationVibration.DEFAULT, ) } diff --git a/app/core/src/main/java/com/fsck/k9/AppConfig.kt b/app/core/src/main/java/com/fsck/k9/AppConfig.kt index 5609db88da0..4d3e0e9bf9c 100644 --- a/app/core/src/main/java/com/fsck/k9/AppConfig.kt +++ b/app/core/src/main/java/com/fsck/k9/AppConfig.kt @@ -1,5 +1,5 @@ package com.fsck.k9 data class AppConfig( - val componentsToDisable: List> + val componentsToDisable: List>, ) diff --git a/app/core/src/main/java/com/fsck/k9/Core.kt b/app/core/src/main/java/com/fsck/k9/Core.kt index ea140fe371d..0128027449b 100644 --- a/app/core/src/main/java/com/fsck/k9/Core.kt +++ b/app/core/src/main/java/com/fsck/k9/Core.kt @@ -70,7 +70,7 @@ object Core : EarlyInit { } else { PackageManager.COMPONENT_ENABLED_STATE_DISABLED }, - PackageManager.DONT_KILL_APP + PackageManager.DONT_KILL_APP, ) } } diff --git a/app/core/src/main/java/com/fsck/k9/CoreKoinModules.kt b/app/core/src/main/java/com/fsck/k9/CoreKoinModules.kt index 38991fcf018..276941edb51 100644 --- a/app/core/src/main/java/com/fsck/k9/CoreKoinModules.kt +++ b/app/core/src/main/java/com/fsck/k9/CoreKoinModules.kt @@ -32,5 +32,5 @@ val coreModules = listOf( preferencesModule, connectivityModule, powerModule, - loggingModule + loggingModule, ) diff --git a/app/core/src/main/java/com/fsck/k9/DI.kt b/app/core/src/main/java/com/fsck/k9/DI.kt index 00adb26ba18..f199ba90ab2 100644 --- a/app/core/src/main/java/com/fsck/k9/DI.kt +++ b/app/core/src/main/java/com/fsck/k9/DI.kt @@ -40,5 +40,5 @@ interface EarlyInit // Copied from ComponentCallbacks.inject() inline fun EarlyInit.inject( qualifier: Qualifier? = null, - noinline parameters: ParametersDefinition? = null + noinline parameters: ParametersDefinition? = null, ) = lazy { getKoin().get(qualifier, parameters) } diff --git a/app/core/src/main/java/com/fsck/k9/EmailAddressValidator.kt b/app/core/src/main/java/com/fsck/k9/EmailAddressValidator.kt index bc85dbbd920..6ba2f1f27ea 100644 --- a/app/core/src/main/java/com/fsck/k9/EmailAddressValidator.kt +++ b/app/core/src/main/java/com/fsck/k9/EmailAddressValidator.kt @@ -21,7 +21,7 @@ class EmailAddressValidator { private val EMAIL_ADDRESS_PATTERN = Pattern.compile( "^($ATEXT+(\\.$ATEXT+)*|\"$QCONTENT+\")" + - "\\@$HOST_NAME" + "\\@$HOST_NAME", ) } } diff --git a/app/core/src/main/java/com/fsck/k9/Identity.kt b/app/core/src/main/java/com/fsck/k9/Identity.kt index 6549f108558..c0c2f35c002 100644 --- a/app/core/src/main/java/com/fsck/k9/Identity.kt +++ b/app/core/src/main/java/com/fsck/k9/Identity.kt @@ -10,7 +10,7 @@ data class Identity( val email: String? = null, val signature: String? = null, val signatureUse: Boolean = false, - val replyTo: String? = null + val replyTo: String? = null, ) : Parcelable { // TODO remove when callers are converted to Kotlin fun withName(name: String?) = copy(name = name) diff --git a/app/core/src/main/java/com/fsck/k9/K9.kt b/app/core/src/main/java/com/fsck/k9/K9.kt index 08cbf947ba5..0d6df8dd4d4 100644 --- a/app/core/src/main/java/com/fsck/k9/K9.kt +++ b/app/core/src/main/java/com/fsck/k9/K9.kt @@ -345,7 +345,7 @@ object K9 : EarlyInit { lockScreenNotificationVisibility = storage.getEnum( "lockScreenNotificationVisibility", - LockScreenNotificationVisibility.MESSAGE_COUNT + LockScreenNotificationVisibility.MESSAGE_COUNT, ) splitViewMode = storage.getEnum("splitViewMode", SplitViewMode.NEVER) @@ -507,7 +507,7 @@ object K9 : EarlyInit { enum class NotificationQuickDelete { ALWAYS, FOR_SINGLE_MSG, - NEVER + NEVER, } enum class LockScreenNotificationVisibility { @@ -515,7 +515,7 @@ object K9 : EarlyInit { SENDERS, MESSAGE_COUNT, APP_NAME, - NOTHING + NOTHING, } /** @@ -524,6 +524,6 @@ object K9 : EarlyInit { enum class SplitViewMode { ALWAYS, NEVER, - WHEN_IN_LANDSCAPE + WHEN_IN_LANDSCAPE, } } diff --git a/app/core/src/main/java/com/fsck/k9/KoinModule.kt b/app/core/src/main/java/com/fsck/k9/KoinModule.kt index 85cacac5b97..a9a5267ed98 100644 --- a/app/core/src/main/java/com/fsck/k9/KoinModule.kt +++ b/app/core/src/main/java/com/fsck/k9/KoinModule.kt @@ -19,7 +19,7 @@ val mainModule = module { Preferences( storagePersister = get(), localStoreProvider = get(), - accountPreferenceSerializer = get() + accountPreferenceSerializer = get(), ) } single { get().resources } diff --git a/app/core/src/main/java/com/fsck/k9/LocalKeyStoreManager.kt b/app/core/src/main/java/com/fsck/k9/LocalKeyStoreManager.kt index 4933879bdaa..b2d31013fc3 100644 --- a/app/core/src/main/java/com/fsck/k9/LocalKeyStoreManager.kt +++ b/app/core/src/main/java/com/fsck/k9/LocalKeyStoreManager.kt @@ -6,7 +6,7 @@ import java.security.cert.CertificateException import java.security.cert.X509Certificate class LocalKeyStoreManager( - private val localKeyStore: LocalKeyStore + private val localKeyStore: LocalKeyStore, ) { /** * Add a new certificate for the incoming or outgoing server to the local key store. diff --git a/app/core/src/main/java/com/fsck/k9/NotificationLight.kt b/app/core/src/main/java/com/fsck/k9/NotificationLight.kt index 4a6f36790eb..aa003f23a06 100644 --- a/app/core/src/main/java/com/fsck/k9/NotificationLight.kt +++ b/app/core/src/main/java/com/fsck/k9/NotificationLight.kt @@ -12,7 +12,8 @@ enum class NotificationLight { Blue, Yellow, Cyan, - Magenta; + Magenta, + ; fun toColor(account: Account): Int? { return when (this) { diff --git a/app/core/src/main/java/com/fsck/k9/NotificationSettings.kt b/app/core/src/main/java/com/fsck/k9/NotificationSettings.kt index 5852e4b14d0..cafac16b011 100644 --- a/app/core/src/main/java/com/fsck/k9/NotificationSettings.kt +++ b/app/core/src/main/java/com/fsck/k9/NotificationSettings.kt @@ -7,5 +7,5 @@ data class NotificationSettings( val isRingEnabled: Boolean = false, val ringtone: String? = null, val light: NotificationLight = NotificationLight.Disabled, - val vibration: NotificationVibration = NotificationVibration.DEFAULT + val vibration: NotificationVibration = NotificationVibration.DEFAULT, ) diff --git a/app/core/src/main/java/com/fsck/k9/NotificationVibration.kt b/app/core/src/main/java/com/fsck/k9/NotificationVibration.kt index 0986baeff3c..744e701685b 100644 --- a/app/core/src/main/java/com/fsck/k9/NotificationVibration.kt +++ b/app/core/src/main/java/com/fsck/k9/NotificationVibration.kt @@ -3,7 +3,7 @@ package com.fsck.k9 data class NotificationVibration( val isEnabled: Boolean, val pattern: VibratePattern, - val repeatCount: Int + val repeatCount: Int, ) { val systemPattern: LongArray get() = getSystemPattern(pattern, repeatCount) @@ -30,14 +30,15 @@ enum class VibratePattern( /** * These are "off, on" patterns, specified in milliseconds. */ - val vibrationPattern: LongArray + val vibrationPattern: LongArray, ) { Default(vibrationPattern = longArrayOf(300, 200)), Pattern1(vibrationPattern = longArrayOf(100, 200)), Pattern2(vibrationPattern = longArrayOf(100, 500)), Pattern3(vibrationPattern = longArrayOf(200, 200)), Pattern4(vibrationPattern = longArrayOf(200, 500)), - Pattern5(vibrationPattern = longArrayOf(500, 500)); + Pattern5(vibrationPattern = longArrayOf(500, 500)), + ; fun serialize(): Int = when (this) { Default -> 0 diff --git a/app/core/src/main/java/com/fsck/k9/Preferences.kt b/app/core/src/main/java/com/fsck/k9/Preferences.kt index 84517c4cf03..c28885bdf6d 100644 --- a/app/core/src/main/java/com/fsck/k9/Preferences.kt +++ b/app/core/src/main/java/com/fsck/k9/Preferences.kt @@ -28,7 +28,7 @@ class Preferences internal constructor( private val storagePersister: StoragePersister, private val localStoreProvider: LocalStoreProvider, private val accountPreferenceSerializer: AccountPreferenceSerializer, - private val backgroundDispatcher: CoroutineDispatcher = Dispatchers.IO + private val backgroundDispatcher: CoroutineDispatcher = Dispatchers.IO, ) : AccountManager { private val accountLock = Any() private val storageLock = Any() diff --git a/app/core/src/main/java/com/fsck/k9/ServerSettingsSerializer.kt b/app/core/src/main/java/com/fsck/k9/ServerSettingsSerializer.kt index 3a9af0e271b..8724389449c 100644 --- a/app/core/src/main/java/com/fsck/k9/ServerSettingsSerializer.kt +++ b/app/core/src/main/java/com/fsck/k9/ServerSettingsSerializer.kt @@ -37,7 +37,7 @@ private val JSON_KEYS = JsonReader.Options.of( KEY_AUTHENTICATION_TYPE, KEY_USERNAME, KEY_PASSWORD, - KEY_CLIENT_CERTIFICATE_ALIAS + KEY_CLIENT_CERTIFICATE_ALIAS, ) private class ServerSettingsAdapter : JsonAdapter() { @@ -90,7 +90,7 @@ private class ServerSettingsAdapter : JsonAdapter() { username, password, clientCertificateAlias, - extra + extra, ) } diff --git a/app/core/src/main/java/com/fsck/k9/SwipeAction.kt b/app/core/src/main/java/com/fsck/k9/SwipeAction.kt index 8079a876615..6a02a1fd83f 100644 --- a/app/core/src/main/java/com/fsck/k9/SwipeAction.kt +++ b/app/core/src/main/java/com/fsck/k9/SwipeAction.kt @@ -8,5 +8,5 @@ enum class SwipeAction(val removesItem: Boolean) { Archive(removesItem = true), Delete(removesItem = true), Spam(removesItem = true), - Move(removesItem = true) + Move(removesItem = true), } diff --git a/app/core/src/main/java/com/fsck/k9/TimberLogger.kt b/app/core/src/main/java/com/fsck/k9/TimberLogger.kt index 80c1af8c50d..aa183dec476 100644 --- a/app/core/src/main/java/com/fsck/k9/TimberLogger.kt +++ b/app/core/src/main/java/com/fsck/k9/TimberLogger.kt @@ -115,7 +115,7 @@ class TimberLogger : Logger { Timber.Tree::class.java.name, Timber.DebugTree::class.java.name, TimberLogger::class.java.name, - com.fsck.k9.logging.Timber::class.java.name + com.fsck.k9.logging.Timber::class.java.name, ) } } diff --git a/app/core/src/main/java/com/fsck/k9/autocrypt/AutocryptDraftStateHeader.kt b/app/core/src/main/java/com/fsck/k9/autocrypt/AutocryptDraftStateHeader.kt index bcb3f09d465..dcbe2d35e13 100644 --- a/app/core/src/main/java/com/fsck/k9/autocrypt/AutocryptDraftStateHeader.kt +++ b/app/core/src/main/java/com/fsck/k9/autocrypt/AutocryptDraftStateHeader.kt @@ -8,7 +8,7 @@ data class AutocryptDraftStateHeader( val isReply: Boolean, val isByChoice: Boolean, val isPgpInline: Boolean, - val parameters: Map = mapOf() + val parameters: Map = mapOf(), ) { fun toHeaderValue(): String { @@ -54,7 +54,7 @@ data class AutocryptDraftStateHeader( cryptoStatus.isReplyToEncrypted, cryptoStatus.isUserChoice(), cryptoStatus.isPgpInlineModeEnabled, - mapOf() + mapOf(), ) } return AutocryptDraftStateHeader( @@ -63,7 +63,7 @@ data class AutocryptDraftStateHeader( cryptoStatus.isReplyToEncrypted, cryptoStatus.isUserChoice(), cryptoStatus.isPgpInlineModeEnabled, - mapOf() + mapOf(), ) } } diff --git a/app/core/src/main/java/com/fsck/k9/backend/BackendManager.kt b/app/core/src/main/java/com/fsck/k9/backend/BackendManager.kt index 061084c591c..71ef4d0fe56 100644 --- a/app/core/src/main/java/com/fsck/k9/backend/BackendManager.kt +++ b/app/core/src/main/java/com/fsck/k9/backend/BackendManager.kt @@ -20,7 +20,7 @@ class BackendManager(private val backendFactories: Map) backendCache[account.uuid] = BackendContainer( backend, account.incomingServerSettings, - account.outgoingServerSettings + account.outgoingServerSettings, ) } } @@ -67,7 +67,7 @@ class BackendManager(private val backendFactories: Map) private data class BackendContainer( val backend: Backend, val incomingServerSettings: ServerSettings, - val outgoingServerSettings: ServerSettings + val outgoingServerSettings: ServerSettings, ) fun interface BackendChangedListener { diff --git a/app/core/src/main/java/com/fsck/k9/cache/ExpiringCache.kt b/app/core/src/main/java/com/fsck/k9/cache/ExpiringCache.kt index 8340420856e..2c45f12dc08 100644 --- a/app/core/src/main/java/com/fsck/k9/cache/ExpiringCache.kt +++ b/app/core/src/main/java/com/fsck/k9/cache/ExpiringCache.kt @@ -6,7 +6,7 @@ internal class ExpiringCache( private val clock: Clock, private val delegateCache: Cache = InMemoryCache(), private var lastClearTime: Long = clock.time, - private val cacheTimeValidity: Long = CACHE_TIME_VALIDITY_IN_MILLIS + private val cacheTimeValidity: Long = CACHE_TIME_VALIDITY_IN_MILLIS, ) : Cache { override fun get(key: KEY): VALUE? { diff --git a/app/core/src/main/java/com/fsck/k9/cache/InMemoryCache.kt b/app/core/src/main/java/com/fsck/k9/cache/InMemoryCache.kt index 835f0a91edd..092a2771fb3 100644 --- a/app/core/src/main/java/com/fsck/k9/cache/InMemoryCache.kt +++ b/app/core/src/main/java/com/fsck/k9/cache/InMemoryCache.kt @@ -1,7 +1,7 @@ package com.fsck.k9.cache internal class InMemoryCache( - private val cache: MutableMap = mutableMapOf() + private val cache: MutableMap = mutableMapOf(), ) : Cache { override fun get(key: KEY): VALUE? { return cache[key] diff --git a/app/core/src/main/java/com/fsck/k9/cache/SynchronizedCache.kt b/app/core/src/main/java/com/fsck/k9/cache/SynchronizedCache.kt index 518f4716de4..ed3a35cc7c9 100644 --- a/app/core/src/main/java/com/fsck/k9/cache/SynchronizedCache.kt +++ b/app/core/src/main/java/com/fsck/k9/cache/SynchronizedCache.kt @@ -1,7 +1,7 @@ package com.fsck.k9.cache internal class SynchronizedCache( - private val delegateCache: Cache + private val delegateCache: Cache, ) : Cache { override fun get(key: KEY): VALUE? { diff --git a/app/core/src/main/java/com/fsck/k9/controller/DraftOperations.kt b/app/core/src/main/java/com/fsck/k9/controller/DraftOperations.kt index 83963f052d2..6437ce10b8e 100644 --- a/app/core/src/main/java/com/fsck/k9/controller/DraftOperations.kt +++ b/app/core/src/main/java/com/fsck/k9/controller/DraftOperations.kt @@ -21,14 +21,14 @@ import timber.log.Timber internal class DraftOperations( private val messagingController: @NotNull MessagingController, private val messageStoreManager: @NotNull MessageStoreManager, - private val saveMessageDataCreator: SaveMessageDataCreator + private val saveMessageDataCreator: SaveMessageDataCreator, ) { fun saveDraft( account: Account, message: Message, existingDraftId: Long?, - plaintextSubject: String? + plaintextSubject: String?, ): Long? { return try { val draftsFolderId = account.draftsFolderId ?: error("No Drafts folder configured") @@ -51,7 +51,7 @@ internal class DraftOperations( message: Message, folderId: Long, existingDraftId: Long?, - subject: String? + subject: String?, ): Long { val messageStore = messageStoreManager.getMessageStore(account) @@ -91,7 +91,7 @@ internal class DraftOperations( message: Message, folderId: Long, existingDraftId: Long?, - plaintextSubject: String? + plaintextSubject: String?, ): Long { val messageStore = messageStoreManager.getMessageStore(account) val messageData = message.toSaveMessageData(plaintextSubject) @@ -124,7 +124,7 @@ internal class DraftOperations( backend: Backend, account: Account, localFolder: LocalFolder, - localMessage: LocalMessage + localMessage: LocalMessage, ) { val folderServerId = localFolder.serverId Timber.d("Uploading message [ID: %d] to remote folder '%s'", localMessage.databaseId, folderServerId) @@ -139,7 +139,7 @@ internal class DraftOperations( if (messageServerId == null) { Timber.w( "Failed to get a server ID for the uploaded message. Removing local copy [ID: %d]", - localMessage.databaseId + localMessage.databaseId, ) localMessage.destroy() } else { diff --git a/app/core/src/main/java/com/fsck/k9/controller/KoinModule.kt b/app/core/src/main/java/com/fsck/k9/controller/KoinModule.kt index b62e67ebf14..6af24ab6724 100644 --- a/app/core/src/main/java/com/fsck/k9/controller/KoinModule.kt +++ b/app/core/src/main/java/com/fsck/k9/controller/KoinModule.kt @@ -24,13 +24,13 @@ val controllerModule = module { get(), get(), get(), - get(named("controllerExtensions")) + get(named("controllerExtensions")), ) } single { DefaultMessageCountsProvider( preferences = get(), - messageStoreManager = get() + messageStoreManager = get(), ) } } diff --git a/app/core/src/main/java/com/fsck/k9/controller/MessageCountsProvider.kt b/app/core/src/main/java/com/fsck/k9/controller/MessageCountsProvider.kt index 1d7e5f27c03..242808ec460 100644 --- a/app/core/src/main/java/com/fsck/k9/controller/MessageCountsProvider.kt +++ b/app/core/src/main/java/com/fsck/k9/controller/MessageCountsProvider.kt @@ -21,7 +21,7 @@ data class MessageCounts(val unread: Int, val starred: Int) internal class DefaultMessageCountsProvider( private val preferences: Preferences, - private val messageStoreManager: MessageStoreManager + private val messageStoreManager: MessageStoreManager, ) : MessageCountsProvider { override fun getMessageCounts(account: Account): MessageCounts { val search = LocalSearch().apply { @@ -66,7 +66,7 @@ internal class DefaultMessageCountsProvider( val messageStore = messageStoreManager.getMessageStore(account) return MessageCounts( unread = messageStore.getUnreadMessageCount(conditions), - starred = messageStore.getStarredMessageCount(conditions) + starred = messageStore.getStarredMessageCount(conditions), ) } catch (e: Exception) { Timber.e(e, "Unable to getMessageCounts for account: %s", account) diff --git a/app/core/src/main/java/com/fsck/k9/controller/MessageReference.kt b/app/core/src/main/java/com/fsck/k9/controller/MessageReference.kt index 13ae584a8c8..a4f012279fa 100644 --- a/app/core/src/main/java/com/fsck/k9/controller/MessageReference.kt +++ b/app/core/src/main/java/com/fsck/k9/controller/MessageReference.kt @@ -6,7 +6,7 @@ import java.util.StringTokenizer data class MessageReference( val accountUuid: String, val folderId: Long, - val uid: String + val uid: String, ) { fun toIdentityString(): String { return buildString { diff --git a/app/core/src/main/java/com/fsck/k9/controller/NotificationOperations.kt b/app/core/src/main/java/com/fsck/k9/controller/NotificationOperations.kt index 8ab0a7f4485..ee3e77ea531 100644 --- a/app/core/src/main/java/com/fsck/k9/controller/NotificationOperations.kt +++ b/app/core/src/main/java/com/fsck/k9/controller/NotificationOperations.kt @@ -12,7 +12,7 @@ import com.fsck.k9.search.isUnifiedInbox internal class NotificationOperations( private val notificationController: NotificationController, private val preferences: Preferences, - private val messageStoreManager: MessageStoreManager + private val messageStoreManager: MessageStoreManager, ) { fun clearNotifications(search: LocalSearch) { if (search.isUnifiedInbox) { diff --git a/app/core/src/main/java/com/fsck/k9/controller/push/AccountPushController.kt b/app/core/src/main/java/com/fsck/k9/controller/push/AccountPushController.kt index c735c20bc67..cecc7182f9e 100644 --- a/app/core/src/main/java/com/fsck/k9/controller/push/AccountPushController.kt +++ b/app/core/src/main/java/com/fsck/k9/controller/push/AccountPushController.kt @@ -22,7 +22,7 @@ internal class AccountPushController( private val preferences: Preferences, private val folderRepository: FolderRepository, backgroundDispatcher: CoroutineDispatcher = Dispatchers.IO, - private val account: Account + private val account: Account, ) { private val coroutineScope = CoroutineScope(backgroundDispatcher) diff --git a/app/core/src/main/java/com/fsck/k9/controller/push/AccountPushControllerFactory.kt b/app/core/src/main/java/com/fsck/k9/controller/push/AccountPushControllerFactory.kt index 7091496d69a..3fedeb4fc6f 100644 --- a/app/core/src/main/java/com/fsck/k9/controller/push/AccountPushControllerFactory.kt +++ b/app/core/src/main/java/com/fsck/k9/controller/push/AccountPushControllerFactory.kt @@ -10,7 +10,7 @@ internal class AccountPushControllerFactory( private val backendManager: BackendManager, private val messagingController: MessagingController, private val folderRepository: FolderRepository, - private val preferences: Preferences + private val preferences: Preferences, ) { fun create(account: Account): AccountPushController { return AccountPushController( @@ -18,7 +18,7 @@ internal class AccountPushControllerFactory( messagingController, preferences, folderRepository, - account = account + account = account, ) } } diff --git a/app/core/src/main/java/com/fsck/k9/controller/push/KoinModule.kt b/app/core/src/main/java/com/fsck/k9/controller/push/KoinModule.kt index b8046a970d1..dc3934fa6a3 100644 --- a/app/core/src/main/java/com/fsck/k9/controller/push/KoinModule.kt +++ b/app/core/src/main/java/com/fsck/k9/controller/push/KoinModule.kt @@ -11,7 +11,7 @@ internal val controllerPushModule = module { backendManager = get(), messagingController = get(), folderRepository = get(), - preferences = get() + preferences = get(), ) } single { @@ -24,7 +24,7 @@ internal val controllerPushModule = module { autoSyncManager = get(), pushNotificationManager = get(), connectivityManager = get(), - accountPushControllerFactory = get() + accountPushControllerFactory = get(), ) } } diff --git a/app/core/src/main/java/com/fsck/k9/controller/push/PushController.kt b/app/core/src/main/java/com/fsck/k9/controller/push/PushController.kt index 29179005761..7340b721ca1 100644 --- a/app/core/src/main/java/com/fsck/k9/controller/push/PushController.kt +++ b/app/core/src/main/java/com/fsck/k9/controller/push/PushController.kt @@ -39,7 +39,7 @@ class PushController internal constructor( private val connectivityManager: ConnectivityManager, private val accountPushControllerFactory: AccountPushControllerFactory, private val coroutineScope: CoroutineScope = GlobalScope, - private val coroutineDispatcher: CoroutineDispatcher = Executors.newSingleThreadExecutor().asCoroutineDispatcher() + private val coroutineDispatcher: CoroutineDispatcher = Executors.newSingleThreadExecutor().asCoroutineDispatcher(), ) { private val lock = Any() private var initializationStarted = false diff --git a/app/core/src/main/java/com/fsck/k9/crypto/EncryptionExtractor.kt b/app/core/src/main/java/com/fsck/k9/crypto/EncryptionExtractor.kt index 52e0ed59fd3..97c5b472dac 100644 --- a/app/core/src/main/java/com/fsck/k9/crypto/EncryptionExtractor.kt +++ b/app/core/src/main/java/com/fsck/k9/crypto/EncryptionExtractor.kt @@ -13,5 +13,5 @@ data class EncryptionResult( val attachmentCount: Int, val previewResult: PreviewResult = PreviewResult.encrypted(), val textForSearchIndex: String? = null, - val extraContentValues: ContentValues? = null + val extraContentValues: ContentValues? = null, ) diff --git a/app/core/src/main/java/com/fsck/k9/helper/IdentityHelper.kt b/app/core/src/main/java/com/fsck/k9/helper/IdentityHelper.kt index b85683af4ed..26b0f1b65a6 100644 --- a/app/core/src/main/java/com/fsck/k9/helper/IdentityHelper.kt +++ b/app/core/src/main/java/com/fsck/k9/helper/IdentityHelper.kt @@ -11,7 +11,7 @@ object IdentityHelper { RecipientType.CC, RecipientType.X_ORIGINAL_TO, RecipientType.DELIVERED_TO, - RecipientType.X_ENVELOPE_TO + RecipientType.X_ENVELOPE_TO, ) /** diff --git a/app/core/src/main/java/com/fsck/k9/job/K9JobManager.kt b/app/core/src/main/java/com/fsck/k9/job/K9JobManager.kt index 227909e9425..1328476521e 100644 --- a/app/core/src/main/java/com/fsck/k9/job/K9JobManager.kt +++ b/app/core/src/main/java/com/fsck/k9/job/K9JobManager.kt @@ -8,7 +8,7 @@ import timber.log.Timber class K9JobManager( private val workManager: WorkManager, private val preferences: Preferences, - private val mailSyncWorkerManager: MailSyncWorkerManager + private val mailSyncWorkerManager: MailSyncWorkerManager, ) { fun scheduleAllMailJobs() { Timber.v("scheduling all jobs") diff --git a/app/core/src/main/java/com/fsck/k9/job/K9WorkerFactory.kt b/app/core/src/main/java/com/fsck/k9/job/K9WorkerFactory.kt index 9251fb4862a..155d9f27666 100644 --- a/app/core/src/main/java/com/fsck/k9/job/K9WorkerFactory.kt +++ b/app/core/src/main/java/com/fsck/k9/job/K9WorkerFactory.kt @@ -11,7 +11,7 @@ class K9WorkerFactory : WorkerFactory() { override fun createWorker( appContext: Context, workerClassName: String, - workerParameters: WorkerParameters + workerParameters: WorkerParameters, ): ListenableWorker? { val workerClass = Class.forName(workerClassName).kotlin return getKoin().getOrNull(workerClass) { parametersOf(workerParameters) } diff --git a/app/core/src/main/java/com/fsck/k9/job/MailSyncWorker.kt b/app/core/src/main/java/com/fsck/k9/job/MailSyncWorker.kt index d580c9da6ca..2e083637800 100644 --- a/app/core/src/main/java/com/fsck/k9/job/MailSyncWorker.kt +++ b/app/core/src/main/java/com/fsck/k9/job/MailSyncWorker.kt @@ -15,7 +15,7 @@ class MailSyncWorker( private val messagingController: MessagingController, private val preferences: Preferences, context: Context, - parameters: WorkerParameters + parameters: WorkerParameters, ) : Worker(context, parameters) { override fun doWork(): Result { diff --git a/app/core/src/main/java/com/fsck/k9/logging/LogFileWriter.kt b/app/core/src/main/java/com/fsck/k9/logging/LogFileWriter.kt index 831637708c6..0797c006b71 100644 --- a/app/core/src/main/java/com/fsck/k9/logging/LogFileWriter.kt +++ b/app/core/src/main/java/com/fsck/k9/logging/LogFileWriter.kt @@ -15,7 +15,7 @@ interface LogFileWriter { class LogcatLogFileWriter( private val contentResolver: ContentResolver, private val processExecutor: ProcessExecutor, - private val coroutineDispatcher: CoroutineDispatcher = Dispatchers.IO + private val coroutineDispatcher: CoroutineDispatcher = Dispatchers.IO, ) : LogFileWriter { override suspend fun writeLogTo(contentUri: Uri) { return withContext(coroutineDispatcher) { diff --git a/app/core/src/main/java/com/fsck/k9/mail/MailServerDirection.kt b/app/core/src/main/java/com/fsck/k9/mail/MailServerDirection.kt index 1a5597c58fa..4972f9073c1 100644 --- a/app/core/src/main/java/com/fsck/k9/mail/MailServerDirection.kt +++ b/app/core/src/main/java/com/fsck/k9/mail/MailServerDirection.kt @@ -2,5 +2,5 @@ package com.fsck.k9.mail enum class MailServerDirection { INCOMING, - OUTGOING + OUTGOING, } diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/AutoExpandFolderBackendFoldersRefreshListener.kt b/app/core/src/main/java/com/fsck/k9/mailstore/AutoExpandFolderBackendFoldersRefreshListener.kt index f7097988769..e6a4e50ceef 100644 --- a/app/core/src/main/java/com/fsck/k9/mailstore/AutoExpandFolderBackendFoldersRefreshListener.kt +++ b/app/core/src/main/java/com/fsck/k9/mailstore/AutoExpandFolderBackendFoldersRefreshListener.kt @@ -9,7 +9,7 @@ import com.fsck.k9.Preferences class AutoExpandFolderBackendFoldersRefreshListener( private val preferences: Preferences, private val account: Account, - private val folderRepository: FolderRepository + private val folderRepository: FolderRepository, ) : BackendFoldersRefreshListener { private var isFirstSync = false diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/CacheAwareMessageMapper.kt b/app/core/src/main/java/com/fsck/k9/mailstore/CacheAwareMessageMapper.kt index 775effd710f..1baf99bc8af 100644 --- a/app/core/src/main/java/com/fsck/k9/mailstore/CacheAwareMessageMapper.kt +++ b/app/core/src/main/java/com/fsck/k9/mailstore/CacheAwareMessageMapper.kt @@ -4,7 +4,7 @@ import com.fsck.k9.mail.Flag internal class CacheAwareMessageMapper( private val cache: MessageListCache, - private val messageMapper: MessageMapper + private val messageMapper: MessageMapper, ) : MessageMapper { override fun map(message: MessageDetailsAccessor): T? { val messageId = message.id @@ -21,7 +21,7 @@ internal class CacheAwareMessageMapper( private class CacheAwareMessageDetailsAccessor( private val cache: MessageListCache, - private val message: MessageDetailsAccessor + private val message: MessageDetailsAccessor, ) : MessageDetailsAccessor by message { override val isRead: Boolean get() { diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/CreateFolderInfo.kt b/app/core/src/main/java/com/fsck/k9/mailstore/CreateFolderInfo.kt index c2a0b4774b1..82a26f0744e 100644 --- a/app/core/src/main/java/com/fsck/k9/mailstore/CreateFolderInfo.kt +++ b/app/core/src/main/java/com/fsck/k9/mailstore/CreateFolderInfo.kt @@ -6,5 +6,5 @@ data class CreateFolderInfo( val serverId: String, val name: String, val type: FolderType, - val settings: FolderSettings + val settings: FolderSettings, ) diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/FolderRepository.kt b/app/core/src/main/java/com/fsck/k9/mailstore/FolderRepository.kt index 3fcd8f1e3a3..47d037fa07c 100644 --- a/app/core/src/main/java/com/fsck/k9/mailstore/FolderRepository.kt +++ b/app/core/src/main/java/com/fsck/k9/mailstore/FolderRepository.kt @@ -26,7 +26,7 @@ import com.fsck.k9.mail.FolderType as RemoteFolderType class FolderRepository( private val messageStoreManager: MessageStoreManager, private val accountManager: AccountManager, - private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO + private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO, ) { private val sortForDisplay = compareByDescending { it.folder.type == FolderType.INBOX } @@ -39,18 +39,18 @@ class FolderRepository( val messageStore = messageStoreManager.getMessageStore(account) return messageStore.getDisplayFolders( displayMode = displayMode ?: account.folderDisplayMode, - outboxFolderId = account.outboxFolderId + outboxFolderId = account.outboxFolderId, ) { folder -> DisplayFolder( folder = Folder( id = folder.id, name = folder.name, type = folderTypeOf(account, folder.id), - isLocalOnly = folder.isLocalOnly + isLocalOnly = folder.isLocalOnly, ), isInTopGroup = folder.isInTopGroup, unreadMessageCount = folder.unreadMessageCount, - starredMessageCount = folder.starredMessageCount + starredMessageCount = folder.starredMessageCount, ) }.sortedWith(sortForDisplay) } @@ -103,7 +103,7 @@ class FolderRepository( id = folder.id, name = folder.name, type = folderTypeOf(account, folder.id), - isLocalOnly = folder.isLocalOnly + isLocalOnly = folder.isLocalOnly, ) } } @@ -116,14 +116,14 @@ class FolderRepository( id = folder.id, name = folder.name, type = folderTypeOf(account, folder.id), - isLocalOnly = folder.isLocalOnly + isLocalOnly = folder.isLocalOnly, ), isInTopGroup = folder.isInTopGroup, isIntegrate = folder.isIntegrate, syncClass = folder.syncClass, displayClass = folder.displayClass, notifyClass = folder.notifyClass, - pushClass = folder.pushClass + pushClass = folder.pushClass, ) } } @@ -135,7 +135,7 @@ class FolderRepository( id = folder.id, serverId = folder.serverIdOrThrow(), name = folder.name, - type = folder.type.toFolderType() + type = folder.type.toFolderType(), ) } } @@ -148,14 +148,14 @@ class FolderRepository( id = folder.id, serverId = folder.serverIdOrThrow(), name = folder.name, - type = folder.type.toFolderType() + type = folder.type.toFolderType(), ), isInTopGroup = folder.isInTopGroup, isIntegrate = folder.isIntegrate, syncClass = folder.syncClass, displayClass = folder.displayClass, notifyClass = folder.notifyClass, - pushClass = folder.pushClass + pushClass = folder.pushClass, ) } } @@ -288,7 +288,7 @@ class FolderRepository( private data class AccountContainer( val account: Account, - val folderDisplayMode: FolderMode + val folderDisplayMode: FolderMode, ) data class Folder(val id: Long, val name: String, val type: FolderType, val isLocalOnly: Boolean) @@ -302,7 +302,7 @@ data class FolderDetails( val syncClass: FolderClass, val displayClass: FolderClass, val notifyClass: FolderClass, - val pushClass: FolderClass + val pushClass: FolderClass, ) data class RemoteFolderDetails( @@ -312,14 +312,14 @@ data class RemoteFolderDetails( val syncClass: FolderClass, val displayClass: FolderClass, val notifyClass: FolderClass, - val pushClass: FolderClass + val pushClass: FolderClass, ) data class DisplayFolder( val folder: Folder, val isInTopGroup: Boolean, val unreadMessageCount: Int, - val starredMessageCount: Int + val starredMessageCount: Int, ) enum class FolderType { @@ -330,5 +330,5 @@ enum class FolderType { TRASH, DRAFTS, ARCHIVE, - SPAM + SPAM, } diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/FolderSettings.kt b/app/core/src/main/java/com/fsck/k9/mailstore/FolderSettings.kt index 11d046e298d..0aa6ab7809b 100644 --- a/app/core/src/main/java/com/fsck/k9/mailstore/FolderSettings.kt +++ b/app/core/src/main/java/com/fsck/k9/mailstore/FolderSettings.kt @@ -9,5 +9,5 @@ data class FolderSettings( val notifyClass: FolderClass, val pushClass: FolderClass, val inTopGroup: Boolean, - val integrate: Boolean + val integrate: Boolean, ) diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/FolderSettingsProvider.kt b/app/core/src/main/java/com/fsck/k9/mailstore/FolderSettingsProvider.kt index cc8125d2c73..ef5dd3363fc 100644 --- a/app/core/src/main/java/com/fsck/k9/mailstore/FolderSettingsProvider.kt +++ b/app/core/src/main/java/com/fsck/k9/mailstore/FolderSettingsProvider.kt @@ -19,7 +19,7 @@ class FolderSettingsProvider(val preferences: Preferences, val account: Account) notifyClass = storage.getString("$prefix.notifyMode", null).toFolderClass(FolderClass.INHERITED), pushClass = storage.getString("$prefix.pushMode", null).toFolderClass(FolderClass.SECOND_CLASS), inTopGroup = storage.getBoolean("$prefix.inTopGroup", false), - integrate = storage.getBoolean("$prefix.integrate", false) + integrate = storage.getBoolean("$prefix.integrate", false), ).also { removeImportedFolderSettings(prefix) } diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/K9BackendFolder.kt b/app/core/src/main/java/com/fsck/k9/mailstore/K9BackendFolder.kt index c00daf0ea2c..7840816d32f 100644 --- a/app/core/src/main/java/com/fsck/k9/mailstore/K9BackendFolder.kt +++ b/app/core/src/main/java/com/fsck/k9/mailstore/K9BackendFolder.kt @@ -11,7 +11,7 @@ import com.fsck.k9.mailstore.MoreMessages as StoreMoreMessages class K9BackendFolder( private val messageStore: MessageStore, private val saveMessageDataCreator: SaveMessageDataCreator, - folderServerId: String + folderServerId: String, ) : BackendFolder { private val databaseId: String private val folderId: Long @@ -25,7 +25,7 @@ class K9BackendFolder( Init( folderId = folder.id, name = folder.name, - visibleLimit = folder.visibleLimit + visibleLimit = folder.visibleLimit, ) } ?: error("Couldn't find folder $folderServerId") diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/K9BackendStorage.kt b/app/core/src/main/java/com/fsck/k9/mailstore/K9BackendStorage.kt index 566a13ca454..450c9059e94 100644 --- a/app/core/src/main/java/com/fsck/k9/mailstore/K9BackendStorage.kt +++ b/app/core/src/main/java/com/fsck/k9/mailstore/K9BackendStorage.kt @@ -10,7 +10,7 @@ class K9BackendStorage( private val messageStore: MessageStore, private val folderSettingsProvider: FolderSettingsProvider, private val saveMessageDataCreator: SaveMessageDataCreator, - private val listeners: List + private val listeners: List, ) : BackendStorage { override fun getFolder(folderServerId: String): BackendFolder { return K9BackendFolder(messageStore, saveMessageDataCreator, folderServerId) @@ -53,7 +53,7 @@ class K9BackendStorage( serverId = folderInfo.serverId, name = folderInfo.name, type = folderInfo.type, - settings = folderSettingsProvider.getFolderSettings(folderInfo.serverId) + settings = folderSettingsProvider.getFolderSettings(folderInfo.serverId), ) } messageStore.createFolders(createFolderInfo) diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/K9BackendStorageFactory.kt b/app/core/src/main/java/com/fsck/k9/mailstore/K9BackendStorageFactory.kt index 211c74a57cf..57aa67a3b2b 100644 --- a/app/core/src/main/java/com/fsck/k9/mailstore/K9BackendStorageFactory.kt +++ b/app/core/src/main/java/com/fsck/k9/mailstore/K9BackendStorageFactory.kt @@ -8,7 +8,7 @@ class K9BackendStorageFactory( private val folderRepository: FolderRepository, private val messageStoreManager: MessageStoreManager, private val specialFolderSelectionStrategy: SpecialFolderSelectionStrategy, - private val saveMessageDataCreator: SaveMessageDataCreator + private val saveMessageDataCreator: SaveMessageDataCreator, ) { fun createBackendStorage(account: Account): K9BackendStorage { val messageStore = messageStoreManager.getMessageStore(account) @@ -17,7 +17,7 @@ class K9BackendStorageFactory( preferences, folderRepository, specialFolderSelectionStrategy, - account + account, ) val specialFolderListener = SpecialFolderBackendFoldersRefreshListener(specialFolderUpdater) val autoExpandFolderListener = AutoExpandFolderBackendFoldersRefreshListener(preferences, account, folderRepository) diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/KoinModule.kt b/app/core/src/main/java/com/fsck/k9/mailstore/KoinModule.kt index 8575c3bf55f..b485d6911d0 100644 --- a/app/core/src/main/java/com/fsck/k9/mailstore/KoinModule.kt +++ b/app/core/src/main/java/com/fsck/k9/mailstore/KoinModule.kt @@ -17,7 +17,7 @@ val mailStoreModule = module { folderRepository = get(), messageStoreManager = get(), specialFolderSelectionStrategy = get(), - saveMessageDataCreator = get() + saveMessageDataCreator = get(), ) } factory { SpecialLocalFoldersCreator(preferences = get(), localStoreProvider = get()) } @@ -31,7 +31,7 @@ val mailStoreModule = module { encryptionExtractor = get(), messagePreviewCreator = get(), messageFulltextCreator = get(), - attachmentCounter = get() + attachmentCounter = get(), ) } single { MessageListRepository(messageStoreManager = get()) } diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/MessageDetails.kt b/app/core/src/main/java/com/fsck/k9/mailstore/MessageDetails.kt index 19c14855f3e..aa681c89082 100644 --- a/app/core/src/main/java/com/fsck/k9/mailstore/MessageDetails.kt +++ b/app/core/src/main/java/com/fsck/k9/mailstore/MessageDetails.kt @@ -10,7 +10,7 @@ data class MessageDetails( val replyTo: List
, val to: List
, val cc: List
, - val bcc: List
+ val bcc: List
, ) sealed interface MessageDate { diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/MessageListRepository.kt b/app/core/src/main/java/com/fsck/k9/mailstore/MessageListRepository.kt index 2bea1c53407..c9c13d38257 100644 --- a/app/core/src/main/java/com/fsck/k9/mailstore/MessageListRepository.kt +++ b/app/core/src/main/java/com/fsck/k9/mailstore/MessageListRepository.kt @@ -3,7 +3,7 @@ package com.fsck.k9.mailstore import java.util.concurrent.CopyOnWriteArraySet class MessageListRepository( - private val messageStoreManager: MessageStoreManager + private val messageStoreManager: MessageStoreManager, ) { private val globalListeners = CopyOnWriteArraySet() private val accountListeners = CopyOnWriteArraySet>() @@ -45,7 +45,7 @@ class MessageListRepository( selection: String, selectionArgs: Array, sortOrder: String, - messageMapper: MessageMapper + messageMapper: MessageMapper, ): List { val messageStore = messageStoreManager.getMessageStore(accountUuid) val cache = MessageListCache.getCache(accountUuid) @@ -62,7 +62,7 @@ class MessageListRepository( selection: String, selectionArgs: Array, sortOrder: String, - messageMapper: MessageMapper + messageMapper: MessageMapper, ): List { val messageStore = messageStoreManager.getMessageStore(accountUuid) val cache = MessageListCache.getCache(accountUuid) @@ -78,7 +78,7 @@ class MessageListRepository( accountUuid: String, threadId: Long, sortOrder: String, - messageMapper: MessageMapper + messageMapper: MessageMapper, ): List { val messageStore = messageStoreManager.getMessageStore(accountUuid) val cache = MessageListCache.getCache(accountUuid) diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/MessageRepository.kt b/app/core/src/main/java/com/fsck/k9/mailstore/MessageRepository.kt index a73c67010e3..a8f0271fbf6 100644 --- a/app/core/src/main/java/com/fsck/k9/mailstore/MessageRepository.kt +++ b/app/core/src/main/java/com/fsck/k9/mailstore/MessageRepository.kt @@ -32,7 +32,7 @@ class MessageRepository(private val messageStoreManager: MessageStoreManager) { replyTo = replyToAddresses, to = toAddresses, cc = ccAddresses, - bcc = bccAddresses + bcc = bccAddresses, ) } @@ -63,7 +63,7 @@ class MessageRepository(private val messageStoreManager: MessageStoreManager) { "reply-to", "to", "cc", - "bcc" + "bcc", ) } } diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/MessageStore.kt b/app/core/src/main/java/com/fsck/k9/mailstore/MessageStore.kt index e72e1779341..05f7e2c7ab9 100644 --- a/app/core/src/main/java/com/fsck/k9/mailstore/MessageStore.kt +++ b/app/core/src/main/java/com/fsck/k9/mailstore/MessageStore.kt @@ -128,7 +128,7 @@ interface MessageStore { selection: String, selectionArgs: Array, sortOrder: String, - messageMapper: MessageMapper + messageMapper: MessageMapper, ): List /** @@ -138,7 +138,7 @@ interface MessageStore { selection: String, selectionArgs: Array, sortOrder: String, - messageMapper: MessageMapper + messageMapper: MessageMapper, ): List /** diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/MessageViewInfoExtractorFactory.kt b/app/core/src/main/java/com/fsck/k9/mailstore/MessageViewInfoExtractorFactory.kt index e72132c4aba..98194d8cf75 100644 --- a/app/core/src/main/java/com/fsck/k9/mailstore/MessageViewInfoExtractorFactory.kt +++ b/app/core/src/main/java/com/fsck/k9/mailstore/MessageViewInfoExtractorFactory.kt @@ -8,7 +8,7 @@ import com.fsck.k9.message.html.HtmlSettings class MessageViewInfoExtractorFactory( private val attachmentInfoExtractor: AttachmentInfoExtractor, private val htmlProcessorFactory: HtmlProcessorFactory, - private val resourceProvider: CoreResourceProvider + private val resourceProvider: CoreResourceProvider, ) { fun create(settings: HtmlSettings): MessageViewInfoExtractor { val htmlProcessor = htmlProcessorFactory.create(settings) diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/NotificationMessage.kt b/app/core/src/main/java/com/fsck/k9/mailstore/NotificationMessage.kt index dddb1073c8e..99b7375b4d6 100644 --- a/app/core/src/main/java/com/fsck/k9/mailstore/NotificationMessage.kt +++ b/app/core/src/main/java/com/fsck/k9/mailstore/NotificationMessage.kt @@ -3,5 +3,5 @@ package com.fsck.k9.mailstore data class NotificationMessage( val message: LocalMessage, val notificationId: Int?, - val timestamp: Long + val timestamp: Long, ) diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/NotifierMessageStore.kt b/app/core/src/main/java/com/fsck/k9/mailstore/NotifierMessageStore.kt index 0a63f3076a5..94adaebb842 100644 --- a/app/core/src/main/java/com/fsck/k9/mailstore/NotifierMessageStore.kt +++ b/app/core/src/main/java/com/fsck/k9/mailstore/NotifierMessageStore.kt @@ -7,7 +7,7 @@ import com.fsck.k9.mail.Flag */ class NotifierMessageStore( private val messageStore: MessageStore, - private val localStore: LocalStore + private val localStore: LocalStore, ) : MessageStore by messageStore { override fun saveRemoteMessage(folderId: Long, messageServerId: String, messageData: SaveMessageData) { diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/OutboxState.kt b/app/core/src/main/java/com/fsck/k9/mailstore/OutboxState.kt index c024d01be9b..f6600883e3c 100644 --- a/app/core/src/main/java/com/fsck/k9/mailstore/OutboxState.kt +++ b/app/core/src/main/java/com/fsck/k9/mailstore/OutboxState.kt @@ -4,5 +4,5 @@ data class OutboxState( val sendState: SendState, val numberOfSendAttempts: Int, val sendError: String?, - val sendErrorTimestamp: Long + val sendErrorTimestamp: Long, ) diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/OutboxStateRepository.kt b/app/core/src/main/java/com/fsck/k9/mailstore/OutboxStateRepository.kt index 360b9a1b51e..792c3195af2 100644 --- a/app/core/src/main/java/com/fsck/k9/mailstore/OutboxStateRepository.kt +++ b/app/core/src/main/java/com/fsck/k9/mailstore/OutboxStateRepository.kt @@ -18,7 +18,7 @@ class OutboxStateRepository(private val database: LockableDatabase, private val arrayOf(messageId.toString()), null, null, - null + null, ).use { cursor -> if (!cursor.moveToFirst()) { throw IllegalStateException("No outbox_state entry for message with id $messageId") @@ -59,7 +59,7 @@ class OutboxStateRepository(private val database: LockableDatabase, private val "UPDATE $TABLE_NAME " + "SET $COLUMN_NUMBER_OF_SEND_ATTEMPTS = $COLUMN_NUMBER_OF_SEND_ATTEMPTS + 1 " + "WHERE $COLUMN_MESSAGE_ID = ?", - arrayOf(messageId.toString()) + arrayOf(messageId.toString()), ) } } @@ -70,7 +70,7 @@ class OutboxStateRepository(private val database: LockableDatabase, private val "UPDATE $TABLE_NAME " + "SET $COLUMN_NUMBER_OF_SEND_ATTEMPTS = $COLUMN_NUMBER_OF_SEND_ATTEMPTS - 1 " + "WHERE $COLUMN_MESSAGE_ID = ?", - arrayOf(messageId.toString()) + arrayOf(messageId.toString()), ) } } @@ -115,7 +115,7 @@ class OutboxStateRepository(private val database: LockableDatabase, private val COLUMN_SEND_STATE, COLUMN_NUMBER_OF_SEND_ATTEMPTS, COLUMN_ERROR_TIMESTAMP, - COLUMN_ERROR + COLUMN_ERROR, ) } } diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/SaveMessageData.kt b/app/core/src/main/java/com/fsck/k9/mailstore/SaveMessageData.kt index a180becb03b..a3822256110 100644 --- a/app/core/src/main/java/com/fsck/k9/mailstore/SaveMessageData.kt +++ b/app/core/src/main/java/com/fsck/k9/mailstore/SaveMessageData.kt @@ -13,5 +13,5 @@ data class SaveMessageData( val attachmentCount: Int, val previewResult: PreviewResult, val textForSearchIndex: String? = null, - val encryptionType: String? + val encryptionType: String?, ) diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/SaveMessageDataCreator.kt b/app/core/src/main/java/com/fsck/k9/mailstore/SaveMessageDataCreator.kt index 8d649b9464f..4d9cc9f99e5 100644 --- a/app/core/src/main/java/com/fsck/k9/mailstore/SaveMessageDataCreator.kt +++ b/app/core/src/main/java/com/fsck/k9/mailstore/SaveMessageDataCreator.kt @@ -11,12 +11,12 @@ class SaveMessageDataCreator( private val encryptionExtractor: EncryptionExtractor, private val messagePreviewCreator: MessagePreviewCreator, private val messageFulltextCreator: MessageFulltextCreator, - private val attachmentCounter: AttachmentCounter + private val attachmentCounter: AttachmentCounter, ) { fun createSaveMessageData( message: Message, downloadState: MessageDownloadState, - subject: String? = null + subject: String? = null, ): SaveMessageData { val now = System.currentTimeMillis() val date = message.sentDate?.time ?: now @@ -34,7 +34,7 @@ class SaveMessageDataCreator( attachmentCount = encryptionResult.attachmentCount, previewResult = encryptionResult.previewResult, textForSearchIndex = encryptionResult.textForSearchIndex, - encryptionType = encryptionResult.encryptionType + encryptionType = encryptionResult.encryptionType, ) } else { SaveMessageData( @@ -46,7 +46,7 @@ class SaveMessageDataCreator( attachmentCount = attachmentCounter.getAttachmentCount(message), previewResult = messagePreviewCreator.createPreview(message), textForSearchIndex = messageFulltextCreator.createFulltext(message), - encryptionType = null + encryptionType = null, ) } } diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/SendState.kt b/app/core/src/main/java/com/fsck/k9/mailstore/SendState.kt index ba0ac59e0de..cb411c02cf8 100644 --- a/app/core/src/main/java/com/fsck/k9/mailstore/SendState.kt +++ b/app/core/src/main/java/com/fsck/k9/mailstore/SendState.kt @@ -3,7 +3,8 @@ package com.fsck.k9.mailstore enum class SendState(val databaseName: String) { READY("ready"), RETRIES_EXCEEDED("retries_exceeded"), - ERROR("error"); + ERROR("error"), + ; companion object { @JvmStatic diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/SpecialFolderBackendFoldersRefreshListener.kt b/app/core/src/main/java/com/fsck/k9/mailstore/SpecialFolderBackendFoldersRefreshListener.kt index 744407aeb14..15fb008fcdd 100644 --- a/app/core/src/main/java/com/fsck/k9/mailstore/SpecialFolderBackendFoldersRefreshListener.kt +++ b/app/core/src/main/java/com/fsck/k9/mailstore/SpecialFolderBackendFoldersRefreshListener.kt @@ -4,7 +4,7 @@ package com.fsck.k9.mailstore * Update special folders when folders are added, removed, or changed. */ class SpecialFolderBackendFoldersRefreshListener( - private val specialFolderUpdater: SpecialFolderUpdater + private val specialFolderUpdater: SpecialFolderUpdater, ) : BackendFoldersRefreshListener { override fun onBeforeFolderListRefresh() = Unit diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/SpecialFolderUpdater.kt b/app/core/src/main/java/com/fsck/k9/mailstore/SpecialFolderUpdater.kt index e25f08c7767..ec680c97587 100644 --- a/app/core/src/main/java/com/fsck/k9/mailstore/SpecialFolderUpdater.kt +++ b/app/core/src/main/java/com/fsck/k9/mailstore/SpecialFolderUpdater.kt @@ -15,7 +15,7 @@ class SpecialFolderUpdater( private val preferences: Preferences, private val folderRepository: FolderRepository, private val specialFolderSelectionStrategy: SpecialFolderSelectionStrategy, - private val account: Account + private val account: Account, ) { fun updateSpecialFolders() { val folders = folderRepository.getRemoteFolders(account) diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/SpecialLocalFoldersCreator.kt b/app/core/src/main/java/com/fsck/k9/mailstore/SpecialLocalFoldersCreator.kt index c2cd90f605e..2b5f5298fb3 100644 --- a/app/core/src/main/java/com/fsck/k9/mailstore/SpecialLocalFoldersCreator.kt +++ b/app/core/src/main/java/com/fsck/k9/mailstore/SpecialLocalFoldersCreator.kt @@ -9,7 +9,7 @@ import timber.log.Timber class SpecialLocalFoldersCreator( private val preferences: Preferences, - private val localStoreProvider: LocalStoreProvider + private val localStoreProvider: LocalStoreProvider, ) { // TODO: When rewriting the account setup code make sure this method is only called once. Until then this can be // called multiple times and we have to make sure folders are only created once. diff --git a/app/core/src/main/java/com/fsck/k9/message/Attachment.kt b/app/core/src/main/java/com/fsck/k9/message/Attachment.kt index 98a16080fa3..a57bfb64977 100644 --- a/app/core/src/main/java/com/fsck/k9/message/Attachment.kt +++ b/app/core/src/main/java/com/fsck/k9/message/Attachment.kt @@ -12,6 +12,6 @@ interface Attachment { URI_ONLY, METADATA, COMPLETE, - CANCELLED + CANCELLED, } } diff --git a/app/core/src/main/java/com/fsck/k9/message/ReplyActionStrategy.kt b/app/core/src/main/java/com/fsck/k9/message/ReplyActionStrategy.kt index a208b982093..462d354deef 100644 --- a/app/core/src/main/java/com/fsck/k9/message/ReplyActionStrategy.kt +++ b/app/core/src/main/java/com/fsck/k9/message/ReplyActionStrategy.kt @@ -27,10 +27,10 @@ class ReplyActionStrategy(private val replyRoParser: ReplyToParser) { data class ReplyActions( val defaultAction: ReplyAction?, - val additionalActions: List = emptyList() + val additionalActions: List = emptyList(), ) enum class ReplyAction { REPLY, - REPLY_ALL + REPLY_ALL, } diff --git a/app/core/src/main/java/com/fsck/k9/message/extractors/BasicPartInfoExtractor.kt b/app/core/src/main/java/com/fsck/k9/message/extractors/BasicPartInfoExtractor.kt index 9643a06f312..af499f08ff0 100644 --- a/app/core/src/main/java/com/fsck/k9/message/extractors/BasicPartInfoExtractor.kt +++ b/app/core/src/main/java/com/fsck/k9/message/extractors/BasicPartInfoExtractor.kt @@ -16,7 +16,7 @@ class BasicPartInfoExtractor { return BasicPartInfo( displayName = part.getDisplayName(contentDisposition), - size = contentDisposition?.getParameter("size")?.toLongOrNull() + size = contentDisposition?.getParameter("size")?.toLongOrNull(), ) } @@ -47,5 +47,5 @@ class BasicPartInfoExtractor { data class BasicPartInfo( val displayName: String, - val size: Long? + val size: Long?, ) diff --git a/app/core/src/main/java/com/fsck/k9/message/html/DividerReplacer.kt b/app/core/src/main/java/com/fsck/k9/message/html/DividerReplacer.kt index e5067fe0cce..d7d7d800942 100644 --- a/app/core/src/main/java/com/fsck/k9/message/html/DividerReplacer.kt +++ b/app/core/src/main/java/com/fsck/k9/message/html/DividerReplacer.kt @@ -10,7 +10,7 @@ internal object DividerReplacer : TextToHtml.HtmlModifier { "(?:" + SIMPLE_DIVIDER + "|" + ASCII_SCISSORS + ")" + "\\s*" + "(?:\\n|$)" + - ")+" + ")+", ) override fun findModifications(text: CharSequence): List { diff --git a/app/core/src/main/java/com/fsck/k9/message/html/EmailTextToHtml.kt b/app/core/src/main/java/com/fsck/k9/message/html/EmailTextToHtml.kt index fc487a75c23..81c4e2db35d 100644 --- a/app/core/src/main/java/com/fsck/k9/message/html/EmailTextToHtml.kt +++ b/app/core/src/main/java/com/fsck/k9/message/html/EmailTextToHtml.kt @@ -39,7 +39,7 @@ class EmailTextToHtml private constructor(private val text: String) { html.append( "
") diff --git a/app/core/src/main/java/com/fsck/k9/message/html/HtmlProcessorFactory.kt b/app/core/src/main/java/com/fsck/k9/message/html/HtmlProcessorFactory.kt index 555bcbe0472..6ea3392421d 100644 --- a/app/core/src/main/java/com/fsck/k9/message/html/HtmlProcessorFactory.kt +++ b/app/core/src/main/java/com/fsck/k9/message/html/HtmlProcessorFactory.kt @@ -3,7 +3,7 @@ package com.fsck.k9.message.html import app.k9mail.html.cleaner.HtmlProcessor class HtmlProcessorFactory( - private val displayHtmlFactory: DisplayHtmlFactory + private val displayHtmlFactory: DisplayHtmlFactory, ) { fun create(settings: HtmlSettings): HtmlProcessor { val displayHtml = displayHtmlFactory.create(settings) diff --git a/app/core/src/main/java/com/fsck/k9/message/html/HtmlSettings.kt b/app/core/src/main/java/com/fsck/k9/message/html/HtmlSettings.kt index 5d6a0592b18..0eb934e4bb9 100644 --- a/app/core/src/main/java/com/fsck/k9/message/html/HtmlSettings.kt +++ b/app/core/src/main/java/com/fsck/k9/message/html/HtmlSettings.kt @@ -2,5 +2,5 @@ package com.fsck.k9.message.html data class HtmlSettings( val useDarkMode: Boolean, - val useFixedWidthFont: Boolean + val useFixedWidthFont: Boolean, ) diff --git a/app/core/src/main/java/com/fsck/k9/message/html/HttpUriParser.kt b/app/core/src/main/java/com/fsck/k9/message/html/HttpUriParser.kt index 009e727ad2a..1ff4e101852 100644 --- a/app/core/src/main/java/com/fsck/k9/message/html/HttpUriParser.kt +++ b/app/core/src/main/java/com/fsck/k9/message/html/HttpUriParser.kt @@ -221,7 +221,7 @@ internal class HttpUriParser : UriParser { private fun matchUnreservedPCTEncodedSubDelimClassesGreedy( text: CharSequence, startPos: Int, - additionalCharacters: String + additionalCharacters: String, ): Int { val allowedCharacters = SUB_DELIM + "-._~" + additionalCharacters var shouldBeHex = 0 diff --git a/app/core/src/main/java/com/fsck/k9/message/html/TextToHtml.kt b/app/core/src/main/java/com/fsck/k9/message/html/TextToHtml.kt index ad0b5e6f2e6..ab634fe6575 100644 --- a/app/core/src/main/java/com/fsck/k9/message/html/TextToHtml.kt +++ b/app/core/src/main/java/com/fsck/k9/message/html/TextToHtml.kt @@ -5,7 +5,7 @@ import java.util.ArrayDeque class TextToHtml private constructor( private val text: CharSequence, private val html: StringBuilder, - private val retainOriginalWhitespace: Boolean + private val retainOriginalWhitespace: Boolean, ) { fun appendAsHtmlFragment() { appendHtmlPrefix() @@ -29,7 +29,7 @@ class TextToHtml private constructor( if (modification.endIndex > modificationStack.peek()?.endIndex ?: Int.MAX_VALUE) { error( "HtmlModification $modification must be fully contained within " + - "outer HtmlModification ${modificationStack.peek()}" + "outer HtmlModification ${modificationStack.peek()}", ) } diff --git a/app/core/src/main/java/com/fsck/k9/message/html/UriLinkifier.kt b/app/core/src/main/java/com/fsck/k9/message/html/UriLinkifier.kt index 5e7b1b4cd68..3a488fac93f 100644 --- a/app/core/src/main/java/com/fsck/k9/message/html/UriLinkifier.kt +++ b/app/core/src/main/java/com/fsck/k9/message/html/UriLinkifier.kt @@ -10,7 +10,7 @@ internal object UriLinkifier : TextToHtml.HtmlModifier { class LinkifyUri( startIndex: Int, endIndex: Int, - val uri: CharSequence + val uri: CharSequence, ) : HtmlModification.Wrap(startIndex, endIndex) { override fun appendPrefix(textToHtml: TextToHtml) { diff --git a/app/core/src/main/java/com/fsck/k9/message/html/UriMatch.kt b/app/core/src/main/java/com/fsck/k9/message/html/UriMatch.kt index 6c611242310..3601895351c 100644 --- a/app/core/src/main/java/com/fsck/k9/message/html/UriMatch.kt +++ b/app/core/src/main/java/com/fsck/k9/message/html/UriMatch.kt @@ -3,5 +3,5 @@ package com.fsck.k9.message.html data class UriMatch( val startIndex: Int, val endIndex: Int, - val uri: CharSequence + val uri: CharSequence, ) diff --git a/app/core/src/main/java/com/fsck/k9/message/html/UriMatcher.kt b/app/core/src/main/java/com/fsck/k9/message/html/UriMatcher.kt index 2d29463e8aa..068b7ae7353 100644 --- a/app/core/src/main/java/com/fsck/k9/message/html/UriMatcher.kt +++ b/app/core/src/main/java/com/fsck/k9/message/html/UriMatcher.kt @@ -10,7 +10,7 @@ object UriMatcher { "mailto:" to genericUriParser, "matrix:" to genericUriParser, "rtsp:" to httpUriParser, - "xmpp:" to genericUriParser + "xmpp:" to genericUriParser, ) } @@ -18,7 +18,7 @@ object UriMatcher { private const val ALLOWED_SEPARATORS_PATTERN = "(?:^|[$SCHEME_SEPARATORS])" private val URI_SCHEME = Regex( "$ALLOWED_SEPARATORS_PATTERN(${ SUPPORTED_URIS.keys.joinToString("|") })", - RegexOption.IGNORE_CASE + RegexOption.IGNORE_CASE, ) fun findUris(text: CharSequence): List { diff --git a/app/core/src/main/java/com/fsck/k9/message/quote/TextQuoteCreator.kt b/app/core/src/main/java/com/fsck/k9/message/quote/TextQuoteCreator.kt index 4148660a211..7eff37912c8 100644 --- a/app/core/src/main/java/com/fsck/k9/message/quote/TextQuoteCreator.kt +++ b/app/core/src/main/java/com/fsck/k9/message/quote/TextQuoteCreator.kt @@ -8,7 +8,7 @@ import com.fsck.k9.mail.Message.RecipientType class TextQuoteCreator( private val quoteDateFormatter: QuoteDateFormatter, - private val resourceProvider: CoreResourceProvider + private val resourceProvider: CoreResourceProvider, ) { private val prefixInsertionRegex = Regex("(?m)^") @@ -16,7 +16,7 @@ class TextQuoteCreator( originalMessage: Message, messageBody: String?, quoteStyle: QuoteStyle, - prefix: String + prefix: String, ): String { val body = messageBody ?: "" return when (quoteStyle) { diff --git a/app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi21.kt b/app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi21.kt index 8832f30a86b..cc2af899139 100644 --- a/app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi21.kt +++ b/app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi21.kt @@ -8,7 +8,7 @@ import android.net.ConnectivityManager as SystemConnectivityManager @Suppress("DEPRECATION") internal class ConnectivityManagerApi21( - private val systemConnectivityManager: SystemConnectivityManager + private val systemConnectivityManager: SystemConnectivityManager, ) : ConnectivityManagerBase() { private var isRunning = false private var lastNetworkType: Int? = null diff --git a/app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi23.kt b/app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi23.kt index 17fb87f3a1d..615182f2d9b 100644 --- a/app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi23.kt +++ b/app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi23.kt @@ -11,7 +11,7 @@ import android.net.ConnectivityManager as SystemConnectivityManager @RequiresApi(Build.VERSION_CODES.M) internal class ConnectivityManagerApi23( - private val systemConnectivityManager: SystemConnectivityManager + private val systemConnectivityManager: SystemConnectivityManager, ) : ConnectivityManagerBase() { private var isRunning = false private var lastActiveNetwork: Network? = null diff --git a/app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi24.kt b/app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi24.kt index b0a3dafed9c..09dd1951297 100644 --- a/app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi24.kt +++ b/app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi24.kt @@ -10,7 +10,7 @@ import android.net.ConnectivityManager as SystemConnectivityManager @RequiresApi(Build.VERSION_CODES.N) internal class ConnectivityManagerApi24( - private val systemConnectivityManager: SystemConnectivityManager + private val systemConnectivityManager: SystemConnectivityManager, ) : ConnectivityManagerBase() { private var isRunning = false private var isNetworkAvailable: Boolean? = null diff --git a/app/core/src/main/java/com/fsck/k9/notification/AddNotificationResult.kt b/app/core/src/main/java/com/fsck/k9/notification/AddNotificationResult.kt index 662235eb2f9..bd2ec9913dd 100644 --- a/app/core/src/main/java/com/fsck/k9/notification/AddNotificationResult.kt +++ b/app/core/src/main/java/com/fsck/k9/notification/AddNotificationResult.kt @@ -4,7 +4,7 @@ internal class AddNotificationResult private constructor( val notificationData: NotificationData, val notificationStoreOperations: List, val notificationHolder: NotificationHolder, - val shouldCancelNotification: Boolean + val shouldCancelNotification: Boolean, ) { val cancelNotificationId: Int get() { @@ -16,26 +16,26 @@ internal class AddNotificationResult private constructor( fun newNotification( notificationData: NotificationData, notificationStoreOperations: List, - notificationHolder: NotificationHolder + notificationHolder: NotificationHolder, ): AddNotificationResult { return AddNotificationResult( notificationData, notificationStoreOperations, notificationHolder, - shouldCancelNotification = false + shouldCancelNotification = false, ) } fun replaceNotification( notificationData: NotificationData, notificationStoreOperations: List, - notificationHolder: NotificationHolder + notificationHolder: NotificationHolder, ): AddNotificationResult { return AddNotificationResult( notificationData, notificationStoreOperations, notificationHolder, - shouldCancelNotification = true + shouldCancelNotification = true, ) } } diff --git a/app/core/src/main/java/com/fsck/k9/notification/AuthenticationErrorNotificationController.kt b/app/core/src/main/java/com/fsck/k9/notification/AuthenticationErrorNotificationController.kt index 332c7dbb426..9f931a07611 100644 --- a/app/core/src/main/java/com/fsck/k9/notification/AuthenticationErrorNotificationController.kt +++ b/app/core/src/main/java/com/fsck/k9/notification/AuthenticationErrorNotificationController.kt @@ -9,7 +9,7 @@ import com.fsck.k9.Account internal open class AuthenticationErrorNotificationController( private val notificationHelper: NotificationHelper, private val actionCreator: NotificationActionCreator, - private val resourceProvider: NotificationResourceProvider + private val resourceProvider: NotificationResourceProvider, ) { fun showAuthenticationErrorNotification(account: Account, incoming: Boolean) { val notificationId = NotificationIds.getAuthenticationErrorNotificationId(account, incoming) diff --git a/app/core/src/main/java/com/fsck/k9/notification/BaseNotificationDataCreator.kt b/app/core/src/main/java/com/fsck/k9/notification/BaseNotificationDataCreator.kt index 9fe65d367ca..e43f5a0a47e 100644 --- a/app/core/src/main/java/com/fsck/k9/notification/BaseNotificationDataCreator.kt +++ b/app/core/src/main/java/com/fsck/k9/notification/BaseNotificationDataCreator.kt @@ -17,7 +17,7 @@ internal class BaseNotificationDataCreator { color = account.chipColor, newMessagesCount = notificationData.newMessagesCount, lockScreenNotificationData = createLockScreenNotificationData(notificationData), - appearance = createNotificationAppearance(account) + appearance = createNotificationAppearance(account), ) } diff --git a/app/core/src/main/java/com/fsck/k9/notification/CertificateErrorNotificationController.kt b/app/core/src/main/java/com/fsck/k9/notification/CertificateErrorNotificationController.kt index bae4f7e45b6..1dd76bbe5b2 100644 --- a/app/core/src/main/java/com/fsck/k9/notification/CertificateErrorNotificationController.kt +++ b/app/core/src/main/java/com/fsck/k9/notification/CertificateErrorNotificationController.kt @@ -9,7 +9,7 @@ import com.fsck.k9.Account internal open class CertificateErrorNotificationController( private val notificationHelper: NotificationHelper, private val actionCreator: NotificationActionCreator, - private val resourceProvider: NotificationResourceProvider + private val resourceProvider: NotificationResourceProvider, ) { fun showCertificateErrorNotification(account: Account, incoming: Boolean) { val notificationId = NotificationIds.getCertificateErrorNotificationId(account, incoming) diff --git a/app/core/src/main/java/com/fsck/k9/notification/CoreKoinModule.kt b/app/core/src/main/java/com/fsck/k9/notification/CoreKoinModule.kt index 6b1ce148398..a4aef538081 100644 --- a/app/core/src/main/java/com/fsck/k9/notification/CoreKoinModule.kt +++ b/app/core/src/main/java/com/fsck/k9/notification/CoreKoinModule.kt @@ -14,7 +14,7 @@ val coreNotificationModule = module { authenticationErrorNotificationController = get(), syncNotificationController = get(), sendFailedNotificationController = get(), - newMailNotificationController = get() + newMailNotificationController = get(), ) } single { NotificationManagerCompat.from(get()) } @@ -27,28 +27,28 @@ val coreNotificationModule = module { backgroundExecutor = Executors.newSingleThreadExecutor(), notificationManager = get().getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager, resourceProvider = get(), - notificationLightDecoder = get() + notificationLightDecoder = get(), ) } single { AccountPreferenceSerializer( storageManager = get(), resourceProvider = get(), - serverSettingsSerializer = get() + serverSettingsSerializer = get(), ) } single { CertificateErrorNotificationController( notificationHelper = get(), actionCreator = get(), - resourceProvider = get() + resourceProvider = get(), ) } single { AuthenticationErrorNotificationController( notificationHelper = get(), actionCreator = get(), - resourceProvider = get() + resourceProvider = get(), ) } single { @@ -62,7 +62,7 @@ val coreNotificationModule = module { notificationManager = get(), newMailNotificationManager = get(), summaryNotificationCreator = get(), - singleMessageNotificationCreator = get() + singleMessageNotificationCreator = get(), ) } single { @@ -72,7 +72,7 @@ val coreNotificationModule = module { baseNotificationDataCreator = get(), singleMessageNotificationDataCreator = get(), summaryNotificationDataCreator = get(), - clock = get() + clock = get(), ) } factory { NotificationContentCreator(context = get(), resourceProvider = get()) } @@ -84,7 +84,7 @@ val coreNotificationModule = module { notificationHelper = get(), actionCreator = get(), resourceProvider = get(), - lockScreenNotificationCreator = get() + lockScreenNotificationCreator = get(), ) } factory { @@ -93,7 +93,7 @@ val coreNotificationModule = module { actionCreator = get(), lockScreenNotificationCreator = get(), singleMessageNotificationCreator = get(), - resourceProvider = get() + resourceProvider = get(), ) } factory { LockScreenNotificationCreator(notificationHelper = get(), resourceProvider = get()) } @@ -102,7 +102,7 @@ val coreNotificationModule = module { context = get(), resourceProvider = get(), notificationChannelManager = get(), - notificationManager = get() + notificationManager = get(), ) } single { @@ -110,7 +110,7 @@ val coreNotificationModule = module { notificationStoreProvider = get(), localStoreProvider = get(), messageStoreManager = get(), - notificationContentCreator = get() + notificationContentCreator = get(), ) } factory { NotificationLightDecoder() } @@ -122,7 +122,7 @@ val coreNotificationModule = module { NotificationSettingsUpdater( preferences = get(), notificationChannelManager = get(), - notificationConfigurationConverter = get() + notificationConfigurationConverter = get(), ) } } diff --git a/app/core/src/main/java/com/fsck/k9/notification/LockScreenNotificationCreator.kt b/app/core/src/main/java/com/fsck/k9/notification/LockScreenNotificationCreator.kt index e071201c0da..08d5d598357 100644 --- a/app/core/src/main/java/com/fsck/k9/notification/LockScreenNotificationCreator.kt +++ b/app/core/src/main/java/com/fsck/k9/notification/LockScreenNotificationCreator.kt @@ -5,11 +5,11 @@ import androidx.core.app.NotificationCompat internal class LockScreenNotificationCreator( private val notificationHelper: NotificationHelper, - private val resourceProvider: NotificationResourceProvider + private val resourceProvider: NotificationResourceProvider, ) { fun configureLockScreenNotification( builder: NotificationCompat.Builder, - baseNotificationData: BaseNotificationData + baseNotificationData: BaseNotificationData, ) { when (baseNotificationData.lockScreenNotificationData) { LockScreenNotificationData.None -> { diff --git a/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationController.kt b/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationController.kt index 21c850da540..01e70c3d506 100644 --- a/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationController.kt +++ b/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationController.kt @@ -12,7 +12,7 @@ internal class NewMailNotificationController( private val notificationManager: NotificationManagerCompat, private val newMailNotificationManager: NewMailNotificationManager, private val summaryNotificationCreator: SummaryNotificationCreator, - private val singleMessageNotificationCreator: SingleMessageNotificationCreator + private val singleMessageNotificationCreator: SingleMessageNotificationCreator, ) { @Synchronized fun restoreNewMailNotifications(accounts: List) { @@ -38,12 +38,12 @@ internal class NewMailNotificationController( fun removeNewMailNotifications( account: Account, clearNewMessageState: Boolean, - selector: (List) -> List + selector: (List) -> List, ) { val notificationData = newMailNotificationManager.removeNewMailNotifications( account, clearNewMessageState, - selector + selector, ) if (notificationData != null) { @@ -78,14 +78,14 @@ internal class NewMailNotificationController( private fun createSingleNotification( baseNotificationData: BaseNotificationData, - singleNotificationData: SingleNotificationData + singleNotificationData: SingleNotificationData, ) { singleMessageNotificationCreator.createSingleNotification(baseNotificationData, singleNotificationData) } private fun createSummaryNotification( baseNotificationData: BaseNotificationData, - summaryNotificationData: SummaryNotificationData + summaryNotificationData: SummaryNotificationData, ) { summaryNotificationCreator.createSummaryNotification(baseNotificationData, summaryNotificationData) } diff --git a/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationData.kt b/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationData.kt index 9069b4f85ad..89c97ade5bd 100644 --- a/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationData.kt +++ b/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationData.kt @@ -7,7 +7,7 @@ internal data class NewMailNotificationData( val cancelNotificationIds: List, val baseNotificationData: BaseNotificationData, val singleNotificationData: List, - val summaryNotificationData: SummaryNotificationData? + val summaryNotificationData: SummaryNotificationData?, ) internal data class BaseNotificationData( @@ -17,7 +17,7 @@ internal data class BaseNotificationData( val color: Int, val newMessagesCount: Int, val lockScreenNotificationData: LockScreenNotificationData, - val appearance: NotificationAppearance + val appearance: NotificationAppearance, ) internal sealed interface LockScreenNotificationData { @@ -31,7 +31,7 @@ internal sealed interface LockScreenNotificationData { internal data class NotificationAppearance( val ringtone: String?, val vibrationPattern: LongArray?, - val ledColor: Int? + val ledColor: Int?, ) internal data class SingleNotificationData( @@ -41,13 +41,13 @@ internal data class SingleNotificationData( val content: NotificationContent, val actions: List, val wearActions: List, - val addLockScreenNotification: Boolean + val addLockScreenNotification: Boolean, ) internal sealed interface SummaryNotificationData internal data class SummarySingleNotificationData( - val singleNotificationData: SingleNotificationData + val singleNotificationData: SingleNotificationData, ) : SummaryNotificationData internal data class SummaryInboxNotificationData( @@ -58,13 +58,13 @@ internal data class SummaryInboxNotificationData( val additionalMessagesCount: Int, val messageReferences: List, val actions: List, - val wearActions: List + val wearActions: List, ) : SummaryNotificationData internal enum class NotificationAction { Reply, MarkAsRead, - Delete + Delete, } internal enum class WearNotificationAction { @@ -72,16 +72,16 @@ internal enum class WearNotificationAction { MarkAsRead, Delete, Archive, - Spam + Spam, } internal enum class SummaryNotificationAction { MarkAsRead, - Delete + Delete, } internal enum class SummaryWearNotificationAction { MarkAsRead, Delete, - Archive + Archive, } diff --git a/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationManager.kt b/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationManager.kt index 3edfdb6abb4..0a8e411a54c 100644 --- a/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationManager.kt +++ b/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationManager.kt @@ -14,7 +14,7 @@ internal class NewMailNotificationManager( private val baseNotificationDataCreator: BaseNotificationDataCreator, private val singleMessageNotificationDataCreator: SingleMessageNotificationDataCreator, private val summaryNotificationDataCreator: SummaryNotificationDataCreator, - private val clock: Clock + private val clock: Clock, ) { fun restoreNewMailNotifications(account: Account): NewMailNotificationData? { val notificationData = notificationRepository.restoreNotifications(account) ?: return null @@ -26,7 +26,7 @@ internal class NewMailNotificationManager( notificationId = notificationHolder.notificationId, content = notificationHolder.content, timestamp = notificationHolder.timestamp, - addLockScreenNotification = addLockScreenNotification + addLockScreenNotification = addLockScreenNotification, ) } @@ -34,7 +34,7 @@ internal class NewMailNotificationManager( cancelNotificationIds = emptyList(), baseNotificationData = createBaseNotificationData(notificationData), singleNotificationData = singleNotificationDataList, - summaryNotificationData = createSummaryNotificationData(notificationData, silent = true) + summaryNotificationData = createSummaryNotificationData(notificationData, silent = true), ) } @@ -48,7 +48,7 @@ internal class NewMailNotificationManager( notificationId = result.notificationHolder.notificationId, content = result.notificationHolder.content, timestamp = result.notificationHolder.timestamp, - addLockScreenNotification = result.notificationData.isSingleMessageNotification + addLockScreenNotification = result.notificationData.isSingleMessageNotification, ) return NewMailNotificationData( @@ -59,14 +59,14 @@ internal class NewMailNotificationManager( }, baseNotificationData = createBaseNotificationData(result.notificationData), singleNotificationData = listOf(singleNotificationData), - summaryNotificationData = createSummaryNotificationData(result.notificationData, silent) + summaryNotificationData = createSummaryNotificationData(result.notificationData, silent), ) } fun removeNewMailNotifications( account: Account, clearNewMessageState: Boolean, - selector: (List) -> List + selector: (List) -> List, ): NewMailNotificationData? { val result = notificationRepository.removeNotifications(account, clearNewMessageState, selector) ?: return null @@ -85,7 +85,7 @@ internal class NewMailNotificationManager( notificationId = notificationHolder.notificationId, content = notificationHolder.content, timestamp = notificationHolder.timestamp, - addLockScreenNotification = result.notificationData.isSingleMessageNotification + addLockScreenNotification = result.notificationData.isSingleMessageNotification, ) } @@ -93,7 +93,7 @@ internal class NewMailNotificationManager( cancelNotificationIds = cancelNotificationIds, baseNotificationData = createBaseNotificationData(result.notificationData), singleNotificationData = singleNotificationData, - summaryNotificationData = createSummaryNotificationData(result.notificationData, silent = true) + summaryNotificationData = createSummaryNotificationData(result.notificationData, silent = true), ) } @@ -111,14 +111,14 @@ internal class NewMailNotificationManager( notificationId: Int, content: NotificationContent, timestamp: Long, - addLockScreenNotification: Boolean + addLockScreenNotification: Boolean, ): SingleNotificationData { return singleMessageNotificationDataCreator.createSingleNotificationData( account, notificationId, content, timestamp, - addLockScreenNotification + addLockScreenNotification, ) } diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationActionService.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationActionService.kt index 5dfa9a8e30a..1c706f7b85a 100644 --- a/app/core/src/main/java/com/fsck/k9/notification/NotificationActionService.kt +++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationActionService.kt @@ -174,14 +174,14 @@ class NotificationActionService : Service() { fun createMarkAllAsReadIntent( context: Context, accountUuid: String, - messageReferences: List + messageReferences: List, ): Intent { return Intent(context, NotificationActionService::class.java).apply { action = ACTION_MARK_AS_READ putExtra(EXTRA_ACCOUNT_UUID, accountUuid) putExtra( EXTRA_MESSAGE_REFERENCES, - MessageReferenceHelper.toMessageReferenceStringList(messageReferences) + MessageReferenceHelper.toMessageReferenceStringList(messageReferences), ) } } @@ -212,14 +212,14 @@ class NotificationActionService : Service() { fun createDeleteAllMessagesIntent( context: Context, accountUuid: String, - messageReferences: List + messageReferences: List, ): Intent { return Intent(context, NotificationActionService::class.java).apply { action = ACTION_DELETE putExtra(EXTRA_ACCOUNT_UUID, accountUuid) putExtra( EXTRA_MESSAGE_REFERENCES, - MessageReferenceHelper.toMessageReferenceStringList(messageReferences) + MessageReferenceHelper.toMessageReferenceStringList(messageReferences), ) } } @@ -235,14 +235,14 @@ class NotificationActionService : Service() { fun createArchiveAllIntent( context: Context, account: Account, - messageReferences: List + messageReferences: List, ): Intent { return Intent(context, NotificationActionService::class.java).apply { action = ACTION_ARCHIVE putExtra(EXTRA_ACCOUNT_UUID, account.uuid) putExtra( EXTRA_MESSAGE_REFERENCES, - MessageReferenceHelper.toMessageReferenceStringList(messageReferences) + MessageReferenceHelper.toMessageReferenceStringList(messageReferences), ) } } diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationChannelManager.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationChannelManager.kt index ad33d10d281..f2a7c998cd7 100644 --- a/app/core/src/main/java/com/fsck/k9/notification/NotificationChannelManager.kt +++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationChannelManager.kt @@ -20,7 +20,7 @@ class NotificationChannelManager( private val backgroundExecutor: Executor, private val notificationManager: NotificationManager, private val resourceProvider: NotificationResourceProvider, - private val notificationLightDecoder: NotificationLightDecoder + private val notificationLightDecoder: NotificationLightDecoder, ) { val pushChannelId = "push" @@ -55,7 +55,7 @@ class NotificationChannelManager( @RequiresApi(api = Build.VERSION_CODES.O) private fun addChannelsForAccounts( notificationManager: NotificationManager, - accounts: List + accounts: List, ) { for (account in accounts) { val groupId = account.notificationChannelGroupId @@ -73,7 +73,7 @@ class NotificationChannelManager( @RequiresApi(api = Build.VERSION_CODES.O) private fun removeChannelsForNonExistingOrChangedAccounts( notificationManager: NotificationManager, - accounts: List + accounts: List, ) { val accountUuids = accounts.map { it.uuid }.toSet() @@ -152,7 +152,7 @@ class NotificationChannelManager( isBlinkLightsEnabled = notificationChannel.shouldShowLights(), lightColor = notificationChannel.lightColor, isVibrationEnabled = notificationChannel.shouldVibrate(), - vibrationPattern = notificationChannel.vibrationPattern?.toList() + vibrationPattern = notificationChannel.vibrationPattern?.toList(), ) } @@ -196,7 +196,7 @@ class NotificationChannelManager( val systemLight = notificationLightDecoder.decode( isBlinkLightsEnabled = shouldShowLights(), lightColor = lightColor, - accountColor = account.chipColor + accountColor = account.chipColor, ) val notificationSettings = account.notificationSettings return sound == notificationSettings.ringtoneUri && @@ -253,5 +253,5 @@ data class NotificationConfiguration( val isBlinkLightsEnabled: Boolean, val lightColor: Int, val isVibrationEnabled: Boolean, - val vibrationPattern: List? + val vibrationPattern: List?, ) diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationConfigurationConverter.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationConfigurationConverter.kt index 3f40015f9d6..36847ae5b3c 100644 --- a/app/core/src/main/java/com/fsck/k9/notification/NotificationConfigurationConverter.kt +++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationConfigurationConverter.kt @@ -8,25 +8,25 @@ import com.fsck.k9.NotificationSettings */ class NotificationConfigurationConverter( private val notificationLightDecoder: NotificationLightDecoder, - private val notificationVibrationDecoder: NotificationVibrationDecoder + private val notificationVibrationDecoder: NotificationVibrationDecoder, ) { fun convert(account: Account, notificationConfiguration: NotificationConfiguration): NotificationSettings { val light = notificationLightDecoder.decode( isBlinkLightsEnabled = notificationConfiguration.isBlinkLightsEnabled, lightColor = notificationConfiguration.lightColor, - accountColor = account.chipColor + accountColor = account.chipColor, ) val vibration = notificationVibrationDecoder.decode( isVibrationEnabled = notificationConfiguration.isVibrationEnabled, - systemPattern = notificationConfiguration.vibrationPattern + systemPattern = notificationConfiguration.vibrationPattern, ) return NotificationSettings( isRingEnabled = notificationConfiguration.sound != null, ringtone = notificationConfiguration.sound?.toString(), light = light, - vibration = vibration + vibration = vibration, ) } } diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationContent.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationContent.kt index 374979d2e10..2d50ced47e8 100644 --- a/app/core/src/main/java/com/fsck/k9/notification/NotificationContent.kt +++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationContent.kt @@ -7,5 +7,5 @@ internal data class NotificationContent( val sender: String, val subject: String, val preview: CharSequence, - val summary: CharSequence + val summary: CharSequence, ) diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationContentCreator.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationContentCreator.kt index 86d85b8efa8..5639a2ec3ef 100644 --- a/app/core/src/main/java/com/fsck/k9/notification/NotificationContentCreator.kt +++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationContentCreator.kt @@ -12,7 +12,7 @@ import com.fsck.k9.message.extractors.PreviewResult.PreviewType internal class NotificationContentCreator( private val context: Context, - private val resourceProvider: NotificationResourceProvider + private val resourceProvider: NotificationResourceProvider, ) { fun createFromMessage(account: Account, message: LocalMessage): NotificationContent { val sender = getMessageSender(account, message) @@ -22,7 +22,7 @@ internal class NotificationContentCreator( sender = getMessageSenderForDisplay(sender), subject = getMessageSubject(message), preview = getMessagePreview(message), - summary = buildMessageSummary(sender, getMessageSubject(message)) + summary = buildMessageSummary(sender, getMessageSubject(message)), ) } diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationController.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationController.kt index 6d506852ee4..317a7afbae0 100644 --- a/app/core/src/main/java/com/fsck/k9/notification/NotificationController.kt +++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationController.kt @@ -11,7 +11,7 @@ class NotificationController internal constructor( private val authenticationErrorNotificationController: AuthenticationErrorNotificationController, private val syncNotificationController: SyncNotificationController, private val sendFailedNotificationController: SendFailedNotificationController, - private val newMailNotificationController: NewMailNotificationController + private val newMailNotificationController: NewMailNotificationController, ) { fun showCertificateErrorNotification(account: Account, incoming: Boolean) { certificateErrorNotificationController.showCertificateErrorNotification(account, incoming) @@ -66,7 +66,7 @@ class NotificationController internal constructor( "Creating notification for message %s:%s:%s", message.account.uuid, message.folder.databaseId, - message.uid + message.uid, ) newMailNotificationController.addNewMailNotification(account, message, silent) diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationData.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationData.kt index d3f8dcd21ac..544a24f2adc 100644 --- a/app/core/src/main/java/com/fsck/k9/notification/NotificationData.kt +++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationData.kt @@ -9,7 +9,7 @@ import com.fsck.k9.controller.MessageReference internal data class NotificationData( val account: Account, val activeNotifications: List, - val inactiveNotifications: List + val inactiveNotifications: List, ) { val newMessagesCount: Int get() = activeNotifications.size + inactiveNotifications.size diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationDataStore.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationDataStore.kt index 058f229e84f..b9f63f3bba4 100644 --- a/app/core/src/main/java/com/fsck/k9/notification/NotificationDataStore.kt +++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationDataStore.kt @@ -24,7 +24,7 @@ internal class NotificationDataStore { fun initializeAccount( account: Account, activeNotifications: List, - inactiveNotifications: List + inactiveNotifications: List, ): NotificationData { require(activeNotifications.size <= MAX_NUMBER_OF_NEW_MESSAGE_NOTIFICATIONS) @@ -48,7 +48,7 @@ internal class NotificationDataStore { return if (activeNotification != null) { val newActiveNotification = activeNotification.copy(content = content) val notificationHolder = activeNotification.copy( - content = content + content = content, ) val operations = emptyList() @@ -56,7 +56,7 @@ internal class NotificationDataStore { val newActiveNotifications = notificationData.activeNotifications .replace(activeNotification, newActiveNotification) val newNotificationData = notificationData.copy( - activeNotifications = newActiveNotifications + activeNotifications = newActiveNotifications, ) notificationDataMap[account.uuid] = newNotificationData @@ -67,7 +67,7 @@ internal class NotificationDataStore { .replace(inactiveNotification, newInactiveNotification) val newNotificationData = notificationData.copy( - inactiveNotifications = newInactiveNotifications + inactiveNotifications = newInactiveNotifications, ) notificationDataMap[account.uuid] = newNotificationData @@ -81,12 +81,12 @@ internal class NotificationDataStore { val operations = listOf( NotificationStoreOperation.ChangeToInactive(lastNotificationHolder.content.messageReference), - NotificationStoreOperation.Add(messageReference, notificationId, timestamp) + NotificationStoreOperation.Add(messageReference, notificationId, timestamp), ) val newNotificationData = notificationData.copy( activeNotifications = listOf(notificationHolder) + notificationData.activeNotifications.dropLast(1), - inactiveNotifications = listOf(inactiveNotificationHolder) + notificationData.inactiveNotifications + inactiveNotifications = listOf(inactiveNotificationHolder) + notificationData.inactiveNotifications, ) notificationDataMap[account.uuid] = newNotificationData @@ -96,11 +96,11 @@ internal class NotificationDataStore { val notificationHolder = NotificationHolder(notificationId, timestamp, content) val operations = listOf( - NotificationStoreOperation.Add(messageReference, notificationId, timestamp) + NotificationStoreOperation.Add(messageReference, notificationId, timestamp), ) val newNotificationData = notificationData.copy( - activeNotifications = listOf(notificationHolder) + notificationData.activeNotifications + activeNotifications = listOf(notificationHolder) + notificationData.activeNotifications, ) notificationDataMap[account.uuid] = newNotificationData @@ -111,7 +111,7 @@ internal class NotificationDataStore { @Synchronized fun removeNotifications( account: Account, - selector: (List) -> List + selector: (List) -> List, ): RemoveNotificationsResult? { var notificationData = getNotificationData(account) if (notificationData.isEmpty()) return null @@ -140,7 +140,7 @@ internal class NotificationDataStore { val removeMessageReferenceSet = removeInactiveMessageReferences.toSet() notificationData = notificationData.copy( inactiveNotifications = notificationData.inactiveNotifications - .filter { it.content.messageReference !in removeMessageReferenceSet } + .filter { it.content.messageReference !in removeMessageReferenceSet }, ) } @@ -160,14 +160,14 @@ internal class NotificationDataStore { operations.add( NotificationStoreOperation.ChangeToActive( newNotificationHolder.content.messageReference, - newNotificationHolder.notificationId - ) + newNotificationHolder.notificationId, + ), ) notificationData = notificationData.copy( activeNotifications = notificationData.activeNotifications - notificationHolder + newNotificationHolder, - inactiveNotifications = notificationData.inactiveNotifications.drop(1) + inactiveNotifications = notificationData.inactiveNotifications.drop(1), ) } else { cancelNotificationIds.add(notificationHolder.notificationId) @@ -175,7 +175,7 @@ internal class NotificationDataStore { operations.add(NotificationStoreOperation.Remove(messageReference)) notificationData = notificationData.copy( - activeNotifications = notificationData.activeNotifications - notificationHolder + activeNotifications = notificationData.activeNotifications - notificationHolder, ) } } @@ -189,7 +189,7 @@ internal class NotificationDataStore { notificationData = notificationData, notificationStoreOperations = operations, notificationHolders = newNotificationHolders, - cancelNotificationIds = cancelNotificationIds + cancelNotificationIds = cancelNotificationIds, ) } } diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationHelper.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationHelper.kt index eef470e8d9f..a6075a51c1a 100644 --- a/app/core/src/main/java/com/fsck/k9/notification/NotificationHelper.kt +++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationHelper.kt @@ -19,7 +19,7 @@ class NotificationHelper( private val context: Context, private val notificationManager: NotificationManagerCompat, private val notificationChannelManager: NotificationChannelManager, - private val resourceProvider: NotificationResourceProvider + private val resourceProvider: NotificationResourceProvider, ) { fun getContext(): Context { return context @@ -101,14 +101,14 @@ internal fun NotificationCompat.Builder.setErrorAppearance(): NotificationCompat setLights( NotificationHelper.NOTIFICATION_LED_FAILURE_COLOR, NotificationHelper.NOTIFICATION_LED_FAST_ON_TIME, - NotificationHelper.NOTIFICATION_LED_FAST_OFF_TIME + NotificationHelper.NOTIFICATION_LED_FAST_OFF_TIME, ) } } internal fun NotificationCompat.Builder.setAppearance( silent: Boolean, - appearance: NotificationAppearance + appearance: NotificationAppearance, ): NotificationCompat.Builder = apply { if (silent) { setSilent(true) @@ -125,7 +125,7 @@ internal fun NotificationCompat.Builder.setAppearance( setLights( appearance.ledColor, NotificationHelper.NOTIFICATION_LED_ON_TIME, - NotificationHelper.NOTIFICATION_LED_OFF_TIME + NotificationHelper.NOTIFICATION_LED_OFF_TIME, ) } } diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationHolder.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationHolder.kt index 73a3647a18c..7a942241a73 100644 --- a/app/core/src/main/java/com/fsck/k9/notification/NotificationHolder.kt +++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationHolder.kt @@ -3,10 +3,10 @@ package com.fsck.k9.notification internal data class NotificationHolder( val notificationId: Int, val timestamp: Long, - val content: NotificationContent + val content: NotificationContent, ) internal data class InactiveNotificationHolder( val timestamp: Long, - val content: NotificationContent + val content: NotificationContent, ) diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationRepository.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationRepository.kt index 05d26a6a369..f95b0f41ec8 100644 --- a/app/core/src/main/java/com/fsck/k9/notification/NotificationRepository.kt +++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationRepository.kt @@ -9,7 +9,7 @@ internal class NotificationRepository( private val notificationStoreProvider: NotificationStoreProvider, private val localStoreProvider: LocalStoreProvider, private val messageStoreManager: MessageStoreManager, - private val notificationContentCreator: NotificationContentCreator + private val notificationContentCreator: NotificationContentCreator, ) { private val notificationDataStore = NotificationDataStore() @@ -36,7 +36,7 @@ internal class NotificationRepository( val notificationData = notificationDataStore.initializeAccount( account, activeNotifications, - inactiveNotifications + inactiveNotifications, ) return if (notificationData.activeNotifications.isNotEmpty()) notificationData else null @@ -50,7 +50,7 @@ internal class NotificationRepository( persistNotificationDataStoreChanges( account = account, operations = result.notificationStoreOperations, - updateNewMessageState = true + updateNewMessageState = true, ) } } @@ -59,7 +59,7 @@ internal class NotificationRepository( fun removeNotifications( account: Account, clearNewMessageState: Boolean = true, - selector: (List) -> List + selector: (List) -> List, ): RemoveNotificationsResult? { restoreNotifications(account) @@ -67,7 +67,7 @@ internal class NotificationRepository( persistNotificationDataStoreChanges( account = account, operations = result.notificationStoreOperations, - updateNewMessageState = clearNewMessageState + updateNewMessageState = clearNewMessageState, ) } } @@ -85,7 +85,7 @@ internal class NotificationRepository( private fun persistNotificationDataStoreChanges( account: Account, operations: List, - updateNewMessageState: Boolean + updateNewMessageState: Boolean, ) { val notificationStore = notificationStoreProvider.getNotificationStore(account) notificationStore.persistNotificationChanges(operations) @@ -105,7 +105,7 @@ internal class NotificationRepository( messageStore.setNewMessageState( folderId = messageReference.folderId, messageServerId = messageReference.uid, - newMessage = true + newMessage = true, ) } is NotificationStoreOperation.Remove -> { @@ -113,7 +113,7 @@ internal class NotificationRepository( messageStore.setNewMessageState( folderId = messageReference.folderId, messageServerId = messageReference.uid, - newMessage = false + newMessage = false, ) } else -> Unit diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationSettingsUpdater.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationSettingsUpdater.kt index 00ea6e8da52..6c4d34d3bd8 100644 --- a/app/core/src/main/java/com/fsck/k9/notification/NotificationSettingsUpdater.kt +++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationSettingsUpdater.kt @@ -11,7 +11,7 @@ import com.fsck.k9.Preferences class NotificationSettingsUpdater( private val preferences: Preferences, private val notificationChannelManager: NotificationChannelManager, - private val notificationConfigurationConverter: NotificationConfigurationConverter + private val notificationConfigurationConverter: NotificationConfigurationConverter, ) { fun updateNotificationSettings(accountUuids: Collection) { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationStoreOperation.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationStoreOperation.kt index c03620fba3d..859187dafd6 100644 --- a/app/core/src/main/java/com/fsck/k9/notification/NotificationStoreOperation.kt +++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationStoreOperation.kt @@ -6,7 +6,7 @@ sealed interface NotificationStoreOperation { data class Add( val messageReference: MessageReference, val notificationId: Int, - val timestamp: Long + val timestamp: Long, ) : NotificationStoreOperation data class Remove(val messageReference: MessageReference) : NotificationStoreOperation @@ -15,6 +15,6 @@ sealed interface NotificationStoreOperation { data class ChangeToActive( val messageReference: MessageReference, - val notificationId: Int + val notificationId: Int, ) : NotificationStoreOperation } diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationStrategy.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationStrategy.kt index a6fb5ed6400..a124178a37c 100644 --- a/app/core/src/main/java/com/fsck/k9/notification/NotificationStrategy.kt +++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationStrategy.kt @@ -10,6 +10,6 @@ interface NotificationStrategy { account: Account, localFolder: LocalFolder, message: LocalMessage, - isOldMessage: Boolean + isOldMessage: Boolean, ): Boolean } diff --git a/app/core/src/main/java/com/fsck/k9/notification/PushNotificationManager.kt b/app/core/src/main/java/com/fsck/k9/notification/PushNotificationManager.kt index 9b562b054cb..38e890f6017 100644 --- a/app/core/src/main/java/com/fsck/k9/notification/PushNotificationManager.kt +++ b/app/core/src/main/java/com/fsck/k9/notification/PushNotificationManager.kt @@ -15,7 +15,7 @@ internal class PushNotificationManager( private val context: Context, private val resourceProvider: CoreResourceProvider, private val notificationChannelManager: NotificationChannelManager, - private val notificationManager: NotificationManagerCompat + private val notificationManager: NotificationManagerCompat, ) { val notificationId = NotificationIds.PUSH_NOTIFICATION_ID @@ -75,5 +75,5 @@ enum class PushNotificationState { INITIALIZING, LISTENING, WAIT_BACKGROUND_SYNC, - WAIT_NETWORK + WAIT_NETWORK, } diff --git a/app/core/src/main/java/com/fsck/k9/notification/RemoveNotificationsResult.kt b/app/core/src/main/java/com/fsck/k9/notification/RemoveNotificationsResult.kt index f3c2d44bffa..fc5382c4280 100644 --- a/app/core/src/main/java/com/fsck/k9/notification/RemoveNotificationsResult.kt +++ b/app/core/src/main/java/com/fsck/k9/notification/RemoveNotificationsResult.kt @@ -4,5 +4,5 @@ internal data class RemoveNotificationsResult( val notificationData: NotificationData, val notificationStoreOperations: List, val notificationHolders: List, - val cancelNotificationIds: List + val cancelNotificationIds: List, ) diff --git a/app/core/src/main/java/com/fsck/k9/notification/SendFailedNotificationController.kt b/app/core/src/main/java/com/fsck/k9/notification/SendFailedNotificationController.kt index 2f82eabe116..fe3baa181d2 100644 --- a/app/core/src/main/java/com/fsck/k9/notification/SendFailedNotificationController.kt +++ b/app/core/src/main/java/com/fsck/k9/notification/SendFailedNotificationController.kt @@ -9,7 +9,7 @@ import com.fsck.k9.helper.ExceptionHelper internal class SendFailedNotificationController( private val notificationHelper: NotificationHelper, private val actionBuilder: NotificationActionCreator, - private val resourceProvider: NotificationResourceProvider + private val resourceProvider: NotificationResourceProvider, ) { fun showSendFailedNotification(account: Account, exception: Exception) { val title = resourceProvider.sendFailedTitle() diff --git a/app/core/src/main/java/com/fsck/k9/notification/SingleMessageNotificationCreator.kt b/app/core/src/main/java/com/fsck/k9/notification/SingleMessageNotificationCreator.kt index d6d5e3626a2..ecfe8831243 100644 --- a/app/core/src/main/java/com/fsck/k9/notification/SingleMessageNotificationCreator.kt +++ b/app/core/src/main/java/com/fsck/k9/notification/SingleMessageNotificationCreator.kt @@ -10,12 +10,12 @@ internal class SingleMessageNotificationCreator( private val notificationHelper: NotificationHelper, private val actionCreator: NotificationActionCreator, private val resourceProvider: NotificationResourceProvider, - private val lockScreenNotificationCreator: LockScreenNotificationCreator + private val lockScreenNotificationCreator: LockScreenNotificationCreator, ) { fun createSingleNotification( baseNotificationData: BaseNotificationData, singleNotificationData: SingleNotificationData, - isGroupSummary: Boolean = false + isGroupSummary: Boolean = false, ) { val account = baseNotificationData.account val notificationId = singleNotificationData.notificationId @@ -45,7 +45,7 @@ internal class SingleMessageNotificationCreator( Timber.v( "Creating single summary notification (silent=%b): %s", singleNotificationData.isSilent, - notification + notification, ) } notificationHelper.notify(account, notificationId, notification) @@ -164,7 +164,7 @@ internal class SingleMessageNotificationCreator( private fun NotificationBuilder.setLockScreenNotification( notificationData: BaseNotificationData, - addLockScreenNotification: Boolean + addLockScreenNotification: Boolean, ) = apply { if (addLockScreenNotification) { lockScreenNotificationCreator.configureLockScreenNotification(this, notificationData) diff --git a/app/core/src/main/java/com/fsck/k9/notification/SingleMessageNotificationDataCreator.kt b/app/core/src/main/java/com/fsck/k9/notification/SingleMessageNotificationDataCreator.kt index f693ab39f10..d3bc822521a 100644 --- a/app/core/src/main/java/com/fsck/k9/notification/SingleMessageNotificationDataCreator.kt +++ b/app/core/src/main/java/com/fsck/k9/notification/SingleMessageNotificationDataCreator.kt @@ -10,7 +10,7 @@ internal class SingleMessageNotificationDataCreator { notificationId: Int, content: NotificationContent, timestamp: Long, - addLockScreenNotification: Boolean + addLockScreenNotification: Boolean, ): SingleNotificationData { return SingleNotificationData( notificationId = notificationId, @@ -19,14 +19,14 @@ internal class SingleMessageNotificationDataCreator { content = content, actions = createSingleNotificationActions(), wearActions = createSingleNotificationWearActions(account), - addLockScreenNotification = addLockScreenNotification + addLockScreenNotification = addLockScreenNotification, ) } fun createSummarySingleNotificationData( data: NotificationData, timestamp: Long, - silent: Boolean + silent: Boolean, ): SummarySingleNotificationData { return SummarySingleNotificationData( SingleNotificationData( @@ -36,8 +36,8 @@ internal class SingleMessageNotificationDataCreator { content = data.activeNotifications.first().content, actions = createSingleNotificationActions(), wearActions = createSingleNotificationWearActions(data.account), - addLockScreenNotification = false - ) + addLockScreenNotification = false, + ), ) } diff --git a/app/core/src/main/java/com/fsck/k9/notification/SummaryNotificationCreator.kt b/app/core/src/main/java/com/fsck/k9/notification/SummaryNotificationCreator.kt index c780415f115..4c8770d80bd 100644 --- a/app/core/src/main/java/com/fsck/k9/notification/SummaryNotificationCreator.kt +++ b/app/core/src/main/java/com/fsck/k9/notification/SummaryNotificationCreator.kt @@ -13,11 +13,11 @@ internal class SummaryNotificationCreator( private val actionCreator: NotificationActionCreator, private val lockScreenNotificationCreator: LockScreenNotificationCreator, private val singleMessageNotificationCreator: SingleMessageNotificationCreator, - private val resourceProvider: NotificationResourceProvider + private val resourceProvider: NotificationResourceProvider, ) { fun createSummaryNotification( baseNotificationData: BaseNotificationData, - summaryNotificationData: SummaryNotificationData + summaryNotificationData: SummaryNotificationData, ) { when (summaryNotificationData) { is SummarySingleNotificationData -> { @@ -31,18 +31,18 @@ internal class SummaryNotificationCreator( private fun createSingleMessageNotification( baseNotificationData: BaseNotificationData, - singleNotificationData: SingleNotificationData + singleNotificationData: SingleNotificationData, ) { singleMessageNotificationCreator.createSingleNotification( baseNotificationData, singleNotificationData, - isGroupSummary = true + isGroupSummary = true, ) } private fun createInboxStyleSummaryNotification( baseNotificationData: BaseNotificationData, - notificationData: SummaryInboxNotificationData + notificationData: SummaryInboxNotificationData, ) { val account = baseNotificationData.account val accountName = baseNotificationData.accountName @@ -85,7 +85,7 @@ internal class SummaryNotificationCreator( private fun NotificationBuilder.setInboxStyle( title: String, summary: String, - contentLines: List + contentLines: List, ) = apply { val style = NotificationCompat.InboxStyle() .setBigContentTitle(title) @@ -104,7 +104,7 @@ internal class SummaryNotificationCreator( private fun NotificationBuilder.setDeviceActions( account: Account, - notificationData: SummaryInboxNotificationData + notificationData: SummaryInboxNotificationData, ) = apply { for (action in notificationData.actions) { when (action) { @@ -116,7 +116,7 @@ internal class SummaryNotificationCreator( private fun NotificationBuilder.addMarkAllAsReadAction( account: Account, - notificationData: SummaryInboxNotificationData + notificationData: SummaryInboxNotificationData, ) { val icon = resourceProvider.iconMarkAsRead val title = resourceProvider.actionMarkAsRead() @@ -128,7 +128,7 @@ internal class SummaryNotificationCreator( private fun NotificationBuilder.addDeleteAllAction( account: Account, - notificationData: SummaryInboxNotificationData + notificationData: SummaryInboxNotificationData, ) { val icon = resourceProvider.iconDelete val title = resourceProvider.actionDelete() @@ -140,7 +140,7 @@ internal class SummaryNotificationCreator( private fun NotificationBuilder.setWearActions( account: Account, - notificationData: SummaryInboxNotificationData + notificationData: SummaryInboxNotificationData, ) = apply { val wearableExtender = WearableExtender().apply { for (action in notificationData.wearActions) { @@ -157,7 +157,7 @@ internal class SummaryNotificationCreator( private fun WearableExtender.addMarkAllAsReadAction( account: Account, - notificationData: SummaryInboxNotificationData + notificationData: SummaryInboxNotificationData, ) { val icon = resourceProvider.wearIconMarkAsRead val title = resourceProvider.actionMarkAllAsRead() diff --git a/app/core/src/main/java/com/fsck/k9/notification/SummaryNotificationDataCreator.kt b/app/core/src/main/java/com/fsck/k9/notification/SummaryNotificationDataCreator.kt index 34d82efcf5d..ae637ef1906 100644 --- a/app/core/src/main/java/com/fsck/k9/notification/SummaryNotificationDataCreator.kt +++ b/app/core/src/main/java/com/fsck/k9/notification/SummaryNotificationDataCreator.kt @@ -6,7 +6,7 @@ import com.fsck.k9.K9 private const val MAX_NUMBER_OF_MESSAGES_FOR_SUMMARY_NOTIFICATION = 5 internal class SummaryNotificationDataCreator( - private val singleMessageNotificationDataCreator: SingleMessageNotificationDataCreator + private val singleMessageNotificationDataCreator: SingleMessageNotificationDataCreator, ) { fun createSummaryNotificationData(data: NotificationData, silent: Boolean): SummaryNotificationData { val timestamp = data.latestTimestamp @@ -21,7 +21,7 @@ internal class SummaryNotificationDataCreator( private fun createSummarySingleNotificationData( data: NotificationData, timestamp: Long, - silent: Boolean + silent: Boolean, ): SummaryNotificationData { return singleMessageNotificationDataCreator.createSummarySingleNotificationData(data, timestamp, silent) } @@ -29,7 +29,7 @@ internal class SummaryNotificationDataCreator( private fun createSummaryInboxNotificationData( data: NotificationData, timestamp: Long, - silent: Boolean + silent: Boolean, ): SummaryNotificationData { return SummaryInboxNotificationData( notificationId = NotificationIds.getNewMailSummaryNotificationId(data.account), @@ -39,7 +39,7 @@ internal class SummaryNotificationDataCreator( additionalMessagesCount = data.additionalMessagesCount, messageReferences = data.activeMessageReferences, actions = createSummaryNotificationActions(), - wearActions = createSummaryWearNotificationActions(data.account) + wearActions = createSummaryWearNotificationActions(data.account), ) } diff --git a/app/core/src/main/java/com/fsck/k9/notification/SyncNotificationController.kt b/app/core/src/main/java/com/fsck/k9/notification/SyncNotificationController.kt index 441d5698337..94bb4e4b16f 100644 --- a/app/core/src/main/java/com/fsck/k9/notification/SyncNotificationController.kt +++ b/app/core/src/main/java/com/fsck/k9/notification/SyncNotificationController.kt @@ -9,7 +9,7 @@ import com.fsck.k9.mailstore.LocalFolder internal class SyncNotificationController( private val notificationHelper: NotificationHelper, private val actionBuilder: NotificationActionCreator, - private val resourceProvider: NotificationResourceProvider + private val resourceProvider: NotificationResourceProvider, ) { fun showSendingNotification(account: Account) { val accountName = account.displayName diff --git a/app/core/src/main/java/com/fsck/k9/oauth/OAuthConfiguration.kt b/app/core/src/main/java/com/fsck/k9/oauth/OAuthConfiguration.kt index d3a11ed18c7..dd43a605738 100644 --- a/app/core/src/main/java/com/fsck/k9/oauth/OAuthConfiguration.kt +++ b/app/core/src/main/java/com/fsck/k9/oauth/OAuthConfiguration.kt @@ -5,5 +5,5 @@ data class OAuthConfiguration( val scopes: List, val authorizationEndpoint: String, val tokenEndpoint: String, - val redirectUri: String + val redirectUri: String, ) diff --git a/app/core/src/main/java/com/fsck/k9/oauth/OAuthConfigurationProvider.kt b/app/core/src/main/java/com/fsck/k9/oauth/OAuthConfigurationProvider.kt index f2b8b31897e..b9cd706090d 100644 --- a/app/core/src/main/java/com/fsck/k9/oauth/OAuthConfigurationProvider.kt +++ b/app/core/src/main/java/com/fsck/k9/oauth/OAuthConfigurationProvider.kt @@ -2,7 +2,7 @@ package com.fsck.k9.oauth class OAuthConfigurationProvider( private val configurations: Map, OAuthConfiguration>, - private val googleConfiguration: OAuthConfiguration + private val googleConfiguration: OAuthConfiguration, ) { private val hostnameMapping: Map = buildMap { for ((hostnames, configuration) in configurations) { diff --git a/app/core/src/main/java/com/fsck/k9/power/AndroidPowerManager.kt b/app/core/src/main/java/com/fsck/k9/power/AndroidPowerManager.kt index 51546280eeb..e802d52b3ab 100644 --- a/app/core/src/main/java/com/fsck/k9/power/AndroidPowerManager.kt +++ b/app/core/src/main/java/com/fsck/k9/power/AndroidPowerManager.kt @@ -73,7 +73,7 @@ internal class AndroidPowerManager(private val systemPowerManager: SystemPowerMa tag, id, endTime - startTime, - timeout + timeout, ) } else { Timber.v("AndroidWakeLock for tag %s / id %d, timeout = %d ms: releasing", tag, id, timeout) diff --git a/app/core/src/main/java/com/fsck/k9/preferences/FolderSettingsProvider.kt b/app/core/src/main/java/com/fsck/k9/preferences/FolderSettingsProvider.kt index 559a4ceb064..a87043eff75 100644 --- a/app/core/src/main/java/com/fsck/k9/preferences/FolderSettingsProvider.kt +++ b/app/core/src/main/java/com/fsck/k9/preferences/FolderSettingsProvider.kt @@ -36,7 +36,7 @@ class FolderSettingsProvider(private val folderRepository: FolderRepository) { syncClass, displayClass, notifyClass, - pushClass + pushClass, ) } } @@ -48,5 +48,5 @@ data class FolderSettings( val syncClass: FolderClass, val displayClass: FolderClass, val notifyClass: FolderClass, - val pushClass: FolderClass + val pushClass: FolderClass, ) diff --git a/app/core/src/main/java/com/fsck/k9/preferences/GeneralSettings.kt b/app/core/src/main/java/com/fsck/k9/preferences/GeneralSettings.kt index 927f04afa9b..595d6b909ad 100644 --- a/app/core/src/main/java/com/fsck/k9/preferences/GeneralSettings.kt +++ b/app/core/src/main/java/com/fsck/k9/preferences/GeneralSettings.kt @@ -16,23 +16,23 @@ data class GeneralSettings( val appTheme: AppTheme, val messageViewTheme: SubTheme, val messageComposeTheme: SubTheme, - val fixedMessageViewTheme: Boolean + val fixedMessageViewTheme: Boolean, ) enum class BackgroundSync { ALWAYS, NEVER, - FOLLOW_SYSTEM_AUTO_SYNC + FOLLOW_SYSTEM_AUTO_SYNC, } enum class AppTheme { LIGHT, DARK, - FOLLOW_SYSTEM + FOLLOW_SYSTEM, } enum class SubTheme { LIGHT, DARK, - USE_GLOBAL + USE_GLOBAL, } diff --git a/app/core/src/main/java/com/fsck/k9/preferences/KoinModule.kt b/app/core/src/main/java/com/fsck/k9/preferences/KoinModule.kt index 0d92a2ad2c2..344d288059b 100644 --- a/app/core/src/main/java/com/fsck/k9/preferences/KoinModule.kt +++ b/app/core/src/main/java/com/fsck/k9/preferences/KoinModule.kt @@ -12,7 +12,7 @@ val preferencesModule = module { preferences = get(), folderSettingsProvider = get(), folderRepository = get(), - notificationSettingsUpdater = get() + notificationSettingsUpdater = get(), ) } factory { FolderSettingsProvider(folderRepository = get()) } @@ -20,7 +20,7 @@ val preferencesModule = module { single { RealGeneralSettingsManager( preferences = get(), - coroutineScope = get(named("AppCoroutineScope")) + coroutineScope = get(named("AppCoroutineScope")), ) } bind GeneralSettingsManager::class } diff --git a/app/core/src/main/java/com/fsck/k9/preferences/RealGeneralSettingsManager.kt b/app/core/src/main/java/com/fsck/k9/preferences/RealGeneralSettingsManager.kt index adb2c53ff83..27a2ccf87d1 100644 --- a/app/core/src/main/java/com/fsck/k9/preferences/RealGeneralSettingsManager.kt +++ b/app/core/src/main/java/com/fsck/k9/preferences/RealGeneralSettingsManager.kt @@ -25,7 +25,7 @@ import timber.log.Timber internal class RealGeneralSettingsManager( private val preferences: Preferences, private val coroutineScope: CoroutineScope, - private val backgroundDispatcher: CoroutineDispatcher = Dispatchers.IO + private val backgroundDispatcher: CoroutineDispatcher = Dispatchers.IO, ) : GeneralSettingsManager { private val settingsFlow = MutableSharedFlow(replay = 1) private var generalSettings: GeneralSettings? = null @@ -71,7 +71,7 @@ internal class RealGeneralSettingsManager( @Synchronized private fun updateGeneralSettingsWithStateFromK9(): GeneralSettings { return getSettings().copy( - backgroundSync = K9.backgroundOps.toBackgroundSync() + backgroundSync = K9.backgroundOps.toBackgroundSync(), ).also { generalSettings -> this.generalSettings = generalSettings } @@ -140,7 +140,7 @@ internal class RealGeneralSettingsManager( appTheme = storage.getEnum("theme", AppTheme.FOLLOW_SYSTEM), messageViewTheme = storage.getEnum("messageViewTheme", SubTheme.USE_GLOBAL), messageComposeTheme = storage.getEnum("messageComposeTheme", SubTheme.USE_GLOBAL), - fixedMessageViewTheme = storage.getBoolean("fixedMessageViewTheme", true) + fixedMessageViewTheme = storage.getBoolean("fixedMessageViewTheme", true), ) updateSettingsFlow(settings) diff --git a/app/core/src/main/java/com/fsck/k9/preferences/SettingsExporter.kt b/app/core/src/main/java/com/fsck/k9/preferences/SettingsExporter.kt index 0098813b3f1..2ea09cb8d0b 100644 --- a/app/core/src/main/java/com/fsck/k9/preferences/SettingsExporter.kt +++ b/app/core/src/main/java/com/fsck/k9/preferences/SettingsExporter.kt @@ -26,7 +26,7 @@ class SettingsExporter( private val preferences: Preferences, private val folderSettingsProvider: FolderSettingsProvider, private val folderRepository: FolderRepository, - private val notificationSettingsUpdater: NotificationSettingsUpdater + private val notificationSettingsUpdater: NotificationSettingsUpdater, ) { @Throws(SettingsImportExportException::class) fun exportToUri(includeGlobals: Boolean, accountUuids: Set, uri: Uri) { @@ -106,7 +106,7 @@ class SettingsExporter( Timber.w( "Global setting \"%s\" has invalid value \"%s\" in preference storage. This shouldn't happen!", key, - valueString + valueString, ) } } else { @@ -257,7 +257,7 @@ class SettingsExporter( serializer: XmlSerializer, keyPart: String, valueString: String, - account: Account + account: Account, ) { val versionedSetting = AccountSettingsDescriptions.SETTINGS[keyPart] if (versionedSetting != null) { @@ -274,7 +274,7 @@ class SettingsExporter( "This shouldn't happen!", keyPart, account, - valueString + valueString, ) } } @@ -284,13 +284,13 @@ class SettingsExporter( private fun writeFolderNameSettings( account: Account, folderRepository: FolderRepository, - serializer: XmlSerializer + serializer: XmlSerializer, ) { fun writeFolderNameSetting( key: String, folderId: Long?, importedFolderServerId: String?, - writeEmptyValue: Boolean = false + writeEmptyValue: Boolean = false, ) { val folderServerId = folderId?.let { folderRepository.getFolderServerId(account, folderId) @@ -307,7 +307,7 @@ class SettingsExporter( "autoExpandFolderName", account.autoExpandFolderId, account.importedAutoExpandFolder, - writeEmptyValue = true + writeEmptyValue = true, ) writeFolderNameSetting("archiveFolderName", account.archiveFolderId, account.importedArchiveFolder) writeFolderNameSetting("draftsFolderName", account.draftsFolderId, account.importedDraftsFolder) @@ -320,7 +320,7 @@ class SettingsExporter( serializer: XmlSerializer, accountUuid: String, identity: String, - prefs: Map + prefs: Map, ) { serializer.startTag(null, IDENTITY_ELEMENT) @@ -379,7 +379,7 @@ class SettingsExporter( "Identity setting \"%s\" has invalid value \"%s\" in preference storage. " + "This shouldn't happen!", identityKey, - valueString + valueString, ) } } @@ -418,7 +418,7 @@ class SettingsExporter( Timber.w( "Folder setting \"%s\" has invalid value \"%s\" in preference storage. This shouldn't happen!", key, - value + value, ) } } @@ -437,7 +437,7 @@ class SettingsExporter( serializer: XmlSerializer, key: String, setting: SettingsDescription, - valueString: String + valueString: String, ) { val value = setting.fromString(valueString) val outputValue = setting.toPrettyString(value) @@ -447,7 +447,7 @@ class SettingsExporter( private fun writeKeyAndDefaultValueFromSetting( serializer: XmlSerializer, key: String, - setting: SettingsDescription + setting: SettingsDescription, ) { val value = setting.getDefaultValue() val outputValue = setting.toPrettyString(value) @@ -518,7 +518,7 @@ class SettingsExporter( "draftsFolderName", "sentFolderName", "spamFolderName", - "trashFolderName" + "trashFolderName", ) } } diff --git a/app/core/src/main/java/com/fsck/k9/search/AccountSearchConditions.kt b/app/core/src/main/java/com/fsck/k9/search/AccountSearchConditions.kt index 3a0beef26c5..599f5320a75 100644 --- a/app/core/src/main/java/com/fsck/k9/search/AccountSearchConditions.kt +++ b/app/core/src/main/java/com/fsck/k9/search/AccountSearchConditions.kt @@ -27,7 +27,7 @@ fun LocalSearch.limitToDisplayableFolders(account: Account) { val searchCondition = SearchCondition( SearchField.DISPLAY_CLASS, Attribute.EQUALS, - FolderClass.SECOND_CLASS.name + FolderClass.SECOND_CLASS.name, ) val root = conditions if (root.mRight != null) { diff --git a/app/core/src/main/java/com/fsck/k9/search/SearchAccount.kt b/app/core/src/main/java/com/fsck/k9/search/SearchAccount.kt index 68a7abea6f4..b7ece5240b7 100644 --- a/app/core/src/main/java/com/fsck/k9/search/SearchAccount.kt +++ b/app/core/src/main/java/com/fsck/k9/search/SearchAccount.kt @@ -14,7 +14,7 @@ class SearchAccount( val id: String, search: LocalSearch, override val name: String, - override val email: String + override val email: String, ) : BaseAccount { /** * Returns the ID of this `SearchAccount` instance. @@ -46,7 +46,7 @@ class SearchAccount( id = UNIFIED_INBOX, search = tmpSearch, name = resourceProvider.searchUnifiedInboxTitle(), - email = resourceProvider.searchUnifiedInboxDetail() + email = resourceProvider.searchUnifiedInboxDetail(), ) } } diff --git a/app/core/src/test/java/com/fsck/k9/ServerSettingsSerializerTest.kt b/app/core/src/test/java/com/fsck/k9/ServerSettingsSerializerTest.kt index 6df0efcad38..c5f9470a480 100644 --- a/app/core/src/test/java/com/fsck/k9/ServerSettingsSerializerTest.kt +++ b/app/core/src/test/java/com/fsck/k9/ServerSettingsSerializerTest.kt @@ -22,7 +22,7 @@ class ServerSettingsSerializerTest { username = "user", password = null, clientCertificateAlias = "alias", - extra = ImapStoreSettings.createExtra(autoDetectNamespace = true, pathPrefix = null) + extra = ImapStoreSettings.createExtra(autoDetectNamespace = true, pathPrefix = null), ) val json = serverSettingsSerializer.serialize(serverSettings) @@ -41,7 +41,7 @@ class ServerSettingsSerializerTest { authenticationType = AuthType.PLAIN, username = "user", password = "password", - clientCertificateAlias = null + clientCertificateAlias = null, ) val json = serverSettingsSerializer.serialize(serverSettings) diff --git a/app/core/src/test/java/com/fsck/k9/autocrypt/AutocryptGossipHeaderParserTest.kt b/app/core/src/test/java/com/fsck/k9/autocrypt/AutocryptGossipHeaderParserTest.kt index f047a9df286..40ccbf523bf 100644 --- a/app/core/src/test/java/com/fsck/k9/autocrypt/AutocryptGossipHeaderParserTest.kt +++ b/app/core/src/test/java/com/fsck/k9/autocrypt/AutocryptGossipHeaderParserTest.kt @@ -15,7 +15,7 @@ class AutocryptGossipHeaderParserTest { mQGNBFoBt74BDAC8AMsjPY17kxodbfmHah38ZQipY0yfuo97WUBs2jeiFYlQdunPANi5VMgbAX+H Mq1XoBRs6qW+WpX8Uj11mu22c57BTUXJRbRr4TnTuuOQmT0egwFDe3x8vHSFmcf9OzG8iKR9ftUE +F2ewrzzmm3XY8hy7QeUgBfClZVA6A3rsX4gGawjDo6ZRBbYwckINgGX/vQk6rGs - """.trimIndent().toByteArray() + """.trimIndent().toByteArray(), ) val GOSSIP_HEADER_BOB = @@ -75,7 +75,7 @@ class AutocryptGossipHeaderParserTest { @Test fun parseHeader_missingKeydata() { val gossipHeader = autocryptGossipHeaderParser.parseAutocryptGossipHeader( - "addr=CDEF" + "addr=CDEF", ) assertNull(gossipHeader) @@ -84,7 +84,7 @@ class AutocryptGossipHeaderParserTest { @Test fun parseHeader_unknownCritical() { val gossipHeader = autocryptGossipHeaderParser.parseAutocryptGossipHeader( - "addr=bawb; somecritical=value; keydata=aGk" + "addr=bawb; somecritical=value; keydata=aGk", ) assertNull(gossipHeader) @@ -93,7 +93,7 @@ class AutocryptGossipHeaderParserTest { @Test fun parseHeader_unknownNonCritical() { val gossipHeader = autocryptGossipHeaderParser.parseAutocryptGossipHeader( - "addr=bawb; _somenoncritical=value; keydata=aGk" + "addr=bawb; _somenoncritical=value; keydata=aGk", ) assertNotNull(gossipHeader) @@ -102,7 +102,7 @@ class AutocryptGossipHeaderParserTest { @Test fun parseHeader_brokenBase64() { val gossipHeader = autocryptGossipHeaderParser.parseAutocryptGossipHeader( - "addr=bawb; _somenoncritical=value; keydata=X" + "addr=bawb; _somenoncritical=value; keydata=X", ) assertNull(gossipHeader) diff --git a/app/core/src/test/java/com/fsck/k9/cache/CacheTest.kt b/app/core/src/test/java/com/fsck/k9/cache/CacheTest.kt index d07d82ac9ec..c4c83ffacbe 100644 --- a/app/core/src/test/java/com/fsck/k9/cache/CacheTest.kt +++ b/app/core/src/test/java/com/fsck/k9/cache/CacheTest.kt @@ -8,7 +8,7 @@ import org.junit.runners.Parameterized data class CacheTestData( val name: String, - val createCache: () -> Cache + val createCache: () -> Cache, ) { override fun toString(): String = name } @@ -25,7 +25,7 @@ class CacheTest(data: CacheTestData) { return listOf( CacheTestData("InMemoryCache") { InMemoryCache() }, CacheTestData("ExpiringCache") { ExpiringCache(TestClock(), InMemoryCache()) }, - CacheTestData("SynchronizedCache") { SynchronizedCache(InMemoryCache()) } + CacheTestData("SynchronizedCache") { SynchronizedCache(InMemoryCache()) }, ) } diff --git a/app/core/src/test/java/com/fsck/k9/crypto/OpenPgpApiHelperTest.kt b/app/core/src/test/java/com/fsck/k9/crypto/OpenPgpApiHelperTest.kt index 20c4d2d77b8..b55959e849c 100644 --- a/app/core/src/test/java/com/fsck/k9/crypto/OpenPgpApiHelperTest.kt +++ b/app/core/src/test/java/com/fsck/k9/crypto/OpenPgpApiHelperTest.kt @@ -10,7 +10,7 @@ class OpenPgpApiHelperTest { fun buildUserId_withName_shouldCreateOpenPgpAccountName() { val identity = Identity( email = "user@domain.com", - name = "Name" + name = "Name", ) val result = OpenPgpApiHelper.buildUserId(identity) @@ -21,7 +21,7 @@ class OpenPgpApiHelperTest { @Test fun buildUserId_withoutName_shouldCreateOpenPgpAccountName() { val identity = Identity( - email = "user@domain.com" + email = "user@domain.com", ) val result = OpenPgpApiHelper.buildUserId(identity) diff --git a/app/core/src/test/java/com/fsck/k9/helper/IdentityHelperTest.kt b/app/core/src/test/java/com/fsck/k9/helper/IdentityHelperTest.kt index cb2867043ca..1d3dfc6e97a 100644 --- a/app/core/src/test/java/com/fsck/k9/helper/IdentityHelperTest.kt +++ b/app/core/src/test/java/com/fsck/k9/helper/IdentityHelperTest.kt @@ -22,7 +22,7 @@ class IdentityHelperTest : RobolectricTest() { RecipientType.CC to IDENTITY_2_ADDRESS, RecipientType.X_ORIGINAL_TO to IDENTITY_3_ADDRESS, RecipientType.DELIVERED_TO to IDENTITY_4_ADDRESS, - RecipientType.X_ENVELOPE_TO to IDENTITY_5_ADDRESS + RecipientType.X_ENVELOPE_TO to IDENTITY_5_ADDRESS, ) val identity = IdentityHelper.getRecipientIdentityFromMessage(account, message) @@ -37,7 +37,7 @@ class IdentityHelperTest : RobolectricTest() { RecipientType.CC to IDENTITY_2_ADDRESS, RecipientType.X_ORIGINAL_TO to IDENTITY_3_ADDRESS, RecipientType.DELIVERED_TO to IDENTITY_4_ADDRESS, - RecipientType.X_ENVELOPE_TO to IDENTITY_5_ADDRESS + RecipientType.X_ENVELOPE_TO to IDENTITY_5_ADDRESS, ) val identity = IdentityHelper.getRecipientIdentityFromMessage(account, message) @@ -52,7 +52,7 @@ class IdentityHelperTest : RobolectricTest() { RecipientType.CC to "unrelated2@example.org", RecipientType.X_ORIGINAL_TO to IDENTITY_3_ADDRESS, RecipientType.DELIVERED_TO to IDENTITY_4_ADDRESS, - RecipientType.X_ENVELOPE_TO to IDENTITY_5_ADDRESS + RecipientType.X_ENVELOPE_TO to IDENTITY_5_ADDRESS, ) val identity = IdentityHelper.getRecipientIdentityFromMessage(account, message) @@ -67,7 +67,7 @@ class IdentityHelperTest : RobolectricTest() { RecipientType.CC to "unrelated2@example.org", RecipientType.X_ORIGINAL_TO to "unrelated3@example.org", RecipientType.DELIVERED_TO to IDENTITY_4_ADDRESS, - RecipientType.X_ENVELOPE_TO to IDENTITY_5_ADDRESS + RecipientType.X_ENVELOPE_TO to IDENTITY_5_ADDRESS, ) val identity = IdentityHelper.getRecipientIdentityFromMessage(account, message) @@ -82,7 +82,7 @@ class IdentityHelperTest : RobolectricTest() { RecipientType.CC to "unrelated2@example.org", RecipientType.X_ORIGINAL_TO to "unrelated3@example.org", RecipientType.DELIVERED_TO to "unrelated4@example.org", - RecipientType.X_ENVELOPE_TO to IDENTITY_5_ADDRESS + RecipientType.X_ENVELOPE_TO to IDENTITY_5_ADDRESS, ) val identity = IdentityHelper.getRecipientIdentityFromMessage(account, message) @@ -97,7 +97,7 @@ class IdentityHelperTest : RobolectricTest() { RecipientType.CC to "unrelated2@example.org", RecipientType.X_ORIGINAL_TO to "unrelated3@example.org", RecipientType.DELIVERED_TO to "unrelated4@example.org", - RecipientType.X_ENVELOPE_TO to "unrelated5@example.org" + RecipientType.X_ENVELOPE_TO to "unrelated5@example.org", ) val identity = IdentityHelper.getRecipientIdentityFromMessage(account, message) @@ -122,14 +122,14 @@ class IdentityHelperTest : RobolectricTest() { newIdentity("Identity 2", IDENTITY_2_ADDRESS), newIdentity("Identity 3", IDENTITY_3_ADDRESS), newIdentity("Identity 4", IDENTITY_4_ADDRESS), - newIdentity("Identity 5", IDENTITY_5_ADDRESS) - ) + newIdentity("Identity 5", IDENTITY_5_ADDRESS), + ), ) } private fun newIdentity(name: String, email: String) = Identity( name = name, - email = email + email = email, ) private fun messageWithRecipients(vararg recipients: Pair): Message { diff --git a/app/core/src/test/java/com/fsck/k9/helper/ListUnsubscribeHelperTest.kt b/app/core/src/test/java/com/fsck/k9/helper/ListUnsubscribeHelperTest.kt index 4c327aefe1a..feca0c75068 100644 --- a/app/core/src/test/java/com/fsck/k9/helper/ListUnsubscribeHelperTest.kt +++ b/app/core/src/test/java/com/fsck/k9/helper/ListUnsubscribeHelperTest.kt @@ -11,7 +11,7 @@ class ListUnsubscribeHelperTest : RobolectricTest() { @Test fun `get list unsubscribe url - should accept mailto`() { val message = buildMimeMessageWithListUnsubscribeValue( - "" + "", ) val result = ListUnsubscribeHelper.getPreferredListUnsubscribeUri(message) assertThat(result).isEqualTo(MailtoUnsubscribeUri("mailto:unsubscribe@example.com".toUri())) @@ -20,7 +20,7 @@ class ListUnsubscribeHelperTest : RobolectricTest() { @Test fun `get list unsubscribe url - should prefer mailto 1`() { val message = buildMimeMessageWithListUnsubscribeValue( - ", " + ", ", ) val result = ListUnsubscribeHelper.getPreferredListUnsubscribeUri(message) assertThat(result).isEqualTo(MailtoUnsubscribeUri("mailto:unsubscribe@example.com".toUri())) @@ -29,7 +29,7 @@ class ListUnsubscribeHelperTest : RobolectricTest() { @Test fun `get list unsubscribe url - should prefer mailto 2`() { val message = buildMimeMessageWithListUnsubscribeValue( - ", " + ", ", ) val result = ListUnsubscribeHelper.getPreferredListUnsubscribeUri(message) assertThat(result).isEqualTo(MailtoUnsubscribeUri("mailto:unsubscribe@example.com".toUri())) @@ -38,7 +38,7 @@ class ListUnsubscribeHelperTest : RobolectricTest() { @Test fun `get list unsubscribe url - should allow https if no mailto`() { val message = buildMimeMessageWithListUnsubscribeValue( - "" + "", ) val result = ListUnsubscribeHelper.getPreferredListUnsubscribeUri(message) assertThat(result).isEqualTo(HttpsUnsubscribeUri("https://example.com/unsubscribe".toUri())) @@ -47,7 +47,7 @@ class ListUnsubscribeHelperTest : RobolectricTest() { @Test fun `get list unsubscribe url - should correctly parse uncommon urls`() { val message = buildMimeMessageWithListUnsubscribeValue( - "" + "", ) val result = ListUnsubscribeHelper.getPreferredListUnsubscribeUri(message) assertThat(result).isEqualTo(HttpsUnsubscribeUri("https://domain.example/one,two".toUri())) @@ -56,7 +56,7 @@ class ListUnsubscribeHelperTest : RobolectricTest() { @Test fun `get list unsubscribe url - should ignore unsafe entries 1`() { val message = buildMimeMessageWithListUnsubscribeValue( - "" + "", ) val result = ListUnsubscribeHelper.getPreferredListUnsubscribeUri(message) assertNull(result) @@ -65,7 +65,7 @@ class ListUnsubscribeHelperTest : RobolectricTest() { @Test fun `get list unsubscribe url - should ignore unsafe entries 2`() { val message = buildMimeMessageWithListUnsubscribeValue( - ", " + ", ", ) val result = ListUnsubscribeHelper.getPreferredListUnsubscribeUri(message) assertThat(result).isEqualTo(HttpsUnsubscribeUri("https://example.com/unsubscribe".toUri())) @@ -74,7 +74,7 @@ class ListUnsubscribeHelperTest : RobolectricTest() { @Test fun `get list unsubscribe url - should ignore empty`() { val message = buildMimeMessageWithListUnsubscribeValue( - "" + "", ) val result = ListUnsubscribeHelper.getPreferredListUnsubscribeUri(message) assertNull(result) diff --git a/app/core/src/test/java/com/fsck/k9/logging/LogcatLogFileWriterTest.kt b/app/core/src/test/java/com/fsck/k9/logging/LogcatLogFileWriterTest.kt index a4229bbb0d8..46dd150d278 100644 --- a/app/core/src/test/java/com/fsck/k9/logging/LogcatLogFileWriterTest.kt +++ b/app/core/src/test/java/com/fsck/k9/logging/LogcatLogFileWriterTest.kt @@ -25,7 +25,7 @@ class LogcatLogFileWriterTest { val logFileWriter = LogcatLogFileWriter( contentResolver = createContentResolver(), processExecutor = createProcessExecutor(logData), - coroutineDispatcher = Dispatchers.Unconfined + coroutineDispatcher = Dispatchers.Unconfined, ) logFileWriter.writeLogTo(contentUri) @@ -38,7 +38,7 @@ class LogcatLogFileWriterTest { val logFileWriter = LogcatLogFileWriter( contentResolver = createThrowingContentResolver(FileNotFoundException()), processExecutor = createProcessExecutor("irrelevant"), - coroutineDispatcher = Dispatchers.Unconfined + coroutineDispatcher = Dispatchers.Unconfined, ) logFileWriter.writeLogTo(contentUri) @@ -49,7 +49,7 @@ class LogcatLogFileWriterTest { val logFileWriter = LogcatLogFileWriter( contentResolver = createContentResolver(), processExecutor = ThrowingProcessExecutor(IOException()), - coroutineDispatcher = Dispatchers.Unconfined + coroutineDispatcher = Dispatchers.Unconfined, ) logFileWriter.writeLogTo(contentUri) diff --git a/app/core/src/test/java/com/fsck/k9/mailstore/K9BackendFolderTest.kt b/app/core/src/test/java/com/fsck/k9/mailstore/K9BackendFolderTest.kt index ba1488fb017..081a53ac300 100644 --- a/app/core/src/test/java/com/fsck/k9/mailstore/K9BackendFolderTest.kt +++ b/app/core/src/test/java/com/fsck/k9/mailstore/K9BackendFolderTest.kt @@ -104,7 +104,7 @@ class K9BackendFolderTest : K9RobolectricTest() { messageStore, createFolderSettingsProvider(), saveMessageDataCreator, - emptyList() + emptyList(), ) backendStorage.updateFolders { createFolders(listOf(FolderInfo(FOLDER_SERVER_ID, FOLDER_NAME, FOLDER_TYPE))) @@ -142,7 +142,7 @@ class K9BackendFolderTest : K9RobolectricTest() { "messages", contentValuesOf("flags" to null), "uid = ?", - arrayOf(MESSAGE_SERVER_ID) + arrayOf(MESSAGE_SERVER_ID), ) assertEquals(1, numberOfUpdatedRows) } diff --git a/app/core/src/test/java/com/fsck/k9/mailstore/K9BackendStorageTest.kt b/app/core/src/test/java/com/fsck/k9/mailstore/K9BackendStorageTest.kt index ccd2fee8cb8..ed0009a78eb 100644 --- a/app/core/src/test/java/com/fsck/k9/mailstore/K9BackendStorageTest.kt +++ b/app/core/src/test/java/com/fsck/k9/mailstore/K9BackendStorageTest.kt @@ -86,7 +86,7 @@ internal fun createFolderSettingsProvider(): FolderSettingsProvider { notifyClass = FolderClass.INHERITED, pushClass = FolderClass.SECOND_CLASS, inTopGroup = false, - integrate = false + integrate = false, ) } } diff --git a/app/core/src/test/java/com/fsck/k9/mailstore/MessageListCacheTest.kt b/app/core/src/test/java/com/fsck/k9/mailstore/MessageListCacheTest.kt index b23c4ff7e6d..9abd03ce3bd 100644 --- a/app/core/src/test/java/com/fsck/k9/mailstore/MessageListCacheTest.kt +++ b/app/core/src/test/java/com/fsck/k9/mailstore/MessageListCacheTest.kt @@ -33,7 +33,7 @@ class MessageListCacheTest { modules( module { single { mock() } - } + }, ) } } diff --git a/app/core/src/test/java/com/fsck/k9/mailstore/MessageListRepositoryTest.kt b/app/core/src/test/java/com/fsck/k9/mailstore/MessageListRepositoryTest.kt index f9284a768a7..4d219c8a206 100644 --- a/app/core/src/test/java/com/fsck/k9/mailstore/MessageListRepositoryTest.kt +++ b/app/core/src/test/java/com/fsck/k9/mailstore/MessageListRepositoryTest.kt @@ -46,7 +46,7 @@ class MessageListRepositoryTest { modules( module { single { messageListRepository } - } + }, ) } } @@ -103,8 +103,8 @@ class MessageListRepositoryTest { isRead = false, isStarred = true, isAnswered = false, - isForwarded = true - ) + isForwarded = true, + ), ) MessageListCache.getCache(accountUuid).apply { setFlagForMessages(listOf(MESSAGE_ID), Flag.SEEN, true) @@ -119,7 +119,7 @@ class MessageListRepositoryTest { isRead = message.isRead, isStarred = message.isStarred, isAnswered = message.isAnswered, - isForwarded = message.isForwarded + isForwarded = message.isForwarded, ) } @@ -131,8 +131,8 @@ class MessageListRepositoryTest { isRead = true, isStarred = false, isAnswered = false, - isForwarded = true - ) + isForwarded = true, + ), ) } @@ -140,7 +140,7 @@ class MessageListRepositoryTest { fun `getMessages() should skip messages marked as hidden in the cache`() { addMessages( MessageData(messageId = MESSAGE_ID, folderId = FOLDER_ID, threadRoot = THREAD_ROOT), - MessageData(messageId = MESSAGE_ID_2, folderId = FOLDER_ID, threadRoot = THREAD_ROOT) + MessageData(messageId = MESSAGE_ID_2, folderId = FOLDER_ID, threadRoot = THREAD_ROOT), ) hideMessage(MESSAGE_ID, FOLDER_ID) @@ -155,7 +155,7 @@ class MessageListRepositoryTest { fun `getMessages() should not skip message when marked as hidden in a different folder`() { addMessages( MessageData(messageId = MESSAGE_ID, folderId = FOLDER_ID, threadRoot = THREAD_ROOT), - MessageData(messageId = MESSAGE_ID_2, folderId = FOLDER_ID, threadRoot = THREAD_ROOT) + MessageData(messageId = MESSAGE_ID_2, folderId = FOLDER_ID, threadRoot = THREAD_ROOT), ) hideMessage(MESSAGE_ID, FOLDER_ID_2) @@ -176,8 +176,8 @@ class MessageListRepositoryTest { isRead = false, isStarred = true, isAnswered = false, - isForwarded = true - ) + isForwarded = true, + ), ) MessageListCache.getCache(accountUuid).apply { setFlagForMessages(listOf(MESSAGE_ID), Flag.SEEN, true) @@ -188,7 +188,7 @@ class MessageListRepositoryTest { accountUuid, SELECTION, SELECTION_ARGS, - SORT_ORDER + SORT_ORDER, ) { message -> MessageData( messageId = message.id, @@ -197,7 +197,7 @@ class MessageListRepositoryTest { isRead = message.isRead, isStarred = message.isStarred, isAnswered = message.isAnswered, - isForwarded = message.isForwarded + isForwarded = message.isForwarded, ) } @@ -209,8 +209,8 @@ class MessageListRepositoryTest { isRead = true, isStarred = false, isAnswered = false, - isForwarded = true - ) + isForwarded = true, + ), ) } @@ -218,7 +218,7 @@ class MessageListRepositoryTest { fun `getThreadedMessages() should skip messages marked as hidden in the cache`() { addThreadedMessages( MessageData(messageId = MESSAGE_ID, folderId = FOLDER_ID, threadRoot = THREAD_ROOT), - MessageData(messageId = MESSAGE_ID_2, folderId = FOLDER_ID, threadRoot = THREAD_ROOT_2) + MessageData(messageId = MESSAGE_ID_2, folderId = FOLDER_ID, threadRoot = THREAD_ROOT_2), ) hideMessage(MESSAGE_ID, FOLDER_ID) @@ -226,7 +226,7 @@ class MessageListRepositoryTest { accountUuid, SELECTION, SELECTION_ARGS, - SORT_ORDER + SORT_ORDER, ) { message -> message.id } @@ -238,7 +238,7 @@ class MessageListRepositoryTest { fun `getThreadedMessages() should not skip message when marked as hidden in a different folder`() { addThreadedMessages( MessageData(messageId = MESSAGE_ID, folderId = FOLDER_ID, threadRoot = THREAD_ROOT), - MessageData(messageId = MESSAGE_ID_2, folderId = FOLDER_ID, threadRoot = THREAD_ROOT_2) + MessageData(messageId = MESSAGE_ID_2, folderId = FOLDER_ID, threadRoot = THREAD_ROOT_2), ) hideMessage(MESSAGE_ID, FOLDER_ID_2) @@ -246,7 +246,7 @@ class MessageListRepositoryTest { accountUuid, SELECTION, SELECTION_ARGS, - SORT_ORDER + SORT_ORDER, ) { message -> message.id } @@ -265,7 +265,7 @@ class MessageListRepositoryTest { isRead = false, isStarred = true, isAnswered = false, - isForwarded = true + isForwarded = true, ), MessageData( messageId = MESSAGE_ID_2, @@ -274,8 +274,8 @@ class MessageListRepositoryTest { isRead = false, isStarred = true, isAnswered = true, - isForwarded = false - ) + isForwarded = false, + ), ) MessageListCache.getCache(accountUuid).apply { setFlagForMessages(listOf(MESSAGE_ID), Flag.SEEN, true) @@ -285,7 +285,7 @@ class MessageListRepositoryTest { val result = messageListRepository.getThread( accountUuid, THREAD_ROOT, - SORT_ORDER + SORT_ORDER, ) { message -> MessageData( messageId = message.id, @@ -294,7 +294,7 @@ class MessageListRepositoryTest { isRead = message.isRead, isStarred = message.isStarred, isAnswered = message.isAnswered, - isForwarded = message.isForwarded + isForwarded = message.isForwarded, ) } @@ -306,7 +306,7 @@ class MessageListRepositoryTest { isRead = true, isStarred = false, isAnswered = false, - isForwarded = true + isForwarded = true, ), MessageData( messageId = MESSAGE_ID_2, @@ -315,8 +315,8 @@ class MessageListRepositoryTest { isRead = false, isStarred = false, isAnswered = true, - isForwarded = false - ) + isForwarded = false, + ), ) } @@ -326,7 +326,7 @@ class MessageListRepositoryTest { THREAD_ROOT, MessageData(messageId = MESSAGE_ID, folderId = FOLDER_ID, threadRoot = THREAD_ROOT), MessageData(messageId = MESSAGE_ID_2, folderId = FOLDER_ID, threadRoot = THREAD_ROOT), - MessageData(messageId = MESSAGE_ID_3, folderId = FOLDER_ID, threadRoot = THREAD_ROOT) + MessageData(messageId = MESSAGE_ID_3, folderId = FOLDER_ID, threadRoot = THREAD_ROOT), ) hideMessage(MESSAGE_ID, FOLDER_ID) @@ -341,7 +341,7 @@ class MessageListRepositoryTest { THREAD_ROOT, MessageData(messageId = MESSAGE_ID, folderId = FOLDER_ID, threadRoot = THREAD_ROOT), MessageData(messageId = MESSAGE_ID_2, folderId = FOLDER_ID, threadRoot = THREAD_ROOT), - MessageData(messageId = MESSAGE_ID_3, folderId = FOLDER_ID, threadRoot = THREAD_ROOT) + MessageData(messageId = MESSAGE_ID_3, folderId = FOLDER_ID, threadRoot = THREAD_ROOT), ) hideMessage(MESSAGE_ID, FOLDER_ID_2) @@ -429,5 +429,5 @@ private data class MessageData( val isRead: Boolean = false, val isStarred: Boolean = false, val isAnswered: Boolean = false, - val isForwarded: Boolean = false + val isForwarded: Boolean = false, ) diff --git a/app/core/src/test/java/com/fsck/k9/message/IdentityHeaderBuilderTest.kt b/app/core/src/test/java/com/fsck/k9/message/IdentityHeaderBuilderTest.kt index 2be6075663d..c3de28c2356 100644 --- a/app/core/src/test/java/com/fsck/k9/message/IdentityHeaderBuilderTest.kt +++ b/app/core/src/test/java/com/fsck/k9/message/IdentityHeaderBuilderTest.kt @@ -49,7 +49,7 @@ class IdentityHeaderBuilderTest : RobolectricTest() { email: String? = null, signature: String? = null, signatureUse: Boolean = false, - replyTo: String? = null + replyTo: String? = null, ): Identity { return Identity(description, name, email, signature, signatureUse, replyTo) } diff --git a/app/core/src/test/java/com/fsck/k9/message/TextBodyBuilderTest.kt b/app/core/src/test/java/com/fsck/k9/message/TextBodyBuilderTest.kt index 2178cb42838..fbd514e9899 100644 --- a/app/core/src/test/java/com/fsck/k9/message/TextBodyBuilderTest.kt +++ b/app/core/src/test/java/com/fsck/k9/message/TextBodyBuilderTest.kt @@ -33,7 +33,7 @@ class TextBodyBuilderTest(val testData: TestData) { signatureBeforeQuotedText = false, expectedPlainTextMessage = MESSAGE_TEXT, expectedHtmlTextMessage = TextBodyBuilder.HTML_AND_BODY_START + MESSAGE_TEXT_HTML + - TextBodyBuilder.HTML_AND_BODY_END + TextBodyBuilder.HTML_AND_BODY_END, ), TestData( appendSignature = true, @@ -43,7 +43,7 @@ class TextBodyBuilderTest(val testData: TestData) { signatureBeforeQuotedText = false, expectedPlainTextMessage = MESSAGE_TEXT + "\r\n" + SIGNATURE_TEXT, expectedHtmlTextMessage = TextBodyBuilder.HTML_AND_BODY_START + MESSAGE_TEXT_HTML + - SIGNATURE_TEXT_HTML + TextBodyBuilder.HTML_AND_BODY_END + SIGNATURE_TEXT_HTML + TextBodyBuilder.HTML_AND_BODY_END, ), TestData( appendSignature = false, @@ -53,7 +53,7 @@ class TextBodyBuilderTest(val testData: TestData) { signatureBeforeQuotedText = false, expectedPlainTextMessage = MESSAGE_TEXT + "\r\n\r\n" + QUOTED_TEXT, expectedHtmlTextMessage = QUOTED_HTML_TAGS_START + MESSAGE_TEXT_HTML + QUOTED_HTML_BODY + - QUOTED_HTML_TAGS_END + QUOTED_HTML_TAGS_END, ), TestData( appendSignature = false, @@ -63,7 +63,7 @@ class TextBodyBuilderTest(val testData: TestData) { signatureBeforeQuotedText = false, expectedPlainTextMessage = MESSAGE_TEXT + "\r\n\r\n" + QUOTED_TEXT, expectedHtmlTextMessage = QUOTED_HTML_TAGS_START + MESSAGE_TEXT_HTML + "

" + - QUOTED_HTML_BODY + QUOTED_HTML_TAGS_END + QUOTED_HTML_BODY + QUOTED_HTML_TAGS_END, ), TestData( appendSignature = false, @@ -73,7 +73,7 @@ class TextBodyBuilderTest(val testData: TestData) { signatureBeforeQuotedText = false, expectedPlainTextMessage = QUOTED_TEXT + "\r\n" + MESSAGE_TEXT, expectedHtmlTextMessage = QUOTED_HTML_TAGS_START + QUOTED_HTML_BODY + MESSAGE_TEXT_HTML + - QUOTED_HTML_TAGS_END + QUOTED_HTML_TAGS_END, ), TestData( appendSignature = false, @@ -83,7 +83,7 @@ class TextBodyBuilderTest(val testData: TestData) { signatureBeforeQuotedText = false, expectedPlainTextMessage = QUOTED_TEXT + "\r\n" + MESSAGE_TEXT, expectedHtmlTextMessage = QUOTED_HTML_TAGS_START + QUOTED_HTML_BODY + "
" + - MESSAGE_TEXT_HTML + QUOTED_HTML_TAGS_END + MESSAGE_TEXT_HTML + QUOTED_HTML_TAGS_END, ), TestData( appendSignature = true, @@ -93,7 +93,7 @@ class TextBodyBuilderTest(val testData: TestData) { signatureBeforeQuotedText = false, expectedPlainTextMessage = MESSAGE_TEXT + "\r\n\r\n" + QUOTED_TEXT + "\r\n" + SIGNATURE_TEXT, expectedHtmlTextMessage = QUOTED_HTML_TAGS_START + MESSAGE_TEXT_HTML + QUOTED_HTML_BODY + - SIGNATURE_TEXT_HTML + QUOTED_HTML_TAGS_END + SIGNATURE_TEXT_HTML + QUOTED_HTML_TAGS_END, ), TestData( appendSignature = true, @@ -103,7 +103,7 @@ class TextBodyBuilderTest(val testData: TestData) { signatureBeforeQuotedText = false, expectedPlainTextMessage = MESSAGE_TEXT + "\r\n\r\n" + QUOTED_TEXT + "\r\n" + SIGNATURE_TEXT, expectedHtmlTextMessage = QUOTED_HTML_TAGS_START + MESSAGE_TEXT_HTML + "

" + - QUOTED_HTML_BODY + SIGNATURE_TEXT_HTML + QUOTED_HTML_TAGS_END + QUOTED_HTML_BODY + SIGNATURE_TEXT_HTML + QUOTED_HTML_TAGS_END, ), TestData( appendSignature = true, @@ -113,7 +113,7 @@ class TextBodyBuilderTest(val testData: TestData) { signatureBeforeQuotedText = false, expectedPlainTextMessage = QUOTED_TEXT + "\r\n" + MESSAGE_TEXT + "\r\n" + SIGNATURE_TEXT, expectedHtmlTextMessage = QUOTED_HTML_TAGS_START + QUOTED_HTML_BODY + MESSAGE_TEXT_HTML + - SIGNATURE_TEXT_HTML + QUOTED_HTML_TAGS_END + SIGNATURE_TEXT_HTML + QUOTED_HTML_TAGS_END, ), TestData( appendSignature = true, @@ -123,7 +123,7 @@ class TextBodyBuilderTest(val testData: TestData) { signatureBeforeQuotedText = false, expectedPlainTextMessage = QUOTED_TEXT + "\r\n" + MESSAGE_TEXT + "\r\n" + SIGNATURE_TEXT, expectedHtmlTextMessage = QUOTED_HTML_TAGS_START + QUOTED_HTML_BODY + "
" + - MESSAGE_TEXT_HTML + SIGNATURE_TEXT_HTML + QUOTED_HTML_TAGS_END + MESSAGE_TEXT_HTML + SIGNATURE_TEXT_HTML + QUOTED_HTML_TAGS_END, ), TestData( appendSignature = true, @@ -133,7 +133,7 @@ class TextBodyBuilderTest(val testData: TestData) { signatureBeforeQuotedText = true, expectedPlainTextMessage = MESSAGE_TEXT + "\r\n" + SIGNATURE_TEXT + "\r\n\r\n" + QUOTED_TEXT, expectedHtmlTextMessage = QUOTED_HTML_TAGS_START + MESSAGE_TEXT_HTML + SIGNATURE_TEXT_HTML + - QUOTED_HTML_BODY + QUOTED_HTML_TAGS_END + QUOTED_HTML_BODY + QUOTED_HTML_TAGS_END, ), TestData( appendSignature = true, @@ -143,8 +143,8 @@ class TextBodyBuilderTest(val testData: TestData) { signatureBeforeQuotedText = true, expectedPlainTextMessage = MESSAGE_TEXT + "\r\n" + SIGNATURE_TEXT + "\r\n\r\n" + QUOTED_TEXT, expectedHtmlTextMessage = QUOTED_HTML_TAGS_START + MESSAGE_TEXT_HTML + SIGNATURE_TEXT_HTML + - "

" + QUOTED_HTML_BODY + QUOTED_HTML_TAGS_END - ) + "

" + QUOTED_HTML_BODY + QUOTED_HTML_TAGS_END, + ), ) } } @@ -161,7 +161,7 @@ class TextBodyBuilderTest(val testData: TestData) { toTest.setQuotedText(QUOTED_TEXT) val quotedHtmlContent = InsertableHtmlContent() quotedHtmlContent.setQuotedContent( - StringBuilder(QUOTED_HTML_TAGS_START + QUOTED_HTML_BODY + QUOTED_HTML_TAGS_END) + StringBuilder(QUOTED_HTML_TAGS_START + QUOTED_HTML_BODY + QUOTED_HTML_TAGS_END), ) quotedHtmlContent.setHeaderInsertionPoint(QUOTED_HTML_TAGS_START.length) quotedHtmlContent.footerInsertionPoint = @@ -209,7 +209,7 @@ class TextBodyBuilderTest(val testData: TestData) { val replyAfterQuote: Boolean, val signatureBeforeQuotedText: Boolean, val expectedPlainTextMessage: String, - val expectedHtmlTextMessage: String + val expectedHtmlTextMessage: String, ) { override fun toString(): String { return "appendSignature=$appendSignature," + diff --git a/app/core/src/test/java/com/fsck/k9/message/extractors/BasicPartInfoExtractorTest.kt b/app/core/src/test/java/com/fsck/k9/message/extractors/BasicPartInfoExtractorTest.kt index f50b99139ce..c218a9c5e40 100644 --- a/app/core/src/test/java/com/fsck/k9/message/extractors/BasicPartInfoExtractorTest.kt +++ b/app/core/src/test/java/com/fsck/k9/message/extractors/BasicPartInfoExtractorTest.kt @@ -12,7 +12,7 @@ class BasicPartInfoExtractorTest { fun `extractPartInfo with 'filename' parameter in Content-Disposition header`() { val part = createPart( contentType = "application/octet-stream", - contentDisposition = "attachment; filename=\"attachment_name.txt\"; size=23" + contentDisposition = "attachment; filename=\"attachment_name.txt\"; size=23", ) val partInfo = basicPartInfoExtractor.extractPartInfo(part) @@ -25,7 +25,7 @@ class BasicPartInfoExtractorTest { fun `extractPartInfo with 'name' parameter in Content-Type header`() { val part = createPart( contentType = "image/jpeg; name=\"attachment.jpeg\"", - contentDisposition = "attachment; size=42" + contentDisposition = "attachment; size=42", ) val partInfo = basicPartInfoExtractor.extractPartInfo(part) @@ -58,7 +58,7 @@ class BasicPartInfoExtractorTest { fun `extractPartInfo with missing Content-Disposition header`() { val part = createPart( contentType = "application/octet-stream; name=\"attachment.dat\"", - contentDisposition = null + contentDisposition = null, ) val partInfo = basicPartInfoExtractor.extractPartInfo(part) @@ -71,7 +71,7 @@ class BasicPartInfoExtractorTest { fun `extractPartInfo with missing Content-Disposition header and name`() { val part = createPart( contentType = "application/octet-stream", - contentDisposition = null + contentDisposition = null, ) val partInfo = basicPartInfoExtractor.extractPartInfo(part) @@ -84,7 +84,7 @@ class BasicPartInfoExtractorTest { fun `extractPartInfo without any relevant headers`() { val part = createPart( contentType = null, - contentDisposition = null + contentDisposition = null, ) val partInfo = basicPartInfoExtractor.extractPartInfo(part) @@ -97,7 +97,7 @@ class BasicPartInfoExtractorTest { fun `extractPartInfo with invalid Content-Disposition header`() { val part = createPart( contentType = "application/octet-stream", - contentDisposition = "something; " + contentDisposition = "something; ", ) val partInfo = basicPartInfoExtractor.extractPartInfo(part) diff --git a/app/core/src/test/java/com/fsck/k9/message/extractors/TextPartFinderTest.kt b/app/core/src/test/java/com/fsck/k9/message/extractors/TextPartFinderTest.kt index 4f7f32c091a..82c24ae858c 100644 --- a/app/core/src/test/java/com/fsck/k9/message/extractors/TextPartFinderTest.kt +++ b/app/core/src/test/java/com/fsck/k9/message/extractors/TextPartFinderTest.kt @@ -43,7 +43,7 @@ class TextPartFinderTest { val part = createMultipart( "multipart/alternative", expected, - createTextPart("text/html") + createTextPart("text/html"), ) val result = textPartFinder.findFirstTextPart(part) @@ -57,7 +57,7 @@ class TextPartFinderTest { val part = createMultipart( "multipart/alternative", createTextPart("text/html"), - expected + expected, ) val result = textPartFinder.findFirstTextPart(part) @@ -72,7 +72,7 @@ class TextPartFinderTest { "multipart/alternative", createPart("image/gif"), expected, - createTextPart("text/html") + createTextPart("text/html"), ) val result = textPartFinder.findFirstTextPart(part) @@ -85,7 +85,7 @@ class TextPartFinderTest { val part = createMultipart( "multipart/alternative", createPart("image/gif"), - createPart("application/pdf") + createPart("application/pdf"), ) val result = textPartFinder.findFirstTextPart(part) @@ -101,9 +101,9 @@ class TextPartFinderTest { createMultipart( "multipart/related", expected, - createPart("image/jpeg") + createPart("image/jpeg"), ), - createTextPart("text/html") + createTextPart("text/html"), ) val result = textPartFinder.findFirstTextPart(part) @@ -119,9 +119,9 @@ class TextPartFinderTest { createMultipart( "multipart/related", createTextPart("text/html"), - createPart("image/jpeg") + createPart("image/jpeg"), ), - expected + expected, ) val result = textPartFinder.findFirstTextPart(part) @@ -135,7 +135,7 @@ class TextPartFinderTest { val part = createMultipart( "multipart/mixed", createPart("image/jpeg"), - expected + expected, ) val result = textPartFinder.findFirstTextPart(part) @@ -149,7 +149,7 @@ class TextPartFinderTest { val part = createMultipart( "multipart/mixed", expected, - createTextPart("text/plain") + createTextPart("text/plain"), ) val result = textPartFinder.findFirstTextPart(part) @@ -162,7 +162,7 @@ class TextPartFinderTest { val part = createMultipart( "multipart/mixed", createPart("image/jpeg"), - createPart("image/gif") + createPart("image/gif"), ) val result = textPartFinder.findFirstTextPart(part) @@ -179,9 +179,9 @@ class TextPartFinderTest { createMultipart( "multipart/alternative", expected, - createTextPart("text/html") + createTextPart("text/html"), ), - createTextPart("text/plain") + createTextPart("text/plain"), ) val result = textPartFinder.findFirstTextPart(part) @@ -197,8 +197,8 @@ class TextPartFinderTest { createMultipart( "multipart/alternative", createTextPart("text/html"), - expected - ) + expected, + ), ) val result = textPartFinder.findFirstTextPart(part) @@ -212,7 +212,7 @@ class TextPartFinderTest { val part = createMultipart( "multipart/alternative", expected, - createTextPart("text/html") + createTextPart("text/html"), ) val result = textPartFinder.findFirstTextPart(part) @@ -226,7 +226,7 @@ class TextPartFinderTest { val part = createMultipart( "multipart/mixed", expected, - createTextPart("text/plain") + createTextPart("text/plain"), ) val result = textPartFinder.findFirstTextPart(part) @@ -242,9 +242,9 @@ class TextPartFinderTest { createMultipart( "multipart/alternative", createPart("image/jpeg"), - createPart("image/png") + createPart("image/png"), ), - expected + expected, ) val result = textPartFinder.findFirstTextPart(part) diff --git a/app/core/src/test/java/com/fsck/k9/message/html/DisplayHtmlTest.kt b/app/core/src/test/java/com/fsck/k9/message/html/DisplayHtmlTest.kt index 080355a4dbf..6dcb06aa35b 100644 --- a/app/core/src/test/java/com/fsck/k9/message/html/DisplayHtmlTest.kt +++ b/app/core/src/test/java/com/fsck/k9/message/html/DisplayHtmlTest.kt @@ -52,7 +52,7 @@ class DisplayHtmlTest { assertEquals( "Expected to find '$cssQuery' $numberOfExpectedOccurrences time(s) in:\n$html", numberOfExpectedOccurrences, - numberOfFoundElements + numberOfFoundElements, ) } } diff --git a/app/core/src/test/java/com/fsck/k9/message/html/HtmlConverterTest.kt b/app/core/src/test/java/com/fsck/k9/message/html/HtmlConverterTest.kt index b8caa01adb5..9f3ec5bc0be 100644 --- a/app/core/src/test/java/com/fsck/k9/message/html/HtmlConverterTest.kt +++ b/app/core/src/test/java/com/fsck/k9/message/html/HtmlConverterTest.kt @@ -60,7 +60,7 @@ class HtmlConverterTest { |
| | - """.trimMargin().removeLineBreaks() + """.trimMargin().removeLineBreaks(), ) } @@ -98,7 +98,7 @@ class HtmlConverterTest { | | | - """.trimMargin().removeLineBreaks() + """.trimMargin().removeLineBreaks(), ) } @@ -154,7 +154,7 @@ class HtmlConverterTest { | | | - """.trimMargin().removeLineBreaks() + """.trimMargin().removeLineBreaks(), ) } @@ -179,7 +179,7 @@ class HtmlConverterTest { | baz
| | - """.trimMargin().removeLineBreaks() + """.trimMargin().removeLineBreaks(), ) } @@ -212,7 +212,7 @@ class HtmlConverterTest { | | | - """.trimMargin().removeLineBreaks() + """.trimMargin().removeLineBreaks(), ) } @@ -252,7 +252,7 @@ class HtmlConverterTest { end - """.trimIndent().removeLineBreaks() + """.trimIndent().removeLineBreaks(), ) } @@ -276,7 +276,7 @@ class HtmlConverterTest { foo bar - """.trimIndent().removeLineBreaks() + """.trimIndent().removeLineBreaks(), ) } @@ -301,7 +301,7 @@ class HtmlConverterTest { foo bar - """.trimIndent().removeLineBreaks() + """.trimIndent().removeLineBreaks(), ) } @@ -319,7 +319,7 @@ class HtmlConverterTest {
- """.trimIndent().removeLineBreaks() + """.trimIndent().removeLineBreaks(), ) } @@ -380,7 +380,7 @@ class HtmlConverterTest { foo bar - """.trimIndent().removeLineBreaks() + """.trimIndent().removeLineBreaks(), ) } @@ -398,7 +398,7 @@ class HtmlConverterTest {
- """.trimIndent().removeLineBreaks() + """.trimIndent().removeLineBreaks(), ) } @@ -422,7 +422,7 @@ class HtmlConverterTest { world - """.trimIndent().removeLineBreaks() + """.trimIndent().removeLineBreaks(), ) } @@ -448,7 +448,7 @@ class HtmlConverterTest { - """.trimIndent().removeLineBreaks() + """.trimIndent().removeLineBreaks(), ) } @@ -524,7 +524,7 @@ class HtmlConverterTest { Two Three - """.trimIndent() + """.trimIndent(), ) } @@ -550,7 +550,7 @@ class HtmlConverterTest { Three Four - """.trimIndent() + """.trimIndent(), ) } diff --git a/app/core/src/test/java/com/fsck/k9/message/quote/TextQuoteCreatorTest.kt b/app/core/src/test/java/com/fsck/k9/message/quote/TextQuoteCreatorTest.kt index 97a39b26ea9..412c54f60b4 100644 --- a/app/core/src/test/java/com/fsck/k9/message/quote/TextQuoteCreatorTest.kt +++ b/app/core/src/test/java/com/fsck/k9/message/quote/TextQuoteCreatorTest.kt @@ -42,7 +42,7 @@ class TextQuoteCreatorTest : RobolectricTest() { > Line 1 > Line 2 > Line 3 - """.trimIndent().crlf() + """.trimIndent().crlf(), ) } @@ -59,7 +59,7 @@ class TextQuoteCreatorTest : RobolectricTest() { On January 18, 1970 7:53:41 PM UTC, Alice wrote: $1\t Line 1 $1\t Line 2 - """.trimIndent().crlf() + """.trimIndent().crlf(), ) } @@ -80,7 +80,7 @@ class TextQuoteCreatorTest : RobolectricTest() { On January 18, 1970 7:53:41 PM UTC, Alice wrote: > [-------] [-------] [-------] [-------] [-------] [-------] [-------] [-------] [-------] [-------] > [-------------------------------------------------------------------------------------------------] - """.trimIndent().crlf() + """.trimIndent().crlf(), ) } @@ -103,7 +103,7 @@ class TextQuoteCreatorTest : RobolectricTest() { Line 1 Line 2 Line 3 - """.trimIndent().crlf() + """.trimIndent().crlf(), ) } diff --git a/app/core/src/test/java/com/fsck/k9/message/signature/HtmlSignatureRemoverTest.kt b/app/core/src/test/java/com/fsck/k9/message/signature/HtmlSignatureRemoverTest.kt index f9ca1af7d4d..c212fa838a8 100644 --- a/app/core/src/test/java/com/fsck/k9/message/signature/HtmlSignatureRemoverTest.kt +++ b/app/core/src/test/java/com/fsck/k9/message/signature/HtmlSignatureRemoverTest.kt @@ -58,7 +58,7 @@ class HtmlSignatureRemoverTest { val withoutSignature = stripSignature(html) assertThat(withoutSignature).isEqualTo( - """
This is the body text
""" + """
This is the body text
""", ) } @@ -114,7 +114,7 @@ class HtmlSignatureRemoverTest {
This is the body text
- """.trimIndent().removeNewlines() + """.trimIndent().removeNewlines(), ) } @@ -145,7 +145,7 @@ class HtmlSignatureRemoverTest {
Some quote
- """.trimIndent().removeNewlines() + """.trimIndent().removeNewlines(), ) } @@ -178,7 +178,7 @@ class HtmlSignatureRemoverTest {
- """.trimIndent().removeNewlines() + """.trimIndent().removeNewlines(), ) } } diff --git a/app/core/src/test/java/com/fsck/k9/notification/AuthenticationErrorNotificationControllerTest.kt b/app/core/src/test/java/com/fsck/k9/notification/AuthenticationErrorNotificationControllerTest.kt index aed171f238d..c0665d0bd0a 100644 --- a/app/core/src/test/java/com/fsck/k9/notification/AuthenticationErrorNotificationControllerTest.kt +++ b/app/core/src/test/java/com/fsck/k9/notification/AuthenticationErrorNotificationControllerTest.kt @@ -30,7 +30,7 @@ class AuthenticationErrorNotificationControllerTest : RobolectricTest() { private val notificationHelper = createFakeNotificationHelper( notificationManager, builder, - lockScreenNotificationBuilder + lockScreenNotificationBuilder, ) private val account = createFakeAccount() private val controller = TestAuthenticationErrorNotificationController() @@ -95,7 +95,7 @@ class AuthenticationErrorNotificationControllerTest : RobolectricTest() { private fun createFakeNotificationHelper( notificationManager: NotificationManagerCompat, notificationBuilder: NotificationCompat.Builder, - lockScreenNotificationBuilder: NotificationCompat.Builder + lockScreenNotificationBuilder: NotificationCompat.Builder, ): NotificationHelper { return mock { on { getContext() } doReturn ApplicationProvider.getApplicationContext() diff --git a/app/core/src/test/java/com/fsck/k9/notification/BaseNotificationDataCreatorTest.kt b/app/core/src/test/java/com/fsck/k9/notification/BaseNotificationDataCreatorTest.kt index 65dea9c1e26..3f28e7aadf2 100644 --- a/app/core/src/test/java/com/fsck/k9/notification/BaseNotificationDataCreatorTest.kt +++ b/app/core/src/test/java/com/fsck/k9/notification/BaseNotificationDataCreatorTest.kt @@ -155,8 +155,8 @@ class BaseNotificationDataCreatorTest { vibration = NotificationVibration( isEnabled = true, pattern = VibratePattern.Pattern3, - repeatCount = 2 - ) + repeatCount = 2, + ), ) } val notificationData = createNotificationData() @@ -164,7 +164,7 @@ class BaseNotificationDataCreatorTest { val result = notificationDataCreator.createBaseNotificationData(notificationData) assertThat(result.appearance.vibrationPattern).isEqualTo( - NotificationVibration.getSystemPattern(VibratePattern.Pattern3, 2) + NotificationVibration.getSystemPattern(VibratePattern.Pattern3, 2), ) } @@ -192,8 +192,8 @@ class BaseNotificationDataCreatorTest { sender = sender, preview = "irrelevant", summary = "irrelevant", - subject = "irrelevant" - ) + subject = "irrelevant", + ), ) } return NotificationData(account, activeNotifications, inactiveNotifications = emptyList()) diff --git a/app/core/src/test/java/com/fsck/k9/notification/CertificateErrorNotificationControllerTest.kt b/app/core/src/test/java/com/fsck/k9/notification/CertificateErrorNotificationControllerTest.kt index 3681ff4a001..7d74127f634 100644 --- a/app/core/src/test/java/com/fsck/k9/notification/CertificateErrorNotificationControllerTest.kt +++ b/app/core/src/test/java/com/fsck/k9/notification/CertificateErrorNotificationControllerTest.kt @@ -30,7 +30,7 @@ class CertificateErrorNotificationControllerTest : RobolectricTest() { private val notificationHelper = createFakeNotificationHelper( notificationManager, builder, - lockScreenNotificationBuilder + lockScreenNotificationBuilder, ) private val account = createFakeAccount() private val controller = TestCertificateErrorNotificationController() @@ -95,7 +95,7 @@ class CertificateErrorNotificationControllerTest : RobolectricTest() { private fun createFakeNotificationHelper( notificationManager: NotificationManagerCompat, notificationBuilder: NotificationCompat.Builder, - lockScreenNotificationBuilder: NotificationCompat.Builder + lockScreenNotificationBuilder: NotificationCompat.Builder, ): NotificationHelper { return mock { on { getContext() } doReturn ApplicationProvider.getApplicationContext() @@ -115,7 +115,7 @@ class CertificateErrorNotificationControllerTest : RobolectricTest() { internal inner class TestCertificateErrorNotificationController : CertificateErrorNotificationController( notificationHelper, mock(), - resourceProvider + resourceProvider, ) { override fun createContentIntent(account: Account, incoming: Boolean): PendingIntent { return contentIntent diff --git a/app/core/src/test/java/com/fsck/k9/notification/LockScreenNotificationCreatorTest.kt b/app/core/src/test/java/com/fsck/k9/notification/LockScreenNotificationCreatorTest.kt index f92ec2a8662..1d999dfe974 100644 --- a/app/core/src/test/java/com/fsck/k9/notification/LockScreenNotificationCreatorTest.kt +++ b/app/core/src/test/java/com/fsck/k9/notification/LockScreenNotificationCreatorTest.kt @@ -18,7 +18,7 @@ class LockScreenNotificationCreatorTest : RobolectricTest() { private val publicBuilder = createFakeNotificationBuilder() private var notificationCreator = LockScreenNotificationCreator( notificationHelper = createFakeNotificationHelper(publicBuilder), - resourceProvider = resourceProvider + resourceProvider = resourceProvider, ) @Test @@ -52,7 +52,7 @@ class LockScreenNotificationCreatorTest : RobolectricTest() { fun `list of sender names`() { val baseNotificationData = createBaseNotificationData( lockScreenNotificationData = LockScreenNotificationData.SenderNames("Alice, Bob"), - newMessagesCount = 2 + newMessagesCount = 2, ) notificationCreator.configureLockScreenNotification(builder, baseNotificationData) @@ -69,7 +69,7 @@ class LockScreenNotificationCreatorTest : RobolectricTest() { val baseNotificationData = createBaseNotificationData( lockScreenNotificationData = LockScreenNotificationData.MessageCount, accountName = "Account name", - newMessagesCount = 23 + newMessagesCount = 23, ) notificationCreator.configureLockScreenNotification(builder, baseNotificationData) @@ -97,7 +97,7 @@ class LockScreenNotificationCreatorTest : RobolectricTest() { private fun createBaseNotificationData( lockScreenNotificationData: LockScreenNotificationData, accountName: String = "irrelevant", - newMessagesCount: Int = 0 + newMessagesCount: Int = 0, ): BaseNotificationData { return BaseNotificationData( account = account, @@ -109,8 +109,8 @@ class LockScreenNotificationCreatorTest : RobolectricTest() { appearance = NotificationAppearance( ringtone = null, vibrationPattern = longArrayOf(), - ledColor = 0 - ) + ledColor = 0, + ), ) } } diff --git a/app/core/src/test/java/com/fsck/k9/notification/NewMailNotificationManagerTest.kt b/app/core/src/test/java/com/fsck/k9/notification/NewMailNotificationManagerTest.kt index dda7ca6afc5..49ea41c2271 100644 --- a/app/core/src/test/java/com/fsck/k9/notification/NewMailNotificationManagerTest.kt +++ b/app/core/src/test/java/com/fsck/k9/notification/NewMailNotificationManagerTest.kt @@ -34,7 +34,7 @@ class NewMailNotificationManagerTest { BaseNotificationDataCreator(), SingleMessageNotificationDataCreator(), SummaryNotificationDataCreator(SingleMessageNotificationDataCreator()), - clock + clock, ) @Test @@ -44,7 +44,7 @@ class NewMailNotificationManagerTest { subject = "subject", preview = "preview", summary = "summary", - messageUid = "msg-1" + messageUid = "msg-1", ) val result = manager.addNewMailNotification(account, message, silent = false) @@ -56,8 +56,8 @@ class NewMailNotificationManagerTest { sender = "sender", subject = "subject", preview = "preview", - summary = "summary" - ) + summary = "summary", + ), ) assertThat(result.summaryNotificationData).isInstanceOf(SummarySingleNotificationData::class.java) val summaryNotificationData = result.summaryNotificationData as SummarySingleNotificationData @@ -71,14 +71,14 @@ class NewMailNotificationManagerTest { subject = "Hi Bob", preview = "How are you?", summary = "Alice Hi Bob", - messageUid = "msg-1" + messageUid = "msg-1", ) val messageTwo = addMessageToNotificationContentCreator( sender = "Zoe", subject = "Meeting", preview = "We need to talk", summary = "Zoe Meeting", - messageUid = "msg-2" + messageUid = "msg-2", ) manager.addNewMailNotification(account, messageOne, silent = false) val timestamp = TIMESTAMP + 1000 @@ -93,8 +93,8 @@ class NewMailNotificationManagerTest { sender = "Zoe", subject = "Meeting", preview = "We need to talk", - summary = "Zoe Meeting" - ) + summary = "Zoe Meeting", + ), ) assertThat(result.baseNotificationData.newMessagesCount).isEqualTo(2) assertThat(result.summaryNotificationData).isInstanceOf(SummaryInboxNotificationData::class.java) @@ -103,8 +103,8 @@ class NewMailNotificationManagerTest { assertThat(summaryNotificationData.messageReferences).isEqualTo( listOf( createMessageReference("msg-2"), - createMessageReference("msg-1") - ) + createMessageReference("msg-1"), + ), ) assertThat(summaryNotificationData.additionalMessagesCount).isEqualTo(0) assertThat(summaryNotificationData.isSilent).isFalse() @@ -118,7 +118,7 @@ class NewMailNotificationManagerTest { subject = "Another one", preview = "Are you tired of me yet?", summary = "Alice Another one", - messageUid = "msg-x" + messageUid = "msg-x", ) val result = manager.addNewMailNotification(account, message, silent = false) @@ -145,7 +145,7 @@ class NewMailNotificationManagerTest { subject = "Another one", preview = "Are you tired of me yet?", summary = "Alice Another one", - messageUid = "msg-x" + messageUid = "msg-x", ) manager.addNewMailNotification(account, message, silent = false) @@ -163,7 +163,7 @@ class NewMailNotificationManagerTest { subject = "Hello", preview = "How are you?", summary = "Alice Hello", - messageUid = "msg-1" + messageUid = "msg-1", ) manager.addNewMailNotification(account, message, silent = false) @@ -174,7 +174,7 @@ class NewMailNotificationManagerTest { assertNotNull(result) { data -> assertThat(data.cancelNotificationIds).containsExactly( NotificationIds.getNewMailSummaryNotificationId(account), - NotificationIds.getSingleMessageNotificationId(account, 0) + NotificationIds.getSingleMessageNotificationId(account, 0), ) assertThat(data.singleNotificationData).isEmpty() assertThat(data.summaryNotificationData).isNull() @@ -188,7 +188,7 @@ class NewMailNotificationManagerTest { subject = "One", preview = "preview", summary = "Alice One", - messageUid = "msg-1" + messageUid = "msg-1", ) manager.addNewMailNotification(account, messageOne, silent = false) val messageTwo = addMessageToNotificationContentCreator( @@ -196,7 +196,7 @@ class NewMailNotificationManagerTest { subject = "Two", preview = "preview", summary = "Alice Two", - messageUid = "msg-2" + messageUid = "msg-2", ) val dataTwo = manager.addNewMailNotification(account, messageTwo, silent = true) assertNotNull(dataTwo) @@ -206,7 +206,7 @@ class NewMailNotificationManagerTest { subject = "Three", preview = "preview", summary = "Alice Three", - messageUid = "msg-3" + messageUid = "msg-3", ) manager.addNewMailNotification(account, messageThree, silent = true) @@ -224,8 +224,8 @@ class NewMailNotificationManagerTest { assertThat(summaryNotificationData.messageReferences).isEqualTo( listOf( createMessageReference("msg-3"), - createMessageReference("msg-1") - ) + createMessageReference("msg-1"), + ), ) } } @@ -237,7 +237,7 @@ class NewMailNotificationManagerTest { subject = "Another one", preview = "Are you tired of me yet?", summary = "Alice Another one", - messageUid = "msg-restore" + messageUid = "msg-restore", ) manager.addNewMailNotification(account, message, silent = false) addMaximumNumberOfNotifications() @@ -260,8 +260,8 @@ class NewMailNotificationManagerTest { sender = "Alice", subject = "Another one", preview = "Are you tired of me yet?", - summary = "Alice Another one" - ) + summary = "Alice Another one", + ), ) } } @@ -282,7 +282,7 @@ class NewMailNotificationManagerTest { subject = "Subject", summary = "Summary", preview = "Preview", - messageUid = "uid-1" + messageUid = "uid-1", ) val result = manager.restoreNewMailNotifications(account) @@ -302,8 +302,8 @@ class NewMailNotificationManagerTest { sender = "Sender", subject = "Subject", preview = "Preview", - summary = "Summary" - ) + summary = "Summary", + ), ) assertThat(data.summaryNotificationData).isInstanceOf(SummarySingleNotificationData::class.java) @@ -315,8 +315,8 @@ class NewMailNotificationManagerTest { sender = "Sender", subject = "Subject", preview = "Preview", - summary = "Summary" - ) + summary = "Summary", + ), ) } } @@ -331,7 +331,7 @@ class NewMailNotificationManagerTest { subject = "inactive", summary = "inactive", preview = "inactive", - messageUid = "uid-inactive" + messageUid = "uid-inactive", ) val result = manager.restoreNewMailNotifications(account) @@ -363,7 +363,7 @@ class NewMailNotificationManagerTest { subject = "subject", preview = "preview", summary = "summary", - messageUid = "msg-$index" + messageUid = "msg-$index", ) manager.addNewMailNotification(account, message, silent = true) } @@ -374,7 +374,7 @@ class NewMailNotificationManagerTest { subject: String, preview: String, summary: String, - messageUid: String + messageUid: String, ): LocalMessage { val message = mock() @@ -385,7 +385,7 @@ class NewMailNotificationManagerTest { sender, subject, preview, - summary + summary, ) } @@ -399,7 +399,7 @@ class NewMailNotificationManagerTest { subject: String, preview: String, summary: String, - messageUid: String + messageUid: String, ) { val message = mock() @@ -413,7 +413,7 @@ class NewMailNotificationManagerTest { sender, subject, preview, - summary + summary, ) } } @@ -427,7 +427,7 @@ class NewMailNotificationManagerTest { subject = "irrelevant", preview = "irrelevant", summary = "irrelevant", - messageUid = "uid-$index" + messageUid = "uid-$index", ) } } @@ -461,7 +461,7 @@ class NewMailNotificationManagerTest { notificationStoreProvider, localStoreProvider, messageStoreManager, - notificationContentCreator + notificationContentCreator, ) } } diff --git a/app/core/src/test/java/com/fsck/k9/notification/NotificationDataStoreTest.kt b/app/core/src/test/java/com/fsck/k9/notification/NotificationDataStoreTest.kt index c3000f77111..f4c94bbda6e 100644 --- a/app/core/src/test/java/com/fsck/k9/notification/NotificationDataStoreTest.kt +++ b/app/core/src/test/java/com/fsck/k9/notification/NotificationDataStoreTest.kt @@ -237,7 +237,7 @@ class NotificationDataStoreTest : RobolectricTest() { sender = "irrelevant", subject = "irrelevant", preview = "irrelevant", - summary = "irrelevant" + summary = "irrelevant", ) } } diff --git a/app/core/src/test/java/com/fsck/k9/notification/NotificationIdsTest.kt b/app/core/src/test/java/com/fsck/k9/notification/NotificationIdsTest.kt index dcc9a67c1a6..e850227c647 100644 --- a/app/core/src/test/java/com/fsck/k9/notification/NotificationIdsTest.kt +++ b/app/core/src/test/java/com/fsck/k9/notification/NotificationIdsTest.kt @@ -88,7 +88,7 @@ class NotificationIdsTest { val notificationIds = NotificationIds.getAllMessageNotificationIds(account) assertThat(notificationIds).containsExactlyElementsIn( - getNewMessageNotificationIds(account) + NotificationIds.getNewMailSummaryNotificationId(account) + getNewMessageNotificationIds(account) + NotificationIds.getNewMailSummaryNotificationId(account), ) } @@ -104,7 +104,7 @@ class NotificationIdsTest { NotificationIds.getAuthenticationErrorNotificationId(account, true), NotificationIds.getAuthenticationErrorNotificationId(account, false), NotificationIds.getFetchingMailNotificationId(account), - NotificationIds.getNewMailSummaryNotificationId(account) + NotificationIds.getNewMailSummaryNotificationId(account), ) + getNewMessageNotificationIds(account) } diff --git a/app/core/src/test/java/com/fsck/k9/notification/SendFailedNotificationControllerTest.kt b/app/core/src/test/java/com/fsck/k9/notification/SendFailedNotificationControllerTest.kt index e92089fc681..7c41e81fb18 100644 --- a/app/core/src/test/java/com/fsck/k9/notification/SendFailedNotificationControllerTest.kt +++ b/app/core/src/test/java/com/fsck/k9/notification/SendFailedNotificationControllerTest.kt @@ -32,7 +32,7 @@ class SendFailedNotificationControllerTest : RobolectricTest() { private val controller = SendFailedNotificationController( notificationHelper = createFakeNotificationHelper(notificationManager, builder, lockScreenNotificationBuilder), actionBuilder = createActionBuilder(contentIntent), - resourceProvider = resourceProvider + resourceProvider = resourceProvider, ) @Test @@ -69,7 +69,7 @@ class SendFailedNotificationControllerTest : RobolectricTest() { private fun createFakeNotificationHelper( notificationManager: NotificationManagerCompat, notificationBuilder: NotificationCompat.Builder, - lockScreenNotificationBuilder: NotificationCompat.Builder + lockScreenNotificationBuilder: NotificationCompat.Builder, ): NotificationHelper { return mock { on { getContext() } doReturn ApplicationProvider.getApplicationContext() diff --git a/app/core/src/test/java/com/fsck/k9/notification/SingleMessageNotificationDataCreatorTest.kt b/app/core/src/test/java/com/fsck/k9/notification/SingleMessageNotificationDataCreatorTest.kt index 2d9e92e95d3..a6376c95df4 100644 --- a/app/core/src/test/java/com/fsck/k9/notification/SingleMessageNotificationDataCreatorTest.kt +++ b/app/core/src/test/java/com/fsck/k9/notification/SingleMessageNotificationDataCreatorTest.kt @@ -20,7 +20,7 @@ class SingleMessageNotificationDataCreatorTest { notificationId = 23, content = content, timestamp = 9000, - addLockScreenNotification = true + addLockScreenNotification = true, ) assertThat(result.notificationId).isEqualTo(23) @@ -38,11 +38,11 @@ class SingleMessageNotificationDataCreatorTest { val result = notificationDataCreator.createSummarySingleNotificationData( timestamp = 9000, silent = false, - data = notificationData + data = notificationData, ) assertThat(result.singleNotificationData.notificationId).isEqualTo( - NotificationIds.getNewMailSummaryNotificationId(account) + NotificationIds.getNewMailSummaryNotificationId(account), ) assertThat(result.singleNotificationData.isSilent).isFalse() assertThat(result.singleNotificationData.timestamp).isEqualTo(9000) @@ -59,7 +59,7 @@ class SingleMessageNotificationDataCreatorTest { notificationId = 0, content = content, timestamp = 0, - addLockScreenNotification = false + addLockScreenNotification = false, ) assertThat(result.actions).contains(NotificationAction.Reply) @@ -79,7 +79,7 @@ class SingleMessageNotificationDataCreatorTest { notificationId = 0, content = content, timestamp = 0, - addLockScreenNotification = false + addLockScreenNotification = false, ) assertThat(result.actions).contains(NotificationAction.Delete) @@ -97,7 +97,7 @@ class SingleMessageNotificationDataCreatorTest { notificationId = 0, content = content, timestamp = 0, - addLockScreenNotification = false + addLockScreenNotification = false, ) assertThat(result.actions).contains(NotificationAction.Delete) @@ -115,7 +115,7 @@ class SingleMessageNotificationDataCreatorTest { notificationId = 0, content = content, timestamp = 0, - addLockScreenNotification = false + addLockScreenNotification = false, ) assertThat(result.actions).contains(NotificationAction.Delete) @@ -133,7 +133,7 @@ class SingleMessageNotificationDataCreatorTest { notificationId = 0, content = content, timestamp = 0, - addLockScreenNotification = false + addLockScreenNotification = false, ) assertThat(result.actions).contains(NotificationAction.Delete) @@ -150,7 +150,7 @@ class SingleMessageNotificationDataCreatorTest { notificationId = 0, content = content, timestamp = 0, - addLockScreenNotification = false + addLockScreenNotification = false, ) assertThat(result.actions).doesNotContain(NotificationAction.Delete) @@ -167,7 +167,7 @@ class SingleMessageNotificationDataCreatorTest { notificationId = 0, content = content, timestamp = 0, - addLockScreenNotification = false + addLockScreenNotification = false, ) assertThat(result.wearActions).contains(WearNotificationAction.Archive) @@ -183,7 +183,7 @@ class SingleMessageNotificationDataCreatorTest { notificationId = 0, content = content, timestamp = 0, - addLockScreenNotification = false + addLockScreenNotification = false, ) assertThat(result.wearActions).doesNotContain(WearNotificationAction.Archive) @@ -200,7 +200,7 @@ class SingleMessageNotificationDataCreatorTest { notificationId = 0, content = content, timestamp = 0, - addLockScreenNotification = false + addLockScreenNotification = false, ) assertThat(result.wearActions).contains(WearNotificationAction.Spam) @@ -217,7 +217,7 @@ class SingleMessageNotificationDataCreatorTest { notificationId = 0, content = content, timestamp = 0, - addLockScreenNotification = false + addLockScreenNotification = false, ) assertThat(result.wearActions).doesNotContain(WearNotificationAction.Spam) @@ -234,7 +234,7 @@ class SingleMessageNotificationDataCreatorTest { notificationId = 0, content = content, timestamp = 0, - addLockScreenNotification = false + addLockScreenNotification = false, ) assertThat(result.wearActions).doesNotContain(WearNotificationAction.Spam) @@ -263,7 +263,7 @@ class SingleMessageNotificationDataCreatorTest { sender = "irrelevant", subject = "irrelevant", preview = "irrelevant", - summary = "irrelevant" + summary = "irrelevant", ) private fun createNotificationData(content: NotificationContent): NotificationData { @@ -273,10 +273,10 @@ class SingleMessageNotificationDataCreatorTest { NotificationHolder( notificationId = 1, timestamp = 0, - content = content - ) + content = content, + ), ), - inactiveNotifications = emptyList() + inactiveNotifications = emptyList(), ) } } diff --git a/app/core/src/test/java/com/fsck/k9/notification/SummaryNotificationDataCreatorTest.kt b/app/core/src/test/java/com/fsck/k9/notification/SummaryNotificationDataCreatorTest.kt index 906e6a00980..2b5c64ceed9 100644 --- a/app/core/src/test/java/com/fsck/k9/notification/SummaryNotificationDataCreatorTest.kt +++ b/app/core/src/test/java/com/fsck/k9/notification/SummaryNotificationDataCreatorTest.kt @@ -25,7 +25,7 @@ class SummaryNotificationDataCreatorTest { modules( module { single { TestClock() } - } + }, ) } } @@ -42,7 +42,7 @@ class SummaryNotificationDataCreatorTest { val result = notificationDataCreator.createSummaryNotificationData( notificationData, - silent = false + silent = false, ) assertThat(result).isInstanceOf(SummarySingleNotificationData::class.java) @@ -55,7 +55,7 @@ class SummaryNotificationDataCreatorTest { val result = notificationDataCreator.createSummaryNotificationData( notificationData, - silent = false + silent = false, ) val summaryNotificationData = result as SummarySingleNotificationData @@ -69,7 +69,7 @@ class SummaryNotificationDataCreatorTest { val result = notificationDataCreator.createSummaryNotificationData( notificationData, - silent = false + silent = false, ) val summaryNotificationData = result as SummarySingleNotificationData @@ -83,7 +83,7 @@ class SummaryNotificationDataCreatorTest { val result = notificationDataCreator.createSummaryNotificationData( notificationData, - silent = false + silent = false, ) val summaryNotificationData = result as SummaryInboxNotificationData @@ -97,7 +97,7 @@ class SummaryNotificationDataCreatorTest { val result = notificationDataCreator.createSummaryNotificationData( notificationData, - silent = false + silent = false, ) val summaryNotificationData = result as SummaryInboxNotificationData @@ -110,12 +110,12 @@ class SummaryNotificationDataCreatorTest { val result = notificationDataCreator.createSummaryNotificationData( notificationData, - silent = true + silent = true, ) val summaryNotificationData = result as SummaryInboxNotificationData assertThat(summaryNotificationData.notificationId).isEqualTo( - NotificationIds.getNewMailSummaryNotificationId(account) + NotificationIds.getNewMailSummaryNotificationId(account), ) assertThat(summaryNotificationData.isSilent).isTrue() assertThat(summaryNotificationData.timestamp).isEqualTo(TIMESTAMP) @@ -127,7 +127,7 @@ class SummaryNotificationDataCreatorTest { val result = notificationDataCreator.createSummaryNotificationData( notificationData, - silent = true + silent = true, ) val summaryNotificationData = result as SummaryInboxNotificationData @@ -143,7 +143,7 @@ class SummaryNotificationDataCreatorTest { val result = notificationDataCreator.createSummaryNotificationData( notificationData, - silent = true + silent = true, ) val summaryNotificationData = result as SummaryInboxNotificationData @@ -159,7 +159,7 @@ class SummaryNotificationDataCreatorTest { val result = notificationDataCreator.createSummaryNotificationData( notificationData, - silent = true + silent = true, ) val summaryNotificationData = result as SummaryInboxNotificationData @@ -175,7 +175,7 @@ class SummaryNotificationDataCreatorTest { val result = notificationDataCreator.createSummaryNotificationData( notificationData, - silent = true + silent = true, ) val summaryNotificationData = result as SummaryInboxNotificationData @@ -190,7 +190,7 @@ class SummaryNotificationDataCreatorTest { val result = notificationDataCreator.createSummaryNotificationData( notificationData, - silent = true + silent = true, ) val summaryNotificationData = result as SummaryInboxNotificationData @@ -205,7 +205,7 @@ class SummaryNotificationDataCreatorTest { val result = notificationDataCreator.createSummaryNotificationData( notificationData, - silent = true + silent = true, ) val summaryNotificationData = result as SummaryInboxNotificationData @@ -219,7 +219,7 @@ class SummaryNotificationDataCreatorTest { val result = notificationDataCreator.createSummaryNotificationData( notificationData, - silent = true + silent = true, ) val summaryNotificationData = result as SummaryInboxNotificationData @@ -253,11 +253,11 @@ class SummaryNotificationDataCreatorTest { sender = "irrelevant", subject = "irrelevant", preview = "irrelevant", - summary = "irrelevant" + summary = "irrelevant", ) private fun createNotificationData( - contentList: List = listOf(createNotificationContent()) + contentList: List = listOf(createNotificationContent()), ): NotificationData { val activeNotifications = contentList.mapIndexed { index, content -> NotificationHolder(notificationId = index, TIMESTAMP, content) diff --git a/app/core/src/test/java/com/fsck/k9/notification/SyncNotificationControllerTest.kt b/app/core/src/test/java/com/fsck/k9/notification/SyncNotificationControllerTest.kt index 18b5aa11cd1..156207dae92 100644 --- a/app/core/src/test/java/com/fsck/k9/notification/SyncNotificationControllerTest.kt +++ b/app/core/src/test/java/com/fsck/k9/notification/SyncNotificationControllerTest.kt @@ -36,7 +36,7 @@ class SyncNotificationControllerTest : RobolectricTest() { private val controller = SyncNotificationController( notificationHelper = createFakeNotificationHelper(notificationManager, builder, lockScreenNotificationBuilder), actionBuilder = createActionBuilder(contentIntent), - resourceProvider = resourceProvider + resourceProvider = resourceProvider, ) @Test @@ -119,7 +119,7 @@ class SyncNotificationControllerTest : RobolectricTest() { private fun createFakeNotificationHelper( notificationManager: NotificationManagerCompat, notificationBuilder: NotificationCompat.Builder, - lockScreenNotificationBuilder: NotificationCompat.Builder + lockScreenNotificationBuilder: NotificationCompat.Builder, ): NotificationHelper { return mock { on { getContext() } doReturn ApplicationProvider.getApplicationContext() diff --git a/app/core/src/test/java/com/fsck/k9/preferences/SettingsExporterTest.kt b/app/core/src/test/java/com/fsck/k9/preferences/SettingsExporterTest.kt index 5819c1ad892..79f24f2d09b 100644 --- a/app/core/src/test/java/com/fsck/k9/preferences/SettingsExporterTest.kt +++ b/app/core/src/test/java/com/fsck/k9/preferences/SettingsExporterTest.kt @@ -24,7 +24,7 @@ class SettingsExporterTest : K9RobolectricTest() { preferences, folderSettingsProvider, folderRepository, - notificationSettingsUpdater = mock() + notificationSettingsUpdater = mock(), ) @Test diff --git a/app/crypto-openpgp/src/main/java/com/fsck/k9/crypto/openpgp/OpenPgpEncryptionExtractor.kt b/app/crypto-openpgp/src/main/java/com/fsck/k9/crypto/openpgp/OpenPgpEncryptionExtractor.kt index 079114e36de..c5d450f4faa 100644 --- a/app/crypto-openpgp/src/main/java/com/fsck/k9/crypto/openpgp/OpenPgpEncryptionExtractor.kt +++ b/app/crypto-openpgp/src/main/java/com/fsck/k9/crypto/openpgp/OpenPgpEncryptionExtractor.kt @@ -6,7 +6,7 @@ import com.fsck.k9.mail.Message import com.fsck.k9.message.extractors.TextPartFinder class OpenPgpEncryptionExtractor internal constructor( - private val encryptionDetector: EncryptionDetector + private val encryptionDetector: EncryptionDetector, ) : EncryptionExtractor { override fun extractEncryption(message: Message): EncryptionResult? { diff --git a/app/html-cleaner/src/main/java/app/k9mail/html/cleaner/BodyCleaner.kt b/app/html-cleaner/src/main/java/app/k9mail/html/cleaner/BodyCleaner.kt index 0f0e5cd7791..4fb58c28522 100644 --- a/app/html-cleaner/src/main/java/app/k9mail/html/cleaner/BodyCleaner.kt +++ b/app/html-cleaner/src/main/java/app/k9mail/html/cleaner/BodyCleaner.kt @@ -8,7 +8,7 @@ internal class BodyCleaner { private val cleaner: Cleaner private val allowedBodyAttributes = setOf( "id", "class", "dir", "lang", "style", - "alink", "background", "bgcolor", "link", "text", "vlink" + "alink", "background", "bgcolor", "link", "text", "vlink", ) init { @@ -25,18 +25,18 @@ internal class BodyCleaner { "border", "cellpadding", "cellspacing", - "width" + "width", ) .addAttributes("tr", "align", "background", "bgcolor", "valign") .addAttributes( "th", "align", "background", "bgcolor", "colspan", "headers", "height", "nowrap", "rowspan", "scope", - "sorted", "valign", "width" + "sorted", "valign", "width", ) .addAttributes( "td", "align", "background", "bgcolor", "colspan", "headers", "height", "nowrap", "rowspan", "scope", - "valign", "width" + "valign", "width", ) .addAttributes("map", "name") .addAttributes("area", "shape", "coords", "href", "alt") diff --git a/app/html-cleaner/src/main/java/app/k9mail/html/cleaner/HeadCleaner.kt b/app/html-cleaner/src/main/java/app/k9mail/html/cleaner/HeadCleaner.kt index 1485291428d..c29c855af49 100644 --- a/app/html-cleaner/src/main/java/app/k9mail/html/cleaner/HeadCleaner.kt +++ b/app/html-cleaner/src/main/java/app/k9mail/html/cleaner/HeadCleaner.kt @@ -24,7 +24,7 @@ internal class HeadCleaner { internal class CleaningVisitor( private val root: Element, - private var destination: Element + private var destination: Element, ) : NodeVisitor { private var elementToSkip: Element? = null diff --git a/app/html-cleaner/src/test/java/app/k9mail/html/cleaner/HtmlSanitizerTest.kt b/app/html-cleaner/src/test/java/app/k9mail/html/cleaner/HtmlSanitizerTest.kt index 90250000671..239812ce4bb 100644 --- a/app/html-cleaner/src/test/java/app/k9mail/html/cleaner/HtmlSanitizerTest.kt +++ b/app/html-cleaner/src/test/java/app/k9mail/html/cleaner/HtmlSanitizerTest.kt @@ -149,7 +149,7 @@ class HtmlSanitizerTest { Message - """.trimIndent().trimLineBreaks() + """.trimIndent().trimLineBreaks(), ) } @@ -176,7 +176,7 @@ class HtmlSanitizerTest { val result = htmlSanitizer.sanitize(html) assertThat(result.toCompactString()).isEqualTo( - "
" + "
", ) } @@ -200,7 +200,7 @@ class HtmlSanitizerTest {
Hmailserver service shutdown:Ok
- """.trimIndent().trimLineBreaks() + """.trimIndent().trimLineBreaks(), ) } @@ -297,7 +297,7 @@ class HtmlSanitizerTest {
A
- """.trimIndent().trimLineBreaks() + """.trimIndent().trimLineBreaks(), ) } @@ -338,7 +338,7 @@ class HtmlSanitizerTest { RTSP - """.trimIndent().trimLineBreaks() + """.trimIndent().trimLineBreaks(), ) } @@ -374,7 +374,7 @@ class HtmlSanitizerTest { - """.trimIndent().trimLineBreaks() + """.trimIndent().trimLineBreaks(), ) } @@ -405,7 +405,7 @@ class HtmlSanitizerTest { """ text - """.trimIndent().trimLineBreaks() + """.trimIndent().trimLineBreaks(), ) } @@ -423,7 +423,7 @@ class HtmlSanitizerTest {
text
- """.trimIndent().trimLineBreaks() + """.trimIndent().trimLineBreaks(), ) } @@ -441,7 +441,7 @@ class HtmlSanitizerTest { - """.trimIndent().trimLineBreaks() + """.trimIndent().trimLineBreaks(), ) } @@ -497,7 +497,7 @@ class HtmlSanitizerTest { <$element>some text - """.trimIndent().trimLineBreaks() + """.trimIndent().trimLineBreaks(), ) } diff --git a/app/k9mail/src/debug/java/app/k9mail/dev/DebugConfig.kt b/app/k9mail/src/debug/java/app/k9mail/dev/DebugConfig.kt index 6d4b73b16bd..c8380082cfd 100644 --- a/app/k9mail/src/debug/java/app/k9mail/dev/DebugConfig.kt +++ b/app/k9mail/src/debug/java/app/k9mail/dev/DebugConfig.kt @@ -4,7 +4,7 @@ import org.koin.core.module.Module import org.koin.core.scope.Scope fun Scope.developmentBackends() = mapOf( - "demo" to get() + "demo" to get(), ) fun Module.developmentModuleAdditions() { diff --git a/app/k9mail/src/main/java/com/fsck/k9/App.kt b/app/k9mail/src/main/java/com/fsck/k9/App.kt index c48017178d5..2ec6faa08c4 100644 --- a/app/k9mail/src/main/java/com/fsck/k9/App.kt +++ b/app/k9mail/src/main/java/com/fsck/k9/App.kt @@ -138,8 +138,8 @@ class App : Application(), WorkManagerConfiguration.Provider { MessageCompose::class.java, LauncherShortcuts::class.java, UnreadWidgetProvider::class.java, - MessageListWidgetProvider::class.java - ) + MessageListWidgetProvider::class.java, + ), ) } } diff --git a/app/k9mail/src/main/java/com/fsck/k9/Dependencies.kt b/app/k9mail/src/main/java/com/fsck/k9/Dependencies.kt index 76936bbbc11..9d95615bb0b 100644 --- a/app/k9mail/src/main/java/com/fsck/k9/Dependencies.kt +++ b/app/k9mail/src/main/java/com/fsck/k9/Dependencies.kt @@ -22,8 +22,8 @@ private val mainAppModule = module { single { MessagingListenerProvider( listOf( - get() - ) + get(), + ), ) } single(named("controllerExtensions")) { emptyList() } @@ -40,5 +40,5 @@ val appModules = listOf( notificationModule, resourcesModule, backendsModule, - storageModule + storageModule, ) diff --git a/app/k9mail/src/main/java/com/fsck/k9/auth/OAuthConfigurations.kt b/app/k9mail/src/main/java/com/fsck/k9/auth/OAuthConfigurations.kt index 4f1b5f47b5d..3bfb710d21d 100644 --- a/app/k9mail/src/main/java/com/fsck/k9/auth/OAuthConfigurations.kt +++ b/app/k9mail/src/main/java/com/fsck/k9/auth/OAuthConfigurations.kt @@ -13,7 +13,7 @@ fun createOAuthConfigurationProvider(): OAuthConfigurationProvider { scopes = listOf("https://mail.google.com/"), authorizationEndpoint = "https://accounts.google.com/o/oauth2/v2/auth", tokenEndpoint = "https://oauth2.googleapis.com/token", - redirectUri = redirectUriSlash + redirectUri = redirectUriSlash, ) return OAuthConfigurationProvider( @@ -24,23 +24,23 @@ fun createOAuthConfigurationProvider(): OAuthConfigurationProvider { scopes = listOf("mail-w"), authorizationEndpoint = "https://api.login.yahoo.com/oauth2/request_auth", tokenEndpoint = "https://api.login.yahoo.com/oauth2/get_token", - redirectUri = redirectUriDoubleSlash + redirectUri = redirectUriDoubleSlash, ), listOf("imap.aol.com", "smtp.aol.com") to OAuthConfiguration( clientId = BuildConfig.OAUTH_AOL_CLIENT_ID, scopes = listOf("mail-w"), authorizationEndpoint = "https://api.login.aol.com/oauth2/request_auth", tokenEndpoint = "https://api.login.aol.com/oauth2/get_token", - redirectUri = redirectUriDoubleSlash + redirectUri = redirectUriDoubleSlash, ), listOf("outlook.office365.com", "smtp.office365.com") to OAuthConfiguration( clientId = BuildConfig.OAUTH_MICROSOFT_CLIENT_ID, scopes = listOf("https://outlook.office.com/IMAP.AccessAsUser.All", "https://outlook.office.com/SMTP.Send", "offline_access"), authorizationEndpoint = "https://login.microsoftonline.com/common/oauth2/v2.0/authorize", tokenEndpoint = "https://login.microsoftonline.com/common/oauth2/v2.0/token", - redirectUri = BuildConfig.OAUTH_MICROSOFT_REDIRECT_URI - ) + redirectUri = BuildConfig.OAUTH_MICROSOFT_REDIRECT_URI, + ), ), - googleConfiguration = googleConfig + googleConfiguration = googleConfig, ) } diff --git a/app/k9mail/src/main/java/com/fsck/k9/backends/AndroidAlarmManager.kt b/app/k9mail/src/main/java/com/fsck/k9/backends/AndroidAlarmManager.kt index 0a09dfa0aa8..fc33fd54b5c 100644 --- a/app/k9mail/src/main/java/com/fsck/k9/backends/AndroidAlarmManager.kt +++ b/app/k9mail/src/main/java/com/fsck/k9/backends/AndroidAlarmManager.kt @@ -24,7 +24,7 @@ private typealias Callback = () -> Unit class AndroidAlarmManager( private val context: Context, private val alarmManager: AlarmManagerCompat, - backgroundDispatcher: CoroutineDispatcher = Dispatchers.IO + backgroundDispatcher: CoroutineDispatcher = Dispatchers.IO, ) : SystemAlarmManager { private val coroutineScope = CoroutineScope(backgroundDispatcher) @@ -53,7 +53,7 @@ class AndroidAlarmManager( } } }, - intentFilter + intentFilter, ) } diff --git a/app/k9mail/src/main/java/com/fsck/k9/backends/ImapBackendFactory.kt b/app/k9mail/src/main/java/com/fsck/k9/backends/ImapBackendFactory.kt index 2b14b1b0ffd..ebe668d940f 100644 --- a/app/k9mail/src/main/java/com/fsck/k9/backends/ImapBackendFactory.kt +++ b/app/k9mail/src/main/java/com/fsck/k9/backends/ImapBackendFactory.kt @@ -25,7 +25,7 @@ class ImapBackendFactory( private val idleRefreshManager: IdleRefreshManager, private val backendStorageFactory: K9BackendStorageFactory, private val trustedSocketFactory: TrustedSocketFactory, - private val context: Context + private val context: Context, ) : BackendFactory { override fun createBackend(account: Account): Backend { val accountName = account.displayName @@ -41,7 +41,7 @@ class ImapBackendFactory( powerManager, idleRefreshManager, pushConfigProvider, - smtpTransport + smtpTransport, ) } @@ -57,7 +57,7 @@ class ImapBackendFactory( account.incomingServerSettings, config, trustedSocketFactory, - oAuth2TokenProvider + oAuth2TokenProvider, ) } diff --git a/app/k9mail/src/main/java/com/fsck/k9/backends/KoinModule.kt b/app/k9mail/src/main/java/com/fsck/k9/backends/KoinModule.kt index b23177632c1..790635874f8 100644 --- a/app/k9mail/src/main/java/com/fsck/k9/backends/KoinModule.kt +++ b/app/k9mail/src/main/java/com/fsck/k9/backends/KoinModule.kt @@ -16,8 +16,8 @@ val backendsModule = module { mapOf( "imap" to get(), "pop3" to get(), - "webdav" to get() - ) + developmentBackends() + "webdav" to get(), + ) + developmentBackends(), ) } single { @@ -27,7 +27,7 @@ val backendsModule = module { idleRefreshManager = get(), backendStorageFactory = get(), trustedSocketFactory = get(), - context = get() + context = get(), ) } single { AndroidAlarmManager(context = get(), alarmManager = get()) } @@ -38,7 +38,7 @@ val backendsModule = module { backendStorageFactory = get(), trustManagerFactory = get(), sniHostSetter = get(), - folderRepository = get() + folderRepository = get(), ) } single { diff --git a/app/k9mail/src/main/java/com/fsck/k9/backends/Pop3BackendFactory.kt b/app/k9mail/src/main/java/com/fsck/k9/backends/Pop3BackendFactory.kt index 4550f5f1759..6b6d2ccdf8a 100644 --- a/app/k9mail/src/main/java/com/fsck/k9/backends/Pop3BackendFactory.kt +++ b/app/k9mail/src/main/java/com/fsck/k9/backends/Pop3BackendFactory.kt @@ -12,7 +12,7 @@ import com.fsck.k9.mailstore.K9BackendStorageFactory class Pop3BackendFactory( private val backendStorageFactory: K9BackendStorageFactory, - private val trustedSocketFactory: TrustedSocketFactory + private val trustedSocketFactory: TrustedSocketFactory, ) : BackendFactory { override fun createBackend(account: Account): Backend { val accountName = account.displayName diff --git a/app/k9mail/src/main/java/com/fsck/k9/backends/RealOAuth2TokenProvider.kt b/app/k9mail/src/main/java/com/fsck/k9/backends/RealOAuth2TokenProvider.kt index 48402de4269..524a376407d 100644 --- a/app/k9mail/src/main/java/com/fsck/k9/backends/RealOAuth2TokenProvider.kt +++ b/app/k9mail/src/main/java/com/fsck/k9/backends/RealOAuth2TokenProvider.kt @@ -17,7 +17,7 @@ import net.openid.appauth.AuthorizationService class RealOAuth2TokenProvider( context: Context, private val accountManager: AccountManager, - private val account: Account + private val account: Account, ) : OAuth2TokenProvider { private val authService = AuthorizationService(context) private var requestFreshToken = false @@ -59,7 +59,7 @@ class RealOAuth2TokenProvider( throw AuthenticationFailedException( message = "Failed to fetch an access token", throwable = authException, - messageFromServer = authException.error + messageFromServer = authException.error, ) } else if (token != oldAccessToken) { requestFreshToken = false diff --git a/app/k9mail/src/main/java/com/fsck/k9/backends/WebDavBackendFactory.kt b/app/k9mail/src/main/java/com/fsck/k9/backends/WebDavBackendFactory.kt index f8bf8f7bfcc..d35f96ce432 100644 --- a/app/k9mail/src/main/java/com/fsck/k9/backends/WebDavBackendFactory.kt +++ b/app/k9mail/src/main/java/com/fsck/k9/backends/WebDavBackendFactory.kt @@ -15,7 +15,7 @@ class WebDavBackendFactory( private val backendStorageFactory: K9BackendStorageFactory, private val trustManagerFactory: TrustManagerFactory, private val sniHostSetter: SniHostSetter, - private val folderRepository: FolderRepository + private val folderRepository: FolderRepository, ) : BackendFactory { override fun createBackend(account: Account): Backend { val accountName = account.displayName diff --git a/app/k9mail/src/main/java/com/fsck/k9/notification/K9NotificationActionCreator.kt b/app/k9mail/src/main/java/com/fsck/k9/notification/K9NotificationActionCreator.kt index b08374a516d..f3ad76064e6 100644 --- a/app/k9mail/src/main/java/com/fsck/k9/notification/K9NotificationActionCreator.kt +++ b/app/k9mail/src/main/java/com/fsck/k9/notification/K9NotificationActionCreator.kt @@ -34,7 +34,7 @@ import com.fsck.k9.ui.notification.DeleteConfirmationActivity internal class K9NotificationActionCreator( private val context: Context, private val defaultFolderProvider: DefaultFolderProvider, - private val messageStoreManager: MessageStoreManager + private val messageStoreManager: MessageStoreManager, ) : NotificationActionCreator { override fun createViewMessagePendingIntent(messageReference: MessageReference): PendingIntent { @@ -51,7 +51,7 @@ internal class K9NotificationActionCreator( override fun createViewMessagesPendingIntent( account: Account, - messageReferences: List + messageReferences: List, ): PendingIntent { val folderIds = extractFolderIds(messageReferences) @@ -101,7 +101,7 @@ internal class K9NotificationActionCreator( override fun createMarkAllAsReadPendingIntent( account: Account, - messageReferences: List + messageReferences: List, ): PendingIntent { val accountUuid = account.uuid val intent = NotificationActionService.createMarkAllAsReadIntent(context, accountUuid, messageReferences).apply { @@ -144,7 +144,7 @@ internal class K9NotificationActionCreator( override fun createDeleteAllPendingIntent( account: Account, - messageReferences: List + messageReferences: List, ): PendingIntent { return if (K9.isConfirmDeleteFromNotification) { getDeleteAllConfirmationPendingIntent(messageReferences) @@ -162,7 +162,7 @@ internal class K9NotificationActionCreator( private fun getDeleteAllServicePendingIntent( account: Account, - messageReferences: List + messageReferences: List, ): PendingIntent { val accountUuid = account.uuid val intent = NotificationActionService.createDeleteAllMessagesIntent(context, accountUuid, messageReferences).apply { @@ -180,7 +180,7 @@ internal class K9NotificationActionCreator( override fun createArchiveAllPendingIntent( account: Account, - messageReferences: List + messageReferences: List, ): PendingIntent { val intent = NotificationActionService.createArchiveAllIntent(context, account, messageReferences).apply { data = Uri.parse("data:,archiveAll/${account.uuid}/${System.currentTimeMillis()}") @@ -207,7 +207,7 @@ internal class K9NotificationActionCreator( search = search, noThreading = false, newTask = true, - clearTop = true + clearTop = true, ).apply { data = Uri.parse("data:,messageList/${account.uuid}/$folderId") } @@ -224,7 +224,7 @@ internal class K9NotificationActionCreator( search = search, noThreading = false, newTask = true, - clearTop = true + clearTop = true, ).apply { data = Uri.parse("data:,messageList/${account.uuid}/$folderId") } diff --git a/app/k9mail/src/main/java/com/fsck/k9/notification/K9NotificationResourceProvider.kt b/app/k9mail/src/main/java/com/fsck/k9/notification/K9NotificationResourceProvider.kt index 2c1eea26032..55e1584d2a5 100644 --- a/app/k9mail/src/main/java/com/fsck/k9/notification/K9NotificationResourceProvider.kt +++ b/app/k9mail/src/main/java/com/fsck/k9/notification/K9NotificationResourceProvider.kt @@ -51,7 +51,7 @@ class K9NotificationResourceProvider(private val context: Context) : Notificatio context.resources.getQuantityString( R.plurals.notification_new_messages_title, newMessagesCount, - newMessagesCount + newMessagesCount, ) override fun additionalMessages(overflowMessagesCount: Int, accountName: String): String = diff --git a/app/k9mail/src/main/java/com/fsck/k9/notification/K9NotificationStrategy.kt b/app/k9mail/src/main/java/com/fsck/k9/notification/K9NotificationStrategy.kt index 2221cd0e6a9..a92c5b78f4b 100644 --- a/app/k9mail/src/main/java/com/fsck/k9/notification/K9NotificationStrategy.kt +++ b/app/k9mail/src/main/java/com/fsck/k9/notification/K9NotificationStrategy.kt @@ -17,7 +17,7 @@ class K9NotificationStrategy(private val contacts: Contacts) : NotificationStrat account: Account, localFolder: LocalFolder, message: LocalMessage, - isOldMessage: Boolean + isOldMessage: Boolean, ): Boolean { if (!K9.isNotificationDuringQuietTimeEnabled && K9.isQuietTime) { Timber.v("No notification: Quiet time is active") diff --git a/app/k9mail/src/main/java/com/fsck/k9/provider/UnreadWidgetProvider.kt b/app/k9mail/src/main/java/com/fsck/k9/provider/UnreadWidgetProvider.kt index 99325bdb911..c2b4b404a38 100644 --- a/app/k9mail/src/main/java/com/fsck/k9/provider/UnreadWidgetProvider.kt +++ b/app/k9mail/src/main/java/com/fsck/k9/provider/UnreadWidgetProvider.kt @@ -90,7 +90,7 @@ class UnreadWidgetProvider : AppWidgetProvider(), EarlyInit { context, appWidgetId, clickIntent, - FLAG_UPDATE_CURRENT or FLAG_MUTABLE + FLAG_UPDATE_CURRENT or FLAG_MUTABLE, ) remoteViews.setOnClickPendingIntent(R.id.unread_widget_layout, pendingIntent) diff --git a/app/k9mail/src/main/java/com/fsck/k9/widget/unread/KoinModule.kt b/app/k9mail/src/main/java/com/fsck/k9/widget/unread/KoinModule.kt index 9eea5177257..87bc422e772 100644 --- a/app/k9mail/src/main/java/com/fsck/k9/widget/unread/KoinModule.kt +++ b/app/k9mail/src/main/java/com/fsck/k9/widget/unread/KoinModule.kt @@ -11,7 +11,7 @@ val unreadWidgetModule = module { messageCountsProvider = get(), defaultFolderProvider = get(), folderRepository = get(), - folderNameFormatter = get() + folderNameFormatter = get(), ) } single { UnreadWidgetUpdater(context = get()) } diff --git a/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetConfigurationFragment.kt b/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetConfigurationFragment.kt index 5c9a19f73bb..73878358729 100644 --- a/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetConfigurationFragment.kt +++ b/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetConfigurationFragment.kt @@ -61,7 +61,7 @@ class UnreadWidgetConfigurationFragment : PreferenceFragmentCompat() { context = requireContext(), action = ChooseFolderActivity.Action.CHOOSE, accountUuid = selectedAccountUuid!!, - showDisplayableOnly = true + showDisplayableOnly = true, ) startActivityForResult(intent, REQUEST_CHOOSE_FOLDER) false diff --git a/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetData.kt b/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetData.kt index bfcfeadb883..30a7a023012 100644 --- a/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetData.kt +++ b/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetData.kt @@ -6,5 +6,5 @@ data class UnreadWidgetData( val configuration: UnreadWidgetConfiguration, val title: String, val unreadCount: Int, - val clickIntent: Intent + val clickIntent: Intent, ) diff --git a/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetDataProvider.kt b/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetDataProvider.kt index 572887da82f..c8d225c86b8 100644 --- a/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetDataProvider.kt +++ b/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetDataProvider.kt @@ -20,7 +20,7 @@ class UnreadWidgetDataProvider( private val messageCountsProvider: MessageCountsProvider, private val defaultFolderProvider: DefaultFolderProvider, private val folderRepository: FolderRepository, - private val folderNameFormatter: FolderNameFormatter + private val folderNameFormatter: FolderNameFormatter, ) { fun loadUnreadWidgetData(configuration: UnreadWidgetConfiguration): UnreadWidgetData? = with(configuration) { if (SearchAccount.UNIFIED_INBOX == accountUuid) { diff --git a/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetMigrations.kt b/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetMigrations.kt index 4221ccef743..0aaa05518d0 100644 --- a/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetMigrations.kt +++ b/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetMigrations.kt @@ -9,7 +9,7 @@ import com.fsck.k9.widget.unread.UnreadWidgetRepository.Companion.PREF_VERSION_K internal class UnreadWidgetMigrations( private val accountRepository: Preferences, - private val folderRepository: FolderRepository + private val folderRepository: FolderRepository, ) { fun upgradePreferences(preferences: SharedPreferences, version: Int) { if (version < 2) rewriteFolderNameToFolderId(preferences) diff --git a/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetRepository.kt b/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetRepository.kt index 07152b746f3..3fa7d71bc1b 100644 --- a/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetRepository.kt +++ b/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetRepository.kt @@ -6,7 +6,7 @@ import android.content.SharedPreferences internal class UnreadWidgetRepository( private val context: Context, private val dataRetriever: UnreadWidgetDataProvider, - private val migrations: UnreadWidgetMigrations + private val migrations: UnreadWidgetMigrations, ) { fun saveWidgetConfiguration(configuration: UnreadWidgetConfiguration) { diff --git a/app/k9mail/src/test/java/com/fsck/k9/widget/unread/UnreadWidgetDataProviderTest.kt b/app/k9mail/src/test/java/com/fsck/k9/widget/unread/UnreadWidgetDataProviderTest.kt index bd290e2dff0..9ea0d37bb8a 100644 --- a/app/k9mail/src/test/java/com/fsck/k9/widget/unread/UnreadWidgetDataProviderTest.kt +++ b/app/k9mail/src/test/java/com/fsck/k9/widget/unread/UnreadWidgetDataProviderTest.kt @@ -32,7 +32,7 @@ class UnreadWidgetDataProviderTest : AppRobolectricTest() { messageCountsProvider, defaultFolderStrategy, folderRepository, - folderNameFormatter + folderNameFormatter, ) @Test @@ -40,7 +40,7 @@ class UnreadWidgetDataProviderTest : AppRobolectricTest() { val configuration = UnreadWidgetConfiguration( appWidgetId = 1, accountUuid = SearchAccount.UNIFIED_INBOX, - folderId = null + folderId = null, ) val widgetData = provider.loadUnreadWidgetData(configuration) @@ -56,7 +56,7 @@ class UnreadWidgetDataProviderTest : AppRobolectricTest() { val configuration = UnreadWidgetConfiguration( appWidgetId = 3, accountUuid = ACCOUNT_UUID, - folderId = null + folderId = null, ) val widgetData = provider.loadUnreadWidgetData(configuration) @@ -137,7 +137,7 @@ class UnreadWidgetDataProviderTest : AppRobolectricTest() { id = FOLDER_ID, name = "INBOX", type = FolderType.INBOX, - isLocalOnly = false + isLocalOnly = false, ) } } diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo10.kt b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo10.kt index aa7f134f7a7..6887ae7eb5e 100644 --- a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo10.kt +++ b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo10.kt @@ -11,7 +11,7 @@ import android.database.sqlite.SQLiteDatabase */ class StorageMigrationTo10( private val db: SQLiteDatabase, - private val migrationsHelper: StorageMigrationsHelper + private val migrationsHelper: StorageMigrationsHelper, ) { private val folderKeyPattern = Regex("[^.]+\\..+\\.([^.]+)") private val folderSettingKeys = setOf( @@ -20,7 +20,7 @@ class StorageMigrationTo10( "syncMode", "pushMode", "inTopGroup", - "integrate" + "integrate", ) fun removeSavedFolderSettings() { diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo11.kt b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo11.kt index 94a232ac835..6492f3ba965 100644 --- a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo11.kt +++ b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo11.kt @@ -12,7 +12,7 @@ import com.fsck.k9.preferences.GeneralSettingsDescriptions */ class StorageMigrationTo11( private val db: SQLiteDatabase, - private val migrationsHelper: StorageMigrationsHelper + private val migrationsHelper: StorageMigrationsHelper, ) { fun upgradeMessageViewContentFontSize() { val newFontSizeValue = migrationsHelper.readValue(db, "fontSizeMessageViewContentPercent") diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo12.kt b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo12.kt index 3b5d9703762..7f48c45dd15 100644 --- a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo12.kt +++ b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo12.kt @@ -13,7 +13,7 @@ import com.fsck.k9.preferences.migrations.migration12.WebDavStoreUriDecoder */ class StorageMigrationTo12( private val db: SQLiteDatabase, - private val migrationsHelper: StorageMigrationsHelper + private val migrationsHelper: StorageMigrationsHelper, ) { private val serverSettingsSerializer = ServerSettingsSerializer() diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo13.kt b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo13.kt index 01b61f67493..916e33ee5e0 100644 --- a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo13.kt +++ b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo13.kt @@ -7,7 +7,7 @@ import android.database.sqlite.SQLiteDatabase */ class StorageMigrationTo13( private val db: SQLiteDatabase, - private val migrationsHelper: StorageMigrationsHelper + private val migrationsHelper: StorageMigrationsHelper, ) { fun renameHideSpecialAccounts() { val hideSpecialAccounts = migrationsHelper.readValue(db, "hideSpecialAccounts")?.toBoolean() ?: false diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo14.kt b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo14.kt index c4f38c2e683..d82f4299327 100644 --- a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo14.kt +++ b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo14.kt @@ -9,7 +9,7 @@ import com.fsck.k9.preferences.Protocols */ class StorageMigrationTo14( private val db: SQLiteDatabase, - private val migrationsHelper: StorageMigrationsHelper + private val migrationsHelper: StorageMigrationsHelper, ) { private val serverSettingsSerializer = ServerSettingsSerializer() diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo15.kt b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo15.kt index e3ab3f05f77..aadf0ca5162 100644 --- a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo15.kt +++ b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo15.kt @@ -10,7 +10,7 @@ private const val MINIMUM_IDLE_REFRESH_MINUTES = 2 */ class StorageMigrationTo15( private val db: SQLiteDatabase, - private val migrationsHelper: StorageMigrationsHelper + private val migrationsHelper: StorageMigrationsHelper, ) { fun rewriteIdleRefreshInterval() { val accountUuidsListValue = migrationsHelper.readValue(db, "accountUuids") diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo16.kt b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo16.kt index c6418ba4bd0..9afe86c80fb 100644 --- a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo16.kt +++ b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo16.kt @@ -7,7 +7,7 @@ import android.database.sqlite.SQLiteDatabase */ class StorageMigrationTo16( private val db: SQLiteDatabase, - private val migrationsHelper: StorageMigrationsHelper + private val migrationsHelper: StorageMigrationsHelper, ) { fun changeDefaultRegisteredNameColor() { val registeredNameColorValue = migrationsHelper.readValue(db, "registeredNameColor")?.toInt() diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo17.kt b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo17.kt index 2f4dc7de3f9..3d11dd17ffc 100644 --- a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo17.kt +++ b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo17.kt @@ -7,7 +7,7 @@ import android.database.sqlite.SQLiteDatabase */ class StorageMigrationTo17( private val db: SQLiteDatabase, - private val migrationsHelper: StorageMigrationsHelper + private val migrationsHelper: StorageMigrationsHelper, ) { fun rewriteNotificationLightSettings() { val accountUuidsListValue = migrationsHelper.readValue(db, "accountUuids") diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo18.kt b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo18.kt index 15a98f95217..b69ff2fe30b 100644 --- a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo18.kt +++ b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo18.kt @@ -7,7 +7,7 @@ import android.database.sqlite.SQLiteDatabase */ class StorageMigrationTo18( private val db: SQLiteDatabase, - private val migrationsHelper: StorageMigrationsHelper + private val migrationsHelper: StorageMigrationsHelper, ) { fun rewriteImapCompressionSettings() { val accountUuidsListValue = migrationsHelper.readValue(db, "accountUuids") diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo19.kt b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo19.kt index 5a35b835fc6..11c6e5dc78d 100644 --- a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo19.kt +++ b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo19.kt @@ -16,7 +16,7 @@ import com.squareup.moshi.Types */ class StorageMigrationTo19( private val db: SQLiteDatabase, - private val migrationsHelper: StorageMigrationsHelper + private val migrationsHelper: StorageMigrationsHelper, ) { fun markGmailAccounts() { val accountUuidsListValue = migrationsHelper.readValue(db, "accountUuids") @@ -36,7 +36,7 @@ class StorageMigrationTo19( val moshi = Moshi.Builder().build() val adapter = moshi.adapter>( - Types.newParameterizedType(Map::class.java, String::class.java, Any::class.java) + Types.newParameterizedType(Map::class.java, String::class.java, Any::class.java), ) val incomingServerSettings = adapter.fromJson(incomingServerSettingsJson) ?: return diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo3.kt b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo3.kt index e0e3062e974..9155eabe8a2 100644 --- a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo3.kt +++ b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo3.kt @@ -7,7 +7,7 @@ import android.database.sqlite.SQLiteDatabase */ class StorageMigrationTo3( private val db: SQLiteDatabase, - private val migrationsHelper: StorageMigrationsHelper + private val migrationsHelper: StorageMigrationsHelper, ) { fun rewriteFolderNone() { val accountUuidsListValue = migrationsHelper.readValue(db, "accountUuids") diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo4.kt b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo4.kt index 066306bb4ba..c7876eac29c 100644 --- a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo4.kt +++ b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo4.kt @@ -7,7 +7,7 @@ import android.database.sqlite.SQLiteDatabase */ class StorageMigrationTo4( private val db: SQLiteDatabase, - private val migrationsHelper: StorageMigrationsHelper + private val migrationsHelper: StorageMigrationsHelper, ) { fun insertSpecialFolderSelectionValues() { val accountUuidsListValue = migrationsHelper.readValue(db, "accountUuids") diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo5.kt b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo5.kt index 318c54a5a80..5a3b6edf03b 100644 --- a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo5.kt +++ b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo5.kt @@ -7,7 +7,7 @@ import android.database.sqlite.SQLiteDatabase */ class StorageMigrationTo5( private val db: SQLiteDatabase, - private val migrationsHelper: StorageMigrationsHelper + private val migrationsHelper: StorageMigrationsHelper, ) { fun fixMailCheckFrequencies() { val accountUuidsListValue = migrationsHelper.readValue(db, "accountUuids") diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo6.kt b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo6.kt index cbab8404783..38a8a86c070 100644 --- a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo6.kt +++ b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo6.kt @@ -7,7 +7,7 @@ import android.database.sqlite.SQLiteDatabase */ class StorageMigrationTo6( private val db: SQLiteDatabase, - private val migrationsHelper: StorageMigrationsHelper + private val migrationsHelper: StorageMigrationsHelper, ) { fun performLegacyMigrations() { rewriteTheme() diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo7.kt b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo7.kt index 70c9675ddea..ce234c104fb 100644 --- a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo7.kt +++ b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo7.kt @@ -7,7 +7,7 @@ import android.database.sqlite.SQLiteDatabase */ class StorageMigrationTo7( private val db: SQLiteDatabase, - private val migrationsHelper: StorageMigrationsHelper + private val migrationsHelper: StorageMigrationsHelper, ) { fun rewriteEnumOrdinalsToNames() { rewriteTheme() diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo8.kt b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo8.kt index 7ac8e8ec2fc..7d5539ed407 100644 --- a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo8.kt +++ b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo8.kt @@ -7,7 +7,7 @@ import android.database.sqlite.SQLiteDatabase */ class StorageMigrationTo8( private val db: SQLiteDatabase, - private val migrationsHelper: StorageMigrationsHelper + private val migrationsHelper: StorageMigrationsHelper, ) { fun rewriteTheme() { val theme = migrationsHelper.readValue(db, "theme") diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/AttachmentFileManager.kt b/app/storage/src/main/java/com/fsck/k9/storage/messages/AttachmentFileManager.kt index 5c68509090b..9123a6dc47c 100644 --- a/app/storage/src/main/java/com/fsck/k9/storage/messages/AttachmentFileManager.kt +++ b/app/storage/src/main/java/com/fsck/k9/storage/messages/AttachmentFileManager.kt @@ -9,7 +9,7 @@ import timber.log.Timber internal class AttachmentFileManager( private val storageManager: StorageManager, - private val accountUuid: String + private val accountUuid: String, ) { fun deleteFile(messagePartId: Long) { val file = getAttachmentFile(messagePartId) diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/CheckFolderOperations.kt b/app/storage/src/main/java/com/fsck/k9/storage/messages/CheckFolderOperations.kt index 37e0a874525..043e18311ee 100644 --- a/app/storage/src/main/java/com/fsck/k9/storage/messages/CheckFolderOperations.kt +++ b/app/storage/src/main/java/com/fsck/k9/storage/messages/CheckFolderOperations.kt @@ -9,12 +9,12 @@ internal class CheckFolderOperations(private val lockableDatabase: LockableDatab performChunkedOperation( arguments = folderIds, - argumentTransformation = Long::toString + argumentTransformation = Long::toString, ) { selectionSet, selectionArguments -> if (allIncludedInUnifiedInbox) { database.rawQuery( "SELECT COUNT(id) FROM folders WHERE integrate = 1 AND id $selectionSet", - selectionArguments + selectionArguments, ).use { cursor -> if (cursor.moveToFirst()) { val count = cursor.getInt(0) diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/ChunkedDatabaseOperations.kt b/app/storage/src/main/java/com/fsck/k9/storage/messages/ChunkedDatabaseOperations.kt index 87303626df1..2d008140968 100644 --- a/app/storage/src/main/java/com/fsck/k9/storage/messages/ChunkedDatabaseOperations.kt +++ b/app/storage/src/main/java/com/fsck/k9/storage/messages/ChunkedDatabaseOperations.kt @@ -4,7 +4,7 @@ internal fun performChunkedOperation( arguments: Collection, argumentTransformation: (T) -> String, chunkSize: Int = 500, - operation: (selectionSet: String, selectionArguments: Array) -> Unit + operation: (selectionSet: String, selectionArguments: Array) -> Unit, ) { require(arguments.isNotEmpty()) { "'arguments' must not be empty" } require(chunkSize in 1..1000) { "'chunkSize' needs to be in 1..1000" } diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/CopyMessageOperations.kt b/app/storage/src/main/java/com/fsck/k9/storage/messages/CopyMessageOperations.kt index a01b2a3d4d6..6a9257785fc 100644 --- a/app/storage/src/main/java/com/fsck/k9/storage/messages/CopyMessageOperations.kt +++ b/app/storage/src/main/java/com/fsck/k9/storage/messages/CopyMessageOperations.kt @@ -13,7 +13,7 @@ import java.util.UUID internal class CopyMessageOperations( private val lockableDatabase: LockableDatabase, private val attachmentFileManager: AttachmentFileManager, - private val threadMessageOperations: ThreadMessageOperations + private val threadMessageOperations: ThreadMessageOperations, ) { fun copyMessage(messageId: Long, destinationFolderId: Long): Long { return lockableDatabase.execute(true) { database -> @@ -28,14 +28,14 @@ internal class CopyMessageOperations( private fun copyMessage( database: SQLiteDatabase, messageId: Long, - destinationFolderId: Long + destinationFolderId: Long, ): Long { val rootMessagePart = copyMessageParts(database, messageId) val threadInfo = threadMessageOperations.doMessageThreading( database, folderId = destinationFolderId, - threadHeaders = threadMessageOperations.getMessageThreadHeaders(database, messageId) + threadHeaders = threadMessageOperations.getMessageThreadHeaders(database, messageId), ) return if (threadInfo?.messageId != null) { @@ -44,14 +44,14 @@ internal class CopyMessageOperations( sourceMessageId = messageId, destinationMessageId = threadInfo.messageId, destinationFolderId, - rootMessagePart + rootMessagePart, ) } else { val newMessageId = insertMessageRow( database, sourceMessageId = messageId, destinationFolderId = destinationFolderId, - rootMessagePartId = rootMessagePart + rootMessagePartId = rootMessagePart, ) if (threadInfo?.threadId == null) { @@ -59,7 +59,7 @@ internal class CopyMessageOperations( database, newMessageId, threadInfo?.rootId, - threadInfo?.parentId + threadInfo?.parentId, ) } @@ -94,7 +94,7 @@ JOIN message_parts ON (message_parts.root = messages.message_part_id) WHERE messages.id = ? ORDER BY message_parts.seq """, - arrayOf(messageId.toString()) + arrayOf(messageId.toString()), ).use { cursor -> if (!cursor.moveToNext()) error("No message part found for message with ID $messageId") @@ -104,7 +104,7 @@ ORDER BY message_parts.seq database = database, databaseMessagePart = rootMessagePart, newRootId = null, - newParentId = -1 + newParentId = -1, ) val messagePartIdMapping = mutableMapOf() @@ -117,7 +117,7 @@ ORDER BY message_parts.seq database = database, databaseMessagePart = messagePart, newRootId = rootMessagePartId, - newParentId = messagePartIdMapping[messagePart.parent] ?: error("parent ID not found") + newParentId = messagePartIdMapping[messagePart.parent] ?: error("parent ID not found"), ) } @@ -129,7 +129,7 @@ ORDER BY message_parts.seq database: SQLiteDatabase, databaseMessagePart: DatabaseMessagePart, newRootId: Long?, - newParentId: Long + newParentId: Long, ): Long { val values = ContentValues().apply { put("type", databaseMessagePart.type) @@ -165,7 +165,7 @@ ORDER BY message_parts.seq sourceMessageId: Long, destinationMessageId: Long, destinationFolderId: Long, - rootMessagePartId: Long + rootMessagePartId: Long, ): Long { val values = readMessageToContentValues(database, sourceMessageId, destinationFolderId, rootMessagePartId) @@ -177,7 +177,7 @@ ORDER BY message_parts.seq database: SQLiteDatabase, sourceMessageId: Long, destinationFolderId: Long, - rootMessagePartId: Long + rootMessagePartId: Long, ): Long { val values = readMessageToContentValues(database, sourceMessageId, destinationFolderId, rootMessagePartId) @@ -188,7 +188,7 @@ ORDER BY message_parts.seq database: SQLiteDatabase, sourceMessageId: Long, destinationFolderId: Long, - rootMessagePartId: Long + rootMessagePartId: Long, ): ContentValues { val values = readMessageToContentValues(database, sourceMessageId) @@ -203,7 +203,7 @@ ORDER BY message_parts.seq database.execSQL( "INSERT OR REPLACE INTO messages_fulltext (docid, fulltext) " + "SELECT ?, fulltext FROM messages_fulltext WHERE docid = ?", - arrayOf(newMessageId.toString(), messageId.toString()) + arrayOf(newMessageId.toString(), messageId.toString()), ) } @@ -232,13 +232,13 @@ ORDER BY message_parts.seq "flagged", "answered", "forwarded", - "encryption_type" + "encryption_type", ), "id = ?", arrayOf(messageId.toString()), null, null, - null + null, ).use { cursor -> if (!cursor.moveToNext()) error("Message with ID $messageId not found") @@ -288,7 +288,7 @@ ORDER BY message_parts.seq epilogue = getBlobOrNull(14), boundary = getStringOrNull(15), contentId = getStringOrNull(16), - serverExtra = getStringOrNull(17) + serverExtra = getStringOrNull(17), ) } } @@ -311,5 +311,5 @@ private class DatabaseMessagePart( val epilogue: ByteArray?, val boundary: String?, val contentId: String?, - val serverExtra: String? + val serverExtra: String?, ) diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/DatabaseOperations.kt b/app/storage/src/main/java/com/fsck/k9/storage/messages/DatabaseOperations.kt index 1558190c6b4..93debbab1d4 100644 --- a/app/storage/src/main/java/com/fsck/k9/storage/messages/DatabaseOperations.kt +++ b/app/storage/src/main/java/com/fsck/k9/storage/messages/DatabaseOperations.kt @@ -7,7 +7,7 @@ import timber.log.Timber internal class DatabaseOperations( private val lockableDatabase: LockableDatabase, val storageManager: StorageManager, - val accountUuid: String + val accountUuid: String, ) { fun getSize(): Long { val storageProviderId = lockableDatabase.storageProviderId diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/DeleteFolderOperations.kt b/app/storage/src/main/java/com/fsck/k9/storage/messages/DeleteFolderOperations.kt index c05c27fc3eb..223d825d57c 100644 --- a/app/storage/src/main/java/com/fsck/k9/storage/messages/DeleteFolderOperations.kt +++ b/app/storage/src/main/java/com/fsck/k9/storage/messages/DeleteFolderOperations.kt @@ -5,7 +5,7 @@ import com.fsck.k9.mailstore.LockableDatabase internal class DeleteFolderOperations( private val lockableDatabase: LockableDatabase, - private val attachmentFileManager: AttachmentFileManager + private val attachmentFileManager: AttachmentFileManager, ) { fun deleteFolders(folderServerIds: List) { lockableDatabase.execute(true) { db -> @@ -29,7 +29,7 @@ JOIN message_parts ON ( ) WHERE folders.server_id = ? """, - arrayOf(folderServerId) + arrayOf(folderServerId), ).use { cursor -> while (cursor.moveToNext()) { val messagePartId = cursor.getLong(0) diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/DeleteMessageOperations.kt b/app/storage/src/main/java/com/fsck/k9/storage/messages/DeleteMessageOperations.kt index d39150e9925..989337fab4b 100644 --- a/app/storage/src/main/java/com/fsck/k9/storage/messages/DeleteMessageOperations.kt +++ b/app/storage/src/main/java/com/fsck/k9/storage/messages/DeleteMessageOperations.kt @@ -6,7 +6,7 @@ import com.fsck.k9.mailstore.LockableDatabase internal class DeleteMessageOperations( private val lockableDatabase: LockableDatabase, - private val attachmentFileManager: AttachmentFileManager + private val attachmentFileManager: AttachmentFileManager, ) { fun destroyMessages(folderId: Long, messageServerIds: Collection) { for (messageServerId in messageServerIds) { @@ -44,13 +44,13 @@ LEFT JOIN threads threads1 ON (threads1.message_id = messages.id) LEFT JOIN threads threads2 ON (threads2.parent = threads1.id) WHERE folder_id = ? AND uid = ? """, - arrayOf(folderId.toString(), messageServerId) + arrayOf(folderId.toString(), messageServerId), ).use { cursor -> if (cursor.moveToFirst()) { MessageData( messageId = cursor.getLong(0), messagePartId = cursor.getLong(1), - hasThreadChildren = !cursor.isNull(2) && cursor.getInt(2) > 0 + hasThreadChildren = !cursor.isNull(2) && cursor.getInt(2) > 0, ) } else { null @@ -67,7 +67,7 @@ WHERE folder_id = ? AND uid = ? arrayOf(rootMessagePartId.toString()), null, null, - null + null, ).use { cursor -> while (cursor.moveToNext()) { val messagePartId = cursor.getLong(0) @@ -134,7 +134,7 @@ JOIN threads threads2 ON (threads1.parent = threads2.id) JOIN messages ON (threads2.message_id = messages.id AND messages.empty = 1) WHERE threads1.message_id = ? """, - arrayOf(messageId.toString()) + arrayOf(messageId.toString()), ).use { cursor -> if (cursor.moveToFirst() && !cursor.isNull(0)) { cursor.getLong(0) @@ -156,7 +156,7 @@ FROM threads threads1 JOIN threads threads2 ON (threads2.parent = threads1.id) WHERE threads1.message_id = ? """, - arrayOf(messageId.toString()) + arrayOf(messageId.toString()), ).use { cursor -> cursor.moveToFirst() && !cursor.isNull(0) && cursor.getLong(0) > 0L } @@ -166,5 +166,5 @@ WHERE threads1.message_id = ? private data class MessageData( val messageId: Long, val messagePartId: Long, - val hasThreadChildren: Boolean + val hasThreadChildren: Boolean, ) diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/FlagMessageOperations.kt b/app/storage/src/main/java/com/fsck/k9/storage/messages/FlagMessageOperations.kt index 3abb91d1778..a9e4473ef77 100644 --- a/app/storage/src/main/java/com/fsck/k9/storage/messages/FlagMessageOperations.kt +++ b/app/storage/src/main/java/com/fsck/k9/storage/messages/FlagMessageOperations.kt @@ -47,7 +47,7 @@ internal class FlagMessageOperations(private val lockableDatabase: LockableDatab lockableDatabase.execute(true) { database -> performChunkedOperation( arguments = messageIds, - argumentTransformation = Long::toString + argumentTransformation = Long::toString, ) { selectionSet, selectionArguments -> database.update("messages", contentValues, "id $selectionSet", selectionArguments) } @@ -69,7 +69,7 @@ internal class FlagMessageOperations(private val lockableDatabase: LockableDatab "messages", values, "folder_id = ? AND uid = ?", - arrayOf(folderId.toString(), messageServerId) + arrayOf(folderId.toString(), messageServerId), ) } } @@ -82,7 +82,7 @@ internal class FlagMessageOperations(private val lockableDatabase: LockableDatab arrayOf(folderId.toString(), messageServerId), null, null, - null + null, ).use { cursor -> if (!cursor.moveToFirst()) error("Message not found $folderId:$messageServerId") @@ -104,7 +104,7 @@ internal class FlagMessageOperations(private val lockableDatabase: LockableDatab "messages", values, "folder_id = ? AND uid = ?", - arrayOf(folderId.toString(), messageServerId) + arrayOf(folderId.toString(), messageServerId), ) } } diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/K9MessageStore.kt b/app/storage/src/main/java/com/fsck/k9/storage/messages/K9MessageStore.kt index 638d4771f23..3f168ab409e 100644 --- a/app/storage/src/main/java/com/fsck/k9/storage/messages/K9MessageStore.kt +++ b/app/storage/src/main/java/com/fsck/k9/storage/messages/K9MessageStore.kt @@ -22,7 +22,7 @@ class K9MessageStore( database: LockableDatabase, storageManager: StorageManager, basicPartInfoExtractor: BasicPartInfoExtractor, - accountUuid: String + accountUuid: String, ) : MessageStore { private val attachmentFileManager = AttachmentFileManager(storageManager, accountUuid) private val threadMessageOperations = ThreadMessageOperations() @@ -30,7 +30,7 @@ class K9MessageStore( database, attachmentFileManager, basicPartInfoExtractor, - threadMessageOperations + threadMessageOperations, ) private val copyMessageOperations = CopyMessageOperations(database, attachmentFileManager, threadMessageOperations) private val moveMessageOperations = MoveMessageOperations(database, threadMessageOperations) @@ -107,7 +107,7 @@ class K9MessageStore( selection: String, selectionArgs: Array, sortOrder: String, - messageMapper: MessageMapper + messageMapper: MessageMapper, ): List { return retrieveMessageListOperations.getMessages(selection, selectionArgs, sortOrder, messageMapper) } @@ -116,7 +116,7 @@ class K9MessageStore( selection: String, selectionArgs: Array, sortOrder: String, - messageMapper: MessageMapper + messageMapper: MessageMapper, ): List { return retrieveMessageListOperations.getThreadedMessages(selection, selectionArgs, sortOrder, messageMapper) } @@ -160,7 +160,7 @@ class K9MessageStore( override fun getDisplayFolders( displayMode: FolderMode, outboxFolderId: Long?, - mapper: FolderMapper + mapper: FolderMapper, ): List { return retrieveFolderOperations.getDisplayFolders(displayMode, outboxFolderId, mapper) } diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/K9MessageStoreFactory.kt b/app/storage/src/main/java/com/fsck/k9/storage/messages/K9MessageStoreFactory.kt index 02ebdde81ce..11cfa8f103b 100644 --- a/app/storage/src/main/java/com/fsck/k9/storage/messages/K9MessageStoreFactory.kt +++ b/app/storage/src/main/java/com/fsck/k9/storage/messages/K9MessageStoreFactory.kt @@ -11,7 +11,7 @@ import com.fsck.k9.message.extractors.BasicPartInfoExtractor class K9MessageStoreFactory( private val localStoreProvider: LocalStoreProvider, private val storageManager: StorageManager, - private val basicPartInfoExtractor: BasicPartInfoExtractor + private val basicPartInfoExtractor: BasicPartInfoExtractor, ) : MessageStoreFactory { override fun create(account: Account): ListenableMessageStore { val localStore = localStoreProvider.getInstance(account) diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/KeyValueStoreOperations.kt b/app/storage/src/main/java/com/fsck/k9/storage/messages/KeyValueStoreOperations.kt index cb2e4e4fad6..2805aeccc27 100644 --- a/app/storage/src/main/java/com/fsck/k9/storage/messages/KeyValueStoreOperations.kt +++ b/app/storage/src/main/java/com/fsck/k9/storage/messages/KeyValueStoreOperations.kt @@ -16,7 +16,7 @@ internal class KeyValueStoreOperations(private val lockableDatabase: LockableDat arrayOf(name), null, null, - null + null, ).use { cursor -> if (cursor.moveToFirst()) { cursor.getStringOrNull(0) @@ -46,7 +46,7 @@ internal class KeyValueStoreOperations(private val lockableDatabase: LockableDat arrayOf(name), null, null, - null + null, ).use { cursor -> if (cursor.moveToFirst()) { cursor.getLongOrNull(0) @@ -76,7 +76,7 @@ internal class KeyValueStoreOperations(private val lockableDatabase: LockableDat arrayOf(name, folderId.toString()), null, null, - null + null, ).use { cursor -> if (cursor.moveToFirst()) { cursor.getStringOrNull(0) @@ -107,7 +107,7 @@ internal class KeyValueStoreOperations(private val lockableDatabase: LockableDat arrayOf(name, folderId.toString()), null, null, - null + null, ).use { cursor -> if (cursor.moveToFirst()) { cursor.getLongOrNull(0) diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/MoveMessageOperations.kt b/app/storage/src/main/java/com/fsck/k9/storage/messages/MoveMessageOperations.kt index 10792153b6f..5e0fb05a7ae 100644 --- a/app/storage/src/main/java/com/fsck/k9/storage/messages/MoveMessageOperations.kt +++ b/app/storage/src/main/java/com/fsck/k9/storage/messages/MoveMessageOperations.kt @@ -12,7 +12,7 @@ import timber.log.Timber internal class MoveMessageOperations( private val database: LockableDatabase, - private val threadMessageOperations: ThreadMessageOperations + private val threadMessageOperations: ThreadMessageOperations, ) { fun moveMessage(messageId: Long, destinationFolderId: Long): Long { Timber.d("Moving message [ID: $messageId] to folder [ID: $destinationFolderId]") @@ -41,7 +41,7 @@ internal class MoveMessageOperations( database: SQLiteDatabase, messageId: Long, destinationFolderId: Long, - threadInfo: ThreadInfo? + threadInfo: ThreadInfo?, ): Long { val destinationUid = K9.LOCAL_UID_PREFIX + UUID.randomUUID().toString() @@ -51,13 +51,13 @@ internal class MoveMessageOperations( "subject", "date", "flags", "sender_list", "to_list", "cc_list", "bcc_list", "reply_to_list", "attachment_count", "internal_date", "message_id", "preview_type", "preview", "mime_type", "normalized_subject_hash", "read", "flagged", "answered", "forwarded", "message_part_id", - "encryption_type" + "encryption_type", ), "id = ?", arrayOf(messageId.toString()), null, null, - null + null, ).use { cursor -> if (!cursor.moveToFirst()) { error("Couldn't find local message [ID: $messageId]") diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/RetrieveFolderOperations.kt b/app/storage/src/main/java/com/fsck/k9/storage/messages/RetrieveFolderOperations.kt index cd18b675adb..5081d68a840 100644 --- a/app/storage/src/main/java/com/fsck/k9/storage/messages/RetrieveFolderOperations.kt +++ b/app/storage/src/main/java/com/fsck/k9/storage/messages/RetrieveFolderOperations.kt @@ -20,7 +20,7 @@ internal class RetrieveFolderOperations(private val lockableDatabase: LockableDa return getFolder( selection = "id = ?", selectionArguments = arrayOf(folderId.toString()), - mapper = mapper + mapper = mapper, ) } @@ -28,7 +28,7 @@ internal class RetrieveFolderOperations(private val lockableDatabase: LockableDa return getFolder( selection = "server_id = ?", selectionArguments = arrayOf(folderServerId), - mapper = mapper + mapper = mapper, ) } @@ -41,7 +41,7 @@ internal class RetrieveFolderOperations(private val lockableDatabase: LockableDa selectionArguments, null, null, - null + null, ).use { cursor -> if (cursor.moveToFirst()) { val cursorFolderAccessor = CursorFolderAccessor(cursor) @@ -127,7 +127,7 @@ $displayModeSelection arrayOf(folderServerId), null, null, - null + null, ).use { cursor -> if (cursor.moveToFirst()) cursor.getLong(0) else null } @@ -143,7 +143,7 @@ $displayModeSelection arrayOf(folderId.toString()), null, null, - null + null, ).use { cursor -> if (cursor.moveToFirst()) cursor.getString(0) else null } @@ -154,7 +154,7 @@ $displayModeSelection return lockableDatabase.execute(false) { db -> db.rawQuery( "SELECT COUNT(id) FROM messages WHERE empty = 0 AND deleted = 0 AND folder_id = ?", - arrayOf(folderId.toString()) + arrayOf(folderId.toString()), ).use { cursor -> if (cursor.moveToFirst()) cursor.getInt(0) else 0 } @@ -165,7 +165,7 @@ $displayModeSelection return lockableDatabase.execute(false) { db -> db.rawQuery( "SELECT COUNT(id) FROM messages WHERE empty = 0 AND deleted = 0 AND read = 0 AND folder_id = ?", - arrayOf(folderId.toString()) + arrayOf(folderId.toString()), ).use { cursor -> if (cursor.moveToFirst()) cursor.getInt(0) else 0 } @@ -280,5 +280,5 @@ private val FOLDER_COLUMNS = arrayOf( "push_class", "visible_limit", "more_messages", - "last_updated" + "last_updated", ) diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/RetrieveMessageListOperations.kt b/app/storage/src/main/java/com/fsck/k9/storage/messages/RetrieveMessageListOperations.kt index 01b0d93e53f..cf5f353b719 100644 --- a/app/storage/src/main/java/com/fsck/k9/storage/messages/RetrieveMessageListOperations.kt +++ b/app/storage/src/main/java/com/fsck/k9/storage/messages/RetrieveMessageListOperations.kt @@ -15,7 +15,7 @@ internal class RetrieveMessageListOperations(private val lockableDatabase: Locka selection: String, selectionArgs: Array, sortOrder: String, - mapper: MessageMapper + mapper: MessageMapper, ): List { return lockableDatabase.execute(false) { database -> database.rawQuery( @@ -46,7 +46,7 @@ WHERE AND empty = 0 AND deleted = 0 ORDER BY $sortOrder """, - selectionArgs + selectionArgs, ).use { cursor -> val cursorMessageAccessor = CursorMessageAccessor(cursor, includesThreadCount = false) buildList { @@ -65,7 +65,7 @@ ORDER BY $sortOrder selection: String, selectionArgs: Array, sortOrder: String, - mapper: MessageMapper + mapper: MessageMapper, ): List { val orderBy = SqlQueryBuilder.addPrefixToSelection(AGGREGATED_MESSAGES_COLUMNS, "aggregated.", sortOrder) @@ -126,7 +126,7 @@ JOIN folders ON (folders.id = messages.folder_id) GROUP BY threads.root ORDER BY $orderBy """, - selectionArgs + selectionArgs, ).use { cursor -> val cursorMessageAccessor = CursorMessageAccessor(cursor, includesThreadCount = true) buildList { @@ -171,7 +171,7 @@ WHERE AND empty = 0 AND deleted = 0 ORDER BY $sortOrder """, - arrayOf(threadId.toString()) + arrayOf(threadId.toString()), ).use { cursor -> val cursorMessageAccessor = CursorMessageAccessor(cursor, includesThreadCount = false) buildList { @@ -238,5 +238,5 @@ private val AGGREGATED_MESSAGES_COLUMNS = arrayOf( "read", "flagged", "answered", - "forwarded" + "forwarded", ) diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/RetrieveMessageOperations.kt b/app/storage/src/main/java/com/fsck/k9/storage/messages/RetrieveMessageOperations.kt index 49e39e7ab81..1943551059d 100644 --- a/app/storage/src/main/java/com/fsck/k9/storage/messages/RetrieveMessageOperations.kt +++ b/app/storage/src/main/java/com/fsck/k9/storage/messages/RetrieveMessageOperations.kt @@ -22,7 +22,7 @@ internal class RetrieveMessageOperations(private val lockableDatabase: LockableD arrayOf(messageId.toString()), null, null, - null + null, ).use { cursor -> if (cursor.moveToFirst()) { cursor.getString(0) @@ -40,7 +40,7 @@ internal class RetrieveMessageOperations(private val lockableDatabase: LockableD val databaseIdToServerIdMapping = mutableMapOf() performChunkedOperation( arguments = messageIds, - argumentTransformation = Long::toString + argumentTransformation = Long::toString, ) { selectionSet, selectionArguments -> database.query( "messages", @@ -49,7 +49,7 @@ internal class RetrieveMessageOperations(private val lockableDatabase: LockableD selectionArguments, null, null, - null + null, ).use { cursor -> while (cursor.moveToNext()) { val databaseId = cursor.getLong(0) @@ -69,7 +69,7 @@ internal class RetrieveMessageOperations(private val lockableDatabase: LockableD database.rawQuery( "SELECT uid FROM messages" + " WHERE empty = 0 AND deleted = 0 AND folder_id = ? AND uid NOT LIKE '${K9.LOCAL_UID_PREFIX}%'", - arrayOf(folderId.toString()) + arrayOf(folderId.toString()), ).use { cursor -> val result = mutableSetOf() while (cursor.moveToNext()) { @@ -90,7 +90,7 @@ internal class RetrieveMessageOperations(private val lockableDatabase: LockableD arrayOf(folderId.toString(), messageServerId), null, null, - null + null, ).use { cursor -> cursor.moveToFirst() } @@ -106,7 +106,7 @@ internal class RetrieveMessageOperations(private val lockableDatabase: LockableD arrayOf(folderId.toString(), messageServerId), null, null, - null + null, ).use { cursor -> if (!cursor.moveToFirst()) error("Couldn't read flags for $folderId:$messageServerId") @@ -141,7 +141,7 @@ internal class RetrieveMessageOperations(private val lockableDatabase: LockableD database.rawQuery( "SELECT uid, date FROM messages" + " WHERE empty = 0 AND deleted = 0 AND folder_id = ? AND uid NOT LIKE '${K9.LOCAL_UID_PREFIX}%'", - arrayOf(folderId.toString()) + arrayOf(folderId.toString()), ).use { cursor -> val result = mutableMapOf() while (cursor.moveToNext()) { @@ -158,7 +158,7 @@ internal class RetrieveMessageOperations(private val lockableDatabase: LockableD return lockableDatabase.execute(false) { database -> database.rawQuery( "SELECT MIN(date) FROM messages WHERE folder_id = ?", - arrayOf(folderId.toString()) + arrayOf(folderId.toString()), ).use { cursor -> if (cursor.moveToFirst()) { val timestamp = cursor.getLong(0) @@ -176,7 +176,7 @@ internal class RetrieveMessageOperations(private val lockableDatabase: LockableD "SELECT message_parts.header FROM messages" + " LEFT JOIN message_parts ON (messages.message_part_id = message_parts.id)" + " WHERE messages.folder_id = ? AND messages.uid = ?", - arrayOf(folderId.toString(), messageServerId) + arrayOf(folderId.toString(), messageServerId), ).use { cursor -> if (!cursor.moveToFirst()) throw MessageNotFoundException(folderId, messageServerId) diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/SaveMessageOperations.kt b/app/storage/src/main/java/com/fsck/k9/storage/messages/SaveMessageOperations.kt index c6e95bc7b20..01f9ddcf826 100644 --- a/app/storage/src/main/java/com/fsck/k9/storage/messages/SaveMessageOperations.kt +++ b/app/storage/src/main/java/com/fsck/k9/storage/messages/SaveMessageOperations.kt @@ -41,7 +41,7 @@ internal class SaveMessageOperations( private val lockableDatabase: LockableDatabase, private val attachmentFileManager: AttachmentFileManager, private val partInfoExtractor: BasicPartInfoExtractor, - private val threadMessageOperations: ThreadMessageOperations + private val threadMessageOperations: ThreadMessageOperations, ) { fun saveRemoteMessage(folderId: Long, messageServerId: String, messageData: SaveMessageData) { saveMessage(folderId, messageServerId, messageData) @@ -70,7 +70,7 @@ internal class SaveMessageOperations( messageServerId, existingMessageId = messageId, existingRootMessagePartId = rootMessagePartId, - messageData + messageData, ) messageId @@ -90,7 +90,7 @@ internal class SaveMessageOperations( messageServerId, existingMessageId, existingRootMessagePartId, - messageData + messageData, ) existingMessageId @@ -105,7 +105,7 @@ internal class SaveMessageOperations( folderId: Long, messageServerId: String, message: Message, - messageData: SaveMessageData + messageData: SaveMessageData, ): Long { val threadInfo = threadMessageOperations.doMessageThreading(database, folderId, message.toThreadHeaders()) @@ -116,7 +116,7 @@ internal class SaveMessageOperations( messageServerId, rootMessagePartId, messageData, - replaceMessageId = threadInfo?.messageId + replaceMessageId = threadInfo?.messageId, ) if (threadInfo?.threadId == null) { @@ -134,7 +134,7 @@ internal class SaveMessageOperations( messageServerId: String, existingMessageId: Long, existingRootMessagePartId: Long?, - messageData: SaveMessageData + messageData: SaveMessageData, ) { if (existingRootMessagePartId != null) { deleteMessagePartsAndDataFromDisk(database, existingRootMessagePartId) @@ -147,7 +147,7 @@ internal class SaveMessageOperations( messageServerId, rootMessagePartId, messageData, - replaceMessageId = existingMessageId + replaceMessageId = existingMessageId, ) createOrReplaceFulltextEntry(database, messageId, messageData) @@ -175,7 +175,7 @@ internal class SaveMessageOperations( database: SQLiteDatabase, partContainer: PartContainer, rootId: Long?, - order: Int + order: Int, ): Long { val part = partContainer.part val values = ContentValues().apply { @@ -192,7 +192,7 @@ internal class SaveMessageOperations( database: SQLiteDatabase, values: ContentValues, part: Part, - existingMessagePartId: Long? + existingMessagePartId: Long?, ): Long { val headerBytes = getHeaderBytes(part) values.put("mime_type", part.mimeType) @@ -378,7 +378,7 @@ internal class SaveMessageOperations( messageServerId: String, rootMessagePartId: Long, messageData: SaveMessageData, - replaceMessageId: Long? + replaceMessageId: Long?, ): Long { val message = messageData.message @@ -450,7 +450,7 @@ internal class SaveMessageOperations( arrayOf(folderId.toString(), messageServerId), null, null, - null + null, ).use { cursor -> if (cursor.moveToFirst()) { val messageId = cursor.getLong(0) @@ -472,7 +472,7 @@ internal class SaveMessageOperations( arrayOf(folderId.toString(), messageId.toString()), null, null, - null + null, ).use { cursor -> if (!cursor.moveToFirst()) error("Local message not found $folderId:$messageId") @@ -496,7 +496,7 @@ internal class SaveMessageOperations( arrayOf(rootMessagePartId.toString()), null, null, - null + null, ).use { cursor -> while (cursor.moveToNext()) { val messagePartId = cursor.getLong(0) diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/ThreadMessageOperations.kt b/app/storage/src/main/java/com/fsck/k9/storage/messages/ThreadMessageOperations.kt index e032756abcc..35435cbe0f9 100644 --- a/app/storage/src/main/java/com/fsck/k9/storage/messages/ThreadMessageOperations.kt +++ b/app/storage/src/main/java/com/fsck/k9/storage/messages/ThreadMessageOperations.kt @@ -11,7 +11,7 @@ internal class ThreadMessageOperations { fun createOrUpdateParentThreadEntries( database: SQLiteDatabase, messageId: Long, - destinationFolderId: Long + destinationFolderId: Long, ): ThreadInfo? { val threadHeaders = getMessageThreadHeaders(database, messageId) return doMessageThreading(database, destinationFolderId, threadHeaders) @@ -25,7 +25,7 @@ FROM messages LEFT JOIN message_parts ON (messages.message_part_id = message_parts.id) WHERE messages.id = ? """, - arrayOf(messageId.toString()) + arrayOf(messageId.toString()), ).use { cursor -> if (!cursor.moveToFirst()) error("Message not found: $messageId") @@ -130,7 +130,7 @@ WHERE messages.id = ? folderId: Long, messageIdHeader: String, rootId: Long?, - parentId: Long? + parentId: Long?, ): Long { val messageValues = ContentValues().apply { put("message_id", messageIdHeader) @@ -151,7 +151,7 @@ WHERE messages.id = ? db: SQLiteDatabase, folderId: Long, messageIdHeader: String?, - onlyEmpty: Boolean + onlyEmpty: Boolean, ): ThreadInfo? { if (messageIdHeader == null) return null @@ -165,7 +165,7 @@ ${if (onlyEmpty) "AND m.empty = 1 " else ""} ORDER BY m.id LIMIT 1 """, - arrayOf(folderId.toString(), messageIdHeader) + arrayOf(folderId.toString(), messageIdHeader), ).use { cursor -> if (cursor.moveToFirst()) { val threadId = cursor.getLong(0) @@ -182,7 +182,7 @@ LIMIT 1 private fun getThreadRoot(database: SQLiteDatabase, threadId: Long): Long { return database.rawQuery( "SELECT root FROM threads WHERE id = ?", - arrayOf(threadId.toString()) + arrayOf(threadId.toString()), ).use { cursor -> if (cursor.moveToFirst()) { cursor.getLong(0) @@ -205,19 +205,19 @@ internal data class ThreadInfo( val threadId: Long?, val messageId: Long?, val rootId: Long, - val parentId: Long? + val parentId: Long?, ) internal data class ThreadHeaders( val messageIdHeader: String?, val inReplyToHeader: String?, - val referencesHeader: String? + val referencesHeader: String?, ) internal fun Message.toThreadHeaders(): ThreadHeaders { return ThreadHeaders( messageIdHeader = messageId, inReplyToHeader = getHeader("In-Reply-To").firstOrNull(), - referencesHeader = getHeader("References").firstOrNull() + referencesHeader = getHeader("References").firstOrNull(), ) } diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/UpdateMessageOperations.kt b/app/storage/src/main/java/com/fsck/k9/storage/messages/UpdateMessageOperations.kt index 9c5891ee069..6889ef870ff 100644 --- a/app/storage/src/main/java/com/fsck/k9/storage/messages/UpdateMessageOperations.kt +++ b/app/storage/src/main/java/com/fsck/k9/storage/messages/UpdateMessageOperations.kt @@ -15,7 +15,7 @@ internal class UpdateMessageOperations(private val lockableDatabase: LockableDat "messages", values, "folder_id = ? AND uid = ?", - arrayOf(folderId.toString(), messageServerId) + arrayOf(folderId.toString(), messageServerId), ) } } diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo64.kt b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo64.kt index d79117aed00..9eb4c51105b 100644 --- a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo64.kt +++ b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo64.kt @@ -10,7 +10,7 @@ internal object MigrationTo64 { "name TEXT NOT NULL PRIMARY KEY, " + "value_text TEXT, " + "value_integer INTEGER " + - ")" + ")", ) db.execSQL( @@ -20,7 +20,7 @@ internal object MigrationTo64 { "value_text TEXT, " + "value_integer INTEGER, " + "PRIMARY KEY (folder_id, name)" + - ")" + ")", ) db.execSQL( @@ -28,7 +28,7 @@ internal object MigrationTo64 { "BEFORE DELETE ON folders " + "BEGIN " + "DELETE FROM folder_extra_values WHERE old.id = folder_id; " + - "END;" + "END;", ) } } diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo68.kt b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo68.kt index 1c3774c9b94..622476454c7 100644 --- a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo68.kt +++ b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo68.kt @@ -16,7 +16,7 @@ internal object MigrationTo68 { "send_state TEXT," + "number_of_send_attempts INTEGER DEFAULT 0," + "error_timestamp INTEGER DEFAULT 0," + - "error TEXT)" + "error TEXT)", ) } @@ -27,7 +27,7 @@ internal object MigrationTo68 { SELECT messages.id, 'ready' FROM folders JOIN messages ON (folders.id = messages.folder_id) WHERE folders.server_id = 'K9MAIL_INTERNAL_OUTBOX' - """.trimIndent() + """.trimIndent(), ) } } diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo70.kt b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo70.kt index 8c041a2d45a..4fbb0074e02 100644 --- a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo70.kt +++ b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo70.kt @@ -37,7 +37,7 @@ internal class MigrationTo70(private val db: SQLiteDatabase) { "server_id TEXT, " + "local_only INTEGER, " + "type TEXT DEFAULT \"regular\"" + - ")" + ")", ) } @@ -64,7 +64,7 @@ internal class MigrationTo70(private val db: SQLiteDatabase) { local_only, type FROM folders_old - """.trimIndent() + """.trimIndent(), ) } @@ -87,7 +87,7 @@ internal class MigrationTo70(private val db: SQLiteDatabase) { "BEFORE DELETE ON folders " + "BEGIN " + "DELETE FROM folder_extra_values WHERE old.id = folder_id; " + - "END;" + "END;", ) } } diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo71.kt b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo71.kt index df01e946873..966175fc97b 100644 --- a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo71.kt +++ b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo71.kt @@ -6,19 +6,19 @@ internal class MigrationTo71(private val db: SQLiteDatabase) { fun cleanUpFolderClass() { db.execSQL( "UPDATE folders SET poll_class = 'NO_CLASS' " + - "WHERE poll_class NOT IN ('NO_CLASS', 'INHERITED', 'FIRST_CLASS', 'SECOND_CLASS')" + "WHERE poll_class NOT IN ('NO_CLASS', 'INHERITED', 'FIRST_CLASS', 'SECOND_CLASS')", ) db.execSQL( "UPDATE folders SET push_class = 'NO_CLASS' " + - "WHERE push_class NOT IN ('NO_CLASS', 'INHERITED', 'FIRST_CLASS', 'SECOND_CLASS')" + "WHERE push_class NOT IN ('NO_CLASS', 'INHERITED', 'FIRST_CLASS', 'SECOND_CLASS')", ) db.execSQL( "UPDATE folders SET display_class = 'NO_CLASS' " + - "WHERE display_class NOT IN ('NO_CLASS', 'INHERITED', 'FIRST_CLASS', 'SECOND_CLASS')" + "WHERE display_class NOT IN ('NO_CLASS', 'INHERITED', 'FIRST_CLASS', 'SECOND_CLASS')", ) db.execSQL( "UPDATE folders SET notify_class = 'NO_CLASS' " + - "WHERE notify_class NOT IN ('NO_CLASS', 'INHERITED', 'FIRST_CLASS', 'SECOND_CLASS')" + "WHERE notify_class NOT IN ('NO_CLASS', 'INHERITED', 'FIRST_CLASS', 'SECOND_CLASS')", ) } } diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo73.kt b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo73.kt index 896b67525a8..dff2c904998 100644 --- a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo73.kt +++ b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo73.kt @@ -25,7 +25,7 @@ internal class MigrationTo73(private val db: SQLiteDatabase) { "delete" to moshi.adapter(LegacyPendingDelete::class.java), "expunge" to moshi.adapter(LegacyPendingExpunge::class.java), "move_or_copy" to moshi.adapter(LegacyPendingMoveOrCopy::class.java), - "move_and_mark_as_read" to moshi.adapter(LegacyPendingMoveAndMarkAsRead::class.java) + "move_and_mark_as_read" to moshi.adapter(LegacyPendingMoveAndMarkAsRead::class.java), ).toMap() fun rewritePendingCommandsToUseFolderIds() { @@ -36,7 +36,7 @@ internal class MigrationTo73(private val db: SQLiteDatabase) { private fun loadPendingCommands(): Map { return db.rawQuery( "SELECT id, command, data FROM pending_commands WHERE command != 'empty_trash'", - null + null, ).use { cursor -> cursor.map { val commandId = cursor.getLong(0) @@ -81,7 +81,7 @@ internal class MigrationTo73(private val db: SQLiteDatabase) { folderId, legacyPendingCommand.newState, legacyPendingCommand.flag, - legacyPendingCommand.uids + legacyPendingCommand.uids, ) } } @@ -102,13 +102,13 @@ internal class MigrationTo73(private val db: SQLiteDatabase) { rewriteOrRemovePendingCommand( commandId, legacyPendingCommand.srcFolder, - legacyPendingCommand.destFolder + legacyPendingCommand.destFolder, ) { (srcFolderId, destFolderId) -> PendingMoveOrCopy.create( srcFolderId, destFolderId, legacyPendingCommand.isCopy, - legacyPendingCommand.newUidMap + legacyPendingCommand.newUidMap, ) } } @@ -117,7 +117,7 @@ internal class MigrationTo73(private val db: SQLiteDatabase) { rewriteOrRemovePendingCommand( commandId, legacyPendingCommand.srcFolder, - legacyPendingCommand.destFolder + legacyPendingCommand.destFolder, ) { (srcFolderId, destFolderId) -> PendingMoveAndMarkAsRead.create(srcFolderId, destFolderId, legacyPendingCommand.newUidMap) } @@ -126,7 +126,7 @@ internal class MigrationTo73(private val db: SQLiteDatabase) { private fun rewriteOrRemovePendingCommand( commandId: Long, vararg folderServerIds: String, - convertPendingCommand: (folderIds: List) -> PendingCommand + convertPendingCommand: (folderIds: List) -> PendingCommand, ) { val folderIds = folderServerIds.map { loadFolderId(it) diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo74.kt b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo74.kt index 6d45d37eab5..e99b3429dbb 100644 --- a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo74.kt +++ b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo74.kt @@ -95,7 +95,7 @@ internal class MigrationTo74(private val db: SQLiteDatabase, private val account "FROM threads t1 " + "JOIN threads t2 ON (t2.parent = t1.id) " + "WHERE t1.message_id = ?", - arrayOf(messageId.toString()) + arrayOf(messageId.toString()), ).use { cursor -> cursor.moveToFirst() && !cursor.isNull(0) && cursor.getLong(0) > 0L } @@ -108,7 +108,7 @@ internal class MigrationTo74(private val db: SQLiteDatabase, private val account "JOIN threads t2 ON (t1.parent = t2.id) " + "LEFT JOIN messages m ON (t2.message_id = m.id) " + "WHERE t1.message_id = ? AND m.empty = 1", - arrayOf(messageId.toString()) + arrayOf(messageId.toString()), ).use { cursor -> if (cursor.moveToFirst() && !cursor.isNull(0)) cursor.getLong(0) else -1 } diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo76.kt b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo76.kt index e35f5652670..6c22a680e24 100644 --- a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo76.kt +++ b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo76.kt @@ -90,7 +90,7 @@ internal class MigrationTo76(private val db: SQLiteDatabase, private val migrati arrayOf(folderType, excludeFolderId.toString()), null, null, - null + null, ).use { cursor -> cursor.map { cursor.getLong(0) } } diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo79.kt b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo79.kt index 47af752844b..6c8952c84e8 100644 --- a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo79.kt +++ b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo79.kt @@ -15,7 +15,7 @@ internal class MigrationTo79(private val db: SQLiteDatabase) { "DELETE FROM message_parts WHERE root = OLD.message_part_id; " + "DELETE FROM messages_fulltext WHERE docid = OLD.id; " + "DELETE FROM threads WHERE message_id = OLD.id; " + - "END" + "END", ) } } diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo81.kt b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo81.kt index 60e67c7cf38..d8b05c52c95 100644 --- a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo81.kt +++ b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo81.kt @@ -13,7 +13,7 @@ internal class MigrationTo81(private val db: SQLiteDatabase) { "message_id INTEGER PRIMARY KEY NOT NULL REFERENCES messages(id) ON DELETE CASCADE," + "notification_id INTEGER UNIQUE," + "timestamp INTEGER NOT NULL" + - ")" + ")", ) db.execSQL("DROP INDEX IF EXISTS notifications_timestamp") diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo82.kt b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo82.kt index 8d84acd03c1..b74471cc158 100644 --- a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo82.kt +++ b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo82.kt @@ -18,7 +18,7 @@ internal class MigrationTo82(private val db: SQLiteDatabase) { "FOR EACH ROW WHEN NEW.read = 1 AND NEW.new_message = 1 " + "BEGIN " + "UPDATE messages SET new_message = 0 WHERE ROWID = NEW.ROWID; " + - "END" + "END", ) // Mark messages with existing notifications as "new" diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo83.kt b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo83.kt index 47952939d14..42e2ba5f7ac 100644 --- a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo83.kt +++ b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo83.kt @@ -17,7 +17,7 @@ internal class MigrationTo83(private val db: SQLiteDatabase, private val migrati val highestKnownUids = db.rawQuery( "SELECT folder_id, MAX(CAST(uid AS INTEGER)) FROM messages GROUP BY folder_id", - null + null, ).use { cursor -> cursor.map { it.getLong(0) to it.getLongOrNull(1) diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo84.kt b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo84.kt index c1b2326a4df..d46175e3268 100644 --- a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo84.kt +++ b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo84.kt @@ -14,7 +14,7 @@ internal class MigrationTo84(private val db: SQLiteDatabase) { fun rewriteAddresses() { val addressSets = db.rawQuery( "SELECT id, to_list, cc_list, bcc_list, reply_to_list, sender_list FROM messages WHERE empty = 0 AND deleted = 0", - null + null, ).use { cursor -> cursor.map { val messageId = it.getLong(0) @@ -24,7 +24,7 @@ internal class MigrationTo84(private val db: SQLiteDatabase) { ccList = it.getStringOrNull(2), bccList = it.getStringOrNull(3), replyToList = it.getStringOrNull(4), - senderList = it.getStringOrNull(5) + senderList = it.getStringOrNull(5), ) }.toMap() } @@ -55,5 +55,5 @@ private data class AddressSet( val ccList: String?, val bccList: String?, val replyToList: String?, - val senderList: String? + val senderList: String?, ) diff --git a/app/storage/src/main/java/com/fsck/k9/storage/notifications/K9NotificationStore.kt b/app/storage/src/main/java/com/fsck/k9/storage/notifications/K9NotificationStore.kt index 4f3527efa7e..52a38358227 100644 --- a/app/storage/src/main/java/com/fsck/k9/storage/notifications/K9NotificationStore.kt +++ b/app/storage/src/main/java/com/fsck/k9/storage/notifications/K9NotificationStore.kt @@ -38,12 +38,12 @@ class K9NotificationStore(private val lockableDatabase: LockableDatabase) : Noti database: SQLiteDatabase, messageReference: MessageReference, notificationId: Int, - timestamp: Long + timestamp: Long, ) { database.execSQL( "INSERT INTO notifications(message_id, notification_id, timestamp) " + "SELECT id, ?, ? FROM messages WHERE folder_id = ? AND uid = ?", - arrayOf(notificationId, timestamp, messageReference.folderId, messageReference.uid) + arrayOf(notificationId, timestamp, messageReference.folderId, messageReference.uid), ) } @@ -51,7 +51,7 @@ class K9NotificationStore(private val lockableDatabase: LockableDatabase) : Noti database.execSQL( "UPDATE notifications SET notification_id = ? WHERE message_id IN " + "(SELECT id FROM messages WHERE folder_id = ? AND uid = ?)", - arrayOf(notificationId, messageReference.folderId, messageReference.uid) + arrayOf(notificationId, messageReference.folderId, messageReference.uid), ) } @@ -59,14 +59,14 @@ class K9NotificationStore(private val lockableDatabase: LockableDatabase) : Noti database.execSQL( "UPDATE notifications SET notification_id = NULL WHERE message_id IN " + "(SELECT id FROM messages WHERE folder_id = ? AND uid = ?)", - arrayOf(messageReference.folderId, messageReference.uid) + arrayOf(messageReference.folderId, messageReference.uid), ) } private fun removeNotification(database: SQLiteDatabase, messageReference: MessageReference) { database.execSQL( "DELETE FROM notifications WHERE message_id IN (SELECT id FROM messages WHERE folder_id = ? AND uid = ?)", - arrayOf(messageReference.folderId, messageReference.uid) + arrayOf(messageReference.folderId, messageReference.uid), ) } } diff --git a/app/storage/src/test/java/com/fsck/k9/preferences/StoragePersisterTest.kt b/app/storage/src/test/java/com/fsck/k9/preferences/StoragePersisterTest.kt index 95898e16dcc..4fb47b03d11 100644 --- a/app/storage/src/test/java/com/fsck/k9/preferences/StoragePersisterTest.kt +++ b/app/storage/src/test/java/com/fsck/k9/preferences/StoragePersisterTest.kt @@ -41,7 +41,7 @@ class StoragePersisterTest : K9RobolectricTest() { onSuccess = { map -> assertEquals(1, map.size) assertEquals("y", map["x"]) - } + }, ) storagePersister.doInTransaction(operationCallback) @@ -58,7 +58,7 @@ class StoragePersisterTest : K9RobolectricTest() { persistOp = { ops -> ops.put("x", "y") throw exception - } + }, ) try { @@ -78,7 +78,7 @@ class StoragePersisterTest : K9RobolectricTest() { val operationCallback = prepareCallback( before = { map -> map["x"] = "y" }, persistOp = { ops -> ops.remove("x") }, - onSuccess = { map -> assertTrue(map.isEmpty()) } + onSuccess = { map -> assertTrue(map.isEmpty()) }, ) storagePersister.doInTransaction(operationCallback) @@ -91,7 +91,7 @@ class StoragePersisterTest : K9RobolectricTest() { fun doInTransaction_before_preserveButNotPersist() { val operationCallback = prepareCallback( before = { map -> map["x"] = "y" }, - onSuccess = { map -> assertEquals("y", map["x"]) } + onSuccess = { map -> assertEquals("y", map["x"]) }, ) storagePersister.doInTransaction(operationCallback) @@ -103,7 +103,7 @@ class StoragePersisterTest : K9RobolectricTest() { private fun prepareCallback( persistOp: ((StoragePersistOperations) -> Unit)? = null, before: ((MutableMap) -> Unit)? = null, - onSuccess: ((Map) -> Unit)? = null + onSuccess: ((Map) -> Unit)? = null, ): StoragePersistOperationCallback = spy(object : StoragePersistOperationCallback { override fun beforePersistTransaction(workingStorage: MutableMap) { before?.invoke(workingStorage) diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/CheckFolderOperationsTest.kt b/app/storage/src/test/java/com/fsck/k9/storage/messages/CheckFolderOperationsTest.kt index 5a16c6b8ebb..076a6d17f97 100644 --- a/app/storage/src/test/java/com/fsck/k9/storage/messages/CheckFolderOperationsTest.kt +++ b/app/storage/src/test/java/com/fsck/k9/storage/messages/CheckFolderOperationsTest.kt @@ -31,7 +31,7 @@ class CheckFolderOperationsTest : RobolectricTest() { fun `not all folders included in Unified Inbox`() { val folderIds = listOf( sqliteDatabase.createFolder(integrate = true), - sqliteDatabase.createFolder(integrate = false) + sqliteDatabase.createFolder(integrate = false), ) val result = checkFolderOperations.areAllIncludedInUnifiedInbox(folderIds) diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/ChunkedDatabaseOperationsTest.kt b/app/storage/src/test/java/com/fsck/k9/storage/messages/ChunkedDatabaseOperationsTest.kt index f7e08eef09a..f8e90ed1d10 100644 --- a/app/storage/src/test/java/com/fsck/k9/storage/messages/ChunkedDatabaseOperationsTest.kt +++ b/app/storage/src/test/java/com/fsck/k9/storage/messages/ChunkedDatabaseOperationsTest.kt @@ -10,7 +10,7 @@ class ChunkedDatabaseOperationsTest { performChunkedOperation( arguments = emptyList(), argumentTransformation = Int::toString, - operation = ::failCallback + operation = ::failCallback, ) } @@ -20,7 +20,7 @@ class ChunkedDatabaseOperationsTest { arguments = listOf(1), argumentTransformation = Int::toString, chunkSize = 0, - operation = ::failCallback + operation = ::failCallback, ) } @@ -30,7 +30,7 @@ class ChunkedDatabaseOperationsTest { arguments = listOf(1), argumentTransformation = Int::toString, chunkSize = 1001, - operation = ::failCallback + operation = ::failCallback, ) } @@ -40,7 +40,7 @@ class ChunkedDatabaseOperationsTest { performChunkedOperation( arguments = listOf(1), - argumentTransformation = Int::toString + argumentTransformation = Int::toString, ) { selectionSet, selectionArguments -> chunks.add(selectionSet to selectionArguments) Unit @@ -60,7 +60,7 @@ class ChunkedDatabaseOperationsTest { performChunkedOperation( arguments = listOf(1, 2), argumentTransformation = Int::toString, - chunkSize = 1 + chunkSize = 1, ) { selectionSet, selectionArguments -> chunks.add(selectionSet to selectionArguments) Unit @@ -84,7 +84,7 @@ class ChunkedDatabaseOperationsTest { performChunkedOperation( arguments = (1..14).toList(), argumentTransformation = Int::toString, - chunkSize = 5 + chunkSize = 5, ) { selectionSet, selectionArguments -> chunks.add(selectionSet to selectionArguments) Unit diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/CopyMessageOperationsTest.kt b/app/storage/src/test/java/com/fsck/k9/storage/messages/CopyMessageOperationsTest.kt index 2bc018f2989..49268b29f72 100644 --- a/app/storage/src/test/java/com/fsck/k9/storage/messages/CopyMessageOperationsTest.kt +++ b/app/storage/src/test/java/com/fsck/k9/storage/messages/CopyMessageOperationsTest.kt @@ -28,7 +28,7 @@ class CopyMessageOperationsTest : RobolectricTest() { private val copyMessageOperations = CopyMessageOperations( lockableDatabase, attachmentFileManager, - threadMessageOperations + threadMessageOperations, ) @After @@ -43,7 +43,7 @@ class CopyMessageOperationsTest : RobolectricTest() { dataLocation = DataLocation.CHILD_PART_CONTAINS_DATA, mimeType = "multipart/mixed", boundary = "--boundary", - header = "Message-ID: \nIn-Reply-To: \n".crlf() + header = "Message-ID: \nIn-Reply-To: \n".crlf(), ) val sourceMessagePartId2 = sqliteDatabase.createMessagePart( seq = 1, @@ -51,14 +51,14 @@ class CopyMessageOperationsTest : RobolectricTest() { parent = sourceMessagePartId1, mimeType = "text/plain", dataLocation = DataLocation.IN_DATABASE, - data = "Text part".toByteArray() + data = "Text part".toByteArray(), ) val sourceMessagePartId3 = sqliteDatabase.createMessagePart( seq = 2, root = sourceMessagePartId1, parent = sourceMessagePartId1, mimeType = "application/octet-stream", - dataLocation = DataLocation.ON_DISK + dataLocation = DataLocation.ON_DISK, ) attachmentFileManager.getAttachmentFile(sourceMessagePartId3).sink().buffer().use { sink -> sink.writeUtf8("Part contents") @@ -67,18 +67,18 @@ class CopyMessageOperationsTest : RobolectricTest() { val messageId1 = sqliteDatabase.createMessage( folderId = 1, empty = true, - messageIdHeader = "" + messageIdHeader = "", ) val messageId2 = sqliteDatabase.createMessage( folderId = 1, empty = false, messageIdHeader = "", - messagePartId = sourceMessagePartId1 + messagePartId = sourceMessagePartId1, ) val messageId3 = sqliteDatabase.createMessage( folderId = 1, empty = false, - messageIdHeader = "" + messageIdHeader = "", ) val threadId1 = sqliteDatabase.createThread(messageId1) val threadId2 = sqliteDatabase.createThread(messageId2, root = threadId1, parent = threadId1) @@ -113,8 +113,8 @@ class CopyMessageOperationsTest : RobolectricTest() { id = destinationMessageId, uid = destinationMessage.uid, folderId = 2, - messagePartId = destinationMessage.messagePartId - ) + messagePartId = destinationMessage.messagePartId, + ), ) val messageParts = sqliteDatabase.readMessageParts() @@ -131,24 +131,24 @@ class CopyMessageOperationsTest : RobolectricTest() { sourceMessagePart1.copy( id = destinationMessagePart1.id, root = destinationMessagePart1.id, - parent = -1 - ) + parent = -1, + ), ) assertThat(destinationMessagePart2).isNotIn(setOf(sourceMessagePart1, sourceMessagePart2, sourceMessagePart3)) assertThat(destinationMessagePart2).isEqualTo( sourceMessagePart2.copy( id = destinationMessagePart2.id, root = destinationMessagePart1.id, - parent = destinationMessagePart1.id - ) + parent = destinationMessagePart1.id, + ), ) assertThat(destinationMessagePart3).isNotIn(setOf(sourceMessagePart1, sourceMessagePart2, sourceMessagePart3)) assertThat(destinationMessagePart3).isEqualTo( sourceMessagePart3.copy( id = destinationMessagePart3.id, root = destinationMessagePart1.id, - parent = destinationMessagePart1.id - ) + parent = destinationMessagePart1.id, + ), ) val files = messagePartDirectory.list()?.toList() ?: emptyList() @@ -165,7 +165,7 @@ class CopyMessageOperationsTest : RobolectricTest() { header = "Message-ID: \nIn-Reply-To: \n".crlf(), mimeType = "text/plain", dataLocation = DataLocation.IN_DATABASE, - data = "Text part".toByteArray() + data = "Text part".toByteArray(), ) attachmentFileManager.getAttachmentFile(sourceMessagePartId).sink().buffer().use { sink -> sink.writeUtf8("Part contents") @@ -175,23 +175,23 @@ class CopyMessageOperationsTest : RobolectricTest() { folderId = 1, empty = false, messageIdHeader = "", - messagePartId = sourceMessagePartId + messagePartId = sourceMessagePartId, ) val destinationMessageId = sqliteDatabase.createMessage( folderId = 2, empty = true, - messageIdHeader = "" + messageIdHeader = "", ) val otherDestinationMessageId = sqliteDatabase.createMessage( folderId = 2, empty = false, - messageIdHeader = "" + messageIdHeader = "", ) val destinationThreadId = sqliteDatabase.createThread(destinationMessageId) val otherDestinationThreadId = sqliteDatabase.createThread( otherDestinationMessageId, root = destinationThreadId, - parent = destinationThreadId + parent = destinationThreadId, ) val resultMessageId = copyMessageOperations.copyMessage(messageId = sourceMessageId, destinationFolderId = 2) @@ -228,8 +228,8 @@ class CopyMessageOperationsTest : RobolectricTest() { id = destinationMessageId, uid = destinationMessage.uid, folderId = 2, - messagePartId = destinationMessage.messagePartId - ) + messagePartId = destinationMessage.messagePartId, + ), ) val messageParts = sqliteDatabase.readMessageParts() @@ -241,8 +241,8 @@ class CopyMessageOperationsTest : RobolectricTest() { sourceMessagePart.copy( id = destinationMessagePart.id, root = destinationMessagePart.id, - parent = -1 - ) + parent = -1, + ), ) } } diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/CreateFolderOperationsTest.kt b/app/storage/src/test/java/com/fsck/k9/storage/messages/CreateFolderOperationsTest.kt index eae3a8e2e26..92c483e85d8 100644 --- a/app/storage/src/test/java/com/fsck/k9/storage/messages/CreateFolderOperationsTest.kt +++ b/app/storage/src/test/java/com/fsck/k9/storage/messages/CreateFolderOperationsTest.kt @@ -28,10 +28,10 @@ class CreateFolderOperationsTest : RobolectricTest() { notifyClass = FolderClass.NO_CLASS, pushClass = FolderClass.NO_CLASS, inTopGroup = true, - integrate = false - ) - ) - ) + integrate = false, + ), + ), + ), ) val folders = sqliteDatabase.readFolders() @@ -55,8 +55,8 @@ class CreateFolderOperationsTest : RobolectricTest() { listOf( createCreateFolderInfo(serverId = "folder1", name = "Inbox"), createCreateFolderInfo(serverId = "folder2", name = "Sent"), - createCreateFolderInfo(serverId = "folder3", name = "Trash") - ) + createCreateFolderInfo(serverId = "folder3", name = "Trash"), + ), ) val folders = sqliteDatabase.readFolders() @@ -65,8 +65,8 @@ class CreateFolderOperationsTest : RobolectricTest() { setOf( "folder1" to "Inbox", "folder2" to "Sent", - "folder3" to "Trash" - ) + "folder3" to "Trash", + ), ) } @@ -82,8 +82,8 @@ class CreateFolderOperationsTest : RobolectricTest() { notifyClass = FolderClass.INHERITED, pushClass = FolderClass.NO_CLASS, inTopGroup = false, - integrate = false - ) + integrate = false, + ), ) } } diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/DeleteMessageOperationsTest.kt b/app/storage/src/test/java/com/fsck/k9/storage/messages/DeleteMessageOperationsTest.kt index 2657d1ea5b4..239f357e465 100644 --- a/app/storage/src/test/java/com/fsck/k9/storage/messages/DeleteMessageOperationsTest.kt +++ b/app/storage/src/test/java/com/fsck/k9/storage/messages/DeleteMessageOperationsTest.kt @@ -34,19 +34,19 @@ class DeleteMessageOperationsTest : RobolectricTest() { folderId = folderId, uid = "empty1", empty = true, - messageIdHeader = "msg001@domain.example" + messageIdHeader = "msg001@domain.example", ) val messageId2 = sqliteDatabase.createMessage( folderId = folderId, uid = "empty2", empty = true, - messageIdHeader = "msg002@domain.example" + messageIdHeader = "msg002@domain.example", ) val messageId3 = sqliteDatabase.createMessage( folderId = folderId, uid = "delete", empty = false, - messageIdHeader = "msg003@domain.example" + messageIdHeader = "msg003@domain.example", ) val threadId1 = sqliteDatabase.createThread(messageId = messageId1) val threadId2 = sqliteDatabase.createThread(messageId = messageId2, root = threadId1, parent = threadId1) @@ -65,19 +65,19 @@ class DeleteMessageOperationsTest : RobolectricTest() { folderId = folderId, uid = "empty", empty = true, - messageIdHeader = "msg001@domain.example" + messageIdHeader = "msg001@domain.example", ) val messageId2 = sqliteDatabase.createMessage( folderId = folderId, uid = "child1", empty = false, - messageIdHeader = "msg002@domain.example" + messageIdHeader = "msg002@domain.example", ) val messageId3 = sqliteDatabase.createMessage( folderId = folderId, uid = "delete", empty = false, - messageIdHeader = "msg003@domain.example" + messageIdHeader = "msg003@domain.example", ) val threadId1 = sqliteDatabase.createThread(messageId = messageId1) val threadId2 = sqliteDatabase.createThread(messageId = messageId2, root = threadId1, parent = threadId1) @@ -101,13 +101,13 @@ class DeleteMessageOperationsTest : RobolectricTest() { folderId = folderId, uid = "parent", empty = false, - messageIdHeader = "msg001@domain.example" + messageIdHeader = "msg001@domain.example", ) val messageId2 = sqliteDatabase.createMessage( folderId = folderId, uid = "delete", empty = false, - messageIdHeader = "msg002@domain.example" + messageIdHeader = "msg002@domain.example", ) val threadId1 = sqliteDatabase.createThread(messageId = messageId1) sqliteDatabase.createThread(messageId = messageId2, root = threadId1, parent = threadId1) @@ -130,7 +130,7 @@ class DeleteMessageOperationsTest : RobolectricTest() { folderId = folderId, uid = "delete", empty = false, - messageIdHeader = "msg001@domain.example" + messageIdHeader = "msg001@domain.example", ) sqliteDatabase.createThread(messageId = messageId1) @@ -147,13 +147,13 @@ class DeleteMessageOperationsTest : RobolectricTest() { folderId = folderId, uid = "delete", empty = false, - messageIdHeader = "msg001@domain.example" + messageIdHeader = "msg001@domain.example", ) val messageId2 = sqliteDatabase.createMessage( folderId = folderId, uid = "child", empty = false, - messageIdHeader = "msg002@domain.example" + messageIdHeader = "msg002@domain.example", ) val threadId1 = sqliteDatabase.createThread(messageId = messageId1) val threadId2 = sqliteDatabase.createThread(messageId = messageId2, root = threadId1, parent = threadId1) diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/FolderHelpers.kt b/app/storage/src/test/java/com/fsck/k9/storage/messages/FolderHelpers.kt index 56d6165496f..6e142bd2a15 100644 --- a/app/storage/src/test/java/com/fsck/k9/storage/messages/FolderHelpers.kt +++ b/app/storage/src/test/java/com/fsck/k9/storage/messages/FolderHelpers.kt @@ -23,7 +23,7 @@ fun SQLiteDatabase.createFolder( visibleLimit: Int = 25, status: String? = null, flaggedCount: Int = 0, - moreMessages: String = "unknown" + moreMessages: String = "unknown", ): Long { val values = ContentValues().apply { put("name", name) @@ -68,7 +68,7 @@ fun SQLiteDatabase.readFolders(): List { visibleLimit = cursor.getIntOrNull("visible_limit"), status = cursor.getStringOrNull("status"), flaggedCount = cursor.getIntOrNull("flagged_count"), - moreMessages = cursor.getStringOrNull("more_messages") + moreMessages = cursor.getStringOrNull("more_messages"), ) } } @@ -91,5 +91,5 @@ data class FolderEntry( val visibleLimit: Int?, val status: String?, val flaggedCount: Int?, - val moreMessages: String? + val moreMessages: String?, ) diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/KeyValueHelpers.kt b/app/storage/src/test/java/com/fsck/k9/storage/messages/KeyValueHelpers.kt index e7755e31e20..64098cfd3cf 100644 --- a/app/storage/src/test/java/com/fsck/k9/storage/messages/KeyValueHelpers.kt +++ b/app/storage/src/test/java/com/fsck/k9/storage/messages/KeyValueHelpers.kt @@ -9,7 +9,7 @@ import com.fsck.k9.helper.map fun SQLiteDatabase.createExtraValue( name: String = "irrelevant", text: String? = null, - number: Long? = null + number: Long? = null, ): Long { val values = ContentValues().apply { put("name", name) @@ -27,7 +27,7 @@ fun SQLiteDatabase.readExtraValues(): List { ExtraValueEntry( name = cursor.getStringOrNull("name"), text = cursor.getStringOrNull("value_text"), - number = cursor.getLongOrNull("value_integer") + number = cursor.getLongOrNull("value_integer"), ) } } @@ -36,14 +36,14 @@ fun SQLiteDatabase.readExtraValues(): List { data class ExtraValueEntry( val name: String?, val text: String?, - val number: Long? + val number: Long?, ) fun SQLiteDatabase.createFolderExtraValue( folderId: Long, name: String = "irrelevant", text: String? = null, - number: Long? = null + number: Long? = null, ): Long { val values = ContentValues().apply { put("folder_id", folderId) @@ -63,7 +63,7 @@ fun SQLiteDatabase.readFolderExtraValues(): List { folderId = cursor.getLongOrNull("folder_id"), name = cursor.getStringOrNull("name"), text = cursor.getStringOrNull("value_text"), - number = cursor.getLongOrNull("value_integer") + number = cursor.getLongOrNull("value_integer"), ) } } @@ -73,5 +73,5 @@ data class FolderExtraValueEntry( val folderId: Long?, val name: String?, val text: String?, - val number: Long? + val number: Long?, ) diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/KeyValueStoreOperationsTest.kt b/app/storage/src/test/java/com/fsck/k9/storage/messages/KeyValueStoreOperationsTest.kt index 9d2980fd260..6bb144ec862 100644 --- a/app/storage/src/test/java/com/fsck/k9/storage/messages/KeyValueStoreOperationsTest.kt +++ b/app/storage/src/test/java/com/fsck/k9/storage/messages/KeyValueStoreOperationsTest.kt @@ -35,8 +35,8 @@ class KeyValueStoreOperationsTest : RobolectricTest() { ExtraValueEntry( name = "jmapState", text = "ABC42", - number = null - ) + number = null, + ), ) } @@ -52,8 +52,8 @@ class KeyValueStoreOperationsTest : RobolectricTest() { ExtraValueEntry( name = "jmapState", text = "ABC42", - number = null - ) + number = null, + ), ) } @@ -83,8 +83,8 @@ class KeyValueStoreOperationsTest : RobolectricTest() { ExtraValueEntry( name = "lastChanged", text = null, - number = 123L - ) + number = 123L, + ), ) } @@ -100,8 +100,8 @@ class KeyValueStoreOperationsTest : RobolectricTest() { ExtraValueEntry( name = "lastChanged", text = null, - number = 42 - ) + number = 42, + ), ) } @@ -132,8 +132,8 @@ class KeyValueStoreOperationsTest : RobolectricTest() { folderId = 1, name = "imapUidValidity", text = "1", - number = null - ) + number = null, + ), ) } @@ -150,8 +150,8 @@ class KeyValueStoreOperationsTest : RobolectricTest() { folderId = 1, name = "imapUidValidity", text = "42", - number = null - ) + number = null, + ), ) } @@ -182,8 +182,8 @@ class KeyValueStoreOperationsTest : RobolectricTest() { folderId = 1, name = "lastChanged", text = null, - number = 123L - ) + number = 123L, + ), ) } @@ -200,8 +200,8 @@ class KeyValueStoreOperationsTest : RobolectricTest() { folderId = 1, name = "lastChanged", text = null, - number = 42 - ) + number = 42, + ), ) } } diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/MessageDatabaseHelpers.kt b/app/storage/src/test/java/com/fsck/k9/storage/messages/MessageDatabaseHelpers.kt index 0c9bbf74a31..cf9c82f7cde 100644 --- a/app/storage/src/test/java/com/fsck/k9/storage/messages/MessageDatabaseHelpers.kt +++ b/app/storage/src/test/java/com/fsck/k9/storage/messages/MessageDatabaseHelpers.kt @@ -63,7 +63,7 @@ fun SQLiteDatabase.createMessage( forwarded: Boolean = false, messagePartId: Long = 0L, encryptionType: String? = null, - newMessage: Boolean = false + newMessage: Boolean = false, ): Long { val values = ContentValues().apply { put("deleted", if (deleted) 1 else 0) @@ -128,7 +128,7 @@ fun SQLiteDatabase.readMessages(): List { forwarded = cursor.getIntOrNull("forwarded"), messagePartId = cursor.getLongOrNull("message_part_id"), encryptionType = cursor.getStringOrNull("encryption_type"), - newMessage = cursor.getIntOrNull("new_message") + newMessage = cursor.getIntOrNull("new_message"), ) } } @@ -161,7 +161,7 @@ data class MessageEntry( val forwarded: Int?, val messagePartId: Long?, val encryptionType: String?, - val newMessage: Int? + val newMessage: Int?, ) fun SQLiteDatabase.createMessagePart( @@ -182,7 +182,7 @@ fun SQLiteDatabase.createMessagePart( boundary: String? = null, contentId: String? = null, serverExtra: String? = null, - directory: File? = null + directory: File? = null, ): Long { val values = ContentValues().apply { put("type", type) diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/MessagePartDatabaseHelpers.kt b/app/storage/src/test/java/com/fsck/k9/storage/messages/MessagePartDatabaseHelpers.kt index d155a0b4e8c..78e31c1c4dc 100644 --- a/app/storage/src/test/java/com/fsck/k9/storage/messages/MessagePartDatabaseHelpers.kt +++ b/app/storage/src/test/java/com/fsck/k9/storage/messages/MessagePartDatabaseHelpers.kt @@ -25,7 +25,7 @@ fun SQLiteDatabase.createMessagePart( epilogue: String? = null, boundary: String? = null, contentId: String? = null, - serverExtra: String? = null + serverExtra: String? = null, ): Long { val values = ContentValues().apply { put("type", type) @@ -71,7 +71,7 @@ fun SQLiteDatabase.readMessageParts(): List { epilogue = cursor.getStringOrNull("epilogue"), boundary = cursor.getStringOrNull("boundary"), contentId = cursor.getStringOrNull("content_id"), - serverExtra = cursor.getStringOrNull("server_extra") + serverExtra = cursor.getStringOrNull("server_extra"), ) } } @@ -95,7 +95,7 @@ data class MessagePartEntry( val epilogue: String?, val boundary: String?, val contentId: String?, - val serverExtra: String? + val serverExtra: String?, ) { override fun equals(other: Any?): Boolean { if (this === other) return true diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/MoveMessageOperationsTest.kt b/app/storage/src/test/java/com/fsck/k9/storage/messages/MoveMessageOperationsTest.kt index aab8a9a6273..185884a4448 100644 --- a/app/storage/src/test/java/com/fsck/k9/storage/messages/MoveMessageOperationsTest.kt +++ b/app/storage/src/test/java/com/fsck/k9/storage/messages/MoveMessageOperationsTest.kt @@ -21,14 +21,14 @@ class MoveMessageOperationsTest : RobolectricTest() { folderId = SOURCE_FOLDER_ID, uid = "uid1", subject = "Move me", - messageIdHeader = MESSAGE_ID_HEADER + messageIdHeader = MESSAGE_ID_HEADER, ) sqliteDatabase.createThread(messageId = originalMessageId) val originalMessage = sqliteDatabase.readMessages().first() val destinationMessageId = moveMessageOperations.moveMessage( messageId = originalMessageId, - destinationFolderId = DESTINATION_FOLDER_ID + destinationFolderId = DESTINATION_FOLDER_ID, ) val messages = sqliteDatabase.readMessages() @@ -48,8 +48,8 @@ class MoveMessageOperationsTest : RobolectricTest() { folderId = DESTINATION_FOLDER_ID, uid = destinationMessage.uid, deleted = 0, - empty = 0 - ) + empty = 0, + ), ) val threads = sqliteDatabase.readThreads() @@ -71,7 +71,7 @@ class MoveMessageOperationsTest : RobolectricTest() { uid = "uid1", subject = "Move me", messageIdHeader = MESSAGE_ID_HEADER, - read = false + read = false, ) sqliteDatabase.createThread(messageId = originalMessageId) val originalMessage = sqliteDatabase.readMessages().first() @@ -79,23 +79,23 @@ class MoveMessageOperationsTest : RobolectricTest() { empty = true, folderId = DESTINATION_FOLDER_ID, messageIdHeader = MESSAGE_ID_HEADER, - uid = "" + uid = "", ) val placeholderThreadId = sqliteDatabase.createThread(messageId = placeholderMessageId) val childMessageId = sqliteDatabase.createMessage( folderId = DESTINATION_FOLDER_ID, messageIdHeader = "", - uid = "uid2" + uid = "uid2", ) sqliteDatabase.createThread( messageId = childMessageId, root = placeholderThreadId, - parent = placeholderThreadId + parent = placeholderThreadId, ) val destinationMessageId = moveMessageOperations.moveMessage( messageId = originalMessageId, - destinationFolderId = DESTINATION_FOLDER_ID + destinationFolderId = DESTINATION_FOLDER_ID, ) val messages = sqliteDatabase.readMessages() @@ -115,8 +115,8 @@ class MoveMessageOperationsTest : RobolectricTest() { folderId = DESTINATION_FOLDER_ID, uid = destinationMessage.uid, deleted = 0, - empty = 0 - ) + empty = 0, + ), ) val threads = sqliteDatabase.readThreads() @@ -141,14 +141,14 @@ class MoveMessageOperationsTest : RobolectricTest() { folderId = SOURCE_FOLDER_ID, uid = "uid1", subject = "Move me", - messageIdHeader = null + messageIdHeader = null, ) sqliteDatabase.createThread(messageId = originalMessageId) val originalMessage = sqliteDatabase.readMessages().first() val destinationMessageId = moveMessageOperations.moveMessage( messageId = originalMessageId, - destinationFolderId = DESTINATION_FOLDER_ID + destinationFolderId = DESTINATION_FOLDER_ID, ) val messages = sqliteDatabase.readMessages() @@ -167,8 +167,8 @@ class MoveMessageOperationsTest : RobolectricTest() { folderId = DESTINATION_FOLDER_ID, uid = destinationMessage.uid, deleted = 0, - empty = 0 - ) + empty = 0, + ), ) val threads = sqliteDatabase.readThreads() diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/RetrieveFolderOperationsTest.kt b/app/storage/src/test/java/com/fsck/k9/storage/messages/RetrieveFolderOperationsTest.kt index 41d1e9006a4..04644b55c6b 100644 --- a/app/storage/src/test/java/com/fsck/k9/storage/messages/RetrieveFolderOperationsTest.kt +++ b/app/storage/src/test/java/com/fsck/k9/storage/messages/RetrieveFolderOperationsTest.kt @@ -30,7 +30,7 @@ class RetrieveFolderOperationsTest : RobolectricTest() { displayClass = "FIRST_CLASS", syncClass = "FIRST_CLASS", notifyClass = "NO_CLASS", - pushClass = "NO_CLASS" + pushClass = "NO_CLASS", ) val result = retrieveFolderOperations.getFolder(folderId) { folder -> @@ -64,7 +64,7 @@ class RetrieveFolderOperationsTest : RobolectricTest() { displayClass = FolderClass.FIRST_CLASS.name, syncClass = null, notifyClass = null, - pushClass = null + pushClass = null, ) val result = retrieveFolderOperations.getFolder(folderId) { folder -> @@ -104,7 +104,7 @@ class RetrieveFolderOperationsTest : RobolectricTest() { displayClass = "FIRST_CLASS", syncClass = "FIRST_CLASS", notifyClass = "NO_CLASS", - pushClass = "NO_CLASS" + pushClass = "NO_CLASS", ) val result = retrieveFolderOperations.getFolder("folder1") { folder -> @@ -144,7 +144,7 @@ class RetrieveFolderOperationsTest : RobolectricTest() { displayClass = "FIRST_CLASS", syncClass = "FIRST_CLASS", notifyClass = "NO_CLASS", - pushClass = "NO_CLASS" + pushClass = "NO_CLASS", ) val result = retrieveFolderOperations.getFolders { folder -> @@ -170,7 +170,7 @@ class RetrieveFolderOperationsTest : RobolectricTest() { val (folderId1, _, folderId3) = listOf( sqliteDatabase.createFolder(name = "Folder 1", isLocalOnly = false), sqliteDatabase.createFolder(name = "Folder 2", isLocalOnly = true), - sqliteDatabase.createFolder(name = "Folder 3", isLocalOnly = false) + sqliteDatabase.createFolder(name = "Folder 3", isLocalOnly = false), ) val result = retrieveFolderOperations.getFolders(excludeLocalOnly = true) { folder -> @@ -180,8 +180,8 @@ class RetrieveFolderOperationsTest : RobolectricTest() { assertThat(result).isEqualTo( listOf( folderId1 to "Folder 1", - folderId3 to "Folder 3" - ) + folderId3 to "Folder 3", + ), ) } @@ -197,12 +197,12 @@ class RetrieveFolderOperationsTest : RobolectricTest() { val (folderId1, folderId2, _) = listOf( sqliteDatabase.createFolder(name = "Folder 1", displayClass = "FIRST_CLASS"), sqliteDatabase.createFolder(name = "Folder 2", displayClass = "SECOND_CLASS"), - sqliteDatabase.createFolder(name = "Folder 3", displayClass = "NO_CLASS") + sqliteDatabase.createFolder(name = "Folder 3", displayClass = "NO_CLASS"), ) val result = retrieveFolderOperations.getDisplayFolders( displayMode = FolderMode.FIRST_CLASS, - outboxFolderId = folderId2 + outboxFolderId = folderId2, ) { folder -> folder.id to folder.name } @@ -215,12 +215,12 @@ class RetrieveFolderOperationsTest : RobolectricTest() { val (folderId1, _, folderId3) = listOf( sqliteDatabase.createFolder(name = "Folder 1", displayClass = "FIRST_CLASS"), sqliteDatabase.createFolder(name = "Folder 2", displayClass = "SECOND_CLASS"), - sqliteDatabase.createFolder(name = "Folder 3", displayClass = "NO_CLASS") + sqliteDatabase.createFolder(name = "Folder 3", displayClass = "NO_CLASS"), ) val result = retrieveFolderOperations.getDisplayFolders( displayMode = FolderMode.NOT_SECOND_CLASS, - outboxFolderId = folderId1 + outboxFolderId = folderId1, ) { folder -> folder.id to folder.name } @@ -228,8 +228,8 @@ class RetrieveFolderOperationsTest : RobolectricTest() { assertThat(result).isEqualTo( listOf( folderId1 to "Folder 1", - folderId3 to "Folder 3" - ) + folderId3 to "Folder 3", + ), ) } @@ -238,12 +238,12 @@ class RetrieveFolderOperationsTest : RobolectricTest() { val (folderId1, folderId2, _) = listOf( sqliteDatabase.createFolder(name = "Folder 1", displayClass = "FIRST_CLASS"), sqliteDatabase.createFolder(name = "Folder 2", displayClass = "SECOND_CLASS"), - sqliteDatabase.createFolder(name = "Folder 3", displayClass = "NO_CLASS") + sqliteDatabase.createFolder(name = "Folder 3", displayClass = "NO_CLASS"), ) val result = retrieveFolderOperations.getDisplayFolders( displayMode = FolderMode.FIRST_AND_SECOND_CLASS, - outboxFolderId = folderId1 + outboxFolderId = folderId1, ) { folder -> folder.id to folder.name } @@ -251,8 +251,8 @@ class RetrieveFolderOperationsTest : RobolectricTest() { assertThat(result).isEqualTo( listOf( folderId1 to "Folder 1", - folderId2 to "Folder 2" - ) + folderId2 to "Folder 2", + ), ) } @@ -262,7 +262,7 @@ class RetrieveFolderOperationsTest : RobolectricTest() { sqliteDatabase.createFolder(name = "Folder 1", displayClass = "FIRST_CLASS"), sqliteDatabase.createFolder(name = "Folder 2", displayClass = "SECOND_CLASS"), sqliteDatabase.createFolder(name = "Folder 3", displayClass = "FIRST_CLASS"), - sqliteDatabase.createFolder(name = "Folder 4", displayClass = "NO_CLASS") + sqliteDatabase.createFolder(name = "Folder 4", displayClass = "NO_CLASS"), ) sqliteDatabase.createMessage(uid = "msg1", folderId = folderId1, read = true) sqliteDatabase.createMessage(uid = "msg2", folderId = folderId2, read = true) @@ -272,7 +272,7 @@ class RetrieveFolderOperationsTest : RobolectricTest() { val result = retrieveFolderOperations.getDisplayFolders( displayMode = FolderMode.ALL, - outboxFolderId = folderId2 + outboxFolderId = folderId2, ) { folder -> Triple(folder.id, folder.name, folder.unreadMessageCount) } @@ -283,8 +283,8 @@ class RetrieveFolderOperationsTest : RobolectricTest() { Triple(folderId1, "Folder 1", 0), Triple(folderId2, "Folder 2", 1), Triple(folderId3, "Folder 3", 2), - Triple(folderId4, "Folder 4", 0) - ) + Triple(folderId4, "Folder 4", 0), + ), ) } @@ -292,7 +292,7 @@ class RetrieveFolderOperationsTest : RobolectricTest() { fun `get folder id`() { val (_, folderId2) = listOf( sqliteDatabase.createFolder(serverId = "folder1"), - sqliteDatabase.createFolder(serverId = "folder2") + sqliteDatabase.createFolder(serverId = "folder2"), ) val result = retrieveFolderOperations.getFolderId(folderServerId = "folder2") @@ -311,7 +311,7 @@ class RetrieveFolderOperationsTest : RobolectricTest() { fun `get folder server id`() { val (_, folderId2) = listOf( sqliteDatabase.createFolder(serverId = "folder1"), - sqliteDatabase.createFolder(serverId = "folder2") + sqliteDatabase.createFolder(serverId = "folder2"), ) val result = retrieveFolderOperations.getFolderServerId(folderId2) diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/RetrieveMessageListOperationsTest.kt b/app/storage/src/test/java/com/fsck/k9/storage/messages/RetrieveMessageListOperationsTest.kt index 45b62c19d59..651d4293cca 100644 --- a/app/storage/src/test/java/com/fsck/k9/storage/messages/RetrieveMessageListOperationsTest.kt +++ b/app/storage/src/test/java/com/fsck/k9/storage/messages/RetrieveMessageListOperationsTest.kt @@ -51,7 +51,7 @@ class RetrieveMessageListOperationsTest : RobolectricTest() { read = true, flagged = true, answered = true, - forwarded = true + forwarded = true, ) val threadId = sqliteDatabase.createThread(messageId) @@ -119,7 +119,7 @@ class RetrieveMessageListOperationsTest : RobolectricTest() { val result = retrieveMessageListOperations.getThreadedMessages( selection = "folder_id = ? AND read = 0", selectionArgs = arrayOf(folderId.toString()), - sortOrder = "date DESC, id DESC" + sortOrder = "date DESC, id DESC", ) { message -> message.id } @@ -165,7 +165,7 @@ class RetrieveMessageListOperationsTest : RobolectricTest() { read = true, flagged = true, answered = true, - forwarded = true + forwarded = true, ) val threadId = sqliteDatabase.createThread(messageId) @@ -219,14 +219,14 @@ class RetrieveMessageListOperationsTest : RobolectricTest() { folderId, uid = "uid1", date = 1000L, - internalDate = 1001L + internalDate = 1001L, ) val threadId1 = sqliteDatabase.createThread(messageId1) val messageId2 = sqliteDatabase.createMessage( folderId, uid = "uid2", date = 2000L, - internalDate = 2001L + internalDate = 2001L, ) sqliteDatabase.createThread(messageId2, root = threadId1) @@ -471,7 +471,7 @@ class RetrieveMessageListOperationsTest : RobolectricTest() { selection = "folder_id = ?", selectionArgs = arrayOf(folderId.toString()), sortOrder = "date DESC, id DESC", - mapper + mapper, ) } @@ -480,7 +480,7 @@ class RetrieveMessageListOperationsTest : RobolectricTest() { selection = "folder_id = ?", selectionArgs = arrayOf(folderId.toString()), sortOrder = "date DESC, id DESC", - mapper + mapper, ) } } diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/RetrieveMessageOperationsTest.kt b/app/storage/src/test/java/com/fsck/k9/storage/messages/RetrieveMessageOperationsTest.kt index 09246c3cb30..2b7f1ca9ca4 100644 --- a/app/storage/src/test/java/com/fsck/k9/storage/messages/RetrieveMessageOperationsTest.kt +++ b/app/storage/src/test/java/com/fsck/k9/storage/messages/RetrieveMessageOperationsTest.kt @@ -46,8 +46,8 @@ class RetrieveMessageOperationsTest : RobolectricTest() { messageId1 to "uid1", messageId2 to "uid2", messageId3 to "uid3", - messageId4 to "uid4" - ) + messageId4 to "uid4", + ), ) } @@ -91,7 +91,7 @@ class RetrieveMessageOperationsTest : RobolectricTest() { read = true, flagged = true, answered = true, - forwarded = true + forwarded = true, ) val flags = retrieveMessageOperations.getMessageFlags(folderId = 1, messageServerId = "uid1") @@ -113,8 +113,8 @@ class RetrieveMessageOperationsTest : RobolectricTest() { Flag.X_REMOTE_COPY_STARTED, Flag.X_MIGRATED_FROM_V50, Flag.X_DRAFT_OPENPGP_INLINE, - Flag.X_SUBJECT_DECRYPTED - ) + Flag.X_SUBJECT_DECRYPTED, + ), ) } @@ -139,8 +139,8 @@ class RetrieveMessageOperationsTest : RobolectricTest() { assertThat(result).isEqualTo( mapOf( "uid1" to 23L, - "uid3" to 42L - ) + "uid3" to 42L, + ), ) } @@ -153,7 +153,7 @@ class RetrieveMessageOperationsTest : RobolectricTest() { Date: Thu, 01 Apr 2021 01:23:45 +0200 Subject: Test Message-Id: <20210401012345.123456789A@domain.example> - """.trimIndent().crlf() + """.trimIndent().crlf(), ) sqliteDatabase.createMessage(folderId = 1, uid = "uid1", messagePartId = messagePartId) @@ -165,8 +165,8 @@ class RetrieveMessageOperationsTest : RobolectricTest() { Header("To", "Bob "), Header("Date", "Thu, 01 Apr 2021 01:23:45 +0200"), Header("Subject", "Test"), - Header("Message-Id", "<20210401012345.123456789A@domain.example>") - ) + Header("Message-Id", "<20210401012345.123456789A@domain.example>"), + ), ) } @@ -179,22 +179,22 @@ class RetrieveMessageOperationsTest : RobolectricTest() { Date: Thu, 01 Apr 2021 01:23:45 +0200 Subject: Test Message-Id: <20210401012345.123456789A@domain.example> - """.trimIndent().crlf() + """.trimIndent().crlf(), ) sqliteDatabase.createMessage(folderId = 1, uid = "uid1", messagePartId = messagePartId) val headers = retrieveMessageOperations.getHeaders( folderId = 1, messageServerId = "uid1", - headerNames = setOf("from", "to", "message-id") + headerNames = setOf("from", "to", "message-id"), ) assertThat(headers).isEqualTo( listOf( Header("From", ""), Header("To", "Bob "), - Header("Message-Id", "<20210401012345.123456789A@domain.example>") - ) + Header("Message-Id", "<20210401012345.123456789A@domain.example>"), + ), ) } diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/SaveMessageOperationsTest.kt b/app/storage/src/test/java/com/fsck/k9/storage/messages/SaveMessageOperationsTest.kt index 76c36728e88..765ba66a400 100644 --- a/app/storage/src/test/java/com/fsck/k9/storage/messages/SaveMessageOperationsTest.kt +++ b/app/storage/src/test/java/com/fsck/k9/storage/messages/SaveMessageOperationsTest.kt @@ -39,7 +39,7 @@ class SaveMessageOperationsTest : RobolectricTest() { lockableDatabase, attachmentFileManager, basicPartInfoExtractor, - threadMessageOperations + threadMessageOperations, ) @After @@ -64,7 +64,7 @@ class SaveMessageOperationsTest : RobolectricTest() { setFlag(Flag.ANSWERED, true) setFlag(Flag.FORWARDED, true) }.toSaveMessageData( - previewResult = PreviewResult.text("Preview") + previewResult = PreviewResult.text("Preview"), ) saveMessageOperations.saveRemoteMessage(folderId = 1, messageServerId = "uid1", messageData) @@ -218,17 +218,17 @@ class SaveMessageOperationsTest : RobolectricTest() { val messageId1 = sqliteDatabase.createMessage( folderId = 1, empty = true, - messageIdHeader = "" + messageIdHeader = "", ) val messageId2 = sqliteDatabase.createMessage( folderId = 1, empty = true, - messageIdHeader = "" + messageIdHeader = "", ) val messageId3 = sqliteDatabase.createMessage( folderId = 1, empty = false, - messageIdHeader = "" + messageIdHeader = "", ) val threadId1 = sqliteDatabase.createThread(messageId1) val threadId2 = sqliteDatabase.createThread(messageId2, root = threadId1, parent = threadId1) @@ -250,8 +250,8 @@ class SaveMessageOperationsTest : RobolectricTest() { id = threadId1, messageId = messageId1, root = threadId1, - parent = null - ) + parent = null, + ), ) assertThat(threads.first { it.id == threadId2 }).isEqualTo( @@ -259,8 +259,8 @@ class SaveMessageOperationsTest : RobolectricTest() { id = threadId2, messageId = messageId2, root = threadId1, - parent = threadId1 - ) + parent = threadId1, + ), ) assertThat(threads.first { it.id == threadId3 }).isEqualTo( @@ -268,8 +268,8 @@ class SaveMessageOperationsTest : RobolectricTest() { id = threadId3, messageId = messageId3, root = threadId1, - parent = threadId2 - ) + parent = threadId2, + ), ) } @@ -368,7 +368,7 @@ class SaveMessageOperationsTest : RobolectricTest() { subject = "Provided subject", date = 1618191720000L, internalDate = 1618191720000L, - previewResult = PreviewResult.text("Preview") + previewResult = PreviewResult.text("Preview"), ) val newMessageId = saveMessageOperations.saveLocalMessage(folderId = 1, messageData, existingMessageId = null) @@ -451,7 +451,7 @@ class SaveMessageOperationsTest : RobolectricTest() { val existingMessageId = saveMessageOperations.saveLocalMessage( folderId = 1, existingMessageData, - existingMessageId = null + existingMessageId = null, ) val messageData = buildMessage { textBody("new") @@ -505,7 +505,7 @@ class SaveMessageOperationsTest : RobolectricTest() { attachmentCount: Int = 0, previewResult: PreviewResult = PreviewResult.none(), textForSearchIndex: String? = null, - encryptionType: String? = null + encryptionType: String? = null, ): SaveMessageData { return SaveMessageData( message = this, @@ -516,7 +516,7 @@ class SaveMessageOperationsTest : RobolectricTest() { attachmentCount, previewResult, textForSearchIndex, - encryptionType + encryptionType, ) } diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/ThreadDatabaseHelpers.kt b/app/storage/src/test/java/com/fsck/k9/storage/messages/ThreadDatabaseHelpers.kt index 2bde3213176..3b0f3868c0f 100644 --- a/app/storage/src/test/java/com/fsck/k9/storage/messages/ThreadDatabaseHelpers.kt +++ b/app/storage/src/test/java/com/fsck/k9/storage/messages/ThreadDatabaseHelpers.kt @@ -8,7 +8,7 @@ import com.fsck.k9.helper.map fun SQLiteDatabase.createThread( messageId: Long, root: Long? = null, - parent: Long? = null + parent: Long? = null, ): Long { val values = ContentValues().apply { put("message_id", messageId) @@ -26,7 +26,7 @@ fun SQLiteDatabase.readThreads(): List { id = cursor.getLongOrNull("id"), messageId = cursor.getLongOrNull("message_id"), root = cursor.getLongOrNull("root"), - parent = cursor.getLongOrNull("parent") + parent = cursor.getLongOrNull("parent"), ) } } @@ -36,5 +36,5 @@ data class ThreadEntry( val id: Long?, val messageId: Long?, val root: Long?, - val parent: Long? + val parent: Long?, ) diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/ThreadMessageOperationsTest.kt b/app/storage/src/test/java/com/fsck/k9/storage/messages/ThreadMessageOperationsTest.kt index 24c5a89f038..820cb366a44 100644 --- a/app/storage/src/test/java/com/fsck/k9/storage/messages/ThreadMessageOperationsTest.kt +++ b/app/storage/src/test/java/com/fsck/k9/storage/messages/ThreadMessageOperationsTest.kt @@ -13,7 +13,7 @@ class ThreadMessageOperationsTest : RobolectricTest() { val threadInfo = threadMessageOperations.doMessageThreading( sqliteDatabase, folderId = 1, - ThreadHeaders(messageIdHeader = "", inReplyToHeader = null, referencesHeader = null) + ThreadHeaders(messageIdHeader = "", inReplyToHeader = null, referencesHeader = null), ) assertThat(threadInfo).isNull() @@ -29,8 +29,8 @@ class ThreadMessageOperationsTest : RobolectricTest() { ThreadHeaders( messageIdHeader = "", inReplyToHeader = "", - referencesHeader = null - ) + referencesHeader = null, + ), ) val threads = sqliteDatabase.readThreads() @@ -52,8 +52,8 @@ class ThreadMessageOperationsTest : RobolectricTest() { threadId = null, messageId = null, rootId = rootThread.id!!, - parentId = rootThread.id - ) + parentId = rootThread.id, + ), ) } @@ -62,7 +62,7 @@ class ThreadMessageOperationsTest : RobolectricTest() { val messageId = sqliteDatabase.createMessage( folderId = 1, empty = false, - messageIdHeader = "" + messageIdHeader = "", ) val threadId = sqliteDatabase.createThread(messageId) @@ -72,8 +72,8 @@ class ThreadMessageOperationsTest : RobolectricTest() { ThreadHeaders( messageIdHeader = "", inReplyToHeader = "", - referencesHeader = null - ) + referencesHeader = null, + ), ) val threads = sqliteDatabase.readThreads() @@ -87,8 +87,8 @@ class ThreadMessageOperationsTest : RobolectricTest() { threadId = null, messageId = null, rootId = threadId, - parentId = threadId - ) + parentId = threadId, + ), ) } @@ -97,12 +97,12 @@ class ThreadMessageOperationsTest : RobolectricTest() { val messageId1 = sqliteDatabase.createMessage( folderId = 1, empty = true, - messageIdHeader = "" + messageIdHeader = "", ) val messageId2 = sqliteDatabase.createMessage( folderId = 1, empty = false, - messageIdHeader = "" + messageIdHeader = "", ) val threadId1 = sqliteDatabase.createThread(messageId1) sqliteDatabase.createThread(messageId2, root = threadId1, parent = threadId1) @@ -113,8 +113,8 @@ class ThreadMessageOperationsTest : RobolectricTest() { ThreadHeaders( messageIdHeader = "", inReplyToHeader = null, - referencesHeader = null - ) + referencesHeader = null, + ), ) val threads = sqliteDatabase.readThreads() @@ -128,8 +128,8 @@ class ThreadMessageOperationsTest : RobolectricTest() { threadId = threadId1, messageId = messageId1, rootId = threadId1, - parentId = null - ) + parentId = null, + ), ) } @@ -138,17 +138,17 @@ class ThreadMessageOperationsTest : RobolectricTest() { val messageId1 = sqliteDatabase.createMessage( folderId = 1, messageIdHeader = "", - empty = true + empty = true, ) val messageId2 = sqliteDatabase.createMessage( folderId = 1, messageIdHeader = "", - empty = true + empty = true, ) val messageId3 = sqliteDatabase.createMessage( folderId = 1, messageIdHeader = "", - empty = false + empty = false, ) val threadId1 = sqliteDatabase.createThread(messageId1) val threadId2 = sqliteDatabase.createThread(messageId2, root = threadId1, parent = threadId1) @@ -160,8 +160,8 @@ class ThreadMessageOperationsTest : RobolectricTest() { ThreadHeaders( messageIdHeader = "", inReplyToHeader = "", - referencesHeader = " " - ) + referencesHeader = " ", + ), ) val threads = sqliteDatabase.readThreads() @@ -180,8 +180,8 @@ class ThreadMessageOperationsTest : RobolectricTest() { threadId = threadId2, messageId = messageId2, rootId = newRootThread.id!!, - parentId = threadId1 - ) + parentId = threadId1, + ), ) } @@ -190,22 +190,22 @@ class ThreadMessageOperationsTest : RobolectricTest() { val messageIdB = sqliteDatabase.createMessage( folderId = 1, messageIdHeader = "", - empty = true + empty = true, ) val messageIdC = sqliteDatabase.createMessage( folderId = 1, messageIdHeader = "", - empty = false + empty = false, ) val messageIdD = sqliteDatabase.createMessage( folderId = 1, messageIdHeader = "", - empty = true + empty = true, ) val messageIdE = sqliteDatabase.createMessage( folderId = 1, messageIdHeader = "", - empty = false + empty = false, ) val threadIdB = sqliteDatabase.createThread(messageIdB) val threadIdC = sqliteDatabase.createThread(messageIdC, root = threadIdB, parent = threadIdB) @@ -218,8 +218,8 @@ class ThreadMessageOperationsTest : RobolectricTest() { ThreadHeaders( messageIdHeader = "", inReplyToHeader = "", - referencesHeader = "" - ) + referencesHeader = "", + ), ) val threads = sqliteDatabase.readThreads() @@ -255,8 +255,8 @@ class ThreadMessageOperationsTest : RobolectricTest() { threadId = threadIdD, messageId = messageIdD, rootId = threadA.id!!, - parentId = threadIdC - ) + parentId = threadIdC, + ), ) } } diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/UpdateFolderOperationsTest.kt b/app/storage/src/test/java/com/fsck/k9/storage/messages/UpdateFolderOperationsTest.kt index 0f6885977de..3e1a482fa97 100644 --- a/app/storage/src/test/java/com/fsck/k9/storage/messages/UpdateFolderOperationsTest.kt +++ b/app/storage/src/test/java/com/fsck/k9/storage/messages/UpdateFolderOperationsTest.kt @@ -35,7 +35,7 @@ class UpdateFolderOperationsTest : RobolectricTest() { displayClass = "NO_CLASS", syncClass = "NO_CLASS", notifyClass = "NO_CLASS", - pushClass = "NO_CLASS" + pushClass = "NO_CLASS", ) updateFolderOperations.updateFolderSettings( @@ -44,15 +44,15 @@ class UpdateFolderOperationsTest : RobolectricTest() { id = folderId, name = "irrelevant", type = FolderType.REGULAR, - isLocalOnly = false + isLocalOnly = false, ), isInTopGroup = true, isIntegrate = true, displayClass = FolderClass.FIRST_CLASS, syncClass = FolderClass.FIRST_CLASS, notifyClass = FolderClass.FIRST_CLASS, - pushClass = FolderClass.FIRST_CLASS - ) + pushClass = FolderClass.FIRST_CLASS, + ), ) val folder = sqliteDatabase.readFolders().first() diff --git a/app/storage/src/test/java/com/fsck/k9/storage/notifications/K9NotificationStoreTest.kt b/app/storage/src/test/java/com/fsck/k9/storage/notifications/K9NotificationStoreTest.kt index aee0e76152c..4723dad1b8e 100644 --- a/app/storage/src/test/java/com/fsck/k9/storage/notifications/K9NotificationStoreTest.kt +++ b/app/storage/src/test/java/com/fsck/k9/storage/notifications/K9NotificationStoreTest.kt @@ -24,8 +24,8 @@ class K9NotificationStoreTest : RobolectricTest() { NotificationStoreOperation.Add( messageReference = createMessageReference("uid-1"), notificationId = 42, - timestamp = 23L - ) + timestamp = 23L, + ), ) store.persistNotificationChanges(operations) @@ -46,8 +46,8 @@ class K9NotificationStoreTest : RobolectricTest() { NotificationStoreOperation.Add( messageReference = createMessageReference("uid-2"), notificationId = 10, - timestamp = 30L - ) + timestamp = 30L, + ), ) store.persistNotificationChanges(operations) @@ -66,7 +66,7 @@ class K9NotificationStoreTest : RobolectricTest() { fun `remove notification`() { sqliteDatabase.createNotification(messageId = messageIdOne, notificationId = 10, timestamp = 20L) val operations = listOf( - NotificationStoreOperation.Remove(messageReference = createMessageReference("uid-1")) + NotificationStoreOperation.Remove(messageReference = createMessageReference("uid-1")), ) store.persistNotificationChanges(operations) @@ -83,8 +83,8 @@ class K9NotificationStoreTest : RobolectricTest() { NotificationStoreOperation.Remove(messageReference = createMessageReference("uid-2")), NotificationStoreOperation.ChangeToActive( messageReference = createMessageReference("uid-1"), - notificationId = 23 - ) + notificationId = 23, + ), ) store.persistNotificationChanges(operations) diff --git a/app/storage/src/test/java/com/fsck/k9/storage/notifications/NotificationsTableHelpers.kt b/app/storage/src/test/java/com/fsck/k9/storage/notifications/NotificationsTableHelpers.kt index d31b531980b..9209a44f9cf 100644 --- a/app/storage/src/test/java/com/fsck/k9/storage/notifications/NotificationsTableHelpers.kt +++ b/app/storage/src/test/java/com/fsck/k9/storage/notifications/NotificationsTableHelpers.kt @@ -9,7 +9,7 @@ import com.fsck.k9.helper.map fun SQLiteDatabase.createNotification( messageId: Long, notificationId: Int? = null, - timestamp: Long = 0L + timestamp: Long = 0L, ): Long { val values = ContentValues().apply { put("message_id", messageId) @@ -27,7 +27,7 @@ fun SQLiteDatabase.readNotifications(): List { NotificationEntry( messageId = cursor.getLongOrNull("message_id"), notificationId = cursor.getIntOrNull("notification_id"), - timestamp = cursor.getLongOrNull("timestamp") + timestamp = cursor.getLongOrNull("timestamp"), ) } } @@ -36,5 +36,5 @@ fun SQLiteDatabase.readNotifications(): List { data class NotificationEntry( val messageId: Long?, val notificationId: Int?, - val timestamp: Long? + val timestamp: Long?, ) diff --git a/app/ui/base/src/main/java/com/fsck/k9/ui/base/AppLanguageManager.kt b/app/ui/base/src/main/java/com/fsck/k9/ui/base/AppLanguageManager.kt index dd306f09593..6b2382ba83f 100644 --- a/app/ui/base/src/main/java/com/fsck/k9/ui/base/AppLanguageManager.kt +++ b/app/ui/base/src/main/java/com/fsck/k9/ui/base/AppLanguageManager.kt @@ -22,7 +22,7 @@ import kotlinx.coroutines.plus */ class AppLanguageManager( private val systemLocaleManager: SystemLocaleManager, - private val coroutineScope: CoroutineScope = GlobalScope + Dispatchers.Main + private val coroutineScope: CoroutineScope = GlobalScope + Dispatchers.Main, ) { private var currentOverrideLocale: Locale? = null private val _overrideLocale = MutableSharedFlow(replay = 1) diff --git a/app/ui/base/src/main/java/com/fsck/k9/ui/base/K9Activity.kt b/app/ui/base/src/main/java/com/fsck/k9/ui/base/K9Activity.kt index 94cbc703ba3..96f7fcfe39e 100644 --- a/app/ui/base/src/main/java/com/fsck/k9/ui/base/K9Activity.kt +++ b/app/ui/base/src/main/java/com/fsck/k9/ui/base/K9Activity.kt @@ -83,5 +83,5 @@ abstract class K9Activity(private val themeType: ThemeType) : AppCompatActivity( enum class ThemeType { DEFAULT, - DIALOG + DIALOG, } diff --git a/app/ui/base/src/main/java/com/fsck/k9/ui/base/KoinModule.kt b/app/ui/base/src/main/java/com/fsck/k9/ui/base/KoinModule.kt index 7fc76c25287..68015016afc 100644 --- a/app/ui/base/src/main/java/com/fsck/k9/ui/base/KoinModule.kt +++ b/app/ui/base/src/main/java/com/fsck/k9/ui/base/KoinModule.kt @@ -10,7 +10,7 @@ val uiBaseModule = module { context = get(), themeProvider = get(), generalSettingsManager = get(), - appCoroutineScope = get(named("AppCoroutineScope")) + appCoroutineScope = get(named("AppCoroutineScope")), ) } single { AppLanguageManager(systemLocaleManager = get()) } diff --git a/app/ui/base/src/main/java/com/fsck/k9/ui/base/ThemeManager.kt b/app/ui/base/src/main/java/com/fsck/k9/ui/base/ThemeManager.kt index 87d3a32229f..9d439387cd1 100644 --- a/app/ui/base/src/main/java/com/fsck/k9/ui/base/ThemeManager.kt +++ b/app/ui/base/src/main/java/com/fsck/k9/ui/base/ThemeManager.kt @@ -21,7 +21,7 @@ class ThemeManager( private val context: Context, private val themeProvider: ThemeProvider, private val generalSettingsManager: GeneralSettingsManager, - private val appCoroutineScope: CoroutineScope + private val appCoroutineScope: CoroutineScope, ) { private val generalSettings: GeneralSettings @@ -113,5 +113,5 @@ class ThemeManager( enum class Theme { LIGHT, - DARK + DARK, } diff --git a/app/ui/base/src/main/java/com/fsck/k9/ui/base/extensions/TextInputLayoutExtensions.kt b/app/ui/base/src/main/java/com/fsck/k9/ui/base/extensions/TextInputLayoutExtensions.kt index a5d6577c319..1607eb4a2c4 100644 --- a/app/ui/base/src/main/java/com/fsck/k9/ui/base/extensions/TextInputLayoutExtensions.kt +++ b/app/ui/base/src/main/java/com/fsck/k9/ui/base/extensions/TextInputLayoutExtensions.kt @@ -32,7 +32,7 @@ fun TextInputLayout.configureAuthenticatedPasswordToggle( activity: FragmentActivity, title: String, subtitle: String, - needScreenLockMessage: String + needScreenLockMessage: String, ) { val viewModel = ViewModelProvider(activity).get() viewModel.textInputLayout = this @@ -68,7 +68,7 @@ fun TextInputLayout.configureAuthenticatedPasswordToggle( .setAllowedAuthenticators(BIOMETRIC_STRONG or BIOMETRIC_WEAK or DEVICE_CREDENTIAL) .setTitle(title) .setSubtitle(subtitle) - .build() + .build(), ) } diff --git a/app/ui/base/src/main/java/com/fsck/k9/ui/base/loader/LoaderStateObserver.kt b/app/ui/base/src/main/java/com/fsck/k9/ui/base/loader/LoaderStateObserver.kt index 5f06f130759..6e2f8e7b6c4 100644 --- a/app/ui/base/src/main/java/com/fsck/k9/ui/base/loader/LoaderStateObserver.kt +++ b/app/ui/base/src/main/java/com/fsck/k9/ui/base/loader/LoaderStateObserver.kt @@ -18,7 +18,7 @@ fun LiveData>.observeLoading( loadingView: View, errorView: View, dataView: View, - displayData: (T) -> Unit + displayData: (T) -> Unit, ) { observe(owner, LoaderStateObserver(loadingView, errorView, dataView, displayData)) } @@ -27,7 +27,7 @@ private class LoaderStateObserver( private val loadingView: View, private val errorView: View, private val dataView: View, - private val displayData: (T) -> Unit + private val displayData: (T) -> Unit, ) : Observer> { private val allViews = setOf(loadingView, errorView, dataView) diff --git a/app/ui/base/src/main/java/com/fsck/k9/ui/base/locale/SystemLocaleManager.kt b/app/ui/base/src/main/java/com/fsck/k9/ui/base/locale/SystemLocaleManager.kt index f3d1674e293..d9d6db07651 100644 --- a/app/ui/base/src/main/java/com/fsck/k9/ui/base/locale/SystemLocaleManager.kt +++ b/app/ui/base/src/main/java/com/fsck/k9/ui/base/locale/SystemLocaleManager.kt @@ -42,7 +42,7 @@ class SystemLocaleManager(context: Context) { packageManager.setComponentEnabledSetting( componentName, PackageManager.COMPONENT_ENABLED_STATE_ENABLED, - PackageManager.DONT_KILL_APP + PackageManager.DONT_KILL_APP, ) } catch (e: Exception) { Timber.e(e, "Error enabling LocaleBroadcastReceiver") @@ -55,7 +55,7 @@ class SystemLocaleManager(context: Context) { packageManager.setComponentEnabledSetting( componentName, PackageManager.COMPONENT_ENABLED_STATE_DISABLED, - PackageManager.DONT_KILL_APP + PackageManager.DONT_KILL_APP, ) } catch (e: Exception) { Timber.e(e, "Error disabling LocaleBroadcastReceiver") diff --git a/app/ui/legacy/src/debug/java/com/fsck/k9/ui/settings/ExtraAccountDiscovery.kt b/app/ui/legacy/src/debug/java/com/fsck/k9/ui/settings/ExtraAccountDiscovery.kt index df09c4e2607..469bc63c1b7 100644 --- a/app/ui/legacy/src/debug/java/com/fsck/k9/ui/settings/ExtraAccountDiscovery.kt +++ b/app/ui/legacy/src/debug/java/com/fsck/k9/ui/settings/ExtraAccountDiscovery.kt @@ -17,7 +17,7 @@ object ExtraAccountDiscovery { authenticationType = AuthType.AUTOMATIC, username = "irrelevant", password = "irrelevant", - clientCertificateAlias = null + clientCertificateAlias = null, ) ConnectionSettings(incoming = serverSettings, outgoing = serverSettings) } else { diff --git a/app/ui/legacy/src/debug/java/com/fsck/k9/ui/settings/NewSetupUiHack.kt b/app/ui/legacy/src/debug/java/com/fsck/k9/ui/settings/NewSetupUiHack.kt index e853fdc7d21..06ebd2c8a5b 100644 --- a/app/ui/legacy/src/debug/java/com/fsck/k9/ui/settings/NewSetupUiHack.kt +++ b/app/ui/legacy/src/debug/java/com/fsck/k9/ui/settings/NewSetupUiHack.kt @@ -9,7 +9,7 @@ internal object NewSetupUiHack { builder.addAction( "Add account (NEW)", R.id.action_settingsListScreen_to_newAddAccountScreen, - R.attr.iconSettingsAccountAdd + R.attr.iconSettingsAccountAdd, ) } } diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/UiKoinModules.kt b/app/ui/legacy/src/main/java/com/fsck/k9/UiKoinModules.kt index 999c510ff23..b938168700d 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/UiKoinModules.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/UiKoinModules.kt @@ -37,5 +37,5 @@ val uiModules = listOf( messageSourceModule, accountUiModule, messageDetailsUiModule, - messageViewUiModule + messageViewUiModule, ) diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/account/AccountRemover.kt b/app/ui/legacy/src/main/java/com/fsck/k9/account/AccountRemover.kt index 7d8ab451315..7366152e76c 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/account/AccountRemover.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/account/AccountRemover.kt @@ -17,7 +17,7 @@ class AccountRemover( private val messagingController: MessagingController, private val backendManager: BackendManager, private val localKeyStoreManager: LocalKeyStoreManager, - private val preferences: Preferences + private val preferences: Preferences, ) { fun removeAccount(accountUuid: String) { diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/account/KoinModule.kt b/app/ui/legacy/src/main/java/com/fsck/k9/account/KoinModule.kt index 69540f65101..b25a3d8c208 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/account/KoinModule.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/account/KoinModule.kt @@ -9,7 +9,7 @@ val accountModule = module { messagingController = get(), backendManager = get(), localKeyStoreManager = get(), - preferences = get() + preferences = get(), ) } factory { BackgroundAccountRemover(get()) } diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/EditIdentity.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/EditIdentity.kt index 149f9ebbfe3..b72d0f505b8 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/EditIdentity.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/EditIdentity.kt @@ -80,7 +80,7 @@ class EditIdentity : K9Activity() { name = name.text.toString(), signatureUse = signatureUse.isChecked, signature = signature.text.toString(), - replyTo = if (replyTo.text.isNotEmpty()) replyTo.text.toString() else null + replyTo = if (replyTo.text.isNotEmpty()) replyTo.text.toString() else null, ) val identities = account.identities diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/FolderInfoHolder.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/FolderInfoHolder.kt index 4ccc496e7f8..14de882d9de 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/FolderInfoHolder.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/FolderInfoHolder.kt @@ -9,7 +9,7 @@ import com.fsck.k9.ui.folders.FolderNameFormatter class FolderInfoHolder( private val folderNameFormatter: FolderNameFormatter, localFolder: LocalFolder, - account: Account + account: Account, ) { @JvmField val databaseId = localFolder.databaseId @@ -25,7 +25,7 @@ class FolderInfoHolder( id = folderId, name = localFolder.name, type = getFolderType(account, folderId), - isLocalOnly = localFolder.isLocalOnly + isLocalOnly = localFolder.isLocalOnly, ) return folderNameFormatter.displayName(folder) } diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt index a806a996b07..a00e795bebe 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt @@ -276,7 +276,7 @@ open class MessageList : val messageListFragment = MessageListFragment.newInstance( search!!, false, - K9.isThreadedViewEnabled && !noThreading + K9.isThreadedViewEnabled && !noThreading, ) fragmentTransaction.add(R.id.message_list_container, messageListFragment) fragmentTransaction.commitNow() @@ -447,7 +447,7 @@ open class MessageList : return LaunchData( search = search, - noThreading = true + noThreading = true, ) } else if (intent.hasExtra(EXTRA_MESSAGE_REFERENCE)) { val messageReferenceString = intent.getStringExtra(EXTRA_MESSAGE_REFERENCE) @@ -463,7 +463,7 @@ open class MessageList : return LaunchData( search = search, messageReference = messageReference, - messageViewOnly = intent.getBooleanExtra(EXTRA_MESSAGE_VIEW_ONLY, false) + messageViewOnly = intent.getBooleanExtra(EXTRA_MESSAGE_VIEW_ONLY, false), ) } } else if (intent.hasExtra(EXTRA_SEARCH)) { @@ -1255,7 +1255,7 @@ open class MessageList : fillInIntent: Intent?, flagsMask: Int, flagsValues: Int, - extraFlags: Int + extraFlags: Int, ) { // If any of the high 16 bits are set it is not one of our request codes if (requestCode and REQUEST_CODE_MASK != 0) { @@ -1366,7 +1366,7 @@ open class MessageList : val account: Account? = null, val messageReference: MessageReference? = null, val noThreading: Boolean = false, - val messageViewOnly: Boolean = false + val messageViewOnly: Boolean = false, ) companion object : KoinComponent { @@ -1406,7 +1406,7 @@ open class MessageList : search: SearchSpecification?, noThreading: Boolean, newTask: Boolean, - clearTop: Boolean = true + clearTop: Boolean = true, ) { context.startActivity(intentDisplaySearch(context, search, noThreading, newTask, clearTop)) } @@ -1417,7 +1417,7 @@ open class MessageList : search: SearchSpecification?, noThreading: Boolean, newTask: Boolean, - clearTop: Boolean + clearTop: Boolean, ): Intent { return Intent(context, MessageList::class.java).apply { putExtra(EXTRA_SEARCH, ParcelableUtil.marshall(search)) @@ -1482,7 +1482,7 @@ open class MessageList : context: Context, messageReference: MessageReference, openInUnifiedInbox: Boolean = false, - messageViewOnly: Boolean = false + messageViewOnly: Boolean = false, ): Intent { return actionDisplayMessageTemplateIntent(context, openInUnifiedInbox, messageViewOnly).apply { putExtra(EXTRA_MESSAGE_REFERENCE, messageReference.toIdentityString()) @@ -1492,7 +1492,7 @@ open class MessageList : fun actionDisplayMessageTemplateIntent( context: Context, openInUnifiedInbox: Boolean, - messageViewOnly: Boolean + messageViewOnly: Boolean, ): Intent { return Intent(context, MessageList::class.java).apply { if (openInUnifiedInbox) { diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageListActivityConfig.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageListActivityConfig.kt index 0e33ac54428..ba099bca565 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageListActivityConfig.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageListActivityConfig.kt @@ -32,7 +32,7 @@ data class MessageListActivityConfig( val fontSizeMessageViewDate: Int, val fontSizeMessageViewContentAsPercent: Int, val swipeRightAction: SwipeAction, - val swipeLeftAction: SwipeAction + val swipeLeftAction: SwipeAction, ) { companion object { @@ -64,7 +64,7 @@ data class MessageListActivityConfig( fontSizeMessageViewDate = K9.fontSizes.messageViewDate, fontSizeMessageViewContentAsPercent = K9.fontSizes.messageViewContentAsPercent, swipeRightAction = K9.swipeRightAction, - swipeLeftAction = K9.swipeLeftAction + swipeLeftAction = K9.swipeLeftAction, ) } } diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageLoaderHelperFactory.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageLoaderHelperFactory.kt index 20e7c814b8d..5e0caab781b 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageLoaderHelperFactory.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageLoaderHelperFactory.kt @@ -9,13 +9,13 @@ import com.fsck.k9.ui.helper.HtmlSettingsProvider class MessageLoaderHelperFactory( private val messageViewInfoExtractorFactory: MessageViewInfoExtractorFactory, - private val htmlSettingsProvider: HtmlSettingsProvider + private val htmlSettingsProvider: HtmlSettingsProvider, ) { fun createForMessageView( context: Context, loaderManager: LoaderManager, fragmentManager: FragmentManager, - callback: MessageLoaderCallbacks + callback: MessageLoaderCallbacks, ): MessageLoaderHelper { val htmlSettings = htmlSettingsProvider.createForMessageView() val messageViewInfoExtractor = messageViewInfoExtractorFactory.create(htmlSettings) @@ -26,7 +26,7 @@ class MessageLoaderHelperFactory( context: Context, loaderManager: LoaderManager, fragmentManager: FragmentManager, - callback: MessageLoaderCallbacks + callback: MessageLoaderCallbacks, ): MessageLoaderHelper { val htmlSettings = htmlSettingsProvider.createForMessageCompose() val messageViewInfoExtractor = messageViewInfoExtractorFactory.create(htmlSettings) diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/ComposeCryptoStatus.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/ComposeCryptoStatus.kt index 5fcb1c64ac8..89eb04921ec 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/ComposeCryptoStatus.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/ComposeCryptoStatus.kt @@ -24,7 +24,7 @@ data class ComposeCryptoStatus( override val isEncryptAllDrafts: Boolean, override val isEncryptSubject: Boolean, private val cryptoMode: CryptoMode, - private val recipientAutocryptStatus: RecipientAutocryptStatus? = null + private val recipientAutocryptStatus: RecipientAutocryptStatus? = null, ) : CryptoStatus { constructor( @@ -36,11 +36,11 @@ data class ComposeCryptoStatus( isReplyToEncrypted: Boolean, isEncryptAllDrafts: Boolean, isEncryptSubject: Boolean, - cryptoMode: CryptoMode + cryptoMode: CryptoMode, ) : this( openPgpProviderState, openPgpKeyId, recipientAddresses.map { it.address.address }, - isPgpInlineModeEnabled, isSenderPreferEncryptMutual, isReplyToEncrypted, isEncryptAllDrafts, isEncryptSubject, cryptoMode + isPgpInlineModeEnabled, isSenderPreferEncryptMutual, isReplyToEncrypted, isEncryptAllDrafts, isEncryptSubject, cryptoMode, ) private val recipientAutocryptStatusType = recipientAutocryptStatus?.type @@ -150,16 +150,16 @@ data class ComposeCryptoStatus( isEncryptAllDrafts = isEncryptAllDrafts, isEncryptSubject = isEncryptSubject, recipientAddresses = recipientAddresses, - recipientAutocryptStatus = recipientAutocryptStatusType + recipientAutocryptStatus = recipientAutocryptStatusType, ) enum class SendErrorState { PROVIDER_ERROR, KEY_CONFIG_ERROR, - ENABLED_ERROR + ENABLED_ERROR, } enum class AttachErrorState { - IS_INLINE + IS_INLINE, } } diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientMvpView.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientMvpView.kt index e3d8ca85577..bbd9eb06828 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientMvpView.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientMvpView.kt @@ -19,7 +19,6 @@ import com.fsck.k9.ui.R import com.fsck.k9.view.RecipientSelectView import com.fsck.k9.view.RecipientSelectView.Recipient import com.fsck.k9.view.ToolableViewAnimator -import java.lang.AssertionError class RecipientMvpView(private val activity: MessageCompose) : View.OnFocusChangeListener, View.OnClickListener { private val toView: RecipientSelectView = activity.findViewById(R.id.to) @@ -396,14 +395,14 @@ class RecipientMvpView(private val activity: MessageCompose) : View.OnFocusChang ENABLED_ERROR(R.id.crypto_status_error), ENABLED_TRUSTED(R.id.crypto_status_trusted), AVAILABLE(R.id.crypto_status_disabled), - ERROR(R.id.crypto_status_error); + ERROR(R.id.crypto_status_error), } enum class CryptoSpecialModeDisplayType(val childIdToDisplay: Int) { NONE(VIEW_INDEX_HIDDEN), PGP_INLINE(R.id.crypto_special_inline), SIGN_ONLY(R.id.crypto_special_sign_only), - SIGN_ONLY_PGP_INLINE(R.id.crypto_special_sign_only_inline); + SIGN_ONLY_PGP_INLINE(R.id.crypto_special_sign_only_inline), } companion object { diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientPresenter.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientPresenter.kt index c3a851a51ac..f0022f0a889 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientPresenter.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientPresenter.kt @@ -62,7 +62,7 @@ class RecipientPresenter( private val composePgpEnableByDefaultDecider: ComposePgpEnableByDefaultDecider, private val autocryptStatusInteractor: AutocryptStatusInteractor, private val replyToParser: ReplyToParser, - private val draftStateHeaderParser: AutocryptDraftStateHeaderParser + private val draftStateHeaderParser: AutocryptDraftStateHeaderParser, ) { private lateinit var account: Account private var alwaysBccAddresses: Array
? = null @@ -386,7 +386,7 @@ class RecipientPresenter( isReplyToEncrypted = isReplyToEncryptedMessage, isEncryptAllDrafts = account.isOpenPgpEncryptAllDrafts, isEncryptSubject = account.isOpenPgpEncryptSubject, - cryptoMode = currentCryptoMode + cryptoMode = currentCryptoMode, ) if (openPgpProviderState != OpenPgpProviderState.OK) { @@ -581,7 +581,7 @@ class RecipientPresenter( if (currentCryptoStatus.hasAutocryptPendingIntent()) { recipientMvpView.launchUserInteractionPendingIntent( currentCryptoStatus.autocryptPendingIntent, - REQUEST_CODE_AUTOCRYPT + REQUEST_CODE_AUTOCRYPT, ) } else if (isEncryptOnNoChoice) { // TODO warning dialog if we override, especially from reply! diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupAccountType.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupAccountType.kt index 6c3b529c8a9..4b3fb0a80c9 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupAccountType.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupAccountType.kt @@ -80,7 +80,7 @@ class AccountSetupAccountType : K9Activity() { initialAccountSettings.authenticationType, initialAccountSettings.email, initialAccountSettings.password, - initialAccountSettings.clientCertificateAlias + initialAccountSettings.clientCertificateAlias, ) account.incomingServerSettings = storeServer } @@ -95,7 +95,7 @@ class AccountSetupAccountType : K9Activity() { initialAccountSettings.authenticationType, initialAccountSettings.email, initialAccountSettings.password, - initialAccountSettings.clientCertificateAlias + initialAccountSettings.clientCertificateAlias, ) account.outgoingServerSettings = transportServer } @@ -118,7 +118,7 @@ class AccountSetupAccountType : K9Activity() { context: Context, account: Account, makeDefault: Boolean, - initialAccountSettings: InitialAccountSettings + initialAccountSettings: InitialAccountSettings, ) { val intent = Intent(context, AccountSetupAccountType::class.java).apply { putExtra(EXTRA_ACCOUNT, account.uuid) diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.kt index 1ee50879d99..422ef0f2bae 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.kt @@ -285,7 +285,7 @@ class AccountSetupBasics : K9Activity() { authenticationType = authenticationType, email = email, password = password, - clientCertificateAlias = clientCertificateAlias + clientCertificateAlias = clientCertificateAlias, ) AccountSetupAccountType.actionSelectAccountType(this, account, makeDefault = false, initialAccountSettings) @@ -357,7 +357,7 @@ class AccountSetupBasics : K9Activity() { private enum class UiState { EMAIL_ADDRESS_ONLY, - PASSWORD_FLOW + PASSWORD_FLOW, } companion object { @@ -387,6 +387,6 @@ private fun DiscoveredServerSettings.toServerSettings(): ServerSettings? { authenticationType = authType, username = username, password = null, - clientCertificateAlias = null + clientCertificateAlias = null, ) } diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupCheckSettings.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupCheckSettings.kt index 461865655af..1ac11bffd19 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupCheckSettings.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupCheckSettings.kt @@ -139,12 +139,12 @@ class AccountSetupCheckSettings : K9Activity(), ConfirmationDialogFragmentListen if (chain != null) { acceptKeyDialog( R.string.account_setup_failed_dlg_certificate_message_fmt, - exception + exception, ) } else { showErrorDialog( R.string.account_setup_failed_dlg_server_message_fmt, - errorMessageForCertificateException(exception)!! + errorMessageForCertificateException(exception)!!, ) } } @@ -333,7 +333,7 @@ class AccountSetupCheckSettings : K9Activity(), ConfirmationDialogFragmentListen getString(R.string.account_setup_failed_dlg_title), customMessage, getString(R.string.account_setup_failed_dlg_edit_details_action), - getString(R.string.account_setup_failed_dlg_continue_action) + getString(R.string.account_setup_failed_dlg_continue_action), ) } else { throw RuntimeException("Called showDialog(int) with unknown dialog id.") diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AuthViewModel.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AuthViewModel.kt index fb66d03c7b2..13c92fbe80c 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AuthViewModel.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AuthViewModel.kt @@ -39,7 +39,7 @@ private const val KEY_AUTHORIZATION = "app.k9mail_auth" class AuthViewModel( application: Application, private val accountManager: AccountManager, - private val oAuthConfigurationProvider: OAuthConfigurationProvider + private val oAuthConfigurationProvider: OAuthConfigurationProvider, ) : AndroidViewModel(application) { private var authService: AuthorizationService? = null private val authState = AuthState() @@ -112,14 +112,14 @@ class AuthViewModel( private fun createAuthorizationRequestIntent(email: String, config: OAuthConfiguration): Intent { val serviceConfig = AuthorizationServiceConfiguration( config.authorizationEndpoint.toUri(), - config.tokenEndpoint.toUri() + config.tokenEndpoint.toUri(), ) val authRequestBuilder = AuthorizationRequest.Builder( serviceConfig, config.clientId, ResponseTypeValues.CODE, - config.redirectUri.toUri() + config.redirectUri.toUri(), ) val scopeString = config.scopes.joinToString(separator = " ") @@ -152,7 +152,7 @@ class AuthViewModel( _uiState.update { AuthFlowState.Failed( errorCode = authorizationException.error, - errorMessage = authorizationException.errorDescription + errorMessage = authorizationException.errorDescription, ) } } @@ -177,7 +177,7 @@ class AuthViewModel( _uiState.update { AuthFlowState.Failed( errorCode = authorizationException.error, - errorMessage = authorizationException.errorDescription + errorMessage = authorizationException.errorDescription, ) } } else { @@ -229,7 +229,7 @@ private class AuthorizationContract : ActivityResultContract { override fun decode(contactImage: ContactImage, width: Int, height: Int, options: Options): Resource? { diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactImageModelLoader.kt b/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactImageModelLoader.kt index afee28d4209..89fd29bf826 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactImageModelLoader.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactImageModelLoader.kt @@ -18,7 +18,7 @@ class ContactImageModelLoader : ModelLoader { contactImage: ContactImage, width: Int, height: Int, - options: Options + options: Options, ): ModelLoader.LoadData { return ModelLoader.LoadData(contactImage, ContactImageDataFetcher(contactImage)) } diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactLetterBitmapCreator.kt b/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactLetterBitmapCreator.kt index eab56cc7fdd..ae0034d7204 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactLetterBitmapCreator.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactLetterBitmapCreator.kt @@ -11,7 +11,7 @@ import com.fsck.k9.mail.Address */ class ContactLetterBitmapCreator( private val letterExtractor: ContactLetterExtractor, - val config: ContactLetterBitmapConfig + val config: ContactLetterBitmapConfig, ) { fun drawBitmap(bitmap: Bitmap, pictureSizeInPx: Int, address: Address): Bitmap { val canvas = Canvas(bitmap) @@ -36,7 +36,7 @@ class ContactLetterBitmapCreator( letter, pictureSizeInPx / 2f - width / 2f, pictureSizeInPx / 2f + rect.height() / 2f, - paint + paint, ) return bitmap diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactPictureLoader.kt b/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactPictureLoader.kt index 7204b21f0b7..250f584815e 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactPictureLoader.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactPictureLoader.kt @@ -14,7 +14,7 @@ import com.fsck.k9.view.RecipientSelectView.Recipient class ContactPictureLoader( private val context: Context, - private val contactLetterBitmapCreator: ContactLetterBitmapCreator + private val contactLetterBitmapCreator: ContactLetterBitmapCreator, ) { private val pictureSizeInPx: Int = PICTURE_SIZE.toDip(context) private val backgroundCacheId: String = with(contactLetterBitmapCreator.config) { @@ -94,7 +94,7 @@ class ContactPictureLoader( contactLetterOnly = contactLetterOnly, backgroundCacheId = backgroundCacheId, contactLetterBitmapCreator = contactLetterBitmapCreator, - address = address + address = address, ) } diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/FragmentExtras.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/FragmentExtras.kt index 98ca2abb690..ed122e5a189 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/FragmentExtras.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/FragmentExtras.kt @@ -14,7 +14,7 @@ inline fun FragmentActivity.fragmentTransaction(crossinline block: FragmentTrans inline fun FragmentActivity.fragmentTransactionWithBackStack( name: String? = null, - crossinline block: FragmentTransaction.() -> Unit + crossinline block: FragmentTransaction.() -> Unit, ) { fragmentTransaction { block() diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt index 56ac2615636..97f094292d0 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt @@ -275,7 +275,7 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K iconRes = folderIconProvider.iconFolderResId identifier = DRAWER_ID_FOLDERS isSelectable = false - } + }, ) sliderView.addStickyFooterItem( @@ -284,7 +284,7 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K iconRes = getResId(R.attr.iconActionSettings) identifier = DRAWER_ID_PREFERENCES isSelectable = false - } + }, ) } @@ -322,7 +322,7 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K swipeRefreshLayout.isRefreshing = false } } - } + }, ) } } @@ -454,7 +454,7 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K private data class DrawerColors( val accentColor: Int, - val selectedColor: Int + val selectedColor: Int, ) private fun getDrawerColorsForAccount(account: Account): DrawerColors { @@ -465,7 +465,7 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K } return DrawerColors( accentColor = baseColor, - selectedColor = baseColor.and(0xffffff).or(0x22000000) + selectedColor = baseColor.and(0xffffff).or(0x22000000), ) } @@ -503,12 +503,12 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K private fun Int.toSelectedColorStateList(): ColorStateList { val states = arrayOf( intArrayOf(android.R.attr.state_selected), - intArrayOf() + intArrayOf(), ) val colors = intArrayOf( this, - textColor + textColor, ) return ColorStateList(states, colors) @@ -543,7 +543,7 @@ private fun Context.obtainDrawerTextColor(): Int { null, MaterialDrawerR.styleable.MaterialDrawerSliderView, MaterialDrawerR.attr.materialDrawerStyle, - MaterialDrawerR.style.Widget_MaterialDrawerStyle + MaterialDrawerR.style.Widget_MaterialDrawerStyle, ) val textColor = styledAttributes.getColor(MaterialDrawerR.styleable.MaterialDrawerSliderView_materialDrawerPrimaryText, 0) styledAttributes.recycle() diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountImageModelLoader.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountImageModelLoader.kt index 2b52817b192..2fa106d70cb 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountImageModelLoader.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountImageModelLoader.kt @@ -18,18 +18,18 @@ import java.security.MessageDigest */ internal class AccountImageModelLoader( private val contactPhotoLoader: ContactPhotoLoader, - private val accountFallbackImageProvider: AccountFallbackImageProvider + private val accountFallbackImageProvider: AccountFallbackImageProvider, ) : ModelLoader { override fun buildLoadData( accountImage: AccountImage, width: Int, height: Int, - options: Options + options: Options, ): ModelLoader.LoadData { val dataFetcher = AccountImageDataFetcher( contactPhotoLoader, accountFallbackImageProvider, - accountImage + accountImage, ) return ModelLoader.LoadData(accountImage, dataFetcher) } @@ -55,7 +55,7 @@ data class AccountImage(val email: String, val color: Int) : Key { internal class AccountImageDataFetcher( private val contactPhotoLoader: ContactPhotoLoader, private val accountFallbackImageProvider: AccountFallbackImageProvider, - private val accountImage: AccountImage + private val accountImage: AccountImage, ) : DataFetcher { override fun loadData(priority: Priority, callback: DataFetcher.DataCallback) { val bitmap = loadAccountImage() ?: createFallbackBitmap() @@ -81,7 +81,7 @@ internal class AccountImageDataFetcher( internal class AccountImageModelLoaderFactory( private val contactPhotoLoader: ContactPhotoLoader, - private val accountFallbackImageProvider: AccountFallbackImageProvider + private val accountFallbackImageProvider: AccountFallbackImageProvider, ) : ModelLoaderFactory { override fun build(multiFactory: MultiModelLoaderFactory): ModelLoader { return AccountImageModelLoader(contactPhotoLoader, accountFallbackImageProvider) diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountsViewModel.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountsViewModel.kt index 488e5c90f61..ff28bc8b5fa 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountsViewModel.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountsViewModel.kt @@ -23,7 +23,7 @@ import kotlinx.coroutines.launch class AccountsViewModel( accountManager: AccountManager, private val messageCountsProvider: MessageCountsProvider, - private val messageListRepository: MessageListRepository + private val messageListRepository: MessageListRepository, ) : ViewModel() { private val displayAccountFlow: Flow> = accountManager.getAccountsFlow() .flatMapLatest { accounts -> @@ -36,7 +36,7 @@ class AccountsViewModel( DisplayAccount( account = accounts[index], unreadMessageCount = messageCounts.unread, - starredMessageCount = messageCounts.starred + starredMessageCount = messageCounts.starred, ) } } diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/DisplayAccount.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/DisplayAccount.kt index ef0e30b9d52..80224e49d0e 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/DisplayAccount.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/DisplayAccount.kt @@ -5,5 +5,5 @@ import com.fsck.k9.Account data class DisplayAccount( val account: Account, val unreadMessageCount: Int, - val starredMessageCount: Int + val starredMessageCount: Int, ) diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/ChangeLogManager.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/ChangeLogManager.kt index 391f56c3d6a..4a6d0f581c7 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/ChangeLogManager.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/ChangeLogManager.kt @@ -17,7 +17,7 @@ import kotlinx.coroutines.withContext class ChangeLogManager( private val context: Context, private val appCoroutineScope: CoroutineScope, - private val backgroundDispatcher: CoroutineDispatcher = Dispatchers.IO + private val backgroundDispatcher: CoroutineDispatcher = Dispatchers.IO, ) { private val mutableChangeLogFlow = MutableSharedFlow(replay = 1) diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/ChangelogFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/ChangelogFragment.kt index d3860465b9e..449b4dfcb46 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/ChangelogFragment.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/ChangelogFragment.kt @@ -35,7 +35,7 @@ class ChangelogFragment : Fragment() { owner = viewLifecycleOwner, loadingView = view.findViewById(R.id.changelog_loading), errorView = view.findViewById(R.id.changelog_error), - dataView = listView + dataView = listView, ) { changeLog -> listView.adapter = ChangelogAdapter(changeLog) } diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/ChangelogViewModel.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/ChangelogViewModel.kt index 200c3e1930f..84ba6f5c217 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/ChangelogViewModel.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/ChangelogViewModel.kt @@ -15,7 +15,7 @@ private typealias ChangeLogState = LoaderState> class ChangelogViewModel( private val generalSettingsManager: GeneralSettingsManager, private val changeLogManager: ChangeLogManager, - private val mode: ChangeLogMode + private val mode: ChangeLogMode, ) : ViewModel() { val showRecentChangesState: LiveData = generalSettingsManager.getSettingsFlow() @@ -42,5 +42,5 @@ class ChangelogViewModel( enum class ChangeLogMode { CHANGE_LOG, - RECENT_CHANGES + RECENT_CHANGES, } diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/RecentChangesViewModel.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/RecentChangesViewModel.kt index c106e8738d4..c241d6d02a5 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/RecentChangesViewModel.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/RecentChangesViewModel.kt @@ -13,7 +13,7 @@ import kotlinx.coroutines.flow.map @OptIn(ExperimentalCoroutinesApi::class) class RecentChangesViewModel( private val generalSettingsManager: GeneralSettingsManager, - private val changeLogManager: ChangeLogManager + private val changeLogManager: ChangeLogManager, ) : ViewModel() { val shouldShowRecentChangesHint = changeLogManager.changeLogFlow.flatMapLatest { changeLog -> if (changeLog.isFirstRun && !changeLog.isFirstRunEver) { diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/choosefolder/ChooseFolderActivity.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/choosefolder/ChooseFolderActivity.kt index 067b5ca8f30..b55ef97e09b 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/choosefolder/ChooseFolderActivity.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/choosefolder/ChooseFolderActivity.kt @@ -233,7 +233,7 @@ class ChooseFolderActivity : K9Activity() { enum class Action { MOVE, COPY, - CHOOSE + CHOOSE, } companion object { @@ -256,7 +256,7 @@ class ChooseFolderActivity : K9Activity() { currentFolderId: Long? = null, scrollToFolderId: Long? = null, showDisplayableOnly: Boolean = false, - messageReference: MessageReference? = null + messageReference: MessageReference? = null, ): Intent { return Intent(context, ChooseFolderActivity::class.java).apply { this.action = action.toString() diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/choosefolder/FolderListItem.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/choosefolder/FolderListItem.kt index 9a07c0cc3f0..4d08f2d9e24 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/choosefolder/FolderListItem.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/choosefolder/FolderListItem.kt @@ -10,7 +10,7 @@ import com.mikepenz.fastadapter.items.AbstractItem class FolderListItem( val databaseId: Long, private val folderIconResource: Int, - val displayName: String + val displayName: String, ) : AbstractItem() { override var identifier = databaseId diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/compose/RecipientCircleImageView.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/compose/RecipientCircleImageView.kt index 2578be1fb49..064d3329deb 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/compose/RecipientCircleImageView.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/compose/RecipientCircleImageView.kt @@ -12,7 +12,7 @@ import de.hdodenhof.circleimageview.CircleImageView class RecipientCircleImageView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, - defStyleAttr: Int = 0 + defStyleAttr: Int = 0, ) : CircleImageView(context, attrs, defStyleAttr) { var onSetImageDrawableListener: OnSetImageDrawableListener? = null diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/compose/RecipientTokenConstraintLayout.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/compose/RecipientTokenConstraintLayout.kt index f021456b91c..b98cdb817f7 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/compose/RecipientTokenConstraintLayout.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/compose/RecipientTokenConstraintLayout.kt @@ -11,7 +11,7 @@ import androidx.constraintlayout.widget.ConstraintLayout class RecipientTokenConstraintLayout @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, - defStyleAttr: Int = 0 + defStyleAttr: Int = 0, ) : ConstraintLayout(context, attrs, defStyleAttr) { private lateinit var textView: TextView diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/compose/SimpleHighlightView.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/compose/SimpleHighlightView.kt index 7188421011d..a011fa96bff 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/compose/SimpleHighlightView.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/compose/SimpleHighlightView.kt @@ -65,7 +65,7 @@ class SimpleHighlightView private constructor(context: Context, style: Int) : Fr val styled = getContext().obtainStyledAttributes(style, R.styleable.SimpleHighlightView) backgroundColor = styled.getColor( R.styleable.SimpleHighlightView_highlightBackgroundColor, - Color.argb(128, 80, 80, 80) + Color.argb(128, 80, 80, 80), ) styled.recycle() } @@ -128,7 +128,7 @@ class SimpleHighlightView private constructor(context: Context, style: Int) : Fr val point = targetView.getHighlightPoint() setHighlightPosition(point.x, point.y) }, - 100 + 100, ) } diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptKeyTransferPresenter.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptKeyTransferPresenter.kt index 046d08e6e28..7316afb2e95 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptKeyTransferPresenter.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptKeyTransferPresenter.kt @@ -17,7 +17,7 @@ class AutocryptKeyTransferPresenter internal constructor( private val openPgpApiManager: OpenPgpApiManager, private val preferences: Preferences, private val viewModel: AutocryptKeyTransferViewModel, - private val view: AutocryptKeyTransferActivity + private val view: AutocryptKeyTransferActivity, ) { private lateinit var account: Account @@ -52,7 +52,7 @@ class AutocryptKeyTransferPresenter internal constructor( override fun onOpenPgpProviderError(error: OpenPgpProviderError) { view.finishWithProviderConnectError(openPgpApiManager.readableOpenPgpProviderName) } - } + }, ) view.setAddress(account.identities[0].email!!) diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptKeyTransferViewModel.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptKeyTransferViewModel.kt index 056514baf3c..4120b2ffddf 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptKeyTransferViewModel.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptKeyTransferViewModel.kt @@ -4,5 +4,5 @@ import androidx.lifecycle.ViewModel internal class AutocryptKeyTransferViewModel( val autocryptSetupMessageLiveEvent: AutocryptSetupMessageLiveEvent, - val autocryptSetupTransferLiveEvent: AutocryptSetupTransferLiveEvent + val autocryptSetupTransferLiveEvent: AutocryptSetupTransferLiveEvent, ) : ViewModel() diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptSetupTransferLiveEvent.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptSetupTransferLiveEvent.kt index d1f93a87ea6..28a30dd09e3 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptSetupTransferLiveEvent.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptSetupTransferLiveEvent.kt @@ -11,7 +11,7 @@ import kotlinx.coroutines.delay import kotlinx.coroutines.launch class AutocryptSetupTransferLiveEvent( - private val messagingController: MessagingController + private val messagingController: MessagingController, ) : SingleLiveEvent() { fun sendMessageAsync(account: Account, setupMsg: AutocryptSetupMessage) { diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/KoinModule.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/KoinModule.kt index 89fa1671e65..f36857c5883 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/KoinModule.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/KoinModule.kt @@ -14,7 +14,7 @@ val endToEndUiModule = module { get { parametersOf(lifecycleOwner) }, get(), get(), - autocryptTransferView + autocryptTransferView, ) } viewModel { AutocryptKeyTransferViewModel(get(), get()) } diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/folders/FoldersViewModel.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/folders/FoldersViewModel.kt index ef66e21cd4a..10b86e6ea7f 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/folders/FoldersViewModel.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/folders/FoldersViewModel.kt @@ -24,7 +24,7 @@ import kotlinx.coroutines.launch class FoldersViewModel( private val folderRepository: FolderRepository, private val messageCountsProvider: MessageCountsProvider, - backgroundDispatcher: CoroutineDispatcher = Dispatchers.IO + backgroundDispatcher: CoroutineDispatcher = Dispatchers.IO, ) : ViewModel() { private val inputFlow = MutableSharedFlow(replay = 1) private val foldersFlow = inputFlow @@ -42,7 +42,7 @@ class FoldersViewModel( FolderList( unifiedInbox = createDisplayUnifiedInbox(), accountId = accountNumber + 1, - folders = displayFolders + folders = displayFolders, ) } .flowOn(backgroundDispatcher) @@ -76,10 +76,10 @@ class FoldersViewModel( data class FolderList( val unifiedInbox: DisplayUnifiedInbox?, val accountId: Int, - val folders: List + val folders: List, ) data class DisplayUnifiedInbox( val unreadMessageCount: Int, - val starredMessageCount: Int + val starredMessageCount: Int, ) diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/helper/BottomBaselineTextView.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/helper/BottomBaselineTextView.kt index 8769cb805a1..0d6756bce7a 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/helper/BottomBaselineTextView.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/helper/BottomBaselineTextView.kt @@ -10,7 +10,7 @@ import androidx.appcompat.widget.AppCompatTextView // Source: https://stackoverflow.com/a/62419876 class BottomBaselineTextView @JvmOverloads constructor( context: Context, - attrs: AttributeSet? = null + attrs: AttributeSet? = null, ) : AppCompatTextView(context, attrs) { override fun getBaseline(): Int { diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/helper/HtmlSettingsProvider.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/helper/HtmlSettingsProvider.kt index c9d6089ed5f..4801a51beab 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/helper/HtmlSettingsProvider.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/helper/HtmlSettingsProvider.kt @@ -8,11 +8,11 @@ import com.fsck.k9.ui.base.ThemeManager class HtmlSettingsProvider(private val themeManager: ThemeManager) { fun createForMessageView() = HtmlSettings( useDarkMode = themeManager.messageViewTheme == Theme.DARK, - useFixedWidthFont = K9.isUseMessageViewFixedWidthFont + useFixedWidthFont = K9.isUseMessageViewFixedWidthFont, ) fun createForMessageCompose() = HtmlSettings( useDarkMode = themeManager.messageComposeTheme == Theme.DARK, - useFixedWidthFont = false + useFixedWidthFont = false, ) } diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/helper/RecyclerViewBackgroundDrawable.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/helper/RecyclerViewBackgroundDrawable.kt index 6a3cda7907b..ce2067e6c55 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/helper/RecyclerViewBackgroundDrawable.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/helper/RecyclerViewBackgroundDrawable.kt @@ -35,7 +35,7 @@ class RecyclerViewBackgroundDrawable internal constructor(private val color: Int recyclerView.top.toFloat(), recyclerView.right.toFloat(), bottom.toFloat(), - paint + paint, ) } diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderListItem.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderListItem.kt index 0a801cbf3d6..b6a08c0994a 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderListItem.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderListItem.kt @@ -10,7 +10,7 @@ import com.mikepenz.fastadapter.items.AbstractItem class FolderListItem( val folderId: Long, private val folderIconResource: Int, - val displayName: String + val displayName: String, ) : AbstractItem() { override var identifier: Long = folderId override val layoutRes = R.layout.folder_list_item diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderSettingsDataStore.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderSettingsDataStore.kt index 4775b493a9e..0f731044d28 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderSettingsDataStore.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderSettingsDataStore.kt @@ -13,7 +13,7 @@ import kotlinx.coroutines.launch class FolderSettingsDataStore( private val folderRepository: FolderRepository, private val account: Account, - private var folder: FolderDetails + private var folder: FolderDetails, ) : PreferenceDataStore() { private val saveScope = CoroutineScope(GlobalScope.coroutineContext + Dispatchers.IO) diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderSettingsFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderSettingsFragment.kt index cb3beda13f3..8f88fc03f3f 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderSettingsFragment.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderSettingsFragment.kt @@ -100,7 +100,7 @@ class FolderSettingsFragment : PreferenceFragmentCompat(), ConfirmationDialogFra getString(R.string.dialog_confirm_clear_local_folder_title), getString(R.string.dialog_confirm_clear_local_folder_message), getString(R.string.dialog_confirm_clear_local_folder_action), - getString(R.string.cancel_action) + getString(R.string.cancel_action), ) dialogFragment.setTargetFragment(this, REQUEST_CLEAR_FOLDER) dialogFragment.show(requireFragmentManager(), TAG_CLEAR_FOLDER_CONFIRMATION) diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderSettingsViewModel.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderSettingsViewModel.kt index 7c047ecaa00..5b894e9fc57 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderSettingsViewModel.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderSettingsViewModel.kt @@ -20,7 +20,7 @@ private const val NO_FOLDER_ID = 0L class FolderSettingsViewModel( private val preferences: Preferences, private val folderRepository: FolderRepository, - private val messagingController: MessagingController + private val messagingController: MessagingController, ) : ViewModel() { private val actionLiveData = SingleLiveEvent() private var folderSettingsLiveData: LiveData? = null @@ -39,7 +39,7 @@ class FolderSettingsViewModel( private fun createFolderSettingsLiveData( accountUuid: String, - folderId: Long + folderId: Long, ): LiveData { return liveData(context = viewModelScope.coroutineContext) { val account = loadAccount(accountUuid) @@ -55,7 +55,7 @@ class FolderSettingsViewModel( val folderSettingsData = FolderSettingsData( folder = folderDetails.folder, - dataStore = FolderSettingsDataStore(folderRepository, account, folderDetails) + dataStore = FolderSettingsDataStore(folderRepository, account, folderDetails), ) emit(folderSettingsData) } diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/ManageFoldersActivity.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/ManageFoldersActivity.kt index 7ee3744893d..66d3f0b6b12 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/ManageFoldersActivity.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/ManageFoldersActivity.kt @@ -29,7 +29,7 @@ class ManageFoldersActivity : K9Activity() { navController = findNavController(R.id.nav_host_fragment) val fragmentArguments = bundleOf( - ManageFoldersFragment.EXTRA_ACCOUNT to accountUuid + ManageFoldersFragment.EXTRA_ACCOUNT to accountUuid, ) navController.setGraph(R.navigation.navigation_manage_folders, fragmentArguments) diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/ManageFoldersFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/ManageFoldersFragment.kt index 094dcba5584..98654350907 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/ManageFoldersFragment.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/ManageFoldersFragment.kt @@ -89,7 +89,7 @@ class ManageFoldersFragment : Fragment() { private fun openFolderSettings(folderId: Long) { val folderSettingsArguments = bundleOf( FolderSettingsFragment.EXTRA_ACCOUNT to account.uuid, - FolderSettingsFragment.EXTRA_FOLDER_ID to folderId + FolderSettingsFragment.EXTRA_FOLDER_ID to folderId, ) findNavController().navigate(R.id.action_manageFoldersScreen_to_folderSettingsScreen, folderSettingsArguments) } diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/FolderNameItem.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/FolderNameItem.kt index 054344df9ad..deb3b30bfb8 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/FolderNameItem.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/FolderNameItem.kt @@ -10,7 +10,7 @@ import com.mikepenz.fastadapter.items.AbstractItem internal class FolderNameItem( val displayName: String, - @DrawableRes val iconResourceId: Int + @DrawableRes val iconResourceId: Int, ) : AbstractItem() { override val type: Int = R.id.message_details_folder_name override val layoutRes = R.layout.message_details_folder_name_item diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/KoinModule.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/KoinModule.kt index afa9f2f4a4d..b1a854dc854 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/KoinModule.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/KoinModule.kt @@ -14,7 +14,7 @@ val messageDetailsUiModule = module { clipboardManager = get(), accountManager = get(), participantFormatter = get(), - folderNameFormatter = get() + folderNameFormatter = get(), ) } factory { ContactSettingsProvider() } diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsFragment.kt index 7650f2acab2..8dd1345f976 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsFragment.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsFragment.kt @@ -57,7 +57,7 @@ class MessageDetailsFragment : ToolbarBottomSheetDialogFragment() { override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? + savedInstanceState: Bundle?, ): View? { return inflater.inflate(R.layout.message_bottom_sheet, container, false) } @@ -161,7 +161,7 @@ class MessageDetailsFragment : ToolbarBottomSheetDialogFragment() { private fun ItemAdapter.addParticipants( participants: List, @StringRes title: Int, - showContactPicture: Boolean + showContactPicture: Boolean, ) { if (participants.isNotEmpty()) { val extraText = if (participants.size > 1) participants.size.toString() else null @@ -176,7 +176,7 @@ class MessageDetailsFragment : ToolbarBottomSheetDialogFragment() { private fun ItemAdapter.addFolderName(folder: FolderInfoUi) { val folderNameItem = FolderNameItem( displayName = folder.displayName, - iconResourceId = folderIconProvider.getFolderIcon(folder.type) + iconResourceId = folderIconProvider.getFolderIcon(folder.type), ) add(folderNameItem) } @@ -194,7 +194,7 @@ class MessageDetailsFragment : ToolbarBottomSheetDialogFragment() { v: View, position: Int, fastAdapter: FastAdapter, - item: CryptoStatusItem + item: CryptoStatusItem, ) { if (item.cryptoDetails.isClickable) { viewModel.onCryptoStatusClicked() @@ -330,7 +330,7 @@ class MessageDetailsFragment : ToolbarBottomSheetDialogFragment() { fun create(messageReference: MessageReference): MessageDetailsFragment { return MessageDetailsFragment().withArguments( - ARG_REFERENCE to messageReference.toIdentityString() + ARG_REFERENCE to messageReference.toIdentityString(), ) } } diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsParticipantFormatter.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsParticipantFormatter.kt index 87aed541477..761f75082cf 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsParticipantFormatter.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsParticipantFormatter.kt @@ -18,7 +18,7 @@ internal interface MessageDetailsParticipantFormatter { internal class RealMessageDetailsParticipantFormatter( private val contactNameProvider: ContactNameProvider, private val showContactNames: Boolean, - private val contactNameColor: Int? + private val contactNameColor: Int?, ) : MessageDetailsParticipantFormatter { override fun getDisplayName(address: Address, account: Account): CharSequence? { val identityDisplayName = account.findIdentity(address)?.name @@ -47,11 +47,11 @@ internal class RealMessageDetailsParticipantFormatter( } internal fun createMessageDetailsParticipantFormatter( - contactNameProvider: ContactNameProvider + contactNameProvider: ContactNameProvider, ): MessageDetailsParticipantFormatter { return RealMessageDetailsParticipantFormatter( contactNameProvider = contactNameProvider, showContactNames = K9.isShowContactName, - contactNameColor = if (K9.isChangeContactNameColor) K9.contactNameColor else null + contactNameColor = if (K9.isChangeContactNameColor) K9.contactNameColor else null, ) } diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsUi.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsUi.kt index d07369f5343..7b2c8dcfa5a 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsUi.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsUi.kt @@ -14,18 +14,18 @@ data class MessageDetailsUi( val to: List, val cc: List, val bcc: List, - val folder: FolderInfoUi? + val folder: FolderInfoUi?, ) data class CryptoDetails( val cryptoStatus: MessageCryptoDisplayStatus, - val isClickable: Boolean + val isClickable: Boolean, ) data class Participant( val displayName: CharSequence?, val emailAddress: String, - val contactLookupUri: Uri? + val contactLookupUri: Uri?, ) { val isInContacts: Boolean get() = contactLookupUri != null @@ -36,5 +36,5 @@ data class Participant( data class FolderInfoUi( val displayName: String, - val type: FolderType + val type: FolderType, ) diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsViewModel.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsViewModel.kt index c3348e0f894..30553770663 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsViewModel.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsViewModel.kt @@ -36,7 +36,7 @@ internal class MessageDetailsViewModel( private val clipboardManager: ClipboardManager, private val accountManager: AccountManager, private val participantFormatter: MessageDetailsParticipantFormatter, - private val folderNameFormatter: FolderNameFormatter + private val folderNameFormatter: FolderNameFormatter, ) : ViewModel() { private val dateFormat = DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.MEDIUM, Locale.getDefault()) private val uiState = MutableStateFlow(MessageDetailsState.Loading) @@ -63,12 +63,12 @@ internal class MessageDetailsViewModel( to = messageDetails.to.toParticipants(account), cc = messageDetails.cc.toParticipants(account), bcc = messageDetails.bcc.toParticipants(account), - folder = folder?.toFolderInfo() + folder = folder?.toFolderInfo(), ) MessageDetailsState.DataLoaded( showContactPicture = contactSettingsProvider.isShowContactPicture, - details = messageDetailsUi + details = messageDetailsUi, ) } catch (e: Exception) { MessageDetailsState.Error @@ -91,7 +91,7 @@ internal class MessageDetailsViewModel( return CryptoDetails( cryptoStatus = messageCryptoDisplayStatus, isClickable = messageCryptoDisplayStatus.hasAssociatedKey() || messageCryptoDisplayStatus.isUnknownKey || - hasOpenPgpInsecureWarningPendingIntent() + hasOpenPgpInsecureWarningPendingIntent(), ) } @@ -103,7 +103,7 @@ internal class MessageDetailsViewModel( Participant( displayName = displayName, emailAddress = emailAddress, - contactLookupUri = contacts.getContactUri(emailAddress) + contactLookupUri = contacts.getContactUri(emailAddress), ) } } @@ -111,7 +111,7 @@ internal class MessageDetailsViewModel( private fun Folder.toFolderInfo(): FolderInfoUi { return FolderInfoUi( displayName = folderNameFormatter.displayName(this), - type = this.type + type = this.type, ) } @@ -155,7 +155,7 @@ sealed interface MessageDetailsState { object Error : MessageDetailsState data class DataLoaded( val showContactPicture: Boolean, - val details: MessageDetailsUi + val details: MessageDetailsUi, ) : MessageDetailsState } diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/ParticipantItem.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/ParticipantItem.kt index ff93d06ea4c..40ff82831d8 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/ParticipantItem.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/ParticipantItem.kt @@ -13,7 +13,7 @@ import com.mikepenz.fastadapter.items.AbstractItem internal class ParticipantItem( private val contactPictureLoader: ContactPictureLoader, private val showContactsPicture: Boolean, - val participant: Participant + val participant: Participant, ) : AbstractItem() { override val type: Int = R.id.message_details_participant override val layoutRes = R.layout.message_details_participant_item diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/SectionHeaderItem.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/SectionHeaderItem.kt index 487aba72907..0e2e7846ef9 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/SectionHeaderItem.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/SectionHeaderItem.kt @@ -8,7 +8,7 @@ import com.mikepenz.fastadapter.items.AbstractItem internal class SectionHeaderItem( private val title: String, - private val extra: String? + private val extra: String?, ) : AbstractItem() { override val type: Int = R.id.message_details_section_header override val layoutRes = R.layout.message_details_section_header_item diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/KoinModule.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/KoinModule.kt index 487fcea1c55..11aa93041e5 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/KoinModule.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/KoinModule.kt @@ -11,7 +11,7 @@ val messageListUiModule = module { preferences = get(), localStoreProvider = get(), messageListRepository = get(), - messageHelper = get() + messageHelper = get(), ) } factory { diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListAdapter.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListAdapter.kt index 18846ed8bb4..1a3dc0e2ba4 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListAdapter.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListAdapter.kt @@ -44,7 +44,7 @@ class MessageListAdapter internal constructor( private val contactsPictureLoader: ContactPictureLoader, private val listItemListener: MessageListItemActionListener, private val appearance: MessageListAppearance, - private val relativeDateTimeFormatter: RelativeDateTimeFormatter + private val relativeDateTimeFormatter: RelativeDateTimeFormatter, ) : RecyclerView.Adapter() { private val forwardedIcon: Drawable = theme.resolveDrawableAttribute(R.attr.messageListForwarded) @@ -54,12 +54,12 @@ class MessageListAdapter internal constructor( private val activeItemBackgroundColor: Int = theme.resolveColorAttribute( colorAttrId = R.attr.messageListActiveItemBackgroundColor, alphaFractionAttrId = R.attr.messageListActiveItemBackgroundAlphaFraction, - backgroundColorAttrId = R.attr.messageListActiveItemBackgroundAlphaBackground + backgroundColorAttrId = R.attr.messageListActiveItemBackgroundAlphaBackground, ) private val selectedItemBackgroundColor: Int = theme.resolveColorAttribute( colorAttrId = R.attr.messageListSelectedBackgroundColor, alphaFractionAttrId = R.attr.messageListSelectedBackgroundAlphaFraction, - backgroundColorAttrId = R.attr.messageListSelectedBackgroundAlphaBackground + backgroundColorAttrId = R.attr.messageListSelectedBackgroundAlphaBackground, ) private val regularItemBackgroundColor: Int = theme.resolveColorAttribute(R.attr.messageListRegularItemBackgroundColor) private val readItemBackgroundColor: Int = theme.resolveColorAttribute(R.attr.messageListReadItemBackgroundColor) @@ -79,7 +79,7 @@ class MessageListAdapter internal constructor( } val diffResult = DiffUtil.calculateDiff( - MessageListDiffCallback(oldMessageList = oldMessageList, newMessageList = value) + MessageListDiffCallback(oldMessageList = oldMessageList, newMessageList = value), ) diffResult.dispatchUpdatesTo(this) } @@ -379,7 +379,7 @@ class MessageListAdapter internal constructor( ForegroundColorSpan(previewTextColor), beforePreviewLength, previewText.length, - Spannable.SPAN_EXCLUSIVE_EXCLUSIVE + Spannable.SPAN_EXCLUSIVE_EXCLUSIVE, ) } @@ -524,7 +524,7 @@ class MessageListAdapter internal constructor( private class MessageListDiffCallback( private val oldMessageList: List, - private val newMessageList: List + private val newMessageList: List, ) : DiffUtil.Callback() { override fun getOldListSize(): Int = oldMessageList.size diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListAppearance.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListAppearance.kt index d7ee9cc38d8..f3638cf4bba 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListAppearance.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListAppearance.kt @@ -10,5 +10,5 @@ data class MessageListAppearance( val showContactPicture: Boolean, val showingThreadedList: Boolean, val backGroundAsReadIndicator: Boolean, - val showAccountChip: Boolean + val showAccountChip: Boolean, ) diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListConfig.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListConfig.kt index 8d8ad2d2721..71cc0bbd416 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListConfig.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListConfig.kt @@ -11,10 +11,10 @@ data class MessageListConfig( val sortAscending: Boolean, val sortDateAscending: Boolean, val activeMessage: MessageReference?, - val sortOverrides: Map + val sortOverrides: Map, ) data class MessageSortOverride( val isRead: Boolean, - val isStarred: Boolean + val isStarred: Boolean, ) diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListFragment.kt index a389f70405d..28c0553eb55 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListFragment.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListFragment.kt @@ -244,7 +244,7 @@ class MessageListFragment : contactsPictureLoader = ContactPicture.getContactPictureLoader(), listItemListener = this, appearance = messageListAppearance, - relativeDateTimeFormatter = RelativeDateTimeFormatter(requireContext(), clock) + relativeDateTimeFormatter = RelativeDateTimeFormatter(requireContext(), clock), ).apply { activeMessage = this@MessageListFragment.activeMessage } @@ -343,8 +343,8 @@ class MessageListFragment : swipeRightAction = K9.swipeRightAction, swipeLeftAction = K9.swipeLeftAction, adapter, - swipeListener - ) + swipeListener, + ), ) itemTouchHelper.attachToRecyclerView(recyclerView) @@ -409,7 +409,7 @@ class MessageListFragment : sortAscending, sortDateAscending, activeMessage, - viewModel.messageSortOverrides.toMap() + viewModel.messageSortOverrides.toMap(), ) viewModel.loadMessageList(config) } @@ -505,7 +505,7 @@ class MessageListFragment : account, currentFolder.databaseId, loadSearchResults, - activityListener + activityListener, ) } } @@ -554,7 +554,7 @@ class MessageListFragment : outState.putBoolean(STATE_REMOTE_SEARCH_PERFORMED, isRemoteSearch) outState.putStringArray( STATE_ACTIVE_MESSAGES, - activeMessages?.map(MessageReference::toIdentityString)?.toTypedArray() + activeMessages?.map(MessageReference::toIdentityString)?.toTypedArray(), ) if (activeMessage != null) { outState.putString(STATE_ACTIVE_MESSAGE, activeMessage!!.toIdentityString()) @@ -570,7 +570,7 @@ class MessageListFragment : showContactPicture = K9.isShowContactPicture, showingThreadedList = showingThreadedList, backGroundAsReadIndicator = K9.isUseBackgroundAsUnreadIndicator, - showAccountChip = isShowAccountChip + showAccountChip = isShowAccountChip, ) private fun getFolderInfoHolder(folderId: Long, account: Account): FolderInfoHolder { @@ -627,7 +627,7 @@ class MessageListFragment : queryString, null, null, - activityListener + activityListener, ) invalidateMenu() @@ -709,7 +709,8 @@ class MessageListFragment : when (requestCode) { ACTIVITY_CHOOSE_FOLDER_MOVE, - ACTIVITY_CHOOSE_FOLDER_COPY -> { + ACTIVITY_CHOOSE_FOLDER_COPY, + -> { if (data == null) return val destinationFolderId = data.getLongExtra(ChooseFolderActivity.RESULT_SELECTED_FOLDER_ID, -1L) @@ -756,7 +757,7 @@ class MessageListFragment : val message = resources.getQuantityString( R.plurals.dialog_confirm_spam_message, selectionSize, - selectionSize + selectionSize, ) val confirmText = getString(R.string.dialog_confirm_spam_confirm_button) val cancelText = getString(R.string.dialog_confirm_spam_cancel_button) @@ -768,7 +769,7 @@ class MessageListFragment : val message = resources.getQuantityString( R.plurals.dialog_confirm_delete_messages, selectionSize, - selectionSize + selectionSize, ) val confirmText = getString(R.string.dialog_confirm_delete_confirm_button) val cancelText = getString(R.string.dialog_confirm_delete_cancel_button) @@ -1048,7 +1049,7 @@ class MessageListFragment : sourceFolderId = folderId, accountUuid = messages.first().accountUuid, lastSelectedFolderId = null, - messages = messages + messages = messages, ) } @@ -1071,7 +1072,7 @@ class MessageListFragment : sourceFolderId = folderId, accountUuid = messages.first().accountUuid, lastSelectedFolderId = null, - messages = messages + messages = messages, ) } @@ -1081,7 +1082,7 @@ class MessageListFragment : sourceFolderId: Long?, accountUuid: String, lastSelectedFolderId: Long?, - messages: List + messages: List, ) { val action = when (operation) { FolderOperation.COPY -> ChooseFolderActivity.Action.COPY @@ -1094,7 +1095,7 @@ class MessageListFragment : currentFolderId = sourceFolderId, scrollToFolderId = lastSelectedFolderId, showDisplayableOnly = false, - messageReference = null + messageReference = null, ) // remember the selected messages for #onActivityResult @@ -1154,7 +1155,7 @@ class MessageListFragment : val toast = Toast.makeText( activity, R.string.move_copy_cannot_copy_unsynced_message, - Toast.LENGTH_LONG + Toast.LENGTH_LONG, ) toast.show() return false @@ -1286,7 +1287,7 @@ class MessageListFragment : currentFolder!!.databaseId, 0, searchAccount.remoteSearchNumResults, - null + null, ) } catch (e: Exception) { // Since the user is going back, log and squash any exceptions. @@ -1546,7 +1547,7 @@ class MessageListFragment : messageSortOverrides.addLast(existingEntry) } else { messageSortOverrides.addLast( - messageReference to MessageSortOverride(messageListItem.isRead, messageListItem.isStarred) + messageReference to MessageSortOverride(messageListItem.isRead, messageListItem.isStarred), ) if (messageSortOverrides.size > MAXIMUM_MESSAGE_SORT_OVERRIDES) { messageSortOverrides.removeFirst() @@ -1707,7 +1708,7 @@ class MessageListFragment : folderId: Long, numResults: Int, maxResults: Int, - extraResults: List? + extraResults: List?, ) { handler.progress(false) handler.remoteSearchFinished() @@ -1728,7 +1729,7 @@ class MessageListFragment : R.plurals.remote_search_downloading_limited, maxResults, maxResults, - numResults + numResults, ) } else { resources.getQuantityString(R.plurals.remote_search_downloading, numResults, numResults) @@ -1760,7 +1761,7 @@ class MessageListFragment : account: Account, folderServerId: String, completed: Int, - total: Int + total: Int, ) { synchronized(lock) { folderCompleted = completed @@ -1774,7 +1775,7 @@ class MessageListFragment : account: Account, folderServerId: String, total: Int, - completed: Int + completed: Int, ) { synchronized(lock) { folderCompleted = 0 @@ -2024,7 +2025,7 @@ class MessageListFragment : } private enum class Error(@StringRes val errorText: Int) { - FolderNotFound(R.string.message_list_error_folder_not_found) + FolderNotFound(R.string.message_list_error_folder_not_found), } interface MessageListFragmentListener { @@ -2061,7 +2062,7 @@ class MessageListFragment : arguments = bundleOf( ARG_SEARCH to search, ARG_IS_THREAD_DISPLAY to isThreadDisplay, - ARG_THREADED_LIST to threadedList + ARG_THREADED_LIST to threadedList, ) } } diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListItem.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListItem.kt index d83b045aa59..42e5a9f1f68 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListItem.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListItem.kt @@ -23,7 +23,7 @@ data class MessageListItem( val folderId: Long, val messageUid: String, val databaseId: Long, - val threadRoot: Long + val threadRoot: Long, ) { val messageReference: MessageReference get() = MessageReference(account.uuid, folderId, messageUid) diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListItemAnimator.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListItemAnimator.kt index af65ac4a793..3967bc3a54a 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListItemAnimator.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListItemAnimator.kt @@ -15,7 +15,7 @@ class MessageListItemAnimator : DefaultItemAnimator() { fromX: Int, fromY: Int, toX: Int, - toY: Int + toY: Int, ): Boolean { if (oldHolder == newHolder && newHolder.wasSwiped) { // Don't touch views currently being swiped diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListItemMapper.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListItemMapper.kt index 9292d708db7..d27521e0bbe 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListItemMapper.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListItemMapper.kt @@ -9,7 +9,7 @@ import com.fsck.k9.ui.helper.DisplayAddressHelper class MessageListItemMapper( private val messageHelper: MessageHelper, - private val account: Account + private val account: Account, ) : MessageMapper { override fun map(message: MessageDetailsAccessor): MessageListItem { @@ -46,7 +46,7 @@ class MessageListItemMapper( message.folderId, message.messageServerId, message.id, - message.threadRoot + message.threadRoot, ) } diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListLiveData.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListLiveData.kt index bf757521d24..38f614abc99 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListLiveData.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListLiveData.kt @@ -15,7 +15,7 @@ class MessageListLiveData( private val preferences: Preferences, private val messageListRepository: MessageListRepository, private val coroutineScope: CoroutineScope, - val config: MessageListConfig + val config: MessageListConfig, ) : LiveData() { private val messageListChangedListener = MessageListChangedListener { diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListLiveDataFactory.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListLiveDataFactory.kt index af995910f10..1d947aa6c5d 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListLiveDataFactory.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListLiveDataFactory.kt @@ -7,7 +7,7 @@ import kotlinx.coroutines.CoroutineScope class MessageListLiveDataFactory( private val messageListLoader: MessageListLoader, private val preferences: Preferences, - private val messageListRepository: MessageListRepository + private val messageListRepository: MessageListRepository, ) { fun create(coroutineScope: CoroutineScope, config: MessageListConfig): MessageListLiveData { return MessageListLiveData(messageListLoader, preferences, messageListRepository, coroutineScope, config) diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListLoader.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListLoader.kt index 595e3f115a7..a59cb0a1bcf 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListLoader.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListLoader.kt @@ -17,7 +17,7 @@ class MessageListLoader( private val preferences: Preferences, private val localStoreProvider: LocalStoreProvider, private val messageListRepository: MessageListRepository, - private val messageHelper: MessageHelper + private val messageHelper: MessageHelper, ) { fun getMessageList(config: MessageListConfig): MessageListInfo { diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListSwipeCallback.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListSwipeCallback.kt index 9c2311284d2..b6a89a7ba90 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListSwipeCallback.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListSwipeCallback.kt @@ -25,7 +25,7 @@ class MessageListSwipeCallback( private val swipeRightAction: SwipeAction, private val swipeLeftAction: SwipeAction, private val adapter: MessageListAdapter, - private val listener: MessageListSwipeListener + private val listener: MessageListSwipeListener, ) : ItemTouchHelper.Callback() { private val swipePadding = context.resources.getDimension(R.dimen.messageListSwipeIconPadding).toInt() private val swipeThreshold = context.resources.getDimension(R.dimen.messageListSwipeThreshold) @@ -63,7 +63,7 @@ class MessageListSwipeCallback( override fun onMove( recyclerView: RecyclerView, viewHolder: ViewHolder, - target: ViewHolder + target: ViewHolder, ): Boolean { throw UnsupportedOperationException("not implemented") } @@ -128,7 +128,7 @@ class MessageListSwipeCallback( dY: Float, actionState: Int, isCurrentlyActive: Boolean, - success: Boolean + success: Boolean, ) { val view = viewHolder.itemView val viewWidth = view.width @@ -158,7 +158,7 @@ class MessageListSwipeCallback( 0F, width.toFloat(), height.toFloat(), - backgroundColorPaint + backgroundColorPaint, ) } @@ -230,7 +230,7 @@ class MessageListSwipeCallback( recyclerView: RecyclerView, animationType: Int, animateDx: Float, - animateDy: Float + animateDy: Float, ): Long { val percentage = abs(animateDx) / recyclerView.width return (super.getAnimationDuration(recyclerView, animationType, animateDx, animateDy) * percentage).toLong() diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagesource/MessageHeadersFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagesource/MessageHeadersFragment.kt index 3f0142be6fc..b66020578e6 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagesource/MessageHeadersFragment.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagesource/MessageHeadersFragment.kt @@ -39,7 +39,7 @@ class MessageHeadersFragment : Fragment() { owner = this, loadingView = view.findViewById(R.id.message_headers_loading), errorView = view.findViewById(R.id.message_headers_error), - dataView = view.findViewById(R.id.message_headers_data) + dataView = view.findViewById(R.id.message_headers_data), ) { headers -> populateHeadersList(messageHeaderView, headers) } @@ -68,7 +68,7 @@ class MessageHeadersFragment : Fragment() { fun newInstance(reference: MessageReference): MessageHeadersFragment { return MessageHeadersFragment().withArguments( - ARG_REFERENCE to reference.toIdentityString() + ARG_REFERENCE to reference.toIdentityString(), ) } } diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/Direction.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/Direction.kt index 62431d38716..172ecf0a585 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/Direction.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/Direction.kt @@ -2,5 +2,5 @@ package com.fsck.k9.ui.messageview enum class Direction { PREVIOUS, - NEXT + NEXT, } diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/DisplayRecipientsExtractor.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/DisplayRecipientsExtractor.kt index 100fed4fd84..95a10e4925f 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/DisplayRecipientsExtractor.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/DisplayRecipientsExtractor.kt @@ -12,7 +12,7 @@ import com.fsck.k9.mail.Message */ internal class DisplayRecipientsExtractor( private val recipientFormatter: MessageViewRecipientFormatter, - private val maxNumberOfDisplayRecipients: Int + private val maxNumberOfDisplayRecipients: Int, ) { fun extractDisplayRecipients(message: Message, account: Account): DisplayRecipients { val toRecipients = message.getRecipients(Message.RecipientType.TO) @@ -54,5 +54,5 @@ internal class DisplayRecipientsExtractor( internal data class DisplayRecipients( val recipientNames: List, - val numberOfRecipients: Int + val numberOfRecipients: Int, ) diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/LinkTextHandler.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/LinkTextHandler.kt index b5bfd669483..3e347e8ddfd 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/LinkTextHandler.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/LinkTextHandler.kt @@ -8,7 +8,7 @@ import com.fsck.k9.ui.R internal class LinkTextHandler( private val context: Context, - private val clipboardManager: ClipboardManager + private val clipboardManager: ClipboardManager, ) : Handler() { override fun handleMessage(message: Message) { diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageContainerView.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageContainerView.kt index ca68a3b5a25..53af38f2691 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageContainerView.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageContainerView.kt @@ -114,7 +114,7 @@ class MessageContainerView(context: Context, attrs: AttributeSet?) : private fun createLinkMenu( menu: ContextMenu, webView: WebView, - linkUrl: String? + linkUrl: String?, ) { if (linkUrl == null) return @@ -148,28 +148,28 @@ class MessageContainerView(context: Context, attrs: AttributeSet?) : Menu.NONE, MENU_ITEM_LINK_VIEW, 0, - context.getString(R.string.webview_contextmenu_link_view_action) + context.getString(R.string.webview_contextmenu_link_view_action), ).setOnMenuItemClickListener(listener) menu.add( Menu.NONE, MENU_ITEM_LINK_SHARE, 1, - context.getString(R.string.webview_contextmenu_link_share_action) + context.getString(R.string.webview_contextmenu_link_share_action), ).setOnMenuItemClickListener(listener) menu.add( Menu.NONE, MENU_ITEM_LINK_COPY, 2, - context.getString(R.string.webview_contextmenu_link_copy_action) + context.getString(R.string.webview_contextmenu_link_copy_action), ).setOnMenuItemClickListener(listener) menu.add( Menu.NONE, MENU_ITEM_LINK_TEXT_COPY, 3, - context.getString(R.string.webview_contextmenu_link_text_copy_action) + context.getString(R.string.webview_contextmenu_link_text_copy_action), ).setOnMenuItemClickListener(listener) } @@ -217,7 +217,7 @@ class MessageContainerView(context: Context, attrs: AttributeSet?) : Menu.NONE, MENU_ITEM_IMAGE_VIEW, 0, - context.getString(R.string.webview_contextmenu_image_view_action) + context.getString(R.string.webview_contextmenu_image_view_action), ).setOnMenuItemClickListener(listener) if (inlineImage || imageUri.scheme?.lowercase() in supportedDownloadUriSchemes) { @@ -238,7 +238,7 @@ class MessageContainerView(context: Context, attrs: AttributeSet?) : Menu.NONE, MENU_ITEM_IMAGE_COPY, 2, - context.getString(R.string.webview_contextmenu_image_copy_action) + context.getString(R.string.webview_contextmenu_image_copy_action), ).setOnMenuItemClickListener(listener) } } @@ -271,21 +271,21 @@ class MessageContainerView(context: Context, attrs: AttributeSet?) : Menu.NONE, MENU_ITEM_PHONE_CALL, 0, - context.getString(R.string.webview_contextmenu_phone_call_action) + context.getString(R.string.webview_contextmenu_phone_call_action), ).setOnMenuItemClickListener(listener) menu.add( Menu.NONE, MENU_ITEM_PHONE_SAVE, 1, - context.getString(R.string.webview_contextmenu_phone_save_action) + context.getString(R.string.webview_contextmenu_phone_save_action), ).setOnMenuItemClickListener(listener) menu.add( Menu.NONE, MENU_ITEM_PHONE_COPY, 2, - context.getString(R.string.webview_contextmenu_phone_copy_action) + context.getString(R.string.webview_contextmenu_phone_copy_action), ).setOnMenuItemClickListener(listener) } @@ -317,21 +317,21 @@ class MessageContainerView(context: Context, attrs: AttributeSet?) : Menu.NONE, MENU_ITEM_EMAIL_SEND, 0, - context.getString(R.string.webview_contextmenu_email_send_action) + context.getString(R.string.webview_contextmenu_email_send_action), ).setOnMenuItemClickListener(listener) menu.add( Menu.NONE, MENU_ITEM_EMAIL_SAVE, 1, - context.getString(R.string.webview_contextmenu_email_save_action) + context.getString(R.string.webview_contextmenu_email_save_action), ).setOnMenuItemClickListener(listener) menu.add( Menu.NONE, MENU_ITEM_EMAIL_COPY, 2, - context.getString(R.string.webview_contextmenu_email_copy_action) + context.getString(R.string.webview_contextmenu_email_copy_action), ).setOnMenuItemClickListener(listener) } @@ -383,7 +383,7 @@ class MessageContainerView(context: Context, attrs: AttributeSet?) : onRenderingFinishedListener: OnRenderingFinishedListener, loadPictures: Boolean, hideUnsignedTextDivider: Boolean, - attachmentCallback: AttachmentViewCallback? + attachmentCallback: AttachmentViewCallback?, ) { this.attachmentCallback = attachmentCallback @@ -407,7 +407,7 @@ class MessageContainerView(context: Context, attrs: AttributeSet?) : displayHtmlContentWithInlineAttachments( htmlText = textToDisplay, attachmentResolver = messageViewInfo.attachmentResolver, - onPageFinishedListener = onRenderingFinishedListener::onLoadFinished + onPageFinishedListener = onRenderingFinishedListener::onLoadFinished, ) if (!messageViewInfo.extraText.isNullOrEmpty()) { @@ -420,7 +420,7 @@ class MessageContainerView(context: Context, attrs: AttributeSet?) : private fun displayHtmlContentWithInlineAttachments( htmlText: String, attachmentResolver: AttachmentResolver, - onPageFinishedListener: OnPageFinishedListener + onPageFinishedListener: OnPageFinishedListener, ) { currentHtmlText = htmlText currentAttachmentResolver = attachmentResolver @@ -433,7 +433,7 @@ class MessageContainerView(context: Context, attrs: AttributeSet?) : messageContentView.displayHtmlContentWithInlineAttachments( htmlText = htmlText, attachmentResolver = currentAttachmentResolver, - onPageFinishedListener = null + onPageFinishedListener = null, ) } @@ -441,7 +441,7 @@ class MessageContainerView(context: Context, attrs: AttributeSet?) : messageContentView.displayHtmlContentWithInlineAttachments( htmlText = "", attachmentResolver = null, - onPageFinishedListener = null + onPageFinishedListener = null, ) unsignedTextContainer.isVisible = false @@ -459,7 +459,7 @@ class MessageContainerView(context: Context, attrs: AttributeSet?) : val attachmentView = layoutInflater.inflate( R.layout.message_view_attachment, attachmentsContainer, - false + false, ) as AttachmentView attachmentView.setCallback(attachmentCallback) @@ -480,7 +480,7 @@ class MessageContainerView(context: Context, attrs: AttributeSet?) : val lockedAttachmentView = layoutInflater.inflate( R.layout.message_view_attachment_locked, attachmentsContainer, - false + false, ) as LockedAttachmentView lockedAttachmentView.setCallback(attachmentCallback) diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageTopView.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageTopView.kt index b138f01e13e..a63932d3f41 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageTopView.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageTopView.kt @@ -31,7 +31,7 @@ import com.fsck.k9.view.ToolableViewAnimator class MessageTopView( context: Context, - attrs: AttributeSet? + attrs: AttributeSet?, ) : LinearLayout(context, attrs) { private lateinit var layoutInflater: LayoutInflater @@ -112,7 +112,7 @@ class MessageTopView( val view = layoutInflater.inflate( R.layout.message_container, containerView, - false + false, ) as MessageContainerView containerView.addView(view) @@ -126,7 +126,7 @@ class MessageTopView( }, loadPictures, hideUnsignedTextDivider, - attachmentCallback + attachmentCallback, ) if (view.hasHiddenExternalImages && !showPicturesButtonClicked) { @@ -280,7 +280,7 @@ class MessageTopView( progressBar, "progress", progressBar.progress, - PROGRESS_MAX + PROGRESS_MAX, ) animator.addListener(object : AnimatorListenerAdapter() { override fun onAnimationEnd(animator: Animator) { diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewContainerFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewContainerFragment.kt index f2caf1b71b8..375dc294f74 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewContainerFragment.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewContainerFragment.kt @@ -235,13 +235,13 @@ class MessageViewContainerFragment : Fragment() { private class MessageViewContainerAdapter( fragment: Fragment, - private val showAccountChip: Boolean + private val showAccountChip: Boolean, ) : FragmentStateAdapter(fragment) { var messageList: List = emptyList() set(value) { val diffResult = DiffUtil.calculateDiff( - MessageListDiffCallback(oldMessageList = messageList, newMessageList = value) + MessageListDiffCallback(oldMessageList = messageList, newMessageList = value), ) field = value @@ -283,7 +283,7 @@ class MessageViewContainerFragment : Fragment() { private class MessageListDiffCallback( private val oldMessageList: List, - private val newMessageList: List + private val newMessageList: List, ) : DiffUtil.Callback() { override fun getOldListSize(): Int = oldMessageList.size @@ -314,7 +314,7 @@ class MessageViewContainerFragment : Fragment() { fun newInstance(reference: MessageReference, showAccountChip: Boolean): MessageViewContainerFragment { return MessageViewContainerFragment().withArguments( ARG_REFERENCE to reference.toIdentityString(), - ARG_SHOW_ACCOUNT_CHIP to showAccountChip + ARG_SHOW_ACCOUNT_CHIP to showAccountChip, ) } } diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt index 73f3d5a4ed6..f8f22ad1206 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt @@ -130,7 +130,7 @@ class MessageViewFragment : context = requireContext().applicationContext, loaderManager = loaderManager, fragmentManager = parentFragmentManager, - callback = messageLoaderCallbacks + callback = messageLoaderCallbacks, ) setFragmentResultListener(MessageDetailsFragment.FRAGMENT_RESULT_KEY, ::onMessageDetailsResult) @@ -339,7 +339,7 @@ class MessageViewFragment : val handledByCryptoPresenter = messageCryptoPresenter.maybeHandleShowMessage( messageTopView, account, - messageViewInfo + messageViewInfo, ) if (!handledByCryptoPresenter) { @@ -463,7 +463,7 @@ class MessageViewFragment : fragmentListener.onReply( messageReference = message.makeMessageReference(), - decryptionResultForReply = messageCryptoPresenter.decryptionResultForReply + decryptionResultForReply = messageCryptoPresenter.decryptionResultForReply, ) } @@ -472,7 +472,7 @@ class MessageViewFragment : fragmentListener.onReplyAll( messageReference = message.makeMessageReference(), - decryptionResultForReply = messageCryptoPresenter.decryptionResultForReply + decryptionResultForReply = messageCryptoPresenter.decryptionResultForReply, ) } @@ -481,7 +481,7 @@ class MessageViewFragment : fragmentListener.onForward( messageReference = message.makeMessageReference(), - decryptionResultForReply = messageCryptoPresenter.decryptionResultForReply + decryptionResultForReply = messageCryptoPresenter.decryptionResultForReply, ) } @@ -490,7 +490,7 @@ class MessageViewFragment : fragmentListener.onForwardAsAttachment( messageReference = message.makeMessageReference(), - decryptionResultForReply = messageCryptoPresenter.decryptionResultForReply + decryptionResultForReply = messageCryptoPresenter.decryptionResultForReply, ) } @@ -555,7 +555,7 @@ class MessageViewFragment : currentFolderId = messageReference.folderId, scrollToFolderId = account.lastSelectedFolderId, showDisplayableOnly = false, - messageReference = messageReference + messageReference = messageReference, ) startActivityForResult(intent, requestCode) @@ -679,7 +679,7 @@ class MessageViewFragment : title, message, confirmText, - cancelText + cancelText, ) } R.id.dialog_confirm_spam -> { @@ -692,7 +692,7 @@ class MessageViewFragment : title, message, confirmText, - cancelText + cancelText, ) } R.id.dialog_attachment_progress -> { @@ -826,7 +826,7 @@ class MessageViewFragment : fillIntent: Intent?, flagsMask: Int, flagValues: Int, - extraFlags: Int + extraFlags: Int, ) { if (requestCode == null) { requireActivity().startIntentSender(intentSender, fillIntent, flagsMask, flagValues, extraFlags) @@ -840,7 +840,7 @@ class MessageViewFragment : fillIntent, flagsMask, flagValues, - extraFlags + extraFlags, ) } @@ -922,7 +922,7 @@ class MessageViewFragment : fillIntent: Intent?, flagsMask: Int, flagValues: Int, - extraFlags: Int + extraFlags: Int, ): Boolean { if (!isActive) return false @@ -935,7 +935,7 @@ class MessageViewFragment : fillIntent, flagsMask, flagValues, - extraFlags + extraFlags, ) } catch (e: SendIntentException) { Timber.e(e, "Irrecoverable error calling PendingIntent!") @@ -996,7 +996,7 @@ class MessageViewFragment : fun newInstance(reference: MessageReference, showAccountChip: Boolean): MessageViewFragment { return MessageViewFragment().withArguments( ARG_REFERENCE to reference.toIdentityString(), - ARG_SHOW_ACCOUNT_CHIP to showAccountChip + ARG_SHOW_ACCOUNT_CHIP to showAccountChip, ) } } diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewRecipientFormatter.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewRecipientFormatter.kt index f438cb0aeca..546012c1f25 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewRecipientFormatter.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewRecipientFormatter.kt @@ -23,7 +23,7 @@ internal class RealMessageViewRecipientFormatter( private val showCorrespondentNames: Boolean, private val showContactNames: Boolean, private val contactNameColor: Int?, - private val meText: String + private val meText: String, ) : MessageViewRecipientFormatter { override fun getDisplayName(address: Address, account: Account): CharSequence { val identity = account.findIdentity(address) @@ -78,13 +78,13 @@ internal class RealMessageViewRecipientFormatter( internal fun createMessageViewRecipientFormatter( contactNameProvider: ContactNameProvider, - resources: Resources + resources: Resources, ): MessageViewRecipientFormatter { return RealMessageViewRecipientFormatter( contactNameProvider = contactNameProvider, showCorrespondentNames = K9.isShowCorrespondentNames, showContactNames = K9.isShowContactName, contactNameColor = if (K9.isChangeContactNameColor) K9.contactNameColor else null, - meText = resources.getString(R.string.message_view_me_text) + meText = resources.getString(R.string.message_view_me_text), ) } diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/RecipientLayoutCreator.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/RecipientLayoutCreator.kt index 179caaae88e..f8f2c4ddf56 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/RecipientLayoutCreator.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/RecipientLayoutCreator.kt @@ -21,12 +21,12 @@ internal class RecipientLayoutCreator( private val maxNumberOfRecipientNames: Int, private val recipientsPrefix: String, private val additionalRecipientSpacing: Int, - private val additionalRecipientsPrefix: String + private val additionalRecipientsPrefix: String, ) { fun createRecipientLayout( recipientNames: List, totalNumberOfRecipients: Int, - availableWidth: Int + availableWidth: Int, ): RecipientLayoutData { require(recipientNames.isNotEmpty()) @@ -38,7 +38,7 @@ internal class RecipientLayoutCreator( return RecipientLayoutData( recipientNames = displayRecipientsBuilder, - additionalRecipients = null + additionalRecipients = null, ) } @@ -63,7 +63,7 @@ internal class RecipientLayoutCreator( if (doesTextFitAvailableWidth(displayRecipientsBuilder, additionalRecipientsBuilder, availableWidth)) { return RecipientLayoutData( recipientNames = displayRecipientsBuilder, - additionalRecipients = additionalRecipientsBuilder.toStringOrNull() + additionalRecipients = additionalRecipientsBuilder.toStringOrNull(), ) } } @@ -74,14 +74,14 @@ internal class RecipientLayoutCreator( return RecipientLayoutData( recipientNames = displayRecipientsBuilder, - additionalRecipients = "$additionalRecipientsPrefix${totalNumberOfRecipients - 1}" + additionalRecipients = "$additionalRecipientsPrefix${totalNumberOfRecipients - 1}", ) } private fun doesTextFitAvailableWidth( displayRecipients: CharSequence, additionalRecipients: CharSequence, - availableWidth: Int + availableWidth: Int, ): Boolean { val recipientNamesWidth = textMeasure.measureRecipientNames(displayRecipients) if (recipientNamesWidth > availableWidth) { @@ -103,7 +103,7 @@ private fun StringBuilder.toStringOrNull(): String? { internal data class RecipientLayoutData( val recipientNames: CharSequence, - val additionalRecipients: String? + val additionalRecipients: String?, ) internal interface TextMeasure { diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/RecipientNamesView.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/RecipientNamesView.kt index 9c8eb53ccff..5c82354de2b 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/RecipientNamesView.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/RecipientNamesView.kt @@ -70,7 +70,7 @@ class RecipientNamesView(context: Context, attrs: AttributeSet?) : ViewGroup(con maxNumberOfRecipientNames = MAX_NUMBER_OF_RECIPIENT_NAMES, recipientsPrefix = context.getString(R.string.message_view_recipient_prefix), additionalRecipientSpacing = additionRecipientSpacing, - additionalRecipientsPrefix = context.getString(R.string.message_view_additional_recipient_prefix) + additionalRecipientsPrefix = context.getString(R.string.message_view_additional_recipient_prefix), ) if (isInEditMode) { @@ -79,7 +79,7 @@ class RecipientNamesView(context: Context, attrs: AttributeSet?) : ViewGroup(con "Katherine Johnson", "Margaret Hamilton", "Adele Goldberg", - "Steve Shirley" + "Steve Shirley", ) numberOfRecipients = 8 } @@ -122,7 +122,7 @@ class RecipientNamesView(context: Context, attrs: AttributeSet?) : ViewGroup(con val recipientLayoutData = recipientLayoutCreator.createRecipientLayout( recipientNames, numberOfRecipients, - availableWidth + availableWidth, ) recipientNameTextView.text = recipientLayoutData.recipientNames @@ -134,7 +134,7 @@ class RecipientNamesView(context: Context, attrs: AttributeSet?) : ViewGroup(con recipientCountTextView.measure( MeasureSpec.makeMeasureSpec(availableWidth, MeasureSpec.AT_MOST), - MeasureSpec.makeMeasureSpec(measuredHeight, MeasureSpec.AT_MOST) + MeasureSpec.makeMeasureSpec(measuredHeight, MeasureSpec.AT_MOST), ) remainingWidth = availableWidth - additionRecipientSpacing - recipientCountTextView.measuredWidth @@ -145,7 +145,7 @@ class RecipientNamesView(context: Context, attrs: AttributeSet?) : ViewGroup(con recipientNameTextView.measure( MeasureSpec.makeMeasureSpec(remainingWidth, MeasureSpec.AT_MOST), - MeasureSpec.makeMeasureSpec(measuredHeight, MeasureSpec.AT_MOST) + MeasureSpec.makeMeasureSpec(measuredHeight, MeasureSpec.AT_MOST), ) if (layoutDirection == LAYOUT_DIRECTION_LTR) { @@ -154,14 +154,14 @@ class RecipientNamesView(context: Context, attrs: AttributeSet?) : ViewGroup(con 0, 0, recipientNameRight, - recipientNameTextView.measuredHeight + recipientNameTextView.measuredHeight, ) val recipientCountLeft = recipientNameRight + additionRecipientSpacing recipientCountTextView.layout( recipientCountLeft, 0, recipientCountLeft + recipientCountTextView.measuredWidth, - recipientCountTextView.measuredHeight + recipientCountTextView.measuredHeight, ) } else { val recipientNameLeft = width - recipientNameTextView.measuredWidth @@ -169,14 +169,14 @@ class RecipientNamesView(context: Context, attrs: AttributeSet?) : ViewGroup(con recipientNameLeft, 0, right, - recipientNameTextView.measuredHeight + recipientNameTextView.measuredHeight, ) val recipientCountRight = recipientNameLeft - additionRecipientSpacing recipientCountTextView.layout( recipientCountRight - recipientCountTextView.measuredWidth, 0, recipientCountRight, - 0 + recipientCountTextView.measuredHeight + 0 + recipientCountTextView.measuredHeight, ) } } diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/notification/DeleteConfirmationActivity.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/notification/DeleteConfirmationActivity.kt index 380dd48303d..f01f559fac6 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/notification/DeleteConfirmationActivity.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/notification/DeleteConfirmationActivity.kt @@ -60,7 +60,7 @@ class DeleteConfirmationActivity : K9Activity(ThemeType.DIALOG), ConfirmationDia getString(R.string.dialog_confirm_delete_title), message, getString(R.string.dialog_confirm_delete_confirm_button), - getString(R.string.dialog_confirm_delete_cancel_button) + getString(R.string.dialog_confirm_delete_cancel_button), ) } diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/permissions/Permission.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/permissions/Permission.kt index d3e4595b902..390de548b73 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/permissions/Permission.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/permissions/Permission.kt @@ -10,12 +10,12 @@ enum class Permission( val permission: String, val requestCode: Int, @param:StringRes val rationaleTitle: Int, - @param:StringRes val rationaleMessage: Int + @param:StringRes val rationaleMessage: Int, ) { READ_CONTACTS( Manifest.permission.READ_CONTACTS, PERMISSIONS_REQUEST_READ_CONTACTS, R.string.permission_contacts_rationale_title, - R.string.permission_contacts_rationale_message - ); + R.string.permission_contacts_rationale_message, + ), } diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/permissions/PermissionRationaleDialogFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/permissions/PermissionRationaleDialogFragment.kt index fe82f945241..85510ea09ee 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/permissions/PermissionRationaleDialogFragment.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/permissions/PermissionRationaleDialogFragment.kt @@ -27,7 +27,7 @@ class PermissionRationaleDialogFragment : DialogFragment() { val permissionUiHelper = requireActivity() as? PermissionUiHelper ?: throw AssertionError( "Activities using PermissionRationaleDialogFragment need to " + - "implement PermissionUiHelper" + "implement PermissionUiHelper", ) permissionUiHelper.requestPermission(permission) diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/push/PushInfoFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/push/PushInfoFragment.kt index 188226792b7..247f9ca740b 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/push/PushInfoFragment.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/push/PushInfoFragment.kt @@ -41,7 +41,7 @@ class PushInfoFragment : Fragment() { val configureNotificationText = getString(R.string.push_info_configure_notification_text) notificationTextView.text = getString( R.string.push_info_notification_explanation_text, - configureNotificationText + configureNotificationText, ) val configureNotificationButton = view.findViewById