diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseModeActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseModeActivity.kt index 84397ab7b..c7832033b 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseModeActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseModeActivity.kt @@ -48,10 +48,7 @@ abstract class DatabaseModeActivity : DatabaseActivity() { } fun onLaunchActivitySpecialMode() { - // TODO Verify behavior for Autofill Callback #765 - if (isIntentSender()) { - onValidateSpecialMode() - } else { + if (!isIntentSender()) { EntrySelectionHelper.removeModesFromIntent(intent) EntrySelectionHelper.removeInfoFromIntent(intent) finish() diff --git a/app/src/main/java/com/kunzisoft/keepass/credentialprovider/EntrySelectionHelper.kt b/app/src/main/java/com/kunzisoft/keepass/credentialprovider/EntrySelectionHelper.kt index 1be32b30a..6a78e115e 100644 --- a/app/src/main/java/com/kunzisoft/keepass/credentialprovider/EntrySelectionHelper.kt +++ b/app/src/main/java/com/kunzisoft/keepass/credentialprovider/EntrySelectionHelper.kt @@ -199,8 +199,13 @@ object EntrySelectionHelper { } private fun addTypeModeInIntent(intent: Intent, typeMode: TypeMode) { + // TODO Replace by Intent.addTypeMode intent.putEnumExtra(KEY_TYPE_MODE, typeMode) } + fun Intent.addTypeMode(typeMode: TypeMode): Intent { + this.putEnumExtra(KEY_TYPE_MODE, typeMode) + return this + } fun retrieveTypeModeFromIntent(intent: Intent): TypeMode { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { diff --git a/app/src/main/java/com/kunzisoft/keepass/credentialprovider/activity/PasskeyLauncherActivity.kt b/app/src/main/java/com/kunzisoft/keepass/credentialprovider/activity/PasskeyLauncherActivity.kt index de433806d..365388689 100644 --- a/app/src/main/java/com/kunzisoft/keepass/credentialprovider/activity/PasskeyLauncherActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/credentialprovider/activity/PasskeyLauncherActivity.kt @@ -24,6 +24,7 @@ import android.app.PendingIntent import android.content.Context import android.content.Intent import android.os.Build +import android.os.Bundle import android.util.Log import androidx.activity.result.ActivityResultLauncher import androidx.annotation.RequiresApi @@ -33,8 +34,8 @@ import androidx.credentials.provider.PendingIntentHandler import com.kunzisoft.keepass.activities.FileDatabaseSelectActivity import com.kunzisoft.keepass.activities.GroupActivity import com.kunzisoft.keepass.activities.legacy.DatabaseModeActivity -import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.addSpecialMode +import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.addTypeMode import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.buildActivityResultLauncher import com.kunzisoft.keepass.credentialprovider.SpecialMode import com.kunzisoft.keepass.credentialprovider.TypeMode @@ -66,6 +67,7 @@ class PasskeyLauncherActivity : DatabaseModeActivity() { private var mUsageParameters: PublicKeyCredentialUsageParameters? = null private var mCreationParameters: PublicKeyCredentialCreationParameters? = null private var mPasskey: Passkey? = null + private var mSearchInfo: SearchInfo = SearchInfo() private var mPasskeySelectionActivityResultLauncher: ActivityResultLauncher? = this.buildActivityResultLauncher( @@ -131,24 +133,26 @@ class PasskeyLauncherActivity : DatabaseModeActivity() { return false } + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + mSearchInfo = intent.retrieveSearchInfo() ?: mSearchInfo + } + override fun onDatabaseRetrieved(database: ContextualDatabase?) { super.onDatabaseRetrieved(database) // TODO nodeId Really useful ? checkSecurity(intent, nodeId) - EntrySelectionHelper.retrieveSpecialModeFromIntent(intent).let { specialMode -> - val searchInfo = intent.retrieveSearchInfo() ?: SearchInfo() - when (specialMode) { - SpecialMode.SELECTION -> { - launchSelection(database, searchInfo) - } - SpecialMode.REGISTRATION -> { - launchRegistration(database, searchInfo) - } - else -> { - Log.e(TAG, "Passkey launch mode not supported") - setResult(Activity.RESULT_CANCELED) - finish() - } + when (mSpecialMode) { + SpecialMode.SELECTION -> { + launchSelection(database, mSearchInfo) + } + SpecialMode.REGISTRATION -> { + launchRegistration(database, mSearchInfo) + } + else -> { + Log.e(TAG, "Passkey launch mode not supported") + setResult(Activity.RESULT_CANCELED) + finish() } } } @@ -336,6 +340,7 @@ class PasskeyLauncherActivity : DatabaseModeActivity() { Math.random().toInt(), Intent(context, PasskeyLauncherActivity::class.java).apply { addSpecialMode(specialMode) + addTypeMode(TypeMode.PASSKEY) searchInfo?.let { putExtra(EXTRA_SEARCH_INFO, searchInfo) } diff --git a/app/src/main/java/com/kunzisoft/keepass/credentialprovider/passkey/PasskeyProviderService.kt b/app/src/main/java/com/kunzisoft/keepass/credentialprovider/passkey/PasskeyProviderService.kt index f9740e9dd..034d366ab 100644 --- a/app/src/main/java/com/kunzisoft/keepass/credentialprovider/passkey/PasskeyProviderService.kt +++ b/app/src/main/java/com/kunzisoft/keepass/credentialprovider/passkey/PasskeyProviderService.kt @@ -1,3 +1,22 @@ +/* + * Copyright 2025 Jeremy Jamet / Kunzisoft. + * + * This file is part of KeePassDX. + * + * KeePassDX is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * KeePassDX is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with KeePassDX. If not, see . + * + */ package com.kunzisoft.keepass.credentialprovider.passkey import android.graphics.BlendMode @@ -128,7 +147,7 @@ class PasskeyProviderService : CredentialProviderService() { pendingIntent = usagePendingIntent, beginGetPublicKeyCredentialOption = option, displayName = passkey?.displayName, - isAutoSelectAllowed = false + isAutoSelectAllowed = true ) ) } diff --git a/database/src/main/java/com/kunzisoft/keepass/database/search/SearchHelper.kt b/database/src/main/java/com/kunzisoft/keepass/database/search/SearchHelper.kt index c87a8c07f..3fa4cad21 100644 --- a/database/src/main/java/com/kunzisoft/keepass/database/search/SearchHelper.kt +++ b/database/src/main/java/com/kunzisoft/keepass/database/search/SearchHelper.kt @@ -170,16 +170,27 @@ class SearchHelper { if (checkSearchQuery(hexString, searchParameters)) return true } + if (searchParameters.searchInOTP) { + if(entry.getExtraFields().any { field -> + field.name == OTP_FIELD + && checkSearchQuery(field.protectedValue.stringValue, searchParameters) + }) + return true + } + if (searchParameters.searchInRelyingParty) { + if(entry.getExtraFields().any { field -> + field.name == FIELD_RELYING_PARTY + && checkSearchQuery(field.protectedValue.stringValue, searchParameters) + }) + return true + } if (searchParameters.searchInOther) { - entry.getExtraFields().forEach { field -> - if ( (field.name != OTP_FIELD && field.name != FIELD_RELYING_PARTY) - || (searchParameters.searchInOTP && field.name == OTP_FIELD) - || (searchParameters.searchInRelyingParty && field.name == FIELD_RELYING_PARTY) - ) { - if (checkSearchQuery(field.protectedValue.toString(), searchParameters)) - return true - } - } + if(entry.getExtraFields().any { field -> + field.name != OTP_FIELD + && field.name != FIELD_RELYING_PARTY + && checkSearchQuery(field.protectedValue.toString(), searchParameters) + }) + return true } if (searchParameters.searchInTags) { if (checkSearchQuery(entry.tags.toString(), searchParameters)) diff --git a/database/src/main/java/com/kunzisoft/keepass/database/search/SearchParameters.kt b/database/src/main/java/com/kunzisoft/keepass/database/search/SearchParameters.kt index 2e038b8a4..b913d2585 100644 --- a/database/src/main/java/com/kunzisoft/keepass/database/search/SearchParameters.kt +++ b/database/src/main/java/com/kunzisoft/keepass/database/search/SearchParameters.kt @@ -59,6 +59,7 @@ class SearchParameters() : Parcelable{ searchInExpired = parcel.readByte() != 0.toByte() searchInNotes = parcel.readByte() != 0.toByte() searchInOTP = parcel.readByte() != 0.toByte() + searchInRelyingParty = parcel.readByte() != 0.toByte() searchInOther = parcel.readByte() != 0.toByte() searchInUUIDs = parcel.readByte() != 0.toByte() searchInTags = parcel.readByte() != 0.toByte() @@ -79,6 +80,7 @@ class SearchParameters() : Parcelable{ parcel.writeByte(if (searchInExpired) 1 else 0) parcel.writeByte(if (searchInNotes) 1 else 0) parcel.writeByte(if (searchInOTP) 1 else 0) + parcel.writeByte(if (searchInRelyingParty) 1 else 0) parcel.writeByte(if (searchInOther) 1 else 0) parcel.writeByte(if (searchInUUIDs) 1 else 0) parcel.writeByte(if (searchInTags) 1 else 0) diff --git a/database/src/main/java/com/kunzisoft/keepass/model/SearchInfo.kt b/database/src/main/java/com/kunzisoft/keepass/model/SearchInfo.kt index 094a6977c..827c16006 100644 --- a/database/src/main/java/com/kunzisoft/keepass/model/SearchInfo.kt +++ b/database/src/main/java/com/kunzisoft/keepass/model/SearchInfo.kt @@ -12,6 +12,7 @@ import com.kunzisoft.keepass.utils.writeBooleanCompat class SearchInfo : ObjectNameResource, Parcelable { var manualSelection: Boolean = false + var tag: String? = null var applicationId: String? = null set(value) { field = when { @@ -41,6 +42,7 @@ class SearchInfo : ObjectNameResource, Parcelable { constructor(toCopy: SearchInfo?) { manualSelection = toCopy?.manualSelection ?: manualSelection + tag = toCopy?.tag applicationId = toCopy?.applicationId webDomain = toCopy?.webDomain webScheme = toCopy?.webScheme @@ -50,6 +52,8 @@ class SearchInfo : ObjectNameResource, Parcelable { private constructor(parcel: Parcel) { manualSelection = parcel.readBooleanCompat() + val readTag = parcel.readString() + tag = if (readTag.isNullOrEmpty()) null else readTag val readAppId = parcel.readString() applicationId = if (readAppId.isNullOrEmpty()) null else readAppId val readDomain = parcel.readString() @@ -68,6 +72,7 @@ class SearchInfo : ObjectNameResource, Parcelable { override fun writeToParcel(parcel: Parcel, flags: Int) { parcel.writeBooleanCompat(manualSelection) + parcel.writeString(tag ?: "") parcel.writeString(applicationId ?: "") parcel.writeString(webDomain ?: "") parcel.writeString(webScheme ?: "") @@ -85,7 +90,8 @@ class SearchInfo : ObjectNameResource, Parcelable { } fun containsOnlyNullValues(): Boolean { - return applicationId == null + return tag == null + && applicationId == null && webDomain == null && webScheme == null && relyingParty == null @@ -103,11 +109,12 @@ class SearchInfo : ObjectNameResource, Parcelable { fun buildSearchParameters(): SearchParameters { return SearchParameters().apply { if (isAPasskeySearch()) { - searchQuery = toString() + searchQuery = relyingParty!! searchInTitles = false searchInUsernames = false searchInPasswords = false searchInUrls = false + searchByDomain = false searchInNotes = false searchInOTP = false searchInOther = false @@ -143,6 +150,7 @@ class SearchInfo : ObjectNameResource, Parcelable { if (other !is SearchInfo) return false if (manualSelection != other.manualSelection) return false + if (tag != other.tag) return false if (applicationId != other.applicationId) return false if (webDomain != other.webDomain) return false if (webScheme != other.webScheme) return false @@ -154,6 +162,7 @@ class SearchInfo : ObjectNameResource, Parcelable { override fun hashCode(): Int { var result = manualSelection.hashCode() + result = 31 * result + (tag?.hashCode() ?: 0) result = 31 * result + (applicationId?.hashCode() ?: 0) result = 31 * result + (webDomain?.hashCode() ?: 0) result = 31 * result + (webScheme?.hashCode() ?: 0) @@ -163,7 +172,7 @@ class SearchInfo : ObjectNameResource, Parcelable { } override fun toString(): String { - return otpString ?: webDomain ?: applicationId ?: relyingParty ?: "" + return otpString ?: webDomain ?: applicationId ?: relyingParty ?: tag ?: "" } companion object {