mirror of
https://github.com/Kunzisoft/KeePassDX.git
synced 2025-12-04 15:49:33 +01:00
Merge branch 'develop' into feature/Autofill_Save
This commit is contained in:
@@ -32,6 +32,7 @@ import com.kunzisoft.keepass.database.element.Database
|
||||
import com.kunzisoft.keepass.database.search.SearchHelper
|
||||
import com.kunzisoft.keepass.model.SearchInfo
|
||||
import com.kunzisoft.keepass.settings.PreferencesUtil
|
||||
import java.util.concurrent.atomic.AtomicBoolean
|
||||
|
||||
@RequiresApi(api = Build.VERSION_CODES.O)
|
||||
class KeeAutofillService : AutofillService() {
|
||||
@@ -39,6 +40,7 @@ class KeeAutofillService : AutofillService() {
|
||||
var applicationIdBlocklist: Set<String>? = null
|
||||
var webDomainBlocklist: Set<String>? = null
|
||||
var askToSaveData: Boolean = false
|
||||
private var mLock = AtomicBoolean()
|
||||
|
||||
override fun onCreate() {
|
||||
super.onCreate()
|
||||
@@ -54,6 +56,9 @@ class KeeAutofillService : AutofillService() {
|
||||
|
||||
cancellationSignal.setOnCancelListener { Log.w(TAG, "Cancel autofill.") }
|
||||
|
||||
// Lock
|
||||
if (!mLock.get()) {
|
||||
mLock.set(true)
|
||||
// Check user's settings for authenticating Responses and Datasets.
|
||||
val latestStructure = request.fillContexts.last().structure
|
||||
StructureParser(latestStructure).parse()?.let { parseResult ->
|
||||
@@ -90,6 +95,7 @@ class KeeAutofillService : AutofillService() {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun showUIForEntrySelection(parseResult: StructureParser.Result,
|
||||
searchInfo: SearchInfo,
|
||||
@@ -161,6 +167,7 @@ class KeeAutofillService : AutofillService() {
|
||||
}
|
||||
|
||||
override fun onDisconnected() {
|
||||
mLock.set(false)
|
||||
Log.d(TAG, "onDisconnected")
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user