github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-03-21 22:00:42 -05:00
Code Issues 144 Packages Projects Releases 116 Wiki Activity

Improve the error messaging when an enum is not parsed correctly (#4730)

Browse Source
This commit is contained in:
David Perez
2025-02-17 15:03:05 -06:00
committed by GitHub
parent 359dedc9d7
commit 22931bbd38
20 changed files with 59 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/AuthRequestTypeJson.kt
View File

@@ -21,5 +21,7 @@ enum class AuthRequestTypeJson {
}
@Keep
private class AuthRequestTypeSerializer :
BaseEnumeratedIntSerializer<AuthRequestTypeJson>(AuthRequestTypeJson.entries.toTypedArray())
private class AuthRequestTypeSerializer : BaseEnumeratedIntSerializer<AuthRequestTypeJson>(
className = "AuthRequestTypeJson",
values = AuthRequestTypeJson.entries.toTypedArray(),
)

6
app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/KdfTypeJson.kt
View File

@@ -18,5 +18,7 @@ enum class KdfTypeJson {
}
@Keep
private class KdfTypeSerializer :
BaseEnumeratedIntSerializer<KdfTypeJson>(KdfTypeJson.entries.toTypedArray())
private class KdfTypeSerializer : BaseEnumeratedIntSerializer<KdfTypeJson>(
className = "KdfTypeJson",
values = KdfTypeJson.entries.toTypedArray(),
)

6
app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/TwoFactorAuthMethod.kt
View File

@@ -39,5 +39,7 @@ enum class TwoFactorAuthMethod(val value: UInt) {
}
@Keep
private class TwoFactorAuthMethodSerializer :
BaseEnumeratedIntSerializer<TwoFactorAuthMethod>(TwoFactorAuthMethod.entries.toTypedArray())
private class TwoFactorAuthMethodSerializer : BaseEnumeratedIntSerializer<TwoFactorAuthMethod>(
className = "TwoFactorAuthMethod",
values = TwoFactorAuthMethod.entries.toTypedArray(),
)

3
app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/serializer/BaseEnumeratedIntSerializer.kt
View File

@@ -15,6 +15,7 @@ import kotlinx.serialization.encoding.Encoder
*/
@Suppress("UnnecessaryAbstractClass")
abstract class BaseEnumeratedIntSerializer<T : Enum<T>>(
private val className: String,
private val values: Array<T>,
private val default: T? = null,
) : KSerializer<T> {
@@ -29,7 +30,7 @@ abstract class BaseEnumeratedIntSerializer<T : Enum<T>>(
val decodedValue = decoder.decodeInt().toString()
return values.firstOrNull { it.serialNameAnnotation?.value == decodedValue }
?: default
?: throw IllegalArgumentException("Unknown value $decodedValue")
?: throw IllegalArgumentException("Unknown value $decodedValue for $className")
}
override fun serialize(encoder: Encoder, value: T) {

6
app/src/main/java/com/x8bit/bitwarden/data/platform/manager/model/NotificationType.kt
View File

@@ -63,5 +63,7 @@ enum class NotificationType {
}
@Keep
private class NotificationTypeSerializer :
BaseEnumeratedIntSerializer<NotificationType>(NotificationType.entries.toTypedArray())
private class NotificationTypeSerializer : BaseEnumeratedIntSerializer<NotificationType>(
className = "NotificationType",
values = NotificationType.entries.toTypedArray(),
)

1
app/src/main/java/com/x8bit/bitwarden/data/platform/manager/model/OrganizationEventType.kt
View File

@@ -130,5 +130,6 @@ enum class OrganizationEventType {
@Keep
private class OrganizationEventTypeSerializer : BaseEnumeratedIntSerializer<OrganizationEventType>(
className = "OrganizationEventType",
values = OrganizationEventType.entries.toTypedArray(),
)

3
app/src/main/java/com/x8bit/bitwarden/data/tools/generator/repository/model/PasscodeGenerationOptions.kt
View File

@@ -91,5 +91,6 @@ data class PasscodeGenerationOptions(
@Keep
private class PasscodeTypeSerializer :
BaseEnumeratedIntSerializer<PasscodeGenerationOptions.PasscodeType>(
PasscodeGenerationOptions.PasscodeType.entries.toTypedArray(),
className = "PasscodeGenerationOptions.PasscodeType",
values = PasscodeGenerationOptions.PasscodeType.entries.toTypedArray(),
)

6
app/src/main/java/com/x8bit/bitwarden/data/tools/generator/repository/model/UsernameGenerationOptions.kt
View File

@@ -122,11 +122,13 @@ data class UsernameGenerationOptions(
@Keep
private class UsernameTypeSerializer :
BaseEnumeratedIntSerializer<UsernameGenerationOptions.UsernameType>(
UsernameGenerationOptions.UsernameType.entries.toTypedArray(),
className = "UsernameGenerationOptions.UsernameType",
values = UsernameGenerationOptions.UsernameType.entries.toTypedArray(),
)
@Keep
private class ForwardedEmailServiceTypeSerializer :
BaseEnumeratedIntSerializer<UsernameGenerationOptions.ForwardedEmailServiceType>(
UsernameGenerationOptions.ForwardedEmailServiceType.entries.toTypedArray(),
className = "UsernameGenerationOptions.ForwardedEmailServiceType",
values = UsernameGenerationOptions.ForwardedEmailServiceType.entries.toTypedArray(),
)

3
app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/CipherRepromptTypeJson.kt
View File

@@ -25,5 +25,6 @@ enum class CipherRepromptTypeJson {
@Keep
private class CipherRepromptTypeSerializer : BaseEnumeratedIntSerializer<CipherRepromptTypeJson>(
CipherRepromptTypeJson.entries.toTypedArray(),
className = "CipherRepromptTypeJson",
values = CipherRepromptTypeJson.entries.toTypedArray(),
)

6
app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/CipherTypeJson.kt
View File

@@ -42,5 +42,7 @@ enum class CipherTypeJson {
}
@Keep
private class CipherTypeSerializer :
BaseEnumeratedIntSerializer<CipherTypeJson>(CipherTypeJson.entries.toTypedArray())
private class CipherTypeSerializer : BaseEnumeratedIntSerializer<CipherTypeJson>(
className = "CipherTypeJson",
values = CipherTypeJson.entries.toTypedArray(),
)

6
app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/FieldTypeJson.kt
View File

@@ -36,5 +36,7 @@ enum class FieldTypeJson {
}
@Keep
private class FieldTypeSerializer :
BaseEnumeratedIntSerializer<FieldTypeJson>(FieldTypeJson.entries.toTypedArray())
private class FieldTypeSerializer : BaseEnumeratedIntSerializer<FieldTypeJson>(
className = "FieldTypeJson",
values = FieldTypeJson.entries.toTypedArray(),
)

3
app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/FileUploadType.kt
View File

@@ -19,5 +19,6 @@ enum class FileUploadType {
@Keep
private class FileUploadTypeSerializer : BaseEnumeratedIntSerializer<FileUploadType>(
FileUploadType.entries.toTypedArray(),
className = "FileUploadType",
values = FileUploadType.entries.toTypedArray(),
)

6
app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/LinkedIdTypeJson.kt
View File

@@ -180,5 +180,7 @@ enum class LinkedIdTypeJson(val value: UInt) {
}
@Keep
private class LinkedIdTypeSerializer :
BaseEnumeratedIntSerializer<LinkedIdTypeJson>(LinkedIdTypeJson.entries.toTypedArray())
private class LinkedIdTypeSerializer : BaseEnumeratedIntSerializer<LinkedIdTypeJson>(
className = "LinkedIdTypeJson",
values = LinkedIdTypeJson.entries.toTypedArray(),
)

3
app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/OrganizationStatusType.kt
View File

@@ -32,5 +32,6 @@ enum class OrganizationStatusType {
@Keep
private class OrganizationStatusTypeSerializer :
BaseEnumeratedIntSerializer<OrganizationStatusType>(
OrganizationStatusType.entries.toTypedArray(),
className = "OrganizationStatusType",
values = OrganizationStatusType.entries.toTypedArray(),
)

3
app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/OrganizationType.kt
View File

@@ -43,5 +43,6 @@ enum class OrganizationType {
@Keep
private class OrganizationTypeSerializer : BaseEnumeratedIntSerializer<OrganizationType>(
OrganizationType.entries.toTypedArray(),
className = "OrganizationType",
values = OrganizationType.entries.toTypedArray(),
)

1
app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/PolicyTypeJson.kt
View File

@@ -100,6 +100,7 @@ enum class PolicyTypeJson {
@Keep
private class PolicyTypeSerializer : BaseEnumeratedIntSerializer<PolicyTypeJson>(
className = "PolicyTypeJson",
values = PolicyTypeJson.entries.toTypedArray(),
default = PolicyTypeJson.UNKNOWN,
)

6
app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SecureNoteTypeJson.kt
View File

@@ -18,5 +18,7 @@ enum class SecureNoteTypeJson {
}
@Keep
private class SecureNoteTypeSerializer :
BaseEnumeratedIntSerializer<SecureNoteTypeJson>(SecureNoteTypeJson.entries.toTypedArray())
private class SecureNoteTypeSerializer : BaseEnumeratedIntSerializer<SecureNoteTypeJson>(
className = "SecureNoteTypeJson",
values = SecureNoteTypeJson.entries.toTypedArray(),
)

6
app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SendTypeJson.kt
View File

@@ -24,5 +24,7 @@ enum class SendTypeJson {
}
@Keep
private class SendTypeSerializer :
BaseEnumeratedIntSerializer<SendTypeJson>(SendTypeJson.entries.toTypedArray())
private class SendTypeSerializer : BaseEnumeratedIntSerializer<SendTypeJson>(
className = "SendTypeJson",
values = SendTypeJson.entries.toTypedArray(),
)

6
app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/UriMatchTypeJson.kt
View File

@@ -48,5 +48,7 @@ enum class UriMatchTypeJson {
}
@Keep
private class UriMatchTypeSerializer :
BaseEnumeratedIntSerializer<UriMatchTypeJson>(UriMatchTypeJson.entries.toTypedArray())
private class UriMatchTypeSerializer : BaseEnumeratedIntSerializer<UriMatchTypeJson>(
className = "UriMatchTypeJson",
values = UriMatchTypeJson.entries.toTypedArray(),
)

1
app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/network/serializer/BaseEnumeratedIntSerializerTest.kt
View File

@@ -62,6 +62,7 @@ private enum class TestEnum {
}
private class TestEnumSerializer : BaseEnumeratedIntSerializer<TestEnum>(
className = "TestEnum",
values = TestEnum.entries.toTypedArray(),
default = TestEnum.UNKNOWN,
)