From 8eca8b34ed5684d255f5ed720c1ed395f4ad4b13 Mon Sep 17 00:00:00 2001 From: Manos Pitsidianakis Date: Sat, 28 Mar 2020 11:43:32 +0200 Subject: [PATCH] jmap: fix two error messages --- melib/src/backends/jmap.rs | 2 +- melib/src/backends/jmap/connection.rs | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/melib/src/backends/jmap.rs b/melib/src/backends/jmap.rs index 4e0ce5f0..32d6df9d 100644 --- a/melib/src/backends/jmap.rs +++ b/melib/src/backends/jmap.rs @@ -236,7 +236,7 @@ impl MailBackend for JmapType { _sender: RefreshEventConsumer, _work_context: WorkContext, ) -> Result { - Err(MeliError::from("sadfsa")) + Err(MeliError::from("JMAP watch for updates is unimplemented")) } fn mailboxes(&self) -> Result> { diff --git a/melib/src/backends/jmap/connection.rs b/melib/src/backends/jmap/connection.rs index c094df24..ecd48905 100644 --- a/melib/src/backends/jmap/connection.rs +++ b/melib/src/backends/jmap/connection.rs @@ -72,11 +72,10 @@ impl JmapConnection { let res_text = req.text()?; let session: JmapSession = serde_json::from_str(&res_text).map_err(|_| { - let err = MeliError::new(format!("Could not connect to JMAP server endpoint for {}. Is your server hostname setting correct? (i.e. \"jmap.mailserver.org\") (Note: only session resource discovery via /.well-known/jmap is supported. DNS SRV records are not suppported.)", &server_conf.server_hostname)); + let err = MeliError::new(format!("Could not connect to JMAP server endpoint for {}. Is your server hostname setting correct? (i.e. \"jmap.mailserver.org\") (Note: only session resource discovery via /.well-known/jmap is supported. DNS SRV records are not suppported.)\nReply from server: {}", &server_conf.server_hostname, &res_text)); *online_status.lock().unwrap() = (Instant::now(), Err(err.clone())); err - } - )?; + })?; if !session .capabilities .contains_key("urn:ietf:params:jmap:core")