From 4e0e08f3f03a81617dcb3bd74b3a3e70e76520bf Mon Sep 17 00:00:00 2001 From: Edward Shen Date: Sun, 31 Oct 2021 01:39:11 -0700 Subject: [PATCH] Better pw prompting --- web/src/main.rs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/web/src/main.rs b/web/src/main.rs index c9d18bb..c901052 100644 --- a/web/src/main.rs +++ b/web/src/main.rs @@ -92,14 +92,20 @@ fn main() { let pw = window().prompt_with_message("A password is required to decrypt this paste:"); match pw { + // Ok button was entered. Ok(Some(password)) if !password.is_empty() => { break Some(SecretVec::new(password.into_bytes())); } - Err(_) => { + // Cancel button was entered. + Ok(None) => { render_message("This paste requires a password.".into()); return; } - _ => (), + e => { + render_message("Internal error occurred.".into()); + error!(format!("Error occurred at pw prompt: {:?}", e)); + return; + } } } } else {