ui: add PGP settings in configuration

1 files changed, 37 insertions, 20 deletions

diff --git a/ui/src/components/mail/view.rs b/ui/src/components/mail/view.rs
index 315970aa..cd256f6c 100644
--- a/ui/src/components/mail/view.rs
+++ b/ui/src/components/mail/view.rs
@@ -195,11 +195,20 @@ impl MailView {
                     }
                 } else if a.is_signed() {
                     v.clear();
-                    match melib::signatures::verify_signature(a) {
-                        Ok((bytes, sig)) => {
-                            let bytes_file = create_temp_file(&bytes, None, None, true);
-                            let signature_file = create_temp_file(sig, None, None, true);
-                            if let Ok(gpg) = Command::new("gpg2")
+                    if context.settings.pgp.auto_verify_signatures {
+                        match melib::signatures::verify_signature(a) {
+                            Ok((bytes, sig)) => {
+                                let bytes_file = create_temp_file(&bytes, None, None, true);
+                                let signature_file = create_temp_file(sig, None, None, true);
+                                if let Ok(gpg) = Command::new(
+                                    context
+                                        .settings
+                                        .pgp
+                                        .gpg_binary
+                                        .as_ref()
+                                        .map(String::as_str)
+                                        .unwrap_or("gpg2"),
+                                )
                                 .args(&[
                                     "--output",
                                     "-",
@@ -210,27 +219,35 @@ impl MailView {
                                 .stdin(Stdio::piped())
                                 .stderr(Stdio::piped())
                                 .spawn()
-                            {
-                                v.extend(gpg.wait_with_output().unwrap().stderr);
-                            } else {
-                                context.replies.push_back(UIEvent::Notification(
-                                    Some(
-                                        "Failed to find an application to verify PGP signature"
+                                {
+                                    v.extend(gpg.wait_with_output().unwrap().stderr);
+                                } else {
+                                    context.replies.push_back(UIEvent::Notification(
+                                        Some(format!(
+                                            "Failed to launch {} to verify PGP signature",
+                                            context
+                                                .settings
+                                                .pgp
+                                                .gpg_binary
+                                                .as_ref()
+                                                .map(String::as_str)
+                                                .unwrap_or("gpg2"),
+                                        )),
+                                        "see meli.conf(5) for configuration setting pgp.gpg_binary"
                                             .to_string(),
-                                    ),
+                                        Some(NotificationType::ERROR),
+                                    ));
+                                    return;
+                                }
+                            }
+                            Err(e) => {
+                                context.replies.push_back(UIEvent::Notification(
+                                    Some(e.to_string()),
                                     String::new(),
                                     Some(NotificationType::ERROR),
                                 ));
-                                return;
                             }
                         }
-                        Err(e) => {
-                            context.replies.push_back(UIEvent::Notification(
-                                Some(e.to_string()),
-                                String::new(),
-                                Some(NotificationType::ERROR),
-                            ));
-                        }
                     }
                 }
             })),