From 8fe4c503730adfc15c8a566ee402db26ed14dd53 Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 20 Sep 2022 23:24:42 +0800 Subject: [PATCH] improve error reproting on #206 --- apps/vault/src/actions.rs | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/apps/vault/src/actions.rs b/apps/vault/src/actions.rs index db7ca13dd..2ebbac336 100644 --- a/apps/vault/src/actions.rs +++ b/apps/vault/src/actions.rs @@ -938,9 +938,6 @@ impl ActionManager { match self.pddb.borrow().unlock_basis(&name, Some(BasisRetentionPolicy::Persist)) { Ok(_) => log::debug!("Basis {} unlocked", name), Err(e) => match e.kind() { - ErrorKind::AlreadyExists => { - self.modals.show_notification(t!("vault.basis.already_exists", xous::LANG), None).ok(); - } ErrorKind::PermissionDenied => { self.report_err(t!("vault.error.basis_unlock_error", xous::LANG), None::) }, @@ -951,7 +948,16 @@ impl ActionManager { // do nothing } } - Err(e) => self.report_err(t!("vault.error.internal_error", xous::LANG), Some(e)), + Err(e) => { + match e.kind() { + ErrorKind::AlreadyExists => { + self.modals.show_notification(t!("vault.basis.already_exists", xous::LANG), None).ok(); + } + _ => { + self.report_err(t!("vault.error.internal_error", xous::LANG), Some(e)) + } + } + }, } } else { // do nothing