diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/datasource/disk/VaultDiskSourceImpl.kt b/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/datasource/disk/VaultDiskSourceImpl.kt index 260cb62421..09be0d36ae 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/datasource/disk/VaultDiskSourceImpl.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/datasource/disk/VaultDiskSourceImpl.kt @@ -147,7 +147,7 @@ class VaultDiskSourceImpl( isReadOnly = collection.isReadOnly, canManage = collection.canManage, defaultUserCollectionEmail = collection.defaultUserCollectionEmail, - type = collection.type, + type = json.encodeToString(collection.type), ), ) } @@ -170,7 +170,7 @@ class VaultDiskSourceImpl( isReadOnly = entity.isReadOnly, canManage = entity.canManage, defaultUserCollectionEmail = entity.defaultUserCollectionEmail, - type = entity.type, + type = json.decodeFromString(entity.type), ) } }, @@ -295,7 +295,7 @@ class VaultDiskSourceImpl( isReadOnly = collection.isReadOnly, canManage = collection.canManage, defaultUserCollectionEmail = collection.defaultUserCollectionEmail, - type = collection.type, + type = json.encodeToString(collection.type), ) }, ) diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/datasource/disk/entity/CollectionEntity.kt b/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/datasource/disk/entity/CollectionEntity.kt index a42b778fed..f31b19943b 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/datasource/disk/entity/CollectionEntity.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/datasource/disk/entity/CollectionEntity.kt @@ -3,7 +3,6 @@ package com.x8bit.bitwarden.data.vault.datasource.disk.entity import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.PrimaryKey -import com.bitwarden.network.model.CollectionTypeJson /** * Entity representing a collection in the database. @@ -39,5 +38,5 @@ data class CollectionEntity( val defaultUserCollectionEmail: String?, @ColumnInfo(name = "type", defaultValue = "0") - val type: CollectionTypeJson, + val type: String, ) diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/datasource/disk/VaultDiskSourceTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/datasource/disk/VaultDiskSourceTest.kt index a3da5fd6ba..02e80d18b6 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/datasource/disk/VaultDiskSourceTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/datasource/disk/VaultDiskSourceTest.kt @@ -3,7 +3,6 @@ package com.x8bit.bitwarden.data.vault.datasource.disk import app.cash.turbine.test import com.bitwarden.core.di.CoreModule import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager -import com.bitwarden.network.model.CollectionTypeJson import com.bitwarden.network.model.SyncResponseJson import com.bitwarden.network.model.createMockCipher import com.bitwarden.network.model.createMockCollection @@ -481,7 +480,7 @@ private val COLLECTION_ENTITY = CollectionEntity( isReadOnly = false, canManage = true, defaultUserCollectionEmail = "mockOffboardedUserEmail-3", - type = CollectionTypeJson.SHARED_COLLECTION, + type = "0", ) private const val DOMAINS_JSON = """