github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-06-05 22:15:09 -05:00
Code Issues 2.1k Packages Projects Releases 127 Wiki Activity

BIT-1641: Use correct matching logic for in-app autofill (#860)

Browse Source
This commit is contained in:
Brian Yencho
2024-01-29 21:22:37 -06:00
committed by Álison Fernandes
parent a317174db7
commit b1cc9a1dd6
2 changed files with 69 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt
View File

@@ -8,8 +8,8 @@ import com.x8bit.bitwarden.data.auth.repository.AuthRepository
import com.x8bit.bitwarden.data.auth.repository.model.ValidatePasswordResult
import com.x8bit.bitwarden.data.autofill.manager.AutofillSelectionManager
import com.x8bit.bitwarden.data.autofill.model.AutofillSelectionData
import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage
import com.x8bit.bitwarden.data.platform.manager.SpecialCircumstanceManager
import com.x8bit.bitwarden.data.platform.manager.ciphermatching.CipherMatchingManager
import com.x8bit.bitwarden.data.platform.manager.clipboard.BitwardenClipboardManager
import com.x8bit.bitwarden.data.platform.manager.model.SpecialCircumstance
import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository
@@ -67,6 +67,7 @@ class VaultItemListingViewModel @Inject constructor(
private val environmentRepository: EnvironmentRepository,
private val settingsRepository: SettingsRepository,
private val autofillSelectionManager: AutofillSelectionManager,
private val cipherMatchingManager: CipherMatchingManager,
private val specialCircumstanceManager: SpecialCircumstanceManager,
) : BaseViewModel<VaultItemListingState, VaultItemListingEvent, VaultItemListingsAction>(
initialState = run {
@@ -665,30 +666,20 @@ class VaultItemListingViewModel @Inject constructor(
?.cipherViewList
?.firstOrNull { it.id == cipherId }
// TODO: Update to use correct logic (BIT-1641)
/**
* Takes the given vault data and filters it for autofill if necessary.
*/
@OmitFromCoverage
private suspend fun DataState<VaultData>.filterForAutofillIfNecessary(): DataState<VaultData> {
val matchingUri = state
val matchUri = state
.autofillSelectionData
?.uri
?.toHostOrPathOrNull()
?: return this
return this.map { vaultData ->
vaultData.copy(
cipherViewList = vaultData
.cipherViewList
.filter { cipherView ->
cipherView
.login
?.uris
.orEmpty()
.any {
matchingUri in it.uri?.toHostOrPathOrNull().orEmpty()
}
},
cipherViewList = cipherMatchingManager.filterCiphersForMatches(
ciphers = vaultData.cipherViewList,
matchUri = matchUri,
),
)
}
}