github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-05-21 11:56:35 -05:00
Code Issues 1.5k Packages Projects Releases 125 Wiki Activity

Update the Send max access count logic (#557)

Browse Source
This commit is contained in:
David Perez
2024-01-09 20:35:05 -06:00
committed by GitHub
parent 378ff21c3c
commit ffff3221e1
4 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendContent.kt
View File

@@ -228,6 +228,7 @@ private fun AddSendOptions(
value = state.common.maxAccessCount,
onValueChange = addSendHandlers.onMaxAccessCountChange,
isDecrementEnabled = state.common.maxAccessCount != null,
range = 0..Int.MAX_VALUE,
modifier = Modifier
.padding(horizontal = 16.dp),
)

5
app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendViewModel.kt
View File

@@ -261,7 +261,9 @@ class AddSendViewModel @Inject constructor(
}
private fun handleMaxAccessCountChange(action: AddSendAction.MaxAccessCountChange) {
updateCommonContent { it.copy(maxAccessCount = action.value) }
updateCommonContent { common ->
common.copy(maxAccessCount = action.value.takeUnless { it == 0 })
}
}
private inline fun onContent(
@@ -355,7 +357,6 @@ data class AddSendState(
@Parcelize
data class Common(
val name: String,
// Null here means "not set"
val maxAccessCount: Int?,
val passwordInput: String,
val noteInput: String,

23
app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendScreenTest.kt
View File

@@ -306,29 +306,6 @@ class AddSendScreenTest : BaseComposeTest() {
verify { viewModel.trySendAction(AddSendAction.MaxAccessCountChange(2)) }
}
@Test
fun `max access count decrement when set to 1 should do nothing`() =
runTest {
mutableStateFlow.update {
it.copy(
viewState = DEFAULT_VIEW_STATE.copy(
common = DEFAULT_COMMON_STATE.copy(maxAccessCount = 1),
),
)
}
// Expand options section:
composeTestRule
.onNodeWithText("Options")
.performScrollTo()
.performClick()
composeTestRule
.onNodeWithContentDescription("\u2212")
.performScrollTo()
.performClick()
verify(exactly = 0) { viewModel.trySendAction(any()) }
}
@Test
fun `on max access count increment should send MaxAccessCountChange`() = runTest {
// Expand options section:

21
app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendViewModelTest.kt
View File

@@ -287,7 +287,7 @@ class AddSendViewModelTest : BaseViewModelTest() {
}
@Test
fun `MaxAccessCountChange should update maxAccessCount`() = runTest {
fun `MaxAccessCountChange should update maxAccessCount to value when non-zero`() = runTest {
val viewModel = createViewModel()
val expectedViewState = DEFAULT_VIEW_STATE.copy(
common = DEFAULT_COMMON_STATE.copy(maxAccessCount = 5),
@@ -300,6 +300,25 @@ class AddSendViewModelTest : BaseViewModelTest() {
}
}
@Test
fun `MaxAccessCountChange should update maxAccessCount to null when zero`() = runTest {
val initialState = DEFAULT_STATE.copy(
viewState = DEFAULT_VIEW_STATE.copy(
common = DEFAULT_COMMON_STATE.copy(maxAccessCount = 5),
),
)
val expectedViewState = DEFAULT_VIEW_STATE.copy(
common = DEFAULT_COMMON_STATE.copy(maxAccessCount = null),
)
val viewModel = createViewModel(initialState)
viewModel.stateFlow.test {
assertEquals(initialState, awaitItem())
viewModel.trySendAction(AddSendAction.MaxAccessCountChange(0))
assertEquals(initialState.copy(viewState = expectedViewState), awaitItem())
}
}
@Test
fun `TextChange should update text input`() = runTest {
val viewModel = createViewModel()