From b2692a563786f8abef6002b8b563b9eac6438ff2 Mon Sep 17 00:00:00 2001
From: Brian Yencho <brian@livefront.com>
Date: Wed, 20 Dec 2023 17:15:21 -0600
Subject: [PATCH] Ensure BaseEnumeratedIntSerializer subclasses are not
 obfuscated (#428)

---
 .../bitwarden/data/auth/datasource/network/model/KdfTypeJson.kt | 2 ++
 .../vault/datasource/network/model/CipherRepromptTypeJson.kt    | 2 ++
 .../data/vault/datasource/network/model/CipherTypeJson.kt       | 2 ++
 .../data/vault/datasource/network/model/FieldTypeJson.kt        | 2 ++
 .../data/vault/datasource/network/model/LinkedIdTypeJson.kt     | 2 ++
 .../data/vault/datasource/network/model/PolicyTypeJson.kt       | 2 ++
 .../data/vault/datasource/network/model/SecureNoteTypeJson.kt   | 2 ++
 .../data/vault/datasource/network/model/SendTypeJson.kt         | 2 ++
 .../data/vault/datasource/network/model/UriMatchTypeJson.kt     | 2 ++
 gradle/libs.versions.toml                                       | 2 +-
 10 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/KdfTypeJson.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/KdfTypeJson.kt
index 31e2bbd5a4..4f813e7942 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/KdfTypeJson.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/KdfTypeJson.kt
@@ -1,5 +1,6 @@
 package com.x8bit.bitwarden.data.auth.datasource.network.model
 
+import androidx.annotation.Keep
 import com.x8bit.bitwarden.data.platform.datasource.network.serializer.BaseEnumeratedIntSerializer
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -16,5 +17,6 @@ enum class KdfTypeJson {
     PBKDF2_SHA256,
 }
 
+@Keep
 private class KdfTypeSerializer :
     BaseEnumeratedIntSerializer<KdfTypeJson>(KdfTypeJson.values())
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/CipherRepromptTypeJson.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/CipherRepromptTypeJson.kt
index 5d7975c577..101a9fb404 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/CipherRepromptTypeJson.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/CipherRepromptTypeJson.kt
@@ -1,5 +1,6 @@
 package com.x8bit.bitwarden.data.vault.datasource.network.model
 
+import androidx.annotation.Keep
 import com.x8bit.bitwarden.data.platform.datasource.network.serializer.BaseEnumeratedIntSerializer
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -22,5 +23,6 @@ enum class CipherRepromptTypeJson {
     PASSWORD,
 }
 
+@Keep
 private class CipherRepromptTypeSerializer :
     BaseEnumeratedIntSerializer<CipherRepromptTypeJson>(CipherRepromptTypeJson.values())
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/CipherTypeJson.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/CipherTypeJson.kt
index caf5c80020..4b9976ba59 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/CipherTypeJson.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/CipherTypeJson.kt
@@ -1,5 +1,6 @@
 package com.x8bit.bitwarden.data.vault.datasource.network.model
 
+import androidx.annotation.Keep
 import com.x8bit.bitwarden.data.platform.datasource.network.serializer.BaseEnumeratedIntSerializer
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -34,5 +35,6 @@ enum class CipherTypeJson {
     IDENTITY,
 }
 
+@Keep
 private class CipherTypeSerializer :
     BaseEnumeratedIntSerializer<CipherTypeJson>(CipherTypeJson.values())
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/FieldTypeJson.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/FieldTypeJson.kt
index 9c7a5ebad9..0c97cd9754 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/FieldTypeJson.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/FieldTypeJson.kt
@@ -1,5 +1,6 @@
 package com.x8bit.bitwarden.data.vault.datasource.network.model
 
+import androidx.annotation.Keep
 import com.x8bit.bitwarden.data.platform.datasource.network.serializer.BaseEnumeratedIntSerializer
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -34,5 +35,6 @@ enum class FieldTypeJson {
     LINKED,
 }
 
+@Keep
 private class FieldTypeSerializer :
     BaseEnumeratedIntSerializer<FieldTypeJson>(FieldTypeJson.values())
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/LinkedIdTypeJson.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/LinkedIdTypeJson.kt
index c29d4d4aa9..b3f4b3c948 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/LinkedIdTypeJson.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/LinkedIdTypeJson.kt
@@ -1,5 +1,6 @@
 package com.x8bit.bitwarden.data.vault.datasource.network.model
 
+import androidx.annotation.Keep
 import com.x8bit.bitwarden.data.platform.datasource.network.serializer.BaseEnumeratedIntSerializer
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -178,5 +179,6 @@ enum class LinkedIdTypeJson(val value: UInt) {
     // endregion IDENTITY
 }
 
+@Keep
 private class LinkedIdTypeSerializer :
     BaseEnumeratedIntSerializer<LinkedIdTypeJson>(LinkedIdTypeJson.values())
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/PolicyTypeJson.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/PolicyTypeJson.kt
index 16af8002fa..6289bfb8ef 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/PolicyTypeJson.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/PolicyTypeJson.kt
@@ -1,5 +1,6 @@
 package com.x8bit.bitwarden.data.vault.datasource.network.model
 
+import androidx.annotation.Keep
 import com.x8bit.bitwarden.data.platform.datasource.network.serializer.BaseEnumeratedIntSerializer
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -76,5 +77,6 @@ enum class PolicyTypeJson {
     DISABLE_PERSONAL_VAULT_EXPORT,
 }
 
+@Keep
 private class PolicyTypeSerializer :
     BaseEnumeratedIntSerializer<PolicyTypeJson>(PolicyTypeJson.values())
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SecureNoteTypeJson.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SecureNoteTypeJson.kt
index 5611e89b18..a11b751485 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SecureNoteTypeJson.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SecureNoteTypeJson.kt
@@ -1,5 +1,6 @@
 package com.x8bit.bitwarden.data.vault.datasource.network.model
 
+import androidx.annotation.Keep
 import com.x8bit.bitwarden.data.platform.datasource.network.serializer.BaseEnumeratedIntSerializer
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -16,5 +17,6 @@ enum class SecureNoteTypeJson {
     GENERIC,
 }
 
+@Keep
 private class SecureNoteTypeSerializer :
     BaseEnumeratedIntSerializer<SecureNoteTypeJson>(SecureNoteTypeJson.values())
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SendTypeJson.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SendTypeJson.kt
index a8bee80983..2848e29c3e 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SendTypeJson.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SendTypeJson.kt
@@ -1,5 +1,6 @@
 package com.x8bit.bitwarden.data.vault.datasource.network.model
 
+import androidx.annotation.Keep
 import com.x8bit.bitwarden.data.platform.datasource.network.serializer.BaseEnumeratedIntSerializer
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -22,5 +23,6 @@ enum class SendTypeJson {
     FILE,
 }
 
+@Keep
 private class SendTypeSerializer :
     BaseEnumeratedIntSerializer<SendTypeJson>(SendTypeJson.values())
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/UriMatchTypeJson.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/UriMatchTypeJson.kt
index 2c10eaf7d2..c23b5b82d2 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/UriMatchTypeJson.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/UriMatchTypeJson.kt
@@ -1,5 +1,6 @@
 package com.x8bit.bitwarden.data.vault.datasource.network.model
 
+import androidx.annotation.Keep
 import com.x8bit.bitwarden.data.platform.datasource.network.serializer.BaseEnumeratedIntSerializer
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -46,5 +47,6 @@ enum class UriMatchTypeJson {
     NEVER,
 }
 
+@Keep
 private class UriMatchTypeSerializer :
     BaseEnumeratedIntSerializer<UriMatchTypeJson>(UriMatchTypeJson.values())
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 155d4f9397..943988ca65 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -34,7 +34,7 @@ kotlin = "1.9.21"
 kotlinCompilerExtensionVersion = "1.5.7"
 kotlinxCollectionsImmutable = "0.3.6"
 kotlinxCoroutines = "1.7.3"
-kotlinxSerialization = "1.5.1"
+kotlinxSerialization = "1.6.2"
 kotlinxKover = "0.7.3"
 ksp = "1.9.21-1.0.16"
 mockk = "1.13.5"