From cafbf487837ba99f0cd1206e8ad4bb058a5c03b3 Mon Sep 17 00:00:00 2001 From: Grzegorz Bobryk Date: Sun, 3 Nov 2024 16:18:10 +0100 Subject: [PATCH] Move from enum.values() to enum.entries. Resolves #13767 --- .../securesms/ContactSelectionListAdapter.kt | 2 +- .../securesms/attachments/AttachmentCreator.kt | 4 ++-- .../thoughtcrime/securesms/attachments/Cdn.kt | 2 +- .../org/thoughtcrime/securesms/avatar/Avatars.kt | 6 +++--- .../badges/glide/BadgeSpriteTransformation.kt | 2 +- .../settings/app/AppSettingsActivity.kt | 2 +- .../remote/RemoteBackupsSettingsFragment.kt | 2 +- .../app/data/DataAndStorageSettingsFragment.kt | 4 ++-- ...endingOneTimeDonationConfigurationFragment.kt | 2 +- .../app/internal/InternalSettingsFragment.kt | 12 ++++++------ .../donor/InternalDonationErrorValues.kt | 8 ++++---- .../InternalDonorErrorConfigurationFragment.kt | 8 ++++---- .../InternalDonorErrorConfigurationViewModel.kt | 8 ++++---- .../expire/CustomExpireTimerSelectorView.kt | 8 ++++---- .../app/storage/ManageStorageSettingsFragment.kt | 2 +- .../donate/transfer/ideal/IdealBank.kt | 2 +- ...TransferDetailsBankSelectionDialogFragment.kt | 2 +- .../app/subscription/errors/DonationError.kt | 2 +- .../subscription/errors/DonationErrorSource.kt | 2 +- .../app/subscription/errors/PayPalDeclineCode.kt | 2 +- .../errors/UnexpectedSubscriptionCancellation.kt | 2 +- .../usernamelinks/UsernameQrCodeColorScheme.kt | 2 +- .../UsernameLinkQrColorPickerFragment.kt | 2 +- .../UsernameLinkQrColorPickerViewModel.kt | 2 +- .../webrtc/PendingParticipantsBottomSheet.kt | 2 +- .../ConversationListSearchAdapter.kt | 2 +- .../securesms/database/AttachmentTable.kt | 4 ++-- .../thoughtcrime/securesms/database/CallTable.kt | 4 ++-- .../database/InAppPaymentSubscriberTable.kt | 2 +- .../securesms/database/InAppPaymentTable.kt | 2 +- .../securesms/database/RecipientTable.kt | 16 ++++++++-------- .../securesms/database/ThreadTable.kt | 2 +- .../database/model/RemoteMegaphoneRecord.kt | 2 +- .../securesms/emoji/EmojiCategory.kt | 2 +- .../thoughtcrime/securesms/fonts/TextToScript.kt | 2 +- .../securesms/fonts/TypefaceCache.kt | 2 +- .../migrations/PushProcessMessageJobMigration.kt | 2 +- .../securesms/jobs/FontDownloaderJob.kt | 2 +- .../securesms/jobs/InAppPaymentKeepAliveJob.kt | 2 +- .../securesms/jobs/PushProcessMessageErrorJob.kt | 2 +- .../keyboard/gif/GifQuickSearchOption.kt | 2 +- .../securesms/keyvalue/AccountValues.kt | 2 +- .../org/thoughtcrime/securesms/mms/QuoteModel.kt | 4 ++-- .../registration/fragments/WelcomePermissions.kt | 2 +- .../securesms/restore/RestoreActivity.kt | 2 +- .../stickers/AnalogClockStickerDrawable.kt | 4 ++-- .../stickers/DigitalClockStickerDrawable.kt | 4 ++-- .../scribbles/stickers/FeatureSticker.kt | 2 +- .../securesms/stories/StorySlateView.kt | 2 +- .../securesms/webrtc/audio/AudioDeviceMapping.kt | 2 +- .../securesms/webrtc/audio/SignalAudioManager.kt | 2 +- .../profiles/NotificationProfileScheduleTest.kt | 6 +++--- .../profiles/NotificationProfilesTest.kt | 2 +- .../org/signal/donations/PaymentSourceType.kt | 2 +- .../org/signal/donations/StripeDeclineCode.kt | 2 +- .../org/signal/donations/StripeFailureCode.kt | 2 +- .../signal/donations/json/StripeIntentStatus.kt | 2 +- .../api/archive/ArchiveMediaResponse.kt | 2 +- .../archive/ArchiveMediaUploadFormStatusCodes.kt | 2 +- .../api/messages/SignalServiceDataMessage.kt | 2 +- 60 files changed, 95 insertions(+), 95 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionListAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionListAdapter.kt index 54c76eaf2a..63b9df5d5a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionListAdapter.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionListAdapter.kt @@ -165,7 +165,7 @@ class ContactSelectionListAdapter( FIND_BY_PHONE_NUMBER("find-by-phone-number"); companion object { - fun fromCode(code: String) = values().first { it.code == code } + fun fromCode(code: String) = entries.first { it.code == code } } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentCreator.kt b/app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentCreator.kt index 4a9b2ae5cc..68553414fd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentCreator.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentCreator.kt @@ -23,14 +23,14 @@ object AttachmentCreator : Parcelable.Creator { @JvmStatic fun writeSubclass(dest: Parcel, instance: Attachment) { - val subclass = Subclass.values().firstOrNull { it.clazz == instance::class.java } ?: error("Unexpected subtype ${instance::class.java.simpleName}") + val subclass = Subclass.entries.firstOrNull { it.clazz == instance::class.java } ?: error("Unexpected subtype ${instance::class.java.simpleName}") dest.writeString(subclass.code) } override fun createFromParcel(source: Parcel): Attachment { val rawCode = source.readString()!! - return when (Subclass.values().first { rawCode == it.code }) { + return when (Subclass.entries.first { rawCode == it.code }) { Subclass.DATABASE -> DatabaseAttachment(source) Subclass.POINTER -> PointerAttachment(source) Subclass.TOMBSTONE -> TombstoneAttachment(source) diff --git a/app/src/main/java/org/thoughtcrime/securesms/attachments/Cdn.kt b/app/src/main/java/org/thoughtcrime/securesms/attachments/Cdn.kt index fe7841bdb9..7b4589f125 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/attachments/Cdn.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/Cdn.kt @@ -37,7 +37,7 @@ enum class Cdn(private val value: Int) { } override fun deserialize(data: Int): Cdn { - return values().first { it.value == data } + return entries.first { it.value == data } } fun fromCdnNumber(cdnNumber: Int): Cdn { 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 ec38196e5b..c528b86701 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/avatar/Avatars.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/avatar/Avatars.kt @@ -30,7 +30,7 @@ object Avatars { A210("A210", 0xFF5C5C5C.toInt()); fun deserialize(code: String): ForegroundColor { - return values().find { it.code == code } ?: throw IllegalArgumentException() + return entries.find { it.code == code } ?: throw IllegalArgumentException() } fun serialize(): String = code @@ -39,7 +39,7 @@ object Avatars { /** * Mapping which associates color codes to ColorPair objects containing background and foreground colors. */ - val colorMap: Map = ForegroundColor.values().map { + val colorMap: Map = ForegroundColor.entries.map { ColorPair(AvatarColor.deserialize(it.serialize()), it) }.associateBy { it.code @@ -134,7 +134,7 @@ object Avatars { @JvmStatic fun getForegroundColor(avatarColor: AvatarColor): ForegroundColor { - return ForegroundColor.values().firstOrNull { it.serialize() == avatarColor.serialize() } ?: ForegroundColor.A210 + return ForegroundColor.entries.firstOrNull { it.serialize() == avatarColor.serialize() } ?: ForegroundColor.A210 } data class DefaultAvatar( diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/glide/BadgeSpriteTransformation.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/glide/BadgeSpriteTransformation.kt index 9cea8285ee..3d07cad6b5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/badges/glide/BadgeSpriteTransformation.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/badges/glide/BadgeSpriteTransformation.kt @@ -190,7 +190,7 @@ class BadgeSpriteTransformation( private val TAG = Log.tag(BadgeSpriteTransformation::class.java) private fun getDensity(density: String): Density { - return Density.values().first { it.density == density } + return Density.entries.first { it.density == density } } private fun getFrame(size: Size, density: Density, isDarkTheme: Boolean): Frame { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsActivity.kt index 84d8a38b78..59c6c5dd24 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsActivity.kt @@ -246,7 +246,7 @@ class AppSettingsActivity : DSLSettingsActivity(), InAppPaymentComponent { companion object { fun fromCode(code: Int?): StartLocation { - return values().find { code == it.code } ?: HOME + return entries.find { code == it.code } ?: HOME } } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsFragment.kt index a3098473c8..7f1be3baa4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsFragment.kt @@ -1091,7 +1091,7 @@ private fun BackupFrequencyDialog( modifier = Modifier.padding(24.dp) ) - BackupFrequency.values().forEach { + BackupFrequency.entries.forEach { Rows.RadioRow( selected = selected == it, text = getTextForFrequency(backupsFrequency = it), diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/data/DataAndStorageSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/data/DataAndStorageSettingsFragment.kt index a0dfd8facb..7c404d7bde 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/data/DataAndStorageSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/data/DataAndStorageSettingsFragment.kt @@ -93,8 +93,8 @@ class DataAndStorageSettingsFragment : DSLSettingsFragment(R.string.preferences_ radioListPref( title = DSLSettingsText.from(R.string.DataAndStorageSettingsFragment__sent_media_quality), listItems = sentMediaQualityLabels, - selected = SentMediaQuality.values().indexOf(state.sentMediaQuality), - onSelected = { viewModel.setSentMediaQuality(SentMediaQuality.values()[it]) } + selected = SentMediaQuality.entries.indexOf(state.sentMediaQuality), + onSelected = { viewModel.setSentMediaQuality(SentMediaQuality.entries[it]) } ) textPref( diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalPendingOneTimeDonationConfigurationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalPendingOneTimeDonationConfigurationFragment.kt index 5da2a6fb7c..9171d0f34f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalPendingOneTimeDonationConfigurationFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalPendingOneTimeDonationConfigurationFragment.kt @@ -140,7 +140,7 @@ private fun Content( expanded = expanded, onDismissRequest = { expanded = false } ) { - PendingOneTimeDonation.PaymentMethodType.values().forEach { item -> + PendingOneTimeDonation.PaymentMethodType.entries.forEach { item -> DropdownMenuItem( text = { Text(text = item.name) }, onClick = { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsFragment.kt index 593aaa72b9..5aa888102a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsFragment.kt @@ -516,19 +516,19 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter radioListPref( title = DSLSettingsText.from("Audio processing method"), - listItems = CallManager.AudioProcessingMethod.values().map { it.name }.toTypedArray(), - selected = CallManager.AudioProcessingMethod.values().indexOf(state.callingAudioProcessingMethod), + listItems = CallManager.AudioProcessingMethod.entries.map { it.name }.toTypedArray(), + selected = CallManager.AudioProcessingMethod.entries.indexOf(state.callingAudioProcessingMethod), onSelected = { - viewModel.setInternalCallingAudioProcessingMethod(CallManager.AudioProcessingMethod.values()[it]) + viewModel.setInternalCallingAudioProcessingMethod(CallManager.AudioProcessingMethod.entries[it]) } ) radioListPref( title = DSLSettingsText.from("Bandwidth mode"), - listItems = CallManager.DataMode.values().map { it.name }.toTypedArray(), - selected = CallManager.DataMode.values().indexOf(state.callingDataMode), + listItems = CallManager.DataMode.entries.map { it.name }.toTypedArray(), + selected = CallManager.DataMode.entries.indexOf(state.callingDataMode), onSelected = { - viewModel.setInternalCallingDataMode(CallManager.DataMode.values()[it]) + viewModel.setInternalCallingDataMode(CallManager.DataMode.entries[it]) } ) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/donor/InternalDonationErrorValues.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/donor/InternalDonationErrorValues.kt index 7d1c42b120..7a639cacde 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/donor/InternalDonationErrorValues.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/donor/InternalDonationErrorValues.kt @@ -55,7 +55,7 @@ fun DonationErrorValueTypeSelector( expanded = expanded, onDismissRequest = { expanded = false } ) { - DonationErrorValue.Type.values().filterNot { + DonationErrorValue.Type.entries.filterNot { selectedPaymentMethodType == PendingOneTimeDonation.PaymentMethodType.PAYPAL && it == DonationErrorValue.Type.FAILURE_CODE }.forEach { item -> DropdownMenuItem( @@ -149,8 +149,8 @@ private fun DeclineCodeErrorsDropdown( ) { val values = remember(paymentMethodType) { when (paymentMethodType) { - PendingOneTimeDonation.PaymentMethodType.PAYPAL -> PayPalDeclineCode.KnownCode.values() - else -> StripeDeclineCode.Code.values() + PendingOneTimeDonation.PaymentMethodType.PAYPAL -> PayPalDeclineCode.KnownCode.entries.toTypedArray() + else -> StripeDeclineCode.Code.entries.toTypedArray() }.map { it.name }.toTypedArray() } @@ -162,7 +162,7 @@ private fun FailureCodeErrorsDropdown( onErrorCodeSelected: (String) -> Unit ) { val values = remember { - StripeFailureCode.Code.values().map { it.name }.toTypedArray() + StripeFailureCode.Code.entries.map { it.name }.toTypedArray() } ValuesDropdown(values = values, onErrorCodeSelected = onErrorCodeSelected) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/donor/InternalDonorErrorConfigurationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/donor/InternalDonorErrorConfigurationFragment.kt index db768533a8..4169f493a6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/donor/InternalDonorErrorConfigurationFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/donor/InternalDonorErrorConfigurationFragment.kt @@ -33,16 +33,16 @@ class InternalDonorErrorConfigurationFragment : DSLSettingsFragment() { radioListPref( title = DSLSettingsText.from("Cancellation Reason"), - selected = UnexpectedSubscriptionCancellation.values().indexOf(state.selectedUnexpectedSubscriptionCancellation), - listItems = UnexpectedSubscriptionCancellation.values().map { it.status }.toTypedArray(), + selected = UnexpectedSubscriptionCancellation.entries.indexOf(state.selectedUnexpectedSubscriptionCancellation), + listItems = UnexpectedSubscriptionCancellation.entries.map { it.status }.toTypedArray(), onSelected = { viewModel.setSelectedUnexpectedSubscriptionCancellation(it) }, isEnabled = state.selectedBadge == null || state.selectedBadge.isSubscription() ) radioListPref( title = DSLSettingsText.from("Charge Failure"), - selected = StripeDeclineCode.Code.values().indexOf(state.selectedStripeDeclineCode), - listItems = StripeDeclineCode.Code.values().map { it.code }.toTypedArray(), + selected = StripeDeclineCode.Code.entries.indexOf(state.selectedStripeDeclineCode), + listItems = StripeDeclineCode.Code.entries.map { it.code }.toTypedArray(), onSelected = { viewModel.setStripeDeclineCode(it) }, isEnabled = state.selectedBadge == null || state.selectedBadge.isSubscription() ) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/donor/InternalDonorErrorConfigurationViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/donor/InternalDonorErrorConfigurationViewModel.kt index 71e4b1729b..70ed3386d6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/donor/InternalDonorErrorConfigurationViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/donor/InternalDonorErrorConfigurationViewModel.kt @@ -77,8 +77,8 @@ class InternalDonorErrorConfigurationViewModel : ViewModel() { fun setSelectedUnexpectedSubscriptionCancellation(unexpectedSubscriptionCancellationIndex: Int) { store.update { it.copy( - selectedUnexpectedSubscriptionCancellation = if (unexpectedSubscriptionCancellationIndex in UnexpectedSubscriptionCancellation.values().indices) { - UnexpectedSubscriptionCancellation.values()[unexpectedSubscriptionCancellationIndex] + selectedUnexpectedSubscriptionCancellation = if (unexpectedSubscriptionCancellationIndex in UnexpectedSubscriptionCancellation.entries.toTypedArray().indices) { + UnexpectedSubscriptionCancellation.entries[unexpectedSubscriptionCancellationIndex] } else { null } @@ -89,8 +89,8 @@ class InternalDonorErrorConfigurationViewModel : ViewModel() { fun setStripeDeclineCode(stripeDeclineCodeIndex: Int) { store.update { it.copy( - selectedStripeDeclineCode = if (stripeDeclineCodeIndex in StripeDeclineCode.Code.values().indices) { - StripeDeclineCode.Code.values()[stripeDeclineCodeIndex] + selectedStripeDeclineCode = if (stripeDeclineCodeIndex in StripeDeclineCode.Code.entries.toTypedArray().indices) { + StripeDeclineCode.Code.entries[stripeDeclineCodeIndex] } else { null } diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/expire/CustomExpireTimerSelectorView.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/expire/CustomExpireTimerSelectorView.kt index 2e26dd7e1d..c8d126a792 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/expire/CustomExpireTimerSelectorView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/expire/CustomExpireTimerSelectorView.kt @@ -45,11 +45,11 @@ class CustomExpireTimerSelectorView @JvmOverloads constructor( return } - TimerUnit.values() + TimerUnit.entries .find { (timer / it.valueMultiplier) < it.maxValue } ?.let { timerUnit -> valuePicker.value = (timer / timerUnit.valueMultiplier).toInt() - unitPicker.value = TimerUnit.values().indexOf(timerUnit) + unitPicker.value = TimerUnit.entries.indexOf(timerUnit) unitChange(unitPicker.value) } } @@ -59,7 +59,7 @@ class CustomExpireTimerSelectorView @JvmOverloads constructor( } private fun unitChange(newValue: Int) { - val timerUnit: TimerUnit = TimerUnit.values()[newValue] + val timerUnit: TimerUnit = TimerUnit.entries[newValue] valuePicker.minValue = timerUnit.minValue valuePicker.maxValue = timerUnit.maxValue @@ -79,7 +79,7 @@ class CustomExpireTimerSelectorView @JvmOverloads constructor( WEEKS(1, 4, TimeUnit.DAYS.toSeconds(7)); companion object { - fun get(value: Int) = values()[value] + fun get(value: Int) = entries[value] } } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/storage/ManageStorageSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/storage/ManageStorageSettingsFragment.kt index f30a4d58be..b46ce3eabe 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/storage/ManageStorageSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/storage/ManageStorageSettingsFragment.kt @@ -388,7 +388,7 @@ private fun SetKeepMessagesScreen( .verticalScroll(rememberScrollState()) ) { KeepMessagesDuration - .values() + .entries .forEach { Rows.RadioRow( text = stringResource(id = it.stringResource), diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/ideal/IdealBank.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/ideal/IdealBank.kt index bc69f3f77d..561c079266 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/ideal/IdealBank.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/ideal/IdealBank.kt @@ -97,7 +97,7 @@ enum class IdealBank( } fun fromCode(code: String): IdealBank { - return values().first { it.code == code } + return entries.first { it.code == code } } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/ideal/IdealTransferDetailsBankSelectionDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/ideal/IdealTransferDetailsBankSelectionDialogFragment.kt index 10ce976895..bc55998dd1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/ideal/IdealTransferDetailsBankSelectionDialogFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/ideal/IdealTransferDetailsBankSelectionDialogFragment.kt @@ -85,7 +85,7 @@ private fun BankSelectionContent( navigationIconPainter = painterResource(id = R.drawable.symbol_x_24) ) { paddingValues -> LazyColumn(modifier = Modifier.padding(paddingValues)) { - items(IdealBank.values()) { + items(IdealBank.entries.toTypedArray()) { val uiValues = it.getUIValues() Row( diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationError.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationError.kt index 3f9475fe08..8130d23fcf 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationError.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationError.kt @@ -131,7 +131,7 @@ sealed class DonationError(val source: DonationErrorSource, cause: Throwable) : private val TAG = Log.tag(DonationError::class.java) - private val donationErrorSubjectSourceMap: Map> = DonationErrorSource.values().associate { source -> + private val donationErrorSubjectSourceMap: Map> = DonationErrorSource.entries.associate { source -> source to PublishSubject.create() } diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationErrorSource.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationErrorSource.kt index 55eb153500..09c847035e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationErrorSource.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationErrorSource.kt @@ -43,7 +43,7 @@ enum class DonationErrorSource(private val code: String) { companion object { @JvmStatic fun deserialize(code: String): DonationErrorSource { - return values().firstOrNull { it.code == code } ?: UNKNOWN + return entries.firstOrNull { it.code == code } ?: UNKNOWN } } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/PayPalDeclineCode.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/PayPalDeclineCode.kt index 1cefcb49e2..1ed3a41c3b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/PayPalDeclineCode.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/PayPalDeclineCode.kt @@ -122,7 +122,7 @@ data class PayPalDeclineCode( PROCESSOR_NETWORK_UNAVAILABLE_TRY_AGAIN(3000); companion object { - fun fromCode(code: Int): KnownCode? = values().firstOrNull { it.code == code } + fun fromCode(code: Int): KnownCode? = entries.firstOrNull { it.code == code } } } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/UnexpectedSubscriptionCancellation.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/UnexpectedSubscriptionCancellation.kt index 9727d546f2..669b7ea738 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/UnexpectedSubscriptionCancellation.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/UnexpectedSubscriptionCancellation.kt @@ -16,7 +16,7 @@ enum class UnexpectedSubscriptionCancellation(val status: String) { companion object { @JvmStatic fun fromStatus(status: String?): UnexpectedSubscriptionCancellation? { - return values().firstOrNull { it.status == status } + return entries.firstOrNull { it.status == status } } } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/UsernameQrCodeColorScheme.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/UsernameQrCodeColorScheme.kt index aab55da528..0701dd8557 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/UsernameQrCodeColorScheme.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/UsernameQrCodeColorScheme.kt @@ -74,7 +74,7 @@ enum class UsernameQrCodeColorScheme( */ @JvmStatic fun deserialize(serialized: String?): UsernameQrCodeColorScheme { - return values().firstOrNull { it.key == serialized } ?: Blue + return entries.firstOrNull { it.key == serialized } ?: Blue } } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/colorpicker/UsernameLinkQrColorPickerFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/colorpicker/UsernameLinkQrColorPickerFragment.kt index 113fcababe..7674bb6113 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/colorpicker/UsernameLinkQrColorPickerFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/colorpicker/UsernameLinkQrColorPickerFragment.kt @@ -183,7 +183,7 @@ class UsernameLinkQrColorPickerFragment : ComposeFragment() { SignalTheme(isDarkMode = false) { Surface { ColorPicker( - colors = UsernameQrCodeColorScheme.values().toList().toImmutableList(), + colors = UsernameQrCodeColorScheme.entries.toImmutableList(), selected = UsernameQrCodeColorScheme.Blue, onSelectionChanged = {} ) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/colorpicker/UsernameLinkQrColorPickerViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/colorpicker/UsernameLinkQrColorPickerViewModel.kt index 433875ffd1..3cb801c22a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/colorpicker/UsernameLinkQrColorPickerViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/colorpicker/UsernameLinkQrColorPickerViewModel.kt @@ -25,7 +25,7 @@ class UsernameLinkQrColorPickerViewModel : ViewModel() { UsernameLinkQrColorPickerState( username = SignalStore.account.username!!, qrCodeData = QrCodeState.Loading, - colorSchemes = UsernameQrCodeColorScheme.values().asList().toImmutableList(), + colorSchemes = UsernameQrCodeColorScheme.entries.toImmutableList(), selectedColorScheme = SignalStore.misc.usernameQrCodeColorScheme ) ) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/PendingParticipantsBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/PendingParticipantsBottomSheet.kt index 0432ab0090..02423eeb8f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/PendingParticipantsBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/PendingParticipantsBottomSheet.kt @@ -64,7 +64,7 @@ class PendingParticipantsBottomSheet : ComposeBottomSheetDialogFragment() { @JvmStatic fun getAction(bundle: Bundle): Action { val code = bundle.getInt(ACTION, 0) - return Action.values().first { it.code == code } + return Action.entries.first { it.code == code } } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListSearchAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListSearchAdapter.kt index 11b61bbd1f..5c291dc905 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListSearchAdapter.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListSearchAdapter.kt @@ -197,7 +197,7 @@ class ConversationListSearchAdapter( companion object { fun fromCode(code: String): ChatFilterOptions { - return values().firstOrNull { it.code == code } ?: WITHOUT_TIP + return entries.firstOrNull { it.code == code } ?: WITHOUT_TIP } } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt index ba443069dd..bcc44682fb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt @@ -2793,7 +2793,7 @@ class AttachmentTable( companion object { fun deserialize(value: Int): ThumbnailRestoreState { - return values().firstOrNull { it.value == value } ?: NONE + return entries.firstOrNull { it.value == value } ?: NONE } } } @@ -2833,7 +2833,7 @@ class AttachmentTable( companion object { fun deserialize(value: Int): ArchiveTransferState { - return values().firstOrNull { it.value == value } ?: NONE + return entries.firstOrNull { it.value == value } ?: NONE } } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/CallTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/CallTable.kt index 71aa071b85..abf9dffa34 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/CallTable.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/CallTable.kt @@ -1631,7 +1631,7 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl } override fun deserialize(data: Int): ReadState { - return ReadState.values().first { it.code == data } + return entries.first { it.code == data } } } } @@ -1716,7 +1716,7 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl override fun serialize(data: Event): Int = data.code override fun deserialize(data: Int): Event { - return values().firstOrNull { + return entries.firstOrNull { it.code == data } ?: throw IllegalArgumentException("Unknown event $data") } diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/InAppPaymentSubscriberTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/InAppPaymentSubscriberTable.kt index 3d0e0450db..efafe6ceed 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/InAppPaymentSubscriberTable.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/InAppPaymentSubscriberTable.kt @@ -162,6 +162,6 @@ class InAppPaymentSubscriberTable( object TypeSerializer : Serializer { override fun serialize(data: InAppPaymentSubscriberRecord.Type): Int = data.code - override fun deserialize(input: Int): InAppPaymentSubscriberRecord.Type = InAppPaymentSubscriberRecord.Type.values().first { it.code == input } + override fun deserialize(input: Int): InAppPaymentSubscriberRecord.Type = InAppPaymentSubscriberRecord.Type.entries.first { it.code == input } } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/InAppPaymentTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/InAppPaymentTable.kt index ff5af2085f..8de3716196 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/InAppPaymentTable.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/InAppPaymentTable.kt @@ -414,7 +414,7 @@ class InAppPaymentTable(context: Context, databaseHelper: SignalDatabase) : Data companion object : Serializer { override fun serialize(data: State): Int = data.code - override fun deserialize(input: Int): State = State.values().first { it.code == input } + override fun deserialize(input: Int): State = entries.first { it.code == input } } } } 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 a24a034942..b706bc1b47 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt @@ -4714,7 +4714,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da companion object { fun fromId(id: Int): VibrateState { - return values()[id] + return entries[id] } fun fromBoolean(enabled: Boolean): VibrateState { @@ -4730,7 +4730,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da companion object { fun fromId(id: Int): RegisteredState { - return values()[id] + return entries[id] } } } @@ -4743,7 +4743,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da companion object { fun fromMode(mode: Int): SealedSenderAccessMode { - return values()[mode] + return entries[mode] } } } @@ -4759,7 +4759,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da companion object { fun fromId(id: Int): InsightsBannerTier { - return values()[id] + return entries[id] } } } @@ -4774,7 +4774,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da companion object { fun fromId(id: Int): RecipientType { - return values()[id] + return entries[id] } } } @@ -4785,7 +4785,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da companion object { fun fromId(id: Int): MentionSetting { - return values()[id] + return entries[id] } } } @@ -4800,7 +4800,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da companion object { fun fromId(id: Int): PhoneNumberSharingState { - return values()[id] + return entries[id] } } } @@ -4812,7 +4812,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da companion object { fun fromId(id: Int): PhoneNumberDiscoverableState { - return PhoneNumberDiscoverableState.values()[id] + return entries[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 5b20dd93ac..73e7a51523 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadTable.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadTable.kt @@ -2352,7 +2352,7 @@ class ThreadTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTa companion object { fun deserialize(value: Int): ReadStatus { - for (status in values()) { + for (status in entries) { if (status.value == value) { return status } diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/RemoteMegaphoneRecord.kt b/app/src/main/java/org/thoughtcrime/securesms/database/model/RemoteMegaphoneRecord.kt index 02a0de2c91..8f0cadb6e8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/model/RemoteMegaphoneRecord.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/RemoteMegaphoneRecord.kt @@ -55,7 +55,7 @@ data class RemoteMegaphoneRecord( companion object { fun from(id: String?): ActionId? { - return values().firstOrNull { it.id == id } + return entries.firstOrNull { it.id == id } } } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiCategory.kt b/app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiCategory.kt index edf0979658..70d7899ba2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiCategory.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiCategory.kt @@ -25,7 +25,7 @@ enum class EmojiCategory(val priority: Int, val key: String, @AttrRes val icon: companion object { @JvmStatic - fun forKey(key: String) = values().first { it.key == key } + fun forKey(key: String) = entries.first { it.key == key } @JvmStatic @StringRes diff --git a/app/src/main/java/org/thoughtcrime/securesms/fonts/TextToScript.kt b/app/src/main/java/org/thoughtcrime/securesms/fonts/TextToScript.kt index c3132f324d..0a2eda0bbb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/fonts/TextToScript.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/fonts/TextToScript.kt @@ -25,7 +25,7 @@ object TextToScript { ) fun guessScript(text: CharSequence): SupportedScript { - val scriptCounts: MutableMap = SupportedScript.values().associate { it to 0 }.toMutableMap() + val scriptCounts: MutableMap = SupportedScript.entries.associate { it to 0 }.toMutableMap() val input = text.toString() for (i in 0 until input.codePointCount(0, input.length)) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/fonts/TypefaceCache.kt b/app/src/main/java/org/thoughtcrime/securesms/fonts/TypefaceCache.kt index 82daeed07f..3a132c5f65 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/fonts/TypefaceCache.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/fonts/TypefaceCache.kt @@ -21,7 +21,7 @@ object TypefaceCache { */ fun warm(context: Context, script: SupportedScript) { val appContext = context.applicationContext - TextFont.values().forEach { + TextFont.entries.forEach { get(appContext, it, script).subscribe() } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/migrations/PushProcessMessageJobMigration.kt b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/migrations/PushProcessMessageJobMigration.kt index b5413368ea..426d3e5133 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/migrations/PushProcessMessageJobMigration.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/migrations/PushProcessMessageJobMigration.kt @@ -33,7 +33,7 @@ class PushProcessMessageJobMigration : JobMigration(10) { private fun migrateJob(jobData: JobData): JobData { val data = JsonJobData.deserialize(jobData.data) return if (data.hasInt("message_state")) { - val state = MessageState.values()[data.getInt("message_state")] + val state = MessageState.entries[data.getInt("message_state")] return when (state) { MessageState.NOOP -> jobData.withFactoryKey(FailingJob.KEY) diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/FontDownloaderJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/FontDownloaderJob.kt index 6b24ddf6c4..b40e417432 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/FontDownloaderJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/FontDownloaderJob.kt @@ -42,7 +42,7 @@ class FontDownloaderJob private constructor(parameters: Parameters) : BaseJob(pa override fun onRun() { val script = Fonts.getSupportedScript(LocaleUtil.getLocaleDefaults(), SupportedScript.UNKNOWN) - val asyncResults = TextFont.values() + val asyncResults = TextFont.entries .map { Fonts.resolveFont(context, it, script) } .filterIsInstance(Fonts.FontResult.Async::class.java) diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/InAppPaymentKeepAliveJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/InAppPaymentKeepAliveJob.kt index 1b72c8c527..4d2a275ead 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/InAppPaymentKeepAliveJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/InAppPaymentKeepAliveJob.kt @@ -320,7 +320,7 @@ class InAppPaymentKeepAliveJob private constructor( override fun create(parameters: Parameters, serializedData: ByteArray?): InAppPaymentKeepAliveJob { return InAppPaymentKeepAliveJob( parameters, - InAppPaymentSubscriberRecord.Type.values().first { it.code == JsonJobData.deserialize(serializedData).getInt(DATA_TYPE) } + InAppPaymentSubscriberRecord.Type.entries.first { it.code == JsonJobData.deserialize(serializedData).getInt(DATA_TYPE) } ) } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageErrorJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageErrorJob.kt index 1a6ae7d416..98bc2b882e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageErrorJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageErrorJob.kt @@ -66,7 +66,7 @@ class PushProcessMessageErrorJob private constructor( override fun create(parameters: Parameters, serializedData: ByteArray?): PushProcessMessageErrorJob { val data = JsonJobData.deserialize(serializedData) - val state = MessageState.values()[data.getInt(KEY_MESSAGE_STATE)] + val state = MessageState.entries[data.getInt(KEY_MESSAGE_STATE)] check(state != MessageState.DECRYPTED_OK && state != MessageState.NOOP) val exceptionMetadata = ExceptionMetadata( diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyboard/gif/GifQuickSearchOption.kt b/app/src/main/java/org/thoughtcrime/securesms/keyboard/gif/GifQuickSearchOption.kt index 67f2cae418..ffb5a3e8de 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/keyboard/gif/GifQuickSearchOption.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/keyboard/gif/GifQuickSearchOption.kt @@ -13,6 +13,6 @@ enum class GifQuickSearchOption(private val rank: Int, val image: Int, val query ANGRY(7, R.drawable.ic_gif_angry_24, "angry"); companion object { - val ranked: List by lazy { values().sortedBy { it.rank } } + val ranked: List by lazy { entries.sortedBy { it.rank } } } } 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 0793681946..e7fa9b0b1e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/AccountValues.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/AccountValues.kt @@ -565,7 +565,7 @@ class AccountValues internal constructor(store: KeyValueStore, context: Context) companion object { fun deserialize(value: Long): UsernameSyncState { - return values().firstOrNull { it.value == value } ?: throw IllegalArgumentException("Invalid value: $value") + return entries.firstOrNull { it.value == value } ?: throw IllegalArgumentException("Invalid value: $value") } } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/QuoteModel.kt b/app/src/main/java/org/thoughtcrime/securesms/mms/QuoteModel.kt index 741b35f1d9..7bb1de21b4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/QuoteModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/QuoteModel.kt @@ -31,7 +31,7 @@ class QuoteModel( companion object { @JvmStatic fun fromCode(code: Int): Type { - for (value in values()) { + for (value in entries) { if (value.code == code) { return value } @@ -41,7 +41,7 @@ class QuoteModel( @JvmStatic fun fromDataMessageType(dataMessageType: SignalServiceDataMessage.Quote.Type): Type { - for (value in values()) { + for (value in entries) { if (value.dataMessageType === dataMessageType) { return value } diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/WelcomePermissions.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/WelcomePermissions.kt index 9748c7afac..1dc24fa851 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/WelcomePermissions.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/WelcomePermissions.kt @@ -48,6 +48,6 @@ object WelcomePermissions { @JvmStatic fun getWelcomePermissions(isUserBackupSelectionRequired: Boolean): Array { - return Permissions.values().map { it.getPermissions(isUserBackupSelectionRequired) }.flatten().toTypedArray() + return Permissions.entries.map { it.getPermissions(isUserBackupSelectionRequired) }.flatten().toTypedArray() } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/restore/RestoreActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/restore/RestoreActivity.kt index 70a236c45f..7a4f5cdc9a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/restore/RestoreActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/restore/RestoreActivity.kt @@ -65,7 +65,7 @@ class RestoreActivity : BaseActivity() { companion object { fun deserialize(value: Int): NavTarget { - return values().firstOrNull { it.value == value } ?: NONE + return entries.firstOrNull { it.value == value } ?: NONE } } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/scribbles/stickers/AnalogClockStickerDrawable.kt b/app/src/main/java/org/thoughtcrime/securesms/scribbles/stickers/AnalogClockStickerDrawable.kt index 8937a311b9..ef9cf672c5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/scribbles/stickers/AnalogClockStickerDrawable.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/scribbles/stickers/AnalogClockStickerDrawable.kt @@ -210,13 +210,13 @@ class AnalogClockStickerDrawable(val context: Context) : Drawable(), Animatable GREEN(3); fun next(): Style { - val values = Style.values() + val values = entries.toTypedArray() return values[(values.indexOf(this) + 1) % values.size] } companion object { - fun fromType(type: Int) = Style.values().first { it.type == type } + fun fromType(type: Int) = entries.first { it.type == type } } } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/scribbles/stickers/DigitalClockStickerDrawable.kt b/app/src/main/java/org/thoughtcrime/securesms/scribbles/stickers/DigitalClockStickerDrawable.kt index 233b630dd4..a0c0942655 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/scribbles/stickers/DigitalClockStickerDrawable.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/scribbles/stickers/DigitalClockStickerDrawable.kt @@ -250,13 +250,13 @@ class DigitalClockStickerDrawable( DARK_WITH_RED_TEXT(4); fun next(): Style { - val values = Style.values() + val values = entries.toTypedArray() return values[(values.indexOf(this) + 1) % values.size] } companion object { - fun fromType(type: Int) = Style.values().first { it.type == type } + fun fromType(type: Int) = entries.first { it.type == type } } } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/scribbles/stickers/FeatureSticker.kt b/app/src/main/java/org/thoughtcrime/securesms/scribbles/stickers/FeatureSticker.kt index b077467055..fe56c04f4b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/scribbles/stickers/FeatureSticker.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/scribbles/stickers/FeatureSticker.kt @@ -9,6 +9,6 @@ enum class FeatureSticker(val type: String) { companion object { @JvmStatic - fun fromType(type: String) = FeatureSticker.values().first { it.type == type } + fun fromType(type: String) = entries.first { it.type == type } } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/StorySlateView.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/StorySlateView.kt index 4c466074f4..6e55e782af 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/StorySlateView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stories/StorySlateView.kt @@ -163,7 +163,7 @@ class StorySlateView @JvmOverloads constructor( companion object { fun fromCode(code: Int): State { - return values().firstOrNull { + return entries.firstOrNull { it.code == code } ?: HIDDEN } diff --git a/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/AudioDeviceMapping.kt b/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/AudioDeviceMapping.kt index 0c68d54538..f41bc8b776 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/AudioDeviceMapping.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/AudioDeviceMapping.kt @@ -21,7 +21,7 @@ object AudioDeviceMapping { @JvmStatic fun fromPlatformType(type: Int): SignalAudioManager.AudioDevice { - for (kind in SignalAudioManager.AudioDevice.values()) { + for (kind in SignalAudioManager.AudioDevice.entries) { if (getEquivalentPlatformTypes(kind).contains(type)) return kind } return SignalAudioManager.AudioDevice.NONE diff --git a/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/SignalAudioManager.kt b/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/SignalAudioManager.kt index 04f22d7d6b..0900585b24 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/SignalAudioManager.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/SignalAudioManager.kt @@ -384,7 +384,7 @@ class FullSignalAudioManager(context: Context, eventListener: EventListener?) : if (isId) { throw IllegalArgumentException("Passing audio device address $device to legacy audio manager") } - val mappedDevice = AudioDevice.values()[device] + val mappedDevice = AudioDevice.entries[device] val actualDevice: AudioDevice = if (mappedDevice == AudioDevice.EARPIECE && audioDevices.contains(AudioDevice.WIRED_HEADSET)) AudioDevice.WIRED_HEADSET else mappedDevice Log.d(TAG, "selectAudioDevice(): device: $device actualDevice: $actualDevice") diff --git a/app/src/test/java/org/thoughtcrime/securesms/notifications/profiles/NotificationProfileScheduleTest.kt b/app/src/test/java/org/thoughtcrime/securesms/notifications/profiles/NotificationProfileScheduleTest.kt index 6039c5c4fa..a9f8af416c 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/notifications/profiles/NotificationProfileScheduleTest.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/notifications/profiles/NotificationProfileScheduleTest.kt @@ -111,7 +111,7 @@ class NotificationProfileScheduleTest { @Test fun `when enabled schedule 12am to 12am for all days then return true`() { - val schedule = NotificationProfileSchedule(id = 1L, enabled = true, start = 0, end = 2400, daysEnabled = DayOfWeek.values().toSet()) + val schedule = NotificationProfileSchedule(id = 1L, enabled = true, start = 0, end = 2400, daysEnabled = DayOfWeek.entries.toSet()) assertTrue(schedule.isCurrentlyActive(sunday0am.toMillis(ZoneOffset.UTC))) assertTrue(schedule.isCurrentlyActive(sunday1am.toMillis(ZoneOffset.UTC))) @@ -128,7 +128,7 @@ class NotificationProfileScheduleTest { @Test fun `when disabled schedule 12am to 12am for all days then return false`() { - val schedule = NotificationProfileSchedule(id = 1L, enabled = false, start = 0, end = 2400, daysEnabled = DayOfWeek.values().toSet()) + val schedule = NotificationProfileSchedule(id = 1L, enabled = false, start = 0, end = 2400, daysEnabled = DayOfWeek.entries.toSet()) assertFalse(schedule.isCurrentlyActive(sunday0am.toMillis(ZoneOffset.UTC))) assertFalse(schedule.isCurrentlyActive(sunday1am.toMillis(ZoneOffset.UTC))) @@ -145,7 +145,7 @@ class NotificationProfileScheduleTest { @Test fun `when end time is midnight return midnight of next day from now`() { - val schedule = NotificationProfileSchedule(id = 1L, enabled = false, start = 0, end = 2400, daysEnabled = DayOfWeek.values().toSet()) + val schedule = NotificationProfileSchedule(id = 1L, enabled = false, start = 0, end = 2400, daysEnabled = DayOfWeek.entries.toSet()) assertThat(schedule.endDateTime(sunday930am), `is`(monday0am)) } } diff --git a/app/src/test/java/org/thoughtcrime/securesms/notifications/profiles/NotificationProfilesTest.kt b/app/src/test/java/org/thoughtcrime/securesms/notifications/profiles/NotificationProfilesTest.kt index 5f20e4f7c2..dcca57fbc1 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/notifications/profiles/NotificationProfilesTest.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/notifications/profiles/NotificationProfilesTest.kt @@ -184,7 +184,7 @@ class NotificationProfilesTest { every { notificationProfileValues.manuallyEnabledUntil } returns 0 every { notificationProfileValues.manuallyDisabledAt } returns sunday830am.toMillis(ZoneOffset.UTC) - val schedule = NotificationProfileSchedule(id = 3L, enabled = true, start = 2200, end = 1000, daysEnabled = DayOfWeek.values().toSet()) + val schedule = NotificationProfileSchedule(id = 3L, enabled = true, start = 2200, end = 1000, daysEnabled = DayOfWeek.entries.toSet()) val profiles = listOf(first.copy(schedule = schedule)) assertThat("active profile is null", NotificationProfiles.getActiveProfile(profiles, sunday9am.toMillis(ZoneOffset.UTC), utc), nullValue()) } diff --git a/donations/lib/src/main/java/org/signal/donations/PaymentSourceType.kt b/donations/lib/src/main/java/org/signal/donations/PaymentSourceType.kt index e8ba5b55b2..5c75caa4d4 100644 --- a/donations/lib/src/main/java/org/signal/donations/PaymentSourceType.kt +++ b/donations/lib/src/main/java/org/signal/donations/PaymentSourceType.kt @@ -58,7 +58,7 @@ sealed class PaymentSourceType { companion object { fun fromCode(code: String?): PaymentSourceType { - return when (Codes.values().firstOrNull { it.code == code } ?: Codes.UNKNOWN) { + return when (Codes.entries.firstOrNull { it.code == code } ?: Codes.UNKNOWN) { Codes.UNKNOWN -> Unknown Codes.PAY_PAL -> PayPal Codes.CREDIT_CARD -> Stripe.CreditCard diff --git a/donations/lib/src/main/java/org/signal/donations/StripeDeclineCode.kt b/donations/lib/src/main/java/org/signal/donations/StripeDeclineCode.kt index 986cd7881c..2a8198e2cc 100644 --- a/donations/lib/src/main/java/org/signal/donations/StripeDeclineCode.kt +++ b/donations/lib/src/main/java/org/signal/donations/StripeDeclineCode.kt @@ -58,7 +58,7 @@ sealed class StripeDeclineCode(val rawCode: String) { return Unknown("null") } - val typedCode: Code? = Code.values().firstOrNull { it.code == code } + val typedCode: Code? = Code.entries.firstOrNull { it.code == code } return typedCode?.let { Known(typedCode) } ?: Unknown(code) } } diff --git a/donations/lib/src/main/java/org/signal/donations/StripeFailureCode.kt b/donations/lib/src/main/java/org/signal/donations/StripeFailureCode.kt index 28837eb59f..4246e86baa 100644 --- a/donations/lib/src/main/java/org/signal/donations/StripeFailureCode.kt +++ b/donations/lib/src/main/java/org/signal/donations/StripeFailureCode.kt @@ -36,7 +36,7 @@ sealed class StripeFailureCode(val rawCode: String) { return Unknown("null") } - val typedCode: Code? = Code.values().firstOrNull { it.code == code } + val typedCode: Code? = Code.entries.firstOrNull { it.code == code } return typedCode?.let { Known(typedCode) } ?: Unknown(code) } } diff --git a/donations/lib/src/main/java/org/signal/donations/json/StripeIntentStatus.kt b/donations/lib/src/main/java/org/signal/donations/json/StripeIntentStatus.kt index e365be4165..6197bacf44 100644 --- a/donations/lib/src/main/java/org/signal/donations/json/StripeIntentStatus.kt +++ b/donations/lib/src/main/java/org/signal/donations/json/StripeIntentStatus.kt @@ -22,6 +22,6 @@ enum class StripeIntentStatus(private val code: String) { companion object { @JvmStatic @JsonCreator - fun fromCode(code: String): StripeIntentStatus = StripeIntentStatus.values().first { it.code == code } + fun fromCode(code: String): StripeIntentStatus = entries.first { it.code == code } } } diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveMediaResponse.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveMediaResponse.kt index 9fe8ae4427..3c2281deb2 100644 --- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveMediaResponse.kt +++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveMediaResponse.kt @@ -23,7 +23,7 @@ class ArchiveMediaResponse( companion object { fun from(code: Int): StatusCodes { - return values().firstOrNull { it.code == code } ?: Unknown + return entries.firstOrNull { it.code == code } ?: Unknown } } } diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveMediaUploadFormStatusCodes.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveMediaUploadFormStatusCodes.kt index f756bbf675..50d4f54c88 100644 --- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveMediaUploadFormStatusCodes.kt +++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveMediaUploadFormStatusCodes.kt @@ -19,7 +19,7 @@ enum class ArchiveMediaUploadFormStatusCodes(val code: Int) { companion object { fun from(code: Int): ArchiveMediaUploadFormStatusCodes { - return values().firstOrNull { it.code == code } ?: Unknown + return entries.firstOrNull { it.code == code } ?: Unknown } } } diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceDataMessage.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceDataMessage.kt index f5ab96c919..50576095f3 100644 --- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceDataMessage.kt +++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceDataMessage.kt @@ -269,7 +269,7 @@ class SignalServiceDataMessage private constructor( companion object { @JvmStatic fun fromProto(protoType: QuoteProto.Type): Type { - return values().firstOrNull { it.protoType == protoType } ?: NORMAL + return entries.firstOrNull { it.protoType == protoType } ?: NORMAL } } }