qwe/keepass2android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix issue with selecting one of multiple entries for autofill as reported on #1399; also another attempt to work-around the buggy Firefox Autofill

Browse Source
This commit is contained in:
Philipp Crocoll
2021-01-13 21:36:56 +01:00
parent c46b7be051
commit cd1877d34d
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/keepass2android/services/AutofillBase/AutofillServiceBase.cs
View File

@@ -33,7 +33,10 @@ namespace keepass2android.services.AutofillBase
{
//use a lock to avoid returning a response several times in buggy Firefox during one connection: this avoids flickering
//and disappearing of the autofill prompt.
private AtomicBoolean _lock = new AtomicBoolean();
//Instead of using a boolean lock, we use a "time-out lock" which is cleared after a few seconds
private DateTime _lockTime = DateTime.MinValue;
private TimeSpan _lockTimeout = TimeSpan.FromSeconds(2);
public AutofillServiceBase()
{
@@ -90,9 +93,10 @@ namespace keepass2android.services.AutofillBase
CommonUtil.logd( "onFillRequest " + (isManual ? "manual" : "auto"));
var structure = request.FillContexts.Last().Structure;
if (!_lock.Get())
if (_lockTime + _lockTimeout < DateTime.Now)
{
_lock.Set(true);
_lockTime = DateTime.Now;
//TODO support package signature verification as soon as this is supported in Keepass storage
@@ -103,7 +107,7 @@ namespace keepass2android.services.AutofillBase
cancellationSignal.CancelEvent += (sender, e) =>
{
Kp2aLog.Log("Cancel autofill not implemented yet.");
_lock.Set(false);
_lockTime = DateTime.MinValue;
};
// Parse AutoFill data in Activity
StructureParser.AutofillTargetId query = null;
@@ -369,7 +373,7 @@ namespace keepass2android.services.AutofillBase
public override void OnDisconnected()
{
_lock.Set(false);
_lockTime = DateTime.MinValue;
CommonUtil.logd( "onDisconnected");
}

2
src/keepass2android/services/Kp2aAutofill/Kp2aAutofillService.cs
View File

@@ -41,7 +41,7 @@ namespace keepass2android.services
.Select(e => new PwEntryOutput(e, App.Kp2a.FindDatabaseForElement(e)))
.ToList();
if ((App.Kp2a.LastOpenedEntry?.SearchUrl == query) && !foundEntries.Any(e => e.Uuid.Equals(App.Kp2a.LastOpenedEntry?.Uuid)))
if (App.Kp2a.LastOpenedEntry?.SearchUrl == query)
{
foundEntries.Clear();
foundEntries.Add(App.Kp2a.LastOpenedEntry);