diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkSendExtensions.kt b/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkSendExtensions.kt index 6b252b2fae..2899442f37 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkSendExtensions.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkSendExtensions.kt @@ -4,6 +4,7 @@ import com.bitwarden.core.data.repository.util.SpecialCharWithPrecedenceComparat import com.bitwarden.network.model.SendJsonRequest import com.bitwarden.network.model.SendTypeJson import com.bitwarden.network.model.SyncResponseJson +import com.bitwarden.send.AuthType import com.bitwarden.send.Send import com.bitwarden.send.SendFile import com.bitwarden.send.SendText @@ -92,6 +93,8 @@ fun SyncResponseJson.Send.toEncryptedSdkSend(): Send = revisionDate = revisionDate.toInstant(), deletionDate = deletionDate.toInstant(), expirationDate = expirationDate?.toInstant(), + emails = null, + authType = AuthType.NONE, ) /** diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/addedit/util/AddEditSendStateExtensions.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/addedit/util/AddEditSendStateExtensions.kt index f045d41fd9..f895908b87 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/addedit/util/AddEditSendStateExtensions.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/addedit/util/AddEditSendStateExtensions.kt @@ -1,5 +1,6 @@ package com.x8bit.bitwarden.ui.tools.feature.send.addedit.util +import com.bitwarden.send.AuthType import com.bitwarden.send.SendFileView import com.bitwarden.send.SendTextView import com.bitwarden.send.SendType @@ -36,6 +37,8 @@ fun AddEditSendState.ViewState.Content.toSendView( // we just update it to match the deletion date. common.deletionDate.toInstant() }, + emails = emptyList(), + authType = AuthType.NONE, ) private fun AddEditSendState.ViewState.Content.SendType.toSendType(): SendType = diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultAddItemStateExtensions.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultAddItemStateExtensions.kt index 0201ac0167..0bbe3aea52 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultAddItemStateExtensions.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultAddItemStateExtensions.kt @@ -45,6 +45,7 @@ fun VaultAddEditState.ViewState.Content.toCipherView(clock: Clock): CipherView = deletedDate = common.originalCipher?.deletedDate, revisionDate = common.originalCipher?.revisionDate ?: clock.instant(), archivedDate = common.originalCipher?.archivedDate, + attachmentDecryptionFailures = common.originalCipher?.attachmentDecryptionFailures, // Type specific section type = type.toCipherType(), diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/datasource/sdk/model/CipherViewUtil.kt b/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/datasource/sdk/model/CipherViewUtil.kt index e101a117d9..72b9a60e0c 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/datasource/sdk/model/CipherViewUtil.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/datasource/sdk/model/CipherViewUtil.kt @@ -101,6 +101,7 @@ fun createMockCipherView( organizationUseTotp = false, viewPassword = true, localData = null, + attachmentDecryptionFailures = null, ) /** diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/datasource/sdk/model/SendViewUtil.kt b/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/datasource/sdk/model/SendViewUtil.kt index a16c72ce55..c03f9cf910 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/datasource/sdk/model/SendViewUtil.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/datasource/sdk/model/SendViewUtil.kt @@ -1,5 +1,6 @@ package com.x8bit.bitwarden.data.vault.datasource.sdk.model +import com.bitwarden.send.AuthType import com.bitwarden.send.SendFileView import com.bitwarden.send.SendTextView import com.bitwarden.send.SendType @@ -49,6 +50,8 @@ fun createMockSendView( revisionDate = revisionDate, deletionDate = deletionDate, expirationDate = expirationDate, + emails = emptyList(), + authType = AuthType.NONE, ) /** diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/datasource/sdk/model/VaultSdkSendUtil.kt b/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/datasource/sdk/model/VaultSdkSendUtil.kt index 68a636f236..d52344e0ce 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/datasource/sdk/model/VaultSdkSendUtil.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/datasource/sdk/model/VaultSdkSendUtil.kt @@ -1,5 +1,6 @@ package com.x8bit.bitwarden.data.vault.datasource.sdk.model +import com.bitwarden.send.AuthType import com.bitwarden.send.Send import com.bitwarden.send.SendFile import com.bitwarden.send.SendText @@ -30,6 +31,8 @@ fun createMockSdkSend( revisionDate = ZonedDateTime.parse("2023-10-27T12:00:00Z").toInstant(), deletionDate = ZonedDateTime.parse("2023-10-27T12:00:00Z").toInstant(), expirationDate = ZonedDateTime.parse("2023-10-27T12:00:00Z").toInstant(), + emails = null, + authType = AuthType.NONE, ) /** diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensionsTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensionsTest.kt index 98a2ca4262..0be3ff39f9 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensionsTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensionsTest.kt @@ -783,6 +783,7 @@ private val DEFAULT_BASE_CIPHER_VIEW: CipherView = CipherView( revisionDate = FIXED_CLOCK.instant(), archivedDate = null, sshKey = null, + attachmentDecryptionFailures = null, ) private val DEFAULT_CARD_CIPHER_VIEW: CipherView = DEFAULT_BASE_CIPHER_VIEW.copy( diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/util/VaultItemTestUtil.kt b/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/util/VaultItemTestUtil.kt index c866a37269..e90fb5876c 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/util/VaultItemTestUtil.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/util/VaultItemTestUtil.kt @@ -161,6 +161,7 @@ fun createCipherView(type: CipherType, isEmpty: Boolean): CipherView = revisionDate = Instant.ofEpochSecond(1_000L), archivedDate = null, sshKey = createSshKeyView(isEmpty), + attachmentDecryptionFailures = null, ) fun createCommonContent( diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultAddItemStateExtensionsTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultAddItemStateExtensionsTest.kt index e390588587..86664e7803 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultAddItemStateExtensionsTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultAddItemStateExtensionsTest.kt @@ -105,6 +105,7 @@ class VaultAddItemStateExtensionsTest { revisionDate = FIXED_CLOCK.instant(), archivedDate = null, sshKey = null, + attachmentDecryptionFailures = null, ), result, ) @@ -287,6 +288,7 @@ class VaultAddItemStateExtensionsTest { revisionDate = FIXED_CLOCK.instant(), archivedDate = null, sshKey = null, + attachmentDecryptionFailures = null, ), result, ) @@ -417,6 +419,7 @@ class VaultAddItemStateExtensionsTest { revisionDate = FIXED_CLOCK.instant(), archivedDate = null, sshKey = null, + attachmentDecryptionFailures = null, ), result, ) @@ -601,6 +604,7 @@ class VaultAddItemStateExtensionsTest { revisionDate = FIXED_CLOCK.instant(), archivedDate = null, sshKey = null, + attachmentDecryptionFailures = null, ), result, ) @@ -745,6 +749,7 @@ class VaultAddItemStateExtensionsTest { privateKey = "mockPrivateKey-1", fingerprint = "mockFingerprint-1", ), + attachmentDecryptionFailures = null, ), result, ) @@ -975,6 +980,7 @@ private val DEFAULT_BASE_CIPHER_VIEW: CipherView = CipherView( revisionDate = FIXED_CLOCK.instant(), archivedDate = null, sshKey = null, + attachmentDecryptionFailures = null, ) private val DEFAULT_LOGIN_CIPHER_VIEW: CipherView = DEFAULT_BASE_CIPHER_VIEW.copy( diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index aeb290f84f..84e48a379a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -30,7 +30,7 @@ androidxRoom = "2.8.4" androidxSecurityCrypto = "1.1.0" androidxSplash = "1.2.0" androidxWork = "2.11.0" -bitwardenSdk = "2.0.0-4676-0544ddec" +bitwardenSdk = "2.0.0-4772-490c1be4" crashlytics = "3.0.6" detekt = "1.23.8" firebaseBom = "34.8.0"