bitwarden/mobile
1
0
Fork 0
mirror of https://github.com/bitwarden/mobile synced 2025-12-15 07:43:37 +00:00
Code Issues Releases Wiki Activity

check modal stack before popping

Browse Source
This commit is contained in:
Kyle Spearrin
2018-02-01 23:38:18 -05:00
parent d84d11d064
commit 8cdb27fe43
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/App/Pages/Lock/LockFingerprintPage.cs
View File

@@ -119,8 +119,11 @@ namespace Bit.App.Pages
if(result.Authenticated) if(result.Authenticated)
{ {
_appSettings.Locked = false; _appSettings.Locked = false;
if(Navigation.ModalStack.Count > 0)
{
await Navigation.PopModalAsync(); await Navigation.PopModalAsync();
} }
}
else if(result.Status == FingerprintAuthenticationResultStatus.FallbackRequested) else if(result.Status == FingerprintAuthenticationResultStatus.FallbackRequested)
{ {
AuthService.LogOut(); AuthService.LogOut();

3
src/App/Pages/Lock/LockPasswordPage.cs
View File

@@ -155,8 +155,11 @@ namespace Bit.App.Pages
if(key.Key.SequenceEqual(_cryptoService.Key.Key)) if(key.Key.SequenceEqual(_cryptoService.Key.Key))
{ {
_appSettingsService.Locked = false; _appSettingsService.Locked = false;
if(Navigation.ModalStack.Count > 0)
{
await Navigation.PopModalAsync(); await Navigation.PopModalAsync();
} }
}
else else
{ {
// TODO: keep track of invalid attempts and logout? // TODO: keep track of invalid attempts and logout?

3
src/App/Pages/Lock/LockPinPage.cs
View File

@@ -126,8 +126,11 @@ namespace Bit.App.Pages
_appSettingsService.Locked = false; _appSettingsService.Locked = false;
_appSettingsService.FailedPinAttempts = 0; _appSettingsService.FailedPinAttempts = 0;
PinControl.Entry.Unfocus(); PinControl.Entry.Unfocus();
if(Navigation.ModalStack.Count > 0)
{
await Navigation.PopModalAsync(); await Navigation.PopModalAsync();
} }
}
else else
{ {
_appSettingsService.FailedPinAttempts++; _appSettingsService.FailedPinAttempts++;