mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-12-26 02:48:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

lock screen drawing & 2FA entry bugfixes (#910)

Browse source 
* lock screen drawing & 2FA entry bugfixes

* cleanup whitespace
This commit is contained in:
Matt Portune 2020-05-20 09:09:28 -04:00 committed by GitHub
parent 4c65daa995
commit 4576f378cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/App/App.xaml.cs
View file

@ -234,13 +234,6 @@ namespace Bit.App
SyncIfNeeded(); SyncIfNeeded();
if (Current.MainPage is NavigationPage navPage && navPage.CurrentPage is LockPage lockPage) if (Current.MainPage is NavigationPage navPage && navPage.CurrentPage is LockPage lockPage)
{ {
if (Device.RuntimePlatform == Device.Android)
{
// Workaround for https://github.com/xamarin/Xamarin.Forms/issues/7478
await Task.Delay(100);
Current.MainPage = new NavigationPage(lockPage);
// End workaround
}
await lockPage.PromptFingerprintAfterResumeAsync(); await lockPage.PromptFingerprintAfterResumeAsync();
} }
} }

20
src/App/Pages/Accounts/TwoFactorPage.xaml.cs
View file

@ -82,19 +82,19 @@ namespace Bit.App.Pages
} }
}); });
if (!_inited) await LoadOnAppearedAsync(_scrollView, true, () =>
{ {
_inited = true; if (!_inited)
await LoadOnAppearedAsync(_scrollView, true, () =>
{ {
_inited = true;
_vm.Init(); _vm.Init();
if (_vm.TotpMethod) }
{ if (_vm.TotpMethod)
RequestFocus(_totpEntry); {
} RequestFocus(_totpEntry);
return Task.FromResult(0); }
}); return Task.FromResult(0);
} });
} }
protected override void OnDisappearing() protected override void OnDisappearing()