devol
/
Bitwarden-app-android-iphone-ios
mirror of https://github.com/bitwarden/mobile
1
0
Fork 0
Code Issues 2 Releases Wiki Activity

only prompt fingerprint if set

This commit is contained in:
Kyle Spearrin 2019-06-07 10:12:11 -04:00
parent 54141f77d6
commit 060e1a822f
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/App/Pages/Accounts/LockPage.xaml.cs
View File

@ -47,11 +47,14 @@ namespace Bit.App.Pages
public async Task PromptFingerprintAfterResumeAsync()
{
await Task.Delay(500);
if(!_promptedAfterResume)
if(_vm.FingerprintLock)
{
_promptedAfterResume = true;
await _vm?.PromptFingerprintAsync();
await Task.Delay(500);
if(!_promptedAfterResume)
{
_promptedAfterResume = true;
await _vm?.PromptFingerprintAsync();
}
}
}

26
src/App/Pages/Accounts/LockPageViewModel.cs
View File

@ -250,19 +250,23 @@ namespace Bit.App.Pages
public async Task PromptFingerprintAsync()
{
if(!FingerprintLock)
{
return;
}
var success = await _platformUtilsService.AuthenticateFingerprintAsync(null,
PinLock ? AppResources.PIN : AppResources.MasterPassword, () =>
PinLock ? AppResources.PIN : AppResources.MasterPassword, () =>
{
var page = Page as LockPage;
if(PinLock)
{
var page = Page as LockPage;
if(PinLock)
{
page.PinEntry.Focus();
}
else
{
page.MasterPasswordEntry.Focus();
}
});
page.PinEntry.Focus();
}
else
{
page.MasterPasswordEntry.Focus();
}
});
_lockService.FingerprintLocked = !success;
if(success)
{