fix the merge

never return null pointer

Cargo.lock

@@ -474,7 +474,7 @@ dependencies = [
  "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "image-meta 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "imap 1.0.2 (git+https://github.com/jonhoo/rust-imap?rev=31e2490d2203a837d8830736bcb183831ec4894d)",
+ "imap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lettre 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -507,17 +507,6 @@ dependencies = [
  "thread-local-object 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "deltachat-provider-overview"
-version = "0.1.0"
-dependencies = [
- "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
- "yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "deltachat_derive"
 version = "0.1.0"
@@ -531,11 +520,9 @@ name = "deltachat_ffi"
 version = "1.0.0-alpha.4"
 dependencies = [
  "deltachat 1.0.0-alpha.4",
- "deltachat-provider-overview 0.1.0",
  "human-panic 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -804,11 +791,6 @@ name = "glob"
 version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "glob"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "h2"
 version = "0.1.26"
@@ -967,12 +949,12 @@ dependencies = [
 [[package]]
 name = "imap"
 version = "1.0.2"
-source = "git+https://github.com/jonhoo/rust-imap?rev=31e2490d2203a837d8830736bcb183831ec4894d#31e2490d2203a837d8830736bcb183831ec4894d"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "bufstream 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "imap-proto 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "imap-proto 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -980,7 +962,7 @@ dependencies = [
 
 [[package]]
 name = "imap-proto"
-version = "0.8.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2751,14 +2733,6 @@ dependencies = [
  "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "yaml-rust"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "zeroize"
 version = "0.6.0"
@@ -2867,7 +2841,6 @@ dependencies = [
 "checksum generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec"
 "checksum getrandom 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "2512b3191f22e2763a5db387f1c9409379772e2050841722eb4a8c4f497bf096"
 "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
-"checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
 "checksum h2 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)" = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462"
 "checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
 "checksum hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
@@ -2882,8 +2855,8 @@ dependencies = [
 "checksum ident_case 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 "checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
 "checksum image-meta 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b00861cbbb254a627d8acc0cec786b484297d896ab8f20fdc8e28536a3e918ef"
-"checksum imap 1.0.2 (git+https://github.com/jonhoo/rust-imap?rev=31e2490d2203a837d8830736bcb183831ec4894d)" = "<none>"
-"checksum imap-proto 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9a588218700a1f56790d585596d5edd879dd19c2fc554b34277e1c999249d787"
+"checksum imap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "178392198cb2716f4fe34b86a1bf1de1240a3e31136a199b16490fa87538fa25"
+"checksum imap-proto 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c4e77b1d61faf028893531b071cc5584cdd02b6186cebe7f7168ffd8d591339a"
 "checksum indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7e81a7c05f79578dbc15793d8b619db9ba32b4577003ef3af1a91c416798c58d"
 "checksum iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dbe6e417e7d0975db6512b90796e8ce223145ac4e33c377e4a42882a0e88bb08"
 "checksum itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358"
@@ -3078,6 +3051,5 @@ dependencies = [
 "checksum winutil 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7daf138b6b14196e3830a588acf1e86966c694d3e8fb026fb105b8b5dca07e6e"
 "checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
 "checksum x25519-dalek 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7ee1585dc1484373cbc1cee7aafda26634665cf449436fd6e24bfd1fad230538"
-"checksum yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "65923dd1784f44da1d2c3dbbc5e822045628c590ba72123e1c73d3c230c4434d"
 "checksum zeroize 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e68403b858b6af538b11614e62dfe9ab2facba9f13a0cafb974855cfb495ec95"
 "checksum zeroize_derive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b3f07490820219949839d0027b965ffdd659d75be9220c00798762e36c6cd281"

Cargo.toml

@@ -23,7 +23,7 @@ num-derive = "0.2.5"
 num-traits = "0.2.6"
 native-tls = "0.2.3"
 lettre = "0.9.0"
-imap = { git = "https://github.com/jonhoo/rust-imap", rev = "31e2490d2203a837d8830736bcb183831ec4894d" }
+imap = "1.0.1"
 mmime = { git = "https://github.com/dignifiedquire/mmime", rev = "bccd2c2" }
 base64 = "0.10"
 charset = "0.1"

deltachat-ffi/Cargo.toml

@@ -20,10 +20,6 @@ libc = "0.2"
 human-panic = "1.0.1"
 num-traits = "0.2.6"
 
-deltachat-provider-overview = { path = "../../../deltachat-provider-overview" }
-# serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-
 [features]
 default = ["vendored", "nightly", "ringbuf"]
 vendored = ["deltachat/vendored"]

deltachat-ffi/deltachat.h

@@ -441,11 +441,7 @@ char*           dc_get_info                  (dc_context_t* context);
  */
 char*           dc_get_oauth2_url            (dc_context_t* context, const char* addr, const char* redirect_uri);
 
-/**
- * Get the provider information from our provider overview as json object.
- */
 
-char*           dc_get_json_provider_info_from_email  (char* email);
 
 // connect
 

deltachat-ffi/src/lib.rs

@@ -16,8 +16,6 @@ use std::convert::TryInto;
 use std::ptr;
 use std::str::FromStr;
 
-extern crate deltachat_provider_overview;
-
 use deltachat::contact::Contact;
 use deltachat::dc_tools::{as_str, dc_strdup, StrExt};
 use deltachat::*;
@@ -2532,19 +2530,6 @@ fn as_opt_str<'a>(s: *const libc::c_char) -> Option<&'a str> {
     Some(dc_tools::as_str(s))
 }
 
-pub unsafe extern "C" fn dc_get_json_provider_info_from_email(
-    email: *const libc::c_char,
-) -> *mut libc::c_char {
-    let option = deltachat_provider_overview::get_provider_info(
-        deltachat_provider_overview::get_domain_from_email(dc_tools::as_str(email)),
-    );
-    if let Some(provider) = option {
-        serde_json::to_string(provider.0).unwrap().strdup()
-    } else {
-        dc_strdup(ptr::null())
-    }
-} 
-
 pub trait ResultExt<T> {
     fn unwrap_or_log_default(self, context: &context::Context, message: &str) -> T;
     fn log_err(&self, context: &context::Context, message: &str);

python/README.rst

@@ -72,10 +72,10 @@ then cargo-build and install the deltachat bindings::
     python install_python_bindings.py
 
 The bindings will be installed in release mode but with debug symbols.
-The release mode is necessary because some tests generate RSA keys
+The release mode is neccessary because some tests generate RSA keys
 which is prohibitively slow in debug mode.
 
-After successful binding installation you can finally run the tests::
+After succcessul binding installation you can finally run the tests::
 
     pytest -v tests
 

src/dc_securejoin.rs

@@ -30,6 +30,15 @@ pub unsafe fn dc_get_securejoin_qr(
     ====             Alice - the inviter side            ====
     ====   Step 1 in "Setup verified contact" protocol   ====
     ========================================================= */
+    let cleanup = |fingerprint, qr: Option<String>| {
+        free(fingerprint as *mut libc::c_void);
+
+        if let Some(qr) = qr {
+            qr.strdup()
+        } else {
+            "".strdup()
+        }
+    };
 
     let mut fingerprint = ptr::null_mut();
     let mut qr: Option<String> = None;
@@ -53,19 +62,9 @@ pub unsafe fn dc_get_securejoin_qr(
     });
     let self_addr = context.sql.get_config(context, "configured_addr");
 
-    let cleanup = |fingerprint| {
-        free(fingerprint as *mut libc::c_void);
-
-        if let Some(qr) = qr {
-            qr.strdup()
-        } else {
-            std::ptr::null_mut()
-        }
-    };
-
     if self_addr.is_none() {
         error!(context, 0, "Not configured, cannot generate QR code.",);
-        return cleanup(fingerprint);
+        return cleanup(fingerprint, qr);
     }
 
     let self_addr = self_addr.unwrap();
@@ -77,7 +76,7 @@ pub unsafe fn dc_get_securejoin_qr(
     fingerprint = get_self_fingerprint(context);
 
     if fingerprint.is_null() {
-        return cleanup(fingerprint);
+        return cleanup(fingerprint, qr);
     }
 
     let self_addr_urlencoded = utf8_percent_encode(&self_addr, NON_ALPHANUMERIC).to_string();
@@ -103,7 +102,7 @@ pub unsafe fn dc_get_securejoin_qr(
                 context,
                 0, "Cannot get QR-code for chat-id {}", group_chat_id,
             );
-            return cleanup(fingerprint);
+            return cleanup(fingerprint, qr);
         }
     } else {
         Some(format!(
@@ -118,7 +117,7 @@ pub unsafe fn dc_get_securejoin_qr(
 
     info!(context, 0, "Generated QR code: {}", qr.as_ref().unwrap());
 
-    cleanup(fingerprint)
+    return cleanup(fingerprint, qr);
 }
 
 fn get_self_fingerprint(context: &Context) -> *mut libc::c_char {

src/imap.rs

@@ -548,17 +548,19 @@ impl Imap {
         }
 
         let (teardown, can_idle, has_xlist) = match &mut *self.session.lock().unwrap() {
-            Some(ref mut session) => match session.capabilities() {
-                Ok(caps) => {
+            Some(ref mut session) => {
+                if let Ok(caps) = session.capabilities() {
                     if !context.sql.is_open() {
                         warn!(context, 0, "IMAP-LOGIN as {} ok but ABORTING", lp.mail_user,);
                         (true, false, false)
                     } else {
-                        let can_idle = caps.has_str("IDLE");
-                        let has_xlist = caps.has_str("XLIST");
-                        let caps_list = caps
-                            .iter()
-                            .fold(String::new(), |s, c| s + &format!(" {:?}", c));
+                        let can_idle = caps.has("IDLE");
+                        let has_xlist = caps.has("XLIST");
+                        let caps_list = caps.iter().fold(String::new(), |mut s, c| {
+                            s += " ";
+                            s += c;
+                            s
+                        });
                         log_event!(
                             context,
                             Event::IMAP_CONNECTED,
@@ -569,12 +571,10 @@ impl Imap {
                         );
                         (false, can_idle, has_xlist)
                     }
-                }
-                Err(err) => {
-                    info!(context, 0, "CAPABILITY command error: {}", err);
+                } else {
                     (true, false, false)
                 }
-            },
+            }
             None => (true, false, false),
         };