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

set generator page from tile if locked

Browse source
This commit is contained in:
Kyle Spearrin 2019-06-06 20:34:59 -04:00
parent a2bedaab8a
commit d5c610b819
6 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Android/MainActivity.cs
View file

@ -146,10 +146,18 @@ namespace Bit.Droid
if(intent.GetBooleanExtra("generatorTile", false)) if(intent.GetBooleanExtra("generatorTile", false))
{ {
_messagingService.Send("popAllAndGoToTabGenerator"); _messagingService.Send("popAllAndGoToTabGenerator");
if(_appOptions != null)
{
_appOptions.GeneratorTile = true;
}
} }
if(intent.GetBooleanExtra("myVaultTile", false)) if(intent.GetBooleanExtra("myVaultTile", false))
{ {
_messagingService.Send("popAllAndGoToTabMyVault"); _messagingService.Send("popAllAndGoToTabMyVault");
if(_appOptions != null)
{
_appOptions.MyVaultTile = true;
}
} }
else else
{ {

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

@ -90,7 +90,7 @@ namespace Bit.App
else if(message.Command == "locked") else if(message.Command == "locked")
{ {
await _stateService.PurgeAsync(); await _stateService.PurgeAsync();
var lockPage = new LockPage(null, !(message.Data as bool?).GetValueOrDefault()); var lockPage = new LockPage(_appOptions, !(message.Data as bool?).GetValueOrDefault());
Device.BeginInvokeOnMainThread(() => Current.MainPage = new NavigationPage(lockPage)); Device.BeginInvokeOnMainThread(() => Current.MainPage = new NavigationPage(lockPage));
} }
else if(message.Command == "lockVault") else if(message.Command == "lockVault")
@ -135,10 +135,12 @@ namespace Bit.App
} }
if(message.Command == "popAllAndGoToTabMyVault") if(message.Command == "popAllAndGoToTabMyVault")
{ {
_appOptions.MyVaultTile = false;
tabsPage.ResetToVaultPage(); tabsPage.ResetToVaultPage();
} }
else else
{ {
_appOptions.GeneratorTile = false;
tabsPage.ResetToGeneratorPage(); tabsPage.ResetToGeneratorPage();
} }
} }
@ -170,8 +172,8 @@ namespace Bit.App
{ {
await _storageService.SaveAsync(Constants.LastActiveKey, DateTime.UtcNow); await _storageService.SaveAsync(Constants.LastActiveKey, DateTime.UtcNow);
} }
await HandleLockingAsync();
SetTabsPageFromAutofill(); SetTabsPageFromAutofill();
await HandleLockingAsync();
} }
protected async override void OnResume() protected async override void OnResume()

2
src/App/Pages/Accounts/LockPage.xaml.cs
View file

@ -36,7 +36,7 @@ namespace Bit.App.Pages
return; return;
} }
} }
Application.Current.MainPage = new TabsPage(); Application.Current.MainPage = new TabsPage(_appOptions);
}; };
MasterPasswordEntry = _masterPassword; MasterPasswordEntry = _masterPassword;
PinEntry = _pin; PinEntry = _pin;

4
src/App/Pages/TabsPage.cs
View file

@ -54,6 +54,10 @@ namespace Bit.App.Pages
appOptions.GeneratorTile = false; appOptions.GeneratorTile = false;
ResetToGeneratorPage(); ResetToGeneratorPage();
} }
else if(appOptions?.MyVaultTile ?? false)
{
appOptions.MyVaultTile = false;
}
} }
public void ResetToVaultPage() public void ResetToVaultPage()

1
src/App/Pages/Vault/AddEditPage.xaml
View file

@ -483,7 +483,6 @@
<Editor <Editor
x:Name="_notesEditor" x:Name="_notesEditor"
Text="{Binding Cipher.Notes}" Text="{Binding Cipher.Notes}"
AutoSize="TextChanges"
StyleClass="box-value" /> StyleClass="box-value" />
</StackLayout> </StackLayout>
</StackLayout> </StackLayout>

2
src/App/Pages/Vault/CiphersPage.xaml.cs
View file

@ -63,7 +63,7 @@ namespace Bit.App.Pages
{ {
return; return;
} }
_vm.Search(e.NewTextValue, 1000); _vm.Search(e.NewTextValue, 300);
} }
private void SearchBar_SearchButtonPressed(object sender, EventArgs e) private void SearchBar_SearchButtonPressed(object sender, EventArgs e)