From 605289aca490beb122e47d34d1e62d69368e93f3 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Mon, 6 Feb 2023 11:04:40 -0400 Subject: [PATCH] Upgrade ktlint and add twitter compose rules. --- .editorconfig | 1 + app/build.gradle | 3 +- .../changenumber/ChangeNumberViewModelTest.kt | 2 +- .../conversation/ConversationItemPreviewer.kt | 4 +- .../database/MmsTableTest_stories.kt | 8 +- ...entTableTest_processPnpTupleToChangeSet.kt | 41 ++-- .../securesms/database/StorySendTableTest.kt | 6 +- .../securesms/jobs/PreKeysSyncJobTest.kt | 8 +- .../securesms/testing/RxTestSchedulerRule.kt | 2 +- .../securesms/testing/TestProtos.kt | 2 +- .../securesms/absbackup/SignalBackupAgent.kt | 2 +- .../thoughtcrime/securesms/avatar/Avatar.kt | 4 +- .../thoughtcrime/securesms/avatar/Avatars.kt | 2 +- .../avatar/picker/AvatarPickerFragment.kt | 3 +- .../avatar/text/TextAvatarCreationState.kt | 2 +- .../vector/VectorAvatarCreationState.kt | 2 +- .../gifts/ExpiredGiftSheetConfiguration.kt | 3 +- .../badges/gifts/flow/GiftFlowViewModel.kt | 2 +- .../received/ViewReceivedGiftBottomSheet.kt | 6 +- .../viewgift/sent/ViewSentGiftBottomSheet.kt | 3 +- .../securesms/badges/models/Badge.kt | 2 +- .../securesms/components/menu/ActionItem.kt | 2 +- .../components/menu/ContextMenuList.kt | 2 +- .../components/menu/SignalContextMenu.kt | 2 +- .../SegmentedProgressBar.kt | 14 +- .../components/segmentedprogressbar/Utils.kt | 1 - .../components/settings/DSLSettingsIcon.kt | 2 +- .../settings/app/AppSettingsFragment.kt | 1 - .../app/account/AccountSettingsFragment.kt | 1 - .../ChangeNumberEnterPhoneNumberFragment.kt | 4 +- .../app/chats/ChatsSettingsFragment.kt | 1 - .../app/chats/sms/SmsSettingsFragment.kt | 1 - .../NotificationsSettingsFragment.kt | 1 - .../NotificationProfileSelectionFragment.kt | 1 - .../EditNotificationProfileFragment.kt | 2 +- ...EditNotificationProfileScheduleFragment.kt | 2 +- .../NotificationProfileDetailsFragment.kt | 1 - .../app/privacy/PrivacySettingsFragment.kt | 8 +- .../AdvancedPrivacySettingsFragment.kt | 1 - .../advanced/AdvancedPrivacySettingsState.kt | 2 +- .../expire/ExpireTimerSettingsState.kt | 2 +- .../settings/app/subscription/boost/Boost.kt | 6 +- .../donate/DonateToSignalViewModel.kt | 3 +- .../donate/DonationCheckoutDelegate.kt | 3 +- .../DonationWebViewOnBackPressedCallback.kt | 2 +- .../YourInformationIsPrivateBottomSheet.kt | 1 - .../errors/DonationErrorParams.kt | 27 ++- .../manage/ManageDonationsFragment.kt | 3 +- ...ForYourSupportBottomSheetDialogFragment.kt | 2 +- .../app/wrapped/SettingsWrapperFragment.kt | 1 - .../ConversationSettingsActivity.kt | 2 +- .../ConversationSettingsFragment.kt | 1 - .../conversation/ConversationSettingsState.kt | 2 +- .../ConversationSettingsViewModel.kt | 5 +- .../InternalConversationSettingsFragment.kt | 2 +- .../PermissionsSettingsFragment.kt | 1 - .../preferences/BioTextPreference.kt | 2 +- .../preferences/InternalPreference.kt | 2 +- .../SoundsAndNotificationsSettingsFragment.kt | 1 - .../CustomNotificationsSettingsFragment.kt | 1 - .../CustomNotificationsSettingsState.kt | 2 +- .../securesms/components/settings/dsl.kt | 4 +- .../components/settings/models/Text.kt | 2 +- .../webrtc/CallParticipantsState.kt | 2 - .../ComposeBottomSheetDialogFragment.kt | 2 +- .../contacts/paged/ContactSearchMediator.kt | 2 +- .../contacts/paged/GroupsInCommon.kt | 4 +- .../conversation/ConversationContextMenu.kt | 4 +- .../ConversationItemDisplayMode.kt | 4 +- .../conversation/ConversationItemSelection.kt | 6 +- .../ScheduleMessageTimePickerBottomSheet.kt | 2 +- .../conversation/SelectedConversationModel.kt | 2 +- .../conversation/colors/ChatColorsPalette.kt | 11 +- .../colors/RecyclerViewColorizer.kt | 12 +- .../CustomChatColorCreatorPageFragment.kt | 7 +- .../custom/CustomChatColorGradientToolView.kt | 2 - .../conversation/drafts/DraftState.kt | 4 +- .../forward/MultiselectForwardViewModel.kt | 2 +- .../database/DistributionListTables.kt | 14 +- .../database/LocalMetricsDatabase.kt | 3 +- .../database/MessageSendLogTables.kt | 2 +- .../database/NotificationProfileTables.kt | 4 +- .../securesms/database/PnpOperations.kt | 1 + .../securesms/database/RecipientTable.kt | 10 +- .../securesms/database/SearchTable.kt | 2 +- .../database/SenderKeySharedTable.kt | 2 +- .../securesms/database/SenderKeyTable.kt | 2 +- .../database/SqlCipherErrorHandler.kt | 5 +- .../securesms/database/StorySendTable.kt | 2 +- .../securesms/database/ThreadTable.kt | 56 +++-- .../migration/V149_LegacyMigrations.kt | 6 +- .../securesms/emoji/EmojiRemote.kt | 2 +- .../securesms/events/WebRtcViewModel.kt | 1 + .../securesms/fonts/FontManifest.kt | 2 +- .../org/thoughtcrime/securesms/fonts/Fonts.kt | 4 +- .../securesms/fonts/TypefaceHelper.kt | 2 +- .../jobs/RetrieveRemoteAnnouncementsJob.kt | 4 +- .../sticker/KeyboardStickerListAdapter.kt | 2 +- .../securesms/keyvalue/AccountValues.kt | 5 +- .../keyvalue/PlainTextSharedPrefsDataStore.kt | 1 + .../mediapreview/MediaPreviewV2Adapter.kt | 2 +- .../mediapreview/MediaPreviewV2State.kt | 2 +- .../mediapreview/MediaPreviewV2ViewModel.kt | 4 +- .../caption/ExpandingCaptionView.kt | 2 +- .../mediasend/v2/MediaSelectionActivity.kt | 2 +- .../mediasend/v2/MediaSelectionRepository.kt | 4 +- .../v2/gallery/MediaGalleryViewModel.kt | 6 +- .../v2/review/AddMessageDialogFragment.kt | 1 - .../v2/review/MediaReviewFragment.kt | 10 +- .../v2/stories/ChooseStoryTypeBottomSheet.kt | 3 +- .../v2/text/TextStoryBackgroundColors.kt | 30 ++- .../v2/text/TextStoryPostCreationState.kt | 2 +- .../securesms/megaphone/MegaphoneText.kt | 3 +- .../securesms/mms/OutgoingMessage.kt | 8 +- .../v2/DefaultMessageNotifier.kt | 6 + .../manage/UsernameShareBottomSheet.kt | 2 +- .../push/SignalServiceNetworkAccess.kt | 30 +-- .../util/RegistrationNumberInputController.kt | 4 +- .../releasechannel/ReleaseChannel.kt | 1 - .../service/webrtc/AndroidTelecomUtil.kt | 2 +- .../service/webrtc/state/LocalDeviceState.kt | 2 +- .../webrtc/state/WebRtcEphemeralState.kt | 2 +- .../securesms/stories/dialogs/StoryDialogs.kt | 16 +- .../stories/landing/StoriesLandingItem.kt | 1 - .../landing/StoriesLandingRepository.kt | 10 +- .../create/CreateStoryNameFieldItem.kt | 2 +- .../BaseStoryRecipientSelectionFragment.kt | 2 +- .../story/StoriesPrivacySettingsState.kt | 2 +- .../story/StoriesPrivacySettingsViewModel.kt | 2 +- .../stories/viewer/AddToGroupStoryDelegate.kt | 2 +- .../stories/viewer/StoryViewerViewModel.kt | 2 +- .../stories/viewer/page/StoryDisplay.kt | 2 + .../viewer/page/StoryViewerPageFragment.kt | 8 +- .../viewer/reply/composer/StoryReactionBar.kt | 1 - .../reply/group/StoryGroupReplyFragment.kt | 1 - .../reply/reaction/OnReactionSentView.kt | 2 +- .../securesms/subscription/Subscription.kt | 2 +- .../securesms/util/JavaTimeExtensions.kt | 2 +- .../video/exo/SimpleExoPlayerPool.kt | 8 +- .../audio/FullSignalAudioManagerApi31.kt | 3 +- .../securesms/SpinnerApplicationContext.kt | 2 +- .../backup/FullBackupExporterTest.kt | 12 +- .../backup/FullBackupImporterTest.kt | 14 +- .../donate/card/CreditCardTextWatcherTest.kt | 2 +- .../donate/card/CreditCardTypeTest.kt | 2 +- .../paged/ContactSearchPagedDataSourceTest.kt | 2 +- .../ConversationItemTest_linkifyUrlLinks.kt | 2 +- .../ContactSearchSelectionBuilderTest.kt | 3 +- .../securesms/database/GroupTestUtil.kt | 1 - .../database/RecipientDatabaseTestUtils.kt | 2 +- .../securesms/database/TestMms.kt | 2 +- .../securesms/fonts/TextToScriptTest.kt | 2 +- .../securesms/keyvalue/PaymentsValuesTest.kt | 3 +- .../mediasend/MediaRepositoryTest.kt | 5 +- .../RemoteMegaphoneRepositoryTest.kt | 2 +- .../securesms/recipients/BaseRecipientTest.kt | 3 +- .../viewer/StoryViewerViewModelTest.kt | 10 +- .../testing/ProxySQLCipherOpenHelper.kt | 2 +- .../util/NameUtil_getAbbreviation.kt | 2 +- build.gradle | 2 +- contacts/app/build.gradle | 2 +- contacts/lib/build.gradle | 2 +- .../contacts/SystemContactsRepository.kt | 4 +- dependencies.gradle | 1 + gradle/verification-metadata.xml | 209 ++++++++++++------ .../main/java/org/signal/qr/QrProcessor.kt | 1 + signalModule.gradle | 3 +- signalModuleApp.gradle | 4 +- .../signal/smsexporter/SmsExportService.kt | 6 +- .../mms/ExportMmsRecipientsUseCase.kt | 2 +- spinner/app/build.gradle | 2 +- spinner/lib/build.gradle | 2 +- .../java/org/signal/spinner/PluginResult.kt | 2 +- .../java/org/signal/spinner/SpinnerServer.kt | 4 +- 174 files changed, 574 insertions(+), 373 deletions(-) diff --git a/.editorconfig b/.editorconfig index 9e408524b..59d1f7aa8 100644 --- a/.editorconfig +++ b/.editorconfig @@ -2,3 +2,4 @@ root = true [*.kt] indent_size = 2 +twitter_compose_allowed_composition_locals=LocalExtendedColors \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 75a1dd1f9..e61b37067 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -61,7 +61,7 @@ wire { ktlint { // Use a newer version to resolve https://github.com/JLLeitschuh/ktlint-gradle/issues/507 - version = "0.43.2" + version = "0.47.1" } def canonicalVersionCode = 1213 @@ -596,6 +596,7 @@ dependencies { androidTestUtil testLibs.androidx.test.orchestrator implementation project(':core-ui') + ktlintRuleset libs.ktlint.twitter.compose } def getLastCommitTimestamp() { diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberViewModelTest.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberViewModelTest.kt index 00fc4f7fd..12771adec 100644 --- a/app/src/androidTest/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberViewModelTest.kt +++ b/app/src/androidTest/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberViewModelTest.kt @@ -113,7 +113,7 @@ class ChangeNumberViewModelTest { InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers( Get("/v1/devices") { MockResponse().success(MockProvider.primaryOnlyDeviceList) }, - Put("/v1/accounts/number") { MockResponse().failure(500) }, + Put("/v1/accounts/number") { MockResponse().failure(500) } ) // WHEN diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/conversation/ConversationItemPreviewer.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/conversation/ConversationItemPreviewer.kt index ed5ae0683..5e741f466 100644 --- a/app/src/androidTest/java/org/thoughtcrime/securesms/conversation/ConversationItemPreviewer.kt +++ b/app/src/androidTest/java/org/thoughtcrime/securesms/conversation/ConversationItemPreviewer.kt @@ -69,7 +69,7 @@ class ConversationItemPreviewer { sentTimeMillis = System.currentTimeMillis(), serverTimeMillis = System.currentTimeMillis(), receivedTimeMillis = System.currentTimeMillis(), - attachments = PointerAttachment.forPointers(Optional.of(attachments)), + attachments = PointerAttachment.forPointers(Optional.of(attachments)) ) SignalDatabase.messages.insertSecureDecryptedMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(other)).get() @@ -88,7 +88,7 @@ class ConversationItemPreviewer { sentTimeMillis = System.currentTimeMillis(), serverTimeMillis = System.currentTimeMillis(), receivedTimeMillis = System.currentTimeMillis(), - attachments = PointerAttachment.forPointers(Optional.of(attachments)), + attachments = PointerAttachment.forPointers(Optional.of(attachments)) ) val insert = SignalDatabase.messages.insertSecureDecryptedMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(other)).get() diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/database/MmsTableTest_stories.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/database/MmsTableTest_stories.kt index 45e29814e..c20399199 100644 --- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/MmsTableTest_stories.kt +++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/MmsTableTest_stories.kt @@ -128,7 +128,7 @@ class MmsTableTest_stories { sentTimeMillis = 2, serverTimeMillis = 2, receivedTimeMillis = 2, - storyType = StoryType.STORY_WITH_REPLIES, + storyType = StoryType.STORY_WITH_REPLIES ), -1L ).get().messageId @@ -160,7 +160,7 @@ class MmsTableTest_stories { sentTimeMillis = System.currentTimeMillis(), serverTimeMillis = 2, receivedTimeMillis = 2, - storyType = StoryType.STORY_WITH_REPLIES, + storyType = StoryType.STORY_WITH_REPLIES ), -1L ).get().messageId @@ -174,7 +174,7 @@ class MmsTableTest_stories { sentTimeMillis = System.currentTimeMillis(), serverTimeMillis = 2, receivedTimeMillis = 2, - storyType = StoryType.STORY_WITH_REPLIES, + storyType = StoryType.STORY_WITH_REPLIES ), -1L ).get().messageId @@ -219,7 +219,7 @@ class MmsTableTest_stories { sentTimeMillis = 200, serverTimeMillis = 2, receivedTimeMillis = 2, - storyType = StoryType.STORY_WITH_REPLIES, + storyType = StoryType.STORY_WITH_REPLIES ), -1L ) diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest_processPnpTupleToChangeSet.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest_processPnpTupleToChangeSet.kt index bac0d2b30..bfd304df2 100644 --- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest_processPnpTupleToChangeSet.kt +++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest_processPnpTupleToChangeSet.kt @@ -296,7 +296,7 @@ class RecipientTableTest_processPnpTupleToChangeSet { PnpChangeSet( id = PnpIdResolver.PnpNoopId(result.id), operations = linkedSetOf( - PnpOperation.SetE164(result.id, E164_A), + PnpOperation.SetE164(result.id, E164_A) ) ), result.changeSet @@ -407,7 +407,7 @@ class RecipientTableTest_processPnpTupleToChangeSet { val result = applyAndAssert( listOf( Input(E164_A, null, null), - Input(null, PNI_A, null), + Input(null, PNI_A, null) ), Update(E164_A, PNI_A, null), Output(E164_A, PNI_A, null) @@ -432,7 +432,7 @@ class RecipientTableTest_processPnpTupleToChangeSet { val result = applyAndAssert( listOf( Input(E164_A, null, null), - Input(null, PNI_A, null), + Input(null, PNI_A, null) ), Update(E164_A, PNI_A, ACI_A), Output(E164_A, PNI_A, ACI_A) @@ -461,7 +461,7 @@ class RecipientTableTest_processPnpTupleToChangeSet { val result = applyAndAssert( listOf( Input(E164_A, null, null), - Input(E164_B, PNI_A, null), + Input(E164_B, PNI_A, null) ), Update(E164_A, PNI_A, null), Output(E164_A, PNI_A, null) @@ -475,7 +475,7 @@ class RecipientTableTest_processPnpTupleToChangeSet { PnpOperation.SetPni( recipientId = result.firstId, pni = PNI_A - ), + ) ) ), result.changeSet @@ -487,7 +487,7 @@ class RecipientTableTest_processPnpTupleToChangeSet { val result = applyAndAssert( listOf( Input(E164_A, PNI_B, null), - Input(null, PNI_A, null), + Input(null, PNI_A, null) ), Update(E164_A, PNI_A, null), Output(E164_A, PNI_A, null) @@ -501,7 +501,7 @@ class RecipientTableTest_processPnpTupleToChangeSet { PnpOperation.Merge( primaryId = result.firstId, secondaryId = result.secondId - ), + ) ) ), result.changeSet @@ -513,7 +513,7 @@ class RecipientTableTest_processPnpTupleToChangeSet { val result = applyAndAssert( listOf( Input(E164_A, PNI_B, null), - Input(E164_B, PNI_A, null), + Input(E164_B, PNI_A, null) ), Update(E164_A, PNI_A, null), Output(E164_A, PNI_A, null) @@ -536,7 +536,7 @@ class RecipientTableTest_processPnpTupleToChangeSet { val result = applyAndAssert( listOf( Input(E164_A, PNI_B, null, pniSession = true), - Input(E164_B, PNI_A, null, pniSession = true), + Input(E164_B, PNI_A, null, pniSession = true) ), Update(E164_A, PNI_A, null), Output(E164_A, PNI_A, null) @@ -561,7 +561,7 @@ class RecipientTableTest_processPnpTupleToChangeSet { val result = applyAndAssert( listOf( Input(E164_A, PNI_A, null), - Input(null, null, ACI_A), + Input(null, null, ACI_A) ), Update(E164_A, PNI_A, ACI_A), Output(E164_A, PNI_A, ACI_A) @@ -574,7 +574,7 @@ class RecipientTableTest_processPnpTupleToChangeSet { PnpOperation.Merge( primaryId = result.secondId, secondaryId = result.firstId - ), + ) ) ), result.changeSet @@ -586,7 +586,7 @@ class RecipientTableTest_processPnpTupleToChangeSet { val result = applyAndAssert( listOf( Input(E164_B, PNI_A, null), - Input(null, null, ACI_A), + Input(null, null, ACI_A) ), Update(E164_A, PNI_A, ACI_A), Output(E164_A, PNI_A, ACI_A) @@ -599,11 +599,11 @@ class RecipientTableTest_processPnpTupleToChangeSet { PnpOperation.RemovePni(result.firstId), PnpOperation.SetPni( recipientId = result.secondId, - pni = PNI_A, + pni = PNI_A ), PnpOperation.SetE164( recipientId = result.secondId, - e164 = E164_A, + e164 = E164_A ) ) ), @@ -616,7 +616,7 @@ class RecipientTableTest_processPnpTupleToChangeSet { val result = applyAndAssert( listOf( Input(E164_B, PNI_A, null), - Input(E164_C, null, ACI_A), + Input(E164_C, null, ACI_A) ), Update(E164_A, PNI_A, ACI_A), Output(E164_A, PNI_A, ACI_A) @@ -629,11 +629,11 @@ class RecipientTableTest_processPnpTupleToChangeSet { PnpOperation.RemovePni(result.firstId), PnpOperation.SetPni( recipientId = result.secondId, - pni = PNI_A, + pni = PNI_A ), PnpOperation.SetE164( recipientId = result.secondId, - e164 = E164_A, + e164 = E164_A ), PnpOperation.ChangeNumberInsert( recipientId = result.secondId, @@ -651,7 +651,7 @@ class RecipientTableTest_processPnpTupleToChangeSet { val result = applyAndAssert( listOf( Input(E164_A, PNI_A, null), - Input(E164_B, PNI_B, ACI_A), + Input(E164_B, PNI_B, ACI_A) ), Update(E164_A, PNI_A, ACI_A), Output(E164_A, PNI_A, ACI_A) @@ -683,7 +683,7 @@ class RecipientTableTest_processPnpTupleToChangeSet { val result = applyAndAssert( listOf( Input(E164_A, PNI_A, null), - Input(E164_B, null, ACI_A), + Input(E164_B, null, ACI_A) ), Update(E164_A, PNI_A, ACI_A), Output(E164_A, PNI_A, ACI_A) @@ -726,7 +726,8 @@ class RecipientTableTest_processPnpTupleToChangeSet { private fun insertMockSessionFor(account: ServiceId, address: ServiceId) { SignalDatabase.rawDatabase.insert( - SessionTable.TABLE_NAME, null, + SessionTable.TABLE_NAME, + null, contentValuesOf( SessionTable.ACCOUNT_ID to account.toString(), SessionTable.ADDRESS to address.toString(), diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/database/StorySendTableTest.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/database/StorySendTableTest.kt index d8a2fecb3..b482a30cf 100644 --- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/StorySendTableTest.kt +++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/StorySendTableTest.kt @@ -65,17 +65,17 @@ class StorySendTableTest { messageId1 = MmsHelper.insert( recipient = distributionListRecipient1, - storyType = StoryType.STORY_WITHOUT_REPLIES, + storyType = StoryType.STORY_WITHOUT_REPLIES ) messageId2 = MmsHelper.insert( recipient = distributionListRecipient2, - storyType = StoryType.STORY_WITH_REPLIES, + storyType = StoryType.STORY_WITH_REPLIES ) messageId3 = MmsHelper.insert( recipient = distributionListRecipient3, - storyType = StoryType.STORY_WITHOUT_REPLIES, + storyType = StoryType.STORY_WITHOUT_REPLIES ) recipients6to15 = recipients1to10.takeLast(5) + recipients11to20.take(5) diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/jobs/PreKeysSyncJobTest.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/jobs/PreKeysSyncJobTest.kt index cfab95f4b..6b053b5bc 100644 --- a/app/src/androidTest/java/org/thoughtcrime/securesms/jobs/PreKeysSyncJobTest.kt +++ b/app/src/androidTest/java/org/thoughtcrime/securesms/jobs/PreKeysSyncJobTest.kt @@ -69,7 +69,7 @@ class PreKeysSyncJobTest { Put("/v2/keys/signed?identity=pni") { r -> pniSignedPreKey = r.parsedRequestBody() MockResponse().success() - }, + } ) // WHEN @@ -107,7 +107,7 @@ class PreKeysSyncJobTest { InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers( Get("/v2/keys?identity=aci") { MockResponse().success(PreKeyStatus(100)) }, - Get("/v2/keys?identity=pni") { MockResponse().success(PreKeyStatus(100)) }, + Get("/v2/keys?identity=pni") { MockResponse().success(PreKeyStatus(100)) } ) // WHEN @@ -134,7 +134,7 @@ class PreKeysSyncJobTest { InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers( Get("/v2/keys?identity=aci") { MockResponse().success(PreKeyStatus(100)) }, - Put("/v2/keys/signed?identity=pni") { MockResponse().success() }, + Put("/v2/keys/signed?identity=pni") { MockResponse().success() } ) // WHEN @@ -173,7 +173,7 @@ class PreKeysSyncJobTest { Put("/v2/keys/?identity=pni") { r -> pniPreKeyStateRequest = r.parsedRequestBody() MockResponse().success() - }, + } ) // WHEN diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/RxTestSchedulerRule.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/RxTestSchedulerRule.kt index 26036889a..c5c84f141 100644 --- a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/RxTestSchedulerRule.kt +++ b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/RxTestSchedulerRule.kt @@ -13,7 +13,7 @@ class RxTestSchedulerRule( val ioTestScheduler: TestScheduler = defaultTestScheduler, val computationTestScheduler: TestScheduler = defaultTestScheduler, val singleTestScheduler: TestScheduler = defaultTestScheduler, - val newThreadTestScheduler: TestScheduler = defaultTestScheduler, + val newThreadTestScheduler: TestScheduler = defaultTestScheduler ) : ExternalResource() { override fun before() { diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/TestProtos.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/TestProtos.kt index 5d2efabcd..928ec9e66 100644 --- a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/TestProtos.kt +++ b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/TestProtos.kt @@ -21,7 +21,7 @@ class TestProtos private constructor() { } fun metadata( - address: AddressProto = address().build(), + address: AddressProto = address().build() ): MetadataProto.Builder { return MetadataProto.newBuilder() .setAddress(address) diff --git a/app/src/main/java/org/thoughtcrime/securesms/absbackup/SignalBackupAgent.kt b/app/src/main/java/org/thoughtcrime/securesms/absbackup/SignalBackupAgent.kt index 2e68975ef..b1b4176f2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/absbackup/SignalBackupAgent.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/absbackup/SignalBackupAgent.kt @@ -17,7 +17,7 @@ import java.io.IOException */ class SignalBackupAgent : BackupAgent() { private val items: List = listOf( - KbsAuthTokens, + KbsAuthTokens ) override fun onBackup(oldState: ParcelFileDescriptor?, data: BackupDataOutput, newState: ParcelFileDescriptor) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/avatar/Avatar.kt b/app/src/main/java/org/thoughtcrime/securesms/avatar/Avatar.kt index ae66b114c..62cf86645 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/avatar/Avatar.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/avatar/Avatar.kt @@ -21,7 +21,7 @@ sealed class Avatar( data class Text( val text: String, val color: Avatars.ColorPair, - override val databaseId: DatabaseId, + override val databaseId: DatabaseId ) : Avatar(databaseId) { override fun withDatabaseId(databaseId: DatabaseId): Avatar { return copy(databaseId = databaseId) @@ -35,7 +35,7 @@ sealed class Avatar( data class Vector( val key: String, val color: Avatars.ColorPair, - override val databaseId: DatabaseId, + override val databaseId: DatabaseId ) : Avatar(databaseId) { override fun withDatabaseId(databaseId: DatabaseId): Avatar { return copy(databaseId = databaseId) diff --git a/app/src/main/java/org/thoughtcrime/securesms/avatar/Avatars.kt b/app/src/main/java/org/thoughtcrime/securesms/avatar/Avatars.kt index 8222e2d47..ec38196e5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/avatar/Avatars.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/avatar/Avatars.kt @@ -74,7 +74,7 @@ object Avatars { "avatar_sunset" to DefaultAvatar(R.drawable.ic_avatar_sunset, "A120"), "avatar_surfboard" to DefaultAvatar(R.drawable.ic_avatar_surfboard, "A110"), "avatar_soccerball" to DefaultAvatar(R.drawable.ic_avatar_soccerball, "A130"), - "avatar_football" to DefaultAvatar(R.drawable.ic_avatar_football, "A220"), + "avatar_football" to DefaultAvatar(R.drawable.ic_avatar_football, "A220") ) @DrawableRes diff --git a/app/src/main/java/org/thoughtcrime/securesms/avatar/picker/AvatarPickerFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/avatar/picker/AvatarPickerFragment.kt index 0f8e145a9..1dd660c9e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/avatar/picker/AvatarPickerFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/avatar/picker/AvatarPickerFragment.kt @@ -87,8 +87,9 @@ class AvatarPickerFragment : Fragment(R.layout.avatar_picker_fragment) { val selectedPosition = items.indexOfFirst { it.isSelected } adapter.submitList(items) { - if (selectedPosition > -1) + if (selectedPosition > -1) { recycler.smoothScrollToPosition(selectedPosition) + } } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/avatar/text/TextAvatarCreationState.kt b/app/src/main/java/org/thoughtcrime/securesms/avatar/text/TextAvatarCreationState.kt index 52493ad3a..dd8a02f15 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/avatar/text/TextAvatarCreationState.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/avatar/text/TextAvatarCreationState.kt @@ -5,7 +5,7 @@ import org.thoughtcrime.securesms.avatar.AvatarColorItem import org.thoughtcrime.securesms.avatar.Avatars data class TextAvatarCreationState( - val currentAvatar: Avatar.Text, + val currentAvatar: Avatar.Text ) { fun colors(): List = Avatars.colors.map { AvatarColorItem(it, currentAvatar.color == it) } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/avatar/vector/VectorAvatarCreationState.kt b/app/src/main/java/org/thoughtcrime/securesms/avatar/vector/VectorAvatarCreationState.kt index 20da33108..1cb6c1269 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/avatar/vector/VectorAvatarCreationState.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/avatar/vector/VectorAvatarCreationState.kt @@ -5,7 +5,7 @@ import org.thoughtcrime.securesms.avatar.AvatarColorItem import org.thoughtcrime.securesms.avatar.Avatars data class VectorAvatarCreationState( - val currentAvatar: Avatar.Vector, + val currentAvatar: Avatar.Vector ) { fun colors(): List = Avatars.colors.map { AvatarColorItem(it, currentAvatar.color == it) } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/ExpiredGiftSheetConfiguration.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/ExpiredGiftSheetConfiguration.kt index b0c78501d..a422ed9bb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/ExpiredGiftSheetConfiguration.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/ExpiredGiftSheetConfiguration.kt @@ -31,7 +31,8 @@ object ExpiredGiftSheetConfiguration { textPref( title = DSLSettingsText.from( stringId = R.string.ExpiredGiftSheetConfiguration__your_badge_has_expired, - DSLSettingsText.CenterModifier, DSLSettingsText.TitleLargeModifier + DSLSettingsText.CenterModifier, + DSLSettingsText.TitleLargeModifier ) ) diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/flow/GiftFlowViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/flow/GiftFlowViewModel.kt index 6d2906978..7c073a0ba 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/flow/GiftFlowViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/flow/GiftFlowViewModel.kt @@ -117,7 +117,7 @@ class GiftFlowViewModel( private fun getLoadState( oldState: GiftFlowState, giftPrices: Map? = null, - giftBadge: Badge? = null, + giftBadge: Badge? = null ): GiftFlowState.Stage { if (oldState.stage != GiftFlowState.Stage.INIT) { return oldState.stage diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/viewgift/received/ViewReceivedGiftBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/viewgift/received/ViewReceivedGiftBottomSheet.kt index 38161f46e..144083b96 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/viewgift/received/ViewReceivedGiftBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/viewgift/received/ViewReceivedGiftBottomSheet.kt @@ -123,7 +123,8 @@ class ViewReceivedGiftBottomSheet : DSLSettingsBottomSheetFragment() { } errorDialog = DonationErrorDialogs.show( - requireContext(), throwable, + requireContext(), + throwable, object : DonationErrorDialogs.DialogCallback() { override fun onDialogDismissed() { findNavController().popBackStack() @@ -158,7 +159,8 @@ class ViewReceivedGiftBottomSheet : DSLSettingsBottomSheetFragment() { noPadTextPref( title = DSLSettingsText.from( charSequence = requireContext().getString(R.string.ViewReceivedGiftBottomSheet__s_made_a_donation_for_you, state.recipient.getShortDisplayName(requireContext())), - DSLSettingsText.CenterModifier, DSLSettingsText.TitleLargeModifier + DSLSettingsText.CenterModifier, + DSLSettingsText.TitleLargeModifier ) ) diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/viewgift/sent/ViewSentGiftBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/viewgift/sent/ViewSentGiftBottomSheet.kt index 6c850aa59..650cd6c5e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/viewgift/sent/ViewSentGiftBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/viewgift/sent/ViewSentGiftBottomSheet.kt @@ -66,7 +66,8 @@ class ViewSentGiftBottomSheet : DSLSettingsBottomSheetFragment() { noPadTextPref( title = DSLSettingsText.from( stringId = R.string.ViewSentGiftBottomSheet__thanks_for_your_support, - DSLSettingsText.CenterModifier, DSLSettingsText.TitleLargeModifier + DSLSettingsText.CenterModifier, + DSLSettingsText.TitleLargeModifier ) ) diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/models/Badge.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/models/Badge.kt index 5baa02008..2b616b49f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/badges/models/Badge.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/badges/models/Badge.kt @@ -133,7 +133,7 @@ data class Badge( .downsample(DownsampleStrategy.NONE) .diskCacheStrategy(DiskCacheStrategy.NONE) .transform( - BadgeSpriteTransformation(BadgeSpriteTransformation.Size.BADGE_64, model.badge.imageDensity, ThemeUtil.isDarkTheme(context)), + BadgeSpriteTransformation(BadgeSpriteTransformation.Size.BADGE_64, model.badge.imageDensity, ThemeUtil.isDarkTheme(context)) ) .into(badge) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/menu/ActionItem.kt b/app/src/main/java/org/thoughtcrime/securesms/components/menu/ActionItem.kt index 2b7bdfe95..a7fd9758e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/menu/ActionItem.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/menu/ActionItem.kt @@ -11,5 +11,5 @@ data class ActionItem @JvmOverloads constructor( @DrawableRes val iconRes: Int, val title: CharSequence, @ColorRes val tintRes: Int = R.color.signal_colorOnSurface, - val action: Runnable, + val action: Runnable ) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/menu/ContextMenuList.kt b/app/src/main/java/org/thoughtcrime/securesms/components/menu/ContextMenuList.kt index ee9e240a5..4d5e01f75 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/menu/ContextMenuList.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/menu/ContextMenuList.kt @@ -65,7 +65,7 @@ class ContextMenuList(recyclerView: RecyclerView, onItemClick: () -> Unit) { private class ItemViewHolder( itemView: View, - private val onItemClick: () -> Unit, + private val onItemClick: () -> Unit ) : MappingViewHolder(itemView) { val icon: ImageView = itemView.findViewById(R.id.signal_context_menu_item_icon) val title: TextView = itemView.findViewById(R.id.signal_context_menu_item_title) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/menu/SignalContextMenu.kt b/app/src/main/java/org/thoughtcrime/securesms/components/menu/SignalContextMenu.kt index 650a0d5b3..b01a3acc9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/menu/SignalContextMenu.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/menu/SignalContextMenu.kt @@ -36,7 +36,7 @@ class SignalContextMenu private constructor( private val contextMenuList = ContextMenuList( recyclerView = contentView.findViewById(R.id.signal_context_menu_list), - onItemClick = { dismiss() }, + onItemClick = { dismiss() } ) init { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/segmentedprogressbar/SegmentedProgressBar.kt b/app/src/main/java/org/thoughtcrime/securesms/components/segmentedprogressbar/SegmentedProgressBar.kt index af2acd54c..a572f6fe4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/segmentedprogressbar/SegmentedProgressBar.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/segmentedprogressbar/SegmentedProgressBar.kt @@ -211,6 +211,7 @@ class SegmentedProgressBar : View, ViewPager.OnPageChangeListener, View.OnTouchL corners[6] = radius.toFloat() corners[7] = radius.toFloat() } + segments.lastIndex -> { corners.indices.forEach { corners[it] = 0f } corners[2] = radius.toFloat() @@ -227,6 +228,7 @@ class SegmentedProgressBar : View, ViewPager.OnPageChangeListener, View.OnTouchL path.addRoundRect(rectangle, corners, Path.Direction.CW) canvas?.drawPath(path, drawingComponents.second[drawingIndex]) } + else -> canvas?.drawRect( rectangle, drawingComponents.second[drawingIndex] @@ -325,12 +327,14 @@ class SegmentedProgressBar : View, ViewPager.OnPageChangeListener, View.OnTouchL segments.mapIndexed { index, segment -> if (offset > 0) { - if (index < nextSegmentIndex) segment.animationState = - Segment.AnimationState.ANIMATED + if (index < nextSegmentIndex) { + segment.animationState = Segment.AnimationState.ANIMATED + } } else if (offset < 0) { - if (index > nextSegmentIndex - 1) segment.animationState = - Segment.AnimationState.IDLE - } else if (offset == 0) { + if (index > nextSegmentIndex - 1) { + segment.animationState = Segment.AnimationState.IDLE + } + } else { if (index == nextSegmentIndex) segment.animationState = Segment.AnimationState.IDLE } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/segmentedprogressbar/Utils.kt b/app/src/main/java/org/thoughtcrime/securesms/components/segmentedprogressbar/Utils.kt index bd8974b69..cf2b888a0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/segmentedprogressbar/Utils.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/segmentedprogressbar/Utils.kt @@ -38,7 +38,6 @@ fun SegmentedProgressBar.getDrawingComponents( segment: Segment, segmentIndex: Int ): Pair, MutableList> { - val rectangles = mutableListOf() val paints = mutableListOf() val segmentWidth = segmentWidth diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsIcon.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsIcon.kt index fb0b2431e..69f4bb0d2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsIcon.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsIcon.kt @@ -32,7 +32,7 @@ sealed class DSLSettingsIcon { @ColorRes private val iconTintId: Int, @DrawableRes private val backgroundId: Int, @ColorRes private val backgroundTint: Int, - @Px private val insetPx: Int, + @Px private val insetPx: Int ) : DSLSettingsIcon() { override fun resolve(context: Context): Drawable { return LayerDrawable( diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt index d0d7c1917..df8ab77cf 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt @@ -46,7 +46,6 @@ class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__men private fun getConfiguration(state: AppSettingsState): DSLConfiguration { return configure { - customPref( BioPreference(state.self) { findNavController().safeNavigate(R.id.action_appSettingsFragment_to_manageProfileActivity) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsFragment.kt index da7d8f84f..d1be8bdec 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsFragment.kt @@ -59,7 +59,6 @@ class AccountSettingsFragment : DSLSettingsFragment(R.string.AccountSettingsFrag private fun getConfiguration(state: AccountSettingsState): DSLConfiguration { return configure { - sectionHeaderPref(R.string.preferences_app_protection__signal_pin) @Suppress("DEPRECATION") diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterPhoneNumberFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterPhoneNumberFragment.kt index 65609ac21..6fcf49204 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterPhoneNumberFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterPhoneNumberFragment.kt @@ -161,7 +161,9 @@ class ChangeNumberEnterPhoneNumberFragment : LoggingFragment(R.layout.fragment_c ContinueStatus.CAN_CONTINUE -> findNavController().safeNavigate(R.id.action_enterPhoneNumberChangeFragment_to_changePhoneNumberConfirmFragment) ContinueStatus.INVALID_NUMBER -> { Dialogs.showAlertDialog( - context, getString(R.string.RegistrationActivity_invalid_number), String.format(getString(R.string.RegistrationActivity_the_number_you_specified_s_is_invalid), viewModel.number.e164Number) + context, + getString(R.string.RegistrationActivity_invalid_number), + String.format(getString(R.string.RegistrationActivity_the_number_you_specified_s_is_invalid), viewModel.number.e164Number) ) } ContinueStatus.OLD_NUMBER_DOESNT_MATCH -> { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsFragment.kt index 081efe8b0..9415e7eec 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsFragment.kt @@ -44,7 +44,6 @@ class ChatsSettingsFragment : DSLSettingsFragment(R.string.preferences_chats__ch private fun getConfiguration(state: ChatsSettingsState): DSLConfiguration { return configure { - if (!state.useAsDefaultSmsApp) { when (state.smsExportState) { SmsExportState.FETCHING -> Unit diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/sms/SmsSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/sms/SmsSettingsFragment.kt index baef4a856..87523bb6b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/sms/SmsSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/sms/SmsSettingsFragment.kt @@ -60,7 +60,6 @@ class SmsSettingsFragment : DSLSettingsFragment(R.string.preferences__sms_mms) { private fun getConfiguration(state: SmsSettingsState): DSLConfiguration { return configure { - if (state.useAsDefaultSmsApp) { customPref( OutlinedLearnMore.Model( diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/NotificationsSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/NotificationsSettingsFragment.kt index e2b0d3058..ba57df3ed 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/NotificationsSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/NotificationsSettingsFragment.kt @@ -108,7 +108,6 @@ class NotificationsSettingsFragment : DSLSettingsFragment(R.string.preferences__ } ) } else { - clickPref( title = DSLSettingsText.from(R.string.preferences__sound), summary = DSLSettingsText.from(getRingtoneSummary(state.messageNotificationsState.sound)), diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/manual/NotificationProfileSelectionFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/manual/NotificationProfileSelectionFragment.kt index bef69a325..390d970b4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/manual/NotificationProfileSelectionFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/manual/NotificationProfileSelectionFragment.kt @@ -41,7 +41,6 @@ class NotificationProfileSelectionFragment : DSLSettingsBottomSheetFragment() { val activeProfile: NotificationProfile? = NotificationProfiles.getActiveProfile(state.notificationProfiles) return configure { - state.notificationProfiles.sortedDescending().forEach { profile -> customPref( NotificationProfileSelection.Entry( diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/EditNotificationProfileFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/EditNotificationProfileFragment.kt index c4d5f0190..26cad02fe 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/EditNotificationProfileFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/EditNotificationProfileFragment.kt @@ -148,7 +148,7 @@ class EditNotificationProfileFragment : DSLSettingsFragment(layoutId = R.layout. NotificationProfileNamePreset.Model("\uD83D\uDE34", R.string.EditNotificationProfileFragment__sleep, onClick), NotificationProfileNamePreset.Model("\uD83D\uDE97", R.string.EditNotificationProfileFragment__driving, onClick), NotificationProfileNamePreset.Model("\uD83D\uDE0A", R.string.EditNotificationProfileFragment__downtime, onClick), - NotificationProfileNamePreset.Model("\uD83D\uDCA1", R.string.EditNotificationProfileFragment__focus, onClick), + NotificationProfileNamePreset.Model("\uD83D\uDCA1", R.string.EditNotificationProfileFragment__focus, onClick) ) ) } diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/EditNotificationProfileScheduleFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/EditNotificationProfileScheduleFragment.kt index fb3bef6c0..6493384db 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/EditNotificationProfileScheduleFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/EditNotificationProfileScheduleFragment.kt @@ -41,7 +41,7 @@ private val DAY_TO_STARTING_LETTER: Map = mapOf( DayOfWeek.WEDNESDAY to R.string.EditNotificationProfileSchedule__wednesday_first_letter, DayOfWeek.THURSDAY to R.string.EditNotificationProfileSchedule__thursday_first_letter, DayOfWeek.FRIDAY to R.string.EditNotificationProfileSchedule__friday_first_letter, - DayOfWeek.SATURDAY to R.string.EditNotificationProfileSchedule__saturday_first_letter, + DayOfWeek.SATURDAY to R.string.EditNotificationProfileSchedule__saturday_first_letter ) /** diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/NotificationProfileDetailsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/NotificationProfileDetailsFragment.kt index 0face1436..1c0380194 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/NotificationProfileDetailsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/NotificationProfileDetailsFragment.kt @@ -95,7 +95,6 @@ class NotificationProfileDetailsFragment : DSLSettingsFragment() { val (profile: NotificationProfile, recipients: List, isOn: Boolean, expanded: Boolean) = state return configure { - customPref( NotificationProfilePreference.Model( title = DSLSettingsText.from(profile.name), diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsFragment.kt index a518f05b9..3d63d2dee 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsFragment.kt @@ -263,7 +263,8 @@ class PrivacySettingsFragment : DSLSettingsFragment(R.string.preferences__privac val timeoutMinutes = max(TimeUnit.MILLISECONDS.toMinutes(duration).toInt(), 1) viewModel.setObsoletePasswordTimeout(timeoutMinutes) }, - 0, TimeDurationPicker.HH_MM + 0, + TimeDurationPicker.HH_MM ).show() } ) @@ -297,7 +298,8 @@ class PrivacySettingsFragment : DSLSettingsFragment(R.string.preferences__privac val timeoutSeconds = TimeUnit.MILLISECONDS.toSeconds(duration) viewModel.setScreenLockTimeout(timeoutSeconds) }, - 0, TimeDurationPicker.HH_MM + 0, + TimeDurationPicker.HH_MM ).show() } ) @@ -328,7 +330,7 @@ class PrivacySettingsFragment : DSLSettingsFragment(R.string.preferences__privac ) textPref( - summary = DSLSettingsText.from(incognitoSummary), + summary = DSLSettingsText.from(incognitoSummary) ) dividerPref() diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsFragment.kt index e36759a04..9924c74b3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsFragment.kt @@ -107,7 +107,6 @@ class AdvancedPrivacySettingsFragment : DSLSettingsFragment(R.string.preferences private fun getConfiguration(state: AdvancedPrivacySettingsState): DSLConfiguration { return configure { - switchPref( title = DSLSettingsText.from(R.string.preferences__signal_messages_and_calls), summary = DSLSettingsText.from(getPushToggleSummary(state.isPushEnabled)), diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsState.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsState.kt index 076c12696..3f5692d2b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsState.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsState.kt @@ -24,5 +24,5 @@ enum class CensorshipCircumventionState(val available: Boolean) { AVAILABLE_AUTOMATICALLY_ENABLED(true), /** The setting is generically available */ - AVAILABLE(true), + AVAILABLE(true) } diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/expire/ExpireTimerSettingsState.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/expire/ExpireTimerSettingsState.kt index 732a08307..f8d399e66 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/expire/ExpireTimerSettingsState.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/expire/ExpireTimerSettingsState.kt @@ -7,7 +7,7 @@ data class ExpireTimerSettingsState( val userSetTimer: Int? = null, val saveState: ProcessState = ProcessState.Idle(), val isGroupCreate: Boolean = false, - val isForRecipient: Boolean = isGroupCreate, + val isForRecipient: Boolean = isGroupCreate ) { val currentTimer: Int get() = userSetTimer ?: initialTimer diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/Boost.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/Boost.kt index fd364a634..2a4a31bad 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/Boost.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/Boost.kt @@ -108,7 +108,7 @@ data class Boost( val isCustomAmountFocused: Boolean, val isCustomAmountTooSmall: Boolean, val onCustomAmountChanged: (String) -> Unit, - val onCustomAmountFocusChanged: (Boolean) -> Unit, + val onCustomAmountFocusChanged: (Boolean) -> Unit ) : PreferenceModel(isEnabled = isEnabled) { override fun areItemsTheSame(newItem: SelectionModel): Boolean = true @@ -156,7 +156,8 @@ data class Boost( error.text = context.getString( R.string.Boost__the_minimum_amount_you_can_donate_is_s, FiatMoneyUtil.format( - context.resources, model.minimumAmount, + context.resources, + model.minimumAmount, FiatMoneyUtil.formatOptions().trimZerosAfterDecimal() ) ) @@ -253,7 +254,6 @@ data class Boost( dstart: Int, dend: Int ): CharSequence? { - val result = dest.subSequence(0, dstart).toString() + source.toString() + dest.subSequence(dend, dest.length) val resultWithoutCurrencyPrefix = StringUtil.stripBidiIndicator(result.removePrefix(symbol).removeSuffix(symbol).trim()) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonateToSignalViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonateToSignalViewModel.kt index 3f8553817..0083f0c9f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonateToSignalViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonateToSignalViewModel.kt @@ -247,7 +247,8 @@ class DonateToSignalViewModel( selectableCurrencyCodes = availableCurrencies.map(Currency::getCurrencyCode), isCustomAmountFocused = false, customAmount = FiatMoney( - BigDecimal.ZERO, currency + BigDecimal.ZERO, + currency ) ) ) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonationCheckoutDelegate.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonationCheckoutDelegate.kt index bb99d8d9f..043fa2935 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonationCheckoutDelegate.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonationCheckoutDelegate.kt @@ -247,7 +247,8 @@ class DonationCheckoutDelegate( Log.d(TAG, "Displaying donation error dialog.", true) errorDialog = DonationErrorDialogs.show( - fragment!!.requireContext(), throwable, + fragment!!.requireContext(), + throwable, object : DonationErrorDialogs.DialogCallback() { var tryCCAgain = false diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonationWebViewOnBackPressedCallback.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonationWebViewOnBackPressedCallback.kt index c813bfed7..0128cdc8e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonationWebViewOnBackPressedCallback.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonationWebViewOnBackPressedCallback.kt @@ -8,7 +8,7 @@ import androidx.activity.OnBackPressedCallback */ class DonationWebViewOnBackPressedCallback( private val dismissAllowingStateLoss: () -> Unit, - private val webView: WebView, + private val webView: WebView ) : OnBackPressedCallback(true) { override fun handleOnBackPressed() { if (webView.canGoBack()) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/YourInformationIsPrivateBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/YourInformationIsPrivateBottomSheet.kt index e980da3d3..f99563dd3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/YourInformationIsPrivateBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/YourInformationIsPrivateBottomSheet.kt @@ -19,7 +19,6 @@ class YourInformationIsPrivateBottomSheet : DSLSettingsBottomSheetFragment() { private fun getConfiguration(): DSLConfiguration { return configure { - space(10.dp) noPadTextPref( diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationErrorParams.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationErrorParams.kt index e198d0820..83b50fe5a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationErrorParams.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationErrorParams.kt @@ -97,14 +97,16 @@ class DonationErrorParams private constructor( return when (declinedError.declineCode) { is StripeDeclineCode.Known -> when (declinedError.declineCode.code) { StripeDeclineCode.Code.APPROVE_WITH_ID -> getStripeDeclineCodePositiveActionParams( - context, callback, + context, + callback, when (declinedError.method) { PaymentSourceType.Stripe.CreditCard -> R.string.DeclineCode__verify_your_card_details_are_correct_and_try_again PaymentSourceType.Stripe.GooglePay -> R.string.DeclineCode__verify_your_payment_method_is_up_to_date_in_google_pay_and_try_again } ) StripeDeclineCode.Code.CALL_ISSUER -> getStripeDeclineCodePositiveActionParams( - context, callback, + context, + callback, when (declinedError.method) { PaymentSourceType.Stripe.CreditCard -> R.string.DeclineCode__verify_your_card_details_are_correct_and_try_again_if_the_problem_continues PaymentSourceType.Stripe.GooglePay -> R.string.DeclineCode__verify_your_payment_method_is_up_to_date_in_google_pay_and_try_again_if_the_problem @@ -112,21 +114,24 @@ class DonationErrorParams private constructor( ) StripeDeclineCode.Code.CARD_NOT_SUPPORTED -> getLearnMoreParams(context, callback, R.string.DeclineCode__your_card_does_not_support_this_type_of_purchase) StripeDeclineCode.Code.EXPIRED_CARD -> getStripeDeclineCodePositiveActionParams( - context, callback, + context, + callback, when (declinedError.method) { PaymentSourceType.Stripe.CreditCard -> R.string.DeclineCode__your_card_has_expired_verify_your_card_details PaymentSourceType.Stripe.GooglePay -> R.string.DeclineCode__your_card_has_expired } ) StripeDeclineCode.Code.INCORRECT_NUMBER -> getStripeDeclineCodePositiveActionParams( - context, callback, + context, + callback, when (declinedError.method) { PaymentSourceType.Stripe.CreditCard -> R.string.DeclineCode__your_card_number_is_incorrect_verify_your_card_details PaymentSourceType.Stripe.GooglePay -> R.string.DeclineCode__your_card_number_is_incorrect } ) StripeDeclineCode.Code.INCORRECT_CVC -> getStripeDeclineCodePositiveActionParams( - context, callback, + context, + callback, when (declinedError.method) { PaymentSourceType.Stripe.CreditCard -> R.string.DeclineCode__your_cards_cvc_number_is_incorrect_verify_your_card_details PaymentSourceType.Stripe.GooglePay -> R.string.DeclineCode__your_cards_cvc_number_is_incorrect @@ -134,28 +139,32 @@ class DonationErrorParams private constructor( ) StripeDeclineCode.Code.INSUFFICIENT_FUNDS -> getLearnMoreParams(context, callback, R.string.DeclineCode__your_card_does_not_have_sufficient_funds) StripeDeclineCode.Code.INVALID_CVC -> getStripeDeclineCodePositiveActionParams( - context, callback, + context, + callback, when (declinedError.method) { PaymentSourceType.Stripe.CreditCard -> R.string.DeclineCode__your_cards_cvc_number_is_incorrect_verify_your_card_details PaymentSourceType.Stripe.GooglePay -> R.string.DeclineCode__your_cards_cvc_number_is_incorrect } ) StripeDeclineCode.Code.INVALID_EXPIRY_MONTH -> getStripeDeclineCodePositiveActionParams( - context, callback, + context, + callback, when (declinedError.method) { PaymentSourceType.Stripe.CreditCard -> R.string.DeclineCode__the_expiration_month_on_your_card_is_incorrect PaymentSourceType.Stripe.GooglePay -> R.string.DeclineCode__the_expiration_month } ) StripeDeclineCode.Code.INVALID_EXPIRY_YEAR -> getStripeDeclineCodePositiveActionParams( - context, callback, + context, + callback, when (declinedError.method) { PaymentSourceType.Stripe.CreditCard -> R.string.DeclineCode__the_expiration_year_on_your_card_is_incorrect PaymentSourceType.Stripe.GooglePay -> R.string.DeclineCode__the_expiration_year } ) StripeDeclineCode.Code.INVALID_NUMBER -> getStripeDeclineCodePositiveActionParams( - context, callback, + context, + callback, when (declinedError.method) { PaymentSourceType.Stripe.CreditCard -> R.string.DeclineCode__your_card_number_is_incorrect_verify_your_card_details PaymentSourceType.Stripe.GooglePay -> R.string.DeclineCode__your_card_number_is_incorrect diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/ManageDonationsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/ManageDonationsFragment.kt index 7d0a9f10d..dc7eeeef3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/ManageDonationsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/ManageDonationsFragment.kt @@ -105,7 +105,8 @@ class ManageDonationsFragment : noPadTextPref( title = DSLSettingsText.from( R.string.DonateToSignalFragment__privacy_over_profit, - DSLSettingsText.CenterModifier, DSLSettingsText.TitleLargeModifier + DSLSettingsText.CenterModifier, + DSLSettingsText.TitleLargeModifier ) ) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/thanks/ThanksForYourSupportBottomSheetDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/thanks/ThanksForYourSupportBottomSheetDialogFragment.kt index 504910492..a5d9cd928 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/thanks/ThanksForYourSupportBottomSheetDialogFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/thanks/ThanksForYourSupportBottomSheetDialogFragment.kt @@ -74,7 +74,7 @@ class ThanksForYourSupportBottomSheetDialogFragment : FixedRoundedCornerBottomSh .append( SpanUtil.clickable( getString(R.string.SubscribeThanksForYourSupportBottomSheetDialogFragment__become_a_montly_sustainer), - ContextCompat.getColor(requireContext(), R.color.signal_accent_primary), + ContextCompat.getColor(requireContext(), R.color.signal_accent_primary) ) { requireActivity().finish() requireActivity().startActivity(AppSettingsActivity.subscriptions(requireContext())) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/wrapped/SettingsWrapperFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/wrapped/SettingsWrapperFragment.kt index 81a5b0b17..a087a6224 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/wrapped/SettingsWrapperFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/wrapped/SettingsWrapperFragment.kt @@ -18,7 +18,6 @@ abstract class SettingsWrapperFragment : Fragment(R.layout.settings_wrapper_frag private set override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - toolbar = view.findViewById(R.id.toolbar) toolbar.setNavigationOnClickListener { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsActivity.kt index 9aa5c7c39..a6f2b8c05 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsActivity.kt @@ -55,7 +55,7 @@ class ConversationSettingsActivity : DSLSettingsActivity(), ConversationSettings ActivityOptionsCompat.makeSceneTransitionAnimation( context, avatar, - "avatar", + "avatar" ).toBundle() } else { null diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt index 96bae0116..2e5e5535f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt @@ -561,7 +561,6 @@ class ConversationSettingsFragment : DSLSettingsFragment( } if (recipientSettingsState.selfHasGroups && !state.recipient.isReleaseNotes) { - dividerPref() val groupsInCommonCount = recipientSettingsState.allGroupsInCommon.size diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsState.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsState.kt index 0f42447b5..a81049d69 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsState.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsState.kt @@ -20,7 +20,7 @@ data class ConversationSettingsState( val sharedMediaIds: List = listOf(), val displayInternalRecipientDetails: Boolean = false, private val sharedMediaLoaded: Boolean = false, - private val specificSettingsState: SpecificSettingsState, + private val specificSettingsState: SpecificSettingsState ) { val isLoaded: Boolean = recipient != Recipient.UNKNOWN && sharedMediaLoaded && specificSettingsState.isLoaded diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsViewModel.kt index a3e1abefe..0fd3ffb78 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsViewModel.kt @@ -34,7 +34,7 @@ import java.util.Optional sealed class ConversationSettingsViewModel( private val repository: ConversationSettingsRepository, - specificSettingsState: SpecificSettingsState, + specificSettingsState: SpecificSettingsState ) : ViewModel() { private val openedMediaCursors = HashSet() @@ -407,7 +407,6 @@ sealed class ConversationSettingsViewModel( override fun onAddToGroup() { repository.getGroupCapacity(groupId) { capacityResult -> if (capacityResult.getRemainingCapacity() > 0) { - internalEvents.onNext( ConversationSettingsEvent.AddMembersToGroup( groupId, @@ -480,7 +479,7 @@ sealed class ConversationSettingsViewModel( class Factory( private val recipientId: RecipientId? = null, private val groupId: GroupId? = null, - private val repository: ConversationSettingsRepository, + private val repository: ConversationSettingsRepository ) : ViewModelProvider.Factory { override fun create(modelClass: Class): T { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/InternalConversationSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/InternalConversationSettingsFragment.kt index 2ec235b08..668bc73fe 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/InternalConversationSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/InternalConversationSettingsFragment.kt @@ -278,7 +278,7 @@ class InternalConversationSettingsFragment : DSLSettingsFragment( ", ", colorize("ChangeNumber", capabilities.changeNumberCapability), ", ", - colorize("Stories", capabilities.storiesCapability), + colorize("Stories", capabilities.storiesCapability) ) } else { "Recipient not found!" diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/permissions/PermissionsSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/permissions/PermissionsSettingsFragment.kt index 7ba7361e0..b13efebdf 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/permissions/PermissionsSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/permissions/PermissionsSettingsFragment.kt @@ -48,7 +48,6 @@ class PermissionsSettingsFragment : DSLSettingsFragment( private fun getConfiguration(state: PermissionsSettingsState): DSLConfiguration { return configure { - radioListPref( title = DSLSettingsText.from(R.string.PermissionsSettingsFragment__add_members), isEnabled = state.selfCanEditSettings, diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/preferences/BioTextPreference.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/preferences/BioTextPreference.kt index 7b98fd05b..3be3d2f7e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/preferences/BioTextPreference.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/preferences/BioTextPreference.kt @@ -34,7 +34,7 @@ object BioTextPreference { } class RecipientModel( - private val recipient: Recipient, + private val recipient: Recipient ) : BioTextPreferenceModel() { override fun getHeadlineText(context: Context): CharSequence { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/preferences/InternalPreference.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/preferences/InternalPreference.kt index 5ede85911..a7cfd5a87 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/preferences/InternalPreference.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/preferences/InternalPreference.kt @@ -16,7 +16,7 @@ object InternalPreference { class Model( private val recipient: Recipient, - val onInternalDetailsClicked: () -> Unit, + val onInternalDetailsClicked: () -> Unit ) : PreferenceModel() { override fun areItemsTheSame(newItem: Model): Boolean { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/SoundsAndNotificationsSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/SoundsAndNotificationsSettingsFragment.kt index fbd53fbeb..1965832a7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/SoundsAndNotificationsSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/SoundsAndNotificationsSettingsFragment.kt @@ -48,7 +48,6 @@ class SoundsAndNotificationsSettingsFragment : DSLSettingsFragment( private fun getConfiguration(state: SoundsAndNotificationsSettingsState): DSLConfiguration { return configure { - val muteSummary = if (state.muteUntil > 0) { state.muteUntil.formatMutedUntil(requireContext()) } else { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/custom/CustomNotificationsSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/custom/CustomNotificationsSettingsFragment.kt index 146f04168..d218e0f70 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/custom/CustomNotificationsSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/custom/CustomNotificationsSettingsFragment.kt @@ -74,7 +74,6 @@ class CustomNotificationsSettingsFragment : DSLSettingsFragment(R.string.CustomN private fun getConfiguration(state: CustomNotificationsSettingsState): DSLConfiguration { return configure { - sectionHeaderPref(R.string.CustomNotificationsDialogFragment__messages) if (NotificationChannels.supported()) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/custom/CustomNotificationsSettingsState.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/custom/CustomNotificationsSettingsState.kt index 953a9d76f..312e0dbb3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/custom/CustomNotificationsSettingsState.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/custom/CustomNotificationsSettingsState.kt @@ -14,5 +14,5 @@ data class CustomNotificationsSettingsState( val messageSound: Uri? = null, val callVibrateState: RecipientTable.VibrateState = RecipientTable.VibrateState.DEFAULT, val callSound: Uri? = null, - val showCallingOptions: Boolean = false, + val showCallingOptions: Boolean = false ) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/dsl.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/dsl.kt index 9d64b6fcf..315398841 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/dsl.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/dsl.kt @@ -1,3 +1,5 @@ +@file:Suppress("ktlint:filename") + package org.thoughtcrime.securesms.components.settings import androidx.annotation.CallSuper @@ -212,7 +214,7 @@ abstract class PreferenceModel>( open val summary: DSLSettingsText? = null, open val icon: DSLSettingsIcon? = null, open val iconEnd: DSLSettingsIcon? = null, - open val isEnabled: Boolean = true, + open val isEnabled: Boolean = true ) : MappingModel { override fun areItemsTheSame(newItem: T): Boolean { return when { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/models/Text.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/models/Text.kt index 37e4cc931..7cf8a7374 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/models/Text.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/models/Text.kt @@ -16,7 +16,7 @@ import org.thoughtcrime.securesms.util.adapter.mapping.MappingViewHolder * A Text without any padding, allowing for exact padding to be handed in at runtime. */ data class Text( - val text: DSLSettingsText, + val text: DSLSettingsText ) { companion object { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantsState.kt b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantsState.kt index 87f6ba231..3cbbe7971 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantsState.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantsState.kt @@ -186,7 +186,6 @@ data class CallParticipantsState( webRtcViewModel: WebRtcViewModel, enableVideo: Boolean ): CallParticipantsState { - var newShowVideoForOutgoing: Boolean = oldState.showVideoForOutgoing if (enableVideo) { newShowVideoForOutgoing = webRtcViewModel.state == WebRtcViewModel.State.CALL_OUTGOING @@ -281,7 +280,6 @@ data class CallParticipantsState( isViewingFocusedParticipant: Boolean = oldState.isViewingFocusedParticipant, isExpanded: Boolean = oldState.localRenderState == WebRtcLocalRenderState.EXPANDED ): WebRtcLocalRenderState { - val displayLocal: Boolean = (numberOfRemoteParticipants == 0 || !isInPip) && (isNonIdleGroupCall || localParticipant.isVideoEnabled) var localRenderState: WebRtcLocalRenderState = WebRtcLocalRenderState.GONE diff --git a/app/src/main/java/org/thoughtcrime/securesms/compose/ComposeBottomSheetDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/compose/ComposeBottomSheetDialogFragment.kt index a7aad49e7..d313d3587 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/compose/ComposeBottomSheetDialogFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/compose/ComposeBottomSheetDialogFragment.kt @@ -54,7 +54,7 @@ abstract class ComposeBottomSheetDialogFragment : FixedRoundedCornerBottomSheetD * ``` */ @Composable - fun Handle() { + protected fun Handle() { Box( modifier = Modifier .size(width = 48.dp, height = 22.dp) diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchMediator.kt b/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchMediator.kt index 9ea4ac772..71c0c6de7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchMediator.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchMediator.kt @@ -49,7 +49,7 @@ class ContactSearchMediator( private val callbacks: Callbacks = SimpleCallbacks(), performSafetyNumberChecks: Boolean = true, adapterFactory: AdapterFactory = DefaultAdapterFactory, - arbitraryRepository: ArbitraryRepository? = null, + arbitraryRepository: ArbitraryRepository? = null ) { private val queryDebouncer = Debouncer(300, TimeUnit.MILLISECONDS) diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/GroupsInCommon.kt b/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/GroupsInCommon.kt index 3a908744c..4a9cba9d7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/GroupsInCommon.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/GroupsInCommon.kt @@ -15,7 +15,9 @@ data class GroupsInCommon( 1 -> context.getString(R.string.MessageRequestProfileView_member_of_one_group, names[0]) 2 -> context.getString(R.string.MessageRequestProfileView_member_of_two_groups, names[0], names[1]) else -> context.getString( - R.string.MessageRequestProfileView_member_of_many_groups, names[0], names[1], + R.string.MessageRequestProfileView_member_of_many_groups, + names[0], + names[1], context.resources.getQuantityString(R.plurals.MessageRequestProfileView_member_of_d_additional_groups, total - 2, total - 2) ) } diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationContextMenu.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationContextMenu.kt index 82344f59a..a2c257d49 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationContextMenu.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationContextMenu.kt @@ -18,14 +18,14 @@ import org.thoughtcrime.securesms.components.menu.ContextMenuList class ConversationContextMenu(private val anchor: View, items: List) : PopupWindow( LayoutInflater.from(anchor.context).inflate(R.layout.signal_context_menu, null), ViewGroup.LayoutParams.WRAP_CONTENT, - ViewGroup.LayoutParams.WRAP_CONTENT, + ViewGroup.LayoutParams.WRAP_CONTENT ) { val context: Context = anchor.context private val contextMenuList = ContextMenuList( recyclerView = contentView.findViewById(R.id.signal_context_menu_list), - onItemClick = { dismiss() }, + onItemClick = { dismiss() } ) init { diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItemDisplayMode.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItemDisplayMode.kt index f72e1f46d..641f3f70e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItemDisplayMode.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItemDisplayMode.kt @@ -3,8 +3,10 @@ package org.thoughtcrime.securesms.conversation enum class ConversationItemDisplayMode { /** Normal rendering, used for normal bubbles in the conversation view */ STANDARD, + /** Smaller bubbles, often trimming text and shrinking images. Used for quote threads. */ CONDENSED, + /** Less length restrictions. Used to show more info in message details. */ - DETAILED, + DETAILED } diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItemSelection.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItemSelection.kt index bf8fc1d7d..1b930278f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItemSelection.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItemSelection.kt @@ -20,7 +20,7 @@ object ConversationItemSelection { conversationItem: ConversationItem, list: RecyclerView, messageRecord: MessageRecord, - videoBitmap: Bitmap?, + videoBitmap: Bitmap? ): Bitmap { val isOutgoing = messageRecord.isOutgoing val hasNoBubble = messageRecord.hasNoBubble(conversationItem.context) @@ -30,7 +30,7 @@ object ConversationItemSelection { list = list, videoBitmap = videoBitmap, drawConversationItem = !isOutgoing || hasNoBubble, - hasReaction = messageRecord.reactions.isNotEmpty(), + hasReaction = messageRecord.reactions.isNotEmpty() ) } @@ -39,7 +39,7 @@ object ConversationItemSelection { list: RecyclerView, videoBitmap: Bitmap?, drawConversationItem: Boolean, - hasReaction: Boolean, + hasReaction: Boolean ): Bitmap { val bodyBubble = conversationItem.bodyBubble val reactionsView = conversationItem.reactionsView diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ScheduleMessageTimePickerBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/ScheduleMessageTimePickerBottomSheet.kt index 3b68d9a12..f3127cede 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ScheduleMessageTimePickerBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ScheduleMessageTimePickerBottomSheet.kt @@ -83,7 +83,7 @@ class ScheduleMessageTimePickerBottomSheet : FixedRoundedCornerBottomSheetDialog text = getString( R.string.ScheduleMessageTimePickerBottomSheet__timezone_disclaimer, zoneOffsetFormatter.format(zonedDateTime), - zoneNameFormatter.format(zonedDateTime), + zoneNameFormatter.format(zonedDateTime) ) } diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/SelectedConversationModel.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/SelectedConversationModel.kt index 64a36e08c..0a23fe3b6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/SelectedConversationModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/SelectedConversationModel.kt @@ -17,5 +17,5 @@ data class SelectedConversationModel( val bubbleWidth: Int, val audioUri: Uri? = null, val isOutgoing: Boolean, - val focusedView: View?, + val focusedView: View? ) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ChatColorsPalette.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ChatColorsPalette.kt index 50b947599..be486f825 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ChatColorsPalette.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ChatColorsPalette.kt @@ -50,12 +50,14 @@ object ChatColorsPalette { @JvmField val TAUPE = ChatColors.forColor( - ChatColors.Id.BuiltIn, 0xFF8F616A.toInt() + ChatColors.Id.BuiltIn, + 0xFF8F616A.toInt() ) @JvmField val STEEL = ChatColors.forColor( - ChatColors.Id.BuiltIn, 0xFF71717F.toInt() + ChatColors.Id.BuiltIn, + 0xFF71717F.toInt() ) // endregion @@ -128,7 +130,8 @@ object ChatColorsPalette { ChatColors.LinearGradient( 180f, intArrayOf( - 0xFF6281D5.toInt(), 0xFF974460.toInt() + 0xFF6281D5.toInt(), + 0xFF974460.toInt() ), floatArrayOf(0f, 1f) ) @@ -216,7 +219,7 @@ object ChatColorsPalette { NameColor(lightColor = 0xFF5E6E0C.toInt(), darkColor = 0xFF8FAA09.toInt()), NameColor(lightColor = 0xFF077288.toInt(), darkColor = 0xFF00AED1.toInt()), NameColor(lightColor = 0xFFC20AA3.toInt(), darkColor = 0xFFF75FDD.toInt()), - NameColor(lightColor = 0xFF2D761E.toInt(), darkColor = 0xFF43B42D.toInt()), + NameColor(lightColor = 0xFF2D761E.toInt(), darkColor = 0xFF43B42D.toInt()) ) } diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/RecyclerViewColorizer.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/RecyclerViewColorizer.kt index c505ad749..e3b9011a4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/RecyclerViewColorizer.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/RecyclerViewColorizer.kt @@ -137,11 +137,19 @@ class RecyclerViewColorizer(private val recyclerView: RecyclerView) { outOfBoundsPaint.color = color canvas.drawRect( - 0f, -parent.height.toFloat(), parent.width.toFloat(), 0f, outOfBoundsPaint + 0f, + -parent.height.toFloat(), + parent.width.toFloat(), + 0f, + outOfBoundsPaint ) canvas.drawRect( - 0f, parent.height.toFloat(), parent.width.toFloat(), parent.height * 2f, outOfBoundsPaint + 0f, + parent.height.toFloat(), + parent.width.toFloat(), + parent.height * 2f, + outOfBoundsPaint ) } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/custom/CustomChatColorCreatorPageFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/custom/CustomChatColorCreatorPageFragment.kt index 997353ff4..57458b4a8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/custom/CustomChatColorCreatorPageFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/custom/CustomChatColorCreatorPageFragment.kt @@ -189,7 +189,7 @@ class CustomChatColorCreatorPageFragment : state.degrees, intArrayOf(topEdgeColor.getColor(), bottomEdgeColor.getColor()), floatArrayOf(0f, 1f) - ), + ) ) preview.setChatColors(chatColor) gradientTool.setSelectedEdge(state.selectedEdge) @@ -255,14 +255,15 @@ class CustomChatColorCreatorPageFragment : return listOf(0f, 1f).map { ColorUtils.HSLToColor( floatArrayOf( - hue, it, level + hue, + it, + level ) ) }.toIntArray() } private fun calculateLightness(hue: Float, valueFor60To80: Float = 0.3f): Float { - val point1 = PointF() val point2 = PointF() diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/custom/CustomChatColorGradientToolView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/custom/CustomChatColorGradientToolView.kt index bf7a8517b..e1781a948 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/custom/CustomChatColorGradientToolView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/custom/CustomChatColorGradientToolView.kt @@ -149,7 +149,6 @@ class CustomChatColorGradientToolView @JvmOverloads constructor( } override fun onTouchEvent(event: MotionEvent): Boolean { - if (event.action == MotionEvent.ACTION_CANCEL || event.action == MotionEvent.ACTION_UP) { listener?.onGestureFinished() } else if (event.action == MotionEvent.ACTION_DOWN) { @@ -293,7 +292,6 @@ class CustomChatColorGradientToolView @JvmOverloads constructor( distanceX: Float, distanceY: Float ): Boolean { - val a = PointF(e2.getX(activePointerId) - center.x, e2.getY(activePointerId) - center.y) val b = PointF(center.x, 0f) val dot = a.dotProduct(b) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/drafts/DraftState.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/drafts/DraftState.kt index abb0f9e90..911839b0a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/drafts/DraftState.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/drafts/DraftState.kt @@ -17,7 +17,7 @@ data class DraftState( val bodyRangesDraft: DraftTable.Draft? = null, val quoteDraft: DraftTable.Draft? = null, val locationDraft: DraftTable.Draft? = null, - val voiceNoteDraft: DraftTable.Draft? = null, + val voiceNoteDraft: DraftTable.Draft? = null ) { fun copyAndClearDrafts(threadId: Long = this.threadId): DraftState { @@ -41,7 +41,7 @@ data class DraftState( bodyRangesDraft = drafts.getDraftOfType(DraftTable.Draft.BODY_RANGES), quoteDraft = drafts.getDraftOfType(DraftTable.Draft.QUOTE), locationDraft = drafts.getDraftOfType(DraftTable.Draft.LOCATION), - voiceNoteDraft = drafts.getDraftOfType(DraftTable.Draft.VOICE_NOTE), + voiceNoteDraft = drafts.getDraftOfType(DraftTable.Draft.VOICE_NOTE) ) } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardViewModel.kt index ee8cc36e3..68f2147fc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardViewModel.kt @@ -100,7 +100,7 @@ class MultiselectForwardViewModel( private val storySendRequirements: Stories.MediaTransform.SendRequirements, private val records: List, private val isSelectionOnly: Boolean, - private val repository: MultiselectForwardRepository, + private val repository: MultiselectForwardRepository ) : ViewModelProvider.Factory { override fun create(modelClass: Class): T { return requireNotNull(modelClass.cast(MultiselectForwardViewModel(storySendRequirements, records, isSelectionOnly, repository))) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/DistributionListTables.kt b/app/src/main/java/org/thoughtcrime/securesms/database/DistributionListTables.kt index ed2b87bd5..285494fdd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/DistributionListTables.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/DistributionListTables.kt @@ -50,7 +50,8 @@ class DistributionListTables constructor(context: Context?, databaseHelper: Sign fun insertInitialDistributionListAtCreationTime(db: net.zetetic.database.sqlcipher.SQLiteDatabase) { val recipientId = db.insert( - RecipientTable.TABLE_NAME, null, + RecipientTable.TABLE_NAME, + null, contentValuesOf( RecipientTable.GROUP_TYPE to RecipientTable.GroupType.DISTRIBUTION_LIST.id, RecipientTable.DISTRIBUTION_LIST_ID to DistributionListId.MY_STORY_ID, @@ -59,7 +60,8 @@ class DistributionListTables constructor(context: Context?, databaseHelper: Sign ) ) db.insert( - ListTable.TABLE_NAME, null, + ListTable.TABLE_NAME, + null, contentValuesOf( ListTable.ID to DistributionListId.MY_STORY_ID, ListTable.NAME to DistributionId.MY_STORY.toString(), @@ -549,7 +551,9 @@ class DistributionListTables constructor(context: Context?, databaseHelper: Sign arrayOf(ListTable.RECIPIENT_ID), "${ListTable.DISTRIBUTION_ID} = ?", SqlUtil.buildArgs(distributionId.toString()), - null, null, null + null, + null, + null )?.use { cursor -> if (cursor.moveToFirst()) { RecipientId.from(CursorUtil.requireLong(cursor, ListTable.RECIPIENT_ID)) @@ -565,7 +569,9 @@ class DistributionListTables constructor(context: Context?, databaseHelper: Sign arrayOf(ListTable.RECIPIENT_ID), "${ListTable.ID} = ?", SqlUtil.buildArgs(distributionListId), - null, null, null + null, + null, + null )?.use { cursor -> if (cursor.moveToFirst()) { RecipientId.from(CursorUtil.requireLong(cursor, ListTable.RECIPIENT_ID)) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/LocalMetricsDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/database/LocalMetricsDatabase.kt index 1c5de1e84..d3c0214eb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/LocalMetricsDatabase.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/LocalMetricsDatabase.kt @@ -129,7 +129,8 @@ class LocalMetricsDatabase private constructor( try { event.splits.forEach { split -> db.insert( - TABLE_NAME, null, + TABLE_NAME, + null, ContentValues().apply { put(CREATED_AT, event.createdAt) put(EVENT_ID, event.eventId) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MessageSendLogTables.kt b/app/src/main/java/org/thoughtcrime/securesms/database/MessageSendLogTables.kt index 65199f1d9..0644e988d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/MessageSendLogTables.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/MessageSendLogTables.kt @@ -83,7 +83,7 @@ class MessageSendLogTables constructor(context: Context?, databaseHelper: Signal /** Created for [deleteEntriesForRecipient] */ val CREATE_INDEXES = arrayOf( - "CREATE INDEX msl_payload_date_sent_index ON $TABLE_NAME ($DATE_SENT)", + "CREATE INDEX msl_payload_date_sent_index ON $TABLE_NAME ($DATE_SENT)" ) val CREATE_TRIGGERS = arrayOf( diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/NotificationProfileTables.kt b/app/src/main/java/org/thoughtcrime/securesms/database/NotificationProfileTables.kt index 1e00ccad1..9c66635b9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/NotificationProfileTables.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/NotificationProfileTables.kt @@ -1,9 +1,11 @@ +@file:Suppress("ktlint:filename") + package org.thoughtcrime.securesms.database import android.content.ContentValues import android.content.Context import android.database.Cursor -import net.zetetic.database.sqlcipher.SQLiteConstraintException +import android.database.sqlite.SQLiteConstraintException import org.signal.core.util.SqlUtil import org.signal.core.util.requireBoolean import org.signal.core.util.requireInt diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/PnpOperations.kt b/app/src/main/java/org/thoughtcrime/securesms/database/PnpOperations.kt index dfe689c30..04d65abfa 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/PnpOperations.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/PnpOperations.kt @@ -33,6 +33,7 @@ data class PnpDataSet( this.removeIf { it.id == toUpdate.id } this += update(toUpdate) } + /** * Applies the set of operations and returns the resulting dataset. * Important: This only occurs _in memory_. You must still apply the operations to disk to persist them. diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt index a7822f3ce..fafc77411 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt @@ -784,7 +784,9 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da return if (result.isNotEmpty()) { result[0] - } else null + } else { + null + } } fun markNeedsSyncWithoutRefresh(recipientIds: Collection) { @@ -2574,7 +2576,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da val fullData = partialData.copy( e164Record = partialData.byE164?.let { getRecord(it) }, pniSidRecord = partialData.byPniSid?.let { getRecord(it) }, - aciSidRecord = partialData.byAciSid?.let { getRecord(it) }, + aciSidRecord = partialData.byAciSid?.let { getRecord(it) } ) check(fullData.commonId == null) @@ -4032,7 +4034,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da storiesCapability = Recipient.Capability.deserialize(Bitmask.read(capabilities, Capabilities.STORIES, Capabilities.BIT_LENGTH).toInt()), giftBadgesCapability = Recipient.Capability.deserialize(Bitmask.read(capabilities, Capabilities.GIFT_BADGES, Capabilities.BIT_LENGTH).toInt()), pnpCapability = Recipient.Capability.deserialize(Bitmask.read(capabilities, Capabilities.PNP, Capabilities.BIT_LENGTH).toInt()), - paymentActivation = Recipient.Capability.deserialize(Bitmask.read(capabilities, Capabilities.PAYMENT_ACTIVATION, Capabilities.BIT_LENGTH).toInt()), + paymentActivation = Recipient.Capability.deserialize(Bitmask.read(capabilities, Capabilities.PAYMENT_ACTIVATION, Capabilities.BIT_LENGTH).toInt()) ) } @@ -4551,6 +4553,6 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da val oldIds: Set, val changedNumberId: RecipientId?, val operations: List, - val breadCrumbs: List, + val breadCrumbs: List ) } diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SearchTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/SearchTable.kt index feafc8827..44a9e3549 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/SearchTable.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/SearchTable.kt @@ -31,7 +31,7 @@ class SearchTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTa @Language("sql") val CREATE_TABLE = arrayOf( - "CREATE VIRTUAL TABLE $FTS_TABLE_NAME USING fts5($BODY, $THREAD_ID UNINDEXED, content=${MessageTable.TABLE_NAME}, content_rowid=${MessageTable.ID})", + "CREATE VIRTUAL TABLE $FTS_TABLE_NAME USING fts5($BODY, $THREAD_ID UNINDEXED, content=${MessageTable.TABLE_NAME}, content_rowid=${MessageTable.ID})" ) @Language("sql") diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SenderKeySharedTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/SenderKeySharedTable.kt index 27841d642..2fd3c1e26 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/SenderKeySharedTable.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/SenderKeySharedTable.kt @@ -50,7 +50,7 @@ class SenderKeySharedTable internal constructor(context: Context?, databaseHelpe ADDRESS to address.name, DEVICE to address.deviceId, DISTRIBUTION_ID to distributionId.toString(), - TIMESTAMP to System.currentTimeMillis(), + TIMESTAMP to System.currentTimeMillis() ) db.insertWithOnConflict(TABLE_NAME, null, values, SQLiteDatabase.CONFLICT_REPLACE) } diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SenderKeyTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/SenderKeyTable.kt index 0666e2a16..aadf6026c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/SenderKeyTable.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/SenderKeyTable.kt @@ -60,7 +60,7 @@ class SenderKeyTable internal constructor(context: Context?, databaseHelper: Sig DEVICE to address.deviceId, DISTRIBUTION_ID to distributionId.toString(), RECORD to record.serialize(), - CREATED_AT to System.currentTimeMillis(), + CREATED_AT to System.currentTimeMillis() ) db.insertWithOnConflict(TABLE_NAME, null, insertValues, SQLiteDatabase.CONFLICT_REPLACE) } diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SqlCipherErrorHandler.kt b/app/src/main/java/org/thoughtcrime/securesms/database/SqlCipherErrorHandler.kt index aab3e0f10..10fbd62b7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/SqlCipherErrorHandler.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/SqlCipherErrorHandler.kt @@ -59,7 +59,10 @@ class SqlCipherErrorHandler(private val databaseName: String) : DatabaseErrorHan try { SQLiteDatabase.openOrCreateDatabase( - databaseFile.absolutePath, DatabaseSecretProvider.getOrCreateDatabaseSecret(context).asString(), null, null, + databaseFile.absolutePath, + DatabaseSecretProvider.getOrCreateDatabaseSecret(context).asString(), + null, + null, object : SQLiteDatabaseHook { override fun preKey(connection: SQLiteConnection) {} override fun postKey(connection: SQLiteConnection) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/StorySendTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/StorySendTable.kt index 513851334..cd71b212e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/StorySendTable.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/StorySendTable.kt @@ -46,7 +46,7 @@ class StorySendTable(context: Context, databaseHelper: SignalDatabase) : Databas val CREATE_INDEXS = arrayOf( "CREATE INDEX story_sends_recipient_id_sent_timestamp_allows_replies_index ON $TABLE_NAME ($RECIPIENT_ID, $SENT_TIMESTAMP, $ALLOWS_REPLIES)", - "CREATE INDEX story_sends_message_id_distribution_id_index ON $TABLE_NAME ($MESSAGE_ID, $DISTRIBUTION_ID)", + "CREATE INDEX story_sends_message_id_distribution_id_index ON $TABLE_NAME ($MESSAGE_ID, $DISTRIBUTION_ID)" ) } diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadTable.kt index 814d5ba92..07d044334 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadTable.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadTable.kt @@ -1766,11 +1766,13 @@ class ThreadTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTa private fun getSnippetUri(cursor: Cursor?): Uri? { return if (cursor!!.isNull(cursor.getColumnIndexOrThrow(SNIPPET_URI))) { null - } else try { - Uri.parse(cursor.getString(cursor.getColumnIndexOrThrow(SNIPPET_URI))) - } catch (e: IllegalArgumentException) { - Log.w(TAG, e) - null + } else { + try { + Uri.parse(cursor.getString(cursor.getColumnIndexOrThrow(SNIPPET_URI))) + } catch (e: IllegalArgumentException) { + Log.w(TAG, e) + null + } } } @@ -1780,17 +1782,39 @@ class ThreadTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTa } data class Extra( - @field:JsonProperty @param:JsonProperty("isRevealable") val isViewOnce: Boolean = false, - @field:JsonProperty @param:JsonProperty("isSticker") val isSticker: Boolean = false, - @field:JsonProperty @param:JsonProperty("stickerEmoji") val stickerEmoji: String? = null, - @field:JsonProperty @param:JsonProperty("isAlbum") val isAlbum: Boolean = false, - @field:JsonProperty @param:JsonProperty("isRemoteDelete") val isRemoteDelete: Boolean = false, - @field:JsonProperty @param:JsonProperty("isMessageRequestAccepted") val isMessageRequestAccepted: Boolean = true, - @field:JsonProperty @param:JsonProperty("isGv2Invite") val isGv2Invite: Boolean = false, - @field:JsonProperty @param:JsonProperty("groupAddedBy") val groupAddedBy: String? = null, - @field:JsonProperty @param:JsonProperty("individualRecipientId") private val individualRecipientId: String, - @field:JsonProperty @param:JsonProperty("bodyRanges") val bodyRanges: String? = null, - @field:JsonProperty @param:JsonProperty("isScheduled") val isScheduled: Boolean = false + @field:JsonProperty + @param:JsonProperty("isRevealable") + val isViewOnce: Boolean = false, + @field:JsonProperty + @param:JsonProperty("isSticker") + val isSticker: Boolean = false, + @field:JsonProperty + @param:JsonProperty("stickerEmoji") + val stickerEmoji: String? = null, + @field:JsonProperty + @param:JsonProperty("isAlbum") + val isAlbum: Boolean = false, + @field:JsonProperty + @param:JsonProperty("isRemoteDelete") + val isRemoteDelete: Boolean = false, + @field:JsonProperty + @param:JsonProperty("isMessageRequestAccepted") + val isMessageRequestAccepted: Boolean = true, + @field:JsonProperty + @param:JsonProperty("isGv2Invite") + val isGv2Invite: Boolean = false, + @field:JsonProperty + @param:JsonProperty("groupAddedBy") + val groupAddedBy: String? = null, + @field:JsonProperty + @param:JsonProperty("individualRecipientId") + private val individualRecipientId: String, + @field:JsonProperty + @param:JsonProperty("bodyRanges") + val bodyRanges: String? = null, + @field:JsonProperty + @param:JsonProperty("isScheduled") + val isScheduled: Boolean = false ) { fun getIndividualRecipientId(): String { diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V149_LegacyMigrations.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V149_LegacyMigrations.kt index 744ab06ad..75de5ac4d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V149_LegacyMigrations.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V149_LegacyMigrations.kt @@ -2441,7 +2441,8 @@ object V149_LegacyMigrations : SignalDatabaseMigration { ) val recipientId = db.insert( - "recipient", null, + "recipient", + null, contentValuesOf( "distribution_list_id" to 1L, "storage_service_key" to Base64.encodeBytes(StorageSyncHelper.generateKey()), @@ -2451,7 +2452,8 @@ object V149_LegacyMigrations : SignalDatabaseMigration { val listUUID = UUID.randomUUID().toString() db.insert( - "distribution_list", null, + "distribution_list", + null, contentValuesOf( "_id" to 1L, "name" to listUUID, diff --git a/app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiRemote.kt b/app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiRemote.kt index 9e25d3091..23f40451c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiRemote.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiRemote.kt @@ -56,7 +56,7 @@ class EmojiImageRequest( class EmojiFileRequest( version: Int, density: String, - name: String, + name: String ) : EmojiRequest { override val uri: String = "$BASE_STATIC_BUCKET_URI/$version/$density/$name" } diff --git a/app/src/main/java/org/thoughtcrime/securesms/events/WebRtcViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/events/WebRtcViewModel.kt index d30679041..899fa4ee6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/events/WebRtcViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/events/WebRtcViewModel.kt @@ -92,6 +92,7 @@ class WebRtcViewModel(state: WebRtcServiceState) { val identityChangedParticipants: Set = state.callInfoState.identityChangedRecipients val remoteDevicesCount: OptionalLong = state.callInfoState.remoteDevicesCount val participantLimit: Long? = state.callInfoState.participantLimit + @get:JvmName("shouldRingGroup") val ringGroup: Boolean = state.getCallSetupState(state.callInfoState.activePeer?.callId).ringGroup val ringerRecipient: Recipient = state.getCallSetupState(state.callInfoState.activePeer?.callId).ringerRecipient diff --git a/app/src/main/java/org/thoughtcrime/securesms/fonts/FontManifest.kt b/app/src/main/java/org/thoughtcrime/securesms/fonts/FontManifest.kt index b6cb72c83..82ba02e5d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/fonts/FontManifest.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/fonts/FontManifest.kt @@ -35,7 +35,7 @@ data class FontManifest( @JsonProperty("chinese-traditional") val chineseTraditional: FontScript?, @JsonProperty("chinese-simplified") val chineseSimplified: FontScript?, val arabic: FontScript?, - val japanese: FontScript?, + val japanese: FontScript? ) /** diff --git a/app/src/main/java/org/thoughtcrime/securesms/fonts/Fonts.kt b/app/src/main/java/org/thoughtcrime/securesms/fonts/Fonts.kt index eff04145e..c9d14a726 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/fonts/Fonts.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/fonts/Fonts.kt @@ -91,7 +91,9 @@ object Fonts { } val fontDownloadKey = FontDownloadKey( - version, supportedScript, font + version, + supportedScript, + font ) val taskInProgress = taskCache[fontDownloadKey] diff --git a/app/src/main/java/org/thoughtcrime/securesms/fonts/TypefaceHelper.kt b/app/src/main/java/org/thoughtcrime/securesms/fonts/TypefaceHelper.kt index aeabaf5eb..6979ab0b2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/fonts/TypefaceHelper.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/fonts/TypefaceHelper.kt @@ -33,6 +33,6 @@ object TypefaceHelper { SEMI_BOLD(600), BOLD(700), EXTRA_BOLD(800), - BLACK(900), + BLACK(900) } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveRemoteAnnouncementsJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveRemoteAnnouncementsJob.kt index 218267259..32b9fa0c1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveRemoteAnnouncementsJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveRemoteAnnouncementsJob.kt @@ -405,7 +405,7 @@ class RetrieveRemoteAnnouncementsJob private constructor(private val force: Bool @JsonProperty val linkText: String?, @JsonProperty val title: String, @JsonProperty val body: String, - @JsonProperty val callToActionText: String?, + @JsonProperty val callToActionText: String? ) data class TranslatedRemoteMegaphone( @@ -414,7 +414,7 @@ class RetrieveRemoteAnnouncementsJob private constructor(private val force: Bool @JsonProperty val title: String, @JsonProperty val body: String, @JsonProperty val primaryCtaText: String?, - @JsonProperty val secondaryCtaText: String?, + @JsonProperty val secondaryCtaText: String? ) class Factory : Job.Factory { diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyboard/sticker/KeyboardStickerListAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/keyboard/sticker/KeyboardStickerListAdapter.kt index 308f2d80d..2032fdfb8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/keyboard/sticker/KeyboardStickerListAdapter.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/keyboard/sticker/KeyboardStickerListAdapter.kt @@ -18,7 +18,7 @@ import org.thoughtcrime.securesms.util.adapter.mapping.MappingViewHolder class KeyboardStickerListAdapter( private val glideRequests: GlideRequests, private val eventListener: EventListener?, - private val allowApngAnimation: Boolean, + private val allowApngAnimation: Boolean ) : MappingAdapter() { init { diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/AccountValues.kt b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/AccountValues.kt index 79ffeca7e..1a50595f4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/AccountValues.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/AccountValues.kt @@ -59,10 +59,13 @@ internal class AccountValues internal constructor(store: KeyValueStore) : Signal @VisibleForTesting const val KEY_E164 = "account.e164" + @VisibleForTesting const val KEY_ACI = "account.aci" + @VisibleForTesting const val KEY_PNI = "account.pni" + @VisibleForTesting const val KEY_IS_REGISTERED = "account.is_registered" } @@ -84,7 +87,7 @@ internal class AccountValues internal constructor(store: KeyValueStore) : Signal KEY_ACI_IDENTITY_PUBLIC_KEY, KEY_ACI_IDENTITY_PRIVATE_KEY, KEY_PNI_IDENTITY_PUBLIC_KEY, - KEY_PNI_IDENTITY_PRIVATE_KEY, + KEY_PNI_IDENTITY_PRIVATE_KEY ) } diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/PlainTextSharedPrefsDataStore.kt b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/PlainTextSharedPrefsDataStore.kt index 2c8e3e0e5..05e2b25e0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/PlainTextSharedPrefsDataStore.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/PlainTextSharedPrefsDataStore.kt @@ -25,6 +25,7 @@ class PlainTextSharedPrefsDataStore(private val context: Context) { */ var smsMigrationIdOffset: Long get() = sharedPrefs.getLong(SMS_MIGRATION_ID_OFFSET, -1) + @SuppressLint("ApplySharedPref") set(value) { sharedPrefs.edit().putLong(SMS_MIGRATION_ID_OFFSET, value).commit() diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Adapter.kt b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Adapter.kt index d775e32f5..473cd1e28 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Adapter.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Adapter.kt @@ -29,7 +29,7 @@ class MediaPreviewV2Adapter(fragment: Fragment) : FragmentStateAdapter(fragment) MediaPreviewFragment.DATA_CONTENT_TYPE to contentType, MediaPreviewFragment.DATA_SIZE to attachment.size, MediaPreviewFragment.AUTO_PLAY to attachment.isVideoGif, - MediaPreviewFragment.VIDEO_GIF to attachment.isVideoGif, + MediaPreviewFragment.VIDEO_GIF to attachment.isVideoGif ) val fragment = if (MediaUtil.isVideo(contentType)) { VideoMediaPreviewFragment() diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2State.kt b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2State.kt index 56c3439fe..1e5392331 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2State.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2State.kt @@ -12,7 +12,7 @@ data class MediaPreviewV2State( val allMediaInAlbumRail: Boolean = false, val leftIsRecent: Boolean = false, val albums: Map> = mapOf(), - val messageBodies: Map = mapOf(), + val messageBodies: Map = mapOf() ) { enum class LoadState { INIT, DATA_LOADED, MEDIA_READY } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2ViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2ViewModel.kt index a75739eef..9afe58a69 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2ViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2ViewModel.kt @@ -44,7 +44,7 @@ class MediaPreviewV2ViewModel : ViewModel() { mediaRecords = result.records, messageBodies = result.messageBodies, albums = albums, - loadState = MediaPreviewV2State.LoadState.DATA_LOADED, + loadState = MediaPreviewV2State.LoadState.DATA_LOADED ) } else { oldState.copy( @@ -52,7 +52,7 @@ class MediaPreviewV2ViewModel : ViewModel() { mediaRecords = result.records.reversed(), messageBodies = result.messageBodies, albums = albums.mapValues { it.value.reversed() }, - loadState = MediaPreviewV2State.LoadState.DATA_LOADED, + loadState = MediaPreviewV2State.LoadState.DATA_LOADED ) } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/caption/ExpandingCaptionView.kt b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/caption/ExpandingCaptionView.kt index 2f47f45b2..7f55d4a9d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/caption/ExpandingCaptionView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/caption/ExpandingCaptionView.kt @@ -11,7 +11,7 @@ import org.thoughtcrime.securesms.components.emoji.EmojiTextView class ExpandingCaptionView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, - defStyleAttr: Int = 0, + defStyleAttr: Int = 0 ) : EmojiTextView(context, attrs, defStyleAttr) { var expandedHeight = 0 diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionActivity.kt index 5fb86b138..6c81af3e0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionActivity.kt @@ -434,7 +434,7 @@ class MediaSelectionActivity : @JvmStatic fun editor( context: Context, - media: List, + media: List ): Intent { return buildIntent( context = context, diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionRepository.kt index fa92da803..f651d60d6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionRepository.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionRepository.kt @@ -153,7 +153,9 @@ class MediaSelectionRepository(context: Context) { }.map { media -> Stories.MediaTransform.clipMediaToStoryDuration(media) }.flatten() - } else emptyList() + } else { + emptyList() + } uploadRepository.applyMediaUpdates(oldToNewMediaMap, singleRecipient) uploadRepository.updateCaptions(updatedMedia) diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/gallery/MediaGalleryViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/gallery/MediaGalleryViewModel.kt index d8b5ff48f..28f908a22 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/gallery/MediaGalleryViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/gallery/MediaGalleryViewModel.kt @@ -34,7 +34,8 @@ class MediaGalleryViewModel(bucketId: String?, bucketTitle: String?, private val repository.getFolders { folders -> store.update { state -> state.copy( - bucketId = bucketId, bucketTitle = bucketTitle, + bucketId = bucketId, + bucketTitle = bucketTitle, items = folders.map { MediaGallerySelectableItem.FolderModel(it) } @@ -45,7 +46,8 @@ class MediaGalleryViewModel(bucketId: String?, bucketTitle: String?, private val repository.getMedia(bucketId) { media -> store.update { state -> state.copy( - bucketId = bucketId, bucketTitle = bucketTitle, + bucketId = bucketId, + bucketTitle = bucketTitle, items = media.map { MediaGallerySelectableItem.FileModel(it, false, 0) } diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/AddMessageDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/AddMessageDialogFragment.kt index 092a00a39..d4809b439 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/AddMessageDialogFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/AddMessageDialogFragment.kt @@ -214,7 +214,6 @@ class AddMessageDialogFragment : KeyboardEntryDialogFragment(R.layout.v2_media_a if (!recipient.isPushV2Group) { annotations } else { - val validRecipientIds: Set = recipient.participantIds .map { id -> MentionAnnotation.idToMentionAnnotationValue(id) } .toSet() diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragment.kt index 74ba0be73..a8a85a334 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragment.kt @@ -85,7 +85,7 @@ class MediaReviewFragment : Fragment(R.layout.v2_media_review_fragment), Schedul private lateinit var progressWrapper: TouchInterceptingFrameLayout private val navigator = MediaSelectionNavigator( - toGallery = R.id.action_mediaReviewFragment_to_mediaGalleryFragment, + toGallery = R.id.action_mediaReviewFragment_to_mediaGalleryFragment ) private var animatorSet: AnimatorSet? = null @@ -502,24 +502,22 @@ class MediaReviewFragment : Fragment(R.layout.v2_media_review_fragment), Schedul } private fun computeSendButtonAnimators(state: MediaSelectionState): List { - val slideIn = listOf( - MediaReviewAnimatorController.getSlideInAnimator(sendButton), + MediaReviewAnimatorController.getSlideInAnimator(sendButton) ) return slideIn + if (state.isTouchEnabled) { listOf( - MediaReviewAnimatorController.getFadeInAnimator(sendButton, state.canSend), + MediaReviewAnimatorController.getFadeInAnimator(sendButton, state.canSend) ) } else { listOf( - MediaReviewAnimatorController.getFadeOutAnimator(sendButton, state.canSend), + MediaReviewAnimatorController.getFadeOutAnimator(sendButton, state.canSend) ) } } private fun computeSaveButtonAnimators(state: MediaSelectionState): List { - val slideIn = listOf( MediaReviewAnimatorController.getSlideInAnimator(saveButton) ) diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/stories/ChooseStoryTypeBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/stories/ChooseStoryTypeBottomSheet.kt index cd6e360ee..fab8e9f3b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/stories/ChooseStoryTypeBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/stories/ChooseStoryTypeBottomSheet.kt @@ -24,7 +24,8 @@ class ChooseStoryTypeBottomSheet : DSLSettingsBottomSheetFragment( textPref( title = DSLSettingsText.from( stringId = R.string.ChooseStoryTypeBottomSheet__choose_your_story_type, - DSLSettingsText.CenterModifier, DSLSettingsText.TitleMediumModifier + DSLSettingsText.CenterModifier, + DSLSettingsText.TitleMediumModifier ) ) diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/TextStoryBackgroundColors.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/TextStoryBackgroundColors.kt index a810393cb..ed801ec44 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/TextStoryBackgroundColors.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/TextStoryBackgroundColors.kt @@ -29,10 +29,16 @@ object TextStoryBackgroundColors { id = ChatColors.Id.NotSet, linearGradient = ChatColors.LinearGradient( colors = intArrayOf( - 0xFF19A9FA.toInt(), 0xFF7097D7.toInt(), 0xFFD1998D.toInt(), 0xFFFFC369.toInt() + 0xFF19A9FA.toInt(), + 0xFF7097D7.toInt(), + 0xFFD1998D.toInt(), + 0xFFFFC369.toInt() ), positions = floatArrayOf( - 0f, 0.33f, 0.66f, 1f + 0f, + 0.33f, + 0.66f, + 1f ), degrees = 180f ) @@ -41,10 +47,16 @@ object TextStoryBackgroundColors { id = ChatColors.Id.NotSet, linearGradient = ChatColors.LinearGradient( colors = intArrayOf( - 0xFF4437D8.toInt(), 0xFF6B70DE.toInt(), 0xFFB774E0.toInt(), 0xFFFF8E8E.toInt() + 0xFF4437D8.toInt(), + 0xFF6B70DE.toInt(), + 0xFFB774E0.toInt(), + 0xFFFF8E8E.toInt() ), positions = floatArrayOf( - 0f, 0.33f, 0.66f, 1f + 0f, + 0.33f, + 0.66f, + 1f ), degrees = 180f ) @@ -53,10 +65,16 @@ object TextStoryBackgroundColors { id = ChatColors.Id.NotSet, linearGradient = ChatColors.LinearGradient( colors = intArrayOf( - 0xFF004044.toInt(), 0xFF2C5F45.toInt(), 0xFF648E52.toInt(), 0xFF93B864.toInt() + 0xFF004044.toInt(), + 0xFF2C5F45.toInt(), + 0xFF648E52.toInt(), + 0xFF93B864.toInt() ), positions = floatArrayOf( - 0f, 0.33f, 0.66f, 1f + 0f, + 0.33f, + 0.66f, + 1f ), degrees = 180f ) diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/TextStoryPostCreationState.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/TextStoryPostCreationState.kt index 02db1646c..13ea17f1b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/TextStoryPostCreationState.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/TextStoryPostCreationState.kt @@ -21,7 +21,7 @@ data class TextStoryPostCreationState( val textFont: TextFont = TextFont.REGULAR, @IntRange(from = 0, to = 100) val textScale: Int = 50, val backgroundColor: ChatColors = TextStoryBackgroundColors.getInitialBackgroundColor(), - val linkPreviewUri: String? = null, + val linkPreviewUri: String? = null ) : Parcelable { @ColorInt diff --git a/app/src/main/java/org/thoughtcrime/securesms/megaphone/MegaphoneText.kt b/app/src/main/java/org/thoughtcrime/securesms/megaphone/MegaphoneText.kt index 5a3a40e6b..c0727a0e7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/megaphone/MegaphoneText.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/megaphone/MegaphoneText.kt @@ -7,7 +7,8 @@ import androidx.annotation.StringRes * Allows setting of megaphone text by string resource or string literal. */ data class MegaphoneText(@StringRes private val stringRes: Int = 0, private val string: String? = null) { - @get:JvmName("hasText") val hasText = stringRes != 0 || string != null + @get:JvmName("hasText") + val hasText = stringRes != 0 || string != null fun resolve(context: Context): String? { return if (stringRes != 0) context.getString(stringRes) else string diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/OutgoingMessage.kt b/app/src/main/java/org/thoughtcrime/securesms/mms/OutgoingMessage.kt index 174371722..ad1f22784 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/OutgoingMessage.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/OutgoingMessage.kt @@ -50,7 +50,7 @@ data class OutgoingMessage( val isEndSession: Boolean = false, val isIdentityVerified: Boolean = false, val isIdentityDefault: Boolean = false, - val scheduledDate: Long = -1, + val scheduledDate: Long = -1 ) { val isV2Group: Boolean = messageGroupContext != null && GroupV2UpdateMessageUtil.isGroupV2(messageGroupContext) @@ -344,7 +344,7 @@ data class OutgoingMessage( sentTimeMillis = sentTimeMillis, isIdentityVerified = true, isUrgent = false, - isSecure = true, + isSecure = true ) } @@ -358,7 +358,7 @@ data class OutgoingMessage( sentTimeMillis = sentTimeMillis, isIdentityDefault = true, isUrgent = false, - isSecure = true, + isSecure = true ) } @@ -373,7 +373,7 @@ data class OutgoingMessage( sentTimeMillis = sentTimeMillis, isEndSession = true, isUrgent = false, - isSecure = true, + isSecure = true ) } diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/DefaultMessageNotifier.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/DefaultMessageNotifier.kt index 6f9a23211..d9c866f45 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/DefaultMessageNotifier.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/DefaultMessageNotifier.kt @@ -46,11 +46,17 @@ import kotlin.math.max */ class DefaultMessageNotifier(context: Application) : MessageNotifier { @Volatile private var visibleThread: ConversationId? = null + @Volatile private var lastDesktopActivityTimestamp: Long = -1 + @Volatile private var lastAudibleNotification: Long = -1 + @Volatile private var lastScheduledReminder: Long = 0 + @Volatile private var previousLockedStatus: Boolean = KeyCachingService.isLocked(context) + @Volatile private var previousPrivacyPreference: NotificationPrivacyPreference = SignalStore.settings().messageNotificationsPrivacy + @Volatile private var previousState: NotificationState = NotificationState.EMPTY private val threadReminders: MutableMap = ConcurrentHashMap() diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/UsernameShareBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/UsernameShareBottomSheet.kt index 5ef969ea8..91c87723b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/UsernameShareBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/UsernameShareBottomSheet.kt @@ -50,7 +50,7 @@ class UsernameShareBottomSheet : DSLSettingsBottomSheetFragment() { DSLSettingsText.TextAppearanceModifier(R.style.Signal_Text_BodyMedium), DSLSettingsText.CenterModifier, DSLSettingsText.ColorModifier( - ContextCompat.getColor(requireContext(), R.color.signal_colorOnSurfaceVariant), + ContextCompat.getColor(requireContext(), R.color.signal_colorOnSurfaceVariant) ) ) ) diff --git a/app/src/main/java/org/thoughtcrime/securesms/push/SignalServiceNetworkAccess.kt b/app/src/main/java/org/thoughtcrime/securesms/push/SignalServiceNetworkAccess.kt index 82b30b61e..d0245c548 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/push/SignalServiceNetworkAccess.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/push/SignalServiceNetworkAccess.kt @@ -50,7 +50,7 @@ open class SignalServiceNetworkAccess(context: Context) { BuildConfig.SIGNAL_CONTACT_DISCOVERY_URL.stripProtocol() to BuildConfig.SIGNAL_CDS_IPS.toSet(), BuildConfig.SIGNAL_KEY_BACKUP_URL.stripProtocol() to BuildConfig.SIGNAL_KBS_IPS.toSet(), BuildConfig.SIGNAL_SFU_URL.stripProtocol() to BuildConfig.SIGNAL_SFU_IPS.toSet(), - BuildConfig.CONTENT_PROXY_HOST.stripProtocol() to BuildConfig.SIGNAL_CONTENT_PROXY_IPS.toSet(), + BuildConfig.CONTENT_PROXY_HOST.stripProtocol() to BuildConfig.SIGNAL_CONTENT_PROXY_IPS.toSet() ) ) ) @@ -140,7 +140,7 @@ open class SignalServiceNetworkAccess(context: Context) { StandardUserAgentInterceptor(), RemoteDeprecationDetectorInterceptor(), DeprecatedClientPreventionInterceptor(), - DeviceTransferBlockingInterceptor.getInstance(), + DeviceTransferBlockingInterceptor.getInstance() ) private val zkGroupServerPublicParams: ByteArray = try { @@ -154,7 +154,7 @@ open class SignalServiceNetworkAccess(context: Context) { HostConfig("https://android.clients.google.com", G_HOST, PLAY_CONNECTION_SPEC), HostConfig("https://clients3.google.com", G_HOST, GMAPS_CONNECTION_SPEC), HostConfig("https://clients4.google.com", G_HOST, GMAPS_CONNECTION_SPEC), - HostConfig("https://inbox.google.com", G_HOST, GMAIL_CONNECTION_SPEC), + HostConfig("https://inbox.google.com", G_HOST, GMAIL_CONNECTION_SPEC) ) private val fUrls = arrayOf("https://cdn.sstatic.net", "https://github.githubassets.com", "https://pinterest.com", "https://open.scdn.co", "https://www.redditstatic.com") @@ -163,7 +163,7 @@ open class SignalServiceNetworkAccess(context: Context) { fUrls.map { SignalServiceUrl(it, F_SERVICE_HOST, fTrustStore, APP_CONNECTION_SPEC) }.toTypedArray(), mapOf( 0 to fUrls.map { SignalCdnUrl(it, F_CDN_HOST, fTrustStore, APP_CONNECTION_SPEC) }.toTypedArray(), - 2 to fUrls.map { SignalCdnUrl(it, F_CDN2_HOST, fTrustStore, APP_CONNECTION_SPEC) }.toTypedArray(), + 2 to fUrls.map { SignalCdnUrl(it, F_CDN2_HOST, fTrustStore, APP_CONNECTION_SPEC) }.toTypedArray() ), fUrls.map { SignalKeyBackupServiceUrl(it, F_KBS_HOST, fTrustStore, APP_CONNECTION_SPEC) }.toTypedArray(), fUrls.map { SignalStorageUrl(it, F_STORAGE_HOST, fTrustStore, APP_CONNECTION_SPEC) }.toTypedArray(), @@ -171,30 +171,30 @@ open class SignalServiceNetworkAccess(context: Context) { interceptors, Optional.of(DNS), Optional.empty(), - zkGroupServerPublicParams, + zkGroupServerPublicParams ) private val censorshipConfiguration: Map = mapOf( COUNTRY_CODE_EGYPT to buildGConfiguration( - listOf(HostConfig("https://www.google.com.eg", G_HOST, GMAIL_CONNECTION_SPEC)) + baseGHostConfigs, + listOf(HostConfig("https://www.google.com.eg", G_HOST, GMAIL_CONNECTION_SPEC)) + baseGHostConfigs ), COUNTRY_CODE_UAE to buildGConfiguration( - listOf(HostConfig("https://www.google.ae", G_HOST, GMAIL_CONNECTION_SPEC)) + baseGHostConfigs, + listOf(HostConfig("https://www.google.ae", G_HOST, GMAIL_CONNECTION_SPEC)) + baseGHostConfigs ), COUNTRY_CODE_OMAN to buildGConfiguration( - listOf(HostConfig("https://www.google.com.om", G_HOST, GMAIL_CONNECTION_SPEC)) + baseGHostConfigs, + listOf(HostConfig("https://www.google.com.om", G_HOST, GMAIL_CONNECTION_SPEC)) + baseGHostConfigs ), COUNTRY_CODE_QATAR to buildGConfiguration( - listOf(HostConfig("https://www.google.com.qa", G_HOST, GMAIL_CONNECTION_SPEC)) + baseGHostConfigs, + listOf(HostConfig("https://www.google.com.qa", G_HOST, GMAIL_CONNECTION_SPEC)) + baseGHostConfigs ), COUNTRY_CODE_UZBEKISTAN to buildGConfiguration( - listOf(HostConfig("https://www.google.co.uz", G_HOST, GMAIL_CONNECTION_SPEC)) + baseGHostConfigs, + listOf(HostConfig("https://www.google.co.uz", G_HOST, GMAIL_CONNECTION_SPEC)) + baseGHostConfigs ), COUNTRY_CODE_UKRAINE to buildGConfiguration( - listOf(HostConfig("https://www.google.com.ua", G_HOST, GMAIL_CONNECTION_SPEC)) + baseGHostConfigs, + listOf(HostConfig("https://www.google.com.ua", G_HOST, GMAIL_CONNECTION_SPEC)) + baseGHostConfigs ), COUNTRY_CODE_IRAN to fConfig, - COUNTRY_CODE_CUBA to fConfig, + COUNTRY_CODE_CUBA to fConfig ) private val defaultCensoredConfiguration: SignalServiceConfiguration = buildGConfiguration(baseGHostConfigs) @@ -206,7 +206,7 @@ open class SignalServiceNetworkAccess(context: Context) { COUNTRY_CODE_QATAR, COUNTRY_CODE_IRAN, COUNTRY_CODE_CUBA, - COUNTRY_CODE_UZBEKISTAN, + COUNTRY_CODE_UZBEKISTAN ) open val uncensoredConfiguration: SignalServiceConfiguration = SignalServiceConfiguration( @@ -221,7 +221,7 @@ open class SignalServiceNetworkAccess(context: Context) { interceptors, Optional.of(DNS), if (SignalStore.proxy().isProxyEnabled) Optional.ofNullable(SignalStore.proxy().proxy) else Optional.empty(), - zkGroupServerPublicParams, + zkGroupServerPublicParams ) open fun getConfiguration(): SignalServiceConfiguration { @@ -286,7 +286,7 @@ open class SignalServiceNetworkAccess(context: Context) { interceptors, Optional.of(DNS), Optional.empty(), - zkGroupServerPublicParams, + zkGroupServerPublicParams ) } diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/util/RegistrationNumberInputController.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/util/RegistrationNumberInputController.kt index 02d38b323..df28dbe52 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/util/RegistrationNumberInputController.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/util/RegistrationNumberInputController.kt @@ -108,7 +108,9 @@ class RegistrationNumberInputController( } return if (justDigits.isEmpty()) { null - } else justDigits.toString() + } else { + justDigits.toString() + } } inner class NumberChangedListener : TextWatcher { diff --git a/app/src/main/java/org/thoughtcrime/securesms/releasechannel/ReleaseChannel.kt b/app/src/main/java/org/thoughtcrime/securesms/releasechannel/ReleaseChannel.kt index bdb489a43..6449b5904 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/releasechannel/ReleaseChannel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/releasechannel/ReleaseChannel.kt @@ -33,7 +33,6 @@ object ReleaseChannel { messageRanges: BodyRangeList? = null, storyType: StoryType = StoryType.NONE ): MessageTable.InsertResult? { - val attachments: Optional> = if (media != null) { val attachment = SignalServiceAttachmentPointer( CDN_NUMBER, diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/AndroidTelecomUtil.kt b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/AndroidTelecomUtil.kt index ad3c6c5d1..e193dbbea 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/AndroidTelecomUtil.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/AndroidTelecomUtil.kt @@ -146,7 +146,7 @@ object AndroidTelecomUtil { AndroidCallConnectionService.KEY_RECIPIENT_ID to recipientId.serialize(), AndroidCallConnectionService.KEY_CALL_ID to callId, AndroidCallConnectionService.KEY_VIDEO_CALL to isVideoCall - ), + ) ) try { diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/state/LocalDeviceState.kt b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/state/LocalDeviceState.kt index 68b4b6b1a..05300c71f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/state/LocalDeviceState.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/state/LocalDeviceState.kt @@ -17,7 +17,7 @@ data class LocalDeviceState constructor( var activeDevice: SignalAudioManager.AudioDevice = SignalAudioManager.AudioDevice.NONE, var availableDevices: Set = emptySet(), var bluetoothPermissionDenied: Boolean = false, - var networkConnectionType: PeerConnection.AdapterType = PeerConnection.AdapterType.UNKNOWN, + var networkConnectionType: PeerConnection.AdapterType = PeerConnection.AdapterType.UNKNOWN ) { fun duplicate(): LocalDeviceState { diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/state/WebRtcEphemeralState.kt b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/state/WebRtcEphemeralState.kt index de598abce..a0a9da3f1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/state/WebRtcEphemeralState.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/state/WebRtcEphemeralState.kt @@ -8,5 +8,5 @@ import org.thoughtcrime.securesms.events.CallParticipantId */ data class WebRtcEphemeralState( val localAudioLevel: CallParticipant.AudioLevel = CallParticipant.AudioLevel.LOWEST, - val remoteAudioLevels: Map = emptyMap(), + val remoteAudioLevels: Map = emptyMap() ) diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/dialogs/StoryDialogs.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/dialogs/StoryDialogs.kt index 81f607b6a..22fb81694 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/dialogs/StoryDialogs.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stories/dialogs/StoryDialogs.kt @@ -56,13 +56,13 @@ object StoryDialogs { } fun resendStory(context: Context, onDismiss: () -> Unit = {}, resend: () -> Unit) { - MaterialAlertDialogBuilder(context) - .setMessage(R.string.StoryDialogs__story_could_not_be_sent) - .setNegativeButton(android.R.string.cancel, null) - .setPositiveButton(R.string.StoryDialogs__send) { _, _ -> resend() } - .setOnDismissListener { onDismiss() } - .show() -} + MaterialAlertDialogBuilder(context) + .setMessage(R.string.StoryDialogs__story_could_not_be_sent) + .setNegativeButton(android.R.string.cancel, null) + .setPositiveButton(R.string.StoryDialogs__send) { _, _ -> resend() } + .setOnDismissListener { onDismiss() } + .show() + } fun displayStoryOrProfileImage( context: Context, @@ -92,7 +92,7 @@ object StoryDialogs { context: Context, recipientName: String, onCancelled: () -> Unit = {}, - onHideStoryConfirmed: () -> Unit, + onHideStoryConfirmed: () -> Unit ) { MaterialAlertDialogBuilder(context, R.style.ThemeOverlay_Signal_MaterialAlertDialog) .setTitle(R.string.StoriesLandingFragment__hide_story) diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingItem.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingItem.kt index 48de725bf..c98784ed3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingItem.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingItem.kt @@ -135,7 +135,6 @@ object StoriesLandingItem { private val addToStoriesView: View = itemView.findViewById(R.id.add_to_story) override fun bind(model: Model) { - presentDateOrStatus(model) setUpClickListeners(model) diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingRepository.kt index 7844ece1f..acbf57d1e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingRepository.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingRepository.kt @@ -122,9 +122,13 @@ class StoriesLandingRepository(context: Context) { hasRepliesFromSelf = messageRecords.any { SignalDatabase.messages.hasSelfReplyInStory(it.id) }, isHidden = sender.shouldHideStory(), primaryStory = ConversationMessage.ConversationMessageFactory.createWithUnresolvedData(context, messageRecords[primaryIndex]), - secondaryStory = if (sender.isMyStory) messageRecords.drop(1).firstOrNull()?.let { - ConversationMessage.ConversationMessageFactory.createWithUnresolvedData(context, it) - } else null, + secondaryStory = if (sender.isMyStory) { + messageRecords.drop(1).firstOrNull()?.let { + ConversationMessage.ConversationMessageFactory.createWithUnresolvedData(context, it) + } + } else { + null + }, sendingCount = sendingCount, failureCount = failureCount ) diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/settings/create/CreateStoryNameFieldItem.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/settings/create/CreateStoryNameFieldItem.kt index d00263080..8ba4dc6c1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/settings/create/CreateStoryNameFieldItem.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stories/settings/create/CreateStoryNameFieldItem.kt @@ -22,7 +22,7 @@ object CreateStoryNameFieldItem { class Model( val body: CharSequence, - val error: CharSequence?, + val error: CharSequence? ) : PreferenceModel() { override fun areItemsTheSame(newItem: Model): Boolean = true override fun areContentsTheSame(newItem: Model): Boolean { diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/settings/select/BaseStoryRecipientSelectionFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/settings/select/BaseStoryRecipientSelectionFragment.kt index f78e9c26a..0f39f3f6d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/settings/select/BaseStoryRecipientSelectionFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stories/settings/select/BaseStoryRecipientSelectionFragment.kt @@ -131,7 +131,7 @@ abstract class BaseStoryRecipientSelectionFragment : Fragment(R.layout.stories_b override fun getHeaderAction(): HeaderAction { return HeaderAction( - R.string.BaseStoryRecipientSelectionFragment__select_all, + R.string.BaseStoryRecipientSelectionFragment__select_all ) { viewModel.toggleSelectAll() } diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/settings/story/StoriesPrivacySettingsState.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/settings/story/StoriesPrivacySettingsState.kt index d77b38a81..9d3b58132 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/settings/story/StoriesPrivacySettingsState.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stories/settings/story/StoriesPrivacySettingsState.kt @@ -7,5 +7,5 @@ data class StoriesPrivacySettingsState( val areViewReceiptsEnabled: Boolean, val isUpdatingEnabledState: Boolean = false, val storyContactItems: List = emptyList(), - val userHasStories: Boolean = false, + val userHasStories: Boolean = false ) diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/settings/story/StoriesPrivacySettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/settings/story/StoriesPrivacySettingsViewModel.kt index 0937d8c4a..40ccfc834 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/settings/story/StoriesPrivacySettingsViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stories/settings/story/StoriesPrivacySettingsViewModel.kt @@ -48,7 +48,7 @@ class StoriesPrivacySettingsViewModel( val configuration = ContactSearchConfiguration.build { addSection( ContactSearchConfiguration.Section.Stories( - includeHeader = false, + includeHeader = false ) ) } diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/AddToGroupStoryDelegate.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/AddToGroupStoryDelegate.kt index 573bdcf90..0602fac45 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/AddToGroupStoryDelegate.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/AddToGroupStoryDelegate.kt @@ -118,7 +118,7 @@ class AddToGroupStoryDelegate( MessageSender.sendStories( ApplicationDependencies.getApplication(), secureMessages, - null, + null ) { Log.d(TAG, "Sent.") } diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/StoryViewerViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/StoryViewerViewModel.kt index 0389075d2..f52e4db0c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/StoryViewerViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/StoryViewerViewModel.kt @@ -20,7 +20,7 @@ import kotlin.math.max class StoryViewerViewModel( private val storyViewerArgs: StoryViewerArgs, - private val repository: StoryViewerRepository, + private val repository: StoryViewerRepository ) : ViewModel() { private val store = RxStore( diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryDisplay.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryDisplay.kt index d8bfa6d5d..bda528efa 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryDisplay.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryDisplay.kt @@ -10,10 +10,12 @@ enum class StoryDisplay { * View/Reply is underneath story content, corners are rounded, content is not cropped */ LARGE, + /** * View/Reply overlays story content, corners are rounded, content is not cropped */ MEDIUM, + /** * View/Reply is overlays story content, corners are not rounded, content is cropped */ diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt index bece0807f..24203c808 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt @@ -228,7 +228,7 @@ class StoryViewerPageFragment : val singleTapHandler = SingleTapHandler( cardWrapper, viewModel::goToNextPost, - viewModel::goToPreviousPost, + viewModel::goToPreviousPost ) val gestureDetector = GestureDetectorCompat( @@ -245,7 +245,9 @@ class StoryViewerPageFragment : gestureDetector.setOnDoubleTapListener(null) val scaleListener = StoryScaleListener( - viewModel, sharedViewModel, card + viewModel, + sharedViewModel, + card ) val scaleDetector = ScaleGestureDetector( @@ -1062,7 +1064,7 @@ class StoryViewerPageFragment : viewModel.setIsDisplayingForwardDialog(true) MultiselectForwardFragmentArgs.create( requireContext(), - storyPost.conversationMessage.multiselectCollection.toSet(), + storyPost.conversationMessage.multiselectCollection.toSet() ) { MultiselectForwardFragment.showBottomSheet(childFragmentManager, it) } diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/composer/StoryReactionBar.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/composer/StoryReactionBar.kt index b8148ef9e..a8203ddb0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/composer/StoryReactionBar.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/composer/StoryReactionBar.kt @@ -63,7 +63,6 @@ class StoryReactionBar @JvmOverloads constructor( animatorSet?.cancel() animatorSet = AnimatorSet().apply { - playTogether( emojiViews.flatMap { listOf(ObjectAnimator.ofFloat(it, View.ALPHA, 1f), ObjectAnimator.ofFloat(it, View.TRANSLATION_Y, 0f)) diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyFragment.kt index ffb0e73f6..a33afd388 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyFragment.kt @@ -481,7 +481,6 @@ class StoryGroupReplyFragment : if (!recipient.isPushV2Group) { annotations } else { - val validRecipientIds: Set = recipient.participantIds .map { id -> MentionAnnotation.idToMentionAnnotationValue(id) } .toSet() diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/reaction/OnReactionSentView.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/reaction/OnReactionSentView.kt index 2e9784c35..bc31658fd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/reaction/OnReactionSentView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/reaction/OnReactionSentView.kt @@ -45,7 +45,7 @@ class OnReactionSentView @JvmOverloads constructor( R.id.emoji_8, R.id.emoji_9, R.id.emoji_10, - R.id.emoji_11, + R.id.emoji_11 ).forEach { findViewById(it).setImageEmoji(emoji) } diff --git a/app/src/main/java/org/thoughtcrime/securesms/subscription/Subscription.kt b/app/src/main/java/org/thoughtcrime/securesms/subscription/Subscription.kt index ecf254d17..4cfbb8e41 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/subscription/Subscription.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/subscription/Subscription.kt @@ -30,7 +30,7 @@ data class Subscription( val name: String, val badge: Badge, val prices: Set, - val level: Int, + val level: Int ) { companion object { diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/JavaTimeExtensions.kt b/app/src/main/java/org/thoughtcrime/securesms/util/JavaTimeExtensions.kt index 6cdbdb85b..67496a3b9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/JavaTimeExtensions.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/util/JavaTimeExtensions.kt @@ -105,6 +105,6 @@ fun Locale.orderOfDaysInWeek(): List { firstDayOfWeek.plus(3), firstDayOfWeek.plus(4), firstDayOfWeek.plus(5), - firstDayOfWeek.plus(6), + firstDayOfWeek.plus(6) ) } diff --git a/app/src/main/java/org/thoughtcrime/securesms/video/exo/SimpleExoPlayerPool.kt b/app/src/main/java/org/thoughtcrime/securesms/video/exo/SimpleExoPlayerPool.kt index 3ef0023aa..eb99ac894 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/video/exo/SimpleExoPlayerPool.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/video/exo/SimpleExoPlayerPool.kt @@ -82,7 +82,7 @@ class SimpleExoPlayerPool(context: Context) : ExoPlayerPool(MAXIMUM_R * players will be returned first when a player is requested via require. */ abstract class ExoPlayerPool( - private val maximumReservedPlayers: Int, + private val maximumReservedPlayers: Int ) : AppForegroundObserver.Listener { companion object { @@ -130,7 +130,7 @@ abstract class ExoPlayerPool( @MainThread private fun get(allowReserved: Boolean, tag: String): T? { val player = findAvailablePlayer(allowReserved) - return if (player == null && pool.size < getMaximumAllowed(allowReserved)) { + val toReturn = if (player == null && pool.size < getMaximumAllowed(allowReserved)) { val newPlayer = createPlayer() val poolState = createPoolStateForNewEntry(allowReserved, tag) pool[newPlayer] = poolState @@ -142,7 +142,9 @@ abstract class ExoPlayerPool( } else { Log.d(TAG, "Failed to get an ExoPlayer instance for tag: $tag :: ${poolStats()}") null - }?.apply { + } + + return toReturn?.apply { configureForVideoPlayback() } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/FullSignalAudioManagerApi31.kt b/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/FullSignalAudioManagerApi31.kt index 3122d1ba5..67e90a34a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/FullSignalAudioManagerApi31.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/FullSignalAudioManagerApi31.kt @@ -229,7 +229,7 @@ class FullSignalAudioManagerApi31(context: Context, eventListener: EventListener else -> AudioDevice.SPEAKER_PHONE } - if (deviceToSet != currentAudioDevice) + if (deviceToSet != currentAudioDevice) { try { val chosenDevice: AudioDeviceInfo = availableCommunicationDevices.first { AudioDeviceMapping.getEquivalentPlatformTypes(deviceToSet).contains(it.type) } val result = androidAudioManager.setCommunicationDevice(chosenDevice) @@ -243,5 +243,6 @@ class FullSignalAudioManagerApi31(context: Context, eventListener: EventListener } catch (e: NoSuchElementException) { androidAudioManager.clearCommunicationDevice() } + } } } diff --git a/app/src/spinner/java/org/thoughtcrime/securesms/SpinnerApplicationContext.kt b/app/src/spinner/java/org/thoughtcrime/securesms/SpinnerApplicationContext.kt index 8ddee0c3b..3efb4dc37 100644 --- a/app/src/spinner/java/org/thoughtcrime/securesms/SpinnerApplicationContext.kt +++ b/app/src/spinner/java/org/thoughtcrime/securesms/SpinnerApplicationContext.kt @@ -69,7 +69,7 @@ class SpinnerApplicationContext : ApplicationContext() { "keyvalue" to DatabaseConfig(db = { KeyValueDatabase.getInstance(this).sqlCipherDatabase }), "megaphones" to DatabaseConfig(db = { MegaphoneDatabase.getInstance(this).sqlCipherDatabase }), "localmetrics" to DatabaseConfig(db = { LocalMetricsDatabase.getInstance(this).sqlCipherDatabase }), - "logs" to DatabaseConfig(db = { LogDatabase.getInstance(this).sqlCipherDatabase }), + "logs" to DatabaseConfig(db = { LogDatabase.getInstance(this).sqlCipherDatabase }) ), linkedMapOf( StorageServicePlugin.PATH to StorageServicePlugin() diff --git a/app/src/test/java/org/thoughtcrime/securesms/backup/FullBackupExporterTest.kt b/app/src/test/java/org/thoughtcrime/securesms/backup/FullBackupExporterTest.kt index 70295b378..b482bb913 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/backup/FullBackupExporterTest.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/backup/FullBackupExporterTest.kt @@ -21,7 +21,7 @@ class FullBackupExporterTest { mapOf( "A" to setOf(), "B" to setOf(), - "C" to setOf(), + "C" to setOf() ) ) @@ -40,7 +40,7 @@ class FullBackupExporterTest { val order = FullBackupExporter.computeTableOrder( mapOf( "C" to setOf("B"), - "B" to setOf("A"), + "B" to setOf("A") ) ) @@ -63,7 +63,7 @@ class FullBackupExporterTest { "H" to setOf(), "A" to setOf(), "C" to setOf(), - "D" to setOf(), + "D" to setOf() ) ) @@ -89,7 +89,7 @@ class FullBackupExporterTest { "B" to setOf(), "D" to setOf(), "F" to setOf(), - "G" to setOf(), + "G" to setOf() ) ) @@ -112,7 +112,7 @@ class FullBackupExporterTest { "B" to setOf(), "D" to setOf(), "F" to setOf(), - "G" to setOf(), + "G" to setOf() ) ) @@ -132,7 +132,7 @@ class FullBackupExporterTest { "D" to setOf("A"), "E" to setOf("A", "B"), "A" to setOf(), - "B" to setOf(), + "B" to setOf() ) ) diff --git a/app/src/test/java/org/thoughtcrime/securesms/backup/FullBackupImporterTest.kt b/app/src/test/java/org/thoughtcrime/securesms/backup/FullBackupImporterTest.kt index e439dc658..208942414 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/backup/FullBackupImporterTest.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/backup/FullBackupImporterTest.kt @@ -21,7 +21,7 @@ class FullBackupImporterTest { mapOf( "A" to setOf(), "B" to setOf(), - "C" to setOf(), + "C" to setOf() ) ) @@ -40,7 +40,7 @@ class FullBackupImporterTest { val order = FullBackupImporter.computeTableDropOrder( mapOf( "A" to setOf("B"), - "B" to setOf("C"), + "B" to setOf("C") ) ) @@ -63,7 +63,7 @@ class FullBackupImporterTest { "E" to setOf("G", "H"), "F" to setOf(), "G" to setOf(), - "H" to setOf(), + "H" to setOf() ) ) @@ -89,7 +89,7 @@ class FullBackupImporterTest { "F" to setOf(), "G" to setOf(), "H" to setOf(), - "I" to setOf(), + "I" to setOf() ) ) @@ -112,7 +112,7 @@ class FullBackupImporterTest { "E" to setOf(), "F" to setOf(), "G" to setOf(), - "H" to setOf(), + "H" to setOf() ) ) @@ -132,7 +132,7 @@ class FullBackupImporterTest { "B" to setOf("D"), "C" to setOf("D", "E"), "D" to setOf(), - "E" to setOf(), + "E" to setOf() ) ) @@ -153,7 +153,7 @@ class FullBackupImporterTest { "A" to setOf("D"), "B" to setOf("C"), "C" to setOf("D"), - "D" to setOf(), + "D" to setOf() ) ) diff --git a/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardTextWatcherTest.kt b/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardTextWatcherTest.kt index fc93adb4a..dea462186 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardTextWatcherTest.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardTextWatcherTest.kt @@ -53,7 +53,7 @@ class CreditCardTextWatcherTest( arrayOf("55000000000", "5500 0000 000"), arrayOf("550000000000000", "5500 0000 0000 000"), arrayOf("5500000000000000", "5500 0000 0000 0000"), - arrayOf("55000000000000000", "55000 00000 00000 00"), + arrayOf("55000000000000000", "55000 00000 00000 00") ) } } diff --git a/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardTypeTest.kt b/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardTypeTest.kt index e1ca410ee..8567a5d37 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardTypeTest.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardTypeTest.kt @@ -38,7 +38,7 @@ class CreditCardTypeTest( arrayOf("2223003122003222", CreditCardType.OTHER), arrayOf("6011111111111117", CreditCardType.OTHER), arrayOf("3056930009020004", CreditCardType.OTHER), - arrayOf("3566002020360505", CreditCardType.OTHER), + arrayOf("3566002020360505", CreditCardType.OTHER) ) } } diff --git a/app/src/test/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchPagedDataSourceTest.kt b/app/src/test/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchPagedDataSourceTest.kt index 6355b9078..622a7eaaa 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchPagedDataSourceTest.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchPagedDataSourceTest.kt @@ -115,7 +115,7 @@ class ContactSearchPagedDataSourceTest { ContactSearchKey.RecipientSearchKey(RecipientId.UNKNOWN, true), ContactSearchKey.RecipientSearchKey(RecipientId.UNKNOWN, true), ContactSearchKey.RecipientSearchKey(RecipientId.UNKNOWN, true), - ContactSearchKey.RecipientSearchKey(RecipientId.UNKNOWN, true), + ContactSearchKey.RecipientSearchKey(RecipientId.UNKNOWN, true) ) val resultKeys = result.map { it.contactSearchKey } diff --git a/app/src/test/java/org/thoughtcrime/securesms/conversation/ConversationItemTest_linkifyUrlLinks.kt b/app/src/test/java/org/thoughtcrime/securesms/conversation/ConversationItemTest_linkifyUrlLinks.kt index 392b34fea..f7dd01544 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/conversation/ConversationItemTest_linkifyUrlLinks.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/conversation/ConversationItemTest_linkifyUrlLinks.kt @@ -40,7 +40,7 @@ class ConversationItemTest_linkifyUrlLinks(private val input: String, private va arrayOf("https://www.instagram.com/tv/CfImYdngccQ/?igshid=YmMyMTA2M2Y=\n", "https://www.instagram.com/tv/CfImYdngccQ/?igshid=YmMyMTA2M2Y="), // arrayOf("https://fr.ulule.com/sapins-barbus-la-bd-/ ", "https://fr.ulule.com/sapins-barbus-la-bd-/"), arrayOf("https://fr.ulule.com/sapins-barbus-la-bd-/\n", "https://fr.ulule.com/sapins-barbus-la-bd-/"), - arrayOf("https://de.m.wikipedia.org/wiki/Red_Dawn_(2012)", "https://de.m.wikipedia.org/wiki/Red_Dawn_(2012)"), + arrayOf("https://de.m.wikipedia.org/wiki/Red_Dawn_(2012)", "https://de.m.wikipedia.org/wiki/Red_Dawn_(2012)") // arrayOf("https://de.m.wikipedia.org/wiki/Red_Dawn_(2012)\n\n\uD83E\uDD14\uD83D\uDE1C", "https://de.m.wikipedia.org/wiki/Red_Dawn_(2012)") ) } diff --git a/app/src/test/java/org/thoughtcrime/securesms/database/ContactSearchSelectionBuilderTest.kt b/app/src/test/java/org/thoughtcrime/securesms/database/ContactSearchSelectionBuilderTest.kt index c3c6e1594..80d791f3c 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/database/ContactSearchSelectionBuilderTest.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/database/ContactSearchSelectionBuilderTest.kt @@ -52,7 +52,8 @@ class ContactSearchSelectionBuilderTest { Assert.assertTrue(result.where.contains(RecipientTable.ContactSearchSelection.FILTER_HIDDEN)) Assert.assertArrayEquals( SqlUtil.buildArgs( - RecipientTable.RegisteredState.REGISTERED.id, 1, + RecipientTable.RegisteredState.REGISTERED.id, + 1, RecipientTable.RegisteredState.REGISTERED.id, 0, 0 diff --git a/app/src/test/java/org/thoughtcrime/securesms/database/GroupTestUtil.kt b/app/src/test/java/org/thoughtcrime/securesms/database/GroupTestUtil.kt index 4acae3036..52317406a 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/database/GroupTestUtil.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/database/GroupTestUtil.kt @@ -209,7 +209,6 @@ fun decryptedGroup( inviteLinkPassword: ByteArray = ByteArray(0), disappearingMessageTimer: DecryptedTimer = DecryptedTimer.getDefaultInstance() ): DecryptedGroup { - val builder = DecryptedGroup.newBuilder() .setAccessControl(accessControl) .setAvatar(avatar) diff --git a/app/src/test/java/org/thoughtcrime/securesms/database/RecipientDatabaseTestUtils.kt b/app/src/test/java/org/thoughtcrime/securesms/database/RecipientDatabaseTestUtils.kt index 2913d1b9d..e2f981040 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/database/RecipientDatabaseTestUtils.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/database/RecipientDatabaseTestUtils.kt @@ -136,7 +136,7 @@ object RecipientDatabaseTestUtils { Recipient.Capability.deserialize(Bitmask.read(capabilities, RecipientTable.Capabilities.STORIES, RecipientTable.Capabilities.BIT_LENGTH).toInt()), Recipient.Capability.deserialize(Bitmask.read(capabilities, RecipientTable.Capabilities.GIFT_BADGES, RecipientTable.Capabilities.BIT_LENGTH).toInt()), Recipient.Capability.deserialize(Bitmask.read(capabilities, RecipientTable.Capabilities.PNP, RecipientTable.Capabilities.BIT_LENGTH).toInt()), - Recipient.Capability.deserialize(Bitmask.read(capabilities, RecipientTable.Capabilities.PAYMENT_ACTIVATION, RecipientTable.Capabilities.BIT_LENGTH).toInt()), + Recipient.Capability.deserialize(Bitmask.read(capabilities, RecipientTable.Capabilities.PAYMENT_ACTIVATION, RecipientTable.Capabilities.BIT_LENGTH).toInt()) ), insightBannerTier, storageId, diff --git a/app/src/test/java/org/thoughtcrime/securesms/database/TestMms.kt b/app/src/test/java/org/thoughtcrime/securesms/database/TestMms.kt index 68d15b90a..e57f4aa73 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/database/TestMms.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/database/TestMms.kt @@ -73,7 +73,7 @@ object TestMms { unread: Boolean = false, viewed: Boolean = false, threadId: Long = 1, - receivedTimestampMillis: Long = System.currentTimeMillis(), + receivedTimestampMillis: Long = System.currentTimeMillis() ): Long { val contentValues = ContentValues().apply { put(MessageTable.DATE_SENT, message.sentTimeMillis) diff --git a/app/src/test/java/org/thoughtcrime/securesms/fonts/TextToScriptTest.kt b/app/src/test/java/org/thoughtcrime/securesms/fonts/TextToScriptTest.kt index de5327b19..1356ce1ca 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/fonts/TextToScriptTest.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/fonts/TextToScriptTest.kt @@ -74,7 +74,7 @@ class TextToScriptTest( arrayOf( listOf("ППППaaaa", ""), SupportedScript.LATIN - ), + ) ) } } diff --git a/app/src/test/java/org/thoughtcrime/securesms/keyvalue/PaymentsValuesTest.kt b/app/src/test/java/org/thoughtcrime/securesms/keyvalue/PaymentsValuesTest.kt index 7dcf73641..4eb18013f 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/keyvalue/PaymentsValuesTest.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/keyvalue/PaymentsValuesTest.kt @@ -23,7 +23,8 @@ import org.thoughtcrime.securesms.util.FeatureFlags class PaymentsValuesTest { @Rule - @JvmField val mockitoRule: MockitoRule = MockitoJUnit.rule() + @JvmField + val mockitoRule: MockitoRule = MockitoJUnit.rule() @Mock private lateinit var featureFlags: MockedStatic diff --git a/app/src/test/java/org/thoughtcrime/securesms/mediasend/MediaRepositoryTest.kt b/app/src/test/java/org/thoughtcrime/securesms/mediasend/MediaRepositoryTest.kt index 70e59177e..f6d7dd3a7 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/mediasend/MediaRepositoryTest.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/mediasend/MediaRepositoryTest.kt @@ -28,7 +28,8 @@ import java.util.Optional class MediaRepositoryTest { @Rule - @JvmField val mockitoRule: MockitoRule = MockitoJUnit.rule() + @JvmField + val mockitoRule: MockitoRule = MockitoJUnit.rule() @Mock private lateinit var staticMediaUtilMock: MockedStatic @@ -129,7 +130,7 @@ class MediaRepositoryTest { videoGif, bucketId, caption, - transformProperties, + transformProperties ) } } diff --git a/app/src/test/java/org/thoughtcrime/securesms/megaphone/RemoteMegaphoneRepositoryTest.kt b/app/src/test/java/org/thoughtcrime/securesms/megaphone/RemoteMegaphoneRepositoryTest.kt index 897659c83..ebb9725d4 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/megaphone/RemoteMegaphoneRepositoryTest.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/megaphone/RemoteMegaphoneRepositoryTest.kt @@ -199,7 +199,7 @@ class RemoteMegaphoneRepositoryTest { primaryActionData, secondaryActionData, snoozedAt, - seenCount, + seenCount ) } } diff --git a/app/src/test/java/org/thoughtcrime/securesms/recipients/BaseRecipientTest.kt b/app/src/test/java/org/thoughtcrime/securesms/recipients/BaseRecipientTest.kt index 586e5ebfb..e4a54deab 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/recipients/BaseRecipientTest.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/recipients/BaseRecipientTest.kt @@ -23,7 +23,8 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore abstract class BaseRecipientTest { @Rule - @JvmField val mockitoRule: MockitoRule = MockitoJUnit.rule() + @JvmField + val mockitoRule: MockitoRule = MockitoJUnit.rule() @Mock private lateinit var applicationDependenciesStaticMock: MockedStatic diff --git a/app/src/test/java/org/thoughtcrime/securesms/stories/viewer/StoryViewerViewModelTest.kt b/app/src/test/java/org/thoughtcrime/securesms/stories/viewer/StoryViewerViewModelTest.kt index 3748cb1af..f7e0825fc 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/stories/viewer/StoryViewerViewModelTest.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/stories/viewer/StoryViewerViewModelTest.kt @@ -104,7 +104,7 @@ class StoryViewerViewModelTest { val testSubject = StoryViewerViewModel( StoryViewerArgs( recipientId = startStory, - isInHiddenStoryMode = false, + isInHiddenStoryMode = false ), repository ) @@ -131,7 +131,7 @@ class StoryViewerViewModelTest { val testSubject = StoryViewerViewModel( StoryViewerArgs( recipientId = startStory, - isInHiddenStoryMode = false, + isInHiddenStoryMode = false ), repository ) @@ -158,7 +158,7 @@ class StoryViewerViewModelTest { val testSubject = StoryViewerViewModel( StoryViewerArgs( recipientId = startStory, - isInHiddenStoryMode = false, + isInHiddenStoryMode = false ), repository ) @@ -185,7 +185,7 @@ class StoryViewerViewModelTest { val testSubject = StoryViewerViewModel( StoryViewerArgs( recipientId = startStory, - isInHiddenStoryMode = false, + isInHiddenStoryMode = false ), repository ) @@ -212,7 +212,7 @@ class StoryViewerViewModelTest { val testSubject = StoryViewerViewModel( StoryViewerArgs( recipientId = startStory, - isInHiddenStoryMode = false, + isInHiddenStoryMode = false ), repository ) diff --git a/app/src/test/java/org/thoughtcrime/securesms/testing/ProxySQLCipherOpenHelper.kt b/app/src/test/java/org/thoughtcrime/securesms/testing/ProxySQLCipherOpenHelper.kt index 566f861f5..bc87d76ba 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/testing/ProxySQLCipherOpenHelper.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/testing/ProxySQLCipherOpenHelper.kt @@ -14,7 +14,7 @@ import net.zetetic.database.sqlcipher.SQLiteDatabase as SQLCipherSQLiteDatabase class ProxySQLCipherOpenHelper( context: Application, val readableDatabase: AndroidSQLiteDatabase, - val writableDatabase: AndroidSQLiteDatabase, + val writableDatabase: AndroidSQLiteDatabase ) : SignalDatabase(context, DatabaseSecret(ByteArray(32).apply { SecureRandom().nextBytes(this) }), AttachmentSecret()) { constructor(context: Application, testOpenHelper: TestSQLiteOpenHelper) : this(context, testOpenHelper.readableDatabase, testOpenHelper.writableDatabase) diff --git a/app/src/test/java/org/thoughtcrime/securesms/util/NameUtil_getAbbreviation.kt b/app/src/test/java/org/thoughtcrime/securesms/util/NameUtil_getAbbreviation.kt index 8f0c13bec..3de13abc3 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/util/NameUtil_getAbbreviation.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/util/NameUtil_getAbbreviation.kt @@ -33,7 +33,7 @@ class NameUtil_getAbbreviation( arrayOf("љabc ђ123", "љђ"), // Works on device, but for whatever reason doesn't work in robolectric // arrayOf("Bob \uD83C\uDDE8\uD83C\uDDFF", "B\uD83C\uDDE8\uD83C\uDDFF"), - arrayOf("", null), + arrayOf("", null) ) } } diff --git a/build.gradle b/build.gradle index 6f245c336..115057624 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ buildscript { classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.5.2' classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.17' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "org.jlleitschuh.gradle:ktlint-gradle:10.2.1" + classpath "org.jlleitschuh.gradle:ktlint-gradle:11.1.0" classpath 'app.cash.exhaustive:exhaustive-gradle:0.1.1' classpath ('com.squareup.wire:wire-gradle-plugin:4.4.3') { exclude group: 'com.squareup.wire', module: 'wire-swift-generator' diff --git a/contacts/app/build.gradle b/contacts/app/build.gradle index 2548e9fdc..c4212f767 100644 --- a/contacts/app/build.gradle +++ b/contacts/app/build.gradle @@ -31,7 +31,7 @@ android { ktlint { // Use a newer version to resolve https://github.com/JLLeitschuh/ktlint-gradle/issues/507 - version = "0.43.2" + version = "0.47.1" } dependencies { diff --git a/contacts/lib/build.gradle b/contacts/lib/build.gradle index 49840ac7e..f0206fbdb 100644 --- a/contacts/lib/build.gradle +++ b/contacts/lib/build.gradle @@ -31,7 +31,7 @@ android { ktlint { // Use a newer version to resolve https://github.com/JLLeitschuh/ktlint-gradle/issues/507 - version = "0.43.2" + version = "0.47.1" } dependencies { diff --git a/contacts/lib/src/main/java/org/signal/contacts/SystemContactsRepository.kt b/contacts/lib/src/main/java/org/signal/contacts/SystemContactsRepository.kt index a45e1c25a..37a47f5b8 100644 --- a/contacts/lib/src/main/java/org/signal/contacts/SystemContactsRepository.kt +++ b/contacts/lib/src/main/java/org/signal/contacts/SystemContactsRepository.kt @@ -588,7 +588,7 @@ object SystemContactsRepository { ContactsContract.PhoneLookup.NUMBER, ContactsContract.PhoneLookup._ID, ContactsContract.PhoneLookup.DISPLAY_NAME, - ContactsContract.PhoneLookup.TYPE, + ContactsContract.PhoneLookup.TYPE ) context.contentResolver.query(uri, projection, null, null, null)?.use { contactCursor -> @@ -719,7 +719,7 @@ object SystemContactsRepository { photoUri = cursor.requireString(ContactsContract.CommonDataKinds.Phone.PHOTO_URI), number = e164Formatter(displayNumber), type = cursor.requireInt(ContactsContract.CommonDataKinds.Phone.TYPE), - label = cursor.requireString(ContactsContract.CommonDataKinds.Phone.LABEL), + label = cursor.requireString(ContactsContract.CommonDataKinds.Phone.LABEL) ) } else { Log.w(TAG, "Skipping phone entry with invalid number!") diff --git a/dependencies.gradle b/dependencies.gradle index 680bbb34f..0cf0186ba 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -20,6 +20,7 @@ dependencyResolutionManagement { alias('androidx-compose-material3').to('androidx.compose.material3', 'material3').withoutVersion() alias('androidx-compose-ui-tooling-preview').to('androidx.compose.ui', 'ui-tooling-preview').withoutVersion() alias('androidx-compose-ui-tooling-core').to('androidx.compose.ui', 'ui-tooling').withoutVersion() + alias('ktlint-twitter-compose').to('com.twitter.compose.rules:ktlint:0.0.26') // Desugaring alias('android-tools-desugar').to('com.android.tools:desugar_jdk_libs:1.1.5') diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 35394878a..6a3efc33d 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -1282,6 +1282,16 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + @@ -2487,14 +2497,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - @@ -2503,12 +2505,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + @@ -2519,12 +2521,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + @@ -2535,12 +2537,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + @@ -2551,12 +2553,20 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + + + + + + + + + @@ -2567,12 +2577,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + @@ -2583,12 +2593,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + @@ -2599,12 +2609,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + @@ -2615,12 +2625,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + @@ -2631,12 +2641,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + @@ -2647,12 +2657,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + @@ -2663,6 +2673,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -2947,6 +2965,38 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2997,6 +3047,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -3005,6 +3060,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -3825,6 +3888,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -3865,6 +3933,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4045,6 +4118,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4531,12 +4609,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + @@ -4985,6 +5063,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + diff --git a/qr/lib/src/main/java/org/signal/qr/QrProcessor.kt b/qr/lib/src/main/java/org/signal/qr/QrProcessor.kt index 6981c3efd..eb5832523 100644 --- a/qr/lib/src/main/java/org/signal/qr/QrProcessor.kt +++ b/qr/lib/src/main/java/org/signal/qr/QrProcessor.kt @@ -65,6 +65,7 @@ class QrProcessor { companion object { private val TAG = Log.tag(QrProcessor::class.java) + /** For debugging only */ var listener: ((LuminanceSource) -> Unit)? = null } diff --git a/signalModule.gradle b/signalModule.gradle index e49aca2c3..e16770c92 100644 --- a/signalModule.gradle +++ b/signalModule.gradle @@ -29,7 +29,7 @@ android { ktlint { // Use a newer version to resolve https://github.com/JLLeitschuh/ktlint-gradle/issues/507 - version = "0.43.2" + version = "0.47.1" } dependencies { @@ -45,4 +45,5 @@ dependencies { implementation libs.androidx.appcompat implementation libs.kotlin.stdlib.jdk8 + ktlintRuleset libs.ktlint.twitter.compose } diff --git a/signalModuleApp.gradle b/signalModuleApp.gradle index 0f34c61f9..f81fd4588 100644 --- a/signalModuleApp.gradle +++ b/signalModuleApp.gradle @@ -28,7 +28,7 @@ android { ktlint { // Use a newer version to resolve https://github.com/JLLeitschuh/ktlint-gradle/issues/507 - version = "0.43.2" + version = "0.47.1" } dependencies { @@ -44,4 +44,6 @@ dependencies { testImplementation testLibs.junit.junit implementation project(':core-util') + + ktlintRuleset libs.ktlint.twitter.compose } \ No newline at end of file diff --git a/sms-exporter/lib/src/main/java/org/signal/smsexporter/SmsExportService.kt b/sms-exporter/lib/src/main/java/org/signal/smsexporter/SmsExportService.kt index 4a4478fa6..afa942a0f 100644 --- a/sms-exporter/lib/src/main/java/org/signal/smsexporter/SmsExportService.kt +++ b/sms-exporter/lib/src/main/java/org/signal/smsexporter/SmsExportService.kt @@ -228,9 +228,9 @@ abstract class SmsExportService : Service() { onMessageExportSucceeded(sms) true }, onFailure = { - onMessageExportFailed(sms) - false - }) + onMessageExportFailed(sms) + false + }) } private fun exportMms(smsExportState: SmsExportState, mms: ExportableMessage.Mms<*>): Boolean { diff --git a/sms-exporter/lib/src/main/java/org/signal/smsexporter/internal/mms/ExportMmsRecipientsUseCase.kt b/sms-exporter/lib/src/main/java/org/signal/smsexporter/internal/mms/ExportMmsRecipientsUseCase.kt index 8da7244ed..ff52cfb54 100644 --- a/sms-exporter/lib/src/main/java/org/signal/smsexporter/internal/mms/ExportMmsRecipientsUseCase.kt +++ b/sms-exporter/lib/src/main/java/org/signal/smsexporter/internal/mms/ExportMmsRecipientsUseCase.kt @@ -35,7 +35,7 @@ object ExportMmsRecipientsUseCase { val addrValues = contentValuesOf( Telephony.Mms.Addr.ADDRESS to recipient, Telephony.Mms.Addr.CHARSET to CharacterSets.DEFAULT_CHARSET, - Telephony.Mms.Addr.TYPE to if (recipient == sender) PduHeaders.FROM else PduHeaders.TO, + Telephony.Mms.Addr.TYPE to if (recipient == sender) PduHeaders.FROM else PduHeaders.TO ) context.contentResolver.insert(addrUri, addrValues) diff --git a/spinner/app/build.gradle b/spinner/app/build.gradle index b03b0d072..083ec5efd 100644 --- a/spinner/app/build.gradle +++ b/spinner/app/build.gradle @@ -15,7 +15,7 @@ repositories { ktlint { // Use a newer version to resolve https://github.com/JLLeitschuh/ktlint-gradle/issues/507 - version = "0.43.2" + version = "0.47.1" } android { diff --git a/spinner/lib/build.gradle b/spinner/lib/build.gradle index 1c901986d..17b6bd3b0 100644 --- a/spinner/lib/build.gradle +++ b/spinner/lib/build.gradle @@ -26,7 +26,7 @@ android { ktlint { // Use a newer version to resolve https://github.com/JLLeitschuh/ktlint-gradle/issues/507 - version = "0.43.2" + version = "0.47.1" } dependencies { diff --git a/spinner/lib/src/main/java/org/signal/spinner/PluginResult.kt b/spinner/lib/src/main/java/org/signal/spinner/PluginResult.kt index 2999821bf..a60a4d98d 100644 --- a/spinner/lib/src/main/java/org/signal/spinner/PluginResult.kt +++ b/spinner/lib/src/main/java/org/signal/spinner/PluginResult.kt @@ -4,6 +4,6 @@ sealed class PluginResult(val type: String) { data class TableResult( val columns: List, val rows: List>, - val rowCount: Int = rows.size, + val rowCount: Int = rows.size ) : PluginResult("table") } diff --git a/spinner/lib/src/main/java/org/signal/spinner/SpinnerServer.kt b/spinner/lib/src/main/java/org/signal/spinner/SpinnerServer.kt index 3a9a48309..087ee2853 100644 --- a/spinner/lib/src/main/java/org/signal/spinner/SpinnerServer.kt +++ b/spinner/lib/src/main/java/org/signal/spinner/SpinnerServer.kt @@ -424,7 +424,7 @@ internal class SpinnerServer( val tableNames: List, val table: String? = null, val queryResult: QueryResult? = null, - val pagingData: PagingData? = null, + val pagingData: PagingData? = null ) : PrefixPageData data class QueryPageModel( @@ -461,7 +461,7 @@ internal class SpinnerServer( val rows: List>, val rowCount: Int = rows.size, val timeToFirstRow: String, - val timeToReadRows: String, + val timeToReadRows: String ) data class TableInfo(