github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-08-25 17:09:55 -05:00
Code Issues 2.4k Packages Projects Releases 129 Wiki Activity

[BWA-53] Fix: Resolve issue with code copying in search results (#163)

Browse Source
This commit is contained in:
Martini
2024-08-20 09:17:32 -04:00
committed by GitHub
parent bcea5a6b25
commit 524e0941e4
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/search/ItemSearchContent.kt
+2 -2
View File
@@ -38,8 +38,8 @@ fun ItemSearchContent(
alertThresholdSeconds = it.alertThresholdSeconds,
supportingLabel = it.supportingLabel,
startIcon = it.startIcon,
onCopyClick = { searchHandlers.onItemClick(it.id) },
onItemClick = { searchHandlers.onItemClick(it.id) },
onCopyClick = { searchHandlers.onItemClick(it.authCode) },
onItemClick = { searchHandlers.onItemClick(it.authCode) },
)
}
app/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/search/ItemSearchViewModel.kt
+6 -3
View File
@@ -5,6 +5,7 @@ import androidx.lifecycle.viewModelScope
import com.bitwarden.authenticator.R
import com.bitwarden.authenticator.data.authenticator.manager.model.VerificationCodeItem
import com.bitwarden.authenticator.data.authenticator.repository.AuthenticatorRepository
import com.bitwarden.authenticator.data.platform.manager.clipboard.BitwardenClipboardManager
import com.bitwarden.authenticator.data.platform.repository.model.DataState
import com.bitwarden.authenticator.ui.platform.base.BaseViewModel
import com.bitwarden.authenticator.ui.platform.base.util.Text
@@ -25,6 +26,7 @@ import javax.inject.Inject
*/
@HiltViewModel
class ItemSearchViewModel @Inject constructor(
private val clipboardManager: BitwardenClipboardManager,
private val authenticatorRepository: AuthenticatorRepository,
) :
BaseViewModel<ItemSearchState, ItemSearchEvent, ItemSearchAction>(
@@ -59,9 +61,10 @@ class ItemSearchViewModel @Inject constructor(
}
is ItemSearchAction.ItemClick -> {
clipboardManager.setText(action.authCode)
sendEvent(
event = ItemSearchEvent.ShowToast(
message = "Item ${action.itemId} copied to clipboard".asText(),
message = R.string.value_has_been_copied.asText(action.authCode),
),
)
}
@@ -231,7 +234,7 @@ class ItemSearchViewModel @Inject constructor(
private fun VerificationCodeItem.toDisplayItem(): ItemSearchState.DisplayItem =
ItemSearchState.DisplayItem(
id = id,
authCode = "",
authCode = code,
accountName = username ?: "",
issuer = issuer,
periodSeconds = periodSeconds,
@@ -345,7 +348,7 @@ sealed class ItemSearchAction {
/**
* User clicked a row item.
*/
data class ItemClick(val itemId: String) : ItemSearchAction()
data class ItemClick(val authCode: String) : ItemSearchAction()
/**
* Models actions that the [ItemSearchViewModel] itself might send.