mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-10-31 15:15:34 +03:00
Code Issues Projects Releases Packages Wiki Activity

BIT-1437: Implement remaining overflow options (#585)

Browse source
This commit is contained in:
David Perez 2024-01-11 21:53:10 -06:00 committed by Álison Fernandes
parent ee688b79e7
commit b29af03b27
2 changed files with 51 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,6 +7,7 @@ import com.bitwarden.core.SendView
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.data.auth.repository.AuthRepository
import com.x8bit.bitwarden.data.auth.repository.model.UserState
import com.x8bit.bitwarden.data.platform.manager.clipboard.BitwardenClipboardManager
import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository
import com.x8bit.bitwarden.data.platform.repository.model.DataState
import com.x8bit.bitwarden.data.platform.repository.util.baseWebSendUrl
@ -47,6 +48,7 @@ class AddSendViewModel @Inject constructor(
savedStateHandle: SavedStateHandle,
authRepo: AuthRepository,
private val clock: Clock,
private val clipboardManager: BitwardenClipboardManager,
private val environmentRepo: EnvironmentRepository,
private val vaultRepo: VaultRepository,
) : BaseViewModel<AddSendState, AddSendEvent, AddSendAction>(
@ -335,8 +337,9 @@ class AddSendViewModel @Inject constructor(
}
private fun handleCopyLinkClick() {
// TODO Add copy link support (BIT-1435)
sendEvent(AddSendEvent.ShowToast("Not yet implemented".asText()))
onContent {
it.common.sendUrl?.let { sendUrl -> clipboardManager.setText(text = sendUrl) }
}
}
private fun handleDeleteClick() {
@ -368,8 +371,11 @@ class AddSendViewModel @Inject constructor(
}
private fun handleShareLinkClick() {
// TODO Add share link support (BIT-1435)
sendEvent(AddSendEvent.ShowToast("Not yet implemented".asText()))
onContent {
it.common.sendUrl?.let { sendUrl ->
sendEvent(AddSendEvent.ShowShareSheet(sendUrl))
}
}
}
private fun handlePasswordChange(action: AddSendAction.PasswordChange) {

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

@ -6,6 +6,7 @@ import com.bitwarden.core.SendView
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.data.auth.repository.AuthRepository
import com.x8bit.bitwarden.data.auth.repository.model.UserState
import com.x8bit.bitwarden.data.platform.manager.clipboard.BitwardenClipboardManager
import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository
import com.x8bit.bitwarden.data.platform.repository.model.DataState
import com.x8bit.bitwarden.data.platform.repository.model.Environment
@ -24,9 +25,12 @@ import com.x8bit.bitwarden.ui.tools.feature.send.util.toSendUrl
import io.mockk.coEvery
import io.mockk.coVerify
import io.mockk.every
import io.mockk.just
import io.mockk.mockk
import io.mockk.mockkStatic
import io.mockk.runs
import io.mockk.unmockkStatic
import io.mockk.verify
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.test.runTest
import org.junit.jupiter.api.AfterEach
@ -45,6 +49,9 @@ class AddSendViewModelTest : BaseViewModelTest() {
Instant.parse("2023-10-27T12:00:00Z"),
ZoneOffset.UTC,
)
private val clipboardManager: BitwardenClipboardManager = mockk {
every { setText(any<String>()) } just runs
}
private val mutableUserStateFlow = MutableStateFlow<UserState?>(DEFAULT_USER_STATE)
private val authRepository: AuthRepository = mockk {
every { userStateFlow } returns mutableUserStateFlow
@ -269,15 +276,28 @@ class AddSendViewModelTest : BaseViewModelTest() {
}
@Test
fun `CopyLinkClick should send ShowToast`() = runTest {
fun `CopyLinkClick with nonnull sendUrl should copy to clipboard`() {
val sendUrl = "www.test.com/send-stuff"
val viewState = DEFAULT_VIEW_STATE.copy(
common = DEFAULT_COMMON_STATE.copy(sendUrl = sendUrl),
)
val mockSendView = createMockSendView(number = 1)
every {
mockSendView.toViewState(clock = clock, baseWebSendUrl = DEFAULT_ENVIRONMENT_URL)
} returns viewState
mutableSendDataStateFlow.value = DataState.Loaded(mockSendView)
val viewModel = createViewModel(
state = DEFAULT_STATE.copy(addSendType = AddSendType.EditItem("sendId")),
state = DEFAULT_STATE.copy(
addSendType = AddSendType.EditItem("sendId"),
viewState = viewState,
),
addSendType = AddSendType.EditItem("sendId"),
)
viewModel.eventFlow.test {
viewModel.trySendAction(AddSendAction.CopyLinkClick)
assertEquals(AddSendEvent.ShowToast("Not yet implemented".asText()), awaitItem())
viewModel.trySendAction(AddSendAction.CopyLinkClick)
verify(exactly = 1) {
clipboardManager.setText(sendUrl)
}
}
@ -460,15 +480,27 @@ class AddSendViewModelTest : BaseViewModelTest() {
}
@Test
fun `ShareLinkClick should send ShowToast`() = runTest {
fun `ShareLinkClick with nonnull sendUrl should launch share sheet`() = runTest {
val sendUrl = "www.test.com/send-stuff"
val viewState = DEFAULT_VIEW_STATE.copy(
common = DEFAULT_COMMON_STATE.copy(sendUrl = sendUrl),
)
val mockSendView = createMockSendView(number = 1)
every {
mockSendView.toViewState(clock = clock, baseWebSendUrl = DEFAULT_ENVIRONMENT_URL)
} returns viewState
mutableSendDataStateFlow.value = DataState.Loaded(mockSendView)
val viewModel = createViewModel(
state = DEFAULT_STATE.copy(addSendType = AddSendType.EditItem("sendId")),
state = DEFAULT_STATE.copy(
addSendType = AddSendType.EditItem("sendId"),
viewState = viewState,
),
addSendType = AddSendType.EditItem("sendId"),
)
viewModel.eventFlow.test {
viewModel.trySendAction(AddSendAction.ShareLinkClick)
assertEquals(AddSendEvent.ShowToast("Not yet implemented".asText()), awaitItem())
assertEquals(AddSendEvent.ShowShareSheet(sendUrl), awaitItem())
}
}
@ -738,6 +770,7 @@ class AddSendViewModelTest : BaseViewModelTest() {
authRepo = authRepository,
environmentRepo = environmentRepository,
clock = clock,
clipboardManager = clipboardManager,
vaultRepo = vaultRepository,
)