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

Move to non-async FetchAndLoadVault

Browse source
This commit is contained in:
Kyle Spearrin 2016-07-15 01:52:33 -04:00
parent 4d692e7eeb
commit 83f4513604
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/App/Pages/Vault/VaultListSitesPage.cs
View file

@ -53,11 +53,11 @@ namespace Bit.App.Pages
private void Init() private void Init()
{ {
MessagingCenter.Subscribe<Application, bool>(Application.Current, "SyncCompleted", async (sender, success) => MessagingCenter.Subscribe<Application, bool>(Application.Current, "SyncCompleted", (sender, success) =>
{ {
if(success) if(success)
{ {
await FetchAndLoadVaultAsync(); FetchAndLoadVault();
} }
}); });
@ -146,10 +146,10 @@ namespace Bit.App.Pages
} }
} }
protected async override void OnAppearing() protected override void OnAppearing()
{ {
base.OnAppearing(); base.OnAppearing();
await FetchAndLoadVaultAsync(); FetchAndLoadVault();
if(_connectivity.IsConnected && Device.OS == TargetPlatform.iOS && !_favorites) if(_connectivity.IsConnected && Device.OS == TargetPlatform.iOS && !_favorites)
{ {
@ -157,7 +157,7 @@ namespace Bit.App.Pages
if(!pushPromptShow) if(!pushPromptShow)
{ {
_settings.AddOrUpdateValue(Constants.PushInitialPromptShown, true); _settings.AddOrUpdateValue(Constants.PushInitialPromptShown, true);
await _userDialogs.AlertAsync("bitwarden keeps your vault automatically synced by using push notifications." _userDialogs.Alert("bitwarden keeps your vault automatically synced by using push notifications."
+ " For the best possible experience, please select \"Ok\" on the following prompt when asked to enable push notifications.", + " For the best possible experience, please select \"Ok\" on the following prompt when asked to enable push notifications.",
"Enable Automatic Syncing", "Ok, got it!"); "Enable Automatic Syncing", "Ok, got it!");
} }
@ -171,14 +171,14 @@ namespace Bit.App.Pages
} }
} }
private async Task FetchAndLoadVaultAsync() private void FetchAndLoadVault()
{ {
if(PresentationFolders.Count > 0 && _syncService.SyncInProgress) if(PresentationFolders.Count > 0 && _syncService.SyncInProgress)
{ {
return; return;
} }
await Task.Run(async () => Task.Run(async () =>
{ {
var foldersTask = _folderService.GetAllAsync(); var foldersTask = _folderService.GetAllAsync();
var sitesTask = _favorites ? _siteService.GetAllAsync(true) : _siteService.GetAllAsync(); var sitesTask = _favorites ? _siteService.GetAllAsync(true) : _siteService.GetAllAsync();