mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-12-24 01:48:25 +03:00
Code Issues Projects Releases Packages 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
Show stats 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)
{
_appSettings.Locked = false;
await Navigation.PopModalAsync();
if(Navigation.ModalStack.Count > 0)
{
await Navigation.PopModalAsync();
}
}
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))
{
_appSettingsService.Locked = false;
await Navigation.PopModalAsync();
if(Navigation.ModalStack.Count > 0)
{
await Navigation.PopModalAsync();
}
}
else
{

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

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