From 636d3c02c49458deb91ee405ab9b8a3d32adeb2d Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Thu, 13 Jun 2019 20:41:24 -0400 Subject: [PATCH] catch errors --- src/App/Pages/Settings/FolderAddEditPageViewModel.cs | 5 ++++- src/App/Pages/Vault/AutofillCiphersPage.xaml.cs | 12 +++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/App/Pages/Settings/FolderAddEditPageViewModel.cs b/src/App/Pages/Settings/FolderAddEditPageViewModel.cs index b8587786f..74a713dce 100644 --- a/src/App/Pages/Settings/FolderAddEditPageViewModel.cs +++ b/src/App/Pages/Settings/FolderAddEditPageViewModel.cs @@ -46,7 +46,10 @@ namespace Bit.App.Pages if(EditMode) { var folder = await _folderService.GetAsync(FolderId); - Folder = await folder.DecryptAsync(); + if(folder != null) + { + Folder = await folder.DecryptAsync(); + } } else { diff --git a/src/App/Pages/Vault/AutofillCiphersPage.xaml.cs b/src/App/Pages/Vault/AutofillCiphersPage.xaml.cs index 17d7b5764..d4cdd59d6 100644 --- a/src/App/Pages/Vault/AutofillCiphersPage.xaml.cs +++ b/src/App/Pages/Vault/AutofillCiphersPage.xaml.cs @@ -3,6 +3,8 @@ using Bit.App.Resources; using Bit.Core.Abstractions; using Bit.Core.Enums; using Bit.Core.Utilities; +using System; +using System.Threading.Tasks; using Xamarin.Forms; namespace Bit.App.Pages @@ -31,7 +33,15 @@ namespace Bit.App.Pages base.OnAppearing(); await LoadOnAppearedAsync(_mainLayout, false, async () => { - await _vm.LoadAsync(); + try + { + await _vm.LoadAsync(); + } + catch(Exception e) when(e.Message.Contains("No key.")) + { + await Task.Delay(5000); + await _vm.LoadAsync(); + } }, _mainContent); }