mirror of
https://github.com/bitwarden/mobile
synced 2026-02-27 18:03:48 +00:00
enable context loading and vm init
This commit is contained in:
@@ -9,6 +9,10 @@
|
||||
x:DataType="authenticator:AuthenticatorPageViewModel"
|
||||
Title="{Binding PageTitle}">
|
||||
|
||||
<ContentPage.BindingContext>
|
||||
<authenticator:AuthenticatorPageViewModel />
|
||||
</ContentPage.BindingContext>
|
||||
|
||||
<StackLayout>
|
||||
<RefreshView
|
||||
IsVisible="{Binding ShowList}"
|
||||
|
||||
@@ -23,13 +23,13 @@ namespace Bit.App.Pages.Authenticator
|
||||
|
||||
public AuthenticatorPage(bool fromTabPage, Action<string> selectAction = null, TabsPage tabsPage = null)
|
||||
{
|
||||
//_tabsPage = tabsPage;
|
||||
_tabsPage = tabsPage;
|
||||
InitializeComponent();
|
||||
//_broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
|
||||
_broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
|
||||
_vm = BindingContext as AuthenticatorPageViewModel;
|
||||
//_vm.Page = this;
|
||||
//_fromTabPage = fromTabPage;
|
||||
//_selectAction = selectAction;
|
||||
_vm.Page = this;
|
||||
_fromTabPage = fromTabPage;
|
||||
_selectAction = selectAction;
|
||||
//var isIos = Device.RuntimePlatform == Device.iOS;
|
||||
//if (selectAction != null)
|
||||
//{
|
||||
@@ -64,20 +64,20 @@ namespace Bit.App.Pages.Authenticator
|
||||
protected async override void OnAppearing()
|
||||
{
|
||||
base.OnAppearing();
|
||||
//if (!_fromTabPage)
|
||||
//{
|
||||
// await InitAsync();
|
||||
//}
|
||||
//_broadcasterService.Subscribe(nameof(GeneratorPage), async (message) =>
|
||||
//{
|
||||
// if (message.Command == "updatedTheme")
|
||||
// {
|
||||
// Device.BeginInvokeOnMainThread(() =>
|
||||
// {
|
||||
// //_vm.RedrawPassword();
|
||||
// });
|
||||
// }
|
||||
//});
|
||||
if (!_fromTabPage)
|
||||
{
|
||||
await InitAsync();
|
||||
}
|
||||
_broadcasterService.Subscribe(nameof(GeneratorPage), async (message) =>
|
||||
{
|
||||
if (message.Command == "updatedTheme")
|
||||
{
|
||||
Device.BeginInvokeOnMainThread(() =>
|
||||
{
|
||||
//_vm.RedrawPassword();
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
protected override void OnDisappearing()
|
||||
|
||||
@@ -13,7 +13,7 @@ namespace Bit.App.Pages.Authenticator
|
||||
private readonly IClipboardService _clipboardService;
|
||||
private bool _showList = true;
|
||||
private bool _refreshing;
|
||||
private readonly IUserService _userService;
|
||||
private readonly IStateService _stateService;
|
||||
private readonly IVaultTimeoutService _vaultTimeoutService;
|
||||
|
||||
#endregion
|
||||
@@ -22,7 +22,7 @@ namespace Bit.App.Pages.Authenticator
|
||||
|
||||
public AuthenticatorPageViewModel()
|
||||
{
|
||||
_userService = ServiceContainer.Resolve<IUserService>("userService");
|
||||
_stateService = ServiceContainer.Resolve<IStateService>("stateService");
|
||||
_vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>("vaultTimeoutService");
|
||||
}
|
||||
|
||||
@@ -30,7 +30,7 @@ namespace Bit.App.Pages.Authenticator
|
||||
|
||||
#region Methods
|
||||
|
||||
public async Task InitAsync() { }
|
||||
public async Task InitAsync() { await LoadAsync(); }
|
||||
|
||||
public async Task CopyAsync()
|
||||
{
|
||||
@@ -41,7 +41,7 @@ namespace Bit.App.Pages.Authenticator
|
||||
|
||||
public async Task LoadAsync()
|
||||
{
|
||||
var authed = await _userService.IsAuthenticatedAsync();
|
||||
var authed = await _stateService.IsAuthenticatedAsync();
|
||||
if (!authed)
|
||||
{
|
||||
return;
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
using System.Threading.Tasks;
|
||||
using Bit.App.Effects;
|
||||
using Bit.App.Models;
|
||||
using Bit.App.Pages.Authenticator;
|
||||
using Bit.App.Resources;
|
||||
using Bit.Core.Abstractions;
|
||||
using Bit.Core.Models.Data;
|
||||
@@ -36,7 +37,7 @@ namespace Bit.App.Pages
|
||||
|
||||
Children.Add(_groupingsPage);
|
||||
|
||||
_authenticatorPage = new NavigationPage(new Authenticator.AuthenticatorPage(true, null, this))
|
||||
_authenticatorPage = new NavigationPage(new AuthenticatorPage(true, null, this))
|
||||
{
|
||||
Title = AppResources.Authenticator,
|
||||
IconImageSource = "info.png"
|
||||
|
||||
3890
src/App/Resources/AppResources.cs.Designer.cs
generated
3890
src/App/Resources/AppResources.cs.Designer.cs
generated
File diff suppressed because it is too large
Load Diff
1
src/App/Resources/AppResources.da.Designer.cs
generated
1
src/App/Resources/AppResources.da.Designer.cs
generated
@@ -0,0 +1 @@
|
||||
|
||||
1
src/App/Resources/AppResources.de.Designer.cs
generated
1
src/App/Resources/AppResources.de.Designer.cs
generated
@@ -0,0 +1 @@
|
||||
|
||||
3890
src/App/Resources/AppResources.es.Designer.cs
generated
3890
src/App/Resources/AppResources.es.Designer.cs
generated
File diff suppressed because it is too large
Load Diff
3890
src/App/Resources/AppResources.fi.Designer.cs
generated
3890
src/App/Resources/AppResources.fi.Designer.cs
generated
File diff suppressed because it is too large
Load Diff
3890
src/App/Resources/AppResources.fr.Designer.cs
generated
3890
src/App/Resources/AppResources.fr.Designer.cs
generated
File diff suppressed because it is too large
Load Diff
3890
src/App/Resources/AppResources.hi.Designer.cs
generated
3890
src/App/Resources/AppResources.hi.Designer.cs
generated
File diff suppressed because it is too large
Load Diff
3890
src/App/Resources/AppResources.hr.Designer.cs
generated
3890
src/App/Resources/AppResources.hr.Designer.cs
generated
File diff suppressed because it is too large
Load Diff
3890
src/App/Resources/AppResources.hu.Designer.cs
generated
3890
src/App/Resources/AppResources.hu.Designer.cs
generated
File diff suppressed because it is too large
Load Diff
3890
src/App/Resources/AppResources.id.Designer.cs
generated
3890
src/App/Resources/AppResources.id.Designer.cs
generated
File diff suppressed because it is too large
Load Diff
3890
src/App/Resources/AppResources.it.Designer.cs
generated
3890
src/App/Resources/AppResources.it.Designer.cs
generated
File diff suppressed because it is too large
Load Diff
3890
src/App/Resources/AppResources.ja.Designer.cs
generated
3890
src/App/Resources/AppResources.ja.Designer.cs
generated
File diff suppressed because it is too large
Load Diff
3890
src/App/Resources/AppResources.nl.Designer.cs
generated
3890
src/App/Resources/AppResources.nl.Designer.cs
generated
File diff suppressed because it is too large
Load Diff
3890
src/App/Resources/AppResources.pl.Designer.cs
generated
3890
src/App/Resources/AppResources.pl.Designer.cs
generated
File diff suppressed because it is too large
Load Diff
3890
src/App/Resources/AppResources.pt-BR.Designer.cs
generated
3890
src/App/Resources/AppResources.pt-BR.Designer.cs
generated
File diff suppressed because it is too large
Load Diff
3890
src/App/Resources/AppResources.ro.Designer.cs
generated
3890
src/App/Resources/AppResources.ro.Designer.cs
generated
File diff suppressed because it is too large
Load Diff
3890
src/App/Resources/AppResources.ru.Designer.cs
generated
3890
src/App/Resources/AppResources.ru.Designer.cs
generated
File diff suppressed because it is too large
Load Diff
3890
src/App/Resources/AppResources.sk.Designer.cs
generated
3890
src/App/Resources/AppResources.sk.Designer.cs
generated
File diff suppressed because it is too large
Load Diff
3890
src/App/Resources/AppResources.sv.Designer.cs
generated
3890
src/App/Resources/AppResources.sv.Designer.cs
generated
File diff suppressed because it is too large
Load Diff
3890
src/App/Resources/AppResources.th.Designer.cs
generated
3890
src/App/Resources/AppResources.th.Designer.cs
generated
File diff suppressed because it is too large
Load Diff
3890
src/App/Resources/AppResources.tr.Designer.cs
generated
3890
src/App/Resources/AppResources.tr.Designer.cs
generated
File diff suppressed because it is too large
Load Diff
3890
src/App/Resources/AppResources.uk.Designer.cs
generated
3890
src/App/Resources/AppResources.uk.Designer.cs
generated
File diff suppressed because it is too large
Load Diff
3890
src/App/Resources/AppResources.vi.Designer.cs
generated
3890
src/App/Resources/AppResources.vi.Designer.cs
generated
File diff suppressed because it is too large
Load Diff
3890
src/App/Resources/AppResources.zh-Hant.Designer.cs
generated
3890
src/App/Resources/AppResources.zh-Hant.Designer.cs
generated
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user