bitwarden/mobile
1
0
Fork 0
mirror of https://github.com/bitwarden/mobile synced 2025-12-22 19:23:58 +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

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

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

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

@@ -155,7 +155,10 @@ namespace Bit.App.Pages
if(key.Key.SequenceEqual(_cryptoService.Key.Key)) if(key.Key.SequenceEqual(_cryptoService.Key.Key))
{ {
_appSettingsService.Locked = false; _appSettingsService.Locked = false;
await Navigation.PopModalAsync(); if(Navigation.ModalStack.Count > 0)
{
await Navigation.PopModalAsync();
}
} }
else else
{ {

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

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