mirror of
https://github.com/Kunzisoft/KeePassDX.git
synced 2025-12-04 15:49:33 +01:00
fix: Remove Passkey error to be able to select search elements #2282
This commit is contained in:
@@ -73,7 +73,6 @@ import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.retrieveSea
|
|||||||
import com.kunzisoft.keepass.credentialprovider.SpecialMode
|
import com.kunzisoft.keepass.credentialprovider.SpecialMode
|
||||||
import com.kunzisoft.keepass.credentialprovider.TypeMode
|
import com.kunzisoft.keepass.credentialprovider.TypeMode
|
||||||
import com.kunzisoft.keepass.credentialprovider.magikeyboard.MagikeyboardService
|
import com.kunzisoft.keepass.credentialprovider.magikeyboard.MagikeyboardService
|
||||||
import com.kunzisoft.keepass.credentialprovider.passkey.util.PasskeyHelper.buildPasskeyErrorAndSetResult
|
|
||||||
import com.kunzisoft.keepass.credentialprovider.passkey.util.PasskeyHelper.buildPasskeyResponseAndSetResult
|
import com.kunzisoft.keepass.credentialprovider.passkey.util.PasskeyHelper.buildPasskeyResponseAndSetResult
|
||||||
import com.kunzisoft.keepass.database.ContextualDatabase
|
import com.kunzisoft.keepass.database.ContextualDatabase
|
||||||
import com.kunzisoft.keepass.database.MainCredential
|
import com.kunzisoft.keepass.database.MainCredential
|
||||||
@@ -726,8 +725,6 @@ class GroupActivity : DatabaseLockActivity(),
|
|||||||
// To get the form filling search as temp search
|
// To get the form filling search as temp search
|
||||||
val searchInfo: SearchInfo? = intent.retrieveSearchInfo()
|
val searchInfo: SearchInfo? = intent.retrieveSearchInfo()
|
||||||
val autoSearch = intent.getBooleanExtra(AUTO_SEARCH_KEY, false)
|
val autoSearch = intent.getBooleanExtra(AUTO_SEARCH_KEY, false)
|
||||||
// Directly return an error if credentialId is search because it's not found
|
|
||||||
errorIfNeededForPasskeySelection(searchInfo)
|
|
||||||
// Get search query
|
// Get search query
|
||||||
if (searchInfo != null && autoSearch) {
|
if (searchInfo != null && autoSearch) {
|
||||||
mAutoSearch = true
|
mAutoSearch = true
|
||||||
@@ -949,21 +946,6 @@ class GroupActivity : DatabaseLockActivity(),
|
|||||||
onValidateSpecialMode()
|
onValidateSpecialMode()
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun errorIfNeededForPasskeySelection(searchInfo: SearchInfo?) {
|
|
||||||
if (mTypeMode == TypeMode.PASSKEY && searchInfo?.credentialIds.isNullOrEmpty().not()) {
|
|
||||||
removeSearch()
|
|
||||||
// Build response with the entry selected
|
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
|
|
||||||
buildPasskeyErrorAndSetResult(
|
|
||||||
resources = resources,
|
|
||||||
relyingPartyId = searchInfo.relyingParty,
|
|
||||||
credentialIds = searchInfo.credentialIds
|
|
||||||
)
|
|
||||||
}
|
|
||||||
onValidateSpecialMode()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun entrySelectedForRegistration(
|
private fun entrySelectedForRegistration(
|
||||||
database: ContextualDatabase,
|
database: ContextualDatabase,
|
||||||
entry: Entry,
|
entry: Entry,
|
||||||
|
|||||||
Reference in New Issue
Block a user