bitwarden/android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-04-27 22:16:40 -05:00
Code Issues Packages Projects Releases 169 Wiki Activity

chore: Update AttachmentsState to use immutable list (#6741)

Browse Source
This commit is contained in:
David Perez
2026-03-30 14:06:04 -05:00
committed by GitHub
parent 0871a2a33d
commit 6eeab656d1
5 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/attachments/AttachmentsViewModel.kt
View File

@@ -20,6 +20,7 @@ import com.x8bit.bitwarden.data.vault.repository.model.CreateAttachmentResult
import com.x8bit.bitwarden.data.vault.repository.model.DeleteAttachmentResult
import com.x8bit.bitwarden.ui.vault.feature.attachments.util.toViewState
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.collections.immutable.ImmutableList
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.onEach
@@ -389,7 +390,7 @@ data class AttachmentsState(
data class Content(
@IgnoredOnParcel
val originalCipher: CipherView? = null,
val attachments: List<AttachmentItem>,
val attachments: ImmutableList<AttachmentItem>,
val newAttachment: NewAttachment?,
) : ViewState()
}

4
app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/attachments/util/CipherViewExtensions.kt
View File

@@ -2,6 +2,7 @@ package com.x8bit.bitwarden.ui.vault.feature.attachments.util
import com.bitwarden.vault.CipherView
import com.x8bit.bitwarden.ui.vault.feature.attachments.AttachmentsState
import kotlinx.collections.immutable.toImmutableList
/**
* Converts the [CipherView] into a [AttachmentsState.ViewState.Content].
@@ -19,6 +20,7 @@ fun CipherView.toViewState(): AttachmentsState.ViewState.Content =
title = it.fileName.orEmpty(),
displaySize = it.sizeName.orEmpty(),
)
},
}
.toImmutableList(),
newAttachment = null,
)

5
app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/attachments/AttachmentsScreenTest.kt
View File

@@ -24,6 +24,7 @@ import io.mockk.just
import io.mockk.mockk
import io.mockk.runs
import io.mockk.verify
import kotlinx.collections.immutable.persistentListOf
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.update
import org.junit.Assert.assertTrue
@@ -264,14 +265,14 @@ private val DEFAULT_STATE: AttachmentsState = AttachmentsState(
private val DEFAULT_CONTENT_WITHOUT_ATTACHMENTS: AttachmentsState.ViewState.Content =
AttachmentsState.ViewState.Content(
originalCipher = createMockCipherView(number = 1),
attachments = emptyList(),
attachments = persistentListOf(),
newAttachment = null,
)
private val DEFAULT_CONTENT_WITH_ATTACHMENTS: AttachmentsState.ViewState.Content =
AttachmentsState.ViewState.Content(
originalCipher = createMockCipherView(number = 1),
attachments = listOf(
attachments = persistentListOf(
AttachmentsState.AttachmentItem(
id = "cipherId-1234",
title = "cool_file.png",

3
app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/attachments/AttachmentsViewModelTest.kt
View File

@@ -27,6 +27,7 @@ import io.mockk.every
import io.mockk.mockk
import io.mockk.mockkStatic
import io.mockk.unmockkStatic
import kotlinx.collections.immutable.persistentListOf
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.test.runTest
import org.junit.jupiter.api.AfterEach
@@ -750,7 +751,7 @@ private val DEFAULT_ATTACHMENT_ITEM: AttachmentsState.AttachmentItem =
private val DEFAULT_CONTENT_WITH_ATTACHMENTS: AttachmentsState.ViewState.Content =
AttachmentsState.ViewState.Content(
originalCipher = createMockCipherView(number = 1),
attachments = listOf(DEFAULT_ATTACHMENT_ITEM),
attachments = persistentListOf(DEFAULT_ATTACHMENT_ITEM),
newAttachment = null,
)

7
app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/attachments/util/CipherViewExtensionsTest.kt
View File

@@ -3,6 +3,7 @@ package com.x8bit.bitwarden.ui.vault.feature.attachments.util
import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockAttachmentView
import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCipherView
import com.x8bit.bitwarden.ui.vault.feature.attachments.AttachmentsState
import kotlinx.collections.immutable.persistentListOf
import org.junit.Test
import org.junit.jupiter.api.Assertions.assertEquals
@@ -17,7 +18,7 @@ class CipherViewExtensionsTest {
assertEquals(
AttachmentsState.ViewState.Content(
originalCipher = cipherView,
attachments = listOf(
attachments = persistentListOf(
AttachmentsState.AttachmentItem(
id = "mockId-1",
title = "mockFileName-1",
@@ -41,7 +42,7 @@ class CipherViewExtensionsTest {
assertEquals(
AttachmentsState.ViewState.Content(
originalCipher = cipherView,
attachments = emptyList(),
attachments = persistentListOf(),
newAttachment = null,
),
result,
@@ -63,7 +64,7 @@ class CipherViewExtensionsTest {
assertEquals(
AttachmentsState.ViewState.Content(
originalCipher = cipherView,
attachments = emptyList(),
attachments = persistentListOf(),
newAttachment = null,
),
result,