Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
dad8010
SDK Update - com.bitwarden:sdk-android 3.0.0-7676-0c5afdd2
bw-ghapp[bot] Jul 6, 2026
a4ba031
SDK Update - com.bitwarden:sdk-android 3.0.0-7677-a4fae39c
bw-ghapp[bot] Jul 6, 2026
1670efd
SDK Update - com.bitwarden:sdk-android 3.0.0-7683-3e060f80
bw-ghapp[bot] Jul 7, 2026
a6ea324
SDK Update - com.bitwarden:sdk-android 3.0.0-7687-4963a281
bw-ghapp[bot] Jul 7, 2026
cd33a83
SDK Update - com.bitwarden:sdk-android 3.0.0-7697-e37dc5b0
bw-ghapp[bot] Jul 9, 2026
cf4e058
SDK Update - com.bitwarden:sdk-android 3.0.0-7698-f76b5145
bw-ghapp[bot] Jul 9, 2026
8297fad
SDK Update - com.bitwarden:sdk-android 3.0.0-7701-365a7eb0
bw-ghapp[bot] Jul 9, 2026
d2613c8
SDK Update - com.bitwarden:sdk-android 3.0.0-7707-b154bdb5
bw-ghapp[bot] Jul 9, 2026
f9eab4a
SDK Update - com.bitwarden:sdk-android 3.0.0-7725-03bcd1f8
bw-ghapp[bot] Jul 10, 2026
812b0bd
SDK Update - com.bitwarden:sdk-android 3.0.0-7736-5ca51921
bw-ghapp[bot] Jul 10, 2026
9232818
SDK Update - com.bitwarden:sdk-android 3.0.0-7740-d0710ef2
bw-ghapp[bot] Jul 10, 2026
e643699
SDK Update - com.bitwarden:sdk-android 3.0.0-7741-291c1684
bw-ghapp[bot] Jul 10, 2026
1587d6b
SDK Update - com.bitwarden:sdk-android 3.0.0-7742-3c6d8a80
bw-ghapp[bot] Jul 10, 2026
14eaed1
SDK Update - com.bitwarden:sdk-android 3.0.0-7743-3ba312ff
bw-ghapp[bot] Jul 10, 2026
9b2af92
SDK Update - com.bitwarden:sdk-android 3.0.0-7751-d4a4c2c8
bw-ghapp[bot] Jul 13, 2026
be9e9c8
SDK Update - com.bitwarden:sdk-android 3.0.0-7753-c6232452
bw-ghapp[bot] Jul 13, 2026
3d81717
SDK Update - com.bitwarden:sdk-android 3.0.0-7756-dd952a29
bw-ghapp[bot] Jul 14, 2026
4d8b002
SDK Update - com.bitwarden:sdk-android 3.0.0-7766-6bd00cb1
bw-ghapp[bot] Jul 14, 2026
6ed2dbd
SDK Update - com.bitwarden:sdk-android 3.0.0-7768-57569e4a
bw-ghapp[bot] Jul 14, 2026
d137393
SDK Update - com.bitwarden:sdk-android 3.0.0-7774-0a188b85
bw-ghapp[bot] Jul 14, 2026
5c083c1
SDK Update - com.bitwarden:sdk-android 3.0.0-7780-f428a439
bw-ghapp[bot] Jul 15, 2026
664ac67
SDK Update - com.bitwarden:sdk-android 3.0.0-7789-9469b905
bw-ghapp[bot] Jul 15, 2026
b0cceb2
SDK Update - com.bitwarden:sdk-android 3.0.0-7795-fe3cd466
bw-ghapp[bot] Jul 16, 2026
438c642
SDK Update - com.bitwarden:sdk-android 3.0.0-7799-d2bd7a3e
bw-ghapp[bot] Jul 16, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import com.bitwarden.network.model.SyncResponseJson
import com.bitwarden.network.model.UriMatchTypeJson
import com.bitwarden.vault.Attachment
import com.bitwarden.vault.BankAccount
import com.bitwarden.vault.BankAccountListView
import com.bitwarden.vault.Card
import com.bitwarden.vault.CardListView
import com.bitwarden.vault.Cipher
Expand Down Expand Up @@ -844,14 +845,20 @@ fun Cipher.toFailureCipherListView(): CipherListView =

