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

pop page on delete success

Browse source
This commit is contained in:
Kyle Spearrin 2019-05-30 08:35:50 -04:00
parent 3f8f29dfe7
commit 46a8ffa5ae
4 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/App/Pages/Vault/AddEditPage.xaml.cs
View file

@ -145,7 +145,10 @@ namespace Bit.App.Pages
{ {
if(DoOnce()) if(DoOnce())
{ {
await _vm.DeleteAsync(); if(await _vm.DeleteAsync())
{
await Navigation.PopModalAsync();
}
} }
} }

3
src/App/Pages/Vault/AddEditPageViewModel.cs
View file

@ -424,7 +424,7 @@ namespace Bit.App.Pages
public async Task<bool> DeleteAsync() public async Task<bool> DeleteAsync()
{ {
var confirmed = await _platformUtilsService.ShowDialogAsync(AppResources.DoYouReallyWantToDelete, var confirmed = await _platformUtilsService.ShowDialogAsync(AppResources.DoYouReallyWantToDelete,
null, AppResources.Yes, AppResources.No); null, AppResources.Yes, AppResources.Cancel);
if(!confirmed) if(!confirmed)
{ {
return false; return false;
@ -436,7 +436,6 @@ namespace Bit.App.Pages
await _deviceActionService.HideLoadingAsync(); await _deviceActionService.HideLoadingAsync();
_platformUtilsService.ShowToast("success", null, AppResources.ItemDeleted); _platformUtilsService.ShowToast("success", null, AppResources.ItemDeleted);
_messagingService.Send("deletedCipher"); _messagingService.Send("deletedCipher");
await Page.Navigation.PopModalAsync();
return true; return true;
} }
catch(ApiException e) catch(ApiException e)

5
src/App/Pages/Vault/ViewPage.xaml.cs
View file

@ -127,7 +127,10 @@ namespace Bit.App.Pages
{ {
if(DoOnce()) if(DoOnce())
{ {
await _vm.DeleteAsync(); if(await _vm.DeleteAsync())
{
await Navigation.PopModalAsync();
}
} }
} }

2
src/App/Pages/Vault/ViewPageViewModel.cs
View file

@ -251,7 +251,7 @@ namespace Bit.App.Pages
public async Task<bool> DeleteAsync() public async Task<bool> DeleteAsync()
{ {
var confirmed = await _platformUtilsService.ShowDialogAsync(AppResources.DoYouReallyWantToDelete, var confirmed = await _platformUtilsService.ShowDialogAsync(AppResources.DoYouReallyWantToDelete,
null, AppResources.Yes, AppResources.No); null, AppResources.Yes, AppResources.Cancel);
if(!confirmed) if(!confirmed)
{ {
return false; return false;