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

reset cancellation signal when cancelled. might fix https://github.com/PhilippC/keepass2android/issues/560 (cannot reproduce, so user must test)

Browse Source
This commit is contained in:
Philipp Crocoll
2019-02-05 10:04:10 +01:00
parent 2df46b6647
commit 857d6f9008
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/keepass2android/FingerprintModule.cs
View File

@@ -194,7 +194,12 @@ namespace keepass2android
return;
Kp2aLog.Log("FP: StartListening ");
_cancellationSignal = new CancellationSignal();
var thisSignal = new CancellationSignal();
_cancellationSignal = thisSignal;
_cancellationSignal.CancelEvent += (sender, args) =>
{
if (_cancellationSignal == thisSignal) _cancellationSignal = null;
};
_selfCancelled = false;
_callback = callback;
_fingerprintManager.Authenticate(_cryptoObject, _cancellationSignal, 0 /* flags */, this, null);
@@ -205,18 +210,18 @@ namespace keepass2android
{
if (_cancellationSignal != null)
{
Kp2aLog.Log("FP: StopListening ");
_selfCancelled = true;
Kp2aLog.Log("FP: StopListening ");
_selfCancelled = true;
try
{
_cancellationSignal.Cancel();
}
}
catch (System.ObjectDisposedException e)
{
Kp2aLog.LogUnexpectedError(e);
}
_cancellationSignal = null;
}
_cancellationSignal = null;
}
}
public string Encrypt(string textToEncrypt)