CipherType.SECURE_NOTE -> CipherListViewType.SecureNote
CipherType.CARD -> CipherListViewType.Card(
CardListView(
v1 = CardListView(
brand = null,
),
)

CipherType.IDENTITY -> CipherListViewType.Identity
CipherType.SSH_KEY -> CipherListViewType.SshKey
CipherType.BANK_ACCOUNT -> CipherListViewType.BankAccount
CipherType.BANK_ACCOUNT -> CipherListViewType.BankAccount(
v1 = BankAccountListView(
accountNumber = null,
accountType = null,
),
)

CipherType.DRIVERS_LICENSE -> CipherListViewType.DriversLicense
CipherType.PASSPORT -> CipherListViewType.Passport
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ private val CipherListViewType.iconRes: Int
is CipherListViewType.Card -> BitwardenDrawable.ic_payment_card
CipherListViewType.Identity -> BitwardenDrawable.ic_id_card
CipherListViewType.SshKey -> BitwardenDrawable.ic_ssh_key
CipherListViewType.BankAccount -> BitwardenDrawable.ic_payment_card
is CipherListViewType.BankAccount -> BitwardenDrawable.ic_payment_card
CipherListViewType.DriversLicense -> BitwardenDrawable.ic_note
CipherListViewType.Passport -> BitwardenDrawable.ic_passport
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,7 @@ private fun CipherListView.toIconTestTag(): String =
is CipherListViewType.Card -> "CardCipherIcon"
CipherListViewType.Identity -> "IdentityCipherIcon"
CipherListViewType.SshKey -> "SshKeyCipherIcon"
CipherListViewType.BankAccount -> "BankAccountCipherIcon"
is CipherListViewType.BankAccount -> "BankAccountCipherIcon"
CipherListViewType.DriversLicense -> "LicenseCipherIcon"
CipherListViewType.Passport -> "PassportCipherIcon"
}
Expand Down Expand Up @@ -635,7 +635,7 @@ private val CipherListViewType.iconRes: Int
is CipherListViewType.Card -> BitwardenDrawable.ic_payment_card
CipherListViewType.Identity -> BitwardenDrawable.ic_id_card
CipherListViewType.SshKey -> BitwardenDrawable.ic_ssh_key
CipherListViewType.BankAccount -> BitwardenDrawable.ic_payment_card
is CipherListViewType.BankAccount -> BitwardenDrawable.ic_payment_card
CipherListViewType.DriversLicense -> BitwardenDrawable.ic_note
CipherListViewType.Passport -> BitwardenDrawable.ic_passport
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ private fun CipherListView.toVaultItemOrNull(
hasDecryptionError = hasDecryptionError,
)

