From 51670404800d557dc37d5aa5acd3b8fd91679c3c Mon Sep 17 00:00:00 2001 From: Mike Dilger Date: Mon, 9 Jan 2023 19:02:59 +1300 Subject: [PATCH] Use a different password field to delete, since you need to unlock with a password and you might accidently click delete --- src/ui/mod.rs | 2 ++ src/ui/you.rs | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/ui/mod.rs b/src/ui/mod.rs index 467346f2..8a8a3e8d 100644 --- a/src/ui/mod.rs +++ b/src/ui/mod.rs @@ -82,6 +82,7 @@ struct GossipUi { follow_hex_pubkey: String, follow_pubkey_at_relay: String, password: String, + del_password: String, import_priv: String, import_pub: String, replying_to: Option, @@ -152,6 +153,7 @@ impl GossipUi { follow_hex_pubkey: "".to_owned(), follow_pubkey_at_relay: "".to_owned(), password: "".to_owned(), + del_password: "".to_owned(), import_priv: "".to_owned(), import_pub: "".to_owned(), replying_to: None, diff --git a/src/ui/you.rs b/src/ui/you.rs index d2a1bd96..0130481c 100644 --- a/src/ui/you.rs +++ b/src/ui/you.rs @@ -251,20 +251,20 @@ fn offer_delete(app: &mut GossipUi, ui: &mut Ui) { ui.horizontal(|ui| { ui.add_space(10.0); ui.label("Enter Password To Delete: "); - ui.add(TextEdit::singleline(&mut app.password).password(true)); + ui.add(TextEdit::singleline(&mut app.del_password).password(true)); }); if ui.button("DELETE (Cannot be undone!)").clicked() { match GLOBALS .signer .blocking_write() - .delete_identity(&app.password) + .delete_identity(&app.del_password) { Ok(_) => *GLOBALS.status_message.blocking_write() = "Identity deleted.".to_string(), Err(e) => *GLOBALS.status_message.blocking_write() = format!("{}", e), } - app.password.zeroize(); - app.password = "".to_owned(); + app.del_password.zeroize(); + app.del_password = "".to_owned(); } }