CipherListViewType.BankAccount -> VaultState.ViewState.VaultItem.BankAccount(
is CipherListViewType.BankAccount -> VaultState.ViewState.VaultItem.BankAccount(
id = id,
name = name.asText(),
overflowOptions = toOverflowActions(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ fun CipherListViewType.toSdkCipherType(): CipherType =
is CipherListViewType.Login -> CipherType.LOGIN
CipherListViewType.SecureNote -> CipherType.SECURE_NOTE
CipherListViewType.SshKey -> CipherType.SSH_KEY
CipherListViewType.BankAccount -> CipherType.BANK_ACCOUNT
is CipherListViewType.BankAccount -> CipherType.BANK_ACCOUNT
CipherListViewType.DriversLicense -> CipherType.DRIVERS_LICENSE
CipherListViewType.Passport -> CipherType.PASSPORT
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import com.bitwarden.network.model.createMockPasswordHistory
import com.bitwarden.network.model.createMockSecureNote
import com.bitwarden.network.model.createMockSshKey
import com.bitwarden.network.model.createMockUri
import com.bitwarden.vault.BankAccountListView
import com.bitwarden.vault.CipherListViewType
import com.bitwarden.vault.CipherRepromptType
import com.bitwarden.vault.CipherType
Expand Down Expand Up @@ -536,7 +537,15 @@ class VaultSdkCipherExtensionsTest {

val result = cipher.toFailureCipherListView()

assertEquals(CipherListViewType.BankAccount, result.type)
assertEquals(
CipherListViewType.BankAccount(
v1 = BankAccountListView(
accountNumber = null,
accountType = null,
),
),
result.type,
)
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import com.bitwarden.send.SendView
import com.bitwarden.ui.platform.resource.BitwardenDrawable
import com.bitwarden.ui.platform.resource.BitwardenString
import com.bitwarden.ui.util.asText
import com.bitwarden.vault.BankAccountListView
import com.bitwarden.vault.CipherListView
import com.bitwarden.vault.CipherListViewType
import com.bitwarden.vault.CipherRepromptType
Expand Down Expand Up @@ -404,13 +405,23 @@ class SearchTypeDataExtensionsTest {
fun `CipherViews filterAndOrganize should return list with only bank account items`() {
val match1 = createMockCipherListView(
number = 1,
type = CipherListViewType.BankAccount,
type = CipherListViewType.BankAccount(
v1 = BankAccountListView(
accountNumber = null,
accountType = null,
),
),
name = "match1",
)
val match2 = createMockCipherListView(number = 2, name = "match2")
val match3 = createMockCipherListView(
number = 3,
type = CipherListViewType.BankAccount,
type = CipherListViewType.BankAccount(
v1 = BankAccountListView(
accountNumber = null,
accountType = null,
),
),
name = "match3",
)
val ciphers = listOf(match1, match2, match3)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import com.bitwarden.ui.platform.model.TotpData
import com.bitwarden.ui.platform.resource.BitwardenDrawable
import com.bitwarden.ui.platform.resource.BitwardenString
import com.bitwarden.ui.util.asText
import com.bitwarden.vault.BankAccountListView
import com.bitwarden.vault.CipherListViewType
import com.bitwarden.vault.CipherRepromptType
import com.bitwarden.vault.CipherType
Expand Down Expand Up @@ -404,7 +405,12 @@ class VaultItemListingDataExtensionsTest {
val cipherView = createMockCipherListView(
number = 1,
isDeleted = false,
type = CipherListViewType.BankAccount,
type = CipherListViewType.BankAccount(
v1 = BankAccountListView(
accountNumber = null,
accountType = null,
),
),
)

mapOf(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.x8bit.bitwarden.ui.vault.feature.util

import com.bitwarden.ui.platform.components.icon.model.IconData
import com.bitwarden.vault.BankAccountListView
import com.bitwarden.vault.CipherListViewType
import com.bitwarden.vault.CipherType
import com.bitwarden.vault.CopyableCipherFields
Expand Down Expand Up @@ -365,7 +366,12 @@ class CipherListViewExtensionsTest {
fun `toOverflowActions should return all copy actions for a bank account cipher`() {
val cipher = createMockCipherListView(
number = 1,
type = CipherListViewType.BankAccount,
type = CipherListViewType.BankAccount(
v1 = BankAccountListView(
accountNumber = null,
accountType = null,
),
),
id = id,
copyableFields = listOf(
CopyableCipherFields.BANK_ACCOUNT_ACCOUNT_NUMBER,
Expand Down Expand Up @@ -408,7 +414,12 @@ class CipherListViewExtensionsTest {
fun `toOverflowActions should return only available copy actions for a bank account cipher`() {
val cipher = createMockCipherListView(
number = 1,
type = CipherListViewType.BankAccount,
type = CipherListViewType.BankAccount(
v1 = BankAccountListView(
accountNumber = null,
accountType = null,
),
),
id = id,
copyableFields = listOf(
CopyableCipherFields.BANK_ACCOUNT_ACCOUNT_NUMBER,
Expand Down Expand Up @@ -449,7 +460,12 @@ class CipherListViewExtensionsTest {
id = id,
isDeleted = true,
isArchived = true,
type = CipherListViewType.BankAccount,
type = CipherListViewType.BankAccount(
v1 = BankAccountListView(
accountNumber = null,
accountType = null,
),
),
)

val result = cipher.toOverflowActions(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import com.bitwarden.ui.platform.components.icon.model.IconData
import com.bitwarden.ui.platform.resource.BitwardenDrawable
import com.bitwarden.ui.platform.resource.BitwardenString
import com.bitwarden.ui.util.asText
import com.bitwarden.vault.BankAccountListView
import com.bitwarden.vault.CipherListViewType
import com.bitwarden.vault.CipherRepromptType
import com.bitwarden.vault.CipherType
Expand Down Expand Up @@ -1390,19 +1391,34 @@ class VaultDataExtensionsTest {
successes = listOf(
createMockCipherListView(
number = 1,
type = CipherListViewType.BankAccount,
type = CipherListViewType.BankAccount(
v1 = BankAccountListView(
accountNumber = null,
accountType = null,
),
),
favorite = true,
folderId = null,
),
createMockCipherListView(
number = 2,
type = CipherListViewType.BankAccount,
type = CipherListViewType.BankAccount(
v1 = BankAccountListView(
accountNumber = null,
accountType = null,
),
),
reprompt = CipherRepromptType.PASSWORD,
folderId = null,
),
createMockCipherListView(
number = 3,
type = CipherListViewType.BankAccount,
type = CipherListViewType.BankAccount(
v1 = BankAccountListView(
accountNumber = null,
accountType = null,
),
),
folderId = null,
),
),
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ androidxRoom = "2.8.4"
androidxSecurityCrypto = "1.1.0"
androidxSplash = "1.2.0"
androidxWork = "2.11.2"
bitwardenSdk = "3.0.0-7673-101364a4"
bitwardenSdk = "3.0.0-7799-d2bd7a3e"
crashlytics = "3.0.7"
detekt = "1.23.8"
firebaseBom = "34.15.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1007,13 +1007,13 @@ data class SyncResponseJson(
@Serializable
data class SshKey(
@SerialName("publicKey")
val publicKey: String,
val publicKey: String?,

@SerialName("privateKey")
val privateKey: String,

@SerialName("keyFingerprint")
val keyFingerprint: String,
val keyFingerprint: String?,
)

/**
Expand Down
Loading