fix bug that lead to all liveconfig tests failing

.circleci/config.yml

@@ -1,4 +1,5 @@
 version: 2.1
+
 executors:
   default:
     docker:
@@ -12,7 +13,7 @@ restore-workspace: &restore-workspace
 restore-cache: &restore-cache
   restore_cache:
     keys:
-      - cargo-v1-{{ checksum "rust-toolchain" }}-{{ checksum "Cargo.toml" }}-{{ checksum "Cargo.lock" }}-{{ arch }}
+      - cargo-v0-{{ checksum "rust-toolchain" }}-{{ checksum "Cargo.toml" }}-{{ checksum "Cargo.lock" }}-{{ arch }}
       - repo-source-{{ .Branch }}-{{ .Revision }}
 
 commands:
@@ -52,11 +53,10 @@ jobs:
           command: cargo generate-lockfile
       - restore_cache:
           keys:
-            - cargo-v1-{{ checksum "rust-toolchain" }}-{{ checksum "Cargo.toml" }}-{{ checksum "Cargo.lock" }}-{{ arch }}
+            - cargo-v0-{{ checksum "rust-toolchain" }}-{{ checksum "Cargo.toml" }}-{{ checksum "Cargo.lock" }}-{{ arch }}
       - run: rustup install $(cat rust-toolchain)
       - run: rustup default $(cat rust-toolchain)
       - run: rustup component add --toolchain $(cat rust-toolchain) rustfmt
-      - run: rustup component add --toolchain $(cat rust-toolchain) clippy-preview
       - run: cargo update
       - run: cargo fetch
       - run: rustc +stable --version
@@ -67,7 +67,7 @@ jobs:
           paths:
             - crate
       - save_cache:
-          key: cargo-v1-{{ checksum "rust-toolchain" }}-{{ checksum "Cargo.toml" }}-{{ checksum "Cargo.lock" }}-{{ arch }}
+          key: cargo-v0-{{ checksum "rust-toolchain" }}-{{ checksum "Cargo.toml" }}-{{ checksum "Cargo.lock" }}-{{ arch }}
           paths:
             - "~/.cargo"
             - "~/.rustup"
@@ -152,24 +152,14 @@ jobs:
             - wheelhouse
 
   upload_docs_wheels:
-    machine: true
+    machine: True
     steps:
       - checkout
       - attach_workspace:
           at: workspace
-      - run: pyenv global 3.5.2
       - run: ls -laR workspace
       - run: ci_scripts/ci_upload.sh workspace/py-docs workspace/wheelhouse
 
-  clippy:
-    executor: default
-    steps:
-      - *restore-workspace
-      - *restore-cache
-      - run:
-          name: Run cargo clippy
-          command: cargo clippy --all
-
 
 workflows:
   version: 2.1
@@ -185,10 +175,6 @@ workflows:
           requires:
             - cargo_fetch
 
-      - clippy:
-          requires:
-            - cargo_fetch
-
       # Linux Desktop 64bit
       - test_x86_64-unknown-linux-gnu:
           requires:

.gitignore

@@ -18,7 +18,3 @@ __pycache__
 python/src/deltachat/capi*.so
 
 python/liveconfig*
-
-# ignore doxgen generated files
-deltachat-ffi/html
-deltachat-ffi/xml

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat"
-version = "1.0.0-alpha.4"
+version = "1.0.0-alpha.3"
 authors = ["dignifiedquire <dignifiedquire@gmail.com>"]
 edition = "2018"
 license = "MPL"
@@ -16,15 +16,14 @@ pgp = { version = "0.2", default-features = false }
 hex = "0.3.2"
 sha2 = "0.8.0"
 rand = "0.6.5"
-phf = { git = "https://github.com/sfackler/rust-phf", rev = "0d00821", features = ["macros"] }
 smallvec = "0.6.9"
 reqwest = "0.9.15"
 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 = "281d2eb8ab50dc656ceff2ae749ca5045f334e15" }
-mmime = { git = "https://github.com/dignifiedquire/mmime", rev = "bccd2c2" }
+imap = "1.0.1"
+mmime = "0.1.0"
 base64 = "0.10"
 charset = "0.1"
 percent-encoding = "2.0"
@@ -35,9 +34,10 @@ failure = "0.1.5"
 failure_derive = "0.1.5"
 # TODO: make optional
 rustyline = "4.1.0"
-lazy_static = "1.4.0"
+lazy_static = "1.3.0"
 regex = "1.1.6"
 rusqlite = { version = "0.20", features = ["bundled"] }
+addr = "0.2.0"
 r2d2_sqlite = "0.12.0"
 r2d2 = "0.8.5"
 strum = "0.15.0"
@@ -46,18 +46,11 @@ thread-local-object = "0.1.0"
 backtrace = "0.3.33"
 byteorder = "1.3.1"
 itertools = "0.8.0"
-image-meta = "0.1.0"
-quick-xml = "0.15.0"
-escaper = "0.1.0"
-bitflags = "1.1.0"
-jetscii = "0.4.4"
-debug_stub_derive = "0.3.0"
 
 [dev-dependencies]
 tempfile = "3.0"
 pretty_assertions = "0.6.1"
 pretty_env_logger = "0.3.0"
-proptest = "0.9.4"
 
 [workspace]
 members = [

Xargo.toml

@@ -1,6 +0,0 @@
-[dependencies.std]
-features = ["panic-unwind"]
-
-# if using `cargo test`
-[dependencies.test]
-stage = 1

ci_scripts/ci_upload.sh

@@ -34,7 +34,7 @@ echo -----------------------
 # Bundle external shared libraries into the wheels
 pushd $WHEELHOUSEDIR
 
-pip3 install devpi-client
+pip install devpi-client
 devpi use https://m.devpi.net
 devpi login dc --password $DEVPI_LOGIN
 

ci_scripts/run_all.sh

@@ -39,10 +39,9 @@ if [ -n "$TESTS" ]; then
     # run tox
     # XXX we don't run liveconfig tests because they hang sometimes
     # see https://github.com/deltachat/deltachat-core-rust/issues/331
-    # unset DCC_PY_LIVECONFIG
+    unset DCC_PY_LIVECONFIG
 
-    tox --workdir "$TOXWORKDIR" -e lint,py35,py36,py37,auditwheels -- -k "not qr"
-    tox --workdir "$TOXWORKDIR" -e py35,py36,py37 -- -k "qr"
+    tox --workdir "$TOXWORKDIR" -e lint,py27,py35,py36,py37,auditwheels
     popd
 fi
 

deltachat-ffi/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.0.0-alpha.4"
+version = "1.0.0-alpha.3"
 description = "Deltachat FFI"
 authors = ["dignifiedquire <dignifiedquire@gmail.com>"]
 edition = "2018"
@@ -25,3 +25,4 @@ default = ["vendored", "nightly", "ringbuf"]
 vendored = ["deltachat/vendored"]
 nightly = ["deltachat/nightly"]
 ringbuf = ["deltachat/ringbuf"]
+

deltachat-ffi/Doxyfile.css

@@ -1,7 +0,0 @@
-
-/* the code snippet frame, defaults to white which tends to get badly readable in combination with explaining text around */
-div.fragment {
-	background-color: #e0e0e0;
-	border: 0;
-	padding: 1em;
-}

deltachat-ffi/README.md

@@ -1,10 +1 @@
 # Delta Chat C Interface
-
-## Documentation
-
-To generate the C Interface documentation,
-call doxygen in the `deltachat-ffi` directory
-and browse the `html` subdirectory.
-
-If thinks work,
-the documentation is also available online at <https://c.delta.chat>

deltachat_derive/src/lib.rs

@@ -20,6 +20,7 @@ pub fn to_sql_derive(input: TokenStream) -> TokenStream {
                 let num = *self as i64;
                 let value = rusqlite::types::Value::Integer(num);
                 let output = rusqlite::types::ToSqlOutput::Owned(value);
+
                 std::result::Result::Ok(output)
             }
         }
@@ -36,7 +37,7 @@ pub fn from_sql_derive(input: TokenStream) -> TokenStream {
         impl rusqlite::types::FromSql for #name {
             fn column_result(col: rusqlite::types::ValueRef) -> rusqlite::types::FromSqlResult<Self> {
                 let inner = rusqlite::types::FromSql::column_result(col)?;
-                Ok(num_traits::FromPrimitive::from_i64(inner).unwrap_or_default())
+                num_traits::FromPrimitive::from_i64(inner).ok_or(rusqlite::types::FromSqlError::InvalidType)
             }
         }
     };

examples/repl/main.rs

@@ -3,6 +3,7 @@
 //!
 //! Usage:  cargo run --example repl --release -- <databasefile>
 //! All further options can be set using the set-command (type ? for help).
+#![feature(ptr_cast)]
 
 #[macro_use]
 extern crate deltachat;
@@ -14,21 +15,19 @@ extern crate lazy_static;
 extern crate rusqlite;
 
 use std::borrow::Cow::{self, Borrowed, Owned};
-use std::io::{self, Write};
-use std::path::Path;
-use std::process::Command;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::{Arc, Mutex, RwLock};
 
 use deltachat::config;
-use deltachat::configure::*;
+use deltachat::constants::*;
 use deltachat::context::*;
+use deltachat::dc_configure::*;
+use deltachat::dc_job::*;
+use deltachat::dc_securejoin::*;
 use deltachat::dc_tools::*;
-use deltachat::job::*;
 use deltachat::oauth2::*;
-use deltachat::securejoin::*;
+use deltachat::types::*;
 use deltachat::x::*;
-use deltachat::Event;
 use rustyline::completion::{Completer, FilenameCompleter, Pair};
 use rustyline::config::OutputStreamType;
 use rustyline::error::ReadlineError;
@@ -43,75 +42,96 @@ use self::cmdline::*;
 
 // Event Handler
 
-fn receive_event(_context: &Context, event: Event) -> libc::uintptr_t {
+unsafe extern "C" fn receive_event(
+    _context: &Context,
+    event: Event,
+    data1: uintptr_t,
+    data2: uintptr_t,
+) -> uintptr_t {
     match event {
-        Event::GetString { .. } => {}
-        Event::Info(msg) => {
+        Event::GET_STRING => {}
+        Event::INFO => {
             /* do not show the event as this would fill the screen */
-            println!("{}", msg);
+            println!("{}", to_string(data2 as *const _),);
         }
-        Event::SmtpConnected(msg) => {
-            println!("[DC_EVENT_SMTP_CONNECTED] {}", msg);
+        Event::SMTP_CONNECTED => {
+            println!("[DC_EVENT_SMTP_CONNECTED] {}", to_string(data2 as *const _));
         }
-        Event::ImapConnected(msg) => {
-            println!("[DC_EVENT_IMAP_CONNECTED] {}", msg);
+        Event::IMAP_CONNECTED => {
+            println!("[DC_EVENT_IMAP_CONNECTED] {}", to_string(data2 as *const _),);
         }
-        Event::SmtpMessageSent(msg) => {
-            println!("[DC_EVENT_SMTP_MESSAGE_SENT] {}", msg);
-        }
-        Event::Warning(msg) => {
-            println!("[Warning] {}", msg);
-        }
-        Event::Error(msg) => {
-            println!("\x1b[31m[DC_EVENT_ERROR] {}\x1b[0m", msg);
-        }
-        Event::ErrorNetwork(msg) => {
-            println!("\x1b[31m[DC_EVENT_ERROR_NETWORK] msg={}\x1b[0m", msg);
-        }
-        Event::ErrorSelfNotInGroup(msg) => {
-            println!("\x1b[31m[DC_EVENT_ERROR_SELF_NOT_IN_GROUP] {}\x1b[0m", msg);
-        }
-        Event::MsgsChanged { chat_id, msg_id } => {
-            print!(
-                "\x1b[33m{{Received DC_EVENT_MSGS_CHANGED(chat_id={}, msg_id={})}}\n\x1b[0m",
-                chat_id, msg_id,
+        Event::SMTP_MESSAGE_SENT => {
+            println!(
+                "[DC_EVENT_SMTP_MESSAGE_SENT] {}",
+                to_string(data2 as *const _),
             );
         }
-        Event::ContactsChanged(_) => {
+        Event::WARNING => {
+            println!("[Warning] {}", to_string(data2 as *const _),);
+        }
+        Event::ERROR => {
+            println!(
+                "\x1b[31m[DC_EVENT_ERROR] {}\x1b[0m",
+                to_string(data2 as *const _),
+            );
+        }
+        Event::ERROR_NETWORK => {
+            println!(
+                "\x1b[31m[DC_EVENT_ERROR_NETWORK] first={}, msg={}\x1b[0m",
+                data1 as usize,
+                to_string(data2 as *const _),
+            );
+        }
+        Event::ERROR_SELF_NOT_IN_GROUP => {
+            println!(
+                "\x1b[31m[DC_EVENT_ERROR_SELF_NOT_IN_GROUP] {}\x1b[0m",
+                to_string(data2 as *const _),
+            );
+        }
+        Event::MSGS_CHANGED => {
+            print!(
+                "\x1b[33m{{Received DC_EVENT_MSGS_CHANGED({}, {})}}\n\x1b[0m",
+                data1 as usize, data2 as usize,
+            );
+        }
+        Event::CONTACTS_CHANGED => {
             print!("\x1b[33m{{Received DC_EVENT_CONTACTS_CHANGED()}}\n\x1b[0m");
         }
-        Event::LocationChanged(contact) => {
+        Event::LOCATION_CHANGED => {
             print!(
-                "\x1b[33m{{Received DC_EVENT_LOCATION_CHANGED(contact={:?})}}\n\x1b[0m",
-                contact,
+                "\x1b[33m{{Received DC_EVENT_LOCATION_CHANGED(contact={})}}\n\x1b[0m",
+                data1 as usize,
             );
         }
-        Event::ConfigureProgress(progress) => {
+        Event::CONFIGURE_PROGRESS => {
             print!(
                 "\x1b[33m{{Received DC_EVENT_CONFIGURE_PROGRESS({} ‰)}}\n\x1b[0m",
-                progress,
+                data1 as usize,
             );
         }
-        Event::ImexProgress(progress) => {
+        Event::IMEX_PROGRESS => {
             print!(
                 "\x1b[33m{{Received DC_EVENT_IMEX_PROGRESS({} ‰)}}\n\x1b[0m",
-                progress,
+                data1 as usize,
             );
         }
-        Event::ImexFileWritten(file) => {
+        Event::IMEX_FILE_WRITTEN => {
             print!(
                 "\x1b[33m{{Received DC_EVENT_IMEX_FILE_WRITTEN({})}}\n\x1b[0m",
-                file.display()
+                to_string(data1 as *const _)
             );
         }
-        Event::ChatModified(chat) => {
+        Event::CHAT_MODIFIED => {
             print!(
                 "\x1b[33m{{Received DC_EVENT_CHAT_MODIFIED({})}}\n\x1b[0m",
-                chat
+                data1 as usize,
             );
         }
         _ => {
-            print!("\x1b[33m{{Received {:?}}}\n\x1b[0m", event);
+            print!(
+                "\x1b[33m{{Received {:?}({}, {})}}\n\x1b[0m",
+                event, data1 as usize, data2 as usize,
+            );
         }
     }
 
@@ -153,11 +173,13 @@ fn start_threads(c: Arc<RwLock<Context>>) {
     let ctx = c.clone();
     let handle_imap = std::thread::spawn(move || loop {
         while_running!({
-            perform_imap_jobs(&ctx.read().unwrap());
-            perform_imap_fetch(&ctx.read().unwrap());
+            unsafe {
+                dc_perform_imap_jobs(&ctx.read().unwrap());
+                dc_perform_imap_fetch(&ctx.read().unwrap());
+            }
             while_running!({
                 let context = ctx.read().unwrap();
-                perform_imap_idle(&context);
+                dc_perform_imap_idle(&context);
             });
         });
     });
@@ -165,9 +187,9 @@ fn start_threads(c: Arc<RwLock<Context>>) {
     let ctx = c.clone();
     let handle_mvbox = std::thread::spawn(move || loop {
         while_running!({
-            perform_mvbox_fetch(&ctx.read().unwrap());
+            unsafe { dc_perform_mvbox_fetch(&ctx.read().unwrap()) };
             while_running!({
-                perform_mvbox_idle(&ctx.read().unwrap());
+                unsafe { dc_perform_mvbox_idle(&ctx.read().unwrap()) };
             });
         });
     });
@@ -175,9 +197,9 @@ fn start_threads(c: Arc<RwLock<Context>>) {
     let ctx = c.clone();
     let handle_sentbox = std::thread::spawn(move || loop {
         while_running!({
-            perform_sentbox_fetch(&ctx.read().unwrap());
+            unsafe { dc_perform_sentbox_fetch(&ctx.read().unwrap()) };
             while_running!({
-                perform_sentbox_idle(&ctx.read().unwrap());
+                unsafe { dc_perform_sentbox_idle(&ctx.read().unwrap()) };
             });
         });
     });
@@ -185,9 +207,9 @@ fn start_threads(c: Arc<RwLock<Context>>) {
     let ctx = c;
     let handle_smtp = std::thread::spawn(move || loop {
         while_running!({
-            perform_smtp_jobs(&ctx.read().unwrap());
+            unsafe { dc_perform_smtp_jobs(&ctx.read().unwrap()) };
             while_running!({
-                perform_smtp_idle(&ctx.read().unwrap());
+                unsafe { dc_perform_smtp_idle(&ctx.read().unwrap()) };
             });
         });
     });
@@ -205,10 +227,12 @@ fn stop_threads(context: &Context) {
         println!("Stopping threads");
         IS_RUNNING.store(false, Ordering::Relaxed);
 
-        interrupt_imap_idle(context);
-        interrupt_mvbox_idle(context);
-        interrupt_sentbox_idle(context);
-        interrupt_smtp_idle(context);
+        unsafe {
+            dc_interrupt_imap_idle(context);
+            dc_interrupt_mvbox_idle(context);
+            dc_interrupt_sentbox_idle(context);
+            dc_interrupt_smtp_idle(context);
+        }
 
         handle.handle_imap.take().unwrap().join().unwrap();
         handle.handle_mvbox.take().unwrap().join().unwrap();
@@ -365,15 +389,21 @@ impl Highlighter for DcHelper {
 impl Helper for DcHelper {}
 
 fn main_0(args: Vec<String>) -> Result<(), failure::Error> {
-    if args.len() < 2 {
+    let mut context = dc_context_new(
+        Some(receive_event),
+        0 as *mut libc::c_void,
+        Some("CLI".into()),
+    );
+
+    unsafe { dc_cmdline_skip_auth() };
+
+    if args.len() == 2 {
+        if unsafe { !dc_open(&mut context, &args[1], None) } {
+            println!("Error: Cannot open {}.", args[0],);
+        }
+    } else if args.len() != 1 {
         println!("Error: Bad arguments, expected [db-name].");
-        return Err(format_err!("No db-name specified"));
     }
-    let context = Context::new(
-        Box::new(receive_event),
-        "CLI".into(),
-        Path::new(&args[1]).to_path_buf(),
-    )?;
 
     println!("Delta Chat Core is awaiting your commands.");
 
@@ -458,19 +488,19 @@ unsafe fn handle_cmd(line: &str, ctx: Arc<RwLock<Context>>) -> Result<ExitResult
             if HANDLE.clone().lock().unwrap().is_some() {
                 println!("smtp-jobs are already running in a thread.",);
             } else {
-                perform_smtp_jobs(&ctx.read().unwrap());
+                dc_perform_smtp_jobs(&ctx.read().unwrap());
             }
         }
         "imap-jobs" => {
             if HANDLE.clone().lock().unwrap().is_some() {
                 println!("imap-jobs are already running in a thread.");
             } else {
-                perform_imap_jobs(&ctx.read().unwrap());
+                dc_perform_imap_jobs(&ctx.read().unwrap());
             }
         }
         "configure" => {
             start_threads(ctx.clone());
-            configure(&ctx.read().unwrap());
+            dc_configure(&ctx.read().unwrap());
         }
         "oauth2" => {
             if let Some(addr) = ctx.read().unwrap().get_config(config::Config::Addr) {
@@ -494,27 +524,30 @@ unsafe fn handle_cmd(line: &str, ctx: Arc<RwLock<Context>>) -> Result<ExitResult
         }
         "getqr" | "getbadqr" => {
             start_threads(ctx.clone());
-            if let Some(mut qr) =
-                dc_get_securejoin_qr(&ctx.read().unwrap(), arg1.parse().unwrap_or_default())
-            {
-                if !qr.is_empty() {
-                    if arg0 == "getbadqr" && qr.len() > 40 {
-                        qr.replace_range(12..22, "0000000000")
+            let qrstr =
+                dc_get_securejoin_qr(&ctx.read().unwrap(), arg1.parse().unwrap_or_default());
+            if !qrstr.is_null() && 0 != *qrstr.offset(0isize) as libc::c_int {
+                if arg0 == "getbadqr" && strlen(qrstr) > 40 {
+                    let mut i: libc::c_int = 12i32;
+                    while i < 22i32 {
+                        *qrstr.offset(i as isize) = '0' as i32 as libc::c_char;
+                        i += 1
                     }
-                    println!("{}", qr);
-                    let output = Command::new("qrencode")
-                        .args(&["-t", "ansiutf8", qr.as_str(), "-o", "-"])
-                        .output()
-                        .expect("failed to execute process");
-                    io::stdout().write_all(&output.stdout).unwrap();
-                    io::stderr().write_all(&output.stderr).unwrap();
                 }
+                println!("{}", to_string(qrstr as *const _));
+                let syscmd = dc_mprintf(
+                    b"qrencode -t ansiutf8 \"%s\" -o -\x00" as *const u8 as *const libc::c_char,
+                    qrstr,
+                );
+                system(syscmd);
+                free(syscmd as *mut libc::c_void);
             }
+            free(qrstr as *mut libc::c_void);
         }
         "joinqr" => {
             start_threads(ctx.clone());
             if !arg0.is_empty() {
-                dc_join_securejoin(&ctx.read().unwrap(), arg1);
+                dc_join_securejoin(&ctx.read().unwrap(), arg1_c);
             }
         }
         "exit" | "quit" => return Ok(ExitResult::Exit),

examples/simple.rs

@@ -1,62 +1,64 @@
 extern crate deltachat;
 
+use std::ffi::CStr;
 use std::sync::{Arc, RwLock};
 use std::{thread, time};
 use tempfile::tempdir;
 
-use deltachat::chat;
 use deltachat::chatlist::*;
 use deltachat::config;
-use deltachat::configure::*;
+use deltachat::constants::Event;
 use deltachat::contact::*;
 use deltachat::context::*;
-use deltachat::job::{
-    perform_imap_fetch, perform_imap_idle, perform_imap_jobs, perform_smtp_idle, perform_smtp_jobs,
+use deltachat::dc_chat::*;
+use deltachat::dc_configure::*;
+use deltachat::dc_job::{
+    dc_perform_imap_fetch, dc_perform_imap_idle, dc_perform_imap_jobs, dc_perform_smtp_idle,
+    dc_perform_smtp_jobs,
 };
-use deltachat::Event;
+use deltachat::dc_lot::*;
 
-fn cb(_ctx: &Context, event: Event) -> usize {
-    print!("[{:?}]", event);
+extern "C" fn cb(_ctx: &Context, event: Event, data1: usize, data2: usize) -> usize {
+    println!("[{:?}]", event);
 
     match event {
-        Event::ConfigureProgress(progress) => {
-            print!("  progress: {}\n", progress);
+        Event::CONFIGURE_PROGRESS => {
+            println!("  progress: {}", data1);
             0
         }
-        Event::Info(msg) | Event::Warning(msg) | Event::Error(msg) | Event::ErrorNetwork(msg) => {
-            print!("  {}\n", msg);
-            0
-        }
-        _ => {
-            print!("\n");
+        Event::INFO | Event::WARNING | Event::ERROR | Event::ERROR_NETWORK => {
+            println!(
+                "  {}",
+                unsafe { CStr::from_ptr(data2 as *const _) }
+                    .to_str()
+                    .unwrap()
+            );
             0
         }
+        _ => 0,
     }
 }
 
 fn main() {
     unsafe {
-        let dir = tempdir().unwrap();
-        let dbfile = dir.path().join("db.sqlite");
-        println!("creating database {:?}", dbfile);
-        let ctx =
-            Context::new(Box::new(cb), "FakeOs".into(), dbfile).expect("Failed to create context");
+        let ctx = dc_context_new(Some(cb), std::ptr::null_mut(), None);
         let running = Arc::new(RwLock::new(true));
-        let info = ctx.get_info();
+        let info = dc_get_info(&ctx);
+        let info_s = CStr::from_ptr(info);
         let duration = time::Duration::from_millis(4000);
-        println!("info: {:#?}", info);
+        println!("info: {}", info_s.to_str().unwrap());
 
         let ctx = Arc::new(ctx);
         let ctx1 = ctx.clone();
         let r1 = running.clone();
         let t1 = thread::spawn(move || {
             while *r1.read().unwrap() {
-                perform_imap_jobs(&ctx1);
+                dc_perform_imap_jobs(&ctx1);
                 if *r1.read().unwrap() {
-                    perform_imap_fetch(&ctx1);
+                    dc_perform_imap_fetch(&ctx1);
 
                     if *r1.read().unwrap() {
-                        perform_imap_idle(&ctx1);
+                        dc_perform_imap_idle(&ctx1);
                     }
                 }
             }
@@ -66,13 +68,20 @@ fn main() {
         let r1 = running.clone();
         let t2 = thread::spawn(move || {
             while *r1.read().unwrap() {
-                perform_smtp_jobs(&ctx1);
+                dc_perform_smtp_jobs(&ctx1);
                 if *r1.read().unwrap() {
-                    perform_smtp_idle(&ctx1);
+                    dc_perform_smtp_idle(&ctx1);
                 }
             }
         });
 
+        let dir = tempdir().unwrap();
+        let dbfile = dir.path().join("db.sqlite");
+
+        println!("opening database {:?}", dbfile);
+
+        assert!(dc_open(&ctx, dbfile.to_str().unwrap(), None));
+
         println!("configuring");
         let args = std::env::args().collect::<Vec<String>>();
         assert_eq!(args.len(), 2, "missing password");
@@ -80,24 +89,36 @@ fn main() {
         ctx.set_config(config::Config::Addr, Some("d@testrun.org"))
             .unwrap();
         ctx.set_config(config::Config::MailPw, Some(&pw)).unwrap();
-        configure(&ctx);
+        dc_configure(&ctx);
 
         thread::sleep(duration);
 
         println!("sending a message");
         let contact_id =
             Contact::create(&ctx, "dignifiedquire", "dignifiedquire@gmail.com").unwrap();
-        let chat_id = chat::create_by_contact_id(&ctx, contact_id).unwrap();
-        chat::send_text_msg(&ctx, chat_id, "Hi, here is my first message!".into()).unwrap();
+        let chat_id = dc_create_chat_by_contact_id(&ctx, contact_id);
+        dc_send_text_msg(&ctx, chat_id, "Hi, here is my first message!".into());
 
         println!("fetching chats..");
         let chats = Chatlist::try_load(&ctx, 0, None, None).unwrap();
 
         for i in 0..chats.len() {
-            let summary = chats.get_summary(&ctx, 0, None);
-            let text1 = summary.get_text1();
-            let text2 = summary.get_text2();
-            println!("chat: {} - {:?} - {:?}", i, text1, text2,);
+            let summary = chats.get_summary(0, std::ptr::null_mut());
+            let text1 = dc_lot_get_text1(summary);
+            let text2 = dc_lot_get_text2(summary);
+
+            let text1_s = if !text1.is_null() {
+                Some(CStr::from_ptr(text1))
+            } else {
+                None
+            };
+            let text2_s = if !text2.is_null() {
+                Some(CStr::from_ptr(text2))
+            } else {
+                None
+            };
+            println!("chat: {} - {:?} - {:?}", i, text1_s, text2_s,);
+            dc_lot_unref(summary);
         }
 
         thread::sleep(duration);
@@ -115,13 +136,14 @@ fn main() {
         println!("stopping threads");
 
         *running.clone().write().unwrap() = false;
-        deltachat::job::interrupt_imap_idle(&ctx);
-        deltachat::job::interrupt_smtp_idle(&ctx);
+        deltachat::dc_job::dc_interrupt_imap_idle(&ctx);
+        deltachat::dc_job::dc_interrupt_smtp_idle(&ctx);
 
         println!("joining");
         t1.join().unwrap();
         t2.join().unwrap();
 
         println!("closing");
+        dc_close(&ctx);
     }
 }

proptest-regressions/dc_strencode.txt

@@ -1,7 +0,0 @@
-# Seeds for failure cases proptest has generated in the past. It is
-# automatically read and these particular cases re-run before any
-# novel cases are generated.
-#
-# It is recommended to check this file in to source control so that
-# everyone who runs the test benefits from these saved cases.
-cc 679506fe9ac59df773f8cfa800fdab5f0a32fe49d2ab370394000a1aa5bc2a72 # shrinks to buf = "%0A"

proptest-regressions/dc_tools.txt

@@ -1,9 +0,0 @@
-# Seeds for failure cases proptest has generated in the past. It is
-# automatically read and these particular cases re-run before any
-# novel cases are generated.
-#
-# It is recommended to check this file in to source control so that
-# everyone who runs the test benefits from these saved cases.
-cc c310754465ee0261807b96fa9bcc4861ff9aa286e94667524b5960c69f9b6620 # shrinks to buf = "", approx_chars = 0, do_unwrap = false
-cc 5fd8d730b0a9cdf7308ce58818ca9aefc0255c9ba2a0878944fc48d43a67315b # shrinks to buf = "𑒀ὐ￠🜀\u{1e01b}A a🟠", approx_chars = 0, do_unwrap = false
-cc c6a0029a54137a4b9efc9ef2ea6d9a7dd1d60d1c937bb472b66a174618ba8013 # shrinks to buf = "𐠈0Aᝮa𫝀®!ꫛa¡0A𐢧00𐹠®A  丽ⷐએ  ", approx_chars = 0, do_unwrap = false

python/README.rst

@@ -65,17 +65,17 @@ Afterwards ``which python`` tells you that it comes out of the "venv"
 directory that contains all python install artifacts. Let's first
 install test tools::
 
-    pip install pytest pytest-timeout pytest-rerunfailures requests
+    pip install pytest pytest-timeout requests
 
 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
 

python/doc/api.rst

@@ -37,3 +37,16 @@ Message
 .. autoclass:: deltachat.message.Message
     :members:
 
+MessageType
+------------
+
+.. autoclass:: deltachat.message.MessageType
+    :members:
+
+MessageState
+------------
+
+.. autoclass:: deltachat.message.MessageState
+    :members:
+
+

python/doc/examples.rst

@@ -8,7 +8,8 @@ Playing around on the commandline
 ----------------------------------
 
 Once you have :doc:`installed deltachat bindings <install>`
-you can start playing from the python interpreter commandline.
+you can start playing from the python interpreter commandline::
+
 For example you can type ``python`` and then::
 
     # instantiate and configure deltachat account
@@ -22,7 +23,7 @@ For example you can type ``python`` and then::
     # create a contact and send a message
     contact = ac.create_contact("someother@email.address")
     chat = ac.create_chat_by_contact(contact)
-    chat.send_text("hi from the python interpreter command line")
+    chat.send_text_message("hi from the python interpreter command line")
 
 Checkout our :doc:`api` for the various high-level things you can do
 to send/receive messages, create contacts and chats.

python/src/deltachat/__init__.py

@@ -34,14 +34,13 @@ def py_dc_callback(ctx, evt, data1, data2):
     if data1 and event_sig_types & 1:
         data1 = ffi.string(ffi.cast('char*', data1)).decode("utf8")
     if data2 and event_sig_types & 2:
-        data2 = ffi.string(ffi.cast('char*', data2)).decode("utf8")
         try:
-            if isinstance(data2, bytes):
-                data2 = data2.decode("utf8")
+            data2 = ffi.string(ffi.cast('char*', data2)).decode("utf8")
         except UnicodeDecodeError:
-            # XXX ignoring the decode error is not quite correct but for now
+            # XXX ignoring this error is not quite correct but for now
             # i don't want to hunt down encoding problems in the c lib
-            pass
+            data2 = ffi.string(ffi.cast('char*', data2))
+
     try:
         ret = callback(ctx, evt_name, data1, data2)
         if ret is None:

python/src/deltachat/account.py

@@ -14,7 +14,7 @@ except ImportError:
 import deltachat
 from . import const
 from .capi import ffi, lib
-from .cutil import as_dc_charpointer, from_dc_charpointer, iter_array, DCLot
+from .cutil import as_dc_charpointer, from_dc_charpointer, iter_array
 from .chatting import Contact, Chat, Message
 
 
@@ -176,7 +176,7 @@ class Account(object):
                       whose name or e-mail matches query.
         :param only_verified: if true only return verified contacts.
         :param with_self: if true the self-contact is also returned.
-        :returns: list of :class:`deltachat.chatting.Contact` objects.
+        :returns: list of :class:`deltachat.message.Message` objects.
         """
         flags = 0
         query = as_dc_charpointer(query)
@@ -329,56 +329,6 @@ class Account(object):
             raise RuntimeError("could not send out autocrypt setup message")
         return from_dc_charpointer(res)
 
-    def get_setup_contact_qr(self):
-        """ get/create Setup-Contact QR Code as ascii-string.
-
-        this string needs to be transferred to another DC account
-        in a second channel (typically used by mobiles with QRcode-show + scan UX)
-        where qr_setup_contact(qr) is called.
-        """
-        res = lib.dc_get_securejoin_qr(self._dc_context, 0)
-        return from_dc_charpointer(res)
-
-    def check_qr(self, qr):
-        """ check qr code and return :class:`ScannedQRCode` instance representing the result"""
-        res = ffi.gc(
-            lib.dc_check_qr(self._dc_context, as_dc_charpointer(qr)),
-            lib.dc_lot_unref
-        )
-        lot = DCLot(res)
-        if lot.state() == const.DC_QR_ERROR:
-            raise ValueError("invalid or unknown QR code: {}".format(lot.text1()))
-        return ScannedQRCode(lot)
-
-    def qr_setup_contact(self, qr):
-        """ setup contact and return a Chat after contact is established.
-
-        Note that this function may block for a long time as messages are exchanged
-        with the emitter of the QR code.  On success a :class:`deltachat.chatting.Chat` instance
-        is returned.
-        :param qr: valid "setup contact" QR code (all other QR codes will result in an exception)
-        """
-        assert self.check_qr(qr).is_ask_verifycontact()
-        chat_id = lib.dc_join_securejoin(self._dc_context, as_dc_charpointer(qr))
-        if chat_id == 0:
-            raise ValueError("could not setup secure contact")
-        return Chat(self, chat_id)
-
-    def qr_join_chat(self, qr):
-        """ join a chat group through a QR code.
-
-        Note that this function may block for a long time as messages are exchanged
-        with the emitter of the QR code.  On success a :class:`deltachat.chatting.Chat` instance
-        is returned which is the chat that we just joined.
-
-        :param qr: valid "join-group" QR code (all other QR codes will result in an exception)
-        """
-        assert self.check_qr(qr).is_ask_verifygroup()
-        chat_id = lib.dc_join_securejoin(self._dc_context, as_dc_charpointer(qr))
-        if chat_id == 0:
-            raise ValueError("could not join group")
-        return Chat(self, chat_id)
-
     def start_threads(self):
         """ start IMAP/SMTP threads (and configure account if it hasn't happened).
 
@@ -483,10 +433,6 @@ class EventLogger:
     def set_timeout(self, timeout):
         self._timeout = timeout
 
-    def consume_events(self, check_error=True):
-        while not self._event_queue.empty():
-            self.get()
-
     def get(self, timeout=None, check_error=True):
         timeout = timeout or self._timeout
         ev = self._event_queue.get(timeout=timeout)
@@ -546,18 +492,3 @@ def _destroy_dc_context(dc_context, dc_context_unref=lib.dc_context_unref):
         # we are deep into Python Interpreter shutdown,
         # so no need to clear the callback context mapping.
         pass
-
-
-class ScannedQRCode:
-    def __init__(self, dc_lot):
-        self._dc_lot = dc_lot
-
-    def is_ask_verifycontact(self):
-        return self._dc_lot.state() == const.DC_QR_ASK_VERIFYCONTACT
-
-    def is_ask_verifygroup(self):
-        return self._dc_lot.state() == const.DC_QR_ASK_VERIFYGROUP
-
-    @property
-    def contact_id(self):
-        return self._dc_lot.id()

python/src/deltachat/chatting.py

@@ -1,7 +1,6 @@
 """ chatting related objects: Contact, Chat, Message. """
 
 import mimetypes
-import os
 from . import props
 from .cutil import as_dc_charpointer, from_dc_charpointer, iter_array
 from .capi import lib, ffi
@@ -132,16 +131,6 @@ class Chat(object):
         """
         return lib.dc_chat_get_type(self._dc_chat)
 
-    def get_join_qr(self):
-        """ get/create Join-Group QR Code as ascii-string.
-
-        this string needs to be transferred to another DC account
-        in a second channel (typically used by mobiles with QRcode-show + scan UX)
-        where account.join_with_qrcode(qr) needs to be called.
-        """
-        res = lib.dc_get_securejoin_qr(self._dc_context, self.id)
-        return from_dc_charpointer(res)
-
     # ------  chat messaging API ------------------------------
 
     def send_text(self, text):
@@ -316,46 +305,3 @@ class Chat(object):
         return list(iter_array(
             dc_array, lambda id: Contact(self._dc_context, id))
         )
-
-    def set_profile_image(self, img_path):
-        """Set group profile image.
-
-        If the group is already promoted (any message was sent to the group),
-        all group members are informed by a special status message that is sent
-        automatically by this function.
-        :params img_path: path to image object
-        :raises ValueError: if profile image could not be set
-        :returns: None
-        """
-        assert os.path.exists(img_path), img_path
-        p = as_dc_charpointer(img_path)
-        res = lib.dc_set_chat_profile_image(self._dc_context, self.id, p)
-        if res != 1:
-            raise ValueError("Setting Profile Image {!r} failed".format(p))
-
-    def remove_profile_image(self):
-        """remove group profile image.
-
-        If the group is already promoted (any message was sent to the group),
-        all group members are informed by a special status message that is sent
-        automatically by this function.
-        :raises ValueError: if profile image could not be reset
-        :returns: None
-        """
-        res = lib.dc_set_chat_profile_image(self._dc_context, self.id, ffi.NULL)
-        if res != 1:
-            raise ValueError("Removing Profile Image failed")
-
-    def get_profile_image(self):
-        """Get group profile image.
-
-        For groups, this is the image set by any group member using
-        set_chat_profile_image(). For normal chats, this is the image
-        set by each remote user on their own using dc_set_config(context,
-        "selfavatar", image).
-        :returns: path to profile image, None if no profile image exists.
-        """
-        dc_res = lib.dc_chat_get_profile_image(self._dc_chat)
-        if dc_res == ffi.NULL:
-            return None
-        return from_dc_charpointer(dc_res)

python/src/deltachat/const.py

@@ -13,15 +13,6 @@ DC_GCL_NO_SPECIALS = 0x02
 DC_GCL_ADD_ALLDONE_HINT = 0x04
 DC_GCL_VERIFIED_ONLY = 0x01
 DC_GCL_ADD_SELF = 0x02
-DC_QR_ASK_VERIFYCONTACT = 200
-DC_QR_ASK_VERIFYGROUP = 202
-DC_QR_FPR_OK = 210
-DC_QR_FPR_MISMATCH = 220
-DC_QR_FPR_WITHOUT_ADDR = 230
-DC_QR_ADDR = 320
-DC_QR_TEXT = 330
-DC_QR_URL = 332
-DC_QR_ERROR = 400
 DC_CHAT_ID_DEADDROP = 1
 DC_CHAT_ID_TRASH = 3
 DC_CHAT_ID_MSGS_IN_CREATION = 4
@@ -78,13 +69,15 @@ DC_EVENT_IMEX_FILE_WRITTEN = 2052
 DC_EVENT_SECUREJOIN_INVITER_PROGRESS = 2060
 DC_EVENT_SECUREJOIN_JOINER_PROGRESS = 2061
 DC_EVENT_GET_STRING = 2091
+DC_EVENT_HTTP_GET = 2100
+DC_EVENT_HTTP_POST = 2110
 DC_EVENT_FILE_COPIED = 2055
 DC_EVENT_IS_OFFLINE = 2081
 # end const generated
 
 
 def read_event_defines(f):
-    rex = re.compile(r'#define\s+((?:DC_EVENT_|DC_QR|DC_MSG|DC_STATE_|DC_CONTACT_ID_|DC_GCL|DC_CHAT)\S+)\s+([x\d]+).*')
+    rex = re.compile(r'#define\s+((?:DC_EVENT_|DC_MSG|DC_STATE_|DC_CONTACT_ID_|DC_GCL|DC_CHAT)\S+)\s+([x\d]+).*')
     for line in f:
         m = rex.match(line)
         if m:
@@ -97,7 +90,7 @@ if __name__ == "__main__":
     if len(sys.argv) >= 2:
         deltah = sys.argv[1]
     else:
-        deltah = joinpath(dirname(dirname(dirname(here_dir))), "deltachat-ffi", "deltachat.h")
+        deltah = joinpath(dirname(dirname(dirname(here_dir))), "src", "deltachat.h")
     assert os.path.exists(deltah)
 
     lines = []

python/src/deltachat/cutil.py

@@ -1,6 +1,5 @@
 from .capi import lib
 from .capi import ffi
-from datetime import datetime
 
 
 def as_dc_charpointer(obj):
@@ -17,30 +16,4 @@ def iter_array(dc_array_t, constructor):
 
 
 def from_dc_charpointer(obj):
-    return ffi.string(ffi.gc(obj, lib.dc_str_unref)).decode("utf8")
-
-
-class DCLot:
-    def __init__(self, dc_lot):
-        self._dc_lot = dc_lot
-
-    def id(self):
-        return lib.dc_lot_get_id(self._dc_lot)
-
-    def state(self):
-        return lib.dc_lot_get_state(self._dc_lot)
-
-    def text1(self):
-        return from_dc_charpointer(lib.dc_lot_get_text1(self._dc_lot))
-
-    def text1_meaning(self):
-        return lib.dc_lot_get_text1_meaning(self._dc_lot)
-
-    def text2(self):
-        return from_dc_charpointer(lib.dc_lot_get_text2(self._dc_lot))
-
-    def timestamp(self):
-        ts = lib.dc_lot_get_timestamp(self._dc_lot)
-        if ts == 0:
-            return None
-        return datetime.utcfromtimestamp(ts)
+    return ffi.string(obj).decode("utf8")

python/src/deltachat/message.py

@@ -142,7 +142,7 @@ class Message(object):
         import email.parser
         mime_headers = lib.dc_get_mime_headers(self._dc_context, self.id)
         if mime_headers:
-            s = ffi.string(ffi.gc(mime_headers, lib.dc_str_unref))
+            s = ffi.string(mime_headers)
             if isinstance(s, bytes):
                 s = s.decode("ascii")
             return email.message_from_string(s)

python/tests/conftest.py

@@ -213,15 +213,6 @@ def wait_configuration_progress(account, target):
             break
 
 
-def wait_securejoin_inviter_progress(account, target):
-    while 1:
-        evt_name, data1, data2 = \
-            account._evlogger.get_matching("DC_EVENT_SECUREJOIN_INVITER_PROGRESS")
-        if data2 >= target:
-            print("** SECUREJOINT-INVITER PROGRESS {}".format(target), account)
-            break
-
-
 def wait_successful_IMAP_SMTP_connection(account):
     imap_ok = smtp_ok = False
     while not imap_ok or not smtp_ok:

python/tests/test_account.py

@@ -4,7 +4,7 @@ import os
 from deltachat import const, Account
 from deltachat.message import Message
 from datetime import datetime, timedelta
-from conftest import wait_configuration_progress, wait_successful_IMAP_SMTP_connection, wait_securejoin_inviter_progress
+from conftest import wait_configuration_progress, wait_successful_IMAP_SMTP_connection
 
 
 class TestOfflineAccountBasic:
@@ -140,22 +140,6 @@ class TestOfflineChat:
         chat.set_name("title2")
         assert chat.get_name() == "title2"
 
-    @pytest.mark.parametrize("verified", [True, False])
-    def test_group_chat_qr(self, acfactory, ac1, verified):
-        ac2 = acfactory.get_configured_offline_account()
-        chat = ac1.create_group_chat(name="title1", verified=verified)
-        qr = chat.get_join_qr()
-        assert ac2.check_qr(qr).is_ask_verifygroup
-
-    def test_get_set_profile_image_simple(self, ac1, data):
-        chat = ac1.create_group_chat(name="title1")
-        p = data.get_path("d.png")
-        chat.set_profile_image(p)
-        p2 = chat.get_profile_image()
-        assert open(p, "rb").read() == open(p2, "rb").read()
-        chat.remove_profile_image()
-        assert chat.get_profile_image() is None
-
     def test_delete_and_send_fails(self, ac1, chat1):
         chat1.delete()
         ac1._evlogger.get_matching("DC_EVENT_MSGS_CHANGED")
@@ -322,16 +306,6 @@ class TestOfflineChat:
         chat1.set_draft(None)
         assert chat1.get_draft() is None
 
-    def test_qr_setup_contact(self, acfactory, lp):
-        ac1 = acfactory.get_configured_offline_account()
-        ac2 = acfactory.get_configured_offline_account()
-        qr = ac1.get_setup_contact_qr()
-        assert qr.startswith("OPENPGP4FPR:")
-        res = ac2.check_qr(qr)
-        assert res.is_ask_verifycontact()
-        assert not res.is_ask_verifygroup()
-        assert res.contact_id == 10
-
 
 class TestOnlineAccount:
     def test_one_account_init(self, acfactory):
@@ -572,85 +546,3 @@ class TestOnlineAccount:
         print("*************** Setup Code: ", setup_code)
         msg.continue_key_transfer(setup_code)
         assert ac1.get_info()["fingerprint"] == ac2.get_info()["fingerprint"]
-
-    def test_qr_setup_contact(self, acfactory, lp):
-        ac1 = acfactory.get_online_configuring_account()
-        ac2 = acfactory.get_online_configuring_account()
-        wait_configuration_progress(ac2, 1000)
-        wait_configuration_progress(ac1, 1000)
-        lp.sec("ac1: create QR code and let ac2 scan it, starting the securejoin")
-        qr = ac1.get_setup_contact_qr()
-        lp.sec("ac2: start QR-code based setup contact protocol")
-        ch = ac2.qr_setup_contact(qr)
-        assert ch.id >= 10
-        wait_securejoin_inviter_progress(ac1, 1000)
-
-    def test_qr_join_chat(self, acfactory, lp):
-        ac1 = acfactory.get_online_configuring_account()
-        ac2 = acfactory.get_online_configuring_account()
-        wait_configuration_progress(ac2, 1000)
-        wait_configuration_progress(ac1, 1000)
-        lp.sec("ac1: create QR code and let ac2 scan it, starting the securejoin")
-
-        chat = ac1.create_group_chat("hello")
-        qr = chat.get_join_qr()
-        lp.sec("ac2: start QR-code based join-group protocol")
-        ch = ac2.qr_join_chat(qr)
-        assert ch.id >= 10
-        wait_securejoin_inviter_progress(ac1, 1000)
-
-    def test_set_get_profile_image(self, acfactory, data, lp):
-        ac1 = acfactory.get_online_configuring_account()
-        ac2 = acfactory.get_online_configuring_account()
-        wait_configuration_progress(ac2, 1000)
-        wait_configuration_progress(ac1, 1000)
-
-        lp.sec("create unpromoted group chat")
-        chat = ac1.create_group_chat("hello")
-        p = data.get_path("d.png")
-
-        lp.sec("ac1: set profile image on unpromoted chat")
-        chat.set_profile_image(p)
-        ac1._evlogger.get_matching("DC_EVENT_CHAT_MODIFIED")
-        assert not chat.is_promoted()
-
-        lp.sec("ac1: send text to promote chat (XXX without contact added)")
-        # XXX first promote the chat before adding contact
-        # because DC does not send out profile images for unpromoted chats
-        # otherwise
-        chat.send_text("ac1: initial message to promote chat (workaround)")
-        assert chat.is_promoted()
-
-        lp.sec("ac2: add ac1 to a chat so the message does not land in DEADDROP")
-        c1 = ac2.create_contact(email=ac1.get_config("addr"))
-        ac2.create_chat_by_contact(c1)
-        ev = ac2._evlogger.get_matching("DC_EVENT_MSGS_CHANGED")
-
-        lp.sec("ac1: add ac2 to promoted group chat")
-        c2 = ac1.create_contact(email=ac2.get_config("addr"))
-        chat.add_contact(c2)
-
-        lp.sec("ac1: send a first message to ac2")
-        chat.send_text("hi")
-        assert chat.is_promoted()
-
-        lp.sec("ac2: wait for receiving message from ac1")
-        ev = ac2._evlogger.get_matching("DC_EVENT_INCOMING_MSG")
-        msg_in = ac2.get_message_by_id(ev[2])
-        assert not msg_in.chat.is_deaddrop()
-
-        lp.sec("ac2: create chat and read profile image")
-        chat2 = ac2.create_chat_by_message(msg_in)
-        p2 = chat2.get_profile_image()
-        assert p2 is not None
-        assert open(p2, "rb").read() == open(p, "rb").read()
-
-        ac2._evlogger.consume_events()
-        ac1._evlogger.consume_events()
-        lp.sec("ac2: delete profile image from chat")
-        chat2.remove_profile_image()
-        ev = ac1._evlogger.get_matching("DC_EVENT_INCOMING_MSG")
-        assert ev[1] == chat.id
-        chat1b = ac1.create_chat_by_message(ev[2])
-        assert chat1b.get_profile_image() is None
-        assert chat.get_profile_image() is None

python/tests/test_lowlevel.py

@@ -17,19 +17,11 @@ def test_callback_None2int():
     clear_context_callback(ctx)
 
 
-def test_dc_close_events(tmpdir):
-    ctx = ffi.gc(
-        capi.lib.dc_context_new(capi.lib.py_dc_callback, ffi.NULL, ffi.NULL),
-        lib.dc_context_unref,
-    )
+def test_dc_close_events():
+    ctx = capi.lib.dc_context_new(capi.lib.py_dc_callback, ffi.NULL, ffi.NULL)
     evlog = EventLogger(ctx)
     evlog.set_timeout(5)
-    set_context_callback(
-        ctx,
-        lambda ctx, evt_name, data1, data2: evlog(evt_name, data1, data2)
-    )
-    p = tmpdir.join("hello.db")
-    lib.dc_open(ctx, p.strpath.encode("ascii"), ffi.NULL)
+    set_context_callback(ctx, lambda ctx, evt_name, data1, data2: evlog(evt_name, data1, data2))
     capi.lib.dc_close(ctx)
 
     def find(info_string):

python/tox.ini

@@ -1,6 +1,7 @@
 [tox]
 # make sure to update environment list in travis.yml and appveyor.yml
 envlist =
+    py27
     py35
     lint
     auditwheels
@@ -16,10 +17,7 @@ passenv =
     DCC_PY_LIVECONFIG
 deps = 
     pytest
-    pytest-rerunfailures
-    pytest-timeout
-    pytest-xdist
-    auditwheel
+    pytest-faulthandler
     pdbpp
     requests
 
@@ -54,12 +52,11 @@ commands =
 
 
 [pytest]
-addopts = -v -rs --reruns 3 --reruns-delay 2
+addopts = -v -rs
 python_files = tests/test_*.py 
 norecursedirs = .tox 
 xfail_strict=true
-timeout = 60 
-timeout_method = thread
+timeout = 60
 
 [flake8]
 max-line-length = 120

rust-toolchain

@@ -1 +1 @@
-nightly-2019-08-13
+nightly-2019-07-10

src/aheader.rs

@@ -7,6 +7,7 @@ use mmime::mailimf_types::*;
 
 use crate::constants::*;
 use crate::contact::*;
+use crate::dc_tools::as_str;
 use crate::key::*;
 
 /// Possible values for encryption preference
@@ -63,8 +64,11 @@ impl Aheader {
         }
     }
 
-    pub fn from_imffields(wanted_from: &str, header: *const mailimf_fields) -> Option<Self> {
-        if header.is_null() {
+    pub fn from_imffields(
+        wanted_from: *const libc::c_char,
+        header: *const mailimf_fields,
+    ) -> Option<Self> {
+        if wanted_from.is_null() || header.is_null() {
             return None;
         }
 
@@ -90,7 +94,7 @@ impl Aheader {
 
                     match Self::from_str(value) {
                         Ok(test) => {
-                            if addr_cmp(&test.addr, wanted_from) {
+                            if addr_cmp(&test.addr, as_str(wanted_from)) {
                                 if fine_header.is_none() {
                                     fine_header = Some(test);
                                 } else {

src/chatlist.rs

@@ -1,10 +1,11 @@
-use crate::chat::*;
 use crate::constants::*;
 use crate::contact::*;
 use crate::context::*;
+use crate::dc_chat::*;
+use crate::dc_lot::*;
+use crate::dc_msg::*;
+use crate::dc_tools::*;
 use crate::error::Result;
-use crate::lot::Lot;
-use crate::message::*;
 use crate::stock::StockMessage;
 
 /// An object representing a single chatlist in memory.
@@ -31,13 +32,17 @@ use crate::stock::StockMessage;
 /// first entry and only present on new messages, there is the rough idea that it can be optionally always
 /// present and sorted into the list by date. Rendering the deaddrop in the described way
 /// would not add extra work in the UI then.
-#[derive(Debug)]
-pub struct Chatlist {
+pub struct Chatlist<'a> {
+    context: &'a Context,
     /// Stores pairs of `chat_id, message_id`
     ids: Vec<(u32, u32)>,
 }
 
-impl Chatlist {
+impl<'a> Chatlist<'a> {
+    pub fn get_context(&self) -> &Context {
+        self.context
+    }
+
     /// Get a list of chats.
     /// The list can be filtered by query parameters.
     ///
@@ -81,7 +86,7 @@ impl Chatlist {
     /// `query_contact_id`: An optional contact ID for filtering the list. Only chats including this contact ID
     ///     are returned.
     pub fn try_load(
-        context: &Context,
+        context: &'a Context,
         listflags: usize,
         query: Option<&str>,
         query_contact_id: Option<u32>,
@@ -191,12 +196,12 @@ impl Chatlist {
 
         if 0 != add_archived_link_item && dc_get_archived_cnt(context) > 0 {
             if ids.is_empty() && 0 != listflags & DC_GCL_ADD_ALLDONE_HINT {
-                ids.push((DC_CHAT_ID_ALLDONE_HINT, 0));
+                ids.push((DC_CHAT_ID_ALLDONE_HINT as u32, 0));
             }
-            ids.push((DC_CHAT_ID_ARCHIVED_LINK, 0));
+            ids.push((DC_CHAT_ID_ARCHIVED_LINK as u32, 0));
         }
 
-        Ok(Chatlist { ids })
+        Ok(Chatlist { context, ids })
     }
 
     /// Find out the number of chats.
@@ -243,58 +248,57 @@ impl Chatlist {
     /// - dc_lot_t::timestamp: the timestamp of the message.  0 if not applicable.
     /// - dc_lot_t::state: The state of the message as one of the DC_STATE_* constants (see #dc_msg_get_state()).
     //    0 if not applicable.
-    pub fn get_summary(&self, context: &Context, index: usize, chat: Option<&Chat>) -> Lot {
+    pub unsafe fn get_summary(&self, index: usize, mut chat: *mut Chat<'a>) -> *mut dc_lot_t {
         // The summary is created by the chat, not by the last message.
         // This is because we may want to display drafts here or stuff as
         // "is typing".
         // Also, sth. as "No messages" would not work if the summary comes from a message.
 
-        let mut ret = Lot::new();
+        let mut ret = dc_lot_new();
         if index >= self.ids.len() {
-            ret.text2 = Some("ErrBadChatlistIndex".to_string());
+            (*ret).text2 = "ErrBadChatlistIndex".strdup();
             return ret;
         }
 
-        let chat_loaded: Chat;
-        let chat = if let Some(chat) = chat {
-            chat
-        } else {
-            if let Ok(chat) = Chat::load_from_db(context, self.ids[index].0) {
-                chat_loaded = chat;
-                &chat_loaded
-            } else {
-                return ret;
-            }
-        };
-
         let lastmsg_id = self.ids[index].1;
         let mut lastcontact = None;
 
-        let lastmsg = if 0 != lastmsg_id {
-            if let Ok(lastmsg) = dc_msg_load_from_db(context, lastmsg_id) {
-                if lastmsg.from_id != 1 as libc::c_uint
-                    && (chat.typ == Chattype::Group || chat.typ == Chattype::VerifiedGroup)
-                {
-                    lastcontact = Contact::load_from_db(context, lastmsg.from_id).ok();
-                }
+        if chat.is_null() {
+            chat = dc_chat_new(self.context);
+            let chat_to_delete = chat;
+            if !dc_chat_load_from_db(chat, self.ids[index].0) {
+                (*ret).text2 = "ErrCannotReadChat".strdup();
+                dc_chat_unref(chat_to_delete);
 
-                Some(lastmsg)
-            } else {
-                None
+                return ret;
             }
+        }
+
+        let lastmsg = if 0 != lastmsg_id {
+            let lastmsg = dc_msg_new_untyped(self.context);
+            dc_msg_load_from_db(lastmsg, self.context, lastmsg_id);
+
+            if (*lastmsg).from_id != 1 as libc::c_uint
+                && ((*chat).type_0 == DC_CHAT_TYPE_GROUP
+                    || (*chat).type_0 == DC_CHAT_TYPE_VERIFIED_GROUP)
+            {
+                lastcontact = Contact::load_from_db(self.context, (*lastmsg).from_id).ok();
+            }
+            lastmsg
         } else {
-            None
+            std::ptr::null_mut()
         };
 
-        if chat.id == DC_CHAT_ID_ARCHIVED_LINK {
-            ret.text2 = None;
-        } else if lastmsg.is_none() || lastmsg.as_ref().unwrap().from_id == DC_CONTACT_ID_UNDEFINED
-        {
-            ret.text2 = Some(context.stock_str(StockMessage::NoMessages).to_string());
+        if (*chat).id == DC_CHAT_ID_ARCHIVED_LINK as u32 {
+            (*ret).text2 = dc_strdup(0 as *const libc::c_char)
+        } else if lastmsg.is_null() || (*lastmsg).from_id == DC_CONTACT_ID_UNDEFINED as u32 {
+            (*ret).text2 = self.context.stock_str(StockMessage::NoMessages).strdup();
         } else {
-            ret.fill(&mut lastmsg.unwrap(), chat, lastcontact.as_ref(), context);
+            dc_lot_fill(ret, lastmsg, chat, lastcontact.as_ref(), self.context);
         }
 
+        dc_msg_unref(lastmsg);
+
         ret
     }
 }
@@ -302,10 +306,11 @@ impl Chatlist {
 pub fn dc_get_archived_cnt(context: &Context) -> u32 {
     context
         .sql
-        .query_get_value(
+        .query_row_col(
             context,
             "SELECT COUNT(*) FROM chats WHERE blocked=0 AND archived=1;",
             params![],
+            0,
         )
         .unwrap_or_default()
 }
@@ -315,7 +320,7 @@ fn get_last_deaddrop_fresh_msg(context: &Context) -> u32 {
     // only few fresh messages.
     context
         .sql
-        .query_get_value(
+        .query_row_col(
             context,
             "SELECT m.id  FROM msgs m  LEFT JOIN chats c ON c.id=m.chat_id  \
              WHERE m.state=10   \
@@ -323,6 +328,7 @@ fn get_last_deaddrop_fresh_msg(context: &Context) -> u32 {
              AND c.blocked=2 \
              ORDER BY m.timestamp DESC, m.id DESC;",
             params![],
+            0,
         )
         .unwrap_or_default()
 }

src/config.rs

@@ -3,9 +3,9 @@ use strum_macros::{AsRefStr, Display, EnumIter, EnumProperty, EnumString};
 
 use crate::constants::DC_VERSION_STR;
 use crate::context::Context;
+use crate::dc_job::*;
 use crate::dc_tools::*;
 use crate::error::Error;
-use crate::job::*;
 use crate::stock::StockMessage;
 
 /// The available configuration keys.
@@ -33,7 +33,6 @@ pub enum Config {
     E2eeEnabled,
     #[strum(props(default = "1"))]
     MdnsEnabled,
-    #[strum(props(default = "1"))]
     InboxWatch,
     #[strum(props(default = "1"))]
     SentboxWatch,
@@ -49,14 +48,11 @@ pub enum Config {
     ConfiguredMailUser,
     ConfiguredMailPw,
     ConfiguredMailPort,
-    ConfiguredMailSecurity,
     ConfiguredSendServer,
     ConfiguredSendUser,
     ConfiguredSendPw,
     ConfiguredSendPort,
     ConfiguredServerFlags,
-    ConfiguredSendSecurity,
-    ConfiguredE2EEEnabled,
     Configured,
     // Deprecated
     #[strum(serialize = "sys.version")]
@@ -73,9 +69,9 @@ impl Context {
         let value = match key {
             Config::Selfavatar => {
                 let rel_path = self.sql.get_config(self, key);
-                rel_path.map(|p| dc_get_abs_path(self, &p).to_str().unwrap().to_string())
+                rel_path.map(|p| dc_get_abs_path_safe(self, &p).to_str().unwrap().to_string())
             }
-            Config::SysVersion => Some((&*DC_VERSION_STR).clone()),
+            Config::SysVersion => Some(std::str::from_utf8(DC_VERSION_STR).unwrap().into()),
             Config::SysMsgsizeMaxRecommended => Some(format!("{}", 24 * 1024 * 1024 / 4 * 3)),
             Config::SysConfigKeys => Some(get_config_keys_string()),
             _ => self.sql.get_config(self, key),
@@ -103,17 +99,17 @@ impl Context {
             }
             Config::InboxWatch => {
                 let ret = self.sql.set_config(self, key, value);
-                interrupt_imap_idle(self);
+                unsafe { dc_interrupt_imap_idle(self) };
                 ret
             }
             Config::SentboxWatch => {
                 let ret = self.sql.set_config(self, key, value);
-                interrupt_sentbox_idle(self);
+                unsafe { dc_interrupt_sentbox_idle(self) };
                 ret
             }
             Config::MvboxWatch => {
                 let ret = self.sql.set_config(self, key, value);
-                interrupt_mvbox_idle(self);
+                unsafe { dc_interrupt_mvbox_idle(self) };
                 ret
             }
             Config::Selfstatus => {
@@ -124,7 +120,8 @@ impl Context {
                     value
                 };
 
-                self.sql.set_config(self, key, val)
+                let ret = self.sql.set_config(self, key, val);
+                ret
             }
             _ => self.sql.set_config(self, key, value),
         }

src/configure/auto_mozilla.rs

@@ -1,213 +0,0 @@
-use quick_xml;
-use quick_xml::events::{BytesEnd, BytesStart, BytesText};
-
-use crate::constants::*;
-use crate::context::Context;
-use crate::dc_tools::*;
-use crate::login_param::LoginParam;
-use crate::x::*;
-
-use super::read_autoconf_file;
-/* ******************************************************************************
- * Thunderbird's Autoconfigure
- ******************************************************************************/
-/* documentation: https://developer.mozilla.org/en-US/docs/Mozilla/Thunderbird/Autoconfiguration */
-#[repr(C)]
-struct moz_autoconfigure_t<'a> {
-    pub in_0: &'a LoginParam,
-    pub in_emaildomain: &'a str,
-    pub in_emaillocalpart: &'a str,
-    pub out: LoginParam,
-    pub out_imap_set: libc::c_int,
-    pub out_smtp_set: libc::c_int,
-    pub tag_server: libc::c_int,
-    pub tag_config: libc::c_int,
-}
-
-pub unsafe fn moz_autoconfigure(
-    context: &Context,
-    url: &str,
-    param_in: &LoginParam,
-) -> Option<LoginParam> {
-    let xml_raw = read_autoconf_file(context, url);
-    if xml_raw.is_null() {
-        return None;
-    }
-
-    // Split address into local part and domain part.
-    let p = param_in.addr.find("@");
-    if p.is_none() {
-        free(xml_raw as *mut libc::c_void);
-        return None;
-    }
-    let (in_emaillocalpart, in_emaildomain) = param_in.addr.split_at(p.unwrap());
-    let in_emaildomain = &in_emaildomain[1..];
-
-    let mut reader = quick_xml::Reader::from_str(as_str(xml_raw));
-    reader.trim_text(true);
-
-    let mut buf = Vec::new();
-
-    let mut moz_ac = moz_autoconfigure_t {
-        in_0: param_in,
-        in_emaildomain,
-        in_emaillocalpart,
-        out: LoginParam::new(),
-        out_imap_set: 0,
-        out_smtp_set: 0,
-        tag_server: 0,
-        tag_config: 0,
-    };
-    loop {
-        match reader.read_event(&mut buf) {
-            Ok(quick_xml::events::Event::Start(ref e)) => {
-                moz_autoconfigure_starttag_cb(e, &mut moz_ac, &reader)
-            }
-            Ok(quick_xml::events::Event::End(ref e)) => moz_autoconfigure_endtag_cb(e, &mut moz_ac),
-            Ok(quick_xml::events::Event::Text(ref e)) => {
-                moz_autoconfigure_text_cb(e, &mut moz_ac, &reader)
-            }
-            Err(e) => {
-                error!(
-                    context,
-                    "Configure xml: Error at position {}: {:?}",
-                    reader.buffer_position(),
-                    e
-                );
-            }
-            Ok(quick_xml::events::Event::Eof) => break,
-            _ => (),
-        }
-        buf.clear();
-    }
-
-    if moz_ac.out.mail_server.is_empty()
-        || moz_ac.out.mail_port == 0
-        || moz_ac.out.send_server.is_empty()
-        || moz_ac.out.send_port == 0
-    {
-        let r = moz_ac.out.to_string();
-        warn!(context, "Bad or incomplete autoconfig: {}", r,);
-        free(xml_raw as *mut libc::c_void);
-        return None;
-    }
-
-    free(xml_raw as *mut libc::c_void);
-    Some(moz_ac.out)
-}
-
-fn moz_autoconfigure_text_cb<B: std::io::BufRead>(
-    event: &BytesText,
-    moz_ac: &mut moz_autoconfigure_t,
-    reader: &quick_xml::Reader<B>,
-) {
-    let val = event.unescape_and_decode(reader).unwrap_or_default();
-
-    let addr = &moz_ac.in_0.addr;
-    let email_local = moz_ac.in_emaillocalpart;
-    let email_domain = moz_ac.in_emaildomain;
-
-    let val = val
-        .trim()
-        .replace("%EMAILADDRESS%", addr)
-        .replace("%EMAILLOCALPART%", email_local)
-        .replace("%EMAILDOMAIN%", email_domain);
-
-    if moz_ac.tag_server == 1 {
-        match moz_ac.tag_config {
-            10 => moz_ac.out.mail_server = val,
-            11 => moz_ac.out.mail_port = val.parse().unwrap_or_default(),
-            12 => moz_ac.out.mail_user = val,
-            13 => {
-                let val_lower = val.to_lowercase();
-                if val_lower == "ssl" {
-                    moz_ac.out.server_flags |= DC_LP_IMAP_SOCKET_SSL as i32
-                }
-                if val_lower == "starttls" {
-                    moz_ac.out.server_flags |= DC_LP_IMAP_SOCKET_STARTTLS as i32
-                }
-                if val_lower == "plain" {
-                    moz_ac.out.server_flags |= DC_LP_IMAP_SOCKET_PLAIN as i32
-                }
-            }
-            _ => {}
-        }
-    } else if moz_ac.tag_server == 2 {
-        match moz_ac.tag_config {
-            10 => moz_ac.out.send_server = val,
-            11 => moz_ac.out.send_port = val.parse().unwrap_or_default(),
-            12 => moz_ac.out.send_user = val,
-            13 => {
-                let val_lower = val.to_lowercase();
-                if val_lower == "ssl" {
-                    moz_ac.out.server_flags |= DC_LP_SMTP_SOCKET_SSL as i32
-                }
-                if val_lower == "starttls" {
-                    moz_ac.out.server_flags |= DC_LP_SMTP_SOCKET_STARTTLS as i32
-                }
-                if val_lower == "plain" {
-                    moz_ac.out.server_flags |= DC_LP_SMTP_SOCKET_PLAIN as i32
-                }
-            }
-            _ => {}
-        }
-    }
-}
-
-fn moz_autoconfigure_endtag_cb(event: &BytesEnd, moz_ac: &mut moz_autoconfigure_t) {
-    let tag = String::from_utf8_lossy(event.name()).trim().to_lowercase();
-
-    if tag == "incomingserver" {
-        moz_ac.tag_server = 0;
-        moz_ac.tag_config = 0;
-        moz_ac.out_imap_set = 1;
-    } else if tag == "outgoingserver" {
-        moz_ac.tag_server = 0;
-        moz_ac.tag_config = 0;
-        moz_ac.out_smtp_set = 1;
-    } else {
-        moz_ac.tag_config = 0;
-    }
-}
-
-fn moz_autoconfigure_starttag_cb<B: std::io::BufRead>(
-    event: &BytesStart,
-    moz_ac: &mut moz_autoconfigure_t,
-    reader: &quick_xml::Reader<B>,
-) {
-    let tag = String::from_utf8_lossy(event.name()).trim().to_lowercase();
-
-    if tag == "incomingserver" {
-        moz_ac.tag_server = if let Some(typ) = event.attributes().find(|attr| {
-            attr.as_ref()
-                .map(|a| String::from_utf8_lossy(a.key).trim().to_lowercase() == "type")
-                .unwrap_or_default()
-        }) {
-            let typ = typ
-                .unwrap()
-                .unescape_and_decode_value(reader)
-                .unwrap_or_default()
-                .to_lowercase();
-
-            if typ == "imap" && moz_ac.out_imap_set == 0 {
-                1
-            } else {
-                0
-            }
-        } else {
-            0
-        };
-        moz_ac.tag_config = 0;
-    } else if tag == "outgoingserver" {
-        moz_ac.tag_server = if moz_ac.out_smtp_set == 0 { 2 } else { 0 };
-        moz_ac.tag_config = 0;
-    } else if tag == "hostname" {
-        moz_ac.tag_config = 10;
-    } else if tag == "port" {
-        moz_ac.tag_config = 11;
-    } else if tag == "sockettype" {
-        moz_ac.tag_config = 13;
-    } else if tag == "username" {
-        moz_ac.tag_config = 12;
-    }
-}

src/configure/auto_outlook.rs

@@ -1,213 +0,0 @@
-use quick_xml;
-use quick_xml::events::{BytesEnd, BytesStart, BytesText};
-
-use crate::constants::*;
-use crate::context::Context;
-use crate::dc_tools::*;
-use crate::login_param::LoginParam;
-use crate::x::*;
-use std::ptr;
-
-use super::read_autoconf_file;
-/* ******************************************************************************
- * Outlook's Autodiscover
- ******************************************************************************/
-#[repr(C)]
-struct outlk_autodiscover_t<'a> {
-    pub in_0: &'a LoginParam,
-    pub out: LoginParam,
-    pub out_imap_set: libc::c_int,
-    pub out_smtp_set: libc::c_int,
-    pub tag_config: libc::c_int,
-    pub config: [*mut libc::c_char; 6],
-    pub redirect: *mut libc::c_char,
-}
-
-pub unsafe fn outlk_autodiscover(
-    context: &Context,
-    url__: &str,
-    param_in: &LoginParam,
-) -> Option<LoginParam> {
-    let mut xml_raw: *mut libc::c_char = ptr::null_mut();
-    let mut url = url__.strdup();
-    let mut outlk_ad = outlk_autodiscover_t {
-        in_0: param_in,
-        out: LoginParam::new(),
-        out_imap_set: 0,
-        out_smtp_set: 0,
-        tag_config: 0,
-        config: [ptr::null_mut(); 6],
-        redirect: ptr::null_mut(),
-    };
-    let ok_to_continue;
-    let mut i = 0;
-    loop {
-        if !(i < 10) {
-            ok_to_continue = true;
-            break;
-        }
-        memset(
-            &mut outlk_ad as *mut outlk_autodiscover_t as *mut libc::c_void,
-            0,
-            ::std::mem::size_of::<outlk_autodiscover_t>(),
-        );
-        xml_raw = read_autoconf_file(context, as_str(url));
-        if xml_raw.is_null() {
-            ok_to_continue = false;
-            break;
-        }
-
-        let mut reader = quick_xml::Reader::from_str(as_str(xml_raw));
-        reader.trim_text(true);
-
-        let mut buf = Vec::new();
-
-        loop {
-            match reader.read_event(&mut buf) {
-                Ok(quick_xml::events::Event::Start(ref e)) => {
-                    outlk_autodiscover_starttag_cb(e, &mut outlk_ad)
-                }
-                Ok(quick_xml::events::Event::End(ref e)) => {
-                    outlk_autodiscover_endtag_cb(e, &mut outlk_ad)
-                }
-                Ok(quick_xml::events::Event::Text(ref e)) => {
-                    outlk_autodiscover_text_cb(e, &mut outlk_ad, &reader)
-                }
-                Err(e) => {
-                    error!(
-                        context,
-                        "Configure xml: Error at position {}: {:?}",
-                        reader.buffer_position(),
-                        e
-                    );
-                }
-                Ok(quick_xml::events::Event::Eof) => break,
-                _ => (),
-            }
-            buf.clear();
-        }
-
-        if !(!outlk_ad.config[5].is_null()
-            && 0 != *outlk_ad.config[5usize].offset(0isize) as libc::c_int)
-        {
-            ok_to_continue = true;
-            break;
-        }
-        free(url as *mut libc::c_void);
-        url = dc_strdup(outlk_ad.config[5usize]);
-
-        outlk_clean_config(&mut outlk_ad);
-        free(xml_raw as *mut libc::c_void);
-        xml_raw = ptr::null_mut();
-        i += 1;
-    }
-
-    if ok_to_continue {
-        if outlk_ad.out.mail_server.is_empty()
-            || outlk_ad.out.mail_port == 0
-            || outlk_ad.out.send_server.is_empty()
-            || outlk_ad.out.send_port == 0
-        {
-            let r = outlk_ad.out.to_string();
-            warn!(context, "Bad or incomplete autoconfig: {}", r,);
-            free(url as *mut libc::c_void);
-            free(xml_raw as *mut libc::c_void);
-            outlk_clean_config(&mut outlk_ad);
-
-            return None;
-        }
-    }
-    free(url as *mut libc::c_void);
-    free(xml_raw as *mut libc::c_void);
-    outlk_clean_config(&mut outlk_ad);
-    Some(outlk_ad.out)
-}
-
-unsafe fn outlk_clean_config(mut outlk_ad: *mut outlk_autodiscover_t) {
-    for i in 0..6 {
-        free((*outlk_ad).config[i] as *mut libc::c_void);
-        (*outlk_ad).config[i] = ptr::null_mut();
-    }
-}
-
-fn outlk_autodiscover_text_cb<B: std::io::BufRead>(
-    event: &BytesText,
-    outlk_ad: &mut outlk_autodiscover_t,
-    reader: &quick_xml::Reader<B>,
-) {
-    let val = event.unescape_and_decode(reader).unwrap_or_default();
-
-    unsafe {
-        free(outlk_ad.config[outlk_ad.tag_config as usize].cast());
-        outlk_ad.config[outlk_ad.tag_config as usize] = val.trim().strdup();
-    }
-}
-
-unsafe fn outlk_autodiscover_endtag_cb(event: &BytesEnd, outlk_ad: &mut outlk_autodiscover_t) {
-    let tag = String::from_utf8_lossy(event.name()).trim().to_lowercase();
-
-    if tag == "protocol" {
-        if !outlk_ad.config[1].is_null() {
-            let port = dc_atoi_null_is_0(outlk_ad.config[3]);
-            let ssl_on = (!outlk_ad.config[4].is_null()
-                && strcasecmp(
-                    outlk_ad.config[4],
-                    b"on\x00" as *const u8 as *const libc::c_char,
-                ) == 0) as libc::c_int;
-            let ssl_off = (!outlk_ad.config[4].is_null()
-                && strcasecmp(
-                    outlk_ad.config[4],
-                    b"off\x00" as *const u8 as *const libc::c_char,
-                ) == 0) as libc::c_int;
-            if strcasecmp(
-                outlk_ad.config[1],
-                b"imap\x00" as *const u8 as *const libc::c_char,
-            ) == 0
-                && outlk_ad.out_imap_set == 0
-            {
-                outlk_ad.out.mail_server = to_string(outlk_ad.config[2]);
-                outlk_ad.out.mail_port = port;
-                if 0 != ssl_on {
-                    outlk_ad.out.server_flags |= DC_LP_IMAP_SOCKET_SSL as i32
-                } else if 0 != ssl_off {
-                    outlk_ad.out.server_flags |= DC_LP_IMAP_SOCKET_PLAIN as i32
-                }
-                outlk_ad.out_imap_set = 1
-            } else if strcasecmp(
-                outlk_ad.config[1usize],
-                b"smtp\x00" as *const u8 as *const libc::c_char,
-            ) == 0
-                && outlk_ad.out_smtp_set == 0
-            {
-                outlk_ad.out.send_server = to_string(outlk_ad.config[2]);
-                outlk_ad.out.send_port = port;
-                if 0 != ssl_on {
-                    outlk_ad.out.server_flags |= DC_LP_SMTP_SOCKET_SSL as i32
-                } else if 0 != ssl_off {
-                    outlk_ad.out.server_flags |= DC_LP_SMTP_SOCKET_PLAIN as i32
-                }
-                outlk_ad.out_smtp_set = 1
-            }
-        }
-        outlk_clean_config(outlk_ad);
-    }
-    outlk_ad.tag_config = 0;
-}
-
-fn outlk_autodiscover_starttag_cb(event: &BytesStart, outlk_ad: &mut outlk_autodiscover_t) {
-    let tag = String::from_utf8_lossy(event.name()).trim().to_lowercase();
-
-    if tag == "protocol" {
-        unsafe { outlk_clean_config(outlk_ad) };
-    } else if tag == "type" {
-        outlk_ad.tag_config = 1
-    } else if tag == "server" {
-        outlk_ad.tag_config = 2
-    } else if tag == "port" {
-        outlk_ad.tag_config = 3
-    } else if tag == "ssl" {
-        outlk_ad.tag_config = 4
-    } else if tag == "redirecturl" {
-        outlk_ad.tag_config = 5
-    };
-}

src/configure/mod.rs

@@ -1,662 +0,0 @@
-use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC};
-
-use crate::constants::*;
-use crate::context::Context;
-use crate::dc_tools::*;
-use crate::e2ee;
-use crate::imap::*;
-use crate::job::*;
-use crate::login_param::LoginParam;
-use crate::oauth2::*;
-use crate::param::Params;
-
-mod auto_outlook;
-use auto_outlook::outlk_autodiscover;
-mod auto_mozilla;
-use auto_mozilla::moz_autoconfigure;
-
-macro_rules! progress {
-    ($context:tt, $progress:expr) => {
-        assert!(
-            $progress > 0 && $progress <= 1000,
-            "value in range 0..1000 expected with: 0=error, 1..999=progress, 1000=success"
-        );
-        $context.call_cb($crate::events::Event::ConfigureProgress($progress));
-    };
-}
-
-// connect
-pub unsafe fn configure(context: &Context) {
-    if dc_has_ongoing(context) {
-        warn!(context, "There is already another ongoing process running.",);
-        return;
-    }
-    job_kill_action(context, Action::ConfigureImap);
-    job_add(context, Action::ConfigureImap, 0, Params::new(), 0);
-}
-
-/// Check if the context is already configured.
-pub fn dc_is_configured(context: &Context) -> bool {
-    context.sql.get_config_bool(context, "configured")
-}
-
-/*******************************************************************************
- * Configure JOB
- ******************************************************************************/
-// the other dc_job_do_DC_JOB_*() functions are declared static in the c-file
-#[allow(non_snake_case, unused_must_use)]
-pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context, _job: &Job) {
-    let mut success = false;
-    let mut imap_connected_here = false;
-    let mut smtp_connected_here = false;
-    let mut ongoing_allocated_here = false;
-
-    let mut param_autoconfig: Option<LoginParam> = None;
-    if dc_alloc_ongoing(context) {
-        ongoing_allocated_here = true;
-        if !context.sql.is_open() {
-            error!(context, "Cannot configure, database not opened.",);
-        } else {
-            context.inbox.read().unwrap().disconnect(context);
-            context
-                .sentbox_thread
-                .read()
-                .unwrap()
-                .imap
-                .disconnect(context);
-            context
-                .mvbox_thread
-                .read()
-                .unwrap()
-                .imap
-                .disconnect(context);
-            context.smtp.clone().lock().unwrap().disconnect();
-            info!(context, "Configure ...",);
-
-            let s_a = context.running_state.clone();
-            let s = s_a.read().unwrap();
-
-            // Variables that are shared between steps:
-            let mut param = LoginParam::from_database(context, "");
-            // need all vars here to be mutable because rust thinks the same step could be called multiple times
-            // and also initialize, because otherwise rust thinks it's used while unitilized, even if thats not the case as the loop goes only forward
-            let mut param_domain = "undefined.undefined".to_owned();
-            let mut param_addr_urlencoded: String =
-                "Internal Error: this value should never be used".to_owned();
-            let mut keep_flags = std::i32::MAX;
-
-            const STEP_3_INDEX: u8 = 13;
-            let mut step_counter: u8 = 0;
-            while !s.shall_stop_ongoing {
-                step_counter = step_counter + 1;
-
-                let success = match step_counter {
-                    // Read login parameters from the database
-                    1 => {
-                        progress!(context, 1);
-                        if param.addr.is_empty() {
-                            error!(context, "Please enter an email address.",);
-                        }
-                        !param.addr.is_empty()
-                    }
-                    // Step 1: Load the parameters and check email-address and password
-                    2 => {
-                        if 0 != param.server_flags & 0x2 {
-                            // the used oauth2 addr may differ, check this.
-                            // if dc_get_oauth2_addr() is not available in the oauth2 implementation,
-                            // just use the given one.
-                            progress!(context, 10);
-                            if let Some(oauth2_addr) =
-                                dc_get_oauth2_addr(context, &param.addr, &param.mail_pw)
-                                    .and_then(|e| e.parse().ok())
-                            {
-                                param.addr = oauth2_addr;
-                                context
-                                    .sql
-                                    .set_config(context, "addr", Some(param.addr.as_str()))
-                                    .ok();
-                            }
-                            progress!(context, 20);
-                        }
-                        true // no oauth? - just continue it's no error
-                    }
-                    3 => {
-                        if let Ok(parsed) = param.addr.parse() {
-                            let parsed: EmailAddress = parsed;
-                            param_domain = parsed.domain;
-                            param_addr_urlencoded =
-                                utf8_percent_encode(&param.addr, NON_ALPHANUMERIC).to_string();
-                            true
-                        } else {
-                            error!(context, "Bad email-address.");
-                            false
-                        }
-                    }
-                    // Step 2: Autoconfig
-                    4 => {
-                        progress!(context, 200);
-                        if param.mail_server.is_empty()
-                            && param.mail_port == 0
-                            /*&&param.mail_user.is_empty() -- the user can enter a loginname which is used by autoconfig then */
-                            && param.send_server.is_empty()
-                            && param.send_port == 0
-                            && param.send_user.is_empty()
-                            /*&&param.send_pw.is_empty() -- the password cannot be auto-configured and is no criterion for autoconfig or not */
-                            && param.server_flags & !0x2 == 0
-                        {
-                            keep_flags = param.server_flags & 0x2;
-                        } else {
-                            // Autoconfig is not needed so skip it.
-                            step_counter = STEP_3_INDEX - 1;
-                        }
-                        true
-                    }
-                    /* A.  Search configurations from the domain used in the email-address, prefer encrypted */
-                    5 => {
-                        if param_autoconfig.is_none() {
-                            let url = format!(
-                                "https://autoconfig.{}/mail/config-v1.1.xml?emailaddress={}",
-                                param_domain, param_addr_urlencoded
-                            );
-                            param_autoconfig = moz_autoconfigure(context, &url, &param);
-                        }
-                        true
-                    }
-                    6 => {
-                        progress!(context, 300);
-                        if param_autoconfig.is_none() {
-                            // the doc does not mention `emailaddress=`, however, Thunderbird adds it, see https://releases.mozilla.org/pub/thunderbird/ ,  which makes some sense
-                            let url = format!(
-                                            "https://{}/.well-known/autoconfig/mail/config-v1.1.xml?emailaddress={}",
-                                            param_domain,
-                                            param_addr_urlencoded
-                                        );
-                            param_autoconfig = moz_autoconfigure(context, &url, &param);
-                        }
-                        true
-                    }
-                    /* Outlook section start ------------- */
-                    /* Outlook uses always SSL but different domains (this comment describes the next two steps) */
-                    7 => {
-                        progress!(context, 310);
-                        if param_autoconfig.is_none() {
-                            let url = format!(
-                                "https://{}{}/autodiscover/autodiscover.xml",
-                                "", param_domain
-                            );
-                            param_autoconfig = outlk_autodiscover(context, &url, &param);
-                        }
-                        true
-                    }
-                    8 => {
-                        progress!(context, 320);
-                        if param_autoconfig.is_none() {
-                            let url = format!(
-                                "https://{}{}/autodiscover/autodiscover.xml",
-                                "autodiscover.", param_domain
-                            );
-                            param_autoconfig = outlk_autodiscover(context, &url, &param);
-                        }
-                        true
-                    }
-                    /* ----------- Outlook section end */
-                    9 => {
-                        progress!(context, 330);
-                        if param_autoconfig.is_none() {
-                            let url = format!(
-                                "http://autoconfig.{}/mail/config-v1.1.xml?emailaddress={}",
-                                param_domain, param_addr_urlencoded
-                            );
-                            param_autoconfig = moz_autoconfigure(context, &url, &param);
-                        }
-                        true
-                    }
-                    10 => {
-                        progress!(context, 340);
-                        if param_autoconfig.is_none() {
-                            // do not transfer the email-address unencrypted
-                            let url = format!(
-                                "http://{}/.well-known/autoconfig/mail/config-v1.1.xml",
-                                param_domain
-                            );
-                            param_autoconfig = moz_autoconfigure(context, &url, &param);
-                        }
-                        true
-                    }
-                    /* B.  If we have no configuration yet, search configuration in Thunderbird's centeral database */
-                    11 => {
-                        progress!(context, 350);
-                        if param_autoconfig.is_none() {
-                            /* always SSL for Thunderbird's database */
-                            let url =
-                                format!("https://autoconfig.thunderbird.net/v1.1/{}", param_domain);
-                            param_autoconfig = moz_autoconfigure(context, &url, &param);
-                        }
-                        true
-                    }
-                    /* C.  Do we have any result? */
-                    12 => {
-                        progress!(context, 500);
-                        if let Some(ref cfg) = param_autoconfig {
-                            info!(context, "Got autoconfig: {}", &cfg);
-                            if !cfg.mail_user.is_empty() {
-                                param.mail_user = cfg.mail_user.clone();
-                            }
-                            param.mail_server = cfg.mail_server.clone(); /* all other values are always NULL when entering autoconfig */
-                            param.mail_port = cfg.mail_port;
-                            param.send_server = cfg.send_server.clone();
-                            param.send_port = cfg.send_port;
-                            param.send_user = cfg.send_user.clone();
-                            param.server_flags = cfg.server_flags;
-                            /* although param_autoconfig's data are no longer needed from, it is important to keep the object as
-                            we may enter "deep guessing" if we could not read a configuration */
-                        }
-                        param.server_flags |= keep_flags;
-                        true
-                    }
-                    // Step 3: Fill missing fields with defaults
-                    13 => {
-                        // if you move this, don't forget to update STEP_3_INDEX, too
-                        if param.mail_server.is_empty() {
-                            param.mail_server = format!("imap.{}", param_domain,)
-                        }
-                        if param.mail_port == 0 {
-                            param.mail_port = if 0 != param.server_flags & (0x100 | 0x400) {
-                                143
-                            } else {
-                                993
-                            }
-                        }
-                        if param.mail_user.is_empty() {
-                            param.mail_user = param.addr.clone();
-                        }
-                        if param.send_server.is_empty() && !param.mail_server.is_empty() {
-                            param.send_server = param.mail_server.clone();
-                            if param.send_server.starts_with("imap.") {
-                                param.send_server = param.send_server.replacen("imap", "smtp", 1);
-                            }
-                        }
-                        if param.send_port == 0 {
-                            param.send_port =
-                                if 0 != param.server_flags & DC_LP_SMTP_SOCKET_STARTTLS as i32 {
-                                    587
-                                } else if 0 != param.server_flags & DC_LP_SMTP_SOCKET_PLAIN as i32 {
-                                    25
-                                } else {
-                                    465
-                                }
-                        }
-                        if param.send_user.is_empty() && !param.mail_user.is_empty() {
-                            param.send_user = param.mail_user.clone();
-                        }
-                        if param.send_pw.is_empty() && !param.mail_pw.is_empty() {
-                            param.send_pw = param.mail_pw.clone()
-                        }
-                        if !dc_exactly_one_bit_set(param.server_flags & DC_LP_AUTH_FLAGS as i32) {
-                            param.server_flags &= !(DC_LP_AUTH_FLAGS as i32);
-                            param.server_flags |= DC_LP_AUTH_NORMAL as i32
-                        }
-                        if !dc_exactly_one_bit_set(
-                            param.server_flags & DC_LP_IMAP_SOCKET_FLAGS as i32,
-                        ) {
-                            param.server_flags &= !(DC_LP_IMAP_SOCKET_FLAGS as i32);
-                            param.server_flags |= if param.send_port == 143 {
-                                DC_LP_IMAP_SOCKET_STARTTLS as i32
-                            } else {
-                                DC_LP_IMAP_SOCKET_SSL as i32
-                            }
-                        }
-                        if !dc_exactly_one_bit_set(
-                            param.server_flags & (DC_LP_SMTP_SOCKET_FLAGS as i32),
-                        ) {
-                            param.server_flags &= !(DC_LP_SMTP_SOCKET_FLAGS as i32);
-                            param.server_flags |= if param.send_port == 587 {
-                                DC_LP_SMTP_SOCKET_STARTTLS as i32
-                            } else if param.send_port == 25 {
-                                DC_LP_SMTP_SOCKET_PLAIN as i32
-                            } else {
-                                DC_LP_SMTP_SOCKET_SSL as i32
-                            }
-                        }
-                        /* do we have a complete configuration? */
-                        if param.mail_server.is_empty()
-                            || param.mail_port == 0
-                            || param.mail_user.is_empty()
-                            || param.mail_pw.is_empty()
-                            || param.send_server.is_empty()
-                            || param.send_port == 0
-                            || param.send_user.is_empty()
-                            || param.send_pw.is_empty()
-                            || param.server_flags == 0
-                        {
-                            error!(context, "Account settings incomplete.");
-                            false
-                        } else {
-                            true
-                        }
-                    }
-                    14 => {
-                        progress!(context, 600);
-                        /* try to connect to IMAP - if we did not got an autoconfig,
-                        do some further tries with different settings and username variations */
-                        let ok_to_continue8;
-                        let mut username_variation = 0;
-                        loop {
-                            if !(username_variation <= 1) {
-                                ok_to_continue8 = true;
-                                break;
-                            }
-                            info!(context, "Trying: {}", &param);
-
-                            if context.inbox.read().unwrap().connect(context, &param) {
-                                ok_to_continue8 = true;
-                                break;
-                            }
-                            if !param_autoconfig.is_none() {
-                                ok_to_continue8 = false;
-                                break;
-                            }
-                            // probe STARTTLS/993
-                            if s.shall_stop_ongoing {
-                                ok_to_continue8 = false;
-                                break;
-                            }
-                            progress!(context, 650 + username_variation * 30);
-                            param.server_flags &= !(0x100 | 0x200 | 0x400);
-                            param.server_flags |= 0x100;
-                            info!(context, "Trying: {}", &param);
-
-                            if context.inbox.read().unwrap().connect(context, &param) {
-                                ok_to_continue8 = true;
-                                break;
-                            }
-                            // probe STARTTLS/143
-                            if s.shall_stop_ongoing {
-                                ok_to_continue8 = false;
-                                break;
-                            }
-                            progress!(context, 660 + username_variation * 30);
-                            param.mail_port = 143;
-                            info!(context, "Trying: {}", &param);
-
-                            if context.inbox.read().unwrap().connect(context, &param) {
-                                ok_to_continue8 = true;
-                                break;
-                            }
-                            if 0 != username_variation {
-                                ok_to_continue8 = false;
-                                break;
-                            }
-                            // next probe round with only the localpart of the email-address as the loginname
-                            if s.shall_stop_ongoing {
-                                ok_to_continue8 = false;
-                                break;
-                            }
-                            progress!(context, 670 + username_variation * 30);
-                            param.server_flags &= !(0x100 | 0x200 | 0x400);
-                            param.server_flags |= 0x200;
-                            param.mail_port = 993;
-
-                            if let Some(at) = param.mail_user.find('@') {
-                                param.mail_user = param.mail_user.split_at(at).0.to_string();
-                            }
-                            if let Some(at) = param.send_user.find('@') {
-                                param.send_user = param.send_user.split_at(at).0.to_string();
-                            }
-
-                            username_variation += 1
-                        }
-                        if ok_to_continue8 {
-                            // success, so we are connected and should disconnect in cleanup
-                            imap_connected_here = true;
-                        }
-                        ok_to_continue8
-                    }
-                    15 => {
-                        progress!(context, 800);
-                        let success;
-                        /* try to connect to SMTP - if we did not got an autoconfig, the first try was SSL-465 and we do a second try with STARTTLS-587 */
-                        if !context
-                            .smtp
-                            .clone()
-                            .lock()
-                            .unwrap()
-                            .connect(context, &param)
-                        {
-                            if !param_autoconfig.is_none() {
-                                success = false;
-                            } else if s.shall_stop_ongoing {
-                                success = false;
-                            } else {
-                                progress!(context, 850);
-                                param.server_flags &= !(DC_LP_SMTP_SOCKET_FLAGS as i32);
-                                param.server_flags |= DC_LP_SMTP_SOCKET_STARTTLS as i32;
-                                param.send_port = 587;
-                                info!(context, "Trying: {}", &param);
-
-                                if !context
-                                    .smtp
-                                    .clone()
-                                    .lock()
-                                    .unwrap()
-                                    .connect(context, &param)
-                                {
-                                    if s.shall_stop_ongoing {
-                                        success = false;
-                                    } else {
-                                        progress!(context, 860);
-                                        param.server_flags &= !(DC_LP_SMTP_SOCKET_FLAGS as i32);
-                                        param.server_flags |= DC_LP_SMTP_SOCKET_STARTTLS as i32;
-                                        param.send_port = 25;
-                                        info!(context, "Trying: {}", &param);
-
-                                        if !context
-                                            .smtp
-                                            .clone()
-                                            .lock()
-                                            .unwrap()
-                                            .connect(context, &param)
-                                        {
-                                            success = false;
-                                        } else {
-                                            success = true;
-                                        }
-                                    }
-                                } else {
-                                    success = true;
-                                }
-                            }
-                        } else {
-                            success = true;
-                        }
-                        if success {
-                            smtp_connected_here = true;
-                        }
-                        success
-                    }
-                    16 => {
-                        progress!(context, 900);
-                        let flags: libc::c_int = if 0
-                            != context
-                                .sql
-                                .get_config_int(context, "mvbox_watch")
-                                .unwrap_or_else(|| 1)
-                            || 0 != context
-                                .sql
-                                .get_config_int(context, "mvbox_move")
-                                .unwrap_or_else(|| 1)
-                        {
-                            DC_CREATE_MVBOX as i32
-                        } else {
-                            0
-                        };
-                        context
-                            .inbox
-                            .read()
-                            .unwrap()
-                            .configure_folders(context, flags);
-                        true
-                    }
-                    17 => {
-                        progress!(context, 910);
-                        /* configuration success - write back the configured parameters with the "configured_" prefix; also write the "configured"-flag */
-                        param
-                            .save_to_database(
-                                context,
-                                "configured_", /*the trailing underscore is correct*/
-                            )
-                            .ok();
-
-                        context.sql.set_config_bool(context, "configured", true);
-                        true
-                    }
-                    18 => {
-                        progress!(context, 920);
-                        // we generate the keypair just now - we could also postpone this until the first message is sent, however,
-                        // this may result in a unexpected and annoying delay when the user sends his very first message
-                        // (~30 seconds on a Moto G4 play) and might looks as if message sending is always that slow.
-                        e2ee::ensure_secret_key_exists(context);
-                        success = true;
-                        info!(context, "Configure completed.");
-                        progress!(context, 940);
-                        break; // We are done here
-                    }
-
-                    _ => {
-                        error!(context, "Internal error: step counter out of bound",);
-                        break;
-                    }
-                };
-
-                if !success {
-                    break;
-                }
-            }
-        }
-    }
-    if imap_connected_here {
-        context.inbox.read().unwrap().disconnect(context);
-    }
-    if smtp_connected_here {
-        context.smtp.clone().lock().unwrap().disconnect();
-    }
-
-    /*
-    if !success {
-        // disconnect if configure did not succeed
-        if imap_connected_here {
-            // context.inbox.read().unwrap().disconnect(context);
-        }
-        if smtp_connected_here {
-            // context.smtp.clone().lock().unwrap().disconnect();
-        }
-    } else {
-        assert!(imap_connected_here && smtp_connected_here);
-        info!(
-            context,
-            0, "Keeping IMAP/SMTP connections open after successful configuration"
-        );
-    }
-    */
-    if ongoing_allocated_here {
-        dc_free_ongoing(context);
-    }
-
-    progress!(context, if success { 1000 } else { 0 });
-}
-
-/*******************************************************************************
- * Ongoing process allocation/free/check
- ******************************************************************************/
-
-pub fn dc_alloc_ongoing(context: &Context) -> bool {
-    if dc_has_ongoing(context) {
-        warn!(context, "There is already another ongoing process running.",);
-
-        false
-    } else {
-        let s_a = context.running_state.clone();
-        let mut s = s_a.write().unwrap();
-
-        s.ongoing_running = true;
-        s.shall_stop_ongoing = false;
-
-        true
-    }
-}
-
-pub fn dc_free_ongoing(context: &Context) {
-    let s_a = context.running_state.clone();
-    let mut s = s_a.write().unwrap();
-
-    s.ongoing_running = false;
-    s.shall_stop_ongoing = true;
-}
-
-fn dc_has_ongoing(context: &Context) -> bool {
-    let s_a = context.running_state.clone();
-    let s = s_a.read().unwrap();
-
-    s.ongoing_running || !s.shall_stop_ongoing
-}
-
-/*******************************************************************************
- * Connect to configured account
- ******************************************************************************/
-pub fn dc_connect_to_configured_imap(context: &Context, imap: &Imap) -> libc::c_int {
-    let mut ret_connected = 0;
-
-    if imap.is_connected() {
-        ret_connected = 1
-    } else if context
-        .sql
-        .get_config_int(context, "configured")
-        .unwrap_or_default()
-        == 0
-    {
-        warn!(context, "Not configured, cannot connect.",);
-    } else {
-        let param = LoginParam::from_database(context, "configured_");
-        // the trailing underscore is correct
-
-        if imap.connect(context, &param) {
-            ret_connected = 2;
-        }
-    }
-
-    ret_connected
-}
-
-/*******************************************************************************
- * Configure a Context
- ******************************************************************************/
-
-/// Signal an ongoing process to stop.
-pub fn dc_stop_ongoing_process(context: &Context) {
-    let s_a = context.running_state.clone();
-    let mut s = s_a.write().unwrap();
-
-    if s.ongoing_running && !s.shall_stop_ongoing {
-        info!(context, "Signaling the ongoing process to stop ASAP.",);
-        s.shall_stop_ongoing = true;
-    } else {
-        info!(context, "No ongoing process to stop.",);
-    };
-}
-
-pub fn read_autoconf_file(context: &Context, url: &str) -> *mut libc::c_char {
-    info!(context, "Testing {} ...", url);
-
-    match reqwest::Client::new()
-        .get(url)
-        .send()
-        .and_then(|mut res| res.text())
-    {
-        Ok(res) => unsafe { res.strdup() },
-        Err(_err) => {
-            info!(context, "Can\'t read file.",);
-
-            std::ptr::null_mut()
-        }
-    }
-}

src/constants.rs

@@ -1,12 +1,8 @@
 //! Constants
-#![allow(non_camel_case_types, dead_code)]
-
+#![allow(non_camel_case_types)]
 use deltachat_derive::*;
-use lazy_static::lazy_static;
 
-lazy_static! {
-    pub static ref DC_VERSION_STR: String = env!("CARGO_PKG_VERSION").to_string();
-}
+pub const DC_VERSION_STR: &'static [u8; 14] = b"1.0.0-alpha.3\x00";
 
 #[repr(u8)]
 #[derive(Debug, Display, Clone, Copy, PartialEq, Eq, FromPrimitive, ToPrimitive, ToSql, FromSql)]
@@ -17,33 +13,17 @@ pub enum MoveState {
     Moving = 3,
 }
 
-impl Default for MoveState {
-    fn default() -> Self {
-        MoveState::Undefined
-    }
-}
-
 // some defaults
-const DC_E2EE_DEFAULT_ENABLED: i32 = 1;
+pub const DC_E2EE_DEFAULT_ENABLED: i32 = 1;
 pub const DC_MDNS_DEFAULT_ENABLED: i32 = 1;
-const DC_INBOX_WATCH_DEFAULT: i32 = 1;
-const DC_SENTBOX_WATCH_DEFAULT: i32 = 1;
-const DC_MVBOX_WATCH_DEFAULT: i32 = 1;
-const DC_MVBOX_MOVE_DEFAULT: i32 = 1;
+pub const DC_INBOX_WATCH_DEFAULT: i32 = 1;
+pub const DC_SENTBOX_WATCH_DEFAULT: i32 = 1;
+pub const DC_MVBOX_WATCH_DEFAULT: i32 = 1;
+pub const DC_MVBOX_MOVE_DEFAULT: i32 = 1;
 
-#[derive(Debug, Display, Clone, Copy, PartialEq, Eq, FromPrimitive, ToPrimitive, FromSql, ToSql)]
-#[repr(u8)]
-pub enum Blocked {
-    Not = 0,
-    Manually = 1,
-    Deaddrop = 2,
-}
-
-impl Default for Blocked {
-    fn default() -> Self {
-        Blocked::Not
-    }
-}
+pub const DC_CHAT_NOT_BLOCKED: i32 = 0;
+pub const DC_CHAT_MANUALLY_BLOCKED: i32 = 1;
+pub const DC_CHAT_DEADDROP_BLOCKED: i32 = 2;
 
 pub const DC_IMAP_SEEN: u32 = 0x1;
 
@@ -55,75 +35,88 @@ pub const DC_GCL_ARCHIVED_ONLY: usize = 0x01;
 pub const DC_GCL_NO_SPECIALS: usize = 0x02;
 pub const DC_GCL_ADD_ALLDONE_HINT: usize = 0x04;
 
-const DC_GCM_ADDDAYMARKER: usize = 0x01;
+pub const DC_GCM_ADDDAYMARKER: usize = 0x01;
 
 pub const DC_GCL_VERIFIED_ONLY: usize = 0x01;
 pub const DC_GCL_ADD_SELF: usize = 0x02;
 
 /// param1 is a directory where the keys are written to
-const DC_IMEX_EXPORT_SELF_KEYS: usize = 1;
+pub const DC_IMEX_EXPORT_SELF_KEYS: usize = 1;
 /// param1 is a directory where the keys are searched in and read from
-const DC_IMEX_IMPORT_SELF_KEYS: usize = 2;
+pub const DC_IMEX_IMPORT_SELF_KEYS: usize = 2;
 /// param1 is a directory where the backup is written to
-const DC_IMEX_EXPORT_BACKUP: usize = 11;
+pub const DC_IMEX_EXPORT_BACKUP: usize = 11;
 /// param1 is the file with the backup to import
-const DC_IMEX_IMPORT_BACKUP: usize = 12;
+pub const DC_IMEX_IMPORT_BACKUP: usize = 12;
+
+/// id=contact
+pub const DC_QR_ASK_VERIFYCONTACT: usize = 200;
+/// text1=groupname
+pub const DC_QR_ASK_VERIFYGROUP: usize = 202;
+/// id=contact
+pub const DC_QR_FPR_OK: usize = 210;
+/// id=contact
+pub const DC_QR_FPR_MISMATCH: usize = 220;
+/// test1=formatted fingerprint
+pub const DC_QR_FPR_WITHOUT_ADDR: usize = 230;
+/// id=contact
+pub const DC_QR_ADDR: usize = 320;
+/// text1=text
+pub const DC_QR_TEXT: usize = 330;
+/// text1=URL
+pub const DC_QR_URL: usize = 332;
+/// text1=error string
+pub const DC_QR_ERROR: usize = 400;
 
 /// virtual chat showing all messages belonging to chats flagged with chats.blocked=2
-pub(crate) const DC_CHAT_ID_DEADDROP: u32 = 1;
+pub const DC_CHAT_ID_DEADDROP: usize = 1;
 /// messages that should be deleted get this chat_id; the messages are deleted from the working thread later then. This is also needed as rfc724_mid should be preset as long as the message is not deleted on the server (otherwise it is downloaded again)
-pub const DC_CHAT_ID_TRASH: u32 = 3;
+pub const DC_CHAT_ID_TRASH: usize = 3;
 /// a message is just in creation but not yet assigned to a chat (eg. we may need the message ID to set up blobs; this avoids unready message to be sent and shown)
-const DC_CHAT_ID_MSGS_IN_CREATION: u32 = 4;
+pub const DC_CHAT_ID_MSGS_IN_CREATION: usize = 4;
 /// virtual chat showing all messages flagged with msgs.starred=2
-pub const DC_CHAT_ID_STARRED: u32 = 5;
+pub const DC_CHAT_ID_STARRED: usize = 5;
 /// only an indicator in a chatlist
-pub const DC_CHAT_ID_ARCHIVED_LINK: u32 = 6;
+pub const DC_CHAT_ID_ARCHIVED_LINK: usize = 6;
 /// only an indicator in a chatlist
-pub const DC_CHAT_ID_ALLDONE_HINT: u32 = 7;
+pub const DC_CHAT_ID_ALLDONE_HINT: usize = 7;
 /// larger chat IDs are "real" chats, their messages are "real" messages.
-pub const DC_CHAT_ID_LAST_SPECIAL: u32 = 9;
+pub const DC_CHAT_ID_LAST_SPECIAL: usize = 9;
 
-#[derive(
-    Debug,
-    Display,
-    Clone,
-    Copy,
-    PartialEq,
-    Eq,
-    FromPrimitive,
-    ToPrimitive,
-    FromSql,
-    ToSql,
-    IntoStaticStr,
-)]
-#[repr(u32)]
-pub enum Chattype {
-    Undefined = 0,
-    Single = 100,
-    Group = 120,
-    VerifiedGroup = 130,
-}
+pub const DC_CHAT_TYPE_UNDEFINED: i32 = 0;
+pub const DC_CHAT_TYPE_SINGLE: i32 = 100;
+pub const DC_CHAT_TYPE_GROUP: i32 = 120;
+pub const DC_CHAT_TYPE_VERIFIED_GROUP: i32 = 130;
 
-impl Default for Chattype {
-    fn default() -> Self {
-        Chattype::Undefined
-    }
-}
+pub const DC_MSG_ID_MARKER1: usize = 1;
+pub const DC_MSG_ID_DAYMARKER: usize = 9;
+pub const DC_MSG_ID_LAST_SPECIAL: usize = 9;
 
-pub const DC_MSG_ID_MARKER1: u32 = 1;
-const DC_MSG_ID_DAYMARKER: u32 = 9;
-pub const DC_MSG_ID_LAST_SPECIAL: u32 = 9;
+pub const DC_STATE_UNDEFINED: i32 = 0;
+pub const DC_STATE_IN_FRESH: i32 = 10;
+pub const DC_STATE_IN_NOTICED: i32 = 13;
+pub const DC_STATE_IN_SEEN: i32 = 16;
+pub const DC_STATE_OUT_PREPARING: i32 = 18;
+pub const DC_STATE_OUT_DRAFT: i32 = 19;
+pub const DC_STATE_OUT_PENDING: i32 = 20;
+pub const DC_STATE_OUT_FAILED: i32 = 24;
+/// to check if a mail was sent, use dc_msg_is_sent()
+pub const DC_STATE_OUT_DELIVERED: i32 = 26;
+pub const DC_STATE_OUT_MDN_RCVD: i32 = 28;
 
 /// approx. max. length returned by dc_msg_get_text()
-const DC_MAX_GET_TEXT_LEN: usize = 30000;
+pub const DC_MAX_GET_TEXT_LEN: usize = 30000;
 /// approx. max. length returned by dc_get_msg_info()
-const DC_MAX_GET_INFO_LEN: usize = 100000;
+pub const DC_MAX_GET_INFO_LEN: usize = 100000;
 
-pub const DC_CONTACT_ID_UNDEFINED: u32 = 0;
-pub const DC_CONTACT_ID_SELF: u32 = 1;
-const DC_CONTACT_ID_DEVICE: u32 = 2;
-pub const DC_CONTACT_ID_LAST_SPECIAL: u32 = 9;
+pub const DC_CONTACT_ID_UNDEFINED: usize = 0;
+pub const DC_CONTACT_ID_SELF: usize = 1;
+pub const DC_CONTACT_ID_DEVICE: usize = 2;
+pub const DC_CONTACT_ID_LAST_SPECIAL: usize = 9;
+
+pub const DC_TEXT1_DRAFT: usize = 1;
+pub const DC_TEXT1_USERNAME: usize = 2;
+pub const DC_TEXT1_SELF: usize = 3;
 
 pub const DC_CREATE_MVBOX: usize = 1;
 
@@ -133,7 +126,7 @@ pub const DC_CREATE_MVBOX: usize = 1;
 // via dc_set_config() using the key "server_flags".
 
 /// Force OAuth2 authorization. This flag does not skip automatic configuration.
-/// Before calling configure() with DC_LP_AUTH_OAUTH2 set,
+/// Before calling dc_configure() with DC_LP_AUTH_OAUTH2 set,
 /// the user has to confirm access at the URL returned by dc_get_oauth2_url().
 pub const DC_LP_AUTH_OAUTH2: usize = 0x2;
 
@@ -174,12 +167,6 @@ pub const DC_LP_IMAP_SOCKET_FLAGS: usize =
 pub const DC_LP_SMTP_SOCKET_FLAGS: usize =
     (DC_LP_SMTP_SOCKET_STARTTLS | DC_LP_SMTP_SOCKET_SSL | DC_LP_SMTP_SOCKET_PLAIN);
 
-// QR code scanning (view from Bob, the joiner)
-pub const DC_VC_AUTH_REQUIRED: i32 = 2;
-pub const DC_VC_CONTACT_CONFIRM: i32 = 6;
-pub const DC_BOB_ERROR: i32 = 0;
-pub const DC_BOB_SUCCESS: i32 = 1;
-
 #[derive(Debug, Display, Clone, Copy, PartialEq, Eq, FromPrimitive, ToPrimitive, FromSql, ToSql)]
 #[repr(i32)]
 pub enum Viewtype {
@@ -225,12 +212,6 @@ pub enum Viewtype {
     File = 60,
 }
 
-impl Default for Viewtype {
-    fn default() -> Self {
-        Viewtype::Unknown
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -246,65 +227,301 @@ mod tests {
 // If you do not want to handle an event, it is always safe to return 0,
 // so there is no need to add a "case" for every event.
 
-const DC_EVENT_FILE_COPIED: usize = 2055; // deprecated;
-const DC_EVENT_IS_OFFLINE: usize = 2081; // deprecated;
-const DC_ERROR_SEE_STRING: usize = 0; // deprecated;
-const DC_ERROR_SELF_NOT_IN_GROUP: usize = 1; // deprecated;
-const DC_STR_SELFNOTINGRP: usize = 21; // deprecated;
+#[derive(Debug, Clone, Copy, PartialEq, Eq, FromPrimitive, ToPrimitive)]
+#[repr(u32)]
+pub enum Event {
+    /// The library-user may write an informational string to the log.
+    /// Passed to the callback given to dc_context_new().
+    /// This event should not be reported to the end-user using a popup or something like that.
+    /// @param data1 0
+    /// @param data2 (const char*) Info string in english language.
+    ///     Must not be free()'d or modified and is valid only until the callback returns.
+    /// @return 0
+    INFO = 100,
+
+    /// Emitted when SMTP connection is established and login was successful.
+    ///
+    /// @param data1 0
+    /// @param data2 (const char*) Info string in english language.
+    ///     Must not be free()'d or modified and is valid only until the callback returns.
+    /// @return 0
+    SMTP_CONNECTED = 101,
+
+    /// Emitted when IMAP connection is established and login was successful.
+    ///
+    /// @param data1 0
+    /// @param data2 (const char*) Info string in english language.
+    ///     Must not be free()'d or modified and is valid only until the callback returns.
+    /// @return 0
+    IMAP_CONNECTED = 102,
+
+    /// Emitted when a message was successfully sent to the SMTP server.
+    ///
+    /// @param data1 0
+    /// @param data2 (const char*) Info string in english language.
+    ///     Must not be free()'d or modified and is valid only until the callback returns.
+    /// @return 0
+    SMTP_MESSAGE_SENT = 103,
+
+    /// The library-user should write a warning string to the log.
+    /// Passed to the callback given to dc_context_new().
+    ///
+    /// This event should not be reported to the end-user using a popup or something like that.
+    ///
+    /// @param data1 0
+    /// @param data2 (const char*) Warning string in english language.
+    ///     Must not be free()'d or modified and is valid only until the callback returns.
+    /// @return 0
+    WARNING = 300,
+
+    /// The library-user should report an error to the end-user.
+    /// Passed to the callback given to dc_context_new().
+    ///
+    /// As most things are asynchronous, things may go wrong at any time and the user
+    /// should not be disturbed by a dialog or so.  Instead, use a bubble or so.
+    ///
+    /// However, for ongoing processes (eg. dc_configure())
+    /// or for functions that are expected to fail (eg. dc_continue_key_transfer())
+    /// it might be better to delay showing these events until the function has really
+    /// failed (returned false). It should be sufficient to report only the _last_ error
+    /// in a messasge box then.
+    ///
+    /// @param data1 0
+    /// @param data2 (const char*) Error string, always set, never NULL. Frequent error strings are
+    ///     localized using #DC_EVENT_GET_STRING, however, most error strings will be in english language.
+    ///     Must not be free()'d or modified and is valid only until the callback returns.
+    /// @return 0
+    ERROR = 400,
+
+    /// An action cannot be performed because there is no network available.
+    ///
+    /// The library will typically try over after a some time
+    /// and when dc_maybe_network() is called.
+    ///
+    /// Network errors should be reported to users in a non-disturbing way,
+    /// however, as network errors may come in a sequence,
+    /// it is not useful to raise each an every error to the user.
+    /// For this purpose, data1 is set to 1 if the error is probably worth reporting.
+    ///
+    /// Moreover, if the UI detects that the device is offline,
+    /// it is probably more useful to report this to the user
+    /// instead of the string from data2.
+    ///
+    /// @param data1 (int) 1=first/new network error, should be reported the user;
+    ///     0=subsequent network error, should be logged only
+    /// @param data2 (const char*) Error string, always set, never NULL.
+    ///     Must not be free()'d or modified and is valid only until the callback returns.
+    /// @return 0
+    ERROR_NETWORK = 401,
+
+    /// An action cannot be performed because the user is not in the group.
+    /// Reported eg. after a call to
+    /// dc_set_chat_name(), dc_set_chat_profile_image(),
+    /// dc_add_contact_to_chat(), dc_remove_contact_from_chat(),
+    /// dc_send_text_msg() or another sending function.
+    ///
+    /// @param data1 0
+    /// @param data2 (const char*) Info string in english language.
+    ///     Must not be free()'d or modified
+    ///     and is valid only until the callback returns.
+    /// @return 0
+    ERROR_SELF_NOT_IN_GROUP = 410,
+
+    /// Messages or chats changed.  One or more messages or chats changed for various
+    /// reasons in the database:
+    /// - Messages sent, received or removed
+    /// - Chats created, deleted or archived
+    /// - A draft has been set
+    ///
+    /// @param data1 (int) chat_id for single added messages
+    /// @param data2 (int) msg_id for single added messages
+    /// @return 0
+    MSGS_CHANGED = 2000,
+
+    /// There is a fresh message. Typically, the user will show an notification
+    /// when receiving this message.
+    ///
+    /// There is no extra #DC_EVENT_MSGS_CHANGED event send together with this event.
+    ///
+    /// @param data1 (int) chat_id
+    /// @param data2 (int) msg_id
+    /// @return 0
+    INCOMING_MSG = 2005,
+
+    /// A single message is sent successfully. State changed from  DC_STATE_OUT_PENDING to
+    /// DC_STATE_OUT_DELIVERED, see dc_msg_get_state().
+    ///
+    /// @param data1 (int) chat_id
+    /// @param data2 (int) msg_id
+    /// @return 0
+    MSG_DELIVERED = 2010,
+
+    /// A single message could not be sent. State changed from DC_STATE_OUT_PENDING or DC_STATE_OUT_DELIVERED to
+    /// DC_STATE_OUT_FAILED, see dc_msg_get_state().
+    ///
+    /// @param data1 (int) chat_id
+    /// @param data2 (int) msg_id
+    /// @return 0
+    MSG_FAILED = 2012,
+
+    /// A single message is read by the receiver. State changed from DC_STATE_OUT_DELIVERED to
+    /// DC_STATE_OUT_MDN_RCVD, see dc_msg_get_state().
+    ///
+    /// @param data1 (int) chat_id
+    /// @param data2 (int) msg_id
+    /// @return 0
+    MSG_READ = 2015,
+
+    /// Chat changed.  The name or the image of a chat group was changed or members were added or removed.
+    /// Or the verify state of a chat has changed.
+    /// See dc_set_chat_name(), dc_set_chat_profile_image(), dc_add_contact_to_chat()
+    /// and dc_remove_contact_from_chat().
+    ///
+    /// @param data1 (int) chat_id
+    /// @param data2 0
+    /// @return 0
+    CHAT_MODIFIED = 2020,
+
+    /// Contact(s) created, renamed, blocked or deleted.
+    ///
+    /// @param data1 (int) If not 0, this is the contact_id of an added contact that should be selected.
+    /// @param data2 0
+    /// @return 0
+    CONTACTS_CHANGED = 2030,
+
+    /// Location of one or more contact has changed.
+    ///
+    /// @param data1 (int) contact_id of the contact for which the location has changed.
+    ///     If the locations of several contacts have been changed,
+    ///     eg. after calling dc_delete_all_locations(), this parameter is set to 0.
+    /// @param data2 0
+    /// @return 0
+    LOCATION_CHANGED = 2035,
+
+    /// Inform about the configuration progress started by dc_configure().
+    ///
+    /// @param data1 (int) 0=error, 1-999=progress in permille, 1000=success and done
+    /// @param data2 0
+    /// @return 0
+    CONFIGURE_PROGRESS = 2041,
+
+    /// Inform about the import/export progress started by dc_imex().
+    ///
+    /// @param data1 (int) 0=error, 1-999=progress in permille, 1000=success and done
+    /// @param data2 0
+    /// @return 0
+    IMEX_PROGRESS = 2051,
+
+    /// A file has been exported. A file has been written by dc_imex().
+    /// This event may be sent multiple times by a single call to dc_imex().
+    ///
+    /// A typical purpose for a handler of this event may be to make the file public to some system
+    /// services.
+    ///
+    /// @param data1 (const char*) Path and file name.
+    ///     Must not be free()'d or modified and is valid only until the callback returns.
+    /// @param data2 0
+    /// @return 0
+    IMEX_FILE_WRITTEN = 2052,
+
+    /// Progress information of a secure-join handshake from the view of the inviter
+    /// (Alice, the person who shows the QR code).
+    ///
+    /// These events are typically sent after a joiner has scanned the QR code
+    /// generated by dc_get_securejoin_qr().
+    ///
+    /// @param data1 (int) ID of the contact that wants to join.
+    /// @param data2 (int) Progress as:
+    ///     300=vg-/vc-request received, typically shown as "bob@addr joins".
+    ///     600=vg-/vc-request-with-auth received, vg-member-added/vc-contact-confirm sent, typically shown as "bob@addr verified".
+    ///     800=vg-member-added-received received, shown as "bob@addr securely joined GROUP", only sent for the verified-group-protocol.
+    ///     1000=Protocol finished for this contact.
+    /// @return 0
+    SECUREJOIN_INVITER_PROGRESS = 2060,
+
+    /// Progress information of a secure-join handshake from the view of the joiner
+    /// (Bob, the person who scans the QR code).
+    /// The events are typically sent while dc_join_securejoin(), which
+    /// may take some time, is executed.
+    /// @param data1 (int) ID of the inviting contact.
+    /// @param data2 (int) Progress as:
+    ///     400=vg-/vc-request-with-auth sent, typically shown as "alice@addr verified, introducing myself."
+    ///     (Bob has verified alice and waits until Alice does the same for him)
+    /// @return 0
+    SECUREJOIN_JOINER_PROGRESS = 2061,
+
+    // the following events are functions that should be provided by the frontends
+    /// Requeste a localized string from the frontend.
+    /// @param data1 (int) ID of the string to request, one of the DC_STR_/// constants.
+    /// @param data2 (int) The count. If the requested string contains a placeholder for a numeric value,
+    ///     the ui may use this value to return different strings on different plural forms.
+    /// @return (const char*) Null-terminated UTF-8 string.
+    ///     The string will be free()'d by the core,
+    ///     so it must be allocated using malloc() or a compatible function.
+    ///     Return 0 if the ui cannot provide the requested string
+    ///     the core will use a default string in english language then.
+    GET_STRING = 2091,
+}
+
+pub const DC_EVENT_FILE_COPIED: usize = 2055; // deprecated;
+pub const DC_EVENT_IS_OFFLINE: usize = 2081; // deprecated;
+pub const DC_ERROR_SEE_STRING: usize = 0; // deprecated;
+pub const DC_ERROR_SELF_NOT_IN_GROUP: usize = 1; // deprecated;
+pub const DC_STR_SELFNOTINGRP: usize = 21; // deprecated;
 
 /// Values for dc_get|set_config("show_emails")
-const DC_SHOW_EMAILS_OFF: usize = 0;
-const DC_SHOW_EMAILS_ACCEPTED_CONTACTS: usize = 1;
-const DC_SHOW_EMAILS_ALL: usize = 2;
+pub const DC_SHOW_EMAILS_OFF: usize = 0;
+pub const DC_SHOW_EMAILS_ACCEPTED_CONTACTS: usize = 1;
+pub const DC_SHOW_EMAILS_ALL: usize = 2;
 
 // TODO: Strings need some doumentation about used placeholders.
 // These constants are used to request strings using #DC_EVENT_GET_STRING.
 
-const DC_STR_NOMESSAGES: usize = 1;
-const DC_STR_SELF: usize = 2;
-const DC_STR_DRAFT: usize = 3;
-const DC_STR_MEMBER: usize = 4;
-const DC_STR_CONTACT: usize = 6;
-const DC_STR_VOICEMESSAGE: usize = 7;
-const DC_STR_DEADDROP: usize = 8;
-const DC_STR_IMAGE: usize = 9;
-const DC_STR_VIDEO: usize = 10;
-const DC_STR_AUDIO: usize = 11;
-const DC_STR_FILE: usize = 12;
-const DC_STR_STATUSLINE: usize = 13;
-const DC_STR_NEWGROUPDRAFT: usize = 14;
-const DC_STR_MSGGRPNAME: usize = 15;
-const DC_STR_MSGGRPIMGCHANGED: usize = 16;
-const DC_STR_MSGADDMEMBER: usize = 17;
-const DC_STR_MSGDELMEMBER: usize = 18;
-const DC_STR_MSGGROUPLEFT: usize = 19;
-const DC_STR_GIF: usize = 23;
-const DC_STR_ENCRYPTEDMSG: usize = 24;
-const DC_STR_E2E_AVAILABLE: usize = 25;
-const DC_STR_ENCR_TRANSP: usize = 27;
-const DC_STR_ENCR_NONE: usize = 28;
-const DC_STR_CANTDECRYPT_MSG_BODY: usize = 29;
-const DC_STR_FINGERPRINTS: usize = 30;
-const DC_STR_READRCPT: usize = 31;
-const DC_STR_READRCPT_MAILBODY: usize = 32;
-const DC_STR_MSGGRPIMGDELETED: usize = 33;
-const DC_STR_E2E_PREFERRED: usize = 34;
-const DC_STR_CONTACT_VERIFIED: usize = 35;
-const DC_STR_CONTACT_NOT_VERIFIED: usize = 36;
-const DC_STR_CONTACT_SETUP_CHANGED: usize = 37;
-const DC_STR_ARCHIVEDCHATS: usize = 40;
-const DC_STR_STARREDMSGS: usize = 41;
-const DC_STR_AC_SETUP_MSG_SUBJECT: usize = 42;
-const DC_STR_AC_SETUP_MSG_BODY: usize = 43;
-const DC_STR_SELFTALK_SUBTITLE: usize = 50;
-const DC_STR_CANNOT_LOGIN: usize = 60;
-const DC_STR_SERVER_RESPONSE: usize = 61;
-const DC_STR_MSGACTIONBYUSER: usize = 62;
-const DC_STR_MSGACTIONBYME: usize = 63;
-const DC_STR_MSGLOCATIONENABLED: usize = 64;
-const DC_STR_MSGLOCATIONDISABLED: usize = 65;
-const DC_STR_LOCATION: usize = 66;
-const DC_STR_COUNT: usize = 66;
+pub const DC_STR_NOMESSAGES: usize = 1;
+pub const DC_STR_SELF: usize = 2;
+pub const DC_STR_DRAFT: usize = 3;
+pub const DC_STR_MEMBER: usize = 4;
+pub const DC_STR_CONTACT: usize = 6;
+pub const DC_STR_VOICEMESSAGE: usize = 7;
+pub const DC_STR_DEADDROP: usize = 8;
+pub const DC_STR_IMAGE: usize = 9;
+pub const DC_STR_VIDEO: usize = 10;
+pub const DC_STR_AUDIO: usize = 11;
+pub const DC_STR_FILE: usize = 12;
+pub const DC_STR_STATUSLINE: usize = 13;
+pub const DC_STR_NEWGROUPDRAFT: usize = 14;
+pub const DC_STR_MSGGRPNAME: usize = 15;
+pub const DC_STR_MSGGRPIMGCHANGED: usize = 16;
+pub const DC_STR_MSGADDMEMBER: usize = 17;
+pub const DC_STR_MSGDELMEMBER: usize = 18;
+pub const DC_STR_MSGGROUPLEFT: usize = 19;
+pub const DC_STR_GIF: usize = 23;
+pub const DC_STR_ENCRYPTEDMSG: usize = 24;
+pub const DC_STR_E2E_AVAILABLE: usize = 25;
+pub const DC_STR_ENCR_TRANSP: usize = 27;
+pub const DC_STR_ENCR_NONE: usize = 28;
+pub const DC_STR_CANTDECRYPT_MSG_BODY: usize = 29;
+pub const DC_STR_FINGERPRINTS: usize = 30;
+pub const DC_STR_READRCPT: usize = 31;
+pub const DC_STR_READRCPT_MAILBODY: usize = 32;
+pub const DC_STR_MSGGRPIMGDELETED: usize = 33;
+pub const DC_STR_E2E_PREFERRED: usize = 34;
+pub const DC_STR_CONTACT_VERIFIED: usize = 35;
+pub const DC_STR_CONTACT_NOT_VERIFIED: usize = 36;
+pub const DC_STR_CONTACT_SETUP_CHANGED: usize = 37;
+pub const DC_STR_ARCHIVEDCHATS: usize = 40;
+pub const DC_STR_STARREDMSGS: usize = 41;
+pub const DC_STR_AC_SETUP_MSG_SUBJECT: usize = 42;
+pub const DC_STR_AC_SETUP_MSG_BODY: usize = 43;
+pub const DC_STR_SELFTALK_SUBTITLE: usize = 50;
+pub const DC_STR_CANNOT_LOGIN: usize = 60;
+pub const DC_STR_SERVER_RESPONSE: usize = 61;
+pub const DC_STR_MSGACTIONBYUSER: usize = 62;
+pub const DC_STR_MSGACTIONBYME: usize = 63;
+pub const DC_STR_MSGLOCATIONENABLED: usize = 64;
+pub const DC_STR_MSGLOCATIONDISABLED: usize = 65;
+pub const DC_STR_LOCATION: usize = 66;
+pub const DC_STR_COUNT: usize = 66;
 
 pub const DC_JOB_DELETE_MSG_ON_IMAP: i32 = 110;
 
@@ -314,3 +531,12 @@ pub enum KeyType {
     Public = 0,
     Private = 1,
 }
+
+pub const DC_CMD_GROUPNAME_CHANGED: libc::c_int = 2;
+pub const DC_CMD_GROUPIMAGE_CHANGED: libc::c_int = 3;
+pub const DC_CMD_MEMBER_ADDED_TO_GROUP: libc::c_int = 4;
+pub const DC_CMD_MEMBER_REMOVED_FROM_GROUP: libc::c_int = 5;
+pub const DC_CMD_AUTOCRYPT_SETUP_MESSAGE: libc::c_int = 6;
+pub const DC_CMD_SECUREJOIN_MESSAGE: libc::c_int = 7;
+pub const DC_CMD_LOCATION_STREAMING_ENABLED: libc::c_int = 8;
+pub const DC_CMD_LOCATION_ONLY: libc::c_int = 9;

src/contact.rs

@@ -1,23 +1,24 @@
-use std::path::PathBuf;
-
-use deltachat_derive::*;
 use itertools::Itertools;
+use num_traits::{FromPrimitive, ToPrimitive};
 use rusqlite;
+use rusqlite::types::*;
 
 use crate::aheader::EncryptPreference;
 use crate::config::Config;
 use crate::constants::*;
 use crate::context::Context;
+use crate::dc_array::*;
+use crate::dc_e2ee::*;
+use crate::dc_loginparam::*;
 use crate::dc_tools::*;
-use crate::e2ee;
 use crate::error::Result;
-use crate::events::Event;
 use crate::key::*;
-use crate::login_param::LoginParam;
-use crate::message::MessageState;
 use crate::peerstate::*;
 use crate::sql;
 use crate::stock::StockMessage;
+use crate::types::*;
+
+const DC_GCL_VERIFIED_ONLY: u32 = 0x01;
 
 /// Contacts with at least this origin value are shown in the contact list.
 const DC_ORIGIN_MIN_CONTACT_LIST: i32 = 0x100;
@@ -32,8 +33,8 @@ const DC_ORIGIN_MIN_CONTACT_LIST: i32 = 0x100;
 /// For this purpose, internally, two names are tracked -
 /// authorized-name and given-name.
 /// By default, these names are equal, but functions working with contact names
-#[derive(Debug)]
-pub struct Contact {
+pub struct Contact<'a> {
+    context: &'a Context,
     /// The contact ID.
     ///
     /// Special message IDs:
@@ -59,9 +60,7 @@ pub struct Contact {
 }
 
 /// Possible origins of a contact.
-#[derive(
-    Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, FromPrimitive, ToPrimitive, FromSql, ToSql,
-)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, FromPrimitive, ToPrimitive)]
 #[repr(i32)]
 pub enum Origin {
     Unknown = 0,
@@ -99,9 +98,20 @@ pub enum Origin {
     ManuallyCreated = 0x4000000,
 }
 
-impl Default for Origin {
-    fn default() -> Self {
-        Origin::Unknown
+impl ToSql for Origin {
+    fn to_sql(&self) -> rusqlite::Result<ToSqlOutput> {
+        let num: i64 = self
+            .to_i64()
+            .expect("impossible: Origin -> i64 conversion failed");
+
+        Ok(ToSqlOutput::Owned(Value::Integer(num)))
+    }
+}
+
+impl FromSql for Origin {
+    fn column_result(col: ValueRef) -> FromSqlResult<Self> {
+        let inner = FromSql::column_result(col)?;
+        FromPrimitive::from_i64(inner).ok_or(FromSqlError::InvalidType)
     }
 }
 
@@ -129,7 +139,7 @@ pub enum Modifier {
     Created,
 }
 
-#[derive(Debug, PartialEq, Eq, Clone, Copy, FromPrimitive)]
+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
 #[repr(u8)]
 pub enum VerifiedStatus {
     /// Contact is not verified.
@@ -140,10 +150,11 @@ pub enum VerifiedStatus {
     BidirectVerified = 2,
 }
 
-impl Contact {
-    pub fn load_from_db(context: &Context, contact_id: u32) -> Result<Self> {
-        if contact_id == DC_CONTACT_ID_SELF {
+impl<'a> Contact<'a> {
+    pub fn load_from_db(context: &'a Context, contact_id: u32) -> Result<Self> {
+        if contact_id == DC_CONTACT_ID_SELF as u32 {
             let contact = Contact {
+                context,
                 id: contact_id,
                 name: context.stock_str(StockMessage::SelfMsg).into(),
                 authname: "".into(),
@@ -162,6 +173,7 @@ impl Contact {
             params![contact_id as i32],
             |row| {
                 let contact = Self {
+                    context,
                     id: contact_id,
                     name: row.get::<_, String>(0)?,
                     authname: row.get::<_, String>(4)?,
@@ -180,7 +192,7 @@ impl Contact {
     }
 
     /// Check if a contact is blocked.
-    pub fn is_blocked_load(context: &Context, id: u32) -> bool {
+    pub fn is_blocked_load(context: &'a Context, id: u32) -> bool {
         Self::load_from_db(context, id)
             .map(|contact| contact.blocked)
             .unwrap_or_default()
@@ -214,13 +226,15 @@ impl Contact {
         let (contact_id, sth_modified) =
             Contact::add_or_lookup(context, name, addr, Origin::ManuallyCreated)?;
         let blocked = Contact::is_blocked_load(context, contact_id);
-        context.call_cb(Event::ContactsChanged(
-            if sth_modified == Modifier::Created {
-                Some(contact_id)
+        context.call_cb(
+            Event::CONTACTS_CHANGED,
+            (if sth_modified == Modifier::Created {
+                contact_id
             } else {
-                None
-            },
-        ));
+                0
+            }) as uintptr_t,
+            0 as uintptr_t,
+        );
         if blocked {
             Contact::unblock(context, contact_id);
         }
@@ -237,14 +251,11 @@ impl Contact {
             context,
             &context.sql,
             "UPDATE msgs SET state=? WHERE from_id=? AND state=?;",
-            params![MessageState::InNoticed, id as i32, MessageState::InFresh],
+            params![DC_STATE_IN_NOTICED, id as i32, DC_STATE_IN_FRESH],
         )
         .is_ok()
         {
-            context.call_cb(Event::MsgsChanged {
-                chat_id: 0,
-                msg_id: 0,
-            });
+            context.call_cb(Event::MSGS_CHANGED, 0, 0);
         }
     }
 
@@ -267,7 +278,7 @@ impl Contact {
             return 1;
         }
 
-        context.sql.query_get_value(
+        context.sql.query_row_col(
             context,
             "SELECT id FROM contacts WHERE addr=?1 COLLATE NOCASE AND id>?2 AND origin>=?3 AND blocked=0;",
             params![
@@ -275,6 +286,7 @@ impl Contact {
                 DC_CONTACT_ID_LAST_SPECIAL as i32,
                 DC_ORIGIN_MIN_CONTACT_LIST,
             ],
+            0
         ).unwrap_or_default()
     }
 
@@ -307,6 +319,7 @@ impl Contact {
         if !may_be_valid_addr(&addr) {
             warn!(
                 context,
+                0,
                 "Bad address \"{}\" for contact \"{}\".",
                 addr,
                 if !name.as_ref().is_empty() {
@@ -315,7 +328,7 @@ impl Contact {
                     "<unset>"
                 },
             );
-            bail!("Bad address supplied: {:?}", addr);
+            bail!("Bad address supplied");
         }
 
         let mut update_addr = false;
@@ -330,22 +343,19 @@ impl Contact {
                 let row_id = row.get(0)?;
                 let row_name: String = row.get(1)?;
                 let row_addr: String = row.get(2)?;
-                let row_origin: Origin = row.get(3)?;
+                let row_origin = row.get(3)?;
                 let row_authname: String = row.get(4)?;
 
-                if !name.as_ref().is_empty() {
-                    if !row_name.is_empty() {
-                        if origin >= row_origin && name.as_ref() != row_name {
-                            update_name = true;
-                        }
-                    } else {
+                if !name.as_ref().is_empty() && !row_name.is_empty() {
+                    if origin >= row_origin && name.as_ref() != row_name {
                         update_name = true;
                     }
-                    if origin == Origin::IncomingUnknownFrom && name.as_ref() != row_authname {
-                        update_authname = true;
-                    }
+                } else {
+                    update_name = true;
+                }
+                if origin == Origin::IncomingUnknownFrom && name.as_ref() != row_authname {
+                    update_authname = true;
                 }
-
                 Ok((row_id, row_name, row_addr, row_origin, row_authname))
             },
         ) {
@@ -385,7 +395,7 @@ impl Contact {
                     context,
                     &context.sql,
                     "UPDATE chats SET name=? WHERE type=? AND id IN(SELECT chat_id FROM chats_contacts WHERE contact_id=?);",
-                    params![name.as_ref(), Chattype::Single, row_id]
+                    params![name.as_ref(), 100, row_id]
                 ).ok();
                 }
                 sth_modified = Modifier::Modified;
@@ -402,7 +412,7 @@ impl Contact {
                 row_id = sql::get_rowid(context, &context.sql, "contacts", "addr", addr);
                 sth_modified = Modifier::Created;
             } else {
-                error!(context, "Cannot add contact.");
+                error!(context, 0, "Cannot add contact.");
             }
         }
 
@@ -423,13 +433,19 @@ impl Contact {
     /// To add a single contact entered by the user, you should prefer `Contact::create`,
     /// however, for adding a bunch of addresses, this function is _much_ faster.
     ///
-    /// The `addr_book` is a multiline string in the format `Name one\nAddress one\nName two\nAddress two`.
+    /// The `adr_book` is a multiline string in the format `Name one\nAddress one\nName two\nAddress two`.
     ///
     /// Returns the number of modified contacts.
-    pub fn add_address_book(context: &Context, addr_book: impl AsRef<str>) -> Result<usize> {
+    pub fn add_address_book(context: &Context, adr_book: impl AsRef<str>) -> Result<usize> {
         let mut modify_cnt = 0;
 
-        for (name, addr) in split_address_book(addr_book.as_ref()).into_iter() {
+        for chunk in &adr_book.as_ref().lines().chunks(2) {
+            let chunk = chunk.collect::<Vec<_>>();
+            if chunk.len() < 2 {
+                break;
+            }
+            let name = chunk[0];
+            let addr = chunk[1];
             let name = normalize_name(name);
             let (_, modified) = Contact::add_or_lookup(context, name, addr, Origin::AdressBook)?;
             if modified != Modifier::None {
@@ -437,7 +453,7 @@ impl Contact {
             }
         }
         if modify_cnt > 0 {
-            context.call_cb(Event::ContactsChanged(None));
+            context.call_cb(Event::CONTACTS_CHANGED, 0 as uintptr_t, 0 as uintptr_t);
         }
 
         Ok(modify_cnt)
@@ -463,10 +479,8 @@ impl Contact {
 
         let mut add_self = false;
         let mut ret = Vec::new();
-        let flag_verified_only = listflags_has(listflags, DC_GCL_VERIFIED_ONLY);
-        let flag_add_self = listflags_has(listflags, DC_GCL_ADD_SELF);
 
-        if flag_verified_only || query.is_some() {
+        if (listflags & DC_GCL_VERIFIED_ONLY) > 0 || query.is_some() {
             let s3str_like_cmd = format!(
                 "%{}%",
                 query
@@ -490,7 +504,7 @@ impl Contact {
                     0x100,
                     &s3str_like_cmd,
                     &s3str_like_cmd,
-                    if flag_verified_only { 0 } else { 1 },
+                    if 0 != listflags & 0x1 { 0 } else { 1 },
                 ],
                 |row| row.get::<_, i32>(0),
                 |ids| {
@@ -530,8 +544,8 @@ impl Contact {
             )?;
         }
 
-        if flag_add_self && add_self {
-            ret.push(DC_CONTACT_ID_SELF);
+        if 0 != listflags & DC_GCL_ADD_SELF as u32 && add_self {
+            ret.push(DC_CONTACT_ID_SELF as u32);
         }
 
         Ok(ret)
@@ -540,28 +554,34 @@ impl Contact {
     pub fn get_blocked_cnt(context: &Context) -> usize {
         context
             .sql
-            .query_get_value::<_, isize>(
+            .query_row_col::<_, isize>(
                 context,
                 "SELECT COUNT(*) FROM contacts WHERE id>? AND blocked!=0",
                 params![DC_CONTACT_ID_LAST_SPECIAL as i32],
+                0,
             )
             .unwrap_or_default() as usize
     }
 
     /// Get blocked contacts.
-    pub fn get_all_blocked(context: &Context) -> Vec<u32> {
+    pub fn get_all_blocked(context: &Context) -> *mut dc_array_t {
         context
             .sql
             .query_map(
                 "SELECT id FROM contacts WHERE id>? AND blocked!=0 ORDER BY LOWER(name||addr),id;",
                 params![DC_CONTACT_ID_LAST_SPECIAL as i32],
-                |row| row.get::<_, u32>(0),
+                |row| row.get::<_, i32>(0),
                 |ids| {
-                    ids.collect::<std::result::Result<Vec<_>, _>>()
-                        .map_err(Into::into)
+                    let mut ret = Vec::new();
+
+                    for id in ids {
+                        ret.push(id? as u32);
+                    }
+
+                    Ok(dc_array_t::from(ret).into_raw())
                 },
             )
-            .unwrap_or_default()
+            .unwrap_or_else(|_| std::ptr::null_mut())
     }
 
     /// Returns a textual summary of the encryption state for the contact.
@@ -574,7 +594,7 @@ impl Contact {
 
         if let Ok(contact) = Contact::load_from_db(context, contact_id) {
             let peerstate = Peerstate::from_addr(context, &context.sql, &contact.addr);
-            let loginparam = LoginParam::from_database(context, "configured_");
+            let loginparam = dc_loginparam_read(context, &context.sql, "configured_");
 
             let mut self_key = Key::from_self_public(context, &loginparam.addr, &context.sql);
 
@@ -588,7 +608,7 @@ impl Contact {
                     });
                 ret += &p;
                 if self_key.is_none() {
-                    e2ee::ensure_secret_key_exists(context)?;
+                    dc_ensure_secret_key_exists(context)?;
                     self_key = Key::from_self_public(context, &loginparam.addr, &context.sql);
                 }
                 let p = context.stock_str(StockMessage::FingerPrints);
@@ -640,26 +660,28 @@ impl Contact {
     /// May result in a `#DC_EVENT_CONTACTS_CHANGED` event.
     pub fn delete(context: &Context, contact_id: u32) -> Result<()> {
         ensure!(
-            contact_id > DC_CONTACT_ID_LAST_SPECIAL,
+            contact_id > DC_CONTACT_ID_LAST_SPECIAL as u32,
             "Can not delete special contact"
         );
 
         let count_contacts: i32 = context
             .sql
-            .query_get_value(
+            .query_row_col(
                 context,
                 "SELECT COUNT(*) FROM chats_contacts WHERE contact_id=?;",
                 params![contact_id as i32],
+                0,
             )
             .unwrap_or_default();
 
         let count_msgs: i32 = if count_contacts > 0 {
             context
                 .sql
-                .query_get_value(
+                .query_row_col(
                     context,
                     "SELECT COUNT(*) FROM msgs WHERE from_id=? OR to_id=?;",
                     params![contact_id as i32, contact_id as i32],
+                    0,
                 )
                 .unwrap_or_default()
         } else {
@@ -674,11 +696,11 @@ impl Contact {
                 params![contact_id as i32],
             ) {
                 Ok(_) => {
-                    context.call_cb(Event::ContactsChanged(None));
+                    context.call_cb(Event::CONTACTS_CHANGED, 0, 0);
                     return Ok(());
                 }
                 Err(err) => {
-                    error!(context, "delete_contact {} failed ({})", contact_id, err);
+                    error!(context, 0, "delete_contact {} failed ({})", contact_id, err);
                     return Err(err);
                 }
             }
@@ -686,7 +708,7 @@ impl Contact {
 
         info!(
             context,
-            "could not delete contact {}, there are {} messages with it", contact_id, count_msgs
+            0, "could not delete contact {}, there are {} messages with it", contact_id, count_msgs
         );
         bail!("Could not delete contact with messages in it");
     }
@@ -762,11 +784,9 @@ impl Contact {
     /// Get the contact's profile image.
     /// This is the image set by each remote user on their own
     /// using dc_set_config(context, "selfavatar", image).
-    pub fn get_profile_image(&self, context: &Context) -> Option<PathBuf> {
-        if self.id == DC_CONTACT_ID_SELF {
-            if let Some(p) = context.get_config(Config::Selfavatar) {
-                return Some(PathBuf::from(p));
-            }
+    pub fn get_profile_image(&self) -> Option<String> {
+        if self.id == DC_CONTACT_ID_SELF as u32 {
+            return self.context.get_config(Config::Selfavatar);
         }
         // TODO: else get image_abs from contact param
         None
@@ -777,7 +797,7 @@ impl Contact {
     /// and can be used for an fallback avatar with white initials
     /// as well as for headlines in bubbles of group chats.
     pub fn get_color(&self) -> u32 {
-        dc_str_to_color(&self.addr)
+        dc_str_to_color_safe(&self.addr)
     }
 
     /// Check if a contact was verified. E.g. by a secure-join QR code scan
@@ -785,21 +805,17 @@ impl Contact {
     ///
     /// The UI may draw a checkbox or something like that beside verified contacts.
     ///
-    pub fn is_verified(&self, context: &Context) -> VerifiedStatus {
-        self.is_verified_ex(context, None)
+    pub fn is_verified(&self) -> VerifiedStatus {
+        self.is_verified_ex(None)
     }
 
     /// Same as `Contact::is_verified` but allows speeding up things
     /// by adding the peerstate belonging to the contact.
     /// If you do not have the peerstate available, it is loaded automatically.
-    pub fn is_verified_ex(
-        &self,
-        context: &Context,
-        peerstate: Option<&Peerstate>,
-    ) -> VerifiedStatus {
+    pub fn is_verified_ex(&self, peerstate: Option<&Peerstate<'a>>) -> VerifiedStatus {
         // We're always sort of secured-verified as we could verify the key on this device any time with the key
         // on this device
-        if self.id == DC_CONTACT_ID_SELF {
+        if self.id == DC_CONTACT_ID_SELF as u32 {
             return VerifiedStatus::BidirectVerified;
         }
 
@@ -809,7 +825,7 @@ impl Contact {
             }
         }
 
-        let peerstate = Peerstate::from_addr(context, &context.sql, &self.addr);
+        let peerstate = Peerstate::from_addr(self.context, &self.context.sql, &self.addr);
         if let Some(ps) = peerstate {
             if ps.verified_key().is_some() {
                 return VerifiedStatus::BidirectVerified;
@@ -843,10 +859,11 @@ impl Contact {
 
         context
             .sql
-            .query_get_value::<_, isize>(
+            .query_row_col::<_, isize>(
                 context,
                 "SELECT COUNT(*) FROM contacts WHERE id>?;",
                 params![DC_CONTACT_ID_LAST_SPECIAL as i32],
+                0,
             )
             .unwrap_or_default() as usize
     }
@@ -892,14 +909,26 @@ impl Contact {
     }
 }
 
-fn get_first_name<'a>(full_name: &'a str) -> &'a str {
+pub fn get_first_name<'a>(full_name: &'a str) -> &'a str {
     full_name.splitn(2, ' ').next().unwrap_or_default()
 }
 
 /// Returns false if addr is an invalid address, otherwise true.
 pub fn may_be_valid_addr(addr: &str) -> bool {
-    let res = addr.parse::<EmailAddress>();
-    res.is_ok()
+    if addr.is_empty() {
+        return false;
+    }
+
+    let at = addr.find('@').unwrap_or_default();
+    if at < 1 {
+        return false;
+    }
+    let dot = addr.find('.').unwrap_or_default();
+    if dot < 1 || dot > addr.len() - 3 || dot < at + 2 {
+        return false;
+    }
+
+    true
 }
 
 pub fn addr_normalize(addr: &str) -> &str {
@@ -939,7 +968,11 @@ fn set_block_contact(context: &Context, contact_id: u32, new_blocking: bool) {
                     params![new_blocking, 100, contact_id as i32],
                 ).is_ok() {
                     Contact::mark_noticed(context, contact_id);
-                    context.call_cb(Event::ContactsChanged(None));
+                    context.call_cb(
+                        Event::CONTACTS_CHANGED,
+                        0,
+                        0,
+                    );
                 }
             }
         }
@@ -1027,21 +1060,6 @@ pub fn addr_equals_self(context: &Context, addr: impl AsRef<str>) -> bool {
     false
 }
 
-fn split_address_book(book: &str) -> Vec<(&str, &str)> {
-    book.lines()
-        .chunks(2)
-        .into_iter()
-        .filter_map(|mut chunk| {
-            let name = chunk.next().unwrap();
-            let addr = match chunk.next() {
-                Some(a) => a,
-                None => return None,
-            };
-            Some((name, addr))
-        })
-        .collect()
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -1077,14 +1095,4 @@ mod tests {
     fn test_get_first_name() {
         assert_eq!(get_first_name("John Doe"), "John");
     }
-
-    #[test]
-    fn test_split_address_book() {
-        let book = "Name one\nAddress one\nName two\nAddress two\nrest name";
-        let list = split_address_book(&book);
-        assert_eq!(
-            list,
-            vec![("Name one", "Address one"), ("Name two", "Address two")]
-        )
-    }
 }

src/context.rs

@@ -1,56 +1,39 @@
-use std::collections::HashMap;
-use std::ffi::OsString;
-use std::path::{Path, PathBuf};
 use std::sync::{Arc, Condvar, Mutex, RwLock};
 
-use libc::uintptr_t;
-
-use crate::chat::*;
 use crate::constants::*;
 use crate::contact::*;
-use crate::error::*;
-use crate::events::Event;
+use crate::dc_array::*;
+use crate::dc_chat::*;
+use crate::dc_job::*;
+use crate::dc_jobthread::*;
+use crate::dc_loginparam::*;
+use crate::dc_lot::dc_lot_t;
+use crate::dc_move::*;
+use crate::dc_msg::*;
+use crate::dc_receive_imf::*;
+use crate::dc_tools::*;
 use crate::imap::*;
-use crate::job::*;
-use crate::job_thread::JobThread;
 use crate::key::*;
-use crate::login_param::LoginParam;
-use crate::lot::Lot;
-use crate::message::*;
 use crate::param::Params;
 use crate::smtp::*;
 use crate::sql::Sql;
+use crate::types::*;
+use crate::x::*;
 
-/// Callback function type for [Context]
-///
-/// # Parameters
-///
-/// * `context` - The context object as returned by [Context::new].
-/// * `event` - One of the [Event] items.
-/// * `data1` - Depends on the event parameter, see [Event].
-/// * `data2` - Depends on the event parameter, see [Event].
-///
-/// # Returns
-///
-/// This callback must return 0 unless stated otherwise in the event
-/// description at [Event].
-pub type ContextCallback = dyn Fn(&Context, Event) -> uintptr_t + Send + Sync;
-
-#[derive(DebugStub)]
 pub struct Context {
-    dbfile: PathBuf,
-    blobdir: PathBuf,
+    pub userdata: *mut libc::c_void,
+    pub dbfile: Arc<RwLock<*mut libc::c_char>>,
+    pub blobdir: Arc<RwLock<*mut libc::c_char>>,
     pub sql: Sql,
     pub inbox: Arc<RwLock<Imap>>,
     pub perform_inbox_jobs_needed: Arc<RwLock<bool>>,
     pub probe_imap_network: Arc<RwLock<bool>>,
-    pub sentbox_thread: Arc<RwLock<JobThread>>,
-    pub mvbox_thread: Arc<RwLock<JobThread>>,
+    pub sentbox_thread: Arc<RwLock<dc_jobthread_t>>,
+    pub mvbox_thread: Arc<RwLock<dc_jobthread_t>>,
     pub smtp: Arc<Mutex<Smtp>>,
     pub smtp_state: Arc<(Mutex<SmtpState>, Condvar)>,
     pub oauth2_critical: Arc<Mutex<()>>,
-    #[debug_stub = "Callback"]
-    pub cb: Box<ContextCallback>,
+    pub cb: Option<dc_callback_t>,
     pub os_name: Option<String>,
     pub cmdline_sel_chat_id: Arc<RwLock<u32>>,
     pub bob: Arc<RwLock<BobStatus>>,
@@ -60,6 +43,9 @@ pub struct Context {
     pub generating_key_mutex: Mutex<()>,
 }
 
+unsafe impl std::marker::Send for Context {}
+unsafe impl std::marker::Sync for Context {}
+
 #[derive(Debug, PartialEq, Eq)]
 pub struct RunningState {
     pub ongoing_running: bool,
@@ -67,330 +53,36 @@ pub struct RunningState {
 }
 
 impl Context {
-    pub fn new(cb: Box<ContextCallback>, os_name: String, dbfile: PathBuf) -> Result<Context> {
-        let mut blob_fname = OsString::new();
-        blob_fname.push(dbfile.file_name().unwrap_or_default());
-        blob_fname.push("-blobs");
-        let blobdir = dbfile.with_file_name(blob_fname);
-        if !blobdir.exists() {
-            std::fs::create_dir_all(&blobdir)?;
-        }
-        Context::with_blobdir(cb, os_name, dbfile, blobdir)
+    pub fn has_dbfile(&self) -> bool {
+        !self.get_dbfile().is_null()
     }
 
-    pub fn with_blobdir(
-        cb: Box<ContextCallback>,
-        os_name: String,
-        dbfile: PathBuf,
-        blobdir: PathBuf,
-    ) -> Result<Context> {
-        ensure!(
-            blobdir.is_dir(),
-            "Blobdir does not exist: {}",
-            blobdir.display()
-        );
-        let ctx = Context {
-            blobdir,
-            dbfile,
-            inbox: Arc::new(RwLock::new(Imap::new())),
-            cb,
-            os_name: Some(os_name),
-            running_state: Arc::new(RwLock::new(Default::default())),
-            sql: Sql::new(),
-            smtp: Arc::new(Mutex::new(Smtp::new())),
-            smtp_state: Arc::new((Mutex::new(Default::default()), Condvar::new())),
-            oauth2_critical: Arc::new(Mutex::new(())),
-            bob: Arc::new(RwLock::new(Default::default())),
-            last_smeared_timestamp: Arc::new(RwLock::new(0)),
-            cmdline_sel_chat_id: Arc::new(RwLock::new(0)),
-            sentbox_thread: Arc::new(RwLock::new(JobThread::new(
-                "SENTBOX",
-                "configured_sentbox_folder",
-                Imap::new(),
-            ))),
-            mvbox_thread: Arc::new(RwLock::new(JobThread::new(
-                "MVBOX",
-                "configured_mvbox_folder",
-                Imap::new(),
-            ))),
-            probe_imap_network: Arc::new(RwLock::new(false)),
-            perform_inbox_jobs_needed: Arc::new(RwLock::new(false)),
-            generating_key_mutex: Mutex::new(()),
-        };
-
-        ensure!(
-            ctx.sql.open(&ctx, &ctx.dbfile, 0),
-            "Failed opening sqlite database"
-        );
-
-        Ok(ctx)
+    pub fn has_blobdir(&self) -> bool {
+        !self.get_blobdir().is_null()
     }
 
-    pub fn get_dbfile(&self) -> &Path {
-        self.dbfile.as_path()
+    pub fn get_dbfile(&self) -> *const libc::c_char {
+        *self.dbfile.clone().read().unwrap()
     }
 
-    pub fn get_blobdir(&self) -> &Path {
-        self.blobdir.as_path()
+    pub fn get_blobdir(&self) -> *const libc::c_char {
+        *self.blobdir.clone().read().unwrap()
     }
 
-    pub fn call_cb(&self, event: Event) -> uintptr_t {
-        (*self.cb)(self, event)
-    }
-
-    pub fn get_info(&self) -> HashMap<&'static str, String> {
-        let unset = "0";
-        let l = LoginParam::from_database(self, "");
-        let l2 = LoginParam::from_database(self, "configured_");
-        let displayname = self.sql.get_config(self, "displayname");
-        let chats = get_chat_cnt(self) as usize;
-        let real_msgs = dc_get_real_msg_cnt(self) as usize;
-        let deaddrop_msgs = dc_get_deaddrop_msg_cnt(self) as usize;
-        let contacts = Contact::get_real_cnt(self) as usize;
-        let is_configured = self
-            .sql
-            .get_config_int(self, "configured")
-            .unwrap_or_default();
-        let dbversion = self
-            .sql
-            .get_config_int(self, "dbversion")
-            .unwrap_or_default();
-        let e2ee_enabled = self
-            .sql
-            .get_config_int(self, "e2ee_enabled")
-            .unwrap_or_else(|| 1);
-        let mdns_enabled = self
-            .sql
-            .get_config_int(self, "mdns_enabled")
-            .unwrap_or_else(|| 1);
-
-        let prv_key_cnt: Option<isize> =
-            self.sql
-                .query_get_value(self, "SELECT COUNT(*) FROM keypairs;", rusqlite::NO_PARAMS);
-
-        let pub_key_cnt: Option<isize> = self.sql.query_get_value(
-            self,
-            "SELECT COUNT(*) FROM acpeerstates;",
-            rusqlite::NO_PARAMS,
-        );
-
-        let fingerprint_str = if let Some(key) = Key::from_self_public(self, &l2.addr, &self.sql) {
-            key.fingerprint()
+    pub fn call_cb(&self, event: Event, data1: uintptr_t, data2: uintptr_t) -> uintptr_t {
+        if let Some(cb) = self.cb {
+            unsafe { cb(self, event, data1, data2) }
         } else {
-            "<Not yet calculated>".into()
-        };
-
-        let inbox_watch = self
-            .sql
-            .get_config_int(self, "inbox_watch")
-            .unwrap_or_else(|| 1);
-        let sentbox_watch = self
-            .sql
-            .get_config_int(self, "sentbox_watch")
-            .unwrap_or_else(|| 1);
-        let mvbox_watch = self
-            .sql
-            .get_config_int(self, "mvbox_watch")
-            .unwrap_or_else(|| 1);
-        let mvbox_move = self
-            .sql
-            .get_config_int(self, "mvbox_move")
-            .unwrap_or_else(|| 1);
-        let folders_configured = self
-            .sql
-            .get_config_int(self, "folders_configured")
-            .unwrap_or_default();
-        let configured_sentbox_folder = self
-            .sql
-            .get_config(self, "configured_sentbox_folder")
-            .unwrap_or_else(|| "<unset>".to_string());
-        let configured_mvbox_folder = self
-            .sql
-            .get_config(self, "configured_mvbox_folder")
-            .unwrap_or_else(|| "<unset>".to_string());
-
-        let mut res = HashMap::new();
-        res.insert("deltachat_core_version", format!("v{}", &*DC_VERSION_STR));
-        res.insert("sqlite_version", rusqlite::version().to_string());
-        res.insert(
-            "sqlite_thread_safe",
-            unsafe { rusqlite::ffi::sqlite3_threadsafe() }.to_string(),
-        );
-        res.insert(
-            "arch",
-            (::std::mem::size_of::<*mut libc::c_void>())
-                .wrapping_mul(8)
-                .to_string(),
-        );
-        res.insert("number_of_chats", chats.to_string());
-        res.insert("number_of_chat_messages", real_msgs.to_string());
-        res.insert("messages_in_contact_requests", deaddrop_msgs.to_string());
-        res.insert("number_of_contacts", contacts.to_string());
-        res.insert("database_dir", self.get_dbfile().display().to_string());
-        res.insert("database_version", dbversion.to_string());
-        res.insert("blobdir", self.get_blobdir().display().to_string());
-        res.insert("display_name", displayname.unwrap_or_else(|| unset.into()));
-        res.insert("is_configured", is_configured.to_string());
-        res.insert("entered_account_settings", l.to_string());
-        res.insert("used_account_settings", l2.to_string());
-        res.insert("inbox_watch", inbox_watch.to_string());
-        res.insert("sentbox_watch", sentbox_watch.to_string());
-        res.insert("mvbox_watch", mvbox_watch.to_string());
-        res.insert("mvbox_move", mvbox_move.to_string());
-        res.insert("folders_configured", folders_configured.to_string());
-        res.insert("configured_sentbox_folder", configured_sentbox_folder);
-        res.insert("configured_mvbox_folder", configured_mvbox_folder);
-        res.insert("mdns_enabled", mdns_enabled.to_string());
-        res.insert("e2ee_enabled", e2ee_enabled.to_string());
-        res.insert(
-            "private_key_count",
-            prv_key_cnt.unwrap_or_default().to_string(),
-        );
-        res.insert(
-            "public_key_count",
-            pub_key_cnt.unwrap_or_default().to_string(),
-        );
-        res.insert("fingerprint", fingerprint_str);
-        res.insert("level", "awesome".into());
-
-        res
-    }
-
-    pub fn get_fresh_msgs(&self) -> Vec<u32> {
-        let show_deaddrop = 0;
-
-        self.sql
-            .query_map(
-                "SELECT m.id FROM msgs m LEFT JOIN contacts ct \
-                 ON m.from_id=ct.id LEFT JOIN chats c ON m.chat_id=c.id WHERE m.state=?   \
-                 AND m.hidden=0   \
-                 AND m.chat_id>?   \
-                 AND ct.blocked=0   \
-                 AND (c.blocked=0 OR c.blocked=?) ORDER BY m.timestamp DESC,m.id DESC;",
-                &[10, 9, if 0 != show_deaddrop { 2 } else { 0 }],
-                |row| row.get(0),
-                |rows| {
-                    let mut ret = Vec::new();
-                    for row in rows {
-                        let id: u32 = row?;
-                        ret.push(id);
-                    }
-                    Ok(ret)
-                },
-            )
-            .unwrap()
-    }
-
-    #[allow(non_snake_case)]
-    pub fn search_msgs(&self, chat_id: u32, query: impl AsRef<str>) -> Vec<u32> {
-        let real_query = query.as_ref().trim();
-        if real_query.is_empty() {
-            return Vec::new();
-        }
-        let strLikeInText = format!("%{}%", real_query);
-        let strLikeBeg = format!("{}%", real_query);
-
-        let query = if 0 != chat_id {
-            "SELECT m.id, m.timestamp FROM msgs m LEFT JOIN contacts ct ON m.from_id=ct.id WHERE m.chat_id=?  \
-         AND m.hidden=0  \
-         AND ct.blocked=0 AND (txt LIKE ? OR ct.name LIKE ?) ORDER BY m.timestamp,m.id;"
-        } else {
-            "SELECT m.id, m.timestamp FROM msgs m LEFT JOIN contacts ct ON m.from_id=ct.id \
-         LEFT JOIN chats c ON m.chat_id=c.id WHERE m.chat_id>9 AND m.hidden=0  \
-         AND (c.blocked=0 OR c.blocked=?) \
-         AND ct.blocked=0 AND (m.txt LIKE ? OR ct.name LIKE ?) ORDER BY m.timestamp DESC,m.id DESC;"
-        };
-
-        self.sql
-            .query_map(
-                query,
-                params![chat_id as i32, &strLikeInText, &strLikeBeg],
-                |row| row.get::<_, i32>(0),
-                |rows| {
-                    let mut ret = Vec::new();
-                    for id in rows {
-                        ret.push(id? as u32);
-                    }
-                    Ok(ret)
-                },
-            )
-            .unwrap_or_default()
-    }
-
-    pub fn is_inbox(&self, folder_name: impl AsRef<str>) -> bool {
-        folder_name.as_ref() == "INBOX"
-    }
-
-    pub fn is_sentbox(&self, folder_name: impl AsRef<str>) -> bool {
-        let sentbox_name = self.sql.get_config(self, "configured_sentbox_folder");
-        if let Some(name) = sentbox_name {
-            name == folder_name.as_ref()
-        } else {
-            false
-        }
-    }
-
-    pub fn is_mvbox(&self, folder_name: impl AsRef<str>) -> bool {
-        let mvbox_name = self.sql.get_config(self, "configured_mvbox_folder");
-
-        if let Some(name) = mvbox_name {
-            name == folder_name.as_ref()
-        } else {
-            false
-        }
-    }
-
-    pub fn do_heuristics_moves(&self, folder: &str, msg_id: u32) {
-        if self
-            .sql
-            .get_config_int(self, "mvbox_move")
-            .unwrap_or_else(|| 1)
-            == 0
-        {
-            return;
-        }
-
-        if !self.is_inbox(folder) && !self.is_sentbox(folder) {
-            return;
-        }
-
-        if let Ok(msg) = dc_msg_new_load(self, msg_id) {
-            if dc_msg_is_setupmessage(&msg) {
-                // do not move setup messages;
-                // there may be a non-delta device that wants to handle it
-                return;
-            }
-
-            if self.is_mvbox(folder) {
-                dc_update_msg_move_state(self, msg.rfc724_mid, MoveState::Stay);
-            }
-
-            // 1 = dc message, 2 = reply to dc message
-            if 0 != msg.is_dc_message {
-                job_add(
-                    self,
-                    Action::MoveMsg,
-                    msg.id as libc::c_int,
-                    Params::new(),
-                    0,
-                );
-                dc_update_msg_move_state(self, msg.rfc724_mid, MoveState::Moving);
-            }
+            0
         }
     }
 }
 
 impl Drop for Context {
     fn drop(&mut self) {
-        info!(self, "disconnecting INBOX-watch",);
-        self.inbox.read().unwrap().disconnect(self);
-        info!(self, "disconnecting sentbox-thread",);
-        self.sentbox_thread.read().unwrap().imap.disconnect(self);
-        info!(self, "disconnecting mvbox-thread",);
-        self.mvbox_thread.read().unwrap().imap.disconnect(self);
-        info!(self, "disconnecting SMTP");
-        self.smtp.clone().lock().unwrap().disconnect();
-        self.sql.close(self);
+        unsafe {
+            dc_close(&self);
+        }
     }
 }
 
@@ -403,11 +95,21 @@ impl Default for RunningState {
     }
 }
 
-#[derive(Debug, Default)]
+#[derive(Debug, PartialEq, Eq)]
 pub struct BobStatus {
     pub expects: i32,
     pub status: i32,
-    pub qr_scan: Option<Lot>,
+    pub qr_scan: *mut dc_lot_t,
+}
+
+impl Default for BobStatus {
+    fn default() -> Self {
+        BobStatus {
+            expects: 0,
+            status: 0,
+            qr_scan: std::ptr::null_mut(),
+        }
+    }
 }
 
 #[derive(Default, Debug)]
@@ -419,75 +121,487 @@ pub struct SmtpState {
     pub probe_network: bool,
 }
 
-pub fn get_version_str() -> &'static str {
-    &DC_VERSION_STR
+// create/open/config/information
+pub fn dc_context_new(
+    cb: Option<dc_callback_t>,
+    userdata: *mut libc::c_void,
+    os_name: Option<String>,
+) -> Context {
+    Context {
+        blobdir: Arc::new(RwLock::new(std::ptr::null_mut())),
+        dbfile: Arc::new(RwLock::new(std::ptr::null_mut())),
+        inbox: Arc::new(RwLock::new({
+            Imap::new(
+                cb_get_config,
+                cb_set_config,
+                cb_precheck_imf,
+                cb_receive_imf,
+            )
+        })),
+        userdata,
+        cb,
+        os_name: os_name,
+        running_state: Arc::new(RwLock::new(Default::default())),
+        sql: Sql::new(),
+        smtp: Arc::new(Mutex::new(Smtp::new())),
+        smtp_state: Arc::new((Mutex::new(Default::default()), Condvar::new())),
+        oauth2_critical: Arc::new(Mutex::new(())),
+        bob: Arc::new(RwLock::new(Default::default())),
+        last_smeared_timestamp: Arc::new(RwLock::new(0)),
+        cmdline_sel_chat_id: Arc::new(RwLock::new(0)),
+        sentbox_thread: Arc::new(RwLock::new(dc_jobthread_init(
+            "SENTBOX",
+            "configured_sentbox_folder",
+            Imap::new(
+                cb_get_config,
+                cb_set_config,
+                cb_precheck_imf,
+                cb_receive_imf,
+            ),
+        ))),
+        mvbox_thread: Arc::new(RwLock::new(dc_jobthread_init(
+            "MVBOX",
+            "configured_mvbox_folder",
+            Imap::new(
+                cb_get_config,
+                cb_set_config,
+                cb_precheck_imf,
+                cb_receive_imf,
+            ),
+        ))),
+        probe_imap_network: Arc::new(RwLock::new(false)),
+        perform_inbox_jobs_needed: Arc::new(RwLock::new(false)),
+        generating_key_mutex: Mutex::new(()),
+    }
+}
+
+unsafe fn cb_receive_imf(
+    context: &Context,
+    imf_raw_not_terminated: *const libc::c_char,
+    imf_raw_bytes: size_t,
+    server_folder: &str,
+    server_uid: uint32_t,
+    flags: uint32_t,
+) {
+    dc_receive_imf(
+        context,
+        imf_raw_not_terminated,
+        imf_raw_bytes,
+        server_folder,
+        server_uid,
+        flags,
+    );
+}
+
+unsafe fn cb_precheck_imf(
+    context: &Context,
+    rfc724_mid: *const libc::c_char,
+    server_folder: &str,
+    server_uid: uint32_t,
+) -> libc::c_int {
+    let mut rfc724_mid_exists: libc::c_int = 0i32;
+    let msg_id: uint32_t;
+    let mut old_server_folder: *mut libc::c_char = 0 as *mut libc::c_char;
+    let mut old_server_uid: uint32_t = 0i32 as uint32_t;
+    let mut mark_seen: libc::c_int = 0i32;
+    msg_id = dc_rfc724_mid_exists(
+        context,
+        rfc724_mid,
+        &mut old_server_folder,
+        &mut old_server_uid,
+    );
+    if msg_id != 0i32 as libc::c_uint {
+        rfc724_mid_exists = 1i32;
+        if *old_server_folder.offset(0isize) as libc::c_int == 0i32
+            && old_server_uid == 0i32 as libc::c_uint
+        {
+            info!(
+                context,
+                0,
+                "[move] detected bbc-self {}",
+                as_str(rfc724_mid),
+            );
+            mark_seen = 1i32
+        } else if as_str(old_server_folder) != server_folder {
+            info!(
+                context,
+                0,
+                "[move] detected moved message {}",
+                as_str(rfc724_mid),
+            );
+            dc_update_msg_move_state(context, rfc724_mid, MoveState::Stay);
+        }
+        if as_str(old_server_folder) != server_folder || old_server_uid != server_uid {
+            dc_update_server_uid(context, rfc724_mid, server_folder, server_uid);
+        }
+        dc_do_heuristics_moves(context, server_folder, msg_id);
+        if 0 != mark_seen {
+            dc_job_add(context, 130, msg_id as libc::c_int, Params::new(), 0);
+        }
+    }
+    free(old_server_folder as *mut libc::c_void);
+    return rfc724_mid_exists;
+}
+
+fn cb_set_config(context: &Context, key: &str, value: Option<&str>) {
+    context.sql.set_config(context, key, value).ok();
+}
+
+/* *
+ * The following three callback are given to dc_imap_new() to read/write configuration
+ * and to handle received messages. As the imap-functions are typically used in
+ * a separate user-thread, also these functions may be called from a different thread.
+ *
+ * @private @memberof Context
+ */
+fn cb_get_config(context: &Context, key: &str) -> Option<String> {
+    context.sql.get_config(context, key)
+}
+
+pub unsafe fn dc_close(context: &Context) {
+    info!(context, 0, "disconnecting INBOX-watch",);
+    context.inbox.read().unwrap().disconnect(context);
+    info!(context, 0, "disconnecting sentbox-thread",);
+    context
+        .sentbox_thread
+        .read()
+        .unwrap()
+        .imap
+        .disconnect(context);
+    info!(context, 0, "disconnecting mvbox-thread",);
+    context
+        .mvbox_thread
+        .read()
+        .unwrap()
+        .imap
+        .disconnect(context);
+
+    info!(context, 0, "disconnecting SMTP");
+    context.smtp.clone().lock().unwrap().disconnect();
+
+    context.sql.close(context);
+    let mut dbfile = context.dbfile.write().unwrap();
+    free(*dbfile as *mut libc::c_void);
+    *dbfile = 0 as *mut libc::c_char;
+    let mut blobdir = context.blobdir.write().unwrap();
+    free(*blobdir as *mut libc::c_void);
+    *blobdir = 0 as *mut libc::c_char;
+}
+
+pub unsafe fn dc_is_open(context: &Context) -> libc::c_int {
+    match context.sql.is_open() {
+        true => 1,
+        false => 0,
+    }
+}
+
+pub unsafe fn dc_get_userdata(context: &mut Context) -> *mut libc::c_void {
+    context.userdata as *mut _
+}
+
+pub unsafe fn dc_open(context: &Context, dbfile: &str, blobdir: Option<&str>) -> bool {
+    let mut success = false;
+    if 0 != dc_is_open(context) {
+        return false;
+    }
+    *context.dbfile.write().unwrap() = dbfile.strdup();
+    if blobdir.is_some() && blobdir.unwrap().len() > 0 {
+        let dir = dc_ensure_no_slash_safe(blobdir.unwrap()).strdup();
+        *context.blobdir.write().unwrap() = dir;
+    } else {
+        let dir = dbfile.to_string() + "-blobs";
+        dc_create_folder(context, &dir);
+        *context.blobdir.write().unwrap() = dir.strdup();
+    }
+    // Create/open sqlite database, this may already use the blobdir
+    let dbfile_path = std::path::Path::new(dbfile);
+    if context.sql.open(context, dbfile_path, 0) {
+        success = true
+    }
+    if !success {
+        dc_close(context);
+    }
+    success
+}
+
+pub unsafe fn dc_get_blobdir(context: &Context) -> *mut libc::c_char {
+    dc_strdup(*context.blobdir.clone().read().unwrap())
+}
+
+/* ******************************************************************************
+ * INI-handling, Information
+ ******************************************************************************/
+
+pub unsafe fn dc_get_info(context: &Context) -> *mut libc::c_char {
+    let unset = "0";
+    let l = dc_loginparam_read(context, &context.sql, "");
+    let l2 = dc_loginparam_read(context, &context.sql, "configured_");
+    let displayname = context.sql.get_config(context, "displayname");
+    let chats = dc_get_chat_cnt(context) as usize;
+    let real_msgs = dc_get_real_msg_cnt(context) as usize;
+    let deaddrop_msgs = dc_get_deaddrop_msg_cnt(context) as usize;
+    let contacts = Contact::get_real_cnt(context) as usize;
+    let is_configured = context
+        .sql
+        .get_config_int(context, "configured")
+        .unwrap_or_default();
+    let dbversion = context
+        .sql
+        .get_config_int(context, "dbversion")
+        .unwrap_or_default();
+    let e2ee_enabled = context
+        .sql
+        .get_config_int(context, "e2ee_enabled")
+        .unwrap_or_else(|| 1);
+    let mdns_enabled = context
+        .sql
+        .get_config_int(context, "mdns_enabled")
+        .unwrap_or_else(|| 1);
+
+    let prv_key_cnt: Option<isize> = context.sql.query_row_col(
+        context,
+        "SELECT COUNT(*) FROM keypairs;",
+        rusqlite::NO_PARAMS,
+        0,
+    );
+
+    let pub_key_cnt: Option<isize> = context.sql.query_row_col(
+        context,
+        "SELECT COUNT(*) FROM acpeerstates;",
+        rusqlite::NO_PARAMS,
+        0,
+    );
+
+    let fingerprint_str = if let Some(key) = Key::from_self_public(context, &l2.addr, &context.sql)
+    {
+        key.fingerprint()
+    } else {
+        "<Not yet calculated>".into()
+    };
+
+    let l_readable_str = dc_loginparam_get_readable(&l);
+    let l2_readable_str = dc_loginparam_get_readable(&l2);
+    let inbox_watch = context
+        .sql
+        .get_config_int(context, "inbox_watch")
+        .unwrap_or_else(|| 1);
+    let sentbox_watch = context
+        .sql
+        .get_config_int(context, "sentbox_watch")
+        .unwrap_or_else(|| 1);
+    let mvbox_watch = context
+        .sql
+        .get_config_int(context, "mvbox_watch")
+        .unwrap_or_else(|| 1);
+    let mvbox_move = context
+        .sql
+        .get_config_int(context, "mvbox_move")
+        .unwrap_or_else(|| 1);
+    let folders_configured = context
+        .sql
+        .get_config_int(context, "folders_configured")
+        .unwrap_or_default();
+    let configured_sentbox_folder = context
+        .sql
+        .get_config(context, "configured_sentbox_folder")
+        .unwrap_or_else(|| "<unset>".to_string());
+    let configured_mvbox_folder = context
+        .sql
+        .get_config(context, "configured_mvbox_folder")
+        .unwrap_or_else(|| "<unset>".to_string());
+
+    let res = format!(
+        "deltachat_core_version=v{}\n\
+         sqlite_version={}\n\
+         sqlite_thread_safe={}\n\
+         arch={}\n\
+         number_of_chats={}\n\
+         number_of_chat_messages={}\n\
+         messages_in_contact_requests={}\n\
+         number_of_contacts={}\n\
+         database_dir={}\n\
+         database_version={}\n\
+         blobdir={}\n\
+         display_name={}\n\
+         is_configured={}\n\
+         entered_account_settings={}\n\
+         used_account_settings={}\n\
+         inbox_watch={}\n\
+         sentbox_watch={}\n\
+         mvbox_watch={}\n\
+         mvbox_move={}\n\
+         folders_configured={}\n\
+         configured_sentbox_folder={}\n\
+         configured_mvbox_folder={}\n\
+         mdns_enabled={}\n\
+         e2ee_enabled={}\n\
+         private_key_count={}\n\
+         public_key_count={}\n\
+         fingerprint={}\n\
+         level=awesome\n",
+        as_str(DC_VERSION_STR as *const u8 as *const _),
+        rusqlite::version(),
+        sqlite3_threadsafe(),
+        // arch
+        (::std::mem::size_of::<*mut libc::c_void>()).wrapping_mul(8),
+        chats,
+        real_msgs,
+        deaddrop_msgs,
+        contacts,
+        if context.has_dbfile() {
+            as_str(context.get_dbfile())
+        } else {
+            unset
+        },
+        dbversion,
+        if context.has_blobdir() {
+            as_str(context.get_blobdir())
+        } else {
+            unset
+        },
+        displayname.unwrap_or_else(|| unset.into()),
+        is_configured,
+        l_readable_str,
+        l2_readable_str,
+        inbox_watch,
+        sentbox_watch,
+        mvbox_watch,
+        mvbox_move,
+        folders_configured,
+        configured_sentbox_folder,
+        configured_mvbox_folder,
+        mdns_enabled,
+        e2ee_enabled,
+        prv_key_cnt.unwrap_or_default(),
+        pub_key_cnt.unwrap_or_default(),
+        fingerprint_str,
+    );
+
+    res.strdup()
+}
+
+pub unsafe fn dc_get_version_str() -> *mut libc::c_char {
+    dc_strdup(DC_VERSION_STR as *const u8 as *const libc::c_char)
+}
+
+pub fn dc_get_fresh_msgs(context: &Context) -> *mut dc_array_t {
+    let show_deaddrop = 0;
+
+    context
+        .sql
+        .query_map(
+            "SELECT m.id FROM msgs m LEFT JOIN contacts ct \
+             ON m.from_id=ct.id LEFT JOIN chats c ON m.chat_id=c.id WHERE m.state=?   \
+             AND m.hidden=0   \
+             AND m.chat_id>?   \
+             AND ct.blocked=0   \
+             AND (c.blocked=0 OR c.blocked=?) ORDER BY m.timestamp DESC,m.id DESC;",
+            &[10, 9, if 0 != show_deaddrop { 2 } else { 0 }],
+            |row| row.get(0),
+            |rows| {
+                let mut ret = Vec::new();
+                for row in rows {
+                    let id: u32 = row?;
+                    ret.push(id);
+                }
+                Ok(dc_array_t::from(ret).into_raw())
+            },
+        )
+        .unwrap()
+}
+
+#[allow(non_snake_case)]
+pub fn dc_search_msgs(
+    context: &Context,
+    chat_id: uint32_t,
+    query: *const libc::c_char,
+) -> *mut dc_array_t {
+    if query.is_null() {
+        return std::ptr::null_mut();
+    }
+
+    let real_query = to_string(query).trim().to_string();
+    if real_query.is_empty() {
+        return std::ptr::null_mut();
+    }
+    let strLikeInText = format!("%{}%", &real_query);
+    let strLikeBeg = format!("{}%", &real_query);
+
+    let query = if 0 != chat_id {
+        "SELECT m.id, m.timestamp FROM msgs m LEFT JOIN contacts ct ON m.from_id=ct.id WHERE m.chat_id=?  \
+         AND m.hidden=0  \
+         AND ct.blocked=0 AND (txt LIKE ? OR ct.name LIKE ?) ORDER BY m.timestamp,m.id;"
+    } else {
+        "SELECT m.id, m.timestamp FROM msgs m LEFT JOIN contacts ct ON m.from_id=ct.id \
+         LEFT JOIN chats c ON m.chat_id=c.id WHERE m.chat_id>9 AND m.hidden=0  \
+         AND (c.blocked=0 OR c.blocked=?) \
+         AND ct.blocked=0 AND (m.txt LIKE ? OR ct.name LIKE ?) ORDER BY m.timestamp DESC,m.id DESC;"
+    };
+
+    let mut ret = Vec::new();
+
+    let success = context
+        .sql
+        .query_map(
+            query,
+            params![chat_id as libc::c_int, &strLikeInText, &strLikeBeg],
+            |row| row.get::<_, i32>(0),
+            |rows| {
+                for id in rows {
+                    ret.push(id? as u32);
+                }
+                Ok(())
+            },
+        )
+        .is_ok();
+
+    if success {
+        return dc_array_t::from(ret).into_raw();
+    }
+
+    std::ptr::null_mut()
+}
+
+pub fn dc_is_inbox(_context: &Context, folder_name: impl AsRef<str>) -> bool {
+    folder_name.as_ref() == "INBOX"
+}
+
+pub fn dc_is_sentbox(context: &Context, folder_name: impl AsRef<str>) -> bool {
+    let sentbox_name = context.sql.get_config(context, "configured_sentbox_folder");
+    if let Some(name) = sentbox_name {
+        name == folder_name.as_ref()
+    } else {
+        false
+    }
+}
+
+pub fn dc_is_mvbox(context: &Context, folder_name: impl AsRef<str>) -> bool {
+    let mvbox_name = context.sql.get_config(context, "configured_mvbox_folder");
+
+    if let Some(name) = mvbox_name {
+        name == folder_name.as_ref()
+    } else {
+        false
+    }
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
 
-    use crate::test_utils::*;
-
-    #[test]
-    fn test_wrong_db() {
-        let tmp = tempfile::tempdir().unwrap();
-        let dbfile = tmp.path().join("db.sqlite");
-        std::fs::write(&dbfile, b"123").unwrap();
-        let res = Context::new(Box::new(|_, _| 0), "FakeOs".into(), dbfile);
-        assert!(res.is_err());
-    }
-
-    #[test]
-    fn test_blobdir_exists() {
-        let tmp = tempfile::tempdir().unwrap();
-        let dbfile = tmp.path().join("db.sqlite");
-        Context::new(Box::new(|_, _| 0), "FakeOS".into(), dbfile).unwrap();
-        let blobdir = tmp.path().join("db.sqlite-blobs");
-        assert!(blobdir.is_dir());
-    }
-
-    #[test]
-    fn test_wrong_blogdir() {
-        let tmp = tempfile::tempdir().unwrap();
-        let dbfile = tmp.path().join("db.sqlite");
-        let blobdir = tmp.path().join("db.sqlite-blobs");
-        std::fs::write(&blobdir, b"123").unwrap();
-        let res = Context::new(Box::new(|_, _| 0), "FakeOS".into(), dbfile);
-        assert!(res.is_err());
-    }
-
-    #[test]
-    fn test_sqlite_parent_not_exists() {
-        let tmp = tempfile::tempdir().unwrap();
-        let subdir = tmp.path().join("subdir");
-        let dbfile = subdir.join("db.sqlite");
-        let dbfile2 = dbfile.clone();
-        Context::new(Box::new(|_, _| 0), "FakeOS".into(), dbfile).unwrap();
-        assert!(subdir.is_dir());
-        assert!(dbfile2.is_file());
-    }
-
-    #[test]
-    fn test_with_blobdir_not_exists() {
-        let tmp = tempfile::tempdir().unwrap();
-        let dbfile = tmp.path().join("db.sqlite");
-        let blobdir = tmp.path().join("blobs");
-        let res = Context::with_blobdir(Box::new(|_, _| 0), "FakeOS".into(), dbfile, blobdir);
-        assert!(res.is_err());
-    }
-
     #[test]
     fn no_crashes_on_context_deref() {
-        let t = dummy_context();
-        std::mem::drop(t.ctx);
+        let ctx = dc_context_new(None, std::ptr::null_mut(), Some("Test OS".into()));
+        std::mem::drop(ctx);
     }
 
     #[test]
-    fn test_get_info() {
-        let t = dummy_context();
-
-        let info = t.ctx.get_info();
-        assert_eq!(info.get("level").unwrap(), "awesome");
+    fn test_context_double_close() {
+        let ctx = dc_context_new(None, std::ptr::null_mut(), None);
+        unsafe {
+            dc_close(&ctx);
+            dc_close(&ctx);
+        }
+        std::mem::drop(ctx);
     }
 }

src/dc_array.rs

@@ -1,11 +1,13 @@
-use crate::location::Location;
+use crate::dc_location::dc_location;
+use crate::dc_tools::*;
+use crate::types::*;
 
 /* * the structure behind dc_array_t */
-#[derive(Debug, Clone)]
+#[derive(Clone)]
 #[allow(non_camel_case_types)]
 pub enum dc_array_t {
-    Locations(Vec<Location>),
-    Uint(Vec<u32>),
+    Locations(Vec<dc_location>),
+    Uint(Vec<uintptr_t>),
 }
 
 impl dc_array_t {
@@ -18,15 +20,23 @@ impl dc_array_t {
         dc_array_t::Locations(Vec::with_capacity(capacity))
     }
 
-    pub fn add_id(&mut self, item: u32) {
+    pub fn into_raw(self) -> *mut Self {
+        Box::into_raw(Box::new(self))
+    }
+
+    pub fn add_uint(&mut self, item: uintptr_t) {
         if let Self::Uint(array) = self {
             array.push(item);
         } else {
-            panic!("Attempt to add id to array of other type");
+            panic!("Attempt to add uint to array of other type");
         }
     }
 
-    pub fn add_location(&mut self, location: Location) {
+    pub fn add_id(&mut self, item: uint32_t) {
+        self.add_uint(item as uintptr_t);
+    }
+
+    pub fn add_location(&mut self, location: dc_location) {
         if let Self::Locations(array) = self {
             array.push(location)
         } else {
@@ -34,14 +44,30 @@ impl dc_array_t {
         }
     }
 
-    pub fn get_id(&self, index: usize) -> u32 {
-        match self {
-            Self::Locations(array) => array[index].location_id,
-            Self::Uint(array) => array[index] as u32,
+    pub fn get_uint(&self, index: usize) -> uintptr_t {
+        if let Self::Uint(array) = self {
+            array[index]
+        } else {
+            panic!("Attempt to get uint from array of other type");
         }
     }
 
-    pub fn get_location(&self, index: usize) -> &Location {
+    pub fn get_id(&self, index: usize) -> uint32_t {
+        match self {
+            Self::Locations(array) => array[index].location_id,
+            Self::Uint(array) => array[index] as uint32_t,
+        }
+    }
+
+    pub fn get_ptr(&self, index: size_t) -> *mut libc::c_void {
+        if let Self::Uint(array) = self {
+            array[index] as *mut libc::c_void
+        } else {
+            panic!("Not an array of pointers");
+        }
+    }
+
+    pub fn get_location(&self, index: usize) -> &dc_location {
         if let Self::Locations(array) = self {
             &array[index]
         } else {
@@ -49,6 +75,34 @@ impl dc_array_t {
         }
     }
 
+    pub fn get_latitude(&self, index: usize) -> libc::c_double {
+        self.get_location(index).latitude
+    }
+
+    pub fn get_longitude(&self, index: size_t) -> libc::c_double {
+        self.get_location(index).longitude
+    }
+
+    pub fn get_accuracy(&self, index: size_t) -> libc::c_double {
+        self.get_location(index).accuracy
+    }
+
+    pub fn get_timestamp(&self, index: size_t) -> i64 {
+        self.get_location(index).timestamp
+    }
+
+    pub fn get_chat_id(&self, index: size_t) -> uint32_t {
+        self.get_location(index).chat_id
+    }
+
+    pub fn get_contact_id(&self, index: size_t) -> uint32_t {
+        self.get_location(index).contact_id
+    }
+
+    pub fn get_msg_id(&self, index: size_t) -> uint32_t {
+        self.get_location(index).msg_id
+    }
+
     pub fn is_empty(&self) -> bool {
         match self {
             Self::Locations(array) => array.is_empty(),
@@ -71,7 +125,7 @@ impl dc_array_t {
         }
     }
 
-    pub fn search_id(&self, needle: u32) -> Option<usize> {
+    pub fn search_id(&self, needle: uintptr_t) -> Option<usize> {
         if let Self::Uint(array) = self {
             for (i, &u) in array.iter().enumerate() {
                 if u == needle {
@@ -91,72 +145,263 @@ impl dc_array_t {
             panic!("Attempt to sort array of something other than uints");
         }
     }
-
-    pub fn as_ptr(&self) -> *const u32 {
-        if let dc_array_t::Uint(v) = self {
-            v.as_ptr()
-        } else {
-            panic!("Attempt to convert array of something other than uints to raw");
-        }
-    }
 }
 
 impl From<Vec<u32>> for dc_array_t {
     fn from(array: Vec<u32>) -> Self {
-        dc_array_t::Uint(array)
+        dc_array_t::Uint(array.iter().map(|&x| x as uintptr_t).collect())
     }
 }
 
-impl From<Vec<Location>> for dc_array_t {
-    fn from(array: Vec<Location>) -> Self {
+impl From<Vec<dc_location>> for dc_array_t {
+    fn from(array: Vec<dc_location>) -> Self {
         dc_array_t::Locations(array)
     }
 }
 
+pub unsafe fn dc_array_unref(array: *mut dc_array_t) {
+    assert!(!array.is_null());
+    Box::from_raw(array);
+}
+
+pub unsafe fn dc_array_add_uint(array: *mut dc_array_t, item: uintptr_t) {
+    assert!(!array.is_null());
+    (*array).add_uint(item);
+}
+
+pub unsafe fn dc_array_add_id(array: *mut dc_array_t, item: uint32_t) {
+    assert!(!array.is_null());
+    (*array).add_id(item);
+}
+
+pub unsafe fn dc_array_add_ptr(array: *mut dc_array_t, item: *mut libc::c_void) {
+    dc_array_add_uint(array, item as uintptr_t);
+}
+
+pub unsafe fn dc_array_get_cnt(array: *const dc_array_t) -> size_t {
+    assert!(!array.is_null());
+    (*array).len()
+}
+
+pub unsafe fn dc_array_get_uint(array: *const dc_array_t, index: size_t) -> uintptr_t {
+    assert!(!array.is_null());
+    (*array).get_uint(index)
+}
+
+pub unsafe fn dc_array_get_id(array: *const dc_array_t, index: size_t) -> uint32_t {
+    assert!(!array.is_null());
+    (*array).get_id(index)
+}
+
+pub unsafe fn dc_array_get_ptr(array: *const dc_array_t, index: size_t) -> *mut libc::c_void {
+    assert!(!array.is_null());
+    (*array).get_ptr(index)
+}
+
+pub unsafe fn dc_array_get_latitude(array: *const dc_array_t, index: size_t) -> libc::c_double {
+    assert!(!array.is_null());
+    (*array).get_latitude(index)
+}
+
+pub unsafe fn dc_array_get_longitude(array: *const dc_array_t, index: size_t) -> libc::c_double {
+    assert!(!array.is_null());
+    (*array).get_longitude(index)
+}
+
+pub unsafe fn dc_array_get_accuracy(array: *const dc_array_t, index: size_t) -> libc::c_double {
+    assert!(!array.is_null());
+    (*array).get_accuracy(index)
+}
+
+pub unsafe fn dc_array_get_timestamp(array: *const dc_array_t, index: size_t) -> i64 {
+    assert!(!array.is_null());
+    (*array).get_timestamp(index)
+}
+
+pub unsafe fn dc_array_get_chat_id(array: *const dc_array_t, index: size_t) -> uint32_t {
+    assert!(!array.is_null());
+    (*array).get_chat_id(index)
+}
+
+pub unsafe fn dc_array_get_contact_id(array: *const dc_array_t, index: size_t) -> uint32_t {
+    assert!(!array.is_null());
+    (*array).get_contact_id(index)
+}
+
+pub unsafe fn dc_array_get_msg_id(array: *const dc_array_t, index: size_t) -> uint32_t {
+    assert!(!array.is_null());
+    (*array).get_msg_id(index)
+}
+
+pub unsafe fn dc_array_get_marker(array: *const dc_array_t, index: size_t) -> *mut libc::c_char {
+    assert!(!array.is_null());
+
+    if let dc_array_t::Locations(v) = &*array {
+        if let Some(s) = &v[index].marker {
+            s.strdup()
+        } else {
+            std::ptr::null_mut()
+        }
+    } else {
+        panic!("Not an array of locations");
+    }
+}
+
+/**
+ * Return the independent-state of the location at the given index.
+ * Independent locations do not belong to the track of the user.
+ *
+ * @memberof dc_array_t
+ * @param array The array object.
+ * @param index Index of the item. Must be between 0 and dc_array_get_cnt()-1.
+ * @return 0=Location belongs to the track of the user,
+ *     1=Location was reported independently.
+ */
+pub unsafe fn dc_array_is_independent(array: *const dc_array_t, index: size_t) -> libc::c_int {
+    assert!(!array.is_null());
+
+    if let dc_array_t::Locations(v) = &*array {
+        v[index].independent as libc::c_int
+    } else {
+        panic!("Attempt to get location independent field from array of something other than locations");
+    }
+}
+
+pub unsafe fn dc_array_search_id(
+    array: *const dc_array_t,
+    needle: uint32_t,
+    ret_index: *mut size_t,
+) -> bool {
+    assert!(!array.is_null());
+
+    if let Some(i) = (*array).search_id(needle as uintptr_t) {
+        if !ret_index.is_null() {
+            *ret_index = i
+        }
+        true
+    } else {
+        false
+    }
+}
+
+pub unsafe fn dc_array_get_raw(array: *const dc_array_t) -> *const uintptr_t {
+    assert!(!array.is_null());
+
+    if let dc_array_t::Uint(v) = &*array {
+        v.as_ptr()
+    } else {
+        panic!("Attempt to convert array of something other than uints to raw");
+    }
+}
+
+pub fn dc_array_new(initsize: size_t) -> *mut dc_array_t {
+    dc_array_t::new(initsize).into_raw()
+}
+
+pub fn dc_array_new_locations(initsize: size_t) -> *mut dc_array_t {
+    dc_array_t::new_locations(initsize).into_raw()
+}
+
+pub unsafe fn dc_array_empty(array: *mut dc_array_t) {
+    assert!(!array.is_null());
+
+    (*array).clear()
+}
+
+pub unsafe fn dc_array_duplicate(array: *const dc_array_t) -> *mut dc_array_t {
+    assert!(!array.is_null());
+
+    (*array).clone().into_raw()
+}
+
+pub unsafe fn dc_array_get_string(
+    array: *const dc_array_t,
+    sep: *const libc::c_char,
+) -> *mut libc::c_char {
+    assert!(!array.is_null());
+    assert!(!sep.is_null());
+
+    if let dc_array_t::Uint(v) = &*array {
+        let cnt = v.len();
+        let sep = as_str(sep);
+
+        let res = v
+            .iter()
+            .enumerate()
+            .fold(String::with_capacity(2 * cnt), |res, (i, n)| {
+                if i == 0 {
+                    res + &n.to_string()
+                } else {
+                    res + sep + &n.to_string()
+                }
+            });
+        res.strdup()
+    } else {
+        panic!("Attempt to get string from array of other type");
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::x::*;
+    use std::ffi::CStr;
 
     #[test]
     fn test_dc_array() {
-        let mut arr = dc_array_t::new(7);
-        assert!(arr.is_empty());
+        unsafe {
+            let arr = dc_array_new(7 as size_t);
+            assert_eq!(dc_array_get_cnt(arr), 0);
 
-        for i in 0..1000 {
-            arr.add_id(i + 2);
+            for i in 0..1000 {
+                dc_array_add_id(arr, (i + 2) as uint32_t);
+            }
+
+            assert_eq!(dc_array_get_cnt(arr), 1000);
+
+            for i in 0..1000 {
+                assert_eq!(
+                    dc_array_get_id(arr, i as size_t),
+                    (i + 1i32 * 2i32) as libc::c_uint
+                );
+            }
+
+            dc_array_empty(arr);
+
+            assert_eq!(dc_array_get_cnt(arr), 0);
+
+            dc_array_add_id(arr, 13 as uint32_t);
+            dc_array_add_id(arr, 7 as uint32_t);
+            dc_array_add_id(arr, 666 as uint32_t);
+            dc_array_add_id(arr, 0 as uint32_t);
+            dc_array_add_id(arr, 5000 as uint32_t);
+
+            (*arr).sort_ids();
+
+            assert_eq!(dc_array_get_id(arr, 0 as size_t), 0);
+            assert_eq!(dc_array_get_id(arr, 1 as size_t), 7);
+            assert_eq!(dc_array_get_id(arr, 2 as size_t), 13);
+            assert_eq!(dc_array_get_id(arr, 3 as size_t), 666);
+
+            let str = dc_array_get_string(arr, b"-\x00" as *const u8 as *const libc::c_char);
+            assert_eq!(
+                CStr::from_ptr(str as *const libc::c_char).to_str().unwrap(),
+                "0-7-13-666-5000"
+            );
+            free(str as *mut libc::c_void);
+
+            dc_array_unref(arr);
         }
-
-        assert_eq!(arr.len(), 1000);
-
-        for i in 0..1000 {
-            assert_eq!(arr.get_id(i), (i + 2) as u32);
-        }
-
-        arr.clear();
-
-        assert!(arr.is_empty());
-
-        arr.add_id(13);
-        arr.add_id(7);
-        arr.add_id(666);
-        arr.add_id(0);
-        arr.add_id(5000);
-
-        arr.sort_ids();
-
-        assert_eq!(arr.get_id(0), 0);
-        assert_eq!(arr.get_id(1), 7);
-        assert_eq!(arr.get_id(2), 13);
-        assert_eq!(arr.get_id(3), 666);
     }
 
     #[test]
     #[should_panic]
     fn test_dc_array_out_of_bounds() {
-        let mut arr = dc_array_t::new(7);
+        let arr = dc_array_new(7);
         for i in 0..1000 {
-            arr.add_id(i + 2);
+            unsafe { dc_array_add_id(arr, (i + 2) as uint32_t) };
         }
-        arr.get_id(1000);
+        unsafe { dc_array_get_id(arr, 1000) };
     }
+
 }

src/dc_dehtml.rs

@@ -1,6 +1,8 @@
 use lazy_static::lazy_static;
-use quick_xml;
-use quick_xml::events::{BytesEnd, BytesStart, BytesText};
+
+use crate::dc_saxparser::*;
+use crate::dc_tools::*;
+use crate::x::*;
 
 lazy_static! {
     static ref LINE_RE: regex::Regex = regex::Regex::new(r"(\r?\n)+").unwrap();
@@ -21,79 +23,67 @@ enum AddText {
 
 // dc_dehtml() returns way too many lineends; however, an optimisation on this issue is not needed as
 // the lineends are typically remove in further processing by the caller
-pub fn dc_dehtml(buf_terminated: &str) -> String {
-    let buf_terminated = buf_terminated.trim();
-
-    if buf_terminated.is_empty() {
-        return "".into();
+pub unsafe fn dc_dehtml(buf_terminated: *mut libc::c_char) -> *mut libc::c_char {
+    dc_trim(buf_terminated);
+    if *buf_terminated.offset(0isize) as libc::c_int == 0i32 {
+        return dc_strdup(b"\x00" as *const u8 as *const libc::c_char);
     }
 
     let mut dehtml = Dehtml {
-        strbuilder: String::with_capacity(buf_terminated.len()),
+        strbuilder: String::with_capacity(strlen(buf_terminated)),
         add_text: AddText::YesRemoveLineEnds,
         last_href: None,
     };
+    let mut saxparser = dc_saxparser_t {
+        starttag_cb: None,
+        endtag_cb: None,
+        text_cb: None,
+        userdata: 0 as *mut libc::c_void,
+    };
+    dc_saxparser_init(
+        &mut saxparser,
+        &mut dehtml as *mut Dehtml as *mut libc::c_void,
+    );
+    dc_saxparser_set_tag_handler(
+        &mut saxparser,
+        Some(dehtml_starttag_cb),
+        Some(dehtml_endtag_cb),
+    );
+    dc_saxparser_set_text_handler(&mut saxparser, Some(dehtml_text_cb));
+    dc_saxparser_parse(&mut saxparser, buf_terminated);
 
-    let mut reader = quick_xml::Reader::from_str(buf_terminated);
-
-    let mut buf = Vec::new();
-
-    loop {
-        match reader.read_event(&mut buf) {
-            Ok(quick_xml::events::Event::Start(ref e)) => {
-                dehtml_starttag_cb(e, &mut dehtml, &reader)
-            }
-            Ok(quick_xml::events::Event::End(ref e)) => dehtml_endtag_cb(e, &mut dehtml),
-            Ok(quick_xml::events::Event::Text(ref e)) => dehtml_text_cb(e, &mut dehtml),
-            Ok(quick_xml::events::Event::CData(ref e)) => dehtml_cdata_cb(e, &mut dehtml),
-            Err(e) => {
-                eprintln!(
-                    "Parse html error: Error at position {}: {:?}",
-                    reader.buffer_position(),
-                    e
-                );
-            }
-            Ok(quick_xml::events::Event::Eof) => break,
-            _ => (),
-        }
-        buf.clear();
-    }
-
-    dehtml.strbuilder
+    dehtml.strbuilder.strdup()
 }
 
-fn dehtml_text_cb(event: &BytesText, dehtml: &mut Dehtml) {
+unsafe fn dehtml_text_cb(
+    userdata: *mut libc::c_void,
+    text: *const libc::c_char,
+    _len: libc::c_int,
+) {
+    let dehtml = &mut *(userdata as *mut Dehtml);
+
     if dehtml.add_text == AddText::YesPreserveLineEnds
         || dehtml.add_text == AddText::YesRemoveLineEnds
     {
-        let last_added = escaper::decode_html_buf_sloppy(event.escaped()).unwrap_or_default();
+        let last_added = std::ffi::CStr::from_ptr(text)
+            .to_str()
+            .expect("invalid utf8");
+        // TODO: why does len does not match?
+        // assert_eq!(last_added.len(), len as usize);
 
         if dehtml.add_text == AddText::YesRemoveLineEnds {
-            dehtml.strbuilder += LINE_RE.replace_all(&last_added, "\r").as_ref();
+            dehtml.strbuilder += LINE_RE.replace_all(last_added.as_ref(), "\r").as_ref();
         } else {
-            dehtml.strbuilder += &last_added;
+            dehtml.strbuilder += last_added.as_ref();
         }
     }
 }
 
-fn dehtml_cdata_cb(event: &BytesText, dehtml: &mut Dehtml) {
-    if dehtml.add_text == AddText::YesPreserveLineEnds
-        || dehtml.add_text == AddText::YesRemoveLineEnds
-    {
-        let last_added = escaper::decode_html_buf_sloppy(event.escaped()).unwrap_or_default();
+unsafe fn dehtml_endtag_cb(userdata: *mut libc::c_void, tag: *const libc::c_char) {
+    let mut dehtml = &mut *(userdata as *mut Dehtml);
+    let tag = std::ffi::CStr::from_ptr(tag).to_string_lossy();
 
-        if dehtml.add_text == AddText::YesRemoveLineEnds {
-            dehtml.strbuilder += LINE_RE.replace_all(&last_added, "\r").as_ref();
-        } else {
-            dehtml.strbuilder += &last_added;
-        }
-    }
-}
-
-fn dehtml_endtag_cb(event: &BytesEnd, dehtml: &mut Dehtml) {
-    let tag = String::from_utf8_lossy(event.name()).trim().to_lowercase();
-
-    match tag.as_str() {
+    match tag.as_ref() {
         "p" | "div" | "table" | "td" | "style" | "script" | "title" | "pre" => {
             dehtml.strbuilder += "\n\n";
             dehtml.add_text = AddText::YesRemoveLineEnds;
@@ -115,14 +105,15 @@ fn dehtml_endtag_cb(event: &BytesEnd, dehtml: &mut Dehtml) {
     }
 }
 
-fn dehtml_starttag_cb<B: std::io::BufRead>(
-    event: &BytesStart,
-    dehtml: &mut Dehtml,
-    reader: &quick_xml::Reader<B>,
+unsafe fn dehtml_starttag_cb(
+    userdata: *mut libc::c_void,
+    tag: *const libc::c_char,
+    attr: *mut *mut libc::c_char,
 ) {
-    let tag = String::from_utf8_lossy(event.name()).trim().to_lowercase();
+    let mut dehtml = &mut *(userdata as *mut Dehtml);
+    let tag = std::ffi::CStr::from_ptr(tag).to_string_lossy();
 
-    match tag.as_str() {
+    match tag.as_ref() {
         "p" | "div" | "table" | "td" => {
             dehtml.strbuilder += "\n\n";
             dehtml.add_text = AddText::YesRemoveLineEnds;
@@ -139,21 +130,14 @@ fn dehtml_starttag_cb<B: std::io::BufRead>(
             dehtml.add_text = AddText::YesPreserveLineEnds;
         }
         "a" => {
-            if let Some(href) = event.html_attributes().find(|attr| {
-                attr.as_ref()
-                    .map(|a| String::from_utf8_lossy(a.key).trim().to_lowercase() == "href")
-                    .unwrap_or_default()
-            }) {
-                let href = href
-                    .unwrap()
-                    .unescape_and_decode_value(reader)
-                    .unwrap_or_default()
-                    .to_lowercase();
-
-                if !href.is_empty() {
-                    dehtml.last_href = Some(href);
-                    dehtml.strbuilder += "[";
-                }
+            let text_c = std::ffi::CStr::from_ptr(dc_attr_find(
+                attr,
+                b"href\x00" as *const u8 as *const libc::c_char,
+            ));
+            let text_r = text_c.to_str().expect("invalid utf8");
+            if !text_r.is_empty() {
+                dehtml.last_href = Some(text_r.to_string());
+                dehtml.strbuilder += "[";
             }
         }
         "b" | "strong" => {

src/dc_imex.rs

@@ -1,28 +1,26 @@
 use std::ffi::CString;
-use std::path::Path;
-use std::ptr;
 
 use mmime::mailmime_content::*;
 use mmime::mmapstring::*;
 use mmime::other::*;
 use rand::{thread_rng, Rng};
 
-use crate::chat;
 use crate::config::Config;
-use crate::configure::*;
 use crate::constants::*;
 use crate::context::Context;
+use crate::dc_chat::*;
+use crate::dc_configure::*;
+use crate::dc_e2ee::*;
+use crate::dc_job::*;
+use crate::dc_msg::*;
 use crate::dc_tools::*;
-use crate::e2ee;
 use crate::error::*;
-use crate::events::Event;
-use crate::job::*;
 use crate::key::*;
-use crate::message::*;
 use crate::param::*;
 use crate::pgp::*;
 use crate::sql::{self, Sql};
 use crate::stock::StockMessage;
+use crate::types::*;
 use crate::x::*;
 
 // import/export and tools
@@ -30,39 +28,40 @@ use crate::x::*;
 // param1 is a directory where the keys are searched in and read from
 // param1 is a directory where the backup is written to
 // param1 is the file with the backup to import
-pub fn dc_imex(
+pub unsafe fn dc_imex(
     context: &Context,
     what: libc::c_int,
-    param1: Option<impl AsRef<Path>>,
+    param1: *const libc::c_char,
     param2: *const libc::c_char,
 ) {
     let mut param = Params::new();
     param.set_int(Param::Cmd, what as i32);
-    if let Some(param1) = param1 {
-        param.set(Param::Arg, param1.as_ref().to_string_lossy());
+    if !param1.is_null() {
+        param.set(Param::Arg, as_str(param1));
     }
     if !param2.is_null() {
         param.set(Param::Arg2, as_str(param2));
     }
 
-    job_kill_action(context, Action::ImexImap);
-    job_add(context, Action::ImexImap, 0, param, 0);
+    dc_job_kill_action(context, 910);
+    dc_job_add(context, 910, 0, param, 0);
 }
 
 /// Returns the filename of the backup if found, nullptr otherwise.
 pub unsafe fn dc_imex_has_backup(
     context: &Context,
-    dir_name: impl AsRef<Path>,
+    dir_name: *const libc::c_char,
 ) -> *mut libc::c_char {
-    let dir_name = dir_name.as_ref();
+    let dir_name = as_path(dir_name);
     let dir_iter = std::fs::read_dir(dir_name);
     if dir_iter.is_err() {
         info!(
             context,
+            0,
             "Backup check: Cannot open directory \"{}\".\x00",
             dir_name.display(),
         );
-        return ptr::null_mut();
+        return 0 as *mut libc::c_char;
     }
     let mut newest_backup_time = 0;
     let mut newest_backup_path: Option<std::path::PathBuf> = None;
@@ -92,7 +91,7 @@ pub unsafe fn dc_imex_has_backup(
         Some(path) => match path.to_c_string() {
             Ok(cstr) => dc_strdup(cstr.as_ptr()),
             Err(err) => {
-                error!(context, "Invalid backup filename: {}", err);
+                error!(context, 0, "Invalid backup filename: {}", err);
                 std::ptr::null_mut()
             }
         },
@@ -101,9 +100,9 @@ pub unsafe fn dc_imex_has_backup(
 }
 
 pub unsafe fn dc_initiate_key_transfer(context: &Context) -> *mut libc::c_char {
-    let mut setup_file_name: *mut libc::c_char = ptr::null_mut();
-    let mut msg: Message;
-    if !dc_alloc_ongoing(context) {
+    let mut setup_file_name: *mut libc::c_char = 0 as *mut libc::c_char;
+    let mut msg: *mut dc_msg_t = 0 as *mut dc_msg_t;
+    if dc_alloc_ongoing(context) == 0 {
         return std::ptr::null_mut();
     }
     let setup_code = dc_create_setup_code(context);
@@ -138,15 +137,17 @@ pub unsafe fn dc_initiate_key_transfer(context: &Context) -> *mut libc::c_char {
                         setup_file_content_c.as_bytes().len(),
                     ))
                 {
-                    if let Ok(chat_id) = chat::create_by_contact_id(context, 1) {
-                        msg = dc_msg_new_untyped();
-                        msg.type_0 = Viewtype::File;
-                        msg.param.set(Param::File, as_str(setup_file_name));
+                    let chat_id = dc_create_chat_by_contact_id(context, 1i32 as uint32_t);
+                    if !(chat_id == 0i32 as libc::c_uint) {
+                        msg = dc_msg_new_untyped(context);
+                        (*msg).type_0 = Viewtype::File;
+                        (*msg).param.set(Param::File, as_str(setup_file_name));
 
-                        msg.param
+                        (*msg)
+                            .param
                             .set(Param::MimeType, "application/autocrypt-setup");
-                        msg.param.set_int(Param::Cmd, 6);
-                        msg.param.set_int(Param::ForcePlaintext, 2);
+                        (*msg).param.set_int(Param::Cmd, 6);
+                        (*msg).param.set_int(Param::ForcePlaintext, 2);
 
                         if !context
                             .running_state
@@ -155,8 +156,11 @@ pub unsafe fn dc_initiate_key_transfer(context: &Context) -> *mut libc::c_char {
                             .unwrap()
                             .shall_stop_ongoing
                         {
-                            if let Ok(msg_id) = chat::send_msg(context, chat_id, &mut msg) {
-                                info!(context, "Wait for setup message being sent ...",);
+                            let msg_id = dc_send_msg(context, chat_id, msg);
+                            if msg_id != 0 {
+                                dc_msg_unref(msg);
+                                msg = 0 as *mut dc_msg_t;
+                                info!(context, 0, "Wait for setup message being sent ...",);
                                 loop {
                                     if context
                                         .running_state
@@ -168,12 +172,13 @@ pub unsafe fn dc_initiate_key_transfer(context: &Context) -> *mut libc::c_char {
                                         break;
                                     }
                                     std::thread::sleep(std::time::Duration::from_secs(1));
-                                    if let Ok(msg) = dc_get_msg(context, msg_id) {
-                                        if dc_msg_is_sent(&msg) {
-                                            info!(context, "... setup message sent.",);
-                                            break;
-                                        }
+                                    msg = dc_get_msg(context, msg_id);
+                                    if 0 != dc_msg_is_sent(msg) {
+                                        info!(context, 0, "... setup message sent.",);
+                                        break;
                                     }
+                                    dc_msg_unref(msg);
+                                    msg = 0 as *mut dc_msg_t
                                 }
                             }
                         }
@@ -183,6 +188,7 @@ pub unsafe fn dc_initiate_key_transfer(context: &Context) -> *mut libc::c_char {
         }
     }
     free(setup_file_name as *mut libc::c_void);
+    dc_msg_unref(msg);
     dc_free_ongoing(context);
 
     setup_code.strdup()
@@ -196,7 +202,7 @@ pub fn dc_render_setup_file(context: &Context, passphrase: &str) -> Result<Strin
         passphrase.len() >= 2,
         "Passphrase must be at least 2 chars long."
     );
-    let self_addr = e2ee::ensure_secret_key_exists(context)?;
+    let self_addr = dc_ensure_secret_key_exists(context)?;
     let private_key = Key::from_self_private(context, self_addr, &context.sql)
         .ok_or(format_err!("Failed to get private key."))?;
     let ac_headers = match context
@@ -208,8 +214,16 @@ pub fn dc_render_setup_file(context: &Context, passphrase: &str) -> Result<Strin
         _ => Some(("Autocrypt-Prefer-Encrypt", "mutual")),
     };
     let private_key_asc = private_key.to_asc(ac_headers);
-    let encr = dc_pgp_symm_encrypt(&passphrase, private_key_asc.as_bytes())
-        .ok_or(format_err!("Failed to encrypt private key."))?;
+    let encr = {
+        let private_key_asc_c = CString::yolo(private_key_asc);
+        let passphrase_c = CString::yolo(passphrase);
+        dc_pgp_symm_encrypt(
+            passphrase_c.as_ptr(),
+            private_key_asc_c.as_ptr() as *const libc::c_void,
+            private_key_asc_c.as_bytes().len(),
+        )
+        .ok_or(format_err!("Failed to encrypt private key."))?
+    };
     let replacement = format!(
         concat!(
             "-----BEGIN PGP MESSAGE-----\r\n",
@@ -242,7 +256,7 @@ pub fn dc_render_setup_file(context: &Context, passphrase: &str) -> Result<Strin
 }
 
 pub fn dc_create_setup_code(_context: &Context) -> String {
-    let mut random_val: u16;
+    let mut random_val: uint16_t;
     let mut rng = thread_rng();
     let mut ret = String::new();
 
@@ -253,7 +267,7 @@ pub fn dc_create_setup_code(_context: &Context) -> String {
                 break;
             }
         }
-        random_val = (random_val as libc::c_int % 10000) as u16;
+        random_val = (random_val as libc::c_int % 10000) as uint16_t;
         ret += &format!(
             "{}{:04}",
             if 0 != i { "-" } else { "" },
@@ -264,54 +278,61 @@ pub fn dc_create_setup_code(_context: &Context) -> String {
     ret
 }
 
+// TODO should return bool /rtn
 pub unsafe fn dc_continue_key_transfer(
     context: &Context,
-    msg_id: u32,
+    msg_id: uint32_t,
     setup_code: *const libc::c_char,
-) -> bool {
-    let mut success = false;
-    let mut armored_key: *mut libc::c_char = ptr::null_mut();
-    let norm_sc;
-    if msg_id <= 9i32 as libc::c_uint || setup_code.is_null() {
-        return false;
-    }
-
-    let msg = dc_get_msg(context, msg_id);
-    if msg.is_err() {
-        error!(context, "Message is no Autocrypt Setup Message.");
-        return false;
-    }
-    let msg = msg.unwrap();
-    if !dc_msg_is_setupmessage(&msg) {
-        error!(context, "Message is no Autocrypt Setup Message.");
-        return false;
-    }
-
-    if let Some(filename) = dc_msg_get_file(context, &msg) {
-        if let Some(buf) = dc_read_file_safe(context, filename) {
+) -> libc::c_int {
+    let mut success: libc::c_int = 0i32;
+    let mut msg: *mut dc_msg_t = 0 as *mut dc_msg_t;
+    let mut filename: *mut libc::c_char = 0 as *mut libc::c_char;
+    let mut filecontent: *mut libc::c_char = 0 as *mut libc::c_char;
+    let mut filebytes: size_t = 0i32 as size_t;
+    let mut armored_key: *mut libc::c_char = 0 as *mut libc::c_char;
+    let mut norm_sc: *mut libc::c_char = 0 as *mut libc::c_char;
+    if !(msg_id <= 9i32 as libc::c_uint || setup_code.is_null()) {
+        msg = dc_get_msg(context, msg_id);
+        if msg.is_null()
+            || !dc_msg_is_setupmessage(msg)
+            || {
+                filename = dc_msg_get_file(msg);
+                filename.is_null()
+            }
+            || *filename.offset(0isize) as libc::c_int == 0i32
+        {
+            error!(context, 0, "Message is no Autocrypt Setup Message.",);
+        } else if 0
+            == dc_read_file(
+                context,
+                filename,
+                &mut filecontent as *mut *mut libc::c_char as *mut *mut libc::c_void,
+                &mut filebytes,
+            )
+            || filecontent.is_null()
+            || filebytes <= 0
+        {
+            error!(context, 0, "Cannot read Autocrypt Setup Message file.",);
+        } else {
             norm_sc = dc_normalize_setup_code(context, setup_code);
             if norm_sc.is_null() {
-                warn!(context, "Cannot normalize Setup Code.",);
+                warn!(context, 0, "Cannot normalize Setup Code.",);
             } else {
-                armored_key = dc_decrypt_setup_file(context, norm_sc, buf.as_ptr().cast());
+                armored_key = dc_decrypt_setup_file(context, norm_sc, filecontent);
                 if armored_key.is_null() {
-                    warn!(context, "Cannot decrypt Autocrypt Setup Message.",);
+                    warn!(context, 0, "Cannot decrypt Autocrypt Setup Message.",);
                 } else if set_self_key(context, armored_key, 1) {
                     /*set default*/
                     /* error already logged */
-                    success = true
+                    success = 1i32
                 }
             }
-        } else {
-            error!(context, "Cannot read Autocrypt Setup Message file.",);
-            return false;
         }
-    } else {
-        error!(context, "Message is no Autocrypt Setup Message.");
-        return false;
     }
-
     free(armored_key as *mut libc::c_void);
+    free(filecontent as *mut libc::c_void);
+    free(filename as *mut libc::c_void);
+    dc_msg_unref(msg);
     free(norm_sc as *mut libc::c_void);
 
     success
@@ -330,7 +351,7 @@ fn set_self_key(
         .and_then(|(k, h)| k.split_key().map(|pub_key| (k, pub_key, h)));
 
     if keys.is_none() {
-        error!(context, "File does not contain a valid private key.",);
+        error!(context, 0, "File does not contain a valid private key.",);
         return false;
     }
 
@@ -360,13 +381,13 @@ fn set_self_key(
             return false;
         }
     } else {
-        error!(context, "File does not contain a private key.",);
+        error!(context, 0, "File does not contain a private key.",);
     }
 
-    let self_addr = context.get_config(Config::ConfiguredAddr);
+    let self_addr = context.sql.get_config(context, "configured_addr");
 
     if self_addr.is_none() {
-        error!(context, "Missing self addr");
+        error!(context, 0, "Missing self addr");
         return false;
     }
 
@@ -378,7 +399,7 @@ fn set_self_key(
         set_default,
         &context.sql,
     ) {
-        error!(context, "Cannot save keypair.");
+        error!(context, 0, "Cannot save keypair.");
         return false;
     }
 
@@ -402,19 +423,19 @@ pub unsafe fn dc_decrypt_setup_file(
     filecontent: *const libc::c_char,
 ) -> *mut libc::c_char {
     let fc_buf: *mut libc::c_char;
-    let mut fc_headerline: *const libc::c_char = ptr::null();
-    let mut fc_base64: *const libc::c_char = ptr::null();
-    let mut binary: *mut libc::c_char = ptr::null_mut();
-    let mut binary_bytes: libc::size_t = 0;
-    let mut indx: libc::size_t = 0;
+    let mut fc_headerline: *const libc::c_char = 0 as *const libc::c_char;
+    let mut fc_base64: *const libc::c_char = 0 as *const libc::c_char;
+    let mut binary: *mut libc::c_char = 0 as *mut libc::c_char;
+    let mut binary_bytes: size_t = 0i32 as size_t;
+    let mut indx: size_t = 0i32 as size_t;
 
-    let mut payload: *mut libc::c_char = ptr::null_mut();
+    let mut payload: *mut libc::c_char = 0 as *mut libc::c_char;
     fc_buf = dc_strdup(filecontent);
     if dc_split_armored_data(
         fc_buf,
         &mut fc_headerline,
-        ptr::null_mut(),
-        ptr::null_mut(),
+        0 as *mut *const libc::c_char,
+        0 as *mut *const libc::c_char,
         &mut fc_base64,
     ) && !fc_headerline.is_null()
         && strcmp(
@@ -436,10 +457,9 @@ pub unsafe fn dc_decrypt_setup_file(
             || binary_bytes == 0)
         {
             /* decrypt symmetrically */
-            if let Some(plain) = dc_pgp_symm_decrypt(
-                as_str(passphrase),
-                std::slice::from_raw_parts(binary as *const u8, binary_bytes),
-            ) {
+            if let Some(plain) =
+                dc_pgp_symm_decrypt(passphrase, binary as *const libc::c_void, binary_bytes)
+            {
                 let payload_c = CString::new(plain).unwrap();
                 payload = strdup(payload_c.as_ptr());
             }
@@ -459,7 +479,7 @@ pub unsafe fn dc_normalize_setup_code(
     in_0: *const libc::c_char,
 ) -> *mut libc::c_char {
     if in_0.is_null() {
-        return ptr::null_mut();
+        return 0 as *mut libc::c_char;
     }
     let mut out = String::new();
     let mut outlen;
@@ -487,30 +507,33 @@ pub unsafe fn dc_normalize_setup_code(
 }
 
 #[allow(non_snake_case)]
-pub unsafe fn dc_job_do_DC_JOB_IMEX_IMAP(context: &Context, job: &Job) {
+pub unsafe fn dc_job_do_DC_JOB_IMEX_IMAP(context: &Context, job: *mut dc_job_t) {
     let mut ok_to_continue = true;
     let mut success: libc::c_int = 0;
+    let mut ongoing_allocated_here: libc::c_int = 0;
+    let what: libc::c_int;
 
-    if dc_alloc_ongoing(context) {
-        let what = job.param.get_int(Param::Cmd).unwrap_or_default();
-        let param1_s = job.param.get(Param::Arg).unwrap_or_default();
+    if !(0 == dc_alloc_ongoing(context)) {
+        ongoing_allocated_here = 1;
+        what = (*job).param.get_int(Param::Cmd).unwrap_or_default();
+        let param1_s = (*job).param.get(Param::Arg).unwrap_or_default();
         let param1 = CString::yolo(param1_s);
-        let _param2 = CString::yolo(job.param.get(Param::Arg2).unwrap_or_default());
+        let _param2 = CString::yolo((*job).param.get(Param::Arg2).unwrap_or_default());
 
         if strlen(param1.as_ptr()) == 0 {
-            error!(context, "No Import/export dir/file given.",);
+            error!(context, 0, "No Import/export dir/file given.",);
         } else {
-            info!(context, "Import/export process started.",);
-            context.call_cb(Event::ImexProgress(10));
-
+            info!(context, 0, "Import/export process started.",);
+            context.call_cb(Event::IMEX_PROGRESS, 10 as uintptr_t, 0 as uintptr_t);
             if !context.sql.is_open() {
-                error!(context, "Import/export: Database not opened.",);
+                error!(context, 0, "Import/export: Database not opened.",);
             } else {
                 if what == 1 || what == 11 {
                     /* before we export anything, make sure the private key exists */
-                    if e2ee::ensure_secret_key_exists(context).is_err() {
+                    if dc_ensure_secret_key_exists(context).is_err() {
                         error!(
                             context,
+                            0,
                             "Import/export: Cannot create private key or private key not available.",
                         );
                         ok_to_continue = false;
@@ -521,26 +544,26 @@ pub unsafe fn dc_job_do_DC_JOB_IMEX_IMAP(context: &Context, job: &Job) {
                 if ok_to_continue {
                     match what {
                         1 => {
-                            if export_self_keys(context, param1.as_ptr()) {
-                                info!(context, "Import/export completed.",);
+                            if 0 != export_self_keys(context, param1.as_ptr()) {
+                                info!(context, 0, "Import/export completed.",);
                                 success = 1
                             }
                         }
                         2 => {
                             if 0 != import_self_keys(context, param1.as_ptr()) {
-                                info!(context, "Import/export completed.",);
+                                info!(context, 0, "Import/export completed.",);
                                 success = 1
                             }
                         }
                         11 => {
-                            if export_backup(context, param1.as_ptr()) {
-                                info!(context, "Import/export completed.",);
+                            if 0 != export_backup(context, param1.as_ptr()) {
+                                info!(context, 0, "Import/export completed.",);
                                 success = 1
                             }
                         }
                         12 => {
-                            if import_backup(context, param1.as_ptr()) {
-                                info!(context, "Import/export completed.",);
+                            if 0 != import_backup(context, param1.as_ptr()) {
+                                info!(context, 0, "Import/export completed.",);
                                 success = 1
                             }
                         }
@@ -549,54 +572,67 @@ pub unsafe fn dc_job_do_DC_JOB_IMEX_IMAP(context: &Context, job: &Job) {
                 }
             }
         }
+    }
+
+    if 0 != ongoing_allocated_here {
         dc_free_ongoing(context);
     }
-    context.call_cb(Event::ImexProgress(if 0 != success { 1000 } else { 0 }));
+    context.call_cb(
+        Event::IMEX_PROGRESS,
+        (if 0 != success { 1000 } else { 0 }) as uintptr_t,
+        0 as uintptr_t,
+    );
 }
 
 /*******************************************************************************
  * Import backup
  ******************************************************************************/
 
+// TODO should return bool /rtn
 #[allow(non_snake_case)]
-unsafe fn import_backup(context: &Context, backup_to_import: *const libc::c_char) -> bool {
+unsafe fn import_backup(context: &Context, backup_to_import: *const libc::c_char) -> libc::c_int {
     info!(
         context,
+        0,
         "Import \"{}\" to \"{}\".",
         as_str(backup_to_import),
-        context.get_dbfile().display()
+        as_str(context.get_dbfile()),
     );
 
-    if dc_is_configured(context) {
-        error!(context, "Cannot import backups to accounts in use.");
-        return false;
+    if 0 != dc_is_configured(context) {
+        error!(context, 0, "Cannot import backups to accounts in use.");
+        return 0;
     }
     &context.sql.close(&context);
-    dc_delete_file(context, context.get_dbfile());
-    if dc_file_exist(context, context.get_dbfile()) {
+    dc_delete_file(context, as_path(context.get_dbfile()));
+    if dc_file_exist(context, as_path(context.get_dbfile())) {
         error!(
             context,
-            "Cannot import backups: Cannot delete the old file.",
+            0, "Cannot import backups: Cannot delete the old file.",
         );
-        return false;
+        return 0;
     }
 
-    if !dc_copy_file(context, as_path(backup_to_import), context.get_dbfile()) {
-        return false;
+    if !dc_copy_file(
+        context,
+        as_path(backup_to_import),
+        as_path(context.get_dbfile()),
+    ) {
+        return 0;
     }
     /* error already logged */
     /* re-open copied database file */
-    if !context.sql.open(&context, &context.get_dbfile(), 0) {
-        return false;
+    if !context.sql.open(&context, as_path(context.get_dbfile()), 0) {
+        return 0;
     }
 
     let total_files_cnt = context
         .sql
-        .query_get_value::<_, isize>(context, "SELECT COUNT(*) FROM backup_blobs;", params![])
+        .query_row_col::<_, isize>(context, "SELECT COUNT(*) FROM backup_blobs;", params![], 0)
         .unwrap_or_default() as usize;
     info!(
         context,
-        "***IMPORT-in-progress: total_files_cnt={:?}", total_files_cnt,
+        0, "***IMPORT-in-progress: total_files_cnt={:?}", total_files_cnt,
     );
 
     let res = context.sql.query_map(
@@ -633,19 +669,20 @@ unsafe fn import_backup(context: &Context, backup_to_import: *const libc::c_char
                 if permille > 990 {
                     permille = 990
                 }
-                context.call_cb(Event::ImexProgress(permille));
+                context.call_cb(Event::IMEX_PROGRESS, permille as uintptr_t, 0);
                 if file_blob.is_empty() {
                     continue;
                 }
 
-                let pathNfilename = context.get_blobdir().join(file_name);
+                let pathNfilename = format!("{}/{}", as_str(context.get_blobdir()), file_name);
                 if dc_write_file_safe(context, &pathNfilename, &file_blob) {
                     continue;
                 }
                 error!(
                     context,
+                    0,
                     "Storage full? Cannot write file {} with {} bytes.",
-                    pathNfilename.display(),
+                    &pathNfilename,
                     file_blob.len(),
                 );
                 // otherwise the user may believe the stuff is imported correctly, but there are files missing ...
@@ -666,7 +703,7 @@ unsafe fn import_backup(context: &Context, backup_to_import: *const libc::c_char
         sql::try_execute(context, &context.sql, "VACUUM;").ok();
         Ok(())
     })
-    .is_ok()
+    .is_ok() as libc::c_int
 }
 
 /*******************************************************************************
@@ -674,10 +711,11 @@ unsafe fn import_backup(context: &Context, backup_to_import: *const libc::c_char
  ******************************************************************************/
 /* the FILE_PROGRESS macro calls the callback with the permille of files processed.
 The macro avoids weird values of 0% or 100% while still working. */
+// TODO should return bool /rtn
 #[allow(non_snake_case)]
-unsafe fn export_backup(context: &Context, dir: *const libc::c_char) -> bool {
-    let mut ok_to_continue: bool;
-    let mut success = false;
+unsafe fn export_backup(context: &Context, dir: *const libc::c_char) -> libc::c_int {
+    let mut current_block: u64;
+    let mut success: libc::c_int = 0;
 
     let mut delete_dest_file: libc::c_int = 0;
     // get a fine backup file name (the name includes the date so that multiple backup instances are possible)
@@ -689,7 +727,7 @@ unsafe fn export_backup(context: &Context, dir: *const libc::c_char) -> bool {
     let buffer = CString::yolo(res);
     let dest_pathNfilename = dc_get_fine_pathNfilename(context, dir, buffer.as_ptr());
     if dest_pathNfilename.is_null() {
-        error!(context, "Cannot get backup file name.",);
+        error!(context, 0, "Cannot get backup file name.",);
 
         return success;
     }
@@ -701,12 +739,17 @@ unsafe fn export_backup(context: &Context, dir: *const libc::c_char) -> bool {
     let mut closed = true;
     info!(
         context,
+        0,
         "Backup \"{}\" to \"{}\".",
-        context.get_dbfile().display(),
+        as_str(context.get_dbfile()),
         as_str(dest_pathNfilename),
     );
-    if dc_copy_file(context, context.get_dbfile(), as_path(dest_pathNfilename)) {
-        context.sql.open(&context, &context.get_dbfile(), 0);
+    if dc_copy_file(
+        context,
+        as_path(context.get_dbfile()),
+        as_path(dest_pathNfilename),
+    ) {
+        context.sql.open(&context, as_path(context.get_dbfile()), 0);
         closed = false;
         /* add all files as blobs to the database copy (this does not require the source to be locked, neigher the destination as it is used only here) */
         /*for logging only*/
@@ -722,30 +765,51 @@ unsafe fn export_backup(context: &Context, dir: *const libc::c_char) -> bool {
                 .is_err()
                 {
                     /* error already logged */
-                    ok_to_continue = false;
+                    current_block = 11487273724841241105;
                 } else {
-                    ok_to_continue = true;
+                    current_block = 14648156034262866959;
                 }
             } else {
-                ok_to_continue = true;
+                current_block = 14648156034262866959;
             }
-            if ok_to_continue {
-                let mut total_files_cnt = 0;
-                let dir = context.get_blobdir();
-                if let Ok(dir_handle) = std::fs::read_dir(&dir) {
-                    total_files_cnt += dir_handle.filter(|r| r.is_ok()).count();
+            match current_block {
+                11487273724841241105 => {}
+                _ => {
+                    let mut total_files_cnt = 0;
+                    let dir = std::path::Path::new(as_str(context.get_blobdir()));
+                    let dir_handle = std::fs::read_dir(dir);
+                    if dir_handle.is_err() {
+                        error!(
+                            context,
+                            0,
+                            "Backup: Cannot get info for blob-directory \"{}\".",
+                            as_str(context.get_blobdir()),
+                        );
+                    } else {
+                        let dir_handle = dir_handle.unwrap();
+                        total_files_cnt += dir_handle.filter(|r| r.is_ok()).count();
 
-                    info!(context, "EXPORT: total_files_cnt={}", total_files_cnt);
-                    if total_files_cnt > 0 {
-                        // scan directory, pass 2: copy files
-                        if let Ok(dir_handle) = std::fs::read_dir(&dir) {
-                            sql.prepare(
+                        info!(context, 0, "EXPORT: total_files_cnt={}", total_files_cnt);
+                        if total_files_cnt > 0 {
+                            // scan directory, pass 2: copy files
+                            let dir_handle = std::fs::read_dir(dir);
+                            if dir_handle.is_err() {
+                                error!(
+                                    context,
+                                    0,
+                                    "Backup: Cannot copy from blob-directory \"{}\".",
+                                    as_str(context.get_blobdir()),
+                                );
+                            } else {
+                                let dir_handle = dir_handle.unwrap();
+
+                                sql.prepare(
                                     "INSERT INTO backup_blobs (file_name, file_content) VALUES (?, ?);",
                                     move |mut stmt, _| {
                                         let mut processed_files_cnt = 0;
                                         for entry in dir_handle {
                                             if entry.is_err() {
-                                                ok_to_continue = true;
+                                                current_block = 2631791190359682872;
                                                 break;
                                             }
                                             let entry = entry.unwrap();
@@ -757,7 +821,7 @@ unsafe fn export_backup(context: &Context, dir: *const libc::c_char) -> bool {
                                                 .shall_stop_ongoing
                                             {
                                                 delete_dest_file = 1;
-                                                ok_to_continue = false;
+                                                current_block = 11487273724841241105;
                                                 break;
                                             } else {
                                                 processed_files_cnt += 1;
@@ -769,7 +833,11 @@ unsafe fn export_backup(context: &Context, dir: *const libc::c_char) -> bool {
                                                 if permille > 990 {
                                                     permille = 990;
                                                 }
-                                                context.call_cb(Event::ImexProgress(permille));
+                                                context.call_cb(
+                                                    Event::IMEX_PROGRESS,
+                                                    permille as uintptr_t,
+                                                    0 as uintptr_t,
+                                                );
 
                                                 let name_f = entry.file_name();
                                                 let name = name_f.to_string_lossy();
@@ -777,8 +845,13 @@ unsafe fn export_backup(context: &Context, dir: *const libc::c_char) -> bool {
                                                 {
                                                     continue;
                                                 } else {
-                                                    info!(context, "EXPORTing filename={}", name);
-                                                    let curr_pathNfilename = context.get_blobdir().join(entry.file_name());
+                                                    info!(context, 0, "EXPORTing filename={}", name);
+                                                    let curr_pathNfilename = format!(
+                                                        "{}/{}",
+                                                        as_str(context.get_blobdir()),
+                                                        name
+                                                    );
+
                                                     if let Some(buf) =
                                                         dc_read_file_safe(context, &curr_pathNfilename)
                                                     {
@@ -788,11 +861,12 @@ unsafe fn export_backup(context: &Context, dir: *const libc::c_char) -> bool {
                                                         if stmt.execute(params![name, buf]).is_err() {
                                                             error!(
                                                                 context,
+                                                                0,
                                                                 "Disk full? Cannot add file \"{}\" to backup.",
-                                                                curr_pathNfilename.display(),
+                                                                &curr_pathNfilename,
                                                             );
                                                             /* this is not recoverable! writing to the sqlite database should work! */
-                                                            ok_to_continue = false;
+                                                            current_block = 11487273724841241105;
                                                             break;
                                                         }
                                                     } else {
@@ -804,40 +878,34 @@ unsafe fn export_backup(context: &Context, dir: *const libc::c_char) -> bool {
                                         Ok(())
                                     }
                                 ).unwrap();
+                            }
                         } else {
-                            error!(
-                                context,
-                                "Backup: Cannot copy from blob-directory \"{}\".",
-                                context.get_blobdir().display(),
-                            );
+                            info!(context, 0, "Backup: No files to copy.",);
+                            current_block = 2631791190359682872;
                         }
-                    } else {
-                        info!(context, "Backup: No files to copy.",);
-                        ok_to_continue = true;
-                    }
-                    if ok_to_continue {
-                        if sql
-                            .set_config_int(context, "backup_time", now as i32)
-                            .is_ok()
-                        {
-                            context.call_cb(Event::ImexFileWritten(
-                                as_path(dest_pathNfilename).to_path_buf(),
-                            ));
-                            success = true;
+                        match current_block {
+                            11487273724841241105 => {}
+                            _ => {
+                                if sql
+                                    .set_config_int(context, "backup_time", now as i32)
+                                    .is_ok()
+                                {
+                                    context.call_cb(
+                                        Event::IMEX_FILE_WRITTEN,
+                                        dest_pathNfilename as uintptr_t,
+                                        0,
+                                    );
+                                    success = 1;
+                                }
+                            }
                         }
                     }
-                } else {
-                    error!(
-                        context,
-                        "Backup: Cannot get info for blob-directory \"{}\".",
-                        context.get_blobdir().display(),
-                    );
-                };
+                }
             }
         }
     }
     if closed {
-        context.sql.open(&context, &context.get_dbfile(), 0);
+        context.sql.open(&context, as_path(context.get_dbfile()), 0);
     }
     if 0 != delete_dest_file {
         dc_delete_file(context, as_path(dest_pathNfilename));
@@ -858,19 +926,28 @@ unsafe fn import_self_keys(context: &Context, dir_name: *const libc::c_char) ->
     Maybe we should make the "default" key handlong also a little bit smarter
     (currently, the last imported key is the standard key unless it contains the string "legacy" in its name) */
     let mut imported_cnt: libc::c_int = 0;
-    let mut suffix: *mut libc::c_char = ptr::null_mut();
-    let mut path_plus_name: *mut libc::c_char = ptr::null_mut();
+    let mut suffix: *mut libc::c_char = 0 as *mut libc::c_char;
+    let mut path_plus_name: *mut libc::c_char = 0 as *mut libc::c_char;
     let mut set_default: libc::c_int;
-    let mut buf: *mut libc::c_char = ptr::null_mut();
-    let mut buf_bytes: libc::size_t = 0;
+    let mut buf: *mut libc::c_char = 0 as *mut libc::c_char;
+    let mut buf_bytes: size_t = 0 as size_t;
     // a pointer inside buf, MUST NOT be free()'d
     let mut private_key: *const libc::c_char;
-    let mut buf2: *mut libc::c_char = ptr::null_mut();
+    let mut buf2: *mut libc::c_char = 0 as *mut libc::c_char;
     // a pointer inside buf2, MUST NOT be free()'d
-    let mut buf2_headerline: *const libc::c_char = ptr::null_mut();
+    let mut buf2_headerline: *const libc::c_char = 0 as *const libc::c_char;
     if !dir_name.is_null() {
         let dir = std::path::Path::new(as_str(dir_name));
-        if let Ok(dir_handle) = std::fs::read_dir(dir) {
+        let dir_handle = std::fs::read_dir(dir);
+        if dir_handle.is_err() {
+            error!(
+                context,
+                0,
+                "Import: Cannot open directory \"{}\".",
+                as_str(dir_name),
+            );
+        } else {
+            let dir_handle = dir_handle.unwrap();
             for entry in dir_handle {
                 if entry.is_err() {
                     break;
@@ -879,7 +956,7 @@ unsafe fn import_self_keys(context: &Context, dir_name: *const libc::c_char) ->
                 free(suffix as *mut libc::c_void);
                 let name_f = entry.file_name();
                 let name_c = name_f.to_c_string().unwrap();
-                suffix = dc_get_filesuffix_lc(name_f.to_string_lossy());
+                suffix = dc_get_filesuffix_lc(name_c.as_ptr());
                 if suffix.is_null()
                     || strcmp(suffix, b"asc\x00" as *const u8 as *const libc::c_char) != 0
                 {
@@ -891,9 +968,9 @@ unsafe fn import_self_keys(context: &Context, dir_name: *const libc::c_char) ->
                     dir_name,
                     name_c.as_ptr(),
                 );
-                info!(context, "Checking: {}", as_str(path_plus_name));
+                info!(context, 0, "Checking: {}", as_str(path_plus_name));
                 free(buf as *mut libc::c_void);
-                buf = ptr::null_mut();
+                buf = 0 as *mut libc::c_char;
                 if 0 == dc_read_file(
                     context,
                     path_plus_name,
@@ -909,9 +986,9 @@ unsafe fn import_self_keys(context: &Context, dir_name: *const libc::c_char) ->
                 if dc_split_armored_data(
                     buf2,
                     &mut buf2_headerline,
-                    ptr::null_mut(),
-                    ptr::null_mut(),
-                    ptr::null_mut(),
+                    0 as *mut *const libc::c_char,
+                    0 as *mut *const libc::c_char,
+                    0 as *mut *const libc::c_char,
                 ) && strcmp(
                     buf2_headerline,
                     b"-----BEGIN PGP PUBLIC KEY BLOCK-----\x00" as *const u8 as *const libc::c_char,
@@ -935,6 +1012,7 @@ unsafe fn import_self_keys(context: &Context, dir_name: *const libc::c_char) ->
                 {
                     info!(
                         context,
+                        0,
                         "Treating \"{}\" as a legacy private key.",
                         as_str(path_plus_name),
                     );
@@ -948,16 +1026,11 @@ unsafe fn import_self_keys(context: &Context, dir_name: *const libc::c_char) ->
             if imported_cnt == 0i32 {
                 error!(
                     context,
+                    0,
                     "No private keys found in \"{}\".",
                     as_str(dir_name),
                 );
             }
-        } else {
-            error!(
-                context,
-                "Import: Cannot open directory \"{}\".",
-                as_str(dir_name),
-            );
         }
     }
 
@@ -969,7 +1042,8 @@ unsafe fn import_self_keys(context: &Context, dir_name: *const libc::c_char) ->
     imported_cnt
 }
 
-unsafe fn export_self_keys(context: &Context, dir: *const libc::c_char) -> bool {
+// TODO should return bool /rtn
+unsafe fn export_self_keys(context: &Context, dir: *const libc::c_char) -> libc::c_int {
     let mut export_errors = 0;
 
     context
@@ -991,14 +1065,14 @@ unsafe fn export_self_keys(context: &Context, dir: *const libc::c_char) -> bool
                 for key_pair in keys {
                     let (id, public_key, private_key, is_default) = key_pair?;
                     if let Some(key) = public_key {
-                        if export_key_to_asc_file(context, dir, id, &key, is_default) {
+                        if 0 == export_key_to_asc_file(context, dir, id, &key, is_default) {
                             export_errors += 1;
                         }
                     } else {
                         export_errors += 1;
                     }
                     if let Some(key) = private_key {
-                        if export_key_to_asc_file(context, dir, id, &key, is_default) {
+                        if 0 == export_key_to_asc_file(context, dir, id, &key, is_default) {
                             export_errors += 1;
                         }
                     } else {
@@ -1011,20 +1085,25 @@ unsafe fn export_self_keys(context: &Context, dir: *const libc::c_char) -> bool
         )
         .unwrap();
 
-    export_errors == 0
+    if export_errors == 0 {
+        1
+    } else {
+        0
+    }
 }
 
 /*******************************************************************************
  * Classic key export
  ******************************************************************************/
+// TODO should return bool /rtn
 unsafe fn export_key_to_asc_file(
     context: &Context,
     dir: *const libc::c_char,
     id: libc::c_int,
     key: &Key,
     is_default: libc::c_int,
-) -> bool {
-    let mut success = false;
+) -> libc::c_int {
+    let mut success: libc::c_int = 0i32;
     let file_name;
     if 0 != is_default {
         file_name = dc_mprintf(
@@ -1048,13 +1127,17 @@ unsafe fn export_key_to_asc_file(
             id,
         )
     }
-    info!(context, "Exporting key {}", as_str(file_name),);
+    info!(context, 0, "Exporting key {}", as_str(file_name),);
     dc_delete_file(context, as_path(file_name));
-    if !key.write_asc_to_file(as_path(file_name), context) {
-        error!(context, "Cannot write key to {}", as_str(file_name),);
+    if !key.write_asc_to_file(file_name, context) {
+        error!(context, 0, "Cannot write key to {}", as_str(file_name),);
     } else {
-        context.call_cb(Event::ImexFileWritten(as_path(file_name).to_path_buf()));
-        success = true;
+        context.call_cb(
+            Event::IMEX_FILE_WRITTEN,
+            file_name as uintptr_t,
+            0i32 as uintptr_t,
+        );
+        success = 1i32
     }
     free(file_name as *mut libc::c_void);
 
@@ -1065,11 +1148,13 @@ unsafe fn export_key_to_asc_file(
 mod tests {
     use super::*;
 
+    use num_traits::ToPrimitive;
+
     use crate::test_utils::*;
 
     #[test]
     fn test_render_setup_file() {
-        let t = test_context(Some(Box::new(logging_cb)));
+        let t = test_context(Some(logging_cb));
 
         configure_alice_keypair(&t.ctx);
         let msg = dc_render_setup_file(&t.ctx, "hello").unwrap();
@@ -1087,19 +1172,22 @@ mod tests {
         assert!(msg.contains("-----END PGP MESSAGE-----\n"));
     }
 
-    fn ac_setup_msg_cb(ctx: &Context, evt: Event) -> libc::uintptr_t {
-        match evt {
-            Event::GetString {
-                id: StockMessage::AcSetupMsgBody,
-                ..
-            } => unsafe { "hello\r\nthere".strdup() as usize },
-            _ => logging_cb(ctx, evt),
+    unsafe extern "C" fn ac_setup_msg_cb(
+        ctx: &Context,
+        evt: Event,
+        d1: uintptr_t,
+        d2: uintptr_t,
+    ) -> uintptr_t {
+        if evt == Event::GET_STRING && d1 == StockMessage::AcSetupMsgBody.to_usize().unwrap() {
+            "hello\r\nthere".strdup() as usize
+        } else {
+            logging_cb(ctx, evt, d1, d2)
         }
     }
 
     #[test]
     fn test_render_setup_file_newline_replace() {
-        let t = test_context(Some(Box::new(ac_setup_msg_cb)));
+        let t = test_context(Some(ac_setup_msg_cb));
         configure_alice_keypair(&t.ctx);
         let msg = dc_render_setup_file(&t.ctx, "pw").unwrap();
         println!("{}", &msg);

src/dc_jobthread.rs

@@ -0,0 +1,209 @@
+use std::sync::{Arc, Condvar, Mutex};
+
+use crate::context::Context;
+use crate::dc_configure::*;
+use crate::imap::Imap;
+use crate::x::*;
+
+#[repr(C)]
+pub struct dc_jobthread_t {
+    pub name: &'static str,
+    pub folder_config_name: &'static str,
+    pub imap: Imap,
+    pub state: Arc<(Mutex<JobState>, Condvar)>,
+}
+
+pub fn dc_jobthread_init(
+    name: &'static str,
+    folder_config_name: &'static str,
+    imap: Imap,
+) -> dc_jobthread_t {
+    dc_jobthread_t {
+        name,
+        folder_config_name,
+        imap,
+        state: Arc::new((Mutex::new(Default::default()), Condvar::new())),
+    }
+}
+
+#[derive(Debug, Default)]
+pub struct JobState {
+    idle: bool,
+    jobs_needed: i32,
+    suspended: i32,
+    using_handle: i32,
+}
+
+pub unsafe fn dc_jobthread_suspend(
+    context: &Context,
+    jobthread: &dc_jobthread_t,
+    suspend: libc::c_int,
+) {
+    if 0 != suspend {
+        info!(context, 0, "Suspending {}-thread.", jobthread.name,);
+        {
+            jobthread.state.0.lock().unwrap().suspended = 1;
+        }
+        dc_jobthread_interrupt_idle(context, jobthread);
+        loop {
+            let using_handle = jobthread.state.0.lock().unwrap().using_handle;
+            if using_handle == 0 {
+                return;
+            }
+            std::thread::sleep(std::time::Duration::from_micros(300 * 1000));
+        }
+    } else {
+        info!(context, 0, "Unsuspending {}-thread.", jobthread.name);
+
+        let &(ref lock, ref cvar) = &*jobthread.state.clone();
+        let mut state = lock.lock().unwrap();
+
+        state.suspended = 0;
+        state.idle = true;
+        cvar.notify_one();
+    }
+}
+
+pub unsafe fn dc_jobthread_interrupt_idle(context: &Context, jobthread: &dc_jobthread_t) {
+    {
+        jobthread.state.0.lock().unwrap().jobs_needed = 1;
+    }
+
+    info!(context, 0, "Interrupting {}-IDLE...", jobthread.name);
+
+    jobthread.imap.interrupt_idle();
+
+    let &(ref lock, ref cvar) = &*jobthread.state.clone();
+    let mut state = lock.lock().unwrap();
+
+    state.idle = true;
+    cvar.notify_one();
+}
+
+pub unsafe fn dc_jobthread_fetch(
+    context: &Context,
+    jobthread: &mut dc_jobthread_t,
+    use_network: libc::c_int,
+) {
+    let start;
+
+    {
+        let &(ref lock, _) = &*jobthread.state.clone();
+        let mut state = lock.lock().unwrap();
+
+        if 0 != state.suspended {
+            return;
+        }
+
+        state.using_handle = 1;
+    }
+
+    if 0 != use_network {
+        start = clock();
+        if !(0 == connect_to_imap(context, jobthread)) {
+            info!(context, 0, "{}-fetch started...", jobthread.name);
+            jobthread.imap.fetch(context);
+
+            if jobthread.imap.should_reconnect() {
+                info!(
+                    context,
+                    0, "{}-fetch aborted, starting over...", jobthread.name,
+                );
+                jobthread.imap.fetch(context);
+            }
+            info!(
+                context,
+                0,
+                "{}-fetch done in {:.3} ms.",
+                jobthread.name,
+                clock().wrapping_sub(start) as f64 / 1000.0,
+            );
+        }
+    }
+
+    jobthread.state.0.lock().unwrap().using_handle = 0;
+}
+
+/* ******************************************************************************
+ * the typical fetch, idle, interrupt-idle
+ ******************************************************************************/
+
+unsafe fn connect_to_imap(context: &Context, jobthread: &dc_jobthread_t) -> libc::c_int {
+    if jobthread.imap.is_connected() {
+        return 1;
+    }
+
+    let mut ret_connected = dc_connect_to_configured_imap(context, &jobthread.imap);
+
+    if !(0 == ret_connected) {
+        if context
+            .sql
+            .get_config_int(context, "folders_configured")
+            .unwrap_or_default()
+            < 3
+        {
+            jobthread.imap.configure_folders(context, 0x1);
+        }
+
+        if let Some(mvbox_name) = context
+            .sql
+            .get_config(context, jobthread.folder_config_name)
+        {
+            jobthread.imap.set_watch_folder(mvbox_name);
+        } else {
+            jobthread.imap.disconnect(context);
+            ret_connected = 0;
+        }
+    }
+
+    ret_connected
+}
+
+pub unsafe fn dc_jobthread_idle(
+    context: &Context,
+    jobthread: &dc_jobthread_t,
+    use_network: libc::c_int,
+) {
+    {
+        let &(ref lock, ref cvar) = &*jobthread.state.clone();
+        let mut state = lock.lock().unwrap();
+
+        if 0 != state.jobs_needed {
+            info!(
+                context,
+                0,
+                "{}-IDLE will not be started as it was interrupted while not ideling.",
+                jobthread.name,
+            );
+            state.jobs_needed = 0;
+            return;
+        }
+
+        if 0 != state.suspended {
+            while !state.idle {
+                state = cvar.wait(state).unwrap();
+            }
+            state.idle = false;
+            return;
+        }
+
+        state.using_handle = 1;
+
+        if 0 == use_network {
+            state.using_handle = 0;
+
+            while !state.idle {
+                state = cvar.wait(state).unwrap();
+            }
+            state.idle = false;
+            return;
+        }
+    }
+
+    connect_to_imap(context, jobthread);
+    info!(context, 0, "{}-IDLE started...", jobthread.name,);
+    jobthread.imap.idle(context);
+    info!(context, 0, "{}-IDLE ended.", jobthread.name);
+
+    jobthread.state.0.lock().unwrap().using_handle = 0;
+}

src/dc_location.rs

@@ -0,0 +1,754 @@
+use std::ffi::CString;
+
+use crate::constants::Event;
+use crate::constants::*;
+use crate::context::*;
+use crate::dc_array::*;
+use crate::dc_chat::*;
+use crate::dc_job::*;
+use crate::dc_msg::*;
+use crate::dc_saxparser::*;
+use crate::dc_tools::*;
+use crate::param::*;
+use crate::sql;
+use crate::stock::StockMessage;
+use crate::types::*;
+use crate::x::*;
+
+// location handling
+#[derive(Clone, Default)]
+#[allow(non_camel_case_types)]
+pub struct dc_location {
+    pub location_id: uint32_t,
+    pub latitude: libc::c_double,
+    pub longitude: libc::c_double,
+    pub accuracy: libc::c_double,
+    pub timestamp: i64,
+    pub contact_id: uint32_t,
+    pub msg_id: uint32_t,
+    pub chat_id: uint32_t,
+    pub marker: Option<String>,
+    pub independent: uint32_t,
+}
+
+impl dc_location {
+    pub fn new() -> Self {
+        dc_location {
+            location_id: 0,
+            latitude: 0.0,
+            longitude: 0.0,
+            accuracy: 0.0,
+            timestamp: 0,
+            contact_id: 0,
+            msg_id: 0,
+            chat_id: 0,
+            marker: None,
+            independent: 0,
+        }
+    }
+}
+
+#[derive(Clone)]
+#[allow(non_camel_case_types)]
+pub struct dc_kml_t {
+    pub addr: *mut libc::c_char,
+    pub locations: Option<Vec<dc_location>>,
+    pub tag: libc::c_int,
+    pub curr: dc_location,
+}
+
+impl dc_kml_t {
+    pub fn new() -> Self {
+        dc_kml_t {
+            addr: std::ptr::null_mut(),
+            locations: None,
+            tag: 0,
+            curr: dc_location::new(),
+        }
+    }
+}
+
+// location streaming
+pub unsafe fn dc_send_locations_to_chat(
+    context: &Context,
+    chat_id: uint32_t,
+    seconds: libc::c_int,
+) {
+    let now = time();
+    let mut msg: *mut dc_msg_t = 0 as *mut dc_msg_t;
+    let is_sending_locations_before: bool;
+    if !(seconds < 0i32 || chat_id <= 9i32 as libc::c_uint) {
+        is_sending_locations_before = dc_is_sending_locations_to_chat(context, chat_id);
+        if sql::execute(
+            context,
+            &context.sql,
+            "UPDATE chats    \
+             SET locations_send_begin=?,        \
+             locations_send_until=?  \
+             WHERE id=?",
+            params![
+                if 0 != seconds { now } else { 0 },
+                if 0 != seconds {
+                    now + seconds as i64
+                } else {
+                    0
+                },
+                chat_id as i32,
+            ],
+        )
+        .is_ok()
+        {
+            if 0 != seconds && !is_sending_locations_before {
+                msg = dc_msg_new(context, Viewtype::Text);
+                (*msg).text =
+                    Some(context.stock_system_msg(StockMessage::MsgLocationEnabled, "", "", 0));
+                (*msg).param.set_int(Param::Cmd, 8);
+                dc_send_msg(context, chat_id, msg);
+            } else if 0 == seconds && is_sending_locations_before {
+                let stock_str = CString::new(context.stock_system_msg(
+                    StockMessage::MsgLocationDisabled,
+                    "",
+                    "",
+                    0,
+                ))
+                .unwrap();
+                dc_add_device_msg(context, chat_id, stock_str.as_ptr());
+            }
+            context.call_cb(
+                Event::CHAT_MODIFIED,
+                chat_id as uintptr_t,
+                0i32 as uintptr_t,
+            );
+            if 0 != seconds {
+                schedule_MAYBE_SEND_LOCATIONS(context, 0i32);
+                dc_job_add(
+                    context,
+                    5007i32,
+                    chat_id as libc::c_int,
+                    Params::new(),
+                    seconds + 1i32,
+                );
+            }
+        }
+    }
+    dc_msg_unref(msg);
+}
+
+/*******************************************************************************
+ * job to send locations out to all chats that want them
+ ******************************************************************************/
+#[allow(non_snake_case)]
+unsafe fn schedule_MAYBE_SEND_LOCATIONS(context: &Context, flags: libc::c_int) {
+    if 0 != flags & 0x1 || !dc_job_action_exists(context, 5005) {
+        dc_job_add(context, 5005, 0, Params::new(), 60);
+    };
+}
+
+pub fn dc_is_sending_locations_to_chat(context: &Context, chat_id: u32) -> bool {
+    context
+        .sql
+        .exists(
+            "SELECT id  FROM chats  WHERE (? OR id=?)   AND locations_send_until>?;",
+            params![if chat_id == 0 { 1 } else { 0 }, chat_id as i32, time()],
+        )
+        .unwrap_or_default()
+}
+
+pub fn dc_set_location(
+    context: &Context,
+    latitude: libc::c_double,
+    longitude: libc::c_double,
+    accuracy: libc::c_double,
+) -> libc::c_int {
+    if latitude == 0.0 && longitude == 0.0 {
+        return 1;
+    }
+
+    context.sql.query_map(
+        "SELECT id FROM chats WHERE locations_send_until>?;",
+        params![time()], |row| row.get::<_, i32>(0),
+        |chats| {
+            let mut continue_streaming = false;
+
+            for chat in chats {
+                let chat_id = chat?;
+                context.sql.execute(
+                    "INSERT INTO locations  \
+                     (latitude, longitude, accuracy, timestamp, chat_id, from_id) VALUES (?,?,?,?,?,?);",
+                    params![
+                        latitude,
+                        longitude,
+                        accuracy,
+                        time(),
+                        chat_id,
+                        1,
+                    ]
+                )?;
+                continue_streaming = true;
+            }
+            if continue_streaming {
+                context.call_cb(Event::LOCATION_CHANGED, 1, 0);
+            };
+            unsafe { schedule_MAYBE_SEND_LOCATIONS(context, 0) };
+            Ok(continue_streaming as libc::c_int)
+        }
+    ).unwrap_or_default()
+}
+
+pub fn dc_get_locations(
+    context: &Context,
+    chat_id: uint32_t,
+    contact_id: uint32_t,
+    timestamp_from: i64,
+    mut timestamp_to: i64,
+) -> *mut dc_array_t {
+    if timestamp_to == 0 {
+        timestamp_to = time() + 10;
+    }
+
+    context
+        .sql
+        .query_map(
+            "SELECT l.id, l.latitude, l.longitude, l.accuracy, l.timestamp, l.independent, \
+             m.id, l.from_id, l.chat_id, m.txt \
+             FROM locations l  LEFT JOIN msgs m ON l.id=m.location_id  WHERE (? OR l.chat_id=?) \
+             AND (? OR l.from_id=?) \
+             AND (l.independent=1 OR (l.timestamp>=? AND l.timestamp<=?)) \
+             ORDER BY l.timestamp DESC, l.id DESC, m.id DESC;",
+            params![
+                if chat_id == 0 { 1 } else { 0 },
+                chat_id as i32,
+                if contact_id == 0 { 1 } else { 0 },
+                contact_id as i32,
+                timestamp_from,
+                timestamp_to,
+            ],
+            |row| {
+                let msg_id = row.get(6)?;
+                let txt: String = row.get(9)?;
+                let marker = if msg_id != 0 && is_marker(&txt) {
+                    Some(txt)
+                } else {
+                    None
+                };
+
+                let loc = dc_location {
+                    location_id: row.get(0)?,
+                    latitude: row.get(1)?,
+                    longitude: row.get(2)?,
+                    accuracy: row.get(3)?,
+                    timestamp: row.get(4)?,
+                    independent: row.get(5)?,
+                    msg_id: msg_id,
+                    contact_id: row.get(7)?,
+                    chat_id: row.get(8)?,
+                    marker: marker,
+                };
+                Ok(loc)
+            },
+            |locations| {
+                let mut ret = Vec::new();
+
+                for location in locations {
+                    ret.push(location?);
+                }
+                Ok(dc_array_t::from(ret).into_raw())
+            },
+        )
+        .unwrap_or_else(|_| std::ptr::null_mut())
+}
+
+fn is_marker(txt: &str) -> bool {
+    txt.len() == 1 && txt.chars().next().unwrap() != ' '
+}
+
+pub fn dc_delete_all_locations(context: &Context) -> bool {
+    if sql::execute(context, &context.sql, "DELETE FROM locations;", params![]).is_err() {
+        return false;
+    }
+    context.call_cb(Event::LOCATION_CHANGED, 0, 0);
+    true
+}
+
+pub fn dc_get_location_kml(
+    context: &Context,
+    chat_id: uint32_t,
+    last_added_location_id: *mut uint32_t,
+) -> *mut libc::c_char {
+    let mut success: libc::c_int = 0;
+    let now = time();
+    let mut location_count: libc::c_int = 0;
+    let mut ret = String::new();
+
+    let self_addr = context
+        .sql
+        .get_config(context, "configured_addr")
+        .unwrap_or_default();
+
+    if let Ok((locations_send_begin, locations_send_until, locations_last_sent)) = context.sql.query_row(
+        "SELECT locations_send_begin, locations_send_until, locations_last_sent  FROM chats  WHERE id=?;",
+        params![chat_id as i32], |row| {
+            let send_begin: i64 = row.get(0)?;
+            let send_until: i64 = row.get(1)?;
+            let last_sent: i64 = row.get(2)?;
+
+            Ok((send_begin, send_until, last_sent))
+        }
+    ) {
+        if !(locations_send_begin == 0 || now > locations_send_until) {
+            ret += &format!(
+                "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<kml xmlns=\"http://www.opengis.net/kml/2.2\">\n<Document addr=\"{}\">\n",
+                self_addr,
+            );
+
+            context.sql.query_map(
+                "SELECT id, latitude, longitude, accuracy, timestamp\
+                 FROM locations  WHERE from_id=? \
+                 AND timestamp>=? \
+                 AND (timestamp>=? OR timestamp=(SELECT MAX(timestamp) FROM locations WHERE from_id=?)) \
+                 AND independent=0 \
+                 GROUP BY timestamp \
+                 ORDER BY timestamp;",
+                params![1, locations_send_begin, locations_last_sent, 1],
+                |row| {
+                    let location_id: i32 = row.get(0)?;
+                    let latitude: f64 = row.get(1)?;
+                    let longitude: f64 = row.get(2)?;
+                    let accuracy: f64 = row.get(3)?;
+                    let timestamp = unsafe { get_kml_timestamp(row.get(4)?) };
+
+                    Ok((location_id, latitude, longitude, accuracy, timestamp))
+                },
+                |rows| {
+                    for row in rows {
+                        let (location_id, latitude, longitude, accuracy, timestamp) = row?;
+                        ret += &format!(
+                            "<Placemark><Timestamp><when>{}</when></Timestamp><Point><coordinates accuracy=\"{}\">{},{}</coordinates></Point></Placemark>\n\x00",
+                            as_str(timestamp),
+                            accuracy,
+                            longitude,
+                            latitude
+                        );
+                        location_count += 1;
+                        if !last_added_location_id.is_null() {
+                            unsafe { *last_added_location_id = location_id as u32 };
+                        }
+                        unsafe { free(timestamp as *mut libc::c_void) };
+                    }
+                    Ok(())
+                }
+            ).unwrap(); // TODO: better error handling
+        }
+    }
+
+    if location_count > 0 {
+        ret += "</Document>\n</kml>";
+        success = 1;
+    }
+
+    if 0 != success {
+        unsafe { ret.strdup() }
+    } else {
+        std::ptr::null_mut()
+    }
+}
+
+/*******************************************************************************
+ * create kml-files
+ ******************************************************************************/
+unsafe fn get_kml_timestamp(utc: i64) -> *mut libc::c_char {
+    // Returns a string formatted as YYYY-MM-DDTHH:MM:SSZ. The trailing `Z` indicates UTC.
+    let res = chrono::NaiveDateTime::from_timestamp(utc, 0)
+        .format("%Y-%m-%dT%H:%M:%SZ")
+        .to_string();
+    res.strdup()
+}
+
+pub unsafe fn dc_get_message_kml(
+    timestamp: i64,
+    latitude: libc::c_double,
+    longitude: libc::c_double,
+) -> *mut libc::c_char {
+    let timestamp_str = get_kml_timestamp(timestamp);
+    let latitude_str = dc_ftoa(latitude);
+    let longitude_str = dc_ftoa(longitude);
+
+    let ret = dc_mprintf(
+        b"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n\
+         <kml xmlns=\"http://www.opengis.net/kml/2.2\">\n\
+         <Document>\n\
+         <Placemark>\
+         <Timestamp><when>%s</when></Timestamp>\
+         <Point><coordinates>%s,%s</coordinates></Point>\
+         </Placemark>\n\
+         </Document>\n\
+         </kml>\x00" as *const u8 as *const libc::c_char,
+        timestamp_str,
+        longitude_str, // reverse order!
+        latitude_str,
+    );
+
+    free(latitude_str as *mut libc::c_void);
+    free(longitude_str as *mut libc::c_void);
+    free(timestamp_str as *mut libc::c_void);
+
+    ret
+}
+
+pub fn dc_set_kml_sent_timestamp(context: &Context, chat_id: u32, timestamp: i64) -> bool {
+    sql::execute(
+        context,
+        &context.sql,
+        "UPDATE chats SET locations_last_sent=? WHERE id=?;",
+        params![timestamp, chat_id as i32],
+    )
+    .is_ok()
+}
+
+pub fn dc_set_msg_location_id(context: &Context, msg_id: u32, location_id: u32) -> bool {
+    sql::execute(
+        context,
+        &context.sql,
+        "UPDATE msgs SET location_id=? WHERE id=?;",
+        params![location_id, msg_id as i32],
+    )
+    .is_ok()
+}
+
+pub unsafe fn dc_save_locations(
+    context: &Context,
+    chat_id: u32,
+    contact_id: u32,
+    locations_opt: &Option<Vec<dc_location>>,
+    independent: libc::c_int,
+) -> u32 {
+    if chat_id <= 9 || locations_opt.is_none() {
+        return 0;
+    }
+
+    let locations = locations_opt.as_ref().unwrap();
+    context
+        .sql
+        .prepare2(
+            "SELECT id FROM locations WHERE timestamp=? AND from_id=?",
+            "INSERT INTO locations\
+             (timestamp, from_id, chat_id, latitude, longitude, accuracy, independent) \
+             VALUES (?,?,?,?,?,?,?);",
+            |mut stmt_test, mut stmt_insert, conn| {
+                let mut newest_timestamp = 0;
+                let mut newest_location_id = 0;
+
+                for location in locations {
+                    let exists =
+                        stmt_test.exists(params![location.timestamp, contact_id as i32])?;
+
+                    if 0 != independent || !exists {
+                        stmt_insert.execute(params![
+                            location.timestamp,
+                            contact_id as i32,
+                            chat_id as i32,
+                            location.latitude,
+                            location.longitude,
+                            location.accuracy,
+                            independent,
+                        ])?;
+
+                        if location.timestamp > newest_timestamp {
+                            newest_timestamp = location.timestamp;
+                            newest_location_id = sql::get_rowid2_with_conn(
+                                context,
+                                conn,
+                                "locations",
+                                "timestamp",
+                                location.timestamp,
+                                "from_id",
+                                contact_id as i32,
+                            );
+                        }
+                    }
+                }
+                Ok(newest_location_id)
+            },
+        )
+        .unwrap_or_default()
+}
+
+pub unsafe fn dc_kml_parse(
+    context: &Context,
+    content: *const libc::c_char,
+    content_bytes: size_t,
+) -> dc_kml_t {
+    let mut kml = dc_kml_t::new();
+    let mut content_nullterminated: *mut libc::c_char = 0 as *mut libc::c_char;
+    let mut saxparser: dc_saxparser_t = dc_saxparser_t {
+        starttag_cb: None,
+        endtag_cb: None,
+        text_cb: None,
+        userdata: 0 as *mut libc::c_void,
+    };
+
+    if content_bytes > (1 * 1024 * 1024) {
+        warn!(
+            context,
+            0, "A kml-files with {} bytes is larger than reasonably expected.", content_bytes,
+        );
+    } else {
+        content_nullterminated = dc_null_terminate(content, content_bytes as libc::c_int);
+        if !content_nullterminated.is_null() {
+            kml.locations = Some(Vec::with_capacity(100));
+            dc_saxparser_init(
+                &mut saxparser,
+                &mut kml as *mut dc_kml_t as *mut libc::c_void,
+            );
+            dc_saxparser_set_tag_handler(
+                &mut saxparser,
+                Some(kml_starttag_cb),
+                Some(kml_endtag_cb),
+            );
+            dc_saxparser_set_text_handler(&mut saxparser, Some(kml_text_cb));
+            dc_saxparser_parse(&mut saxparser, content_nullterminated);
+        }
+    }
+
+    free(content_nullterminated as *mut libc::c_void);
+
+    kml
+}
+
+unsafe fn kml_text_cb(userdata: *mut libc::c_void, text: *const libc::c_char, _len: libc::c_int) {
+    let mut kml: *mut dc_kml_t = userdata as *mut dc_kml_t;
+    if 0 != (*kml).tag & (0x4 | 0x10) {
+        let mut val: *mut libc::c_char = dc_strdup(text);
+        dc_str_replace(
+            &mut val,
+            b"\n\x00" as *const u8 as *const libc::c_char,
+            b"\x00" as *const u8 as *const libc::c_char,
+        );
+        dc_str_replace(
+            &mut val,
+            b"\r\x00" as *const u8 as *const libc::c_char,
+            b"\x00" as *const u8 as *const libc::c_char,
+        );
+        dc_str_replace(
+            &mut val,
+            b"\t\x00" as *const u8 as *const libc::c_char,
+            b"\x00" as *const u8 as *const libc::c_char,
+        );
+        dc_str_replace(
+            &mut val,
+            b" \x00" as *const u8 as *const libc::c_char,
+            b"\x00" as *const u8 as *const libc::c_char,
+        );
+        if 0 != (*kml).tag & 0x4 && strlen(val) >= 19 {
+            // YYYY-MM-DDTHH:MM:SSZ
+            // 0   4  7  10 13 16 19
+            let val_r = as_str(val);
+            match chrono::NaiveDateTime::parse_from_str(val_r, "%Y-%m-%dT%H:%M:%SZ") {
+                Ok(res) => {
+                    (*kml).curr.timestamp = res.timestamp();
+                    if (*kml).curr.timestamp > time() {
+                        (*kml).curr.timestamp = time();
+                    }
+                }
+                Err(_err) => {
+                    (*kml).curr.timestamp = time();
+                }
+            }
+        } else if 0 != (*kml).tag & 0x10 {
+            let mut comma: *mut libc::c_char = strchr(val, ',' as i32);
+            if !comma.is_null() {
+                let longitude: *mut libc::c_char = val;
+                let latitude: *mut libc::c_char = comma.offset(1isize);
+                *comma = 0 as libc::c_char;
+                comma = strchr(latitude, ',' as i32);
+                if !comma.is_null() {
+                    *comma = 0 as libc::c_char
+                }
+                (*kml).curr.latitude = dc_atof(latitude);
+                (*kml).curr.longitude = dc_atof(longitude)
+            }
+        }
+        free(val as *mut libc::c_void);
+    };
+}
+
+unsafe fn kml_endtag_cb(userdata: *mut libc::c_void, tag: *const libc::c_char) {
+    let mut kml: *mut dc_kml_t = userdata as *mut dc_kml_t;
+    if strcmp(tag, b"placemark\x00" as *const u8 as *const libc::c_char) == 0 {
+        if 0 != (*kml).tag & 0x1
+            && 0 != (*kml).curr.timestamp
+            && 0. != (*kml).curr.latitude
+            && 0. != (*kml).curr.longitude
+        {
+            let location = (*kml).curr.clone();
+            ((*kml).locations.as_mut().unwrap()).push(location);
+        }
+        (*kml).tag = 0
+    };
+}
+
+/*******************************************************************************
+ * parse kml-files
+ ******************************************************************************/
+unsafe fn kml_starttag_cb(
+    userdata: *mut libc::c_void,
+    tag: *const libc::c_char,
+    attr: *mut *mut libc::c_char,
+) {
+    let mut kml: *mut dc_kml_t = userdata as *mut dc_kml_t;
+    if strcmp(tag, b"document\x00" as *const u8 as *const libc::c_char) == 0 {
+        let addr: *const libc::c_char =
+            dc_attr_find(attr, b"addr\x00" as *const u8 as *const libc::c_char);
+        if !addr.is_null() {
+            (*kml).addr = dc_strdup(addr)
+        }
+    } else if strcmp(tag, b"placemark\x00" as *const u8 as *const libc::c_char) == 0 {
+        (*kml).tag = 0x1;
+        (*kml).curr.timestamp = 0;
+        (*kml).curr.latitude = 0 as libc::c_double;
+        (*kml).curr.longitude = 0.0f64;
+        (*kml).curr.accuracy = 0.0f64
+    } else if strcmp(tag, b"timestamp\x00" as *const u8 as *const libc::c_char) == 0
+        && 0 != (*kml).tag & 0x1
+    {
+        (*kml).tag = 0x1 | 0x2
+    } else if strcmp(tag, b"when\x00" as *const u8 as *const libc::c_char) == 0
+        && 0 != (*kml).tag & 0x2
+    {
+        (*kml).tag = 0x1 | 0x2 | 0x4
+    } else if strcmp(tag, b"point\x00" as *const u8 as *const libc::c_char) == 0
+        && 0 != (*kml).tag & 0x1
+    {
+        (*kml).tag = 0x1 | 0x8
+    } else if strcmp(tag, b"coordinates\x00" as *const u8 as *const libc::c_char) == 0
+        && 0 != (*kml).tag & 0x8
+    {
+        (*kml).tag = 0x1 | 0x8 | 0x10;
+        let accuracy: *const libc::c_char =
+            dc_attr_find(attr, b"accuracy\x00" as *const u8 as *const libc::c_char);
+        if !accuracy.is_null() {
+            (*kml).curr.accuracy = dc_atof(accuracy)
+        }
+    };
+}
+
+pub unsafe fn dc_kml_unref(kml: &mut dc_kml_t) {
+    free((*kml).addr as *mut libc::c_void);
+}
+
+#[allow(non_snake_case)]
+pub unsafe fn dc_job_do_DC_JOB_MAYBE_SEND_LOCATIONS(context: &Context, _job: *mut dc_job_t) {
+    let now = time();
+    let mut continue_streaming: libc::c_int = 1;
+    info!(
+        context,
+        0, " ----------------- MAYBE_SEND_LOCATIONS -------------- ",
+    );
+
+    context
+        .sql
+        .query_map(
+            "SELECT id, locations_send_begin, locations_last_sent \
+             FROM chats \
+             WHERE locations_send_until>?;",
+            params![now],
+            |row| {
+                let chat_id: i32 = row.get(0)?;
+                let locations_send_begin: i64 = row.get(1)?;
+                let locations_last_sent: i64 = row.get(2)?;
+                continue_streaming = 1;
+
+                // be a bit tolerant as the timer may not align exactly with time(NULL)
+                if now - locations_last_sent < (60 - 3) {
+                    Ok(None)
+                } else {
+                    Ok(Some((chat_id, locations_send_begin, locations_last_sent)))
+                }
+            },
+            |rows| {
+                context.sql.prepare(
+                    "SELECT id \
+                     FROM locations \
+                     WHERE from_id=? \
+                     AND timestamp>=? \
+                     AND timestamp>? \
+                     AND independent=0 \
+                     ORDER BY timestamp;",
+                    |mut stmt_locations, _| {
+                        for (chat_id, locations_send_begin, locations_last_sent) in
+                            rows.filter_map(|r| match r {
+                                Ok(Some(v)) => Some(v),
+                                _ => None,
+                            })
+                        {
+                            // TODO: do I need to reset?
+                            if !stmt_locations
+                                .exists(params![1, locations_send_begin, locations_last_sent,])
+                                .unwrap_or_default()
+                            {
+                                // if there is no new location, there's nothing to send.
+                                // however, maybe we want to bypass this test eg. 15 minutes
+                                continue;
+                            }
+                            // pending locations are attached automatically to every message,
+                            // so also to this empty text message.
+                            // DC_CMD_LOCATION is only needed to create a nicer subject.
+                            //
+                            // for optimisation and to avoid flooding the sending queue,
+                            // we could sending these messages only if we're really online.
+                            // the easiest way to determine this, is to check for an empty message queue.
+                            // (might not be 100%, however, as positions are sent combined later
+                            // and dc_set_location() is typically called periodically, this is ok)
+                            let mut msg = dc_msg_new(context, Viewtype::Text);
+                            (*msg).hidden = 1;
+                            (*msg).param.set_int(Param::Cmd, 9);
+                            dc_send_msg(context, chat_id as u32, msg);
+                            dc_msg_unref(msg);
+                        }
+                        Ok(())
+                    },
+                )
+            },
+        )
+        .unwrap(); // TODO: Better error handling
+
+    if 0 != continue_streaming {
+        schedule_MAYBE_SEND_LOCATIONS(context, 0x1);
+    }
+}
+
+#[allow(non_snake_case)]
+pub unsafe fn dc_job_do_DC_JOB_MAYBE_SEND_LOC_ENDED(context: &Context, job: &mut dc_job_t) {
+    // this function is called when location-streaming _might_ have ended for a chat.
+    // the function checks, if location-streaming is really ended;
+    // if so, a device-message is added if not yet done.
+
+    let chat_id = (*job).foreign_id;
+
+    if let Ok((send_begin, send_until)) = context.sql.query_row(
+        "SELECT locations_send_begin, locations_send_until  FROM chats  WHERE id=?",
+        params![chat_id as i32],
+        |row| Ok((row.get::<_, i64>(0)?, row.get::<_, i64>(1)?)),
+    ) {
+        if !(send_begin != 0 && time() <= send_until) {
+            // still streaming -
+            // may happen as several calls to dc_send_locations_to_chat()
+            // do not un-schedule pending DC_MAYBE_SEND_LOC_ENDED jobs
+            if !(send_begin == 0 && send_until == 0) {
+                // not streaming, device-message already sent
+                if context.sql.execute(
+                    "UPDATE chats    SET locations_send_begin=0, locations_send_until=0  WHERE id=?",
+                    params![chat_id as i32],
+                ).is_ok() {
+                    let stock_str = CString::new(context.stock_system_msg(StockMessage::MsgLocationDisabled, "", "", 0)).unwrap();
+                    dc_add_device_msg(context, chat_id, stock_str.as_ptr());
+                    context.call_cb(
+                        Event::CHAT_MODIFIED,
+                        chat_id as usize,
+                        0,
+                    );
+                }
+            }
+        }
+    }
+}

src/dc_loginparam.rs

@@ -0,0 +1,214 @@
+use std::borrow::Cow;
+
+use crate::context::Context;
+use crate::sql::Sql;
+
+#[derive(Default, Debug)]
+#[allow(non_camel_case_types)]
+pub struct dc_loginparam_t {
+    pub addr: String,
+    pub mail_server: String,
+    pub mail_user: String,
+    pub mail_pw: String,
+    pub mail_port: i32,
+    pub send_server: String,
+    pub send_user: String,
+    pub send_pw: String,
+    pub send_port: i32,
+    pub server_flags: i32,
+}
+
+impl dc_loginparam_t {
+    pub fn addr_str(&self) -> &str {
+        self.addr.as_str()
+    }
+}
+
+pub fn dc_loginparam_new() -> dc_loginparam_t {
+    Default::default()
+}
+
+pub fn dc_loginparam_read(
+    context: &Context,
+    sql: &Sql,
+    prefix: impl AsRef<str>,
+) -> dc_loginparam_t {
+    let prefix = prefix.as_ref();
+
+    let key = format!("{}addr", prefix);
+    let addr = sql
+        .get_config(context, key)
+        .unwrap_or_default()
+        .trim()
+        .to_string();
+
+    let key = format!("{}mail_server", prefix);
+    let mail_server = sql.get_config(context, key).unwrap_or_default();
+
+    let key = format!("{}mail_port", prefix);
+    let mail_port = sql.get_config_int(context, key).unwrap_or_default();
+
+    let key = format!("{}mail_user", prefix);
+    let mail_user = sql.get_config(context, key).unwrap_or_default();
+
+    let key = format!("{}mail_pw", prefix);
+    let mail_pw = sql.get_config(context, key).unwrap_or_default();
+
+    let key = format!("{}send_server", prefix);
+    let send_server = sql.get_config(context, key).unwrap_or_default();
+
+    let key = format!("{}send_port", prefix);
+    let send_port = sql.get_config_int(context, key).unwrap_or_default();
+
+    let key = format!("{}send_user", prefix);
+    let send_user = sql.get_config(context, key).unwrap_or_default();
+
+    let key = format!("{}send_pw", prefix);
+    let send_pw = sql.get_config(context, key).unwrap_or_default();
+
+    let key = format!("{}server_flags", prefix);
+    let server_flags = sql.get_config_int(context, key).unwrap_or_default();
+
+    dc_loginparam_t {
+        addr: addr.to_string(),
+        mail_server,
+        mail_user,
+        mail_pw,
+        mail_port,
+        send_server,
+        send_user,
+        send_pw,
+        send_port,
+        server_flags,
+    }
+}
+
+pub fn dc_loginparam_write(
+    context: &Context,
+    loginparam: &dc_loginparam_t,
+    sql: &Sql,
+    prefix: impl AsRef<str>,
+) {
+    let prefix = prefix.as_ref();
+
+    let key = format!("{}addr", prefix);
+    sql.set_config(context, key, Some(&loginparam.addr)).ok();
+
+    let key = format!("{}mail_server", prefix);
+    sql.set_config(context, key, Some(&loginparam.mail_server))
+        .ok();
+
+    let key = format!("{}mail_port", prefix);
+    sql.set_config_int(context, key, loginparam.mail_port).ok();
+
+    let key = format!("{}mail_user", prefix);
+    sql.set_config(context, key, Some(&loginparam.mail_user))
+        .ok();
+
+    let key = format!("{}mail_pw", prefix);
+    sql.set_config(context, key, Some(&loginparam.mail_pw)).ok();
+
+    let key = format!("{}send_server", prefix);
+    sql.set_config(context, key, Some(&loginparam.send_server))
+        .ok();
+
+    let key = format!("{}send_port", prefix);
+    sql.set_config_int(context, key, loginparam.send_port).ok();
+
+    let key = format!("{}send_user", prefix);
+    sql.set_config(context, key, Some(&loginparam.send_user))
+        .ok();
+
+    let key = format!("{}send_pw", prefix);
+    sql.set_config(context, key, Some(&loginparam.send_pw)).ok();
+
+    let key = format!("{}server_flags", prefix);
+    sql.set_config_int(context, key, loginparam.server_flags)
+        .ok();
+}
+
+fn unset_empty(s: &String) -> Cow<String> {
+    if s.is_empty() {
+        Cow::Owned("unset".to_string())
+    } else {
+        Cow::Borrowed(s)
+    }
+}
+
+pub fn dc_loginparam_get_readable(loginparam: &dc_loginparam_t) -> String {
+    let unset = "0";
+    let pw = "***";
+
+    let flags_readable = get_readable_flags(loginparam.server_flags);
+
+    format!(
+        "{} {}:{}:{}:{} {}:{}:{}:{} {}",
+        unset_empty(&loginparam.addr),
+        unset_empty(&loginparam.mail_user),
+        if !loginparam.mail_pw.is_empty() {
+            pw
+        } else {
+            unset
+        },
+        unset_empty(&loginparam.mail_server),
+        loginparam.mail_port,
+        unset_empty(&loginparam.send_user),
+        if !loginparam.send_pw.is_empty() {
+            pw
+        } else {
+            unset
+        },
+        unset_empty(&loginparam.send_server),
+        loginparam.send_port,
+        flags_readable,
+    )
+}
+
+fn get_readable_flags(flags: i32) -> String {
+    let mut res = String::new();
+    for bit in 0..31 {
+        if 0 != flags & 1 << bit {
+            let mut flag_added = 0;
+            if 1 << bit == 0x2 {
+                res += "OAUTH2 ";
+                flag_added = 1;
+            }
+            if 1 << bit == 0x4 {
+                res += "AUTH_NORMAL ";
+                flag_added = 1;
+            }
+            if 1 << bit == 0x100 {
+                res += "IMAP_STARTTLS ";
+                flag_added = 1;
+            }
+            if 1 << bit == 0x200 {
+                res += "IMAP_SSL ";
+                flag_added = 1;
+            }
+            if 1 << bit == 0x400 {
+                res += "IMAP_PLAIN ";
+                flag_added = 1;
+            }
+            if 1 << bit == 0x10000 {
+                res += "SMTP_STARTTLS ";
+                flag_added = 1
+            }
+            if 1 << bit == 0x20000 {
+                res += "SMTP_SSL ";
+                flag_added = 1
+            }
+            if 1 << bit == 0x40000 {
+                res += "SMTP_PLAIN ";
+                flag_added = 1
+            }
+            if 0 == flag_added {
+                res += &format!("{:#0x}", 1 << bit);
+            }
+        }
+    }
+    if res.is_empty() {
+        res += "0";
+    }
+
+    res
+}

src/dc_lot.rs

@@ -0,0 +1,181 @@
+use crate::contact::*;
+use crate::context::Context;
+use crate::dc_chat::*;
+use crate::dc_msg::*;
+use crate::dc_tools::*;
+use crate::stock::StockMessage;
+use crate::types::*;
+use crate::x::*;
+
+/* * Structure behind dc_lot_t */
+#[derive(Copy, Clone)]
+#[repr(C)]
+pub struct dc_lot_t {
+    pub text1_meaning: libc::c_int,
+    pub text1: *mut libc::c_char,
+    pub text2: *mut libc::c_char,
+    pub timestamp: i64,
+    pub state: libc::c_int,
+    pub id: uint32_t,
+    pub fingerprint: *mut libc::c_char,
+    pub invitenumber: *mut libc::c_char,
+    pub auth: *mut libc::c_char,
+}
+
+/* *
+ * @class dc_lot_t
+ *
+ * An object containing a set of values.
+ * The meaning of the values is defined by the function returning the object.
+ * Lot objects are created
+ * eg. by chatlist.get_summary() or dc_msg_get_summary().
+ *
+ * NB: _Lot_ is used in the meaning _heap_ here.
+ */
+pub unsafe fn dc_lot_new() -> *mut dc_lot_t {
+    let mut lot: *mut dc_lot_t;
+    lot = calloc(1, ::std::mem::size_of::<dc_lot_t>()) as *mut dc_lot_t;
+    assert!(!lot.is_null());
+
+    (*lot).text1_meaning = 0i32;
+
+    lot
+}
+
+pub unsafe fn dc_lot_empty(mut lot: *mut dc_lot_t) {
+    if lot.is_null() {
+        return;
+    }
+    free((*lot).text1 as *mut libc::c_void);
+    (*lot).text1 = 0 as *mut libc::c_char;
+    (*lot).text1_meaning = 0i32;
+    free((*lot).text2 as *mut libc::c_void);
+    (*lot).text2 = 0 as *mut libc::c_char;
+    free((*lot).fingerprint as *mut libc::c_void);
+    (*lot).fingerprint = 0 as *mut libc::c_char;
+    free((*lot).invitenumber as *mut libc::c_void);
+    (*lot).invitenumber = 0 as *mut libc::c_char;
+    free((*lot).auth as *mut libc::c_void);
+    (*lot).auth = 0 as *mut libc::c_char;
+    (*lot).timestamp = 0;
+    (*lot).state = 0i32;
+    (*lot).id = 0i32 as uint32_t;
+}
+
+pub unsafe fn dc_lot_unref(set: *mut dc_lot_t) {
+    if set.is_null() {
+        return;
+    }
+    dc_lot_empty(set);
+    free(set as *mut libc::c_void);
+}
+
+pub unsafe fn dc_lot_get_text1(lot: *const dc_lot_t) -> *mut libc::c_char {
+    if lot.is_null() {
+        return 0 as *mut libc::c_char;
+    }
+
+    dc_strdup_keep_null((*lot).text1)
+}
+
+pub unsafe fn dc_lot_get_text2(lot: *const dc_lot_t) -> *mut libc::c_char {
+    if lot.is_null() {
+        return 0 as *mut libc::c_char;
+    }
+
+    dc_strdup_keep_null((*lot).text2)
+}
+
+pub unsafe fn dc_lot_get_text1_meaning(lot: *const dc_lot_t) -> libc::c_int {
+    if lot.is_null() {
+        return 0i32;
+    }
+
+    (*lot).text1_meaning
+}
+
+pub unsafe fn dc_lot_get_state(lot: *const dc_lot_t) -> libc::c_int {
+    if lot.is_null() {
+        return 0i32;
+    }
+
+    (*lot).state
+}
+
+pub unsafe fn dc_lot_get_id(lot: *const dc_lot_t) -> uint32_t {
+    if lot.is_null() {
+        return 0i32 as uint32_t;
+    }
+
+    (*lot).id
+}
+
+pub unsafe fn dc_lot_get_timestamp(lot: *const dc_lot_t) -> i64 {
+    if lot.is_null() {
+        return 0;
+    }
+
+    (*lot).timestamp
+}
+
+/* library-internal */
+/* in practice, the user additionally cuts the string himself pixel-accurate */
+pub unsafe fn dc_lot_fill(
+    mut lot: *mut dc_lot_t,
+    msg: *mut dc_msg_t,
+    chat: *const Chat,
+    contact: Option<&Contact>,
+    context: &Context,
+) {
+    if lot.is_null() || msg.is_null() {
+        return;
+    }
+    if (*msg).state == 19i32 {
+        (*lot).text1 = context.stock_str(StockMessage::Draft).strdup();
+        (*lot).text1_meaning = 1i32
+    } else if (*msg).from_id == 1i32 as libc::c_uint {
+        if 0 != dc_msg_is_info(msg) || 0 != dc_chat_is_self_talk(chat) {
+            (*lot).text1 = 0 as *mut libc::c_char;
+            (*lot).text1_meaning = 0i32
+        } else {
+            (*lot).text1 = context.stock_str(StockMessage::SelfMsg).strdup();
+            (*lot).text1_meaning = 3i32
+        }
+    } else if chat.is_null() {
+        (*lot).text1 = 0 as *mut libc::c_char;
+        (*lot).text1_meaning = 0i32
+    } else if (*chat).type_0 == 120i32 || (*chat).type_0 == 130i32 {
+        if 0 != dc_msg_is_info(msg) || contact.is_none() {
+            (*lot).text1 = 0 as *mut libc::c_char;
+            (*lot).text1_meaning = 0i32
+        } else {
+            if !chat.is_null() && (*chat).id == 1i32 as libc::c_uint {
+                if let Some(contact) = contact {
+                    (*lot).text1 = contact.get_display_name().strdup();
+                } else {
+                    (*lot).text1 = std::ptr::null_mut();
+                }
+            } else {
+                if let Some(contact) = contact {
+                    (*lot).text1 = contact.get_first_name().strdup();
+                } else {
+                    (*lot).text1 = std::ptr::null_mut();
+                }
+            }
+            (*lot).text1_meaning = 2i32;
+        }
+    }
+
+    let message_text = (*msg).text.as_ref().unwrap();
+
+    (*lot).text2 = dc_msg_get_summarytext_by_raw(
+        (*msg).type_0,
+        message_text.strdup(),
+        &mut (*msg).param,
+        160,
+        context,
+    );
+
+    (*lot).timestamp = dc_msg_get_timestamp(msg);
+    (*lot).state = (*msg).state;
+}

src/dc_move.rs

@@ -0,0 +1,40 @@
+use crate::constants::*;
+use crate::context::*;
+use crate::dc_job::*;
+use crate::dc_msg::*;
+use crate::param::Params;
+
+pub unsafe fn dc_do_heuristics_moves(context: &Context, folder: &str, msg_id: u32) {
+    if context
+        .sql
+        .get_config_int(context, "mvbox_move")
+        .unwrap_or_else(|| 1)
+        == 0
+    {
+        return;
+    }
+
+    if !dc_is_inbox(context, folder) && !dc_is_sentbox(context, folder) {
+        return;
+    }
+
+    let msg = dc_msg_new_load(context, msg_id);
+    if dc_msg_is_setupmessage(msg) {
+        // do not move setup messages;
+        // there may be a non-delta device that wants to handle it
+        dc_msg_unref(msg);
+        return;
+    }
+
+    if dc_is_mvbox(context, folder) {
+        dc_update_msg_move_state(context, (*msg).rfc724_mid, MoveState::Stay);
+    }
+
+    // 1 = dc message, 2 = reply to dc message
+    if 0 != (*msg).is_dc_message {
+        dc_job_add(context, 200, (*msg).id as libc::c_int, Params::new(), 0);
+        dc_update_msg_move_state(context, (*msg).rfc724_mid, MoveState::Moving);
+    }
+
+    dc_msg_unref(msg);
+}

src/dc_qr.rs

@@ -0,0 +1,346 @@
+use percent_encoding::percent_decode_str;
+
+use crate::contact::*;
+use crate::context::Context;
+use crate::dc_chat::*;
+use crate::dc_lot::*;
+use crate::dc_strencode::*;
+use crate::dc_tools::*;
+use crate::key::*;
+use crate::param::*;
+use crate::peerstate::*;
+use crate::types::*;
+use crate::x::*;
+
+// out-of-band verification
+// id=contact
+// text1=groupname
+// id=contact
+// id=contact
+// test1=formatted fingerprint
+// id=contact
+// text1=text
+// text1=URL
+// text1=error string
+pub unsafe fn dc_check_qr(context: &Context, qr: *const libc::c_char) -> *mut dc_lot_t {
+    let mut current_block: u64;
+    let mut payload: *mut libc::c_char = 0 as *mut libc::c_char;
+    // must be normalized, if set
+    let mut addr: *mut libc::c_char = 0 as *mut libc::c_char;
+    // must be normalized, if set
+    let mut fingerprint: *mut libc::c_char = 0 as *mut libc::c_char;
+    let mut name: *mut libc::c_char = 0 as *mut libc::c_char;
+    let mut invitenumber: *mut libc::c_char = 0 as *mut libc::c_char;
+    let mut auth: *mut libc::c_char = 0 as *mut libc::c_char;
+    let mut qr_parsed: *mut dc_lot_t = dc_lot_new();
+    let mut chat_id: uint32_t = 0i32 as uint32_t;
+    let mut device_msg: *mut libc::c_char = 0 as *mut libc::c_char;
+    let mut grpid: *mut libc::c_char = 0 as *mut libc::c_char;
+    let mut grpname: *mut libc::c_char = 0 as *mut libc::c_char;
+    (*qr_parsed).state = 0i32;
+    if !qr.is_null() {
+        info!(context, 0, "Scanned QR code: {}", as_str(qr),);
+        /* split parameters from the qr code
+        ------------------------------------ */
+        if strncasecmp(
+            qr,
+            b"OPENPGP4FPR:\x00" as *const u8 as *const libc::c_char,
+            strlen(b"OPENPGP4FPR:\x00" as *const u8 as *const libc::c_char),
+        ) == 0i32
+        {
+            payload =
+                dc_strdup(&*qr.offset(strlen(
+                    b"OPENPGP4FPR:\x00" as *const u8 as *const libc::c_char,
+                ) as isize));
+            let mut fragment: *mut libc::c_char = strchr(payload, '#' as i32);
+            if !fragment.is_null() {
+                *fragment = 0i32 as libc::c_char;
+                fragment = fragment.offset(1isize);
+                let param: Params = as_str(fragment).parse().expect("invalid params");
+                addr = param
+                    .get(Param::Forwarded)
+                    .map(|s| s.strdup())
+                    .unwrap_or_else(|| std::ptr::null_mut());
+                if !addr.is_null() {
+                    if let Some(ref name_enc) = param.get(Param::SetLongitude) {
+                        let name_r = percent_decode_str(name_enc)
+                            .decode_utf8()
+                            .expect("invalid name");
+                        name = normalize_name(name_r).strdup();
+                    }
+                    invitenumber = param
+                        .get(Param::ProfileImage)
+                        .map(|s| s.strdup())
+                        .unwrap_or_else(|| std::ptr::null_mut());
+                    auth = param
+                        .get(Param::Auth)
+                        .map(|s| s.strdup())
+                        .unwrap_or_else(|| std::ptr::null_mut());
+                    grpid = param
+                        .get(Param::GroupId)
+                        .map(|s| s.strdup())
+                        .unwrap_or_else(|| std::ptr::null_mut());
+                    if !grpid.is_null() {
+                        if let Some(grpname_enc) = param.get(Param::GroupName) {
+                            let grpname_r = percent_decode_str(grpname_enc)
+                                .decode_utf8()
+                                .expect("invalid groupname");
+                            grpname = grpname_r.strdup();
+                        }
+                    }
+                }
+            }
+            fingerprint = dc_normalize_fingerprint_c(payload);
+            current_block = 5023038348526654800;
+        } else if strncasecmp(
+            qr,
+            b"mailto:\x00" as *const u8 as *const libc::c_char,
+            strlen(b"mailto:\x00" as *const u8 as *const libc::c_char),
+        ) == 0i32
+        {
+            payload = dc_strdup(
+                &*qr.offset(strlen(b"mailto:\x00" as *const u8 as *const libc::c_char) as isize),
+            );
+            let query: *mut libc::c_char = strchr(payload, '?' as i32);
+            if !query.is_null() {
+                *query = 0i32 as libc::c_char
+            }
+            addr = dc_strdup(payload);
+            current_block = 5023038348526654800;
+        } else if strncasecmp(
+            qr,
+            b"SMTP:\x00" as *const u8 as *const libc::c_char,
+            strlen(b"SMTP:\x00" as *const u8 as *const libc::c_char),
+        ) == 0i32
+        {
+            payload = dc_strdup(
+                &*qr.offset(strlen(b"SMTP:\x00" as *const u8 as *const libc::c_char) as isize),
+            );
+            let colon: *mut libc::c_char = strchr(payload, ':' as i32);
+            if !colon.is_null() {
+                *colon = 0i32 as libc::c_char
+            }
+            addr = dc_strdup(payload);
+            current_block = 5023038348526654800;
+        } else if strncasecmp(
+            qr,
+            b"MATMSG:\x00" as *const u8 as *const libc::c_char,
+            strlen(b"MATMSG:\x00" as *const u8 as *const libc::c_char),
+        ) == 0i32
+        {
+            /* scheme: `MATMSG:TO:addr...;SUB:subject...;BODY:body...;` - there may or may not be linebreaks after the fields */
+            /* does not work when the text `TO:` is used in subject/body _and_ TO: is not the first field. we ignore this case. */
+            let to: *mut libc::c_char = strstr(qr, b"TO:\x00" as *const u8 as *const libc::c_char);
+            if !to.is_null() {
+                addr = dc_strdup(&mut *to.offset(3isize));
+                let semicolon: *mut libc::c_char = strchr(addr, ';' as i32);
+                if !semicolon.is_null() {
+                    *semicolon = 0i32 as libc::c_char
+                }
+                current_block = 5023038348526654800;
+            } else {
+                (*qr_parsed).state = 400i32;
+                (*qr_parsed).text1 =
+                    dc_strdup(b"Bad e-mail address.\x00" as *const u8 as *const libc::c_char);
+                current_block = 16562876845594826114;
+            }
+        } else {
+            if strncasecmp(
+                qr,
+                b"BEGIN:VCARD\x00" as *const u8 as *const libc::c_char,
+                strlen(b"BEGIN:VCARD\x00" as *const u8 as *const libc::c_char),
+            ) == 0i32
+            {
+                let lines = dc_split_into_lines(qr);
+                for &key in &lines {
+                    dc_trim(key);
+                    let mut value: *mut libc::c_char = strchr(key, ':' as i32);
+                    if !value.is_null() {
+                        *value = 0i32 as libc::c_char;
+                        value = value.offset(1isize);
+                        let mut semicolon_0: *mut libc::c_char = strchr(key, ';' as i32);
+                        if !semicolon_0.is_null() {
+                            *semicolon_0 = 0i32 as libc::c_char
+                        }
+                        if strcasecmp(key, b"EMAIL\x00" as *const u8 as *const libc::c_char) == 0i32
+                        {
+                            semicolon_0 = strchr(value, ';' as i32);
+                            if !semicolon_0.is_null() {
+                                *semicolon_0 = 0i32 as libc::c_char
+                            }
+                            addr = dc_strdup(value)
+                        } else if strcasecmp(key, b"N\x00" as *const u8 as *const libc::c_char)
+                            == 0i32
+                        {
+                            semicolon_0 = strchr(value, ';' as i32);
+                            if !semicolon_0.is_null() {
+                                semicolon_0 = strchr(semicolon_0.offset(1isize), ';' as i32);
+                                if !semicolon_0.is_null() {
+                                    *semicolon_0 = 0i32 as libc::c_char
+                                }
+                            }
+                            name = dc_strdup(value);
+                            dc_str_replace(
+                                &mut name,
+                                b";\x00" as *const u8 as *const libc::c_char,
+                                b",\x00" as *const u8 as *const libc::c_char,
+                            );
+                            name = normalize_name(as_str(name)).strdup();
+                        }
+                    }
+                }
+                dc_free_splitted_lines(lines);
+            }
+            current_block = 5023038348526654800;
+        }
+        match current_block {
+            16562876845594826114 => {}
+            _ => {
+                /* check the parameters
+                ---------------------- */
+                if !addr.is_null() {
+                    /* urldecoding is needed at least for OPENPGP4FPR but should not hurt in the other cases */
+                    let mut temp: *mut libc::c_char = dc_urldecode(addr);
+                    free(addr as *mut libc::c_void);
+                    addr = temp;
+                    temp = addr_normalize(as_str(addr)).strdup();
+                    free(addr as *mut libc::c_void);
+                    addr = temp;
+                    if !may_be_valid_addr(as_str(addr)) {
+                        (*qr_parsed).state = 400i32;
+                        (*qr_parsed).text1 = dc_strdup(
+                            b"Bad e-mail address.\x00" as *const u8 as *const libc::c_char,
+                        );
+                        current_block = 16562876845594826114;
+                    } else {
+                        current_block = 14116432890150942211;
+                    }
+                } else {
+                    current_block = 14116432890150942211;
+                }
+                match current_block {
+                    16562876845594826114 => {}
+                    _ => {
+                        if !fingerprint.is_null() {
+                            if strlen(fingerprint) != 40 {
+                                (*qr_parsed).state = 400i32;
+                                (*qr_parsed).text1 = dc_strdup(
+                                    b"Bad fingerprint length in QR code.\x00" as *const u8
+                                        as *const libc::c_char,
+                                );
+                                current_block = 16562876845594826114;
+                            } else {
+                                current_block = 5409161009579131794;
+                            }
+                        } else {
+                            current_block = 5409161009579131794;
+                        }
+                        match current_block {
+                            16562876845594826114 => {}
+                            _ => {
+                                if !fingerprint.is_null() {
+                                    let peerstate = Peerstate::from_fingerprint(
+                                        context,
+                                        &context.sql,
+                                        as_str(fingerprint),
+                                    );
+                                    if addr.is_null() || invitenumber.is_null() || auth.is_null() {
+                                        if let Some(peerstate) = peerstate {
+                                            (*qr_parsed).state = 210i32;
+                                            let addr = peerstate
+                                                .addr
+                                                .as_ref()
+                                                .map(|s| s.as_str())
+                                                .unwrap_or_else(|| "");
+                                            (*qr_parsed).id = Contact::add_or_lookup(
+                                                context,
+                                                "",
+                                                addr,
+                                                Origin::UnhandledQrScan,
+                                            )
+                                            .map(|(id, _)| id)
+                                            .unwrap_or_default();
+                                            dc_create_or_lookup_nchat_by_contact_id(
+                                                context,
+                                                (*qr_parsed).id,
+                                                2i32,
+                                                &mut chat_id,
+                                                0 as *mut libc::c_int,
+                                            );
+                                            device_msg = dc_mprintf(
+                                                b"%s verified.\x00" as *const u8
+                                                    as *const libc::c_char,
+                                                peerstate.addr,
+                                            )
+                                        } else {
+                                            (*qr_parsed).text1 =
+                                                dc_format_fingerprint_c(fingerprint);
+                                            (*qr_parsed).state = 230i32
+                                        }
+                                    } else {
+                                        if !grpid.is_null() && !grpname.is_null() {
+                                            (*qr_parsed).state = 202i32;
+                                            (*qr_parsed).text1 = dc_strdup(grpname);
+                                            (*qr_parsed).text2 = dc_strdup(grpid)
+                                        } else {
+                                            (*qr_parsed).state = 200i32
+                                        }
+                                        (*qr_parsed).id = Contact::add_or_lookup(
+                                            context,
+                                            as_str(name),
+                                            as_str(addr),
+                                            Origin::UnhandledQrScan,
+                                        )
+                                        .map(|(id, _)| id)
+                                        .unwrap_or_default();
+                                        (*qr_parsed).fingerprint = dc_strdup(fingerprint);
+                                        (*qr_parsed).invitenumber = dc_strdup(invitenumber);
+                                        (*qr_parsed).auth = dc_strdup(auth)
+                                    }
+                                } else if !addr.is_null() {
+                                    (*qr_parsed).state = 320i32;
+                                    (*qr_parsed).id = Contact::add_or_lookup(
+                                        context,
+                                        as_str(name),
+                                        as_str(addr),
+                                        Origin::UnhandledQrScan,
+                                    )
+                                    .map(|(id, _)| id)
+                                    .unwrap_or_default();
+                                } else if strstr(
+                                    qr,
+                                    b"http://\x00" as *const u8 as *const libc::c_char,
+                                ) == qr as *mut libc::c_char
+                                    || strstr(
+                                        qr,
+                                        b"https://\x00" as *const u8 as *const libc::c_char,
+                                    ) == qr as *mut libc::c_char
+                                {
+                                    (*qr_parsed).state = 332i32;
+                                    (*qr_parsed).text1 = dc_strdup(qr)
+                                } else {
+                                    (*qr_parsed).state = 330i32;
+                                    (*qr_parsed).text1 = dc_strdup(qr)
+                                }
+                                if !device_msg.is_null() {
+                                    dc_add_device_msg(context, chat_id, device_msg);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    free(addr as *mut libc::c_void);
+    free(fingerprint as *mut libc::c_void);
+    free(payload as *mut libc::c_void);
+    free(name as *mut libc::c_void);
+    free(invitenumber as *mut libc::c_void);
+    free(auth as *mut libc::c_void);
+    free(device_msg as *mut libc::c_void);
+    free(grpname as *mut libc::c_void);
+    free(grpid as *mut libc::c_void);
+
+    qr_parsed
+}

src/dc_securejoin.rs

@@ -0,0 +1,962 @@
+use std::ffi::CString;
+
+use mmime::mailimf_types::*;
+use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC};
+
+use crate::aheader::EncryptPreference;
+use crate::constants::*;
+use crate::contact::*;
+use crate::context::Context;
+use crate::dc_chat::*;
+use crate::dc_configure::*;
+use crate::dc_e2ee::*;
+use crate::dc_lot::*;
+use crate::dc_mimeparser::*;
+use crate::dc_msg::*;
+use crate::dc_qr::*;
+use crate::dc_strencode::*;
+use crate::dc_token::*;
+use crate::dc_tools::*;
+use crate::key::*;
+use crate::param::*;
+use crate::peerstate::*;
+use crate::stock::StockMessage;
+use crate::types::*;
+use crate::x::*;
+
+pub unsafe fn dc_get_securejoin_qr(
+    context: &Context,
+    group_chat_id: uint32_t,
+) -> *mut libc::c_char {
+    /* =========================================================
+    ====             Alice - the inviter side            ====
+    ====   Step 1 in "Setup verified contact" protocol   ====
+    ========================================================= */
+
+    let mut fingerprint = 0 as *mut libc::c_char;
+    let mut invitenumber: *mut libc::c_char;
+    let mut auth: *mut libc::c_char;
+    let mut chat = 0 as *mut Chat;
+    let mut group_name = 0 as *mut libc::c_char;
+    let mut group_name_urlencoded = 0 as *mut libc::c_char;
+    let mut qr: Option<String> = None;
+
+    dc_ensure_secret_key_exists(context).ok();
+    invitenumber = dc_token_lookup(context, DC_TOKEN_INVITENUMBER, group_chat_id);
+    if invitenumber.is_null() {
+        invitenumber = dc_create_id().strdup();
+        dc_token_save(context, DC_TOKEN_INVITENUMBER, group_chat_id, invitenumber);
+    }
+    auth = dc_token_lookup(context, DC_TOKEN_AUTH, group_chat_id);
+    if auth.is_null() {
+        auth = dc_create_id().strdup();
+        dc_token_save(context, DC_TOKEN_AUTH, group_chat_id, auth);
+    }
+    let self_addr = context.sql.get_config(context, "configured_addr");
+
+    let cleanup = |fingerprint, chat, group_name, group_name_urlencoded| {
+        free(fingerprint as *mut libc::c_void);
+        free(invitenumber as *mut libc::c_void);
+        free(auth as *mut libc::c_void);
+        dc_chat_unref(chat);
+        free(group_name as *mut libc::c_void);
+        free(group_name_urlencoded 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, chat, group_name, group_name_urlencoded);
+    }
+
+    let self_addr = self_addr.unwrap();
+    let self_name = context
+        .sql
+        .get_config(context, "displayname")
+        .unwrap_or_default();
+
+    fingerprint = get_self_fingerprint(context);
+
+    if fingerprint.is_null() {
+        return cleanup(fingerprint, chat, group_name, group_name_urlencoded);
+    }
+
+    let self_addr_urlencoded = utf8_percent_encode(&self_addr, NON_ALPHANUMERIC).to_string();
+    let self_name_urlencoded = utf8_percent_encode(&self_name, NON_ALPHANUMERIC).to_string();
+
+    qr = if 0 != group_chat_id {
+        chat = dc_get_chat(context, group_chat_id);
+        if chat.is_null() {
+            error!(
+                context,
+                0, "Cannot get QR-code for chat-id {}", group_chat_id,
+            );
+            return cleanup(fingerprint, chat, group_name, group_name_urlencoded);
+        }
+
+        group_name = dc_chat_get_name(chat);
+        group_name_urlencoded = dc_urlencode(group_name);
+
+        Some(format!(
+            "OPENPGP4FPR:{}#a={}&g={}&x={}&i={}&s={}",
+            as_str(fingerprint),
+            self_addr_urlencoded,
+            as_str(group_name_urlencoded),
+            as_str((*chat).grpid),
+            as_str(invitenumber),
+            as_str(auth),
+        ))
+    } else {
+        Some(format!(
+            "OPENPGP4FPR:{}#a={}&n={}&i={}&s={}",
+            as_str(fingerprint),
+            self_addr_urlencoded,
+            self_name_urlencoded,
+            as_str(invitenumber),
+            as_str(auth),
+        ))
+    };
+
+    info!(context, 0, "Generated QR code: {}", qr.as_ref().unwrap());
+
+    cleanup(fingerprint, chat, group_name, group_name_urlencoded)
+}
+
+fn get_self_fingerprint(context: &Context) -> *mut libc::c_char {
+    if let Some(self_addr) = context.sql.get_config(context, "configured_addr") {
+        if let Some(key) = Key::from_self_public(context, self_addr, &context.sql) {
+            return key.fingerprint_c();
+        }
+    }
+
+    std::ptr::null_mut()
+}
+
+pub unsafe fn dc_join_securejoin(context: &Context, qr: *const libc::c_char) -> uint32_t {
+    /* ==========================================================
+    ====             Bob - the joiner's side             =====
+    ====   Step 2 in "Setup verified contact" protocol   =====
+    ========================================================== */
+    let mut ret_chat_id: libc::c_int = 0i32;
+    let ongoing_allocated: libc::c_int;
+    let mut contact_chat_id: uint32_t = 0i32 as uint32_t;
+    let mut join_vg: libc::c_int = 0i32;
+    let mut qr_scan: *mut dc_lot_t = 0 as *mut dc_lot_t;
+    info!(context, 0, "Requesting secure-join ...",);
+    dc_ensure_secret_key_exists(context).ok();
+    ongoing_allocated = dc_alloc_ongoing(context);
+    if !(ongoing_allocated == 0i32) {
+        qr_scan = dc_check_qr(context, qr);
+        if qr_scan.is_null() || (*qr_scan).state != 200i32 && (*qr_scan).state != 202i32 {
+            error!(context, 0, "Unknown QR code.",);
+        } else {
+            contact_chat_id = dc_create_chat_by_contact_id(context, (*qr_scan).id);
+            if contact_chat_id == 0i32 as libc::c_uint {
+                error!(context, 0, "Unknown contact.",);
+            } else if !(context
+                .running_state
+                .clone()
+                .read()
+                .unwrap()
+                .shall_stop_ongoing)
+            {
+                join_vg = ((*qr_scan).state == 202i32) as libc::c_int;
+                {
+                    let bob_a = context.bob.clone();
+                    let mut bob = bob_a.write().unwrap();
+                    bob.status = 0;
+                    bob.qr_scan = qr_scan;
+                }
+                if 0 != fingerprint_equals_sender(context, (*qr_scan).fingerprint, contact_chat_id)
+                {
+                    info!(context, 0, "Taking protocol shortcut.");
+                    context.bob.clone().write().unwrap().expects = 6;
+                    context.call_cb(
+                        Event::SECUREJOIN_JOINER_PROGRESS,
+                        chat_id_2_contact_id(context, contact_chat_id) as uintptr_t,
+                        400i32 as uintptr_t,
+                    );
+                    let own_fingerprint: *mut libc::c_char = get_self_fingerprint(context);
+                    send_handshake_msg(
+                        context,
+                        contact_chat_id,
+                        if 0 != join_vg {
+                            b"vg-request-with-auth\x00" as *const u8 as *const libc::c_char
+                        } else {
+                            b"vc-request-with-auth\x00" as *const u8 as *const libc::c_char
+                        },
+                        (*qr_scan).auth,
+                        own_fingerprint,
+                        if 0 != join_vg {
+                            (*qr_scan).text2
+                        } else {
+                            0 as *mut libc::c_char
+                        },
+                    );
+                    free(own_fingerprint as *mut libc::c_void);
+                } else {
+                    context.bob.clone().write().unwrap().expects = 2;
+                    send_handshake_msg(
+                        context,
+                        contact_chat_id,
+                        if 0 != join_vg {
+                            b"vg-request\x00" as *const u8 as *const libc::c_char
+                        } else {
+                            b"vc-request\x00" as *const u8 as *const libc::c_char
+                        },
+                        (*qr_scan).invitenumber,
+                        0 as *const libc::c_char,
+                        0 as *const libc::c_char,
+                    );
+                }
+
+                // Bob -> Alice
+                while !(context
+                    .running_state
+                    .clone()
+                    .read()
+                    .unwrap()
+                    .shall_stop_ongoing)
+                {
+                    std::thread::sleep(std::time::Duration::new(0, 3_000_000));
+                }
+            }
+        }
+    }
+    let bob_a = context.bob.clone();
+    let mut bob = bob_a.write().unwrap();
+
+    bob.expects = 0;
+    if bob.status == 1 {
+        if 0 != join_vg {
+            ret_chat_id = dc_get_chat_id_by_grpid(
+                context,
+                (*qr_scan).text2,
+                0 as *mut libc::c_int,
+                0 as *mut libc::c_int,
+            ) as libc::c_int
+        } else {
+            ret_chat_id = contact_chat_id as libc::c_int
+        }
+    }
+    bob.qr_scan = std::ptr::null_mut();
+
+    dc_lot_unref(qr_scan);
+    if 0 != ongoing_allocated {
+        dc_free_ongoing(context);
+    }
+    ret_chat_id as uint32_t
+}
+
+unsafe fn send_handshake_msg(
+    context: &Context,
+    contact_chat_id: uint32_t,
+    step: *const libc::c_char,
+    param2: *const libc::c_char,
+    fingerprint: *const libc::c_char,
+    grpid: *const libc::c_char,
+) {
+    let mut msg: *mut dc_msg_t = dc_msg_new_untyped(context);
+    (*msg).type_0 = Viewtype::Text;
+    (*msg).text = Some(format!("Secure-Join: {}", to_string(step)));
+    (*msg).hidden = 1;
+    (*msg).param.set_int(Param::Cmd, 7);
+    if step.is_null() {
+        (*msg).param.remove(Param::Arg);
+    } else {
+        (*msg).param.set(Param::Arg, as_str(step));
+    }
+    if !param2.is_null() {
+        (*msg).param.set(Param::Arg2, as_str(param2));
+    }
+    if !fingerprint.is_null() {
+        (*msg).param.set(Param::Arg3, as_str(fingerprint));
+    }
+    if !grpid.is_null() {
+        (*msg).param.set(Param::Arg4, as_str(grpid));
+    }
+    if strcmp(step, b"vg-request\x00" as *const u8 as *const libc::c_char) == 0i32
+        || strcmp(step, b"vc-request\x00" as *const u8 as *const libc::c_char) == 0i32
+    {
+        (*msg).param.set_int(
+            Param::ForcePlaintext,
+            ForcePlaintext::AddAutocryptHeader as i32,
+        );
+    } else {
+        (*msg).param.set_int(Param::GuranteeE2ee, 1);
+    }
+    dc_send_msg(context, contact_chat_id, msg);
+    dc_msg_unref(msg);
+}
+
+unsafe fn chat_id_2_contact_id(context: &Context, contact_chat_id: uint32_t) -> uint32_t {
+    let contacts = dc_get_chat_contacts(context, contact_chat_id);
+    if contacts.len() == 1 {
+        contacts[0]
+    } else {
+        0
+    }
+}
+
+unsafe fn fingerprint_equals_sender(
+    context: &Context,
+    fingerprint: *const libc::c_char,
+    contact_chat_id: uint32_t,
+) -> libc::c_int {
+    if fingerprint.is_null() {
+        return 0;
+    }
+    let mut fingerprint_equal: libc::c_int = 0i32;
+    let contacts = dc_get_chat_contacts(context, contact_chat_id);
+
+    if contacts.len() == 1 {
+        if let Ok(contact) = Contact::load_from_db(context, contacts[0]) {
+            if let Some(peerstate) = Peerstate::from_addr(context, &context.sql, contact.get_addr())
+            {
+                let fingerprint_normalized = dc_normalize_fingerprint(as_str(fingerprint));
+                if peerstate.public_key_fingerprint.is_some()
+                    && &fingerprint_normalized == peerstate.public_key_fingerprint.as_ref().unwrap()
+                {
+                    fingerprint_equal = 1;
+                }
+            }
+        } else {
+            return 0;
+        }
+    }
+
+    fingerprint_equal
+}
+
+/* library private: secure-join */
+pub unsafe fn dc_handle_securejoin_handshake(
+    context: &Context,
+    mimeparser: &dc_mimeparser_t,
+    contact_id: uint32_t,
+) -> libc::c_int {
+    let mut current_block: u64;
+    let step: *const libc::c_char;
+    let join_vg: libc::c_int;
+    let mut scanned_fingerprint_of_alice: *mut libc::c_char = 0 as *mut libc::c_char;
+    let mut auth: *mut libc::c_char = 0 as *mut libc::c_char;
+    let mut own_fingerprint: *mut libc::c_char = 0 as *mut libc::c_char;
+    let mut contact_chat_id: uint32_t = 0i32 as uint32_t;
+    let mut contact_chat_id_blocked: libc::c_int = 0i32;
+    let mut grpid: *mut libc::c_char = 0 as *mut libc::c_char;
+    let mut ret: libc::c_int = 0i32;
+
+    if !(contact_id <= 9i32 as libc::c_uint) {
+        step = lookup_field(mimeparser, "Secure-Join");
+        if !step.is_null() {
+            info!(
+                context,
+                0,
+                ">>>>>>>>>>>>>>>>>>>>>>>>> secure-join message \'{}\' received",
+                as_str(step),
+            );
+            join_vg = (strncmp(step, b"vg-\x00" as *const u8 as *const libc::c_char, 3) == 0)
+                as libc::c_int;
+            dc_create_or_lookup_nchat_by_contact_id(
+                context,
+                contact_id,
+                0i32,
+                &mut contact_chat_id,
+                &mut contact_chat_id_blocked,
+            );
+            if 0 != contact_chat_id_blocked {
+                dc_unblock_chat(context, contact_chat_id);
+            }
+            ret = 0x2i32;
+            if strcmp(step, b"vg-request\x00" as *const u8 as *const libc::c_char) == 0i32
+                || strcmp(step, b"vc-request\x00" as *const u8 as *const libc::c_char) == 0i32
+            {
+                /* =========================================================
+                ====             Alice - the inviter side            ====
+                ====   Step 3 in "Setup verified contact" protocol   ====
+                ========================================================= */
+                // this message may be unencrypted (Bob, the joinder and the sender, might not have Alice's key yet)
+                // it just ensures, we have Bobs key now. If we do _not_ have the key because eg. MitM has removed it,
+                // send_message() will fail with the error "End-to-end-encryption unavailable unexpectedly.", so, there is no additional check needed here.
+                // verify that the `Secure-Join-Invitenumber:`-header matches invitenumber written to the QR code
+                let invitenumber: *const libc::c_char;
+                invitenumber = lookup_field(mimeparser, "Secure-Join-Invitenumber");
+                if invitenumber.is_null() {
+                    warn!(context, 0, "Secure-join denied (invitenumber missing).",);
+                    current_block = 4378276786830486580;
+                } else if !dc_token_exists(context, DC_TOKEN_INVITENUMBER, invitenumber) {
+                    warn!(context, 0, "Secure-join denied (bad invitenumber).",);
+                    current_block = 4378276786830486580;
+                } else {
+                    info!(context, 0, "Secure-join requested.",);
+
+                    context.call_cb(
+                        Event::SECUREJOIN_INVITER_PROGRESS,
+                        contact_id as uintptr_t,
+                        300i32 as uintptr_t,
+                    );
+                    send_handshake_msg(
+                        context,
+                        contact_chat_id,
+                        if 0 != join_vg {
+                            b"vg-auth-required\x00" as *const u8 as *const libc::c_char
+                        } else {
+                            b"vc-auth-required\x00" as *const u8 as *const libc::c_char
+                        },
+                        0 as *const libc::c_char,
+                        0 as *const libc::c_char,
+                        0 as *const libc::c_char,
+                    );
+                    current_block = 10256747982273457880;
+                }
+            } else if strcmp(
+                step,
+                b"vg-auth-required\x00" as *const u8 as *const libc::c_char,
+            ) == 0i32
+                || strcmp(
+                    step,
+                    b"vc-auth-required\x00" as *const u8 as *const libc::c_char,
+                ) == 0i32
+            {
+                let cond = {
+                    let bob_a = context.bob.clone();
+                    let bob = bob_a.read().unwrap();
+                    let scan = bob.qr_scan;
+                    scan.is_null() || bob.expects != 2 || 0 != join_vg && (*scan).state != 202
+                };
+
+                if cond {
+                    warn!(context, 0, "auth-required message out of sync.",);
+                    // no error, just aborted somehow or a mail from another handshake
+                    current_block = 4378276786830486580;
+                } else {
+                    {
+                        let scan = context.bob.clone().read().unwrap().qr_scan;
+                        scanned_fingerprint_of_alice = dc_strdup((*scan).fingerprint);
+                        auth = dc_strdup((*scan).auth);
+                        if 0 != join_vg {
+                            grpid = dc_strdup((*scan).text2)
+                        }
+                    }
+                    if 0 == encrypted_and_signed(mimeparser, scanned_fingerprint_of_alice) {
+                        could_not_establish_secure_connection(
+                            context,
+                            contact_chat_id,
+                            if 0 != mimeparser.e2ee_helper.encrypted {
+                                b"No valid signature.\x00" as *const u8 as *const libc::c_char
+                            } else {
+                                b"Not encrypted.\x00" as *const u8 as *const libc::c_char
+                            },
+                        );
+                        end_bobs_joining(context, 0i32);
+                        current_block = 4378276786830486580;
+                    } else if 0
+                        == fingerprint_equals_sender(
+                            context,
+                            scanned_fingerprint_of_alice,
+                            contact_chat_id,
+                        )
+                    {
+                        could_not_establish_secure_connection(
+                            context,
+                            contact_chat_id,
+                            b"Fingerprint mismatch on joiner-side.\x00" as *const u8
+                                as *const libc::c_char,
+                        );
+                        end_bobs_joining(context, 0i32);
+                        current_block = 4378276786830486580;
+                    } else {
+                        info!(context, 0, "Fingerprint verified.",);
+                        own_fingerprint = get_self_fingerprint(context);
+                        context.call_cb(
+                            Event::SECUREJOIN_JOINER_PROGRESS,
+                            contact_id as uintptr_t,
+                            400i32 as uintptr_t,
+                        );
+                        context.bob.clone().write().unwrap().expects = 6;
+
+                        send_handshake_msg(
+                            context,
+                            contact_chat_id,
+                            if 0 != join_vg {
+                                b"vg-request-with-auth\x00" as *const u8 as *const libc::c_char
+                            } else {
+                                b"vc-request-with-auth\x00" as *const u8 as *const libc::c_char
+                            },
+                            auth,
+                            own_fingerprint,
+                            grpid,
+                        );
+                        current_block = 10256747982273457880;
+                    }
+                }
+            } else if strcmp(
+                step,
+                b"vg-request-with-auth\x00" as *const u8 as *const libc::c_char,
+            ) == 0i32
+                || strcmp(
+                    step,
+                    b"vc-request-with-auth\x00" as *const u8 as *const libc::c_char,
+                ) == 0i32
+            {
+                /* ============================================================
+                ====              Alice - the inviter side              ====
+                ====   Steps 5+6 in "Setup verified contact" protocol   ====
+                ====  Step 6 in "Out-of-band verified groups" protocol  ====
+                ============================================================ */
+                // verify that Secure-Join-Fingerprint:-header matches the fingerprint of Bob
+                let fingerprint: *const libc::c_char;
+                fingerprint = lookup_field(mimeparser, "Secure-Join-Fingerprint");
+                if fingerprint.is_null() {
+                    could_not_establish_secure_connection(
+                        context,
+                        contact_chat_id,
+                        b"Fingerprint not provided.\x00" as *const u8 as *const libc::c_char,
+                    );
+                    current_block = 4378276786830486580;
+                } else if 0 == encrypted_and_signed(mimeparser, fingerprint) {
+                    could_not_establish_secure_connection(
+                        context,
+                        contact_chat_id,
+                        b"Auth not encrypted.\x00" as *const u8 as *const libc::c_char,
+                    );
+                    current_block = 4378276786830486580;
+                } else if 0 == fingerprint_equals_sender(context, fingerprint, contact_chat_id) {
+                    could_not_establish_secure_connection(
+                        context,
+                        contact_chat_id,
+                        b"Fingerprint mismatch on inviter-side.\x00" as *const u8
+                            as *const libc::c_char,
+                    );
+                    current_block = 4378276786830486580;
+                } else {
+                    info!(context, 0, "Fingerprint verified.",);
+                    // verify that the `Secure-Join-Auth:`-header matches the secret written to the QR code
+                    let auth_0: *const libc::c_char;
+                    auth_0 = lookup_field(mimeparser, "Secure-Join-Auth");
+                    if auth_0.is_null() {
+                        could_not_establish_secure_connection(
+                            context,
+                            contact_chat_id,
+                            b"Auth not provided.\x00" as *const u8 as *const libc::c_char,
+                        );
+                        current_block = 4378276786830486580;
+                    } else if !dc_token_exists(context, DC_TOKEN_AUTH, auth_0) {
+                        could_not_establish_secure_connection(
+                            context,
+                            contact_chat_id,
+                            b"Auth invalid.\x00" as *const u8 as *const libc::c_char,
+                        );
+                        current_block = 4378276786830486580;
+                    } else if 0 == mark_peer_as_verified(context, fingerprint) {
+                        could_not_establish_secure_connection(
+                            context,
+                            contact_chat_id,
+                            b"Fingerprint mismatch on inviter-side.\x00" as *const u8
+                                as *const libc::c_char,
+                        );
+                        current_block = 4378276786830486580;
+                    } else {
+                        Contact::scaleup_origin_by_id(
+                            context,
+                            contact_id,
+                            Origin::SecurejoinInvited,
+                        );
+                        info!(context, 0, "Auth verified.",);
+                        secure_connection_established(context, contact_chat_id);
+                        context.call_cb(
+                            Event::CONTACTS_CHANGED,
+                            contact_id as uintptr_t,
+                            0i32 as uintptr_t,
+                        );
+                        context.call_cb(
+                            Event::SECUREJOIN_INVITER_PROGRESS,
+                            contact_id as uintptr_t,
+                            600i32 as uintptr_t,
+                        );
+                        if 0 != join_vg {
+                            grpid = dc_strdup(lookup_field(mimeparser, "Secure-Join-Group"));
+                            let group_chat_id: uint32_t = dc_get_chat_id_by_grpid(
+                                context,
+                                grpid,
+                                0 as *mut libc::c_int,
+                                0 as *mut libc::c_int,
+                            );
+                            if group_chat_id == 0i32 as libc::c_uint {
+                                error!(context, 0, "Chat {} not found.", as_str(grpid),);
+                                current_block = 4378276786830486580;
+                            } else {
+                                dc_add_contact_to_chat_ex(
+                                    context,
+                                    group_chat_id,
+                                    contact_id,
+                                    0x1i32,
+                                );
+                                current_block = 10256747982273457880;
+                            }
+                        } else {
+                            send_handshake_msg(
+                                context,
+                                contact_chat_id,
+                                b"vc-contact-confirm\x00" as *const u8 as *const libc::c_char,
+                                0 as *const libc::c_char,
+                                0 as *const libc::c_char,
+                                0 as *const libc::c_char,
+                            );
+                            context.call_cb(
+                                Event::SECUREJOIN_INVITER_PROGRESS,
+                                contact_id as uintptr_t,
+                                1000i32 as uintptr_t,
+                            );
+                            current_block = 10256747982273457880;
+                        }
+                    }
+                }
+            } else if strcmp(
+                step,
+                b"vg-member-added\x00" as *const u8 as *const libc::c_char,
+            ) == 0i32
+                || strcmp(
+                    step,
+                    b"vc-contact-confirm\x00" as *const u8 as *const libc::c_char,
+                ) == 0i32
+            {
+                if 0 != join_vg {
+                    ret = 0x1i32
+                }
+                if context.bob.clone().read().unwrap().expects != 6 {
+                    info!(context, 0, "Message belongs to a different handshake.",);
+                    current_block = 4378276786830486580;
+                } else {
+                    let cond = {
+                        let scan = context.bob.clone().read().unwrap().qr_scan;
+                        scan.is_null() || 0 != join_vg && (*scan).state != 202
+                    };
+                    if cond {
+                        warn!(
+                            context,
+                            0, "Message out of sync or belongs to a different handshake.",
+                        );
+                        current_block = 4378276786830486580;
+                    } else {
+                        {
+                            let scan = context.bob.clone().read().unwrap().qr_scan;
+                            scanned_fingerprint_of_alice = dc_strdup((*scan).fingerprint);
+                            if 0 != join_vg {
+                                grpid = dc_strdup((*scan).text2)
+                            }
+                        }
+                        let mut vg_expect_encrypted: libc::c_int = 1i32;
+                        if 0 != join_vg {
+                            let mut is_verified_group: libc::c_int = 0i32;
+                            dc_get_chat_id_by_grpid(
+                                context,
+                                grpid,
+                                0 as *mut libc::c_int,
+                                &mut is_verified_group,
+                            );
+                            if 0 == is_verified_group {
+                                vg_expect_encrypted = 0i32
+                            }
+                        }
+                        if 0 != vg_expect_encrypted {
+                            if 0 == encrypted_and_signed(mimeparser, scanned_fingerprint_of_alice) {
+                                could_not_establish_secure_connection(
+                                    context,
+                                    contact_chat_id,
+                                    b"Contact confirm message not encrypted.\x00" as *const u8
+                                        as *const libc::c_char,
+                                );
+                                end_bobs_joining(context, 0i32);
+                                current_block = 4378276786830486580;
+                            } else {
+                                current_block = 5195798230510548452;
+                            }
+                        } else {
+                            current_block = 5195798230510548452;
+                        }
+                        match current_block {
+                            4378276786830486580 => {}
+                            _ => {
+                                if 0 == mark_peer_as_verified(context, scanned_fingerprint_of_alice)
+                                {
+                                    could_not_establish_secure_connection(
+                                        context,
+                                        contact_chat_id,
+                                        b"Fingerprint mismatch on joiner-side.\x00" as *const u8
+                                            as *const libc::c_char,
+                                    );
+                                    current_block = 4378276786830486580;
+                                } else {
+                                    Contact::scaleup_origin_by_id(
+                                        context,
+                                        contact_id,
+                                        Origin::SecurejoinJoined,
+                                    );
+                                    context.call_cb(
+                                        Event::CONTACTS_CHANGED,
+                                        0i32 as uintptr_t,
+                                        0i32 as uintptr_t,
+                                    );
+                                    if 0 != join_vg {
+                                        if !addr_equals_self(
+                                            context,
+                                            as_str(lookup_field(
+                                                mimeparser,
+                                                "Chat-Group-Member-Added",
+                                            )),
+                                        ) {
+                                            info!(
+                                                context,
+                                                0,
+                                                "Message belongs to a different handshake (scaled up contact anyway to allow creation of group)."
+                                            );
+                                            current_block = 4378276786830486580;
+                                        } else {
+                                            current_block = 9180031981464905198;
+                                        }
+                                    } else {
+                                        current_block = 9180031981464905198;
+                                    }
+                                    match current_block {
+                                        4378276786830486580 => {}
+                                        _ => {
+                                            secure_connection_established(context, contact_chat_id);
+                                            context.bob.clone().write().unwrap().expects = 0;
+                                            if 0 != join_vg {
+                                                send_handshake_msg(
+                                                    context,
+                                                    contact_chat_id,
+                                                    b"vg-member-added-received\x00" as *const u8
+                                                        as *const libc::c_char,
+                                                    0 as *const libc::c_char,
+                                                    0 as *const libc::c_char,
+                                                    0 as *const libc::c_char,
+                                                );
+                                            }
+                                            end_bobs_joining(context, 1i32);
+                                            current_block = 10256747982273457880;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            } else if strcmp(
+                step,
+                b"vg-member-added-received\x00" as *const u8 as *const libc::c_char,
+            ) == 0i32
+            {
+                /* ============================================================
+                ====              Alice - the inviter side              ====
+                ====  Step 8 in "Out-of-band verified groups" protocol  ====
+                ============================================================ */
+                if let Ok(contact) = Contact::get_by_id(context, contact_id) {
+                    if contact.is_verified() == VerifiedStatus::Unverified {
+                        warn!(context, 0, "vg-member-added-received invalid.",);
+                        current_block = 4378276786830486580;
+                    } else {
+                        context.call_cb(
+                            Event::SECUREJOIN_INVITER_PROGRESS,
+                            contact_id as uintptr_t,
+                            800i32 as uintptr_t,
+                        );
+                        context.call_cb(
+                            Event::SECUREJOIN_INVITER_PROGRESS,
+                            contact_id as uintptr_t,
+                            1000i32 as uintptr_t,
+                        );
+                        current_block = 10256747982273457880;
+                    }
+                } else {
+                    warn!(context, 0, "vg-member-added-received invalid.",);
+                    current_block = 4378276786830486580;
+                }
+            } else {
+                current_block = 10256747982273457880;
+            }
+            match current_block {
+                4378276786830486580 => {}
+                _ => {
+                    if 0 != ret & 0x2i32 {
+                        ret |= 0x4i32
+                    }
+                }
+            }
+        }
+    }
+
+    free(scanned_fingerprint_of_alice as *mut libc::c_void);
+    free(auth as *mut libc::c_void);
+    free(own_fingerprint as *mut libc::c_void);
+    free(grpid as *mut libc::c_void);
+
+    ret
+}
+
+unsafe fn end_bobs_joining(context: &Context, status: libc::c_int) {
+    context.bob.clone().write().unwrap().status = status;
+    dc_stop_ongoing_process(context);
+}
+
+unsafe fn secure_connection_established(context: &Context, contact_chat_id: uint32_t) {
+    let contact_id: uint32_t = chat_id_2_contact_id(context, contact_chat_id);
+    let contact = Contact::get_by_id(context, contact_id);
+    let addr = if let Ok(ref contact) = contact {
+        contact.get_addr()
+    } else {
+        "?"
+    };
+    let msg =
+        CString::new(context.stock_string_repl_str(StockMessage::ContactVerified, addr)).unwrap();
+    dc_add_device_msg(context, contact_chat_id, msg.as_ptr());
+    context.call_cb(
+        Event::CHAT_MODIFIED,
+        contact_chat_id as uintptr_t,
+        0i32 as uintptr_t,
+    );
+}
+
+unsafe fn lookup_field(mimeparser: &dc_mimeparser_t, key: &str) -> *const libc::c_char {
+    let mut value: *const libc::c_char = 0 as *const libc::c_char;
+    let field: *mut mailimf_field = dc_mimeparser_lookup_field(mimeparser, key);
+    if field.is_null()
+        || (*field).fld_type != MAILIMF_FIELD_OPTIONAL_FIELD as libc::c_int
+        || (*field).fld_data.fld_optional_field.is_null()
+        || {
+            value = (*(*field).fld_data.fld_optional_field).fld_value;
+            value.is_null()
+        }
+    {
+        return 0 as *const libc::c_char;
+    }
+
+    value
+}
+
+unsafe fn could_not_establish_secure_connection(
+    context: &Context,
+    contact_chat_id: uint32_t,
+    details: *const libc::c_char,
+) {
+    let contact_id: uint32_t = chat_id_2_contact_id(context, contact_chat_id);
+    let contact = Contact::get_by_id(context, contact_id);
+    let msg = context.stock_string_repl_str(
+        StockMessage::ContactNotVerified,
+        if let Ok(ref contact) = contact {
+            contact.get_addr()
+        } else {
+            "?"
+        },
+    );
+    let msg_c = CString::new(msg.as_str()).unwrap();
+    dc_add_device_msg(context, contact_chat_id, msg_c.as_ptr());
+    error!(context, 0, "{} ({})", msg, as_str(details));
+}
+
+unsafe fn mark_peer_as_verified(
+    context: &Context,
+    fingerprint: *const libc::c_char,
+) -> libc::c_int {
+    let mut success = 0;
+
+    if let Some(ref mut peerstate) =
+        Peerstate::from_fingerprint(context, &context.sql, as_str(fingerprint))
+    {
+        if peerstate.set_verified(1, as_str(fingerprint), 2) {
+            peerstate.prefer_encrypt = EncryptPreference::Mutual;
+            peerstate.to_save = Some(ToSave::All);
+            peerstate.save_to_db(&context.sql, false);
+            success = 1;
+        }
+    }
+
+    success
+}
+
+/* ******************************************************************************
+ * Tools: Misc.
+ ******************************************************************************/
+
+// TODO should return bool
+unsafe fn encrypted_and_signed(
+    mimeparser: &dc_mimeparser_t,
+    expected_fingerprint: *const libc::c_char,
+) -> libc::c_int {
+    if 0 == mimeparser.e2ee_helper.encrypted {
+        warn!(mimeparser.context, 0, "Message not encrypted.",);
+        return 0i32;
+    }
+    if mimeparser.e2ee_helper.signatures.len() <= 0 {
+        warn!(mimeparser.context, 0, "Message not signed.",);
+        return 0i32;
+    }
+    if expected_fingerprint.is_null() {
+        warn!(mimeparser.context, 0, "Fingerprint for comparison missing.",);
+        return 0i32;
+    }
+    if !mimeparser
+        .e2ee_helper
+        .signatures
+        .contains(as_str(expected_fingerprint))
+    {
+        warn!(
+            mimeparser.context,
+            0,
+            "Message does not match expected fingerprint {}.",
+            as_str(expected_fingerprint),
+        );
+        return 0;
+    }
+
+    1
+}
+
+pub unsafe fn dc_handle_degrade_event(context: &Context, peerstate: &Peerstate) {
+    let mut contact_chat_id = 0;
+
+    // - we do not issue an warning for DC_DE_ENCRYPTION_PAUSED as this is quite normal
+    // - currently, we do not issue an extra warning for DC_DE_VERIFICATION_LOST - this always comes
+    //   together with DC_DE_FINGERPRINT_CHANGED which is logged, the idea is not to bother
+    //   with things they cannot fix, so the user is just kicked from the verified group
+    //   (and he will know this and can fix this)
+    if Some(DegradeEvent::FingerprintChanged) == peerstate.degrade_event {
+        let contact_id: i32 = context
+            .sql
+            .query_row_col(
+                context,
+                "SELECT id FROM contacts WHERE addr=?;",
+                params![&peerstate.addr],
+                0,
+            )
+            .unwrap_or_default();
+        if contact_id > 0 {
+            dc_create_or_lookup_nchat_by_contact_id(
+                context,
+                contact_id as u32,
+                2,
+                &mut contact_chat_id,
+                0 as *mut libc::c_int,
+            );
+            let peeraddr: &str = match peerstate.addr {
+                Some(ref addr) => &addr,
+                None => "",
+            };
+            let msg = CString::new(
+                context.stock_string_repl_str(StockMessage::ContactSetupChanged, peeraddr),
+            )
+            .unwrap();
+            dc_add_device_msg(context, contact_chat_id, msg.as_ptr());
+            context.call_cb(
+                Event::CHAT_MODIFIED,
+                contact_chat_id as uintptr_t,
+                0 as uintptr_t,
+            );
+        }
+    }
+}

src/dc_simplify.rs

@@ -1,49 +1,64 @@
 use crate::dc_dehtml::*;
+use crate::dc_tools::*;
+use crate::x::*;
 
 #[derive(Copy, Clone)]
 pub struct Simplify {
     pub is_forwarded: bool,
-}
-
-/// Return index of footer line in vector of message lines, or vector length if
-/// no footer is found.
-///
-/// Also return whether not-standard (rfc3676, §4.3) footer is found.
-fn find_message_footer(lines: &[&str]) -> (usize, bool) {
-    for ix in 0..lines.len() {
-        let line = lines[ix];
-
-        // quoted-printable may encode `-- ` to `-- =20` which is converted
-        // back to `--  `
-        match line.as_ref() {
-            "-- " | "--  " => return (ix, false),
-            "--" | "---" | "----" => return (ix, true),
-            _ => (),
-        }
-    }
-    return (lines.len(), false);
+    pub is_cut_at_begin: bool,
+    pub is_cut_at_end: bool,
 }
 
 impl Simplify {
     pub fn new() -> Self {
         Simplify {
             is_forwarded: false,
+            is_cut_at_begin: false,
+            is_cut_at_end: false,
         }
     }
 
     /// Simplify and normalise text: Remove quotes, signatures, unnecessary
     /// lineends etc.
     /// The data returned from simplify() must be free()'d when no longer used.
-    pub fn simplify(&mut self, input: &str, is_html: bool, is_msgrmsg: bool) -> String {
-        let mut out = if is_html {
-            dc_dehtml(input)
-        } else {
-            input.to_string()
-        };
+    pub unsafe fn simplify(
+        &mut self,
+        in_unterminated: *const libc::c_char,
+        in_bytes: libc::c_int,
+        is_html: bool,
+        is_msgrmsg: libc::c_int,
+    ) -> *mut libc::c_char {
+        if in_bytes <= 0 {
+            return "".strdup();
+        }
 
-        out.retain(|c| c != '\r');
-        out = self.simplify_plain_text(&out, is_msgrmsg);
-        out.retain(|c| c != '\r');
+        /* create a copy of the given buffer */
+        let mut out: *mut libc::c_char;
+        let mut temp: *mut libc::c_char;
+        self.is_forwarded = false;
+        self.is_cut_at_begin = false;
+        self.is_cut_at_end = false;
+        out = strndup(
+            in_unterminated as *mut libc::c_char,
+            in_bytes as libc::c_ulong,
+        );
+        if out.is_null() {
+            return dc_strdup(b"\x00" as *const u8 as *const libc::c_char);
+        }
+        if is_html {
+            temp = dc_dehtml(out);
+            if !temp.is_null() {
+                free(out as *mut libc::c_void);
+                out = temp
+            }
+        }
+        dc_remove_cr_chars(out);
+        temp = self.simplify_plain_text(out, is_msgrmsg);
+        if !temp.is_null() {
+            free(out as *mut libc::c_void);
+            out = temp
+        }
+        dc_remove_cr_chars(out);
 
         out
     }
@@ -52,75 +67,102 @@ impl Simplify {
      * Simplify Plain Text
      */
     #[allow(non_snake_case)]
-    fn simplify_plain_text(&mut self, buf_terminated: &str, is_msgrmsg: bool) -> String {
+    unsafe fn simplify_plain_text(
+        &mut self,
+        buf_terminated: *const libc::c_char,
+        is_msgrmsg: libc::c_int,
+    ) -> *mut libc::c_char {
         /* This function ...
         ... removes all text after the line `-- ` (footer mark)
         ... removes full quotes at the beginning and at the end of the text -
             these are all lines starting with the character `>`
         ... remove a non-empty line before the removed quote (contains sth. like "On 2.9.2016, Bjoern wrote:" in different formats and lanugages) */
         /* split the given buffer into lines */
-        let lines: Vec<_> = buf_terminated.split('\n').collect();
+        let lines = dc_split_into_lines(buf_terminated);
         let mut l_first: usize = 0;
-        let mut is_cut_at_begin = false;
-        let (mut l_last, mut is_cut_at_end) = find_message_footer(&lines);
-
+        let mut l_last = lines.len();
+        let mut line: *mut libc::c_char;
+        let mut footer_mark: libc::c_int = 0i32;
+        for l in l_first..l_last {
+            line = lines[l];
+            if strcmp(line, b"-- \x00" as *const u8 as *const libc::c_char) == 0i32
+                || strcmp(line, b"--  \x00" as *const u8 as *const libc::c_char) == 0i32
+            {
+                footer_mark = 1i32
+            }
+            if strcmp(line, b"--\x00" as *const u8 as *const libc::c_char) == 0i32
+                || strcmp(line, b"---\x00" as *const u8 as *const libc::c_char) == 0i32
+                || strcmp(line, b"----\x00" as *const u8 as *const libc::c_char) == 0i32
+            {
+                footer_mark = 1i32;
+                self.is_cut_at_end = true
+            }
+            if 0 != footer_mark {
+                l_last = l;
+                /* done */
+                break;
+            }
+        }
         if l_last > l_first + 2 {
-            let line0 = lines[l_first];
-            let line1 = lines[l_first + 1];
-            let line2 = lines[l_first + 2];
-            if line0 == "---------- Forwarded message ----------"
-                && line1.starts_with("From: ")
-                && line2.is_empty()
+            let line0: *mut libc::c_char = lines[l_first];
+            let line1: *mut libc::c_char = lines[l_first + 1];
+            let line2: *mut libc::c_char = lines[l_first + 2];
+            if strcmp(
+                line0,
+                b"---------- Forwarded message ----------\x00" as *const u8 as *const libc::c_char,
+            ) == 0i32
+                && strncmp(line1, b"From: \x00" as *const u8 as *const libc::c_char, 6) == 0i32
+                && *line2.offset(0isize) as libc::c_int == 0i32
             {
                 self.is_forwarded = true;
                 l_first += 3
             }
         }
         for l in l_first..l_last {
-            let line = lines[l];
-            if line == "-----"
-                || line == "_____"
-                || line == "====="
-                || line == "*****"
-                || line == "~~~~~"
+            line = lines[l];
+            if strncmp(line, b"-----\x00" as *const u8 as *const libc::c_char, 5) == 0i32
+                || strncmp(line, b"_____\x00" as *const u8 as *const libc::c_char, 5) == 0i32
+                || strncmp(line, b"=====\x00" as *const u8 as *const libc::c_char, 5) == 0i32
+                || strncmp(line, b"*****\x00" as *const u8 as *const libc::c_char, 5) == 0i32
+                || strncmp(line, b"~~~~~\x00" as *const u8 as *const libc::c_char, 5) == 0i32
             {
                 l_last = l;
-                is_cut_at_end = true;
+                self.is_cut_at_end = true;
                 /* done */
                 break;
             }
         }
-        if !is_msgrmsg {
+        if 0 == is_msgrmsg {
             let mut l_lastQuotedLine = None;
             for l in (l_first..l_last).rev() {
-                let line = lines[l];
+                line = lines[l];
                 if is_plain_quote(line) {
                     l_lastQuotedLine = Some(l)
                 } else if !is_empty_line(line) {
                     break;
                 }
             }
-            if let Some(last_quoted_line) = l_lastQuotedLine {
-                l_last = last_quoted_line;
-                is_cut_at_end = true;
+            if l_lastQuotedLine.is_some() {
+                l_last = l_lastQuotedLine.unwrap();
+                self.is_cut_at_end = true;
                 if l_last > 1 {
                     if is_empty_line(lines[l_last - 1]) {
                         l_last -= 1
                     }
                 }
                 if l_last > 1 {
-                    let line = lines[l_last - 1];
+                    line = lines[l_last - 1];
                     if is_quoted_headline(line) {
                         l_last -= 1
                     }
                 }
             }
         }
-        if !is_msgrmsg {
+        if 0 == is_msgrmsg {
             let mut l_lastQuotedLine_0 = None;
             let mut hasQuotedHeadline = 0;
             for l in l_first..l_last {
-                let line = lines[l];
+                line = lines[l];
                 if is_plain_quote(line) {
                     l_lastQuotedLine_0 = Some(l)
                 } else if !is_empty_line(line) {
@@ -135,21 +177,21 @@ impl Simplify {
                     }
                 }
             }
-            if let Some(last_quoted_line) = l_lastQuotedLine_0 {
-                l_first = last_quoted_line + 1;
-                is_cut_at_begin = true
+            if l_lastQuotedLine_0.is_some() {
+                l_first = l_lastQuotedLine_0.unwrap() + 1;
+                self.is_cut_at_begin = true
             }
         }
         /* re-create buffer from the remaining lines */
         let mut ret = String::new();
-        if is_cut_at_begin {
+        if self.is_cut_at_begin {
             ret += "[...]";
         }
         /* we write empty lines only in case and non-empty line follows */
         let mut pending_linebreaks: libc::c_int = 0i32;
         let mut content_lines_added: libc::c_int = 0i32;
         for l in l_first..l_last {
-            let line = lines[l];
+            line = lines[l];
             if is_empty_line(line) {
                 pending_linebreaks += 1
             } else {
@@ -163,105 +205,144 @@ impl Simplify {
                     }
                 }
                 // the incoming message might contain invalid UTF8
-                ret += line;
+                ret += &to_string_lossy(line);
                 content_lines_added += 1;
                 pending_linebreaks = 1i32
             }
         }
-        if is_cut_at_end && (!is_cut_at_begin || 0 != content_lines_added) {
+        if self.is_cut_at_end && (!self.is_cut_at_begin || 0 != content_lines_added) {
             ret += " [...]";
         }
+        dc_free_splitted_lines(lines);
 
-        ret
+        ret.strdup()
     }
 }
 
 /**
  * Tools
  */
-fn is_empty_line(buf: &str) -> bool {
-    // XXX: can it be simplified to buf.chars().all(|c| c.is_whitespace())?
-    //
-    // Strictly speaking, it is not equivalent (^A is not whitespace, but less than ' '),
-    // but having control sequences in email body?!
-    //
-    // See discussion at: https://github.com/deltachat/deltachat-core-rust/pull/402#discussion_r317062392
-    for c in buf.chars() {
-        if c > ' ' {
+unsafe fn is_empty_line(buf: *const libc::c_char) -> bool {
+    /* force unsigned - otherwise the `> ' '` comparison will fail */
+    let mut p1: *const libc::c_uchar = buf as *const libc::c_uchar;
+    while 0 != *p1 {
+        if *p1 as libc::c_int > ' ' as i32 {
             return false;
         }
+        p1 = p1.offset(1isize)
     }
 
     true
 }
 
-fn is_quoted_headline(buf: &str) -> bool {
+unsafe fn is_quoted_headline(buf: *const libc::c_char) -> bool {
     /* This function may be called for the line _directly_ before a quote.
     The function checks if the line contains sth. like "On 01.02.2016, xy@z wrote:" in various languages.
     - Currently, we simply check if the last character is a ':'.
     - Checking for the existence of an email address may fail (headlines may show the user's name instead of the address) */
+    let buf_len: libc::c_int = strlen(buf) as libc::c_int;
+    if buf_len > 80i32 {
+        return false;
+    }
+    if buf_len > 0i32 && *buf.offset((buf_len - 1i32) as isize) as libc::c_int == ':' as i32 {
+        return true;
+    }
 
-    buf.len() <= 80 && buf.ends_with(':')
+    false
 }
 
-fn is_plain_quote(buf: &str) -> bool {
-    buf.starts_with(">")
+unsafe fn is_plain_quote(buf: *const libc::c_char) -> bool {
+    if *buf.offset(0isize) as libc::c_int == '>' as i32 {
+        return true;
+    }
+
+    false
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
+    use std::ffi::CStr;
 
     #[test]
     fn test_simplify_trim() {
-        let mut simplify = Simplify::new();
-        let html = "\r\r\nline1<br>\r\n\r\n\r\rline2\n\r";
-        let plain = simplify.simplify(html, true, false);
+        unsafe {
+            let mut simplify = Simplify::new();
+            let html: *const libc::c_char =
+                b"\r\r\nline1<br>\r\n\r\n\r\rline2\n\r\x00" as *const u8 as *const libc::c_char;
+            let plain: *mut libc::c_char =
+                simplify.simplify(html, strlen(html) as libc::c_int, true, 0);
 
-        assert_eq!(plain, "line1\nline2");
+            assert_eq!(
+                CStr::from_ptr(plain as *const libc::c_char)
+                    .to_str()
+                    .unwrap(),
+                "line1\nline2",
+            );
+
+            free(plain as *mut libc::c_void);
+        }
     }
 
     #[test]
     fn test_simplify_parse_href() {
-        let mut simplify = Simplify::new();
-        let html = "<a href=url>text</a";
-        let plain = simplify.simplify(html, true, false);
+        unsafe {
+            let mut simplify = Simplify::new();
+            let html: *const libc::c_char =
+                b"<a href=url>text</a\x00" as *const u8 as *const libc::c_char;
+            let plain: *mut libc::c_char =
+                simplify.simplify(html, strlen(html) as libc::c_int, true, 0);
 
-        assert_eq!(plain, "[text](url)");
+            assert_eq!(
+                CStr::from_ptr(plain as *const libc::c_char)
+                    .to_str()
+                    .unwrap(),
+                "[text](url)",
+            );
+
+            free(plain as *mut libc::c_void);
+        }
     }
 
     #[test]
     fn test_simplify_bold_text() {
-        let mut simplify = Simplify::new();
-        let html = "<!DOCTYPE name [<!DOCTYPE ...>]><!-- comment -->text <b><?php echo ... ?>bold</b><![CDATA[<>]]>";
-        let plain = simplify.simplify(html, true, false);
+        unsafe {
+            let mut simplify = Simplify::new();
+            let html: *const libc::c_char =
+                b"<!DOCTYPE name [<!DOCTYPE ...>]><!-- comment -->text <b><?php echo ... ?>bold</b><![CDATA[<>]]>\x00"
+                as *const u8 as *const libc::c_char;
+            let plain: *mut libc::c_char =
+                simplify.simplify(html, strlen(html) as libc::c_int, true, 0);
 
-        assert_eq!(plain, "text *bold*<>");
+            assert_eq!(
+                CStr::from_ptr(plain as *const libc::c_char)
+                    .to_str()
+                    .unwrap(),
+                "text *bold*<>",
+            );
+
+            free(plain as *mut libc::c_void);
+        }
     }
 
     #[test]
     fn test_simplify_html_encoded() {
-        let mut simplify = Simplify::new();
-        let html =
-                "&lt;&gt;&quot;&apos;&amp; &auml;&Auml;&ouml;&Ouml;&uuml;&Uuml;&szlig; foo&AElig;&ccedil;&Ccedil; &diams;&lrm;&rlm;&zwnj;&noent;&zwj;";
+        unsafe {
+            let mut simplify = Simplify::new();
+            let html: *const libc::c_char =
+                b"&lt;&gt;&quot;&apos;&amp; &auml;&Auml;&ouml;&Ouml;&uuml;&Uuml;&szlig; foo&AElig;&ccedil;&Ccedil; &diams;&noent;&lrm;&rlm;&zwnj;&zwj;\x00"
+                as *const u8 as *const libc::c_char;
+            let plain: *mut libc::c_char =
+                simplify.simplify(html, strlen(html) as libc::c_int, true, 0);
 
-        let plain = simplify.simplify(html, true, false);
+            assert_eq!(
+                strcmp(plain,
+                       b"<>\"\'& \xc3\xa4\xc3\x84\xc3\xb6\xc3\x96\xc3\xbc\xc3\x9c\xc3\x9f foo\xc3\x86\xc3\xa7\xc3\x87 \xe2\x99\xa6&noent;\x00"
+                       as *const u8 as *const libc::c_char),
+                0,
+            );
 
-        assert_eq!(
-            plain,
-            "<>\"\'& äÄöÖüÜß fooÆçÇ \u{2666}\u{200e}\u{200f}\u{200c}&noent;\u{200d}"
-        );
-    }
-
-    #[test]
-    fn test_simplify_utilities() {
-        assert!(is_empty_line(" \t"));
-        assert!(is_empty_line(""));
-        assert!(is_empty_line(" \r"));
-        assert!(!is_empty_line(" x"));
-        assert!(is_plain_quote("> hello world"));
-        assert!(is_plain_quote(">>"));
-        assert!(!is_plain_quote("Life is pain"));
-        assert!(!is_plain_quote(""));
+            free(plain as *mut libc::c_void);
+        }
     }
 }

src/dc_strencode.rs

@@ -1,33 +1,127 @@
-use std::borrow::Cow;
-use std::ffi::CString;
-use std::ptr;
+use std::ffi::{CStr, CString};
 
 use charset::Charset;
 use mmime::mailmime_decode::*;
 use mmime::mmapstring::*;
 use mmime::other::*;
-use percent_encoding::{percent_decode, utf8_percent_encode, AsciiSet, CONTROLS};
 
 use crate::dc_tools::*;
+use crate::types::*;
 use crate::x::*;
 
-/**
- * Encode non-ascii-strings as `=?UTF-8?Q?Bj=c3=b6rn_Petersen?=`.
- * Belongs to RFC 2047: https://tools.ietf.org/html/rfc2047
- *
- * We do not fold at position 72; this would result in empty words as `=?utf-8?Q??=` which are correct,
- * but cannot be displayed by some mail programs (eg. Android Stock Mail).
- * however, this is not needed, as long as _one_ word is not longer than 72 characters.
- * _if_ it is, the display may get weird.  This affects the subject only.
- * the best solution wor all this would be if libetpan encodes the line as only libetpan knowns when a header line is full.
- *
- * @param to_encode Null-terminated UTF-8-string to encode.
- * @return Returns the encoded string which must be free()'d when no longed needed.
- *     On errors, NULL is returned.
- */
+#[inline]
+pub fn isalnum(c: libc::c_int) -> libc::c_int {
+    if c < std::u8::MAX as libc::c_int {
+        (c as u8 as char).is_ascii_alphanumeric() as libc::c_int
+    } else {
+        0
+    }
+}
+
+pub unsafe fn dc_urlencode(to_encode: *const libc::c_char) -> *mut libc::c_char {
+    let mut pstr: *const libc::c_char = to_encode;
+    if to_encode.is_null() {
+        return dc_strdup(b"\x00" as *const u8 as *const libc::c_char);
+    }
+    let buf: *mut libc::c_char =
+        malloc(strlen(to_encode).wrapping_mul(3).wrapping_add(1)) as *mut libc::c_char;
+    let mut pbuf: *mut libc::c_char = buf;
+    assert!(!buf.is_null());
+
+    while 0 != *pstr {
+        if 0 != isalnum(*pstr as libc::c_int)
+            || *pstr as libc::c_int == '-' as i32
+            || *pstr as libc::c_int == '_' as i32
+            || *pstr as libc::c_int == '.' as i32
+            || *pstr as libc::c_int == '~' as i32
+        {
+            let fresh0 = pbuf;
+            pbuf = pbuf.offset(1);
+            *fresh0 = *pstr
+        } else if *pstr as libc::c_int == ' ' as i32 {
+            let fresh1 = pbuf;
+            pbuf = pbuf.offset(1);
+            *fresh1 = '+' as i32 as libc::c_char
+        } else {
+            let fresh2 = pbuf;
+            pbuf = pbuf.offset(1);
+            *fresh2 = '%' as i32 as libc::c_char;
+            let fresh3 = pbuf;
+            pbuf = pbuf.offset(1);
+            *fresh3 = int_2_uppercase_hex((*pstr as libc::c_int >> 4i32) as libc::c_char);
+            let fresh4 = pbuf;
+            pbuf = pbuf.offset(1);
+            *fresh4 = int_2_uppercase_hex((*pstr as libc::c_int & 15i32) as libc::c_char)
+        }
+        pstr = pstr.offset(1isize)
+    }
+    *pbuf = '\u{0}' as i32 as libc::c_char;
+
+    buf
+}
+
+/* ******************************************************************************
+ * URL encoding and decoding, RFC 3986
+ ******************************************************************************/
+unsafe fn int_2_uppercase_hex(code: libc::c_char) -> libc::c_char {
+    static mut HEX: [libc::c_char; 17] = [
+        48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 65, 66, 67, 68, 69, 70, 0,
+    ];
+
+    HEX[(code as libc::c_int & 15i32) as usize]
+}
+
+pub unsafe fn dc_urldecode(to_decode: *const libc::c_char) -> *mut libc::c_char {
+    let mut pstr: *const libc::c_char = to_decode;
+    if to_decode.is_null() {
+        return dc_strdup(b"\x00" as *const u8 as *const libc::c_char);
+    }
+    let buf: *mut libc::c_char = malloc(strlen(to_decode).wrapping_add(1)) as *mut libc::c_char;
+    let mut pbuf: *mut libc::c_char = buf;
+    assert!(!buf.is_null());
+
+    while 0 != *pstr {
+        if *pstr as libc::c_int == '%' as i32 {
+            if 0 != *pstr.offset(1isize) as libc::c_int && 0 != *pstr.offset(2isize) as libc::c_int
+            {
+                let fresh5 = pbuf;
+                pbuf = pbuf.offset(1);
+                *fresh5 = ((hex_2_int(*pstr.offset(1isize)) as libc::c_int) << 4i32
+                    | hex_2_int(*pstr.offset(2isize)) as libc::c_int)
+                    as libc::c_char;
+                pstr = pstr.offset(2isize)
+            }
+        } else if *pstr as libc::c_int == '+' as i32 {
+            let fresh6 = pbuf;
+            pbuf = pbuf.offset(1);
+            *fresh6 = ' ' as i32 as libc::c_char
+        } else {
+            let fresh7 = pbuf;
+            pbuf = pbuf.offset(1);
+            *fresh7 = *pstr
+        }
+        pstr = pstr.offset(1isize)
+    }
+    *pbuf = '\u{0}' as i32 as libc::c_char;
+
+    buf
+}
+
+fn hex_2_int(ch: libc::c_char) -> libc::c_char {
+    let ch = ch as u8 as char;
+    if !ch.is_ascii_hexdigit() {
+        return (ch.to_ascii_lowercase() as i32 - 'a' as i32 + 10) as libc::c_char;
+    }
+
+    match ch.to_digit(16) {
+        Some(res) => res as libc::c_char,
+        None => 0,
+    }
+}
+
 pub unsafe fn dc_encode_header_words(to_encode: *const libc::c_char) -> *mut libc::c_char {
     let mut ok_to_continue = true;
-    let mut ret_str: *mut libc::c_char = ptr::null_mut();
+    let mut ret_str: *mut libc::c_char = 0 as *mut libc::c_char;
     let mut cur: *const libc::c_char = to_encode;
     let mmapstr: *mut MMAPString = mmap_string_new(b"\x00" as *const u8 as *const libc::c_char);
     if to_encode.is_null() || mmapstr.is_null() {
@@ -65,7 +159,7 @@ pub unsafe fn dc_encode_header_words(to_encode: *const libc::c_char) -> *mut lib
                         b"utf-8\x00" as *const u8 as *const libc::c_char,
                         mmapstr,
                         begin,
-                        end.wrapping_offset_from(begin) as libc::size_t,
+                        end.wrapping_offset_from(begin) as size_t,
                     ) {
                         ok_to_continue = false;
                         continue;
@@ -81,7 +175,7 @@ pub unsafe fn dc_encode_header_words(to_encode: *const libc::c_char) -> *mut lib
                         if mmap_string_append_len(
                             mmapstr,
                             end,
-                            cur.wrapping_offset_from(end) as libc::size_t,
+                            cur.wrapping_offset_from(end) as size_t,
                         )
                         .is_null()
                         {
@@ -92,7 +186,7 @@ pub unsafe fn dc_encode_header_words(to_encode: *const libc::c_char) -> *mut lib
                 } else if mmap_string_append_len(
                     mmapstr,
                     begin,
-                    cur.wrapping_offset_from(begin) as libc::size_t,
+                    cur.wrapping_offset_from(begin) as size_t,
                 )
                 .is_null()
                 {
@@ -121,10 +215,10 @@ unsafe fn quote_word(
     display_charset: *const libc::c_char,
     mmapstr: *mut MMAPString,
     word: *const libc::c_char,
-    size: libc::size_t,
+    size: size_t,
 ) -> bool {
     let mut cur: *const libc::c_char;
-    let mut i = 0;
+    let mut i: size_t = 0i32 as size_t;
     let mut hex: [libc::c_char; 4] = [0; 4];
     // let mut col: libc::c_int = 0i32;
     if mmap_string_append(mmapstr, b"=?\x00" as *const u8 as *const libc::c_char).is_null() {
@@ -187,7 +281,7 @@ unsafe fn get_word(
     {
         cur = cur.offset(1isize)
     }
-    *pto_be_quoted = to_be_quoted(begin, cur.wrapping_offset_from(begin) as libc::size_t);
+    *pto_be_quoted = to_be_quoted(begin, cur.wrapping_offset_from(begin) as size_t);
     *pend = cur;
 }
 
@@ -196,9 +290,9 @@ unsafe fn get_word(
  ******************************************************************************/
 
 /* see comment below */
-unsafe fn to_be_quoted(word: *const libc::c_char, size: libc::size_t) -> bool {
+unsafe fn to_be_quoted(word: *const libc::c_char, size: size_t) -> bool {
     let mut cur: *const libc::c_char = word;
-    let mut i = 0;
+    let mut i: size_t = 0i32 as size_t;
     while i < size {
         match *cur as libc::c_int {
             44 | 58 | 33 | 34 | 35 | 36 | 64 | 91 | 92 | 93 | 94 | 96 | 123 | 124 | 125 | 126
@@ -218,10 +312,10 @@ unsafe fn to_be_quoted(word: *const libc::c_char, size: libc::size_t) -> bool {
 
 pub unsafe fn dc_decode_header_words(in_0: *const libc::c_char) -> *mut libc::c_char {
     if in_0.is_null() {
-        return ptr::null_mut();
+        return 0 as *mut libc::c_char;
     }
-    let mut out: *mut libc::c_char = ptr::null_mut();
-    let mut cur_token = 0;
+    let mut out: *mut libc::c_char = 0 as *mut libc::c_char;
+    let mut cur_token: size_t = 0i32 as size_t;
     let r: libc::c_int = mailmime_encoded_phrase_parse(
         b"iso-8859-1\x00" as *const u8 as *const libc::c_char,
         in_0,
@@ -237,88 +331,371 @@ pub unsafe fn dc_decode_header_words(in_0: *const libc::c_char) -> *mut libc::c_
     out
 }
 
-pub fn dc_decode_header_words_safe(input: &str) -> String {
-    static FROM_ENCODING: &[u8] = b"iso-8859-1\x00";
-    static TO_ENCODING: &[u8] = b"utf-8\x00";
-    let mut out = ptr::null_mut();
-    let mut cur_token = 0;
-    let input_c = CString::yolo(input);
-    unsafe {
-        let r = mailmime_encoded_phrase_parse(
-            FROM_ENCODING.as_ptr().cast(),
-            input_c.as_ptr(),
-            input.len(),
-            &mut cur_token,
-            TO_ENCODING.as_ptr().cast(),
-            &mut out,
-        );
-        if r as u32 != MAILIMF_NO_ERROR || out.is_null() {
-            input.to_string()
-        } else {
-            let res = to_string(out);
-            free(out.cast());
-            res
+pub unsafe fn dc_encode_modified_utf7(
+    mut to_encode: *const libc::c_char,
+    change_spaces: libc::c_int,
+) -> *mut libc::c_char {
+    let mut utf8pos: libc::c_uint;
+    let mut utf8total: libc::c_uint;
+    let mut c: libc::c_uint;
+    let mut utf7mode: libc::c_uint;
+    let mut bitstogo: libc::c_uint;
+    let mut utf16flag: libc::c_uint;
+    let mut ucs4: libc::c_ulong = 0;
+    let mut bitbuf: libc::c_ulong = 0;
+    let mut dst: *mut libc::c_char;
+    let res: *mut libc::c_char;
+    if to_encode.is_null() {
+        return dc_strdup(b"\x00" as *const u8 as *const libc::c_char);
+    }
+    res = malloc(2usize.wrapping_mul(strlen(to_encode)).wrapping_add(1)) as *mut libc::c_char;
+    dst = res;
+    assert!(!dst.is_null());
+
+    utf7mode = 0i32 as libc::c_uint;
+    utf8total = 0i32 as libc::c_uint;
+    bitstogo = 0i32 as libc::c_uint;
+    utf8pos = 0i32 as libc::c_uint;
+    loop {
+        c = *to_encode as libc::c_uchar as libc::c_uint;
+        if !(c != '\u{0}' as i32 as libc::c_uint) {
+            break;
         }
-    }
-}
-
-pub fn dc_needs_ext_header(to_check: impl AsRef<str>) -> bool {
-    let to_check = to_check.as_ref();
-
-    if to_check.is_empty() {
-        return false;
-    }
-
-    to_check.chars().any(|c| {
-        !(c.is_ascii_alphanumeric()
-            || c == '-'
-            || c == '_'
-            || c == '_'
-            || c == '.'
-            || c == '~'
-            || c == '%')
-    })
-}
-
-const EXT_ASCII_ST: &AsciiSet = &CONTROLS
-    .add(b' ')
-    .add(b'-')
-    .add(b'_')
-    .add(b'.')
-    .add(b'~')
-    .add(b'%');
-
-/// Encode an UTF-8 string to the extended header format.
-pub fn dc_encode_ext_header(to_encode: impl AsRef<str>) -> String {
-    let encoded = utf8_percent_encode(to_encode.as_ref(), &EXT_ASCII_ST);
-    format!("utf-8''{}", encoded)
-}
-
-/// Decode an extended-header-format strings to UTF-8.
-pub fn dc_decode_ext_header(to_decode: &[u8]) -> Cow<str> {
-    if let Some(index) = bytes!(b'\'').find(to_decode) {
-        let (charset, rest) = to_decode.split_at(index);
-        if !charset.is_empty() {
-            // skip language
-            if let Some(index2) = bytes!(b'\'').find(&rest[1..]) {
-                let decoded = percent_decode(&rest[index2 + 2..]);
-
-                if charset != b"utf-8" && charset != b"UTF-8" {
-                    if let Some(encoding) = Charset::for_label(charset) {
-                        let bytes = decoded.collect::<Vec<u8>>();
-                        let (res, _, _) = encoding.decode(&bytes);
-                        return Cow::Owned(res.into_owned());
-                    } else {
-                        return decoded.decode_utf8_lossy();
-                    }
+        to_encode = to_encode.offset(1isize);
+        // normal character?
+        if c >= ' ' as i32 as libc::c_uint
+            && c <= '~' as i32 as libc::c_uint
+            && (c != '_' as i32 as libc::c_uint || 0 == change_spaces)
+        {
+            if 0 != utf7mode {
+                if 0 != bitstogo {
+                    let fresh8 = dst;
+                    dst = dst.offset(1);
+                    *fresh8 = BASE64CHARS
+                        [(bitbuf << (6i32 as libc::c_uint).wrapping_sub(bitstogo) & 0x3f) as usize]
+                }
+                let fresh9 = dst;
+                dst = dst.offset(1);
+                *fresh9 = '-' as i32 as libc::c_char;
+                utf7mode = 0i32 as libc::c_uint;
+                utf8pos = 0i32 as libc::c_uint;
+                bitstogo = 0i32 as libc::c_uint;
+                utf8total = 0i32 as libc::c_uint
+            }
+            if 0 != change_spaces && c == ' ' as i32 as libc::c_uint {
+                let fresh10 = dst;
+                dst = dst.offset(1);
+                *fresh10 = '_' as i32 as libc::c_char
+            } else {
+                let fresh11 = dst;
+                dst = dst.offset(1);
+                *fresh11 = c as libc::c_char
+            }
+            if c == '&' as i32 as libc::c_uint {
+                let fresh12 = dst;
+                dst = dst.offset(1);
+                *fresh12 = '-' as i32 as libc::c_char
+            }
+        } else {
+            if 0 == utf7mode {
+                let fresh13 = dst;
+                dst = dst.offset(1);
+                *fresh13 = '&' as i32 as libc::c_char;
+                utf7mode = 1i32 as libc::c_uint
+            }
+            // encode ascii characters as themselves
+            if c < 0x80i32 as libc::c_uint {
+                ucs4 = c as libc::c_ulong
+            } else if 0 != utf8total {
+                ucs4 = ucs4 << 6i32 | c as libc::c_ulong & 0x3f;
+                utf8pos = utf8pos.wrapping_add(1);
+                if utf8pos < utf8total {
+                    continue;
+                }
+            } else {
+                utf8pos = 1i32 as libc::c_uint;
+                if c < 0xe0i32 as libc::c_uint {
+                    utf8total = 2i32 as libc::c_uint;
+                    ucs4 = (c & 0x1fi32 as libc::c_uint) as libc::c_ulong
+                } else if c < 0xf0i32 as libc::c_uint {
+                    utf8total = 3i32 as libc::c_uint;
+                    ucs4 = (c & 0xfi32 as libc::c_uint) as libc::c_ulong
                 } else {
-                    return decoded.decode_utf8_lossy();
+                    utf8total = 4i32 as libc::c_uint;
+                    ucs4 = (c & 0x3i32 as libc::c_uint) as libc::c_ulong
+                }
+                continue;
+            }
+            utf8total = 0i32 as libc::c_uint;
+            loop {
+                if ucs4 >= 0x10000 {
+                    ucs4 = ucs4.wrapping_sub(0x10000);
+                    bitbuf = bitbuf << 16 | (ucs4 >> 10).wrapping_add(0xd800);
+                    ucs4 = (ucs4 & 0x3ff).wrapping_add(0xdc00);
+                    utf16flag = 1i32 as libc::c_uint
+                } else {
+                    bitbuf = bitbuf << 16 | ucs4;
+                    utf16flag = 0i32 as libc::c_uint
+                }
+                bitstogo = bitstogo.wrapping_add(16i32 as libc::c_uint);
+                while bitstogo >= 6i32 as libc::c_uint {
+                    bitstogo = bitstogo.wrapping_sub(6i32 as libc::c_uint);
+                    let fresh14 = dst;
+                    dst = dst.offset(1);
+                    *fresh14 = BASE64CHARS[(if 0 != bitstogo {
+                        bitbuf >> bitstogo
+                    } else {
+                        bitbuf
+                    } & 0x3f) as usize]
+                }
+                if !(0 != utf16flag) {
+                    break;
                 }
             }
         }
     }
+    if 0 != utf7mode {
+        if 0 != bitstogo {
+            let fresh15 = dst;
+            dst = dst.offset(1);
+            *fresh15 = BASE64CHARS
+                [(bitbuf << (6i32 as libc::c_uint).wrapping_sub(bitstogo) & 0x3f) as usize]
+        }
+        let fresh16 = dst;
+        dst = dst.offset(1);
+        *fresh16 = '-' as i32 as libc::c_char
+    }
+    *dst = '\u{0}' as i32 as libc::c_char;
 
-    String::from_utf8_lossy(to_decode)
+    res
+}
+
+/* ******************************************************************************
+ * Encode/decode modified UTF-7 as needed for IMAP, see RFC 2192
+ ******************************************************************************/
+
+// UTF7 modified base64 alphabet
+static mut BASE64CHARS: [libc::c_char; 65] = [
+    65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88,
+    89, 90, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114,
+    115, 116, 117, 118, 119, 120, 121, 122, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 43, 44, 0,
+];
+
+pub unsafe fn dc_decode_modified_utf7(
+    to_decode: *const libc::c_char,
+    change_spaces: libc::c_int,
+) -> *mut libc::c_char {
+    let mut c: libc::c_uint;
+    let mut i: libc::c_uint;
+    let mut bitcount: libc::c_uint;
+    let mut ucs4: libc::c_ulong;
+    let mut utf16: libc::c_ulong;
+    let mut bitbuf: libc::c_ulong;
+    let mut base64: [libc::c_uchar; 256] = [0; 256];
+    let mut src: *const libc::c_char;
+    let mut dst: *mut libc::c_char;
+    let res: *mut libc::c_char;
+    if to_decode.is_null() {
+        return dc_strdup(b"\x00" as *const u8 as *const libc::c_char);
+    }
+    res = malloc(4usize.wrapping_mul(strlen(to_decode)).wrapping_add(1)) as *mut libc::c_char;
+    dst = res;
+    src = to_decode;
+    assert!(!dst.is_null());
+
+    libc::memset(
+        base64.as_mut_ptr() as *mut libc::c_void,
+        64,
+        ::std::mem::size_of::<[libc::c_uchar; 256]>(),
+    );
+    i = 0i32 as libc::c_uint;
+    while (i as libc::c_ulong) < ::std::mem::size_of::<[libc::c_char; 65]>() as libc::c_ulong {
+        base64[BASE64CHARS[i as usize] as libc::c_uint as usize] = i as libc::c_uchar;
+        i = i.wrapping_add(1)
+    }
+    while *src as libc::c_int != '\u{0}' as i32 {
+        let fresh17 = src;
+        src = src.offset(1);
+        c = *fresh17 as libc::c_uint;
+        if c != '&' as i32 as libc::c_uint || *src as libc::c_int == '-' as i32 {
+            if 0 != change_spaces && c == '_' as i32 as libc::c_uint {
+                let fresh18 = dst;
+                dst = dst.offset(1);
+                *fresh18 = ' ' as i32 as libc::c_char
+            } else {
+                let fresh19 = dst;
+                dst = dst.offset(1);
+                *fresh19 = c as libc::c_char
+            }
+            if c == '&' as i32 as libc::c_uint {
+                src = src.offset(1isize)
+            }
+        } else {
+            bitbuf = 0;
+            bitcount = 0i32 as libc::c_uint;
+            ucs4 = 0;
+            loop {
+                c = base64[*src as libc::c_uchar as usize] as libc::c_uint;
+                if !(c != 64i32 as libc::c_uint) {
+                    break;
+                }
+                src = src.offset(1isize);
+                bitbuf = bitbuf << 6i32 | c as libc::c_ulong;
+                bitcount = bitcount.wrapping_add(6i32 as libc::c_uint);
+                // enough bits for a UTF-16 character?
+                if !(bitcount >= 16i32 as libc::c_uint) {
+                    continue;
+                }
+                bitcount = bitcount.wrapping_sub(16i32 as libc::c_uint);
+                utf16 = if 0 != bitcount {
+                    bitbuf >> bitcount
+                } else {
+                    bitbuf
+                } & 0xffff;
+
+                // convert UTF16 to UCS4
+                if utf16 >= 0xd800 && utf16 <= 0xdbff {
+                    ucs4 = utf16.wrapping_sub(0xd800) << 10i32
+                } else {
+                    if utf16 >= 0xdc00 && utf16 <= 0xdfff {
+                        ucs4 = ucs4.wrapping_add(utf16.wrapping_sub(0xdc00).wrapping_add(0x10000))
+                    } else {
+                        ucs4 = utf16
+                    }
+                    if ucs4 <= 0x7f {
+                        *dst.offset(0isize) = ucs4 as libc::c_char;
+                        dst = dst.offset(1isize)
+                    } else if ucs4 <= 0x7ff {
+                        *dst.offset(0isize) = (0xc0 | ucs4 >> 6i32) as libc::c_char;
+                        *dst.offset(1isize) = (0x80 | ucs4 & 0x3f) as libc::c_char;
+                        dst = dst.offset(2isize)
+                    } else if ucs4 <= 0xffff {
+                        *dst.offset(0isize) = (0xe0 | ucs4 >> 12i32) as libc::c_char;
+                        *dst.offset(1isize) = (0x80 | ucs4 >> 6i32 & 0x3f) as libc::c_char;
+                        *dst.offset(2isize) = (0x80 | ucs4 & 0x3f) as libc::c_char;
+                        dst = dst.offset(3isize)
+                    } else {
+                        *dst.offset(0isize) = (0xf0 | ucs4 >> 18i32) as libc::c_char;
+                        *dst.offset(1isize) = (0x80 | ucs4 >> 12i32 & 0x3f) as libc::c_char;
+                        *dst.offset(2isize) = (0x80 | ucs4 >> 6i32 & 0x3f) as libc::c_char;
+                        *dst.offset(3isize) = (0x80 | ucs4 & 0x3f) as libc::c_char;
+                        dst = dst.offset(4isize)
+                    }
+                }
+            }
+            if *src as libc::c_int == '-' as i32 {
+                src = src.offset(1isize)
+            }
+        }
+    }
+    *dst = '\u{0}' as i32 as libc::c_char;
+
+    res
+}
+
+pub unsafe fn dc_needs_ext_header(mut to_check: *const libc::c_char) -> bool {
+    if !to_check.is_null() {
+        while 0 != *to_check {
+            if 0 == isalnum(*to_check as libc::c_int)
+                && *to_check as libc::c_int != '-' as i32
+                && *to_check as libc::c_int != '_' as i32
+                && *to_check as libc::c_int != '.' as i32
+                && *to_check as libc::c_int != '~' as i32
+            {
+                return true;
+            }
+            to_check = to_check.offset(1isize)
+        }
+    }
+
+    false
+}
+
+pub unsafe fn dc_encode_ext_header(to_encode: *const libc::c_char) -> *mut libc::c_char {
+    let mut pstr: *const libc::c_char = to_encode;
+    if to_encode.is_null() {
+        return dc_strdup(b"utf-8\'\'\x00" as *const u8 as *const libc::c_char);
+    }
+    let buf: *mut libc::c_char = malloc(
+        strlen(b"utf-8\'\'\x00" as *const u8 as *const libc::c_char)
+            .wrapping_add(strlen(to_encode).wrapping_mul(3))
+            .wrapping_add(1),
+    ) as *mut libc::c_char;
+    assert!(!buf.is_null());
+
+    let mut pbuf: *mut libc::c_char = buf;
+    strcpy(pbuf, b"utf-8\'\'\x00" as *const u8 as *const libc::c_char);
+    pbuf = pbuf.offset(strlen(pbuf) as isize);
+    while 0 != *pstr {
+        if 0 != isalnum(*pstr as libc::c_int)
+            || *pstr as libc::c_int == '-' as i32
+            || *pstr as libc::c_int == '_' as i32
+            || *pstr as libc::c_int == '.' as i32
+            || *pstr as libc::c_int == '~' as i32
+        {
+            let fresh20 = pbuf;
+            pbuf = pbuf.offset(1);
+            *fresh20 = *pstr
+        } else {
+            let fresh21 = pbuf;
+            pbuf = pbuf.offset(1);
+            *fresh21 = '%' as i32 as libc::c_char;
+            let fresh22 = pbuf;
+            pbuf = pbuf.offset(1);
+            *fresh22 = int_2_uppercase_hex((*pstr as libc::c_int >> 4i32) as libc::c_char);
+            let fresh23 = pbuf;
+            pbuf = pbuf.offset(1);
+            *fresh23 = int_2_uppercase_hex((*pstr as libc::c_int & 15i32) as libc::c_char)
+        }
+        pstr = pstr.offset(1isize)
+    }
+    *pbuf = '\u{0}' as i32 as libc::c_char;
+
+    buf
+}
+
+pub unsafe fn dc_decode_ext_header(to_decode: *const libc::c_char) -> *mut libc::c_char {
+    let mut decoded: *mut libc::c_char = 0 as *mut libc::c_char;
+    let mut charset: *mut libc::c_char = 0 as *mut libc::c_char;
+    let mut p2: *const libc::c_char;
+    if !to_decode.is_null() {
+        // get char set
+        p2 = strchr(to_decode, '\'' as i32);
+        if !(p2.is_null() || p2 == to_decode) {
+            /*no empty charset allowed*/
+            charset =
+                dc_null_terminate(to_decode, p2.wrapping_offset_from(to_decode) as libc::c_int);
+            p2 = p2.offset(1isize);
+            // skip language
+            p2 = strchr(p2, '\'' as i32);
+            if !p2.is_null() {
+                p2 = p2.offset(1isize);
+                decoded = dc_urldecode(p2);
+                if !charset.is_null()
+                    && strcmp(charset, b"utf-8\x00" as *const u8 as *const libc::c_char) != 0i32
+                    && strcmp(charset, b"UTF-8\x00" as *const u8 as *const libc::c_char) != 0i32
+                {
+                    if let Some(encoding) =
+                        Charset::for_label(CStr::from_ptr(charset).to_str().unwrap().as_bytes())
+                    {
+                        let data =
+                            std::slice::from_raw_parts(decoded as *const u8, strlen(decoded));
+
+                        let (res, _, _) = encoding.decode(data);
+                        free(decoded as *mut _);
+                        let r = std::ffi::CString::new(res.as_bytes()).unwrap();
+                        decoded = dc_strdup(r.as_ptr());
+                    }
+                }
+            }
+        }
+    }
+    free(charset as *mut libc::c_void);
+    return if !decoded.is_null() {
+        decoded
+    } else {
+        dc_strdup(to_decode)
+    };
 }
 
 unsafe fn print_hex(target: *mut libc::c_char, cur: *const libc::c_char) {
@@ -335,6 +712,13 @@ mod tests {
     use super::*;
     use std::ffi::CStr;
 
+    #[test]
+    fn test_isalnum() {
+        assert_eq!(isalnum(0), 0);
+        assert_eq!(isalnum('5' as libc::c_int), 1);
+        assert_eq!(isalnum('Q' as libc::c_int), 1);
+    }
+
     #[test]
     fn test_dc_decode_header_words() {
         unsafe {
@@ -395,43 +779,99 @@ mod tests {
 
     #[test]
     fn test_dc_encode_ext_header() {
-        let buf1 = dc_encode_ext_header("Björn Petersen");
-        assert_eq!(&buf1, "utf-8\'\'Bj%C3%B6rn%20Petersen");
-        let buf2 = dc_decode_ext_header(buf1.as_bytes());
-        assert_eq!(&buf2, "Björn Petersen",);
+        unsafe {
+            let mut buf1 = dc_encode_ext_header(
+                b"Bj\xc3\xb6rn Petersen\x00" as *const u8 as *const libc::c_char,
+            );
+            assert_eq!(
+                CStr::from_ptr(buf1).to_str().unwrap(),
+                "utf-8\'\'Bj%C3%B6rn%20Petersen"
+            );
+            let buf2 = dc_decode_ext_header(buf1);
+            assert_eq!(
+                strcmp(
+                    buf2,
+                    b"Bj\xc3\xb6rn Petersen\x00" as *const u8 as *const libc::c_char,
+                ),
+                0
+            );
+            free(buf1 as *mut libc::c_void);
+            free(buf2 as *mut libc::c_void);
 
-        let buf1 = dc_decode_ext_header(b"iso-8859-1\'en\'%A3%20rates");
-        assert_eq!(buf1, "£ rates",);
+            buf1 = dc_decode_ext_header(
+                b"iso-8859-1\'en\'%A3%20rates\x00" as *const u8 as *const libc::c_char,
+            );
+            assert_eq!(
+                strcmp(
+                    buf1,
+                    b"\xc2\xa3 rates\x00" as *const u8 as *const libc::c_char,
+                ),
+                0
+            );
+            free(buf1 as *mut libc::c_void);
 
-        let buf1 = dc_decode_ext_header(b"wrong\'format");
-        assert_eq!(buf1, "wrong\'format",);
+            buf1 = dc_decode_ext_header(b"wrong\'format\x00" as *const u8 as *const libc::c_char);
+            assert_eq!(
+                strcmp(
+                    buf1,
+                    b"wrong\'format\x00" as *const u8 as *const libc::c_char,
+                ),
+                0
+            );
+            free(buf1 as *mut libc::c_void);
 
-        let buf1 = dc_decode_ext_header(b"\'\'");
-        assert_eq!(buf1, "\'\'");
+            buf1 = dc_decode_ext_header(b"\'\'\x00" as *const u8 as *const libc::c_char);
+            assert_eq!(
+                strcmp(buf1, b"\'\'\x00" as *const u8 as *const libc::c_char),
+                0
+            );
+            free(buf1 as *mut libc::c_void);
 
-        let buf1 = dc_decode_ext_header(b"x\'\'");
-        assert_eq!(buf1, "");
+            buf1 = dc_decode_ext_header(b"x\'\'\x00" as *const u8 as *const libc::c_char);
+            assert_eq!(strcmp(buf1, b"\x00" as *const u8 as *const libc::c_char), 0);
+            free(buf1 as *mut libc::c_void);
 
-        let buf1 = dc_decode_ext_header(b"\'");
-        assert_eq!(buf1, "\'");
+            buf1 = dc_decode_ext_header(b"\'\x00" as *const u8 as *const libc::c_char);
+            assert_eq!(
+                strcmp(buf1, b"\'\x00" as *const u8 as *const libc::c_char),
+                0
+            );
+            free(buf1 as *mut libc::c_void);
 
-        let buf1 = dc_decode_ext_header(b"");
-        assert_eq!(buf1, "");
-
-        // regressions
-        assert_eq!(
-            dc_decode_ext_header(dc_encode_ext_header("%0A").as_bytes()),
-            "%0A"
-        );
+            buf1 = dc_decode_ext_header(b"\x00" as *const u8 as *const libc::c_char);
+            assert_eq!(strcmp(buf1, b"\x00" as *const u8 as *const libc::c_char), 0);
+            free(buf1 as *mut libc::c_void);
+        }
     }
 
     #[test]
     fn test_dc_needs_ext_header() {
-        assert_eq!(dc_needs_ext_header("Björn"), true);
-        assert_eq!(dc_needs_ext_header("Bjoern"), false);
-        assert_eq!(dc_needs_ext_header(""), false);
-        assert_eq!(dc_needs_ext_header(" "), true);
-        assert_eq!(dc_needs_ext_header("a b"), true);
+        unsafe {
+            assert_eq!(
+                dc_needs_ext_header(b"Bj\xc3\xb6rn\x00" as *const u8 as *const libc::c_char),
+                true
+            );
+            assert_eq!(
+                dc_needs_ext_header(b"Bjoern\x00" as *const u8 as *const libc::c_char),
+                false
+            );
+            assert_eq!(
+                dc_needs_ext_header(b"\x00" as *const u8 as *const libc::c_char),
+                false
+            );
+            assert_eq!(
+                dc_needs_ext_header(b" \x00" as *const u8 as *const libc::c_char),
+                true
+            );
+            assert_eq!(
+                dc_needs_ext_header(b"a b\x00" as *const u8 as *const libc::c_char),
+                true
+            );
+            assert_eq!(
+                dc_needs_ext_header(0 as *const u8 as *const libc::c_char),
+                false
+            );
+        }
     }
 
     #[test]
@@ -446,20 +886,68 @@ mod tests {
         assert_eq!(to_string(hex.as_ptr() as *const _), "=3A");
     }
 
-    use proptest::prelude::*;
+    #[test]
+    fn test_dc_urlencode_urldecode() {
+        unsafe {
+            let buf1 =
+                dc_urlencode(b"Bj\xc3\xb6rn Petersen\x00" as *const u8 as *const libc::c_char);
 
-    proptest! {
-        #[test]
-        fn test_ext_header_roundtrip(buf: String) {
-            let encoded = dc_encode_ext_header(&buf);
-            let decoded = dc_decode_ext_header(encoded.as_bytes());
-            assert_eq!(buf, decoded);
-        }
+            assert_eq!(
+                CStr::from_ptr(buf1 as *const libc::c_char)
+                    .to_str()
+                    .unwrap(),
+                "Bj%C3%B6rn+Petersen"
+            );
 
-        #[test]
-        fn test_ext_header_decode_anything(buf: Vec<u8>) {
-            // make sure this never panics
-            let _decoded = dc_decode_ext_header(&buf);
+            let buf2 = dc_urldecode(buf1);
+
+            assert_eq!(
+                strcmp(
+                    buf2,
+                    b"Bj\xc3\xb6rn Petersen\x00" as *const u8 as *const libc::c_char
+                ),
+                0
+            );
+
+            free(buf1 as *mut libc::c_void);
+            free(buf2 as *mut libc::c_void);
         }
     }
+
+    #[test]
+    fn test_dc_encode_decode_modified_utf7() {
+        unsafe {
+            let buf1 = dc_encode_modified_utf7(
+                b"Bj\xc3\xb6rn Petersen\x00" as *const u8 as *const libc::c_char,
+                1,
+            );
+
+            assert_eq!(
+                CStr::from_ptr(buf1 as *const libc::c_char)
+                    .to_str()
+                    .unwrap(),
+                "Bj&APY-rn_Petersen"
+            );
+
+            let buf2 = dc_decode_modified_utf7(buf1, 1);
+
+            assert_eq!(
+                strcmp(
+                    buf2,
+                    b"Bj\xc3\xb6rn Petersen\x00" as *const u8 as *const libc::c_char
+                ),
+                0
+            );
+
+            free(buf1 as *mut libc::c_void);
+            free(buf2 as *mut libc::c_void);
+        }
+    }
+    #[test]
+    fn test_hex_to_int() {
+        assert_eq!(hex_2_int(b'A' as libc::c_char), 10);
+        assert_eq!(hex_2_int(b'a' as libc::c_char), 10);
+        assert_eq!(hex_2_int(b'4' as libc::c_char), 4);
+        assert_eq!(hex_2_int(b'K' as libc::c_char), 20);
+    }
 }

src/dc_token.rs

@@ -0,0 +1,65 @@
+use crate::context::Context;
+use crate::dc_tools::*;
+use crate::sql;
+
+// Token namespaces
+#[allow(non_camel_case_types)]
+pub type dc_tokennamespc_t = usize;
+pub const DC_TOKEN_AUTH: dc_tokennamespc_t = 110;
+pub const DC_TOKEN_INVITENUMBER: dc_tokennamespc_t = 100;
+
+// Functions to read/write token from/to the database. A token is any string associated with a key.
+
+pub fn dc_token_save(
+    context: &Context,
+    namespc: dc_tokennamespc_t,
+    foreign_id: u32,
+    token: *const libc::c_char,
+) -> bool {
+    if token.is_null() {
+        return false;
+    }
+    // foreign_id may be 0
+    sql::execute(
+        context,
+        &context.sql,
+        "INSERT INTO tokens (namespc, foreign_id, token, timestamp) VALUES (?, ?, ?, ?);",
+        params![namespc as i32, foreign_id as i32, as_str(token), time()],
+    )
+    .is_ok()
+}
+
+pub fn dc_token_lookup(
+    context: &Context,
+    namespc: dc_tokennamespc_t,
+    foreign_id: u32,
+) -> *mut libc::c_char {
+    context
+        .sql
+        .query_row_col::<_, String>(
+            context,
+            "SELECT token FROM tokens WHERE namespc=? AND foreign_id=?;",
+            params![namespc as i32, foreign_id as i32],
+            0,
+        )
+        .map(|s| unsafe { s.strdup() })
+        .unwrap_or_else(|| std::ptr::null_mut())
+}
+
+pub fn dc_token_exists(
+    context: &Context,
+    namespc: dc_tokennamespc_t,
+    token: *const libc::c_char,
+) -> bool {
+    if token.is_null() {
+        return false;
+    }
+
+    context
+        .sql
+        .exists(
+            "SELECT id FROM tokens WHERE namespc=? AND token=?;",
+            params![namespc as i32, as_str(token)],
+        )
+        .unwrap_or_default()
+}

src/error.rs

@@ -18,12 +18,6 @@ pub enum Error {
     Io(std::io::Error),
     #[fail(display = "{:?}", _0)]
     Message(String),
-    #[fail(display = "{:?}", _0)]
-    Image(image_meta::ImageError),
-    #[fail(display = "{:?}", _0)]
-    Utf8(std::str::Utf8Error),
-    #[fail(display = "{:?}", _0)]
-    CStringError(crate::dc_tools::CStringError),
 }
 
 pub type Result<T> = std::result::Result<T, Error>;
@@ -52,24 +46,6 @@ impl From<std::io::Error> for Error {
     }
 }
 
-impl From<std::str::Utf8Error> for Error {
-    fn from(err: std::str::Utf8Error) -> Error {
-        Error::Utf8(err)
-    }
-}
-
-impl From<image_meta::ImageError> for Error {
-    fn from(err: image_meta::ImageError) -> Error {
-        Error::Image(err)
-    }
-}
-
-impl From<crate::dc_tools::CStringError> for Error {
-    fn from(err: crate::dc_tools::CStringError) -> Error {
-        Error::CStringError(err)
-    }
-}
-
 #[macro_export]
 macro_rules! bail {
     ($e:expr) => {

src/events.rs

@@ -1,229 +0,0 @@
-use std::path::PathBuf;
-
-use strum::EnumProperty;
-
-use crate::stock::StockMessage;
-
-impl Event {
-    /// Returns the corresponding Event id.
-    pub fn as_id(&self) -> i32 {
-        self.get_str("id")
-            .expect("missing id")
-            .parse()
-            .expect("invalid id")
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, EnumProperty)]
-pub enum Event {
-    /// The library-user may write an informational string to the log.
-    /// Passed to the callback given to dc_context_new().
-    /// This event should not be reported to the end-user using a popup or something like that.
-    ///
-    /// @return 0
-    #[strum(props(id = "100"))]
-    Info(String),
-
-    /// Emitted when SMTP connection is established and login was successful.
-    ///
-    /// @return 0
-    #[strum(props(id = "101"))]
-    SmtpConnected(String),
-
-    /// Emitted when IMAP connection is established and login was successful.
-    ///
-    /// @return 0
-    #[strum(props(id = "102"))]
-    ImapConnected(String),
-
-    /// Emitted when a message was successfully sent to the SMTP server.
-    ///
-    /// @return 0
-    #[strum(props(id = "103"))]
-    SmtpMessageSent(String),
-
-    /// The library-user should write a warning string to the log.
-    /// Passed to the callback given to dc_context_new().
-    ///
-    /// This event should not be reported to the end-user using a popup or something like that.
-    ///
-    /// @return 0
-    #[strum(props(id = "300"))]
-    Warning(String),
-
-    /// The library-user should report an error to the end-user.
-    /// Passed to the callback given to dc_context_new().
-    ///
-    /// As most things are asynchronous, things may go wrong at any time and the user
-    /// should not be disturbed by a dialog or so.  Instead, use a bubble or so.
-    ///
-    /// However, for ongoing processes (eg. configure())
-    /// or for functions that are expected to fail (eg. dc_continue_key_transfer())
-    /// it might be better to delay showing these events until the function has really
-    /// failed (returned false). It should be sufficient to report only the _last_ error
-    /// in a messasge box then.
-    ///
-    /// @return
-    #[strum(props(id = "400"))]
-    Error(String),
-
-    /// An action cannot be performed because there is no network available.
-    ///
-    /// The library will typically try over after a some time
-    /// and when dc_maybe_network() is called.
-    ///
-    /// Network errors should be reported to users in a non-disturbing way,
-    /// however, as network errors may come in a sequence,
-    /// it is not useful to raise each an every error to the user.
-    /// For this purpose, data1 is set to 1 if the error is probably worth reporting.
-    ///
-    /// Moreover, if the UI detects that the device is offline,
-    /// it is probably more useful to report this to the user
-    /// instead of the string from data2.
-    ///
-    /// @return 0
-    #[strum(props(id = "401"))]
-    ErrorNetwork(String),
-
-    /// An action cannot be performed because the user is not in the group.
-    /// Reported eg. after a call to
-    /// dc_set_chat_name(), dc_set_chat_profile_image(),
-    /// dc_add_contact_to_chat(), dc_remove_contact_from_chat(),
-    /// dc_send_text_msg() or another sending function.
-    ///
-    /// @return 0
-    #[strum(props(id = "410"))]
-    ErrorSelfNotInGroup(String),
-
-    /// Messages or chats changed.  One or more messages or chats changed for various
-    /// reasons in the database:
-    /// - Messages sent, received or removed
-    /// - Chats created, deleted or archived
-    /// - A draft has been set
-    ///
-    /// @return 0
-    #[strum(props(id = "2000"))]
-    MsgsChanged { chat_id: u32, msg_id: u32 },
-
-    /// There is a fresh message. Typically, the user will show an notification
-    /// when receiving this message.
-    ///
-    /// There is no extra #DC_EVENT_MSGS_CHANGED event send together with this event.
-    ///
-    /// @return 0
-    #[strum(props(id = "2005"))]
-    IncomingMsg { chat_id: u32, msg_id: u32 },
-
-    /// A single message is sent successfully. State changed from  DC_STATE_OUT_PENDING to
-    /// DC_STATE_OUT_DELIVERED, see dc_msg_get_state().
-    ///
-    /// @return 0
-    #[strum(props(id = "2010"))]
-    MsgDelivered { chat_id: u32, msg_id: u32 },
-
-    /// A single message could not be sent. State changed from DC_STATE_OUT_PENDING or DC_STATE_OUT_DELIVERED to
-    /// DC_STATE_OUT_FAILED, see dc_msg_get_state().
-    ///
-    /// @return 0
-    #[strum(props(id = "2012"))]
-    MsgFailed { chat_id: u32, msg_id: u32 },
-
-    /// A single message is read by the receiver. State changed from DC_STATE_OUT_DELIVERED to
-    /// DC_STATE_OUT_MDN_RCVD, see dc_msg_get_state().
-    ///
-    /// @return 0
-    #[strum(props(id = "2015"))]
-    MsgRead { chat_id: u32, msg_id: u32 },
-
-    /// Chat changed.  The name or the image of a chat group was changed or members were added or removed.
-    /// Or the verify state of a chat has changed.
-    /// See dc_set_chat_name(), dc_set_chat_profile_image(), dc_add_contact_to_chat()
-    /// and dc_remove_contact_from_chat().
-    ///
-    /// @return 0
-    #[strum(props(id = "2020"))]
-    ChatModified(u32),
-
-    /// Contact(s) created, renamed, blocked or deleted.
-    ///
-    /// @param data1 (int) If set, this is the contact_id of an added contact that should be selected.
-    /// @return 0
-    #[strum(props(id = "2030"))]
-    ContactsChanged(Option<u32>),
-
-    /// Location of one or more contact has changed.
-    ///
-    /// @param data1 (u32) contact_id of the contact for which the location has changed.
-    ///     If the locations of several contacts have been changed,
-    ///     eg. after calling dc_delete_all_locations(), this parameter is set to `None`.
-    /// @return 0
-    #[strum(props(id = "2035"))]
-    LocationChanged(Option<u32>),
-
-    /// Inform about the configuration progress started by configure().
-    ///
-    /// @param data1 (usize) 0=error, 1-999=progress in permille, 1000=success and done
-    /// @return 0
-    #[strum(props(id = "2041"))]
-    ConfigureProgress(usize),
-
-    /// Inform about the import/export progress started by dc_imex().
-    ///
-    /// @param data1 (usize) 0=error, 1-999=progress in permille, 1000=success and done
-    /// @param data2 0
-    /// @return 0
-    #[strum(props(id = "2051"))]
-    ImexProgress(usize),
-
-    /// A file has been exported. A file has been written by dc_imex().
-    /// This event may be sent multiple times by a single call to dc_imex().
-    ///
-    /// A typical purpose for a handler of this event may be to make the file public to some system
-    /// services.
-    ///
-    /// @param data2 0
-    /// @return 0
-    #[strum(props(id = "2052"))]
-    ImexFileWritten(PathBuf),
-
-    /// Progress information of a secure-join handshake from the view of the inviter
-    /// (Alice, the person who shows the QR code).
-    ///
-    /// These events are typically sent after a joiner has scanned the QR code
-    /// generated by dc_get_securejoin_qr().
-    ///
-    /// @param data1 (int) ID of the contact that wants to join.
-    /// @param data2 (int) Progress as:
-    ///     300=vg-/vc-request received, typically shown as "bob@addr joins".
-    ///     600=vg-/vc-request-with-auth received, vg-member-added/vc-contact-confirm sent, typically shown as "bob@addr verified".
-    ///     800=vg-member-added-received received, shown as "bob@addr securely joined GROUP", only sent for the verified-group-protocol.
-    ///     1000=Protocol finished for this contact.
-    /// @return 0
-    #[strum(props(id = "2060"))]
-    SecurejoinInviterProgress { contact_id: u32, progress: usize },
-
-    /// Progress information of a secure-join handshake from the view of the joiner
-    /// (Bob, the person who scans the QR code).
-    /// The events are typically sent while dc_join_securejoin(), which
-    /// may take some time, is executed.
-    /// @param data1 (int) ID of the inviting contact.
-    /// @param data2 (int) Progress as:
-    ///     400=vg-/vc-request-with-auth sent, typically shown as "alice@addr verified, introducing myself."
-    ///     (Bob has verified alice and waits until Alice does the same for him)
-    /// @return 0
-    #[strum(props(id = "2061"))]
-    SecurejoinJoinerProgress { contact_id: u32, progress: usize },
-
-    // the following events are functions that should be provided by the frontends
-    /// Requeste a localized string from the frontend.
-    /// @param data1 (int) ID of the string to request, one of the DC_STR_/// constants.
-    /// @param data2 (int) The count. If the requested string contains a placeholder for a numeric value,
-    ///     the ui may use this value to return different strings on different plural forms.
-    /// @return (const char*) Null-terminated UTF-8 string.
-    ///     The string will be free()'d by the core,
-    ///     so it must be allocated using malloc() or a compatible function.
-    ///     Return 0 if the ui cannot provide the requested string
-    ///     the core will use a default string in english language then.
-    #[strum(props(id = "2091"))]
-    GetString { id: StockMessage, count: usize },
-}

src/imap.rs

@@ -1,49 +1,42 @@
 use std::ffi::CString;
 use std::net;
-use std::ptr;
-use std::sync::{
-    atomic::{AtomicBool, Ordering},
-    Arc, Condvar, Mutex, RwLock,
-};
+use std::sync::{Arc, Condvar, Mutex, RwLock};
 use std::time::{Duration, SystemTime};
 
 use crate::constants::*;
 use crate::context::Context;
-use crate::dc_receive_imf::dc_receive_imf;
+use crate::dc_loginparam::*;
 use crate::dc_tools::CStringExt;
-use crate::dc_tools::*;
-use crate::events::Event;
-use crate::job::{job_add, Action};
-use crate::login_param::LoginParam;
-use crate::message::{dc_rfc724_mid_exists, dc_update_msg_move_state, dc_update_server_uid};
 use crate::oauth2::dc_get_oauth2_access_token;
-use crate::param::Params;
+use crate::types::*;
 
-const DC_IMAP_SEEN: usize = 0x0001;
-const DC_REGENERATE: usize = 0x01;
+pub const DC_IMAP_SEEN: usize = 0x0001;
+pub const DC_REGENERATE: usize = 0x01;
 
-const DC_SUCCESS: usize = 3;
-const DC_ALREADY_DONE: usize = 2;
-const DC_RETRY_LATER: usize = 1;
-const DC_FAILED: usize = 0;
+pub const DC_SUCCESS: usize = 3;
+pub const DC_ALREADY_DONE: usize = 2;
+pub const DC_RETRY_LATER: usize = 1;
+pub const DC_FAILED: usize = 0;
 
-const PREFETCH_FLAGS: &str = "(UID ENVELOPE)";
-const BODY_FLAGS: &str = "(FLAGS BODY.PEEK[])";
-const FETCH_FLAGS: &str = "(FLAGS)";
+const PREFETCH_FLAGS: &'static str = "(UID ENVELOPE)";
+const BODY_FLAGS: &'static str = "(FLAGS BODY.PEEK[])";
+const FETCH_FLAGS: &'static str = "(FLAGS)";
 
-#[derive(Debug)]
+#[repr(C)]
 pub struct Imap {
     config: Arc<RwLock<ImapConfig>>,
     watch: Arc<(Mutex<bool>, Condvar)>,
 
+    get_config: dc_get_config_t,
+    set_config: dc_set_config_t,
+    precheck_imf: dc_precheck_imf_t,
+    receive_imf: dc_receive_imf_t,
+
     session: Arc<Mutex<Option<Session>>>,
     stream: Arc<RwLock<Option<net::TcpStream>>>,
     connected: Arc<Mutex<bool>>,
-
-    should_reconnect: AtomicBool,
 }
 
-#[derive(Debug)]
 struct OAuth2 {
     user: String,
     access_token: String,
@@ -62,14 +55,13 @@ impl imap::Authenticator for OAuth2 {
 }
 
 #[derive(Debug)]
-enum FolderMeaning {
+pub enum FolderMeaning {
     Unknown,
     SentObjects,
     Other,
 }
 
-#[derive(Debug)]
-enum Client {
+pub enum Client {
     Secure(
         imap::Client<native_tls::TlsStream<net::TcpStream>>,
         net::TcpStream,
@@ -77,14 +69,12 @@ enum Client {
     Insecure(imap::Client<net::TcpStream>, net::TcpStream),
 }
 
-#[derive(Debug)]
-enum Session {
+pub enum Session {
     Secure(imap::Session<native_tls::TlsStream<net::TcpStream>>),
     Insecure(imap::Session<net::TcpStream>),
 }
 
-#[derive(Debug)]
-enum IdleHandle<'a> {
+pub enum IdleHandle<'a> {
     Secure(imap::extensions::idle::Handle<'a, native_tls::TlsStream<net::TcpStream>>),
     Insecure(imap::extensions::idle::Handle<'a, net::TcpStream>),
 }
@@ -209,8 +199,8 @@ impl Session {
 
     pub fn create<S: AsRef<str>>(&mut self, mailbox_name: S) -> imap::error::Result<()> {
         match self {
-            Session::Secure(i) => i.create(mailbox_name),
-            Session::Insecure(i) => i.create(mailbox_name),
+            Session::Secure(i) => i.subscribe(mailbox_name),
+            Session::Insecure(i) => i.subscribe(mailbox_name),
         }
     }
 
@@ -270,8 +260,8 @@ impl Session {
 
     pub fn idle(&mut self) -> imap::error::Result<IdleHandle> {
         match self {
-            Session::Secure(i) => i.idle().map(IdleHandle::Secure),
-            Session::Insecure(i) => i.idle().map(IdleHandle::Insecure),
+            Session::Secure(i) => i.idle().map(|h| IdleHandle::Secure(h)),
+            Session::Insecure(i) => i.idle().map(|h| IdleHandle::Insecure(h)),
         }
     }
 
@@ -313,8 +303,7 @@ impl Session {
     }
 }
 
-#[derive(Debug)]
-struct ImapConfig {
+pub struct ImapConfig {
     pub addr: String,
     pub imap_server: String,
     pub imap_port: u16,
@@ -324,6 +313,7 @@ struct ImapConfig {
     pub selected_folder: Option<String>,
     pub selected_mailbox: Option<imap::types::Mailbox>,
     pub selected_folder_needs_expunge: bool,
+    pub should_reconnect: bool,
     pub can_idle: bool,
     pub has_xlist: bool,
     pub imap_delimiter: char,
@@ -342,6 +332,7 @@ impl Default for ImapConfig {
             selected_folder: None,
             selected_mailbox: None,
             selected_folder_needs_expunge: false,
+            should_reconnect: false,
             can_idle: false,
             has_xlist: false,
             imap_delimiter: '.',
@@ -353,14 +344,22 @@ impl Default for ImapConfig {
 }
 
 impl Imap {
-    pub fn new() -> Self {
+    pub fn new(
+        get_config: dc_get_config_t,
+        set_config: dc_set_config_t,
+        precheck_imf: dc_precheck_imf_t,
+        receive_imf: dc_receive_imf_t,
+    ) -> Self {
         Imap {
             session: Arc::new(Mutex::new(None)),
             stream: Arc::new(RwLock::new(None)),
             config: Arc::new(RwLock::new(ImapConfig::default())),
             watch: Arc::new((Mutex::new(false), Condvar::new())),
+            get_config,
+            set_config,
+            precheck_imf,
+            receive_imf,
             connected: Arc::new(Mutex::new(false)),
-            should_reconnect: AtomicBool::new(false),
         }
     }
 
@@ -369,7 +368,7 @@ impl Imap {
     }
 
     pub fn should_reconnect(&self) -> bool {
-        self.should_reconnect.load(Ordering::Relaxed)
+        self.config.read().unwrap().should_reconnect
     }
 
     fn setup_handle_if_needed(&self, context: &Context) -> bool {
@@ -382,7 +381,7 @@ impl Imap {
         }
 
         if self.is_connected() && self.stream.read().unwrap().is_some() {
-            self.should_reconnect.store(false, Ordering::Relaxed);
+            self.config.write().unwrap().should_reconnect = false;
             return true;
         }
 
@@ -438,19 +437,21 @@ impl Imap {
                 let imap_server: &str = config.imap_server.as_ref();
                 let imap_port = config.imap_port;
 
-                emit_event!(
+                log_event!(
                     context,
-                    Event::ErrorNetwork(format!(
-                        "Could not connect to IMAP-server {}:{}. ({})",
-                        imap_server, imap_port, err
-                    ))
+                    Event::ERROR_NETWORK,
+                    0,
+                    "Could not connect to IMAP-server {}:{}. ({})",
+                    imap_server,
+                    imap_port,
+                    err
                 );
 
                 return false;
             }
         };
 
-        self.should_reconnect.store(false, Ordering::Relaxed);
+        self.config.write().unwrap().should_reconnect = false;
 
         match login_res {
             Ok((session, stream)) => {
@@ -459,10 +460,7 @@ impl Imap {
                 true
             }
             Err((err, _)) => {
-                emit_event!(
-                    context,
-                    Event::ErrorNetwork(format!("Cannot login ({})", err))
-                );
+                log_event!(context, Event::ERROR_NETWORK, 0, "Cannot login ({})", err);
                 self.unsetup_handle(context);
 
                 false
@@ -471,30 +469,39 @@ impl Imap {
     }
 
     fn unsetup_handle(&self, context: &Context) {
-        info!(context, "IMAP unsetup_handle starts");
-
-        info!(context, "IMAP unsetup_handle step 1 (closing down stream).");
-        let stream = self.stream.write().unwrap().take();
-        if let Some(stream) = stream {
-            if let Err(err) = stream.shutdown(net::Shutdown::Both) {
-                eprintln!("failed to shutdown connection: {:?}", err);
-            }
-        }
+        info!(context, 0, "IMAP unsetup_handle starts");
 
         info!(
             context,
-            "IMAP unsetup_handle step 2 (acquiring session.lock)"
+            0, "IMAP unsetup_handle step 1 (closing down stream)."
         );
-        if let Some(mut session) = self.session.lock().unwrap().take() {
-            if let Err(err) = session.close() {
-                eprintln!("failed to close connection: {:?}", err);
+        let stream = self.stream.write().unwrap().take();
+        if stream.is_some() {
+            match stream.unwrap().shutdown(net::Shutdown::Both) {
+                Ok(_) => {}
+                Err(err) => {
+                    eprintln!("failed to shutdown connection: {:?}", err);
+                }
+            }
+        }
+        info!(
+            context,
+            0, "IMAP unsetup_handle step 2 (acquiring session.lock)"
+        );
+        let session = self.session.lock().unwrap().take();
+        if session.is_some() {
+            match session.unwrap().close() {
+                Ok(_) => {}
+                Err(err) => {
+                    eprintln!("failed to close connection: {:?}", err);
+                }
             }
         }
 
-        info!(context, "IMAP unsetup_handle step 3 (clearing config).");
+        info!(context, 0, "IMAP unsetup_handle step 3 (clearing config).");
         self.config.write().unwrap().selected_folder = None;
         self.config.write().unwrap().selected_mailbox = None;
-        info!(context, "IMAP unsetup_handle step 4 (disconnected).",);
+        info!(context, 0, "IMAP unsetup_handle step 4 (disconnected).",);
     }
 
     fn free_connect_params(&self) {
@@ -512,7 +519,7 @@ impl Imap {
         cfg.watch_folder = None;
     }
 
-    pub fn connect(&self, context: &Context, lp: &LoginParam) -> bool {
+    pub fn connect(&self, context: &Context, lp: &dc_loginparam_t) -> bool {
         if lp.mail_server.is_empty() || lp.mail_user.is_empty() || lp.mail_pw.is_empty() {
             return false;
         }
@@ -532,7 +539,7 @@ impl Imap {
             let mut config = self.config.write().unwrap();
             config.addr = addr.to_string();
             config.imap_server = imap_server.to_string();
-            config.imap_port = imap_port;
+            config.imap_port = imap_port.into();
             config.imap_user = imap_user.to_string();
             config.imap_pw = imap_pw.to_string();
             config.server_flags = server_flags;
@@ -543,44 +550,48 @@ impl Imap {
             return false;
         }
 
-        let (teardown, can_idle, has_xlist) = match &mut *self.session.lock().unwrap() {
-            Some(ref mut session) => match session.capabilities() {
-                Ok(caps) => {
-                    if !context.sql.is_open() {
-                        warn!(context, "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));
-                        emit_event!(
-                            context,
-                            Event::ImapConnected(format!(
-                                "IMAP-LOGIN as {}, capabilities: {}",
-                                lp.mail_user, caps_list,
-                            ))
-                        );
-                        (false, can_idle, has_xlist)
-                    }
-                }
-                Err(err) => {
-                    info!(context, "CAPABILITY command error: {}", err);
-                    (true, false, false)
-                }
-            },
-            None => (true, false, false),
-        };
+        let teardown: bool;
 
+        match &mut *self.session.lock().unwrap() {
+            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,);
+                        teardown = true;
+                    } else {
+                        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,
+                            0,
+                            "IMAP-LOGIN as {}, capabilities: {}",
+                            lp.mail_user,
+                            caps_list,
+                        );
+                        self.config.write().unwrap().can_idle = can_idle;
+                        self.config.write().unwrap().has_xlist = has_xlist;
+                        *self.connected.lock().unwrap() = true;
+                        teardown = false;
+                    }
+                } else {
+                    teardown = true;
+                }
+            }
+            None => {
+                teardown = true;
+            }
+        }
         if teardown {
             self.unsetup_handle(context);
             self.free_connect_params();
             false
         } else {
-            self.config.write().unwrap().can_idle = can_idle;
-            self.config.write().unwrap().has_xlist = has_xlist;
-            *self.connected.lock().unwrap() = true;
             true
         }
     }
@@ -642,7 +653,7 @@ impl Imap {
         // deselect existing folder, if needed (it's also done implicitly by SELECT, however, without EXPUNGE then)
         if self.config.read().unwrap().selected_folder_needs_expunge {
             if let Some(ref folder) = self.config.read().unwrap().selected_folder {
-                info!(context, "Expunge messages in \"{}\".", folder);
+                info!(context, 0, "Expunge messages in \"{}\".", folder);
 
                 // A CLOSE-SELECT is considerably faster than an EXPUNGE-SELECT, see
                 // https://tools.ietf.org/html/rfc3501#section-6.4.2
@@ -672,13 +683,15 @@ impl Imap {
                     Err(err) => {
                         info!(
                             context,
+                            0,
                             "Cannot select folder: {}; {:?}.",
                             folder.as_ref(),
                             err
                         );
 
-                        self.config.write().unwrap().selected_folder = None;
-                        self.should_reconnect.store(true, Ordering::Relaxed);
+                        let mut config = self.config.write().unwrap();
+                        config.selected_folder = None;
+                        config.should_reconnect = true;
                         return 0;
                     }
                 }
@@ -692,7 +705,7 @@ impl Imap {
 
     fn get_config_last_seen_uid<S: AsRef<str>>(&self, context: &Context, folder: S) -> (u32, u32) {
         let key = format!("imap.mailbox.{}", folder.as_ref());
-        if let Some(entry) = context.sql.get_config(context, &key) {
+        if let Some(entry) = (self.get_config)(context, &key) {
             // the entry has the format `imap.mailbox.<folder>=<uidvalidity>:<lastseenuid>`
             let mut parts = entry.split(':');
             (
@@ -708,6 +721,7 @@ impl Imap {
         if !self.is_connected() {
             info!(
                 context,
+                0,
                 "Cannot fetch from \"{}\" - not connected.",
                 folder.as_ref()
             );
@@ -718,6 +732,7 @@ impl Imap {
         if self.select_folder(context, Some(&folder)) == 0 {
             info!(
                 context,
+                0,
                 "Cannot select folder \"{}\" for fetching.",
                 folder.as_ref()
             );
@@ -734,6 +749,7 @@ impl Imap {
         if mailbox.uid_validity.is_none() {
             error!(
                 context,
+                0,
                 "Cannot get UIDVALIDITY for folder \"{}\".",
                 folder.as_ref(),
             );
@@ -745,7 +761,7 @@ impl Imap {
             // first time this folder is selected or UIDVALIDITY has changed, init lastseenuid and save it to config
 
             if mailbox.exists == 0 {
-                info!(context, "Folder \"{}\" is empty.", folder.as_ref());
+                info!(context, 0, "Folder \"{}\" is empty.", folder.as_ref());
 
                 // set lastseenuid=0 for empty folders.
                 // id we do not do this here, we'll miss the first message
@@ -761,9 +777,10 @@ impl Imap {
                 match session.fetch(set, PREFETCH_FLAGS) {
                     Ok(list) => list,
                     Err(_err) => {
-                        self.should_reconnect.store(true, Ordering::Relaxed);
+                        self.config.write().unwrap().should_reconnect = true;
                         info!(
                             context,
+                            0,
                             "No result returned for folder \"{}\".",
                             folder.as_ref()
                         );
@@ -786,6 +803,7 @@ impl Imap {
             self.set_config_last_seen_uid(context, &folder, uid_validity, last_seen_uid);
             info!(
                 context,
+                0,
                 "lastseenuid initialized to {} for {}@{}",
                 last_seen_uid,
                 folder.as_ref(),
@@ -804,7 +822,7 @@ impl Imap {
             match session.uid_fetch(set, PREFETCH_FLAGS) {
                 Ok(list) => list,
                 Err(err) => {
-                    warn!(context, "failed to fetch uids: {}", err);
+                    eprintln!("fetch err: {:?}", err);
                     return 0;
                 }
             }
@@ -826,12 +844,13 @@ impl Imap {
 
                 if 0 == unsafe {
                     let message_id_c = CString::yolo(message_id);
-                    precheck_imf(context, message_id_c.as_ptr(), folder.as_ref(), cur_uid)
+                    (self.precheck_imf)(context, message_id_c.as_ptr(), folder.as_ref(), cur_uid)
                 } {
                     // check passed, go fetch the rest
                     if self.fetch_single_msg(context, &folder, cur_uid) == 0 {
                         info!(
                             context,
+                            0,
                             "Read error for message {} from \"{}\", trying over later.",
                             message_id,
                             folder.as_ref()
@@ -843,6 +862,7 @@ impl Imap {
                     // check failed
                     info!(
                         context,
+                        0,
                         "Skipping message {} from \"{}\" by precheck.",
                         message_id,
                         folder.as_ref(),
@@ -863,6 +883,7 @@ impl Imap {
         if read_errors > 0 {
             warn!(
                 context,
+                0,
                 "{} mails read from \"{}\" with {} errors.",
                 read_cnt,
                 folder.as_ref(),
@@ -871,6 +892,7 @@ impl Imap {
         } else {
             info!(
                 context,
+                0,
                 "{} mails read from \"{}\".",
                 read_cnt,
                 folder.as_ref()
@@ -890,7 +912,7 @@ impl Imap {
         let key = format!("imap.mailbox.{}", folder.as_ref());
         let val = format!("{}:{}", uidvalidity, lastseenuid);
 
-        context.sql.set_config(context, &key, Some(&val)).ok();
+        (self.set_config)(context, &key, Some(&val));
     }
 
     fn fetch_single_msg<S: AsRef<str>>(
@@ -906,31 +928,41 @@ impl Imap {
             return 0;
         }
 
+        let mut retry_later = false;
+
         let set = format!("{}", server_uid);
 
         let msgs = if let Some(ref mut session) = &mut *self.session.lock().unwrap() {
             match session.uid_fetch(set, BODY_FLAGS) {
                 Ok(msgs) => msgs,
                 Err(err) => {
-                    self.should_reconnect.store(true, Ordering::Relaxed);
+                    self.config.write().unwrap().should_reconnect = true;
                     warn!(
                         context,
+                        0,
                         "Error on fetching message #{} from folder \"{}\"; retry={}; error={}.",
                         server_uid,
                         folder.as_ref(),
                         self.should_reconnect(),
                         err
                     );
-                    return 0;
+
+                    if self.should_reconnect() {
+                        // maybe we should also retry on other errors, however, we should check this carefully, as this may result in a dead lock!
+                        retry_later = true;
+                    }
+
+                    return if retry_later { 0 } else { 1 };
                 }
             }
         } else {
-            return 1;
+            return if retry_later { 0 } else { 1 };
         };
 
         if msgs.is_empty() {
             warn!(
                 context,
+                0,
                 "Message #{} does not exist in folder \"{}\".",
                 server_uid,
                 folder.as_ref()
@@ -960,7 +992,7 @@ impl Imap {
             if !is_deleted && msg.body().is_some() {
                 let body = msg.body().unwrap();
                 unsafe {
-                    dc_receive_imf(
+                    (self.receive_imf)(
                         context,
                         body.as_ptr() as *const libc::c_char,
                         body.len(),
@@ -972,7 +1004,11 @@ impl Imap {
             }
         }
 
-        1
+        if retry_later {
+            0
+        } else {
+            1
+        }
     }
 
     pub fn idle(&self, context: &Context) {
@@ -984,7 +1020,7 @@ impl Imap {
 
         let watch_folder = self.config.read().unwrap().watch_folder.clone();
         if self.select_folder(context, watch_folder.as_ref()) == 0 {
-            warn!(context, "IMAP-IDLE not setup.",);
+            warn!(context, 0, "IMAP-IDLE not setup.",);
 
             return self.fake_idle(context);
         }
@@ -994,7 +1030,7 @@ impl Imap {
             let (sender, receiver) = std::sync::mpsc::channel();
             let v = self.watch.clone();
 
-            info!(context, "IMAP-IDLE SPAWNING");
+            info!(context, 0, "IMAP-IDLE SPAWNING");
             std::thread::spawn(move || {
                 let &(ref lock, ref cvar) = &*v;
                 if let Some(ref mut session) = &mut *session.lock().unwrap() {
@@ -1029,15 +1065,18 @@ impl Imap {
 
         let handle_res = |res| match res {
             Ok(()) => {
-                info!(context, "IMAP-IDLE has data.");
+                info!(context, 0, "IMAP-IDLE has data.");
             }
             Err(err) => match err {
                 imap::error::Error::ConnectionLost => {
-                    info!(context, "IMAP-IDLE wait cancelled, we will reconnect soon.");
-                    self.should_reconnect.store(true, Ordering::Relaxed);
+                    info!(
+                        context,
+                        0, "IMAP-IDLE wait cancelled, we will reconnect soon."
+                    );
+                    self.config.write().unwrap().should_reconnect = true;
                 }
                 _ => {
-                    warn!(context, "IMAP-IDLE returns unknown value: {}", err);
+                    warn!(context, 0, "IMAP-IDLE returns unknown value: {}", err);
                 }
             },
         };
@@ -1053,7 +1092,7 @@ impl Imap {
                     if let Ok(res) = worker.as_ref().unwrap().try_recv() {
                         handle_res(res);
                     } else {
-                        info!(context, "IMAP-IDLE interrupted");
+                        info!(context, 0, "IMAP-IDLE interrupted");
                     }
 
                     drop(worker.take());
@@ -1071,7 +1110,7 @@ impl Imap {
         let fake_idle_start_time = SystemTime::now();
         let mut wait_long = false;
 
-        info!(context, "IMAP-fake-IDLEing...");
+        info!(context, 0, "IMAP-fake-IDLEing...");
 
         let mut do_fake_idle = true;
         while do_fake_idle {
@@ -1147,6 +1186,7 @@ impl Imap {
         } else if folder.as_ref() == dest_folder.as_ref() {
             info!(
                 context,
+                0,
                 "Skip moving message; message {}/{} is already in {}...",
                 folder.as_ref(),
                 uid,
@@ -1157,6 +1197,7 @@ impl Imap {
         } else {
             info!(
                 context,
+                0,
                 "Moving message {}/{} to {}...",
                 folder.as_ref(),
                 uid,
@@ -1166,6 +1207,7 @@ impl Imap {
             if self.select_folder(context, Some(folder.as_ref())) == 0 {
                 warn!(
                     context,
+                    0,
                     "Cannot select folder {} for moving message.",
                     folder.as_ref()
                 );
@@ -1179,6 +1221,7 @@ impl Imap {
                         Err(err) => {
                             info!(
                                 context,
+                                0,
                                 "Cannot move message, fallback to COPY/DELETE {}/{} to {}: {}",
                                 folder.as_ref(),
                                 uid,
@@ -1199,7 +1242,7 @@ impl Imap {
                             Ok(_) => true,
                             Err(err) => {
                                 eprintln!("error copy: {:?}", err);
-                                info!(context, "Cannot copy message.",);
+                                info!(context, 0, "Cannot copy message.",);
 
                                 false
                             }
@@ -1210,7 +1253,7 @@ impl Imap {
 
                     if copied {
                         if self.add_flag(context, uid, "\\Deleted") == 0 {
-                            warn!(context, "Cannot mark message as \"Deleted\".",);
+                            warn!(context, 0, "Cannot mark message as \"Deleted\".",);
                         }
                         self.config.write().unwrap().selected_folder_needs_expunge = true;
                         res = DC_SUCCESS;
@@ -1247,7 +1290,7 @@ impl Imap {
                 Err(err) => {
                     warn!(
                         context,
-                        "IMAP failed to store: ({}, {}) {:?}", set, query, err
+                        0, "IMAP failed to store: ({}, {}) {:?}", set, query, err
                     );
                 }
             }
@@ -1270,6 +1313,7 @@ impl Imap {
         } else if self.is_connected() {
             info!(
                 context,
+                0,
                 "Marking message {}/{} as seen...",
                 folder.as_ref(),
                 uid,
@@ -1278,11 +1322,12 @@ impl Imap {
             if self.select_folder(context, Some(folder.as_ref())) == 0 {
                 warn!(
                     context,
+                    0,
                     "Cannot select folder {} for setting SEEN flag.",
                     folder.as_ref(),
                 );
             } else if self.add_flag(context, uid, "\\Seen") == 0 {
-                warn!(context, "Cannot mark message as seen.",);
+                warn!(context, 0, "Cannot mark message as seen.",);
             } else {
                 res = DC_SUCCESS
             }
@@ -1309,6 +1354,7 @@ impl Imap {
         } else if self.is_connected() {
             info!(
                 context,
+                0,
                 "Marking message {}/{} as $MDNSent...",
                 folder.as_ref(),
                 uid,
@@ -1317,6 +1363,7 @@ impl Imap {
             if self.select_folder(context, Some(folder.as_ref())) == 0 {
                 warn!(
                     context,
+                    0,
                     "Cannot select folder {} for setting $MDNSent flag.",
                     folder.as_ref()
                 );
@@ -1383,16 +1430,16 @@ impl Imap {
                         };
 
                         if res == DC_SUCCESS {
-                            info!(context, "$MDNSent just set and MDN will be sent.");
+                            info!(context, 0, "$MDNSent just set and MDN will be sent.");
                         } else {
-                            info!(context, "$MDNSent already set and MDN already sent.");
+                            info!(context, 0, "$MDNSent already set and MDN already sent.");
                         }
                     }
                 } else {
                     res = DC_SUCCESS;
                     info!(
                         context,
-                        "Cannot store $MDNSent flags, risk sending duplicate MDN.",
+                        0, "Cannot store $MDNSent flags, risk sending duplicate MDN.",
                     );
                 }
             }
@@ -1423,6 +1470,7 @@ impl Imap {
         } else {
             info!(
                 context,
+                0,
                 "Marking message \"{}\", {}/{} for deletion...",
                 message_id.as_ref(),
                 folder.as_ref(),
@@ -1432,6 +1480,7 @@ impl Imap {
             if self.select_folder(context, Some(&folder)) == 0 {
                 warn!(
                     context,
+                    0,
                     "Cannot select folder {} for deleting message.",
                     folder.as_ref()
                 );
@@ -1452,6 +1501,7 @@ impl Imap {
                             {
                                 warn!(
                                     context,
+                                    0,
                                     "Cannot delete on IMAP, {}/{} does not match {}.",
                                     folder.as_ref(),
                                     server_uid,
@@ -1465,6 +1515,7 @@ impl Imap {
 
                             warn!(
                                 context,
+                                0,
                                 "Cannot delete on IMAP, {}/{} not found.",
                                 folder.as_ref(),
                                 server_uid,
@@ -1476,7 +1527,7 @@ impl Imap {
 
                 // mark the message for deletion
                 if self.add_flag(context, *server_uid, "\\Deleted") == 0 {
-                    warn!(context, "Cannot mark message as \"Deleted\".");
+                    warn!(context, 0, "Cannot mark message as \"Deleted\".");
                 } else {
                     self.config.write().unwrap().selected_folder_needs_expunge = true;
                     success = true
@@ -1496,7 +1547,7 @@ impl Imap {
             return;
         }
 
-        info!(context, "Configuring IMAP-folders.");
+        info!(context, 0, "Configuring IMAP-folders.");
 
         let folders = self.list_folders(context).unwrap();
         let delimiter = self.config.read().unwrap().imap_delimiter;
@@ -1515,31 +1566,30 @@ impl Imap {
             });
 
         if mvbox_folder.is_none() && 0 != (flags as usize & DC_CREATE_MVBOX) {
-            info!(context, "Creating MVBOX-folder \"DeltaChat\"...",);
+            info!(context, 0, "Creating MVBOX-folder \"DeltaChat\"...",);
 
             if let Some(ref mut session) = &mut *self.session.lock().unwrap() {
                 match session.create("DeltaChat") {
                     Ok(_) => {
                         mvbox_folder = Some("DeltaChat".into());
 
-                        info!(context, "MVBOX-folder created.",);
+                        info!(context, 0, "MVBOX-folder created.",);
                     }
                     Err(err) => {
+                        eprintln!("create error: {:?}", err);
                         warn!(
                             context,
-                            "Cannot create MVBOX-folder, using trying INBOX subfolder. ({})", err
+                            0, "Cannot create MVBOX-folder, using trying INBOX subfolder."
                         );
 
                         match session.create(&fallback_folder) {
                             Ok(_) => {
                                 mvbox_folder = Some(fallback_folder);
-                                info!(
-                                    context,
-                                    "MVBOX-folder created as INBOX subfolder. ({})", err
-                                );
+                                info!(context, 0, "MVBOX-folder created as INBOX subfolder.",);
                             }
                             Err(err) => {
-                                warn!(context, "Cannot create MVBOX-folder. ({})", err);
+                                eprintln!("create error: {:?}", err);
+                                warn!(context, 0, "Cannot create MVBOX-folder.",);
                             }
                         }
                     }
@@ -1585,13 +1635,13 @@ impl Imap {
             match session.list(Some(""), Some("*")) {
                 Ok(list) => {
                     if list.is_empty() {
-                        warn!(context, "Folder list is empty.",);
+                        warn!(context, 0, "Folder list is empty.",);
                     }
                     Some(list)
                 }
                 Err(err) => {
                     eprintln!("list error: {:?}", err);
-                    warn!(context, "Cannot get folder list.",);
+                    warn!(context, 0, "Cannot get folder list.",);
 
                     None
                 }
@@ -1645,53 +1695,3 @@ fn get_folder_meaning(folder_name: &imap::types::Name) -> FolderMeaning {
         _ => res,
     }
 }
-
-unsafe fn precheck_imf(
-    context: &Context,
-    rfc724_mid: *const libc::c_char,
-    server_folder: &str,
-    server_uid: u32,
-) -> libc::c_int {
-    let mut rfc724_mid_exists: libc::c_int = 0i32;
-    let msg_id: u32;
-    let mut old_server_folder: *mut libc::c_char = ptr::null_mut();
-    let mut old_server_uid: u32 = 0i32 as u32;
-    let mut mark_seen: libc::c_int = 0i32;
-    msg_id = dc_rfc724_mid_exists(
-        context,
-        rfc724_mid,
-        &mut old_server_folder,
-        &mut old_server_uid,
-    );
-    if msg_id != 0i32 as libc::c_uint {
-        rfc724_mid_exists = 1i32;
-        if *old_server_folder.offset(0isize) as libc::c_int == 0i32
-            && old_server_uid == 0i32 as libc::c_uint
-        {
-            info!(context, "[move] detected bbc-self {}", as_str(rfc724_mid),);
-            mark_seen = 1i32
-        } else if as_str(old_server_folder) != server_folder {
-            info!(
-                context,
-                "[move] detected moved message {}",
-                as_str(rfc724_mid),
-            );
-            dc_update_msg_move_state(context, rfc724_mid, MoveState::Stay);
-        }
-        if as_str(old_server_folder) != server_folder || old_server_uid != server_uid {
-            dc_update_server_uid(context, rfc724_mid, server_folder, server_uid);
-        }
-        context.do_heuristics_moves(server_folder, msg_id);
-        if 0 != mark_seen {
-            job_add(
-                context,
-                Action::MarkseenMsgOnImap,
-                msg_id as libc::c_int,
-                Params::new(),
-                0,
-            );
-        }
-    }
-    libc::free(old_server_folder as *mut libc::c_void);
-    rfc724_mid_exists
-}

src/job_thread.rs

@@ -1,180 +0,0 @@
-use std::sync::{Arc, Condvar, Mutex};
-
-use crate::configure::*;
-use crate::context::Context;
-use crate::imap::Imap;
-
-#[derive(Debug)]
-pub struct JobThread {
-    pub name: &'static str,
-    pub folder_config_name: &'static str,
-    pub imap: Imap,
-    pub state: Arc<(Mutex<JobState>, Condvar)>,
-}
-
-#[derive(Clone, Debug, Default)]
-pub struct JobState {
-    idle: bool,
-    jobs_needed: i32,
-    suspended: bool,
-    using_handle: bool,
-}
-
-impl JobThread {
-    pub fn new(name: &'static str, folder_config_name: &'static str, imap: Imap) -> Self {
-        JobThread {
-            name,
-            folder_config_name,
-            imap,
-            state: Arc::new((Mutex::new(Default::default()), Condvar::new())),
-        }
-    }
-
-    pub fn suspend(&self, context: &Context) {
-        info!(context, "Suspending {}-thread.", self.name,);
-        {
-            self.state.0.lock().unwrap().suspended = true;
-        }
-        self.interrupt_idle(context);
-        loop {
-            let using_handle = self.state.0.lock().unwrap().using_handle;
-            if !using_handle {
-                return;
-            }
-            std::thread::sleep(std::time::Duration::from_micros(300 * 1000));
-        }
-    }
-
-    pub fn unsuspend(&self, context: &Context) {
-        info!(context, "Unsuspending {}-thread.", self.name);
-
-        let &(ref lock, ref cvar) = &*self.state.clone();
-        let mut state = lock.lock().unwrap();
-
-        state.suspended = false;
-        state.idle = true;
-        cvar.notify_one();
-    }
-
-    pub fn interrupt_idle(&self, context: &Context) {
-        {
-            self.state.0.lock().unwrap().jobs_needed = 1;
-        }
-
-        info!(context, "Interrupting {}-IDLE...", self.name);
-
-        self.imap.interrupt_idle();
-
-        let &(ref lock, ref cvar) = &*self.state.clone();
-        let mut state = lock.lock().unwrap();
-
-        state.idle = true;
-        cvar.notify_one();
-    }
-
-    pub fn fetch(&mut self, context: &Context, use_network: bool) {
-        {
-            let &(ref lock, _) = &*self.state.clone();
-            let mut state = lock.lock().unwrap();
-
-            if state.suspended {
-                return;
-            }
-
-            state.using_handle = true;
-        }
-
-        if use_network {
-            let start = std::time::Instant::now();
-            if self.connect_to_imap(context) {
-                info!(context, "{}-fetch started...", self.name);
-                self.imap.fetch(context);
-
-                if self.imap.should_reconnect() {
-                    info!(context, "{}-fetch aborted, starting over...", self.name,);
-                    self.imap.fetch(context);
-                }
-                info!(
-                    context,
-                    "{}-fetch done in {:.3} ms.",
-                    self.name,
-                    start.elapsed().as_millis(),
-                );
-            }
-        }
-
-        self.state.0.lock().unwrap().using_handle = false;
-    }
-
-    fn connect_to_imap(&self, context: &Context) -> bool {
-        if self.imap.is_connected() {
-            return true;
-        }
-
-        let mut ret_connected = dc_connect_to_configured_imap(context, &self.imap) != 0;
-
-        if ret_connected {
-            if context
-                .sql
-                .get_config_int(context, "folders_configured")
-                .unwrap_or_default()
-                < 3
-            {
-                self.imap.configure_folders(context, 0x1);
-            }
-
-            if let Some(mvbox_name) = context.sql.get_config(context, self.folder_config_name) {
-                self.imap.set_watch_folder(mvbox_name);
-            } else {
-                self.imap.disconnect(context);
-                ret_connected = false;
-            }
-        }
-
-        ret_connected
-    }
-
-    pub fn idle(&self, context: &Context, use_network: bool) {
-        {
-            let &(ref lock, ref cvar) = &*self.state.clone();
-            let mut state = lock.lock().unwrap();
-
-            if 0 != state.jobs_needed {
-                info!(
-                    context,
-                    "{}-IDLE will not be started as it was interrupted while not ideling.",
-                    self.name,
-                );
-                state.jobs_needed = 0;
-                return;
-            }
-
-            if state.suspended {
-                while !state.idle {
-                    state = cvar.wait(state).unwrap();
-                }
-                state.idle = false;
-                return;
-            }
-
-            state.using_handle = true;
-
-            if !use_network {
-                state.using_handle = false;
-
-                while !state.idle {
-                    state = cvar.wait(state).unwrap();
-                }
-                state.idle = false;
-                return;
-            }
-        }
-
-        self.connect_to_imap(context);
-        info!(context, "{}-IDLE started...", self.name,);
-        self.imap.idle(context);
-        info!(context, "{}-IDLE ended.", self.name);
-
-        self.state.0.lock().unwrap().using_handle = false;
-    }
-}

src/key.rs

@@ -1,6 +1,7 @@
 use std::collections::BTreeMap;
+use std::ffi::{CStr, CString};
 use std::io::Cursor;
-use std::path::Path;
+use std::slice;
 
 use libc;
 use pgp::composed::{Deserializable, SignedPublicKey, SignedSecretKey};
@@ -11,6 +12,7 @@ use crate::constants::*;
 use crate::context::Context;
 use crate::dc_tools::*;
 use crate::sql::{self, Sql};
+use crate::x::*;
 
 #[derive(Debug, PartialEq, Eq, Clone)]
 pub enum Key {
@@ -87,7 +89,7 @@ impl Key {
     }
 
     pub fn from_slice(bytes: &[u8], key_type: KeyType) -> Option<Self> {
-        if bytes.is_empty() {
+        if 0 == bytes.len() {
             return None;
         }
         let res: Result<Key, _> = match key_type {
@@ -104,6 +106,15 @@ impl Key {
         }
     }
 
+    pub fn from_binary(data: *const u8, len: libc::c_int, key_type: KeyType) -> Option<Self> {
+        if data.is_null() || len == 0 {
+            return None;
+        }
+
+        let bytes = unsafe { slice::from_raw_parts(data, len as usize) };
+        Self::from_slice(bytes, key_type)
+    }
+
     pub fn from_armored_string(
         data: &str,
         key_type: KeyType,
@@ -141,10 +152,11 @@ impl Key {
     ) -> Option<Self> {
         let addr = self_addr.as_ref();
 
-        sql.query_get_value(
+        sql.query_row_col(
             context,
             "SELECT public_key FROM keypairs WHERE addr=? AND is_default=1;",
             &[addr],
+            0,
         )
         .and_then(|blob: Vec<u8>| Self::from_slice(&blob, KeyType::Public))
     }
@@ -154,10 +166,11 @@ impl Key {
         self_addr: impl AsRef<str>,
         sql: &Sql,
     ) -> Option<Self> {
-        sql.query_get_value(
+        sql.query_row_col(
             context,
             "SELECT private_key FROM keypairs WHERE addr=? AND is_default=1;",
             &[self_addr.as_ref()],
+            0,
         )
         .and_then(|blob: Vec<u8>| Self::from_slice(&blob, KeyType::Private))
     }
@@ -215,15 +228,30 @@ impl Key {
             .expect("failed to serialize key")
     }
 
-    pub fn write_asc_to_file(&self, file: impl AsRef<Path>, context: &Context) -> bool {
-        let file_content = self.to_asc(None).into_bytes();
-
-        if dc_write_file_safe(context, &file, &file_content) {
-            return true;
-        } else {
-            error!(context, "Cannot write key to {}", file.as_ref().display());
+    pub fn write_asc_to_file(&self, file: *const libc::c_char, context: &Context) -> bool {
+        if file.is_null() {
             return false;
         }
+
+        let file_content = self.to_asc(None);
+        let file_content_c = CString::new(file_content).unwrap();
+
+        let success = if 0
+            == unsafe {
+                dc_write_file(
+                    context,
+                    file,
+                    file_content_c.as_ptr() as *const libc::c_void,
+                    file_content_c.as_bytes().len(),
+                )
+            } {
+            error!(context, 0, "Cannot write key to {}", to_string(file));
+            false
+        } else {
+            true
+        };
+
+        success
     }
 
     pub fn fingerprint(&self) -> String {
@@ -233,17 +261,29 @@ impl Key {
         }
     }
 
+    pub fn fingerprint_c(&self) -> *mut libc::c_char {
+        let res = CString::new(self.fingerprint()).unwrap();
+
+        unsafe { strdup(res.as_ptr()) }
+    }
+
     pub fn formatted_fingerprint(&self) -> String {
         let rawhex = self.fingerprint();
         dc_format_fingerprint(&rawhex)
     }
 
+    pub fn formatted_fingerprint_c(&self) -> *mut libc::c_char {
+        let res = CString::new(self.formatted_fingerprint()).unwrap();
+
+        unsafe { strdup(res.as_ptr()) }
+    }
+
     pub fn split_key(&self) -> Option<Key> {
         match self {
             Key::Public(_) => None,
             Key::Secret(k) => {
                 let pub_key = k.public_key();
-                pub_key.sign(k, || "".into()).map(Key::Public).ok()
+                pub_key.sign(k, || "".into()).map(|k| Key::Public(k)).ok()
             }
         }
     }
@@ -283,6 +323,14 @@ pub fn dc_format_fingerprint(fingerprint: &str) -> String {
     res
 }
 
+pub fn dc_format_fingerprint_c(fp: *const libc::c_char) -> *mut libc::c_char {
+    let input = unsafe { CStr::from_ptr(fp).to_str().unwrap() };
+    let res = dc_format_fingerprint(input);
+    let res_c = CString::new(res).unwrap();
+
+    unsafe { strdup(res_c.as_ptr()) }
+}
+
 /// Bring a human-readable or otherwise formatted fingerprint back to the 40-characters-uppercase-hex format.
 pub fn dc_normalize_fingerprint(fp: &str) -> String {
     fp.to_uppercase()
@@ -291,6 +339,14 @@ pub fn dc_normalize_fingerprint(fp: &str) -> String {
         .collect()
 }
 
+pub fn dc_normalize_fingerprint_c(fp: *const libc::c_char) -> *mut libc::c_char {
+    let input = unsafe { CStr::from_ptr(fp).to_str().unwrap() };
+    let res = dc_normalize_fingerprint(input);
+    let res_c = CString::new(res).unwrap();
+
+    unsafe { strdup(res_c.as_ptr()) }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -393,27 +449,6 @@ i8pcjGO+IZffvyZJVRWfVooBJmWWbPB1pueo3tx8w3+fcuzpxz+RLFKaPyqXO+dD
         assert_eq!(private_key, private_key2);
     }
 
-    #[test]
-    fn test_from_slice_bad_data() {
-        let mut bad_data: [u8; 4096] = [0; 4096];
-
-        for i in 0..4096 {
-            bad_data[i] = (i & 0xff) as u8;
-        }
-
-        for j in 0..(4096 / 40) {
-            let bad_key = Key::from_slice(
-                &bad_data[j..j + 4096 / 2 + j],
-                if 0 != j & 1 {
-                    KeyType::Public
-                } else {
-                    KeyType::Private
-                },
-            );
-            assert!(bad_key.is_none());
-        }
-    }
-
     #[test]
     #[ignore] // is too expensive
     fn test_ascii_roundtrip() {

src/keyring.rs

@@ -33,10 +33,11 @@ impl<'a> Keyring<'a> {
         self_addr: impl AsRef<str>,
         sql: &Sql,
     ) -> bool {
-        sql.query_get_value(
+        sql.query_row_col(
             context,
             "SELECT private_key FROM keypairs ORDER BY addr=? DESC, is_default DESC;",
             &[self_addr.as_ref()],
+            0,
         )
         .and_then(|blob: Vec<u8>| Key::from_slice(&blob, KeyType::Private))
         .map(|key| self.add_owned(key))

src/lib.rs

@@ -1,9 +1,4 @@
-#![deny(clippy::correctness, missing_debug_implementations)]
-// TODO: make all of these errors, such that clippy actually passes.
-#![warn(clippy::all, clippy::perf, clippy::not_unsafe_ptr_arg_deref)]
-// This is nice, but for now just annoying.
-#![allow(clippy::unreadable_literal)]
-#![feature(ptr_wrapping_offset_from)]
+#![feature(c_variadic, ptr_wrapping_offset_from, ptr_cast)]
 
 #[macro_use]
 extern crate failure_derive;
@@ -16,58 +11,56 @@ extern crate rusqlite;
 extern crate strum;
 #[macro_use]
 extern crate strum_macros;
-#[macro_use]
-extern crate jetscii;
-#[macro_use]
-extern crate debug_stub_derive;
 
 #[macro_use]
 mod log;
 #[macro_use]
 pub mod error;
 
-pub(crate) mod events;
-pub use events::*;
-
-mod aheader;
-pub mod chat;
+pub mod aheader;
 pub mod chatlist;
 pub mod config;
-pub mod configure;
 pub mod constants;
 pub mod contact;
 pub mod context;
-mod e2ee;
-mod imap;
-pub mod job;
-mod job_thread;
+pub mod imap;
 pub mod key;
 pub mod keyring;
-pub mod location;
-pub mod lot;
-pub mod message;
 pub mod oauth2;
-mod param;
+pub mod param;
 pub mod peerstate;
 pub mod pgp;
-pub mod qr;
-mod smtp;
+pub mod smtp;
 pub mod sql;
-mod stock;
+pub mod stock;
+pub mod types;
 pub mod x;
 
 pub mod dc_array;
-mod dc_dehtml;
+pub mod dc_chat;
+pub mod dc_configure;
+pub mod dc_dehtml;
+pub mod dc_e2ee;
 pub mod dc_imex;
-mod dc_mimefactory;
+pub mod dc_job;
+pub mod dc_jobthread;
+pub mod dc_location;
+pub mod dc_loginparam;
+pub mod dc_lot;
+pub mod dc_mimefactory;
 pub mod dc_mimeparser;
+pub mod dc_move;
+pub mod dc_msg;
+pub mod dc_qr;
 pub mod dc_receive_imf;
-mod dc_simplify;
-mod dc_strencode;
+pub mod dc_saxparser;
+pub mod dc_securejoin;
+pub mod dc_simplify;
+pub mod dc_strencode;
+pub mod dc_token;
 pub mod dc_tools;
-mod login_param;
-pub mod securejoin;
-mod token;
+
+pub use self::constants::*;
 
 #[cfg(test)]
-mod test_utils;
+pub mod test_utils;

src/location.rs

@@ -1,694 +0,0 @@
-use bitflags::bitflags;
-use quick_xml;
-use quick_xml::events::{BytesEnd, BytesStart, BytesText};
-
-use crate::chat;
-use crate::constants::*;
-use crate::context::*;
-use crate::dc_tools::*;
-use crate::error::Error;
-use crate::events::Event;
-use crate::job::*;
-use crate::message::*;
-use crate::param::*;
-use crate::sql;
-use crate::stock::StockMessage;
-
-// location handling
-#[derive(Debug, Clone, Default)]
-pub struct Location {
-    pub location_id: u32,
-    pub latitude: f64,
-    pub longitude: f64,
-    pub accuracy: f64,
-    pub timestamp: i64,
-    pub contact_id: u32,
-    pub msg_id: u32,
-    pub chat_id: u32,
-    pub marker: Option<String>,
-    pub independent: u32,
-}
-
-impl Location {
-    pub fn new() -> Self {
-        Default::default()
-    }
-}
-
-#[derive(Debug, Clone, Default)]
-pub struct Kml {
-    pub addr: Option<String>,
-    pub locations: Vec<Location>,
-    tag: KmlTag,
-    pub curr: Location,
-}
-
-bitflags! {
-    #[derive(Default)]
-    struct KmlTag: i32 {
-        const UNDEFINED = 0x00;
-        const PLACEMARK = 0x01;
-        const TIMESTAMP = 0x02;
-        const WHEN = 0x04;
-        const POINT = 0x08;
-        const COORDINATES = 0x10;
-    }
-}
-
-impl Kml {
-    pub fn new() -> Self {
-        Default::default()
-    }
-
-    pub fn parse(context: &Context, content: impl AsRef<str>) -> Result<Self, Error> {
-        ensure!(
-            content.as_ref().len() <= (1 * 1024 * 1024),
-            "A kml-files with {} bytes is larger than reasonably expected.",
-            content.as_ref().len()
-        );
-
-        let mut reader = quick_xml::Reader::from_str(content.as_ref());
-        reader.trim_text(true);
-
-        let mut kml = Kml::new();
-        kml.locations = Vec::with_capacity(100);
-
-        let mut buf = Vec::new();
-
-        loop {
-            match reader.read_event(&mut buf) {
-                Ok(quick_xml::events::Event::Start(ref e)) => kml.starttag_cb(e, &reader),
-                Ok(quick_xml::events::Event::End(ref e)) => kml.endtag_cb(e),
-                Ok(quick_xml::events::Event::Text(ref e)) => kml.text_cb(e, &reader),
-                Err(e) => {
-                    error!(
-                        context,
-                        "Location parsing: Error at position {}: {:?}",
-                        reader.buffer_position(),
-                        e
-                    );
-                }
-                Ok(quick_xml::events::Event::Eof) => break,
-                _ => (),
-            }
-            buf.clear();
-        }
-
-        Ok(kml)
-    }
-
-    fn text_cb<B: std::io::BufRead>(&mut self, event: &BytesText, reader: &quick_xml::Reader<B>) {
-        if self.tag.contains(KmlTag::WHEN) || self.tag.contains(KmlTag::COORDINATES) {
-            let val = event.unescape_and_decode(reader).unwrap_or_default();
-
-            let val = val
-                .replace("\n", "")
-                .replace("\r", "")
-                .replace("\t", "")
-                .replace(" ", "");
-
-            if self.tag.contains(KmlTag::WHEN) && val.len() >= 19 {
-                // YYYY-MM-DDTHH:MM:SSZ
-                // 0   4  7  10 13 16 19
-                match chrono::NaiveDateTime::parse_from_str(&val, "%Y-%m-%dT%H:%M:%SZ") {
-                    Ok(res) => {
-                        self.curr.timestamp = res.timestamp();
-                        if self.curr.timestamp > time() {
-                            self.curr.timestamp = time();
-                        }
-                    }
-                    Err(_err) => {
-                        self.curr.timestamp = time();
-                    }
-                }
-            } else if self.tag.contains(KmlTag::COORDINATES) {
-                let parts = val.splitn(2, ',').collect::<Vec<_>>();
-                if parts.len() == 2 {
-                    self.curr.longitude = parts[0].parse().unwrap_or_default();
-                    self.curr.latitude = parts[1].parse().unwrap_or_default();
-                }
-            }
-        }
-    }
-
-    fn endtag_cb(&mut self, event: &BytesEnd) {
-        let tag = String::from_utf8_lossy(event.name()).trim().to_lowercase();
-
-        if tag == "placemark" {
-            if self.tag.contains(KmlTag::PLACEMARK)
-                && 0 != self.curr.timestamp
-                && 0. != self.curr.latitude
-                && 0. != self.curr.longitude
-            {
-                self.locations
-                    .push(std::mem::replace(&mut self.curr, Location::new()));
-            }
-            self.tag = KmlTag::UNDEFINED;
-        };
-    }
-
-    fn starttag_cb<B: std::io::BufRead>(
-        &mut self,
-        event: &BytesStart,
-        reader: &quick_xml::Reader<B>,
-    ) {
-        let tag = String::from_utf8_lossy(event.name()).trim().to_lowercase();
-        if tag == "document" {
-            if let Some(addr) = event.attributes().find(|attr| {
-                attr.as_ref()
-                    .map(|a| String::from_utf8_lossy(a.key).trim().to_lowercase() == "addr")
-                    .unwrap_or_default()
-            }) {
-                self.addr = addr.unwrap().unescape_and_decode_value(reader).ok();
-            }
-        } else if tag == "placemark" {
-            self.tag = KmlTag::PLACEMARK;
-            self.curr.timestamp = 0;
-            self.curr.latitude = 0.0;
-            self.curr.longitude = 0.0;
-            self.curr.accuracy = 0.0
-        } else if tag == "timestamp" && self.tag.contains(KmlTag::PLACEMARK) {
-            self.tag = KmlTag::PLACEMARK | KmlTag::TIMESTAMP
-        } else if tag == "when" && self.tag.contains(KmlTag::TIMESTAMP) {
-            self.tag = KmlTag::PLACEMARK | KmlTag::TIMESTAMP | KmlTag::WHEN
-        } else if tag == "point" && self.tag.contains(KmlTag::PLACEMARK) {
-            self.tag = KmlTag::PLACEMARK | KmlTag::POINT
-        } else if tag == "coordinates" && self.tag.contains(KmlTag::POINT) {
-            self.tag = KmlTag::PLACEMARK | KmlTag::POINT | KmlTag::COORDINATES;
-            if let Some(acc) = event.attributes().find(|attr| {
-                attr.as_ref()
-                    .map(|a| String::from_utf8_lossy(a.key).trim().to_lowercase() == "accuracy")
-                    .unwrap_or_default()
-            }) {
-                let v = acc
-                    .unwrap()
-                    .unescape_and_decode_value(reader)
-                    .unwrap_or_default();
-
-                self.curr.accuracy = v.trim().parse().unwrap_or_default();
-            }
-        }
-    }
-}
-
-// location streaming
-pub fn send_locations_to_chat(context: &Context, chat_id: u32, seconds: i64) {
-    let now = time();
-    let mut msg: Message;
-    let is_sending_locations_before: bool;
-    if !(seconds < 0 || chat_id <= 9i32 as libc::c_uint) {
-        is_sending_locations_before = is_sending_locations_to_chat(context, chat_id);
-        if sql::execute(
-            context,
-            &context.sql,
-            "UPDATE chats    \
-             SET locations_send_begin=?,        \
-             locations_send_until=?  \
-             WHERE id=?",
-            params![
-                if 0 != seconds { now } else { 0 },
-                if 0 != seconds { now + seconds } else { 0 },
-                chat_id as i32,
-            ],
-        )
-        .is_ok()
-        {
-            if 0 != seconds && !is_sending_locations_before {
-                msg = dc_msg_new(Viewtype::Text);
-                msg.text =
-                    Some(context.stock_system_msg(StockMessage::MsgLocationEnabled, "", "", 0));
-                msg.param.set_int(Param::Cmd, 8);
-                chat::send_msg(context, chat_id, &mut msg).unwrap();
-            } else if 0 == seconds && is_sending_locations_before {
-                let stock_str =
-                    context.stock_system_msg(StockMessage::MsgLocationDisabled, "", "", 0);
-                chat::add_device_msg(context, chat_id, stock_str);
-            }
-            context.call_cb(Event::ChatModified(chat_id));
-            if 0 != seconds {
-                schedule_MAYBE_SEND_LOCATIONS(context, 0i32);
-                job_add(
-                    context,
-                    Action::MaybeSendLocationsEnded,
-                    chat_id as libc::c_int,
-                    Params::new(),
-                    seconds + 1,
-                );
-            }
-        }
-    }
-}
-
-#[allow(non_snake_case)]
-fn schedule_MAYBE_SEND_LOCATIONS(context: &Context, flags: i32) {
-    if 0 != flags & 0x1 || !job_action_exists(context, Action::MaybeSendLocations) {
-        job_add(context, Action::MaybeSendLocations, 0, Params::new(), 60);
-    };
-}
-
-pub fn is_sending_locations_to_chat(context: &Context, chat_id: u32) -> bool {
-    context
-        .sql
-        .exists(
-            "SELECT id  FROM chats  WHERE (? OR id=?)   AND locations_send_until>?;",
-            params![if chat_id == 0 { 1 } else { 0 }, chat_id as i32, time()],
-        )
-        .unwrap_or_default()
-}
-
-pub fn set(context: &Context, latitude: f64, longitude: f64, accuracy: f64) -> libc::c_int {
-    if latitude == 0.0 && longitude == 0.0 {
-        return 1;
-    }
-    let mut continue_streaming = false;
-
-    if let Ok(chats) = context.sql.query_map(
-        "SELECT id FROM chats WHERE locations_send_until>?;",
-        params![time()],
-        |row| row.get::<_, i32>(0),
-        |chats| chats.collect::<Result<Vec<_>, _>>().map_err(Into::into),
-    ) {
-        for chat_id in chats {
-            if let Err(err) = context.sql.execute(
-                    "INSERT INTO locations  \
-                     (latitude, longitude, accuracy, timestamp, chat_id, from_id) VALUES (?,?,?,?,?,?);",
-                    params![
-                        latitude,
-                        longitude,
-                        accuracy,
-                        time(),
-                        chat_id,
-                        1,
-                    ]
-            ) {
-                warn!(context, "failed to store location {:?}", err);
-            } else {
-                continue_streaming = true;
-            }
-        }
-        if continue_streaming {
-            context.call_cb(Event::LocationChanged(Some(1)));
-        };
-        schedule_MAYBE_SEND_LOCATIONS(context, 0);
-    }
-
-    continue_streaming as libc::c_int
-}
-
-pub fn get_range(
-    context: &Context,
-    chat_id: u32,
-    contact_id: u32,
-    timestamp_from: i64,
-    mut timestamp_to: i64,
-) -> Vec<Location> {
-    if timestamp_to == 0 {
-        timestamp_to = time() + 10;
-    }
-
-    context
-        .sql
-        .query_map(
-            "SELECT l.id, l.latitude, l.longitude, l.accuracy, l.timestamp, l.independent, \
-             m.id, l.from_id, l.chat_id, m.txt \
-             FROM locations l  LEFT JOIN msgs m ON l.id=m.location_id  WHERE (? OR l.chat_id=?) \
-             AND (? OR l.from_id=?) \
-             AND (l.independent=1 OR (l.timestamp>=? AND l.timestamp<=?)) \
-             ORDER BY l.timestamp DESC, l.id DESC, m.id DESC;",
-            params![
-                if chat_id == 0 { 1 } else { 0 },
-                chat_id as i32,
-                if contact_id == 0 { 1 } else { 0 },
-                contact_id as i32,
-                timestamp_from,
-                timestamp_to,
-            ],
-            |row| {
-                let msg_id = row.get(6)?;
-                let txt: String = row.get(9)?;
-                let marker = if msg_id != 0 && is_marker(&txt) {
-                    Some(txt)
-                } else {
-                    None
-                };
-
-                let loc = Location {
-                    location_id: row.get(0)?,
-                    latitude: row.get(1)?,
-                    longitude: row.get(2)?,
-                    accuracy: row.get(3)?,
-                    timestamp: row.get(4)?,
-                    independent: row.get(5)?,
-                    msg_id,
-                    contact_id: row.get(7)?,
-                    chat_id: row.get(8)?,
-                    marker,
-                };
-                Ok(loc)
-            },
-            |locations| {
-                let mut ret = Vec::new();
-
-                for location in locations {
-                    ret.push(location?);
-                }
-                Ok(ret)
-            },
-        )
-        .unwrap_or_default()
-}
-
-fn is_marker(txt: &str) -> bool {
-    txt.len() == 1 && txt.chars().next().unwrap() != ' '
-}
-
-pub fn delete_all(context: &Context) -> Result<(), Error> {
-    sql::execute(context, &context.sql, "DELETE FROM locations;", params![])?;
-    context.call_cb(Event::LocationChanged(None));
-    Ok(())
-}
-
-pub fn get_kml(context: &Context, chat_id: u32) -> Result<(String, u32), Error> {
-    let now = time();
-    let mut location_count = 0;
-    let mut ret = String::new();
-    let mut last_added_location_id = 0;
-
-    let self_addr = context
-        .sql
-        .get_config(context, "configured_addr")
-        .unwrap_or_default();
-
-    let (locations_send_begin, locations_send_until, locations_last_sent) = context.sql.query_row(
-        "SELECT locations_send_begin, locations_send_until, locations_last_sent  FROM chats  WHERE id=?;",
-        params![chat_id as i32], |row| {
-            let send_begin: i64 = row.get(0)?;
-            let send_until: i64 = row.get(1)?;
-            let last_sent: i64 = row.get(2)?;
-
-            Ok((send_begin, send_until, last_sent))
-        })?;
-
-    if !(locations_send_begin == 0 || now > locations_send_until) {
-        ret += &format!(
-            "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<kml xmlns=\"http://www.opengis.net/kml/2.2\">\n<Document addr=\"{}\">\n",
-            self_addr,
-        );
-
-        context.sql.query_map(
-            "SELECT id, latitude, longitude, accuracy, timestamp\
-             FROM locations  WHERE from_id=? \
-             AND timestamp>=? \
-             AND (timestamp>=? OR timestamp=(SELECT MAX(timestamp) FROM locations WHERE from_id=?)) \
-             AND independent=0 \
-             GROUP BY timestamp \
-             ORDER BY timestamp;",
-            params![1, locations_send_begin, locations_last_sent, 1],
-            |row| {
-                let location_id: i32 = row.get(0)?;
-                let latitude: f64 = row.get(1)?;
-                let longitude: f64 = row.get(2)?;
-                let accuracy: f64 = row.get(3)?;
-                let timestamp = get_kml_timestamp(row.get(4)?);
-
-                Ok((location_id, latitude, longitude, accuracy, timestamp))
-            },
-            |rows| {
-                for row in rows {
-                    let (location_id, latitude, longitude, accuracy, timestamp) = row?;
-                    ret += &format!(
-                        "<Placemark><Timestamp><when>{}</when></Timestamp><Point><coordinates accuracy=\"{}\">{},{}</coordinates></Point></Placemark>\n\x00",
-                        timestamp,
-                        accuracy,
-                        longitude,
-                        latitude
-                    );
-                    location_count += 1;
-                    last_added_location_id = location_id as u32;
-                }
-                Ok(())
-            }
-        )?;
-    }
-
-    ensure!(location_count > 0, "No locations processed");
-    ret += "</Document>\n</kml>";
-
-    Ok((ret, last_added_location_id))
-}
-
-fn get_kml_timestamp(utc: i64) -> String {
-    // Returns a string formatted as YYYY-MM-DDTHH:MM:SSZ. The trailing `Z` indicates UTC.
-    chrono::NaiveDateTime::from_timestamp(utc, 0)
-        .format("%Y-%m-%dT%H:%M:%SZ")
-        .to_string()
-}
-
-pub fn get_message_kml(timestamp: i64, latitude: f64, longitude: f64) -> String {
-    format!(
-        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n\
-         <kml xmlns=\"http://www.opengis.net/kml/2.2\">\n\
-         <Document>\n\
-         <Placemark>\
-         <Timestamp><when>{}</when></Timestamp>\
-         <Point><coordinates>{:.2},{:.2}</coordinates></Point>\
-         </Placemark>\n\
-         </Document>\n\
-         </kml>",
-        get_kml_timestamp(timestamp),
-        longitude,
-        latitude,
-    )
-}
-
-pub fn set_kml_sent_timestamp(
-    context: &Context,
-    chat_id: u32,
-    timestamp: i64,
-) -> Result<(), Error> {
-    sql::execute(
-        context,
-        &context.sql,
-        "UPDATE chats SET locations_last_sent=? WHERE id=?;",
-        params![timestamp, chat_id as i32],
-    )?;
-
-    Ok(())
-}
-
-pub fn set_msg_location_id(context: &Context, msg_id: u32, location_id: u32) -> Result<(), Error> {
-    sql::execute(
-        context,
-        &context.sql,
-        "UPDATE msgs SET location_id=? WHERE id=?;",
-        params![location_id, msg_id as i32],
-    )?;
-
-    Ok(())
-}
-
-pub fn save(
-    context: &Context,
-    chat_id: u32,
-    contact_id: u32,
-    locations: &[Location],
-    independent: i32,
-) -> Result<u32, Error> {
-    ensure!(chat_id > 9, "Invalid chat id");
-    context.sql.prepare2(
-        "SELECT id FROM locations WHERE timestamp=? AND from_id=?",
-        "INSERT INTO locations\
-         (timestamp, from_id, chat_id, latitude, longitude, accuracy, independent) \
-         VALUES (?,?,?,?,?,?,?);",
-        |mut stmt_test, mut stmt_insert, conn| {
-            let mut newest_timestamp = 0;
-            let mut newest_location_id = 0;
-
-            for location in locations {
-                let exists = stmt_test.exists(params![location.timestamp, contact_id as i32])?;
-
-                if 0 != independent || !exists {
-                    stmt_insert.execute(params![
-                        location.timestamp,
-                        contact_id as i32,
-                        chat_id as i32,
-                        location.latitude,
-                        location.longitude,
-                        location.accuracy,
-                        independent,
-                    ])?;
-
-                    if location.timestamp > newest_timestamp {
-                        newest_timestamp = location.timestamp;
-                        newest_location_id = sql::get_rowid2_with_conn(
-                            context,
-                            conn,
-                            "locations",
-                            "timestamp",
-                            location.timestamp,
-                            "from_id",
-                            contact_id as i32,
-                        );
-                    }
-                }
-            }
-            Ok(newest_location_id)
-        },
-    )
-}
-
-#[allow(non_snake_case)]
-pub fn job_do_DC_JOB_MAYBE_SEND_LOCATIONS(context: &Context, _job: &Job) {
-    let now = time();
-    let mut continue_streaming: libc::c_int = 1;
-    info!(
-        context,
-        " ----------------- MAYBE_SEND_LOCATIONS -------------- ",
-    );
-
-    if let Ok(rows) = context.sql.query_map(
-        "SELECT id, locations_send_begin, locations_last_sent \
-         FROM chats \
-         WHERE locations_send_until>?;",
-        params![now],
-        |row| {
-            let chat_id: i32 = row.get(0)?;
-            let locations_send_begin: i64 = row.get(1)?;
-            let locations_last_sent: i64 = row.get(2)?;
-            continue_streaming = 1;
-
-            // be a bit tolerant as the timer may not align exactly with time(NULL)
-            if now - locations_last_sent < (60 - 3) {
-                Ok(None)
-            } else {
-                Ok(Some((chat_id, locations_send_begin, locations_last_sent)))
-            }
-        },
-        |rows| {
-            rows.filter_map(|v| v.transpose())
-                .collect::<Result<Vec<_>, _>>()
-                .map_err(Into::into)
-        },
-    ) {
-        let msgs = context
-            .sql
-            .prepare(
-                "SELECT id \
-                 FROM locations \
-                 WHERE from_id=? \
-                 AND timestamp>=? \
-                 AND timestamp>? \
-                 AND independent=0 \
-                 ORDER BY timestamp;",
-                |mut stmt_locations, _| {
-                    let msgs = rows
-                        .into_iter()
-                        .filter_map(|(chat_id, locations_send_begin, locations_last_sent)| {
-                            if !stmt_locations
-                                .exists(params![1, locations_send_begin, locations_last_sent,])
-                                .unwrap_or_default()
-                            {
-                                // if there is no new location, there's nothing to send.
-                                // however, maybe we want to bypass this test eg. 15 minutes
-                                None
-                            } else {
-                                // pending locations are attached automatically to every message,
-                                // so also to this empty text message.
-                                // DC_CMD_LOCATION is only needed to create a nicer subject.
-                                //
-                                // for optimisation and to avoid flooding the sending queue,
-                                // we could sending these messages only if we're really online.
-                                // the easiest way to determine this, is to check for an empty message queue.
-                                // (might not be 100%, however, as positions are sent combined later
-                                // and dc_set_location() is typically called periodically, this is ok)
-                                let mut msg = dc_msg_new(Viewtype::Text);
-                                msg.hidden = true;
-                                msg.param.set_int(Param::Cmd, 9);
-                                Some((chat_id, msg))
-                            }
-                        })
-                        .collect::<Vec<_>>();
-                    Ok(msgs)
-                },
-            )
-            .unwrap_or_default(); // TODO: Better error handling
-
-        for (chat_id, mut msg) in msgs.into_iter() {
-            // TODO: better error handling
-            chat::send_msg(context, chat_id as u32, &mut msg).unwrap();
-        }
-    }
-    if 0 != continue_streaming {
-        schedule_MAYBE_SEND_LOCATIONS(context, 0x1);
-    }
-}
-
-#[allow(non_snake_case)]
-pub fn job_do_DC_JOB_MAYBE_SEND_LOC_ENDED(context: &Context, job: &mut Job) {
-    // this function is called when location-streaming _might_ have ended for a chat.
-    // the function checks, if location-streaming is really ended;
-    // if so, a device-message is added if not yet done.
-
-    let chat_id = job.foreign_id;
-
-    if let Ok((send_begin, send_until)) = context.sql.query_row(
-        "SELECT locations_send_begin, locations_send_until  FROM chats  WHERE id=?",
-        params![chat_id as i32],
-        |row| Ok((row.get::<_, i64>(0)?, row.get::<_, i64>(1)?)),
-    ) {
-        if !(send_begin != 0 && time() <= send_until) {
-            // still streaming -
-            // may happen as several calls to dc_send_locations_to_chat()
-            // do not un-schedule pending DC_MAYBE_SEND_LOC_ENDED jobs
-            if !(send_begin == 0 && send_until == 0) {
-                // not streaming, device-message already sent
-                if context.sql.execute(
-                    "UPDATE chats    SET locations_send_begin=0, locations_send_until=0  WHERE id=?",
-                    params![chat_id as i32],
-                ).is_ok() {
-                    let stock_str = context.stock_system_msg(StockMessage::MsgLocationDisabled, "", "", 0);
-                    chat::add_device_msg(context, chat_id, stock_str);
-                    context.call_cb(Event::ChatModified(chat_id));
-                }
-            }
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::test_utils::dummy_context;
-
-    #[test]
-    fn test_kml_parse() {
-        let context = dummy_context();
-
-        let xml =
-            "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<kml xmlns=\"http://www.opengis.net/kml/2.2\">\n<Document addr=\"user@example.org\">\n<Placemark><Timestamp><when>2019-03-06T21:09:57Z</when></Timestamp><Point><coordinates accuracy=\"32.000000\">9.423110,53.790302</coordinates></Point></Placemark>\n<PlaceMARK>\n<Timestamp><WHEN > \n\t2018-12-13T22:11:12Z\t</WHEN></Timestamp><Point><coordinates aCCuracy=\"2.500000\"> 19.423110 \t , \n 63.790302\n </coordinates></Point></PlaceMARK>\n</Document>\n</kml>";
-
-        let kml = Kml::parse(&context.ctx, &xml).expect("parsing failed");
-
-        assert!(kml.addr.is_some());
-        assert_eq!(kml.addr.as_ref().unwrap(), "user@example.org",);
-
-        let locations_ref = &kml.locations;
-        assert_eq!(locations_ref.len(), 2);
-
-        assert!(locations_ref[0].latitude > 53.6f64);
-        assert!(locations_ref[0].latitude < 53.8f64);
-        assert!(locations_ref[0].longitude > 9.3f64);
-        assert!(locations_ref[0].longitude < 9.5f64);
-        assert!(locations_ref[0].accuracy > 31.9f64);
-        assert!(locations_ref[0].accuracy < 32.1f64);
-        assert_eq!(locations_ref[0].timestamp, 1551906597);
-
-        assert!(locations_ref[1].latitude > 63.6f64);
-        assert!(locations_ref[1].latitude < 63.8f64);
-        assert!(locations_ref[1].longitude > 19.3f64);
-        assert!(locations_ref[1].longitude < 19.5f64);
-        assert!(locations_ref[1].accuracy > 2.4f64);
-        assert!(locations_ref[1].accuracy < 2.6f64);
-        assert_eq!(locations_ref[1].timestamp, 1544739072);
-    }
-}

src/log.rs

@@ -1,39 +1,59 @@
 #[macro_export]
 macro_rules! info {
-    ($ctx:expr,  $msg:expr) => {
-        info!($ctx, $msg,)
-    };
-    ($ctx:expr, $msg:expr, $($args:expr),* $(,)?) => {
-        let formatted = format!($msg, $($args),*);
-        emit_event!($ctx, $crate::Event::Info(formatted));
+    ($ctx:expr, $data1:expr, $msg:expr) => {
+        info!($ctx, $data1, $msg,)
     };
+    ($ctx:expr, $data1:expr, $msg:expr, $($args:expr),* $(,)?) => {
+        #[allow(unused_unsafe)]
+        unsafe {
+            let formatted = format!($msg, $($args),*);
+            let formatted_c =  std::ffi::CString::new(formatted).unwrap();
+            $ctx.call_cb($crate::constants::Event::INFO, $data1 as libc::uintptr_t,
+                     formatted_c.as_ptr() as libc::uintptr_t);
+    }};
 }
 
 #[macro_export]
 macro_rules! warn {
-    ($ctx:expr, $msg:expr) => {
-        warn!($ctx, $msg,)
-    };
-    ($ctx:expr, $msg:expr, $($args:expr),* $(,)?) => {
-        let formatted = format!($msg, $($args),*);
-        emit_event!($ctx, $crate::Event::Warning(formatted));
+    ($ctx:expr, $data1:expr, $msg:expr) => {
+        warn!($ctx, $data1, $msg,)
     };
+    ($ctx:expr, $data1:expr, $msg:expr, $($args:expr),* $(,)?) => {
+        #[allow(unused_unsafe)]
+        unsafe {
+            let formatted = format!($msg, $($args),*);
+            let formatted_c = std::ffi::CString::new(formatted).unwrap();
+            $ctx.call_cb($crate::constants::Event::WARNING, $data1 as libc::uintptr_t,
+                         formatted_c.as_ptr() as libc::uintptr_t);
+        }};
 }
 
 #[macro_export]
 macro_rules! error {
-    ($ctx:expr, $msg:expr) => {
-        error!($ctx, $msg,)
+    ($ctx:expr, $data1:expr, $msg:expr) => {
+        error!($ctx, $data1, $msg,)
     };
-    ($ctx:expr, $msg:expr, $($args:expr),* $(,)?) => {
+    ($ctx:expr, $data1:expr, $msg:expr, $($args:expr),* $(,)?) => {
+        #[allow(unused_unsafe)]
+        unsafe {
         let formatted = format!($msg, $($args),*);
-        emit_event!($ctx, $crate::Event::Error(formatted));
-    };
+        let formatted_c = std::ffi::CString::new(formatted).unwrap();
+        $ctx.call_cb($crate::constants::Event::ERROR, $data1 as libc::uintptr_t,
+                     formatted_c.as_ptr() as libc::uintptr_t);
+    }};
 }
 
 #[macro_export]
-macro_rules! emit_event {
-    ($ctx:expr, $event:expr) => {
-        $ctx.call_cb($event);
+macro_rules! log_event {
+    ($ctx:expr, $data1:expr, $msg:expr) => {
+        log_event!($ctx, $data1, $msg,)
     };
+    ($ctx:expr, $event:expr, $data1:expr, $msg:expr, $($args:expr),* $(,)?) => {
+        #[allow(unused_unsafe)]
+        unsafe {
+            let formatted = format!($msg, $($args),*);
+            let formatted_c = std::ffi::CString::new(formatted).unwrap();
+            $ctx.call_cb($event, $data1 as libc::uintptr_t,
+                         formatted_c.as_ptr() as libc::uintptr_t);
+    }};
 }

src/login_param.rs

@@ -1,206 +0,0 @@
-use std::borrow::Cow;
-use std::fmt;
-
-use crate::context::Context;
-use crate::error::Error;
-
-#[derive(Default, Debug)]
-pub struct LoginParam {
-    pub addr: String,
-    pub mail_server: String,
-    pub mail_user: String,
-    pub mail_pw: String,
-    pub mail_port: i32,
-    pub send_server: String,
-    pub send_user: String,
-    pub send_pw: String,
-    pub send_port: i32,
-    pub server_flags: i32,
-}
-
-impl LoginParam {
-    /// Create a new `LoginParam` with default values.
-    pub fn new() -> Self {
-        Default::default()
-    }
-
-    /// Read the login parameters from the database.
-    pub fn from_database(context: &Context, prefix: impl AsRef<str>) -> Self {
-        let prefix = prefix.as_ref();
-        let sql = &context.sql;
-
-        let key = format!("{}addr", prefix);
-        let addr = sql
-            .get_config(context, key)
-            .unwrap_or_default()
-            .trim()
-            .to_string();
-
-        let key = format!("{}mail_server", prefix);
-        let mail_server = sql.get_config(context, key).unwrap_or_default();
-
-        let key = format!("{}mail_port", prefix);
-        let mail_port = sql.get_config_int(context, key).unwrap_or_default();
-
-        let key = format!("{}mail_user", prefix);
-        let mail_user = sql.get_config(context, key).unwrap_or_default();
-
-        let key = format!("{}mail_pw", prefix);
-        let mail_pw = sql.get_config(context, key).unwrap_or_default();
-
-        let key = format!("{}send_server", prefix);
-        let send_server = sql.get_config(context, key).unwrap_or_default();
-
-        let key = format!("{}send_port", prefix);
-        let send_port = sql.get_config_int(context, key).unwrap_or_default();
-
-        let key = format!("{}send_user", prefix);
-        let send_user = sql.get_config(context, key).unwrap_or_default();
-
-        let key = format!("{}send_pw", prefix);
-        let send_pw = sql.get_config(context, key).unwrap_or_default();
-
-        let key = format!("{}server_flags", prefix);
-        let server_flags = sql.get_config_int(context, key).unwrap_or_default();
-
-        LoginParam {
-            addr: addr.to_string(),
-            mail_server,
-            mail_user,
-            mail_pw,
-            mail_port,
-            send_server,
-            send_user,
-            send_pw,
-            send_port,
-            server_flags,
-        }
-    }
-
-    pub fn addr_str(&self) -> &str {
-        self.addr.as_str()
-    }
-
-    /// Save this loginparam to the database.
-    pub fn save_to_database(
-        &self,
-        context: &Context,
-        prefix: impl AsRef<str>,
-    ) -> Result<(), Error> {
-        let prefix = prefix.as_ref();
-        let sql = &context.sql;
-
-        let key = format!("{}addr", prefix);
-        sql.set_config(context, key, Some(&self.addr))?;
-
-        let key = format!("{}mail_server", prefix);
-        sql.set_config(context, key, Some(&self.mail_server))?;
-
-        let key = format!("{}mail_port", prefix);
-        sql.set_config_int(context, key, self.mail_port)?;
-
-        let key = format!("{}mail_user", prefix);
-        sql.set_config(context, key, Some(&self.mail_user))?;
-
-        let key = format!("{}mail_pw", prefix);
-        sql.set_config(context, key, Some(&self.mail_pw))?;
-
-        let key = format!("{}send_server", prefix);
-        sql.set_config(context, key, Some(&self.send_server))?;
-
-        let key = format!("{}send_port", prefix);
-        sql.set_config_int(context, key, self.send_port)?;
-
-        let key = format!("{}send_user", prefix);
-        sql.set_config(context, key, Some(&self.send_user))?;
-
-        let key = format!("{}send_pw", prefix);
-        sql.set_config(context, key, Some(&self.send_pw))?;
-
-        let key = format!("{}server_flags", prefix);
-        sql.set_config_int(context, key, self.server_flags)?;
-
-        Ok(())
-    }
-}
-
-impl fmt::Display for LoginParam {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        let unset = "0";
-        let pw = "***";
-
-        let flags_readable = get_readable_flags(self.server_flags);
-
-        write!(
-            f,
-            "{} {}:{}:{}:{} {}:{}:{}:{} {}",
-            unset_empty(&self.addr),
-            unset_empty(&self.mail_user),
-            if !self.mail_pw.is_empty() { pw } else { unset },
-            unset_empty(&self.mail_server),
-            self.mail_port,
-            unset_empty(&self.send_user),
-            if !self.send_pw.is_empty() { pw } else { unset },
-            unset_empty(&self.send_server),
-            self.send_port,
-            flags_readable,
-        )
-    }
-}
-
-fn unset_empty(s: &String) -> Cow<String> {
-    if s.is_empty() {
-        Cow::Owned("unset".to_string())
-    } else {
-        Cow::Borrowed(s)
-    }
-}
-
-fn get_readable_flags(flags: i32) -> String {
-    let mut res = String::new();
-    for bit in 0..31 {
-        if 0 != flags & 1 << bit {
-            let mut flag_added = 0;
-            if 1 << bit == 0x2 {
-                res += "OAUTH2 ";
-                flag_added = 1;
-            }
-            if 1 << bit == 0x4 {
-                res += "AUTH_NORMAL ";
-                flag_added = 1;
-            }
-            if 1 << bit == 0x100 {
-                res += "IMAP_STARTTLS ";
-                flag_added = 1;
-            }
-            if 1 << bit == 0x200 {
-                res += "IMAP_SSL ";
-                flag_added = 1;
-            }
-            if 1 << bit == 0x400 {
-                res += "IMAP_PLAIN ";
-                flag_added = 1;
-            }
-            if 1 << bit == 0x10000 {
-                res += "SMTP_STARTTLS ";
-                flag_added = 1
-            }
-            if 1 << bit == 0x20000 {
-                res += "SMTP_SSL ";
-                flag_added = 1
-            }
-            if 1 << bit == 0x40000 {
-                res += "SMTP_PLAIN ";
-                flag_added = 1
-            }
-            if 0 == flag_added {
-                res += &format!("{:#0x}", 1 << bit);
-            }
-        }
-    }
-    if res.is_empty() {
-        res += "0";
-    }
-
-    res
-}

src/lot.rs

@@ -1,109 +0,0 @@
-use deltachat_derive::{FromSql, ToSql};
-
-/// An object containing a set of values.
-/// The meaning of the values is defined by the function returning the object.
-/// Lot objects are created
-/// eg. by chatlist.get_summary() or dc_msg_get_summary().
-///
-/// _Lot_ is used in the meaning _heap_ here.
-#[derive(Default, Debug, Clone)]
-pub struct Lot {
-    pub(crate) text1_meaning: Meaning,
-    pub(crate) text1: Option<String>,
-    pub(crate) text2: Option<String>,
-    pub(crate) timestamp: i64,
-    pub(crate) state: LotState,
-    pub(crate) id: u32,
-    pub(crate) fingerprint: Option<String>,
-    pub(crate) invitenumber: Option<String>,
-    pub(crate) auth: Option<String>,
-}
-
-#[repr(u8)]
-#[derive(Debug, Display, Clone, Copy, PartialEq, Eq, FromPrimitive, ToPrimitive, ToSql, FromSql)]
-pub enum Meaning {
-    None = 0,
-    Text1Draft = 1,
-    Text1Username = 2,
-    Text1Self = 3,
-}
-
-impl Default for Meaning {
-    fn default() -> Self {
-        Meaning::None
-    }
-}
-
-impl Lot {
-    pub fn new() -> Self {
-        Default::default()
-    }
-
-    pub fn get_text1(&self) -> Option<&str> {
-        self.text1.as_ref().map(|s| s.as_str())
-    }
-
-    pub fn get_text2(&self) -> Option<&str> {
-        self.text2.as_ref().map(|s| s.as_str())
-    }
-
-    pub fn get_text1_meaning(&self) -> Meaning {
-        self.text1_meaning
-    }
-
-    pub fn get_state(&self) -> LotState {
-        self.state
-    }
-
-    pub fn get_id(&self) -> u32 {
-        self.id
-    }
-
-    pub fn get_timestamp(&self) -> i64 {
-        self.timestamp
-    }
-}
-
-#[repr(i32)]
-#[derive(Debug, Display, Clone, Copy, PartialEq, Eq, FromPrimitive, ToPrimitive, ToSql, FromSql)]
-pub enum LotState {
-    // Default
-    Undefined = 0,
-
-    // Qr States
-    /// id=contact
-    QrAskVerifyContact = 200,
-    /// text1=groupname
-    QrAskVerifyGroup = 202,
-    /// id=contact
-    QrFprOk = 210,
-    /// id=contact
-    QrFprMissmatch = 220,
-    /// test1=formatted fingerprint
-    QrFprWithoutAddr = 230,
-    /// id=contact
-    QrAddr = 320,
-    /// text1=text
-    QrText = 330,
-    /// text1=URL
-    QrUrl = 332,
-    /// text1=error string
-    QrError = 400,
-
-    // Message States
-    MsgInFresh = 10,
-    MsgInNoticed = 13,
-    MsgInSeen = 16,
-    MsgOutPreparing = 18,
-    MsgOutDraft = 19,
-    MsgOutPending = 20,
-    MsgOutFailed = 24,
-    MsgOutDelivered = 26,
-    MsgOutMdnRcvd = 28,
-}
-
-impl Default for LotState {
-    fn default() -> Self {
-        LotState::Undefined
-    }
-}

src/oauth2.rs

@@ -23,7 +23,7 @@ const OAUTH2_YANDEX: Oauth2 = Oauth2 {
 };
 
 #[derive(Debug, Clone, PartialEq, Eq)]
-struct Oauth2 {
+pub struct Oauth2 {
     client_id: &'static str,
     get_code: &'static str,
     init_token: &'static str,
@@ -97,7 +97,10 @@ pub fn dc_get_oauth2_access_token(
 
         let (redirect_uri, token_url, update_redirect_uri_on_success) =
             if refresh_token.is_none() || refresh_token_for != code.as_ref() {
-                info!(context, "Generate OAuth2 refresh_token and access_token...",);
+                info!(
+                    context,
+                    0, "Generate OAuth2 refresh_token and access_token...",
+                );
                 (
                     context
                         .sql
@@ -109,7 +112,7 @@ pub fn dc_get_oauth2_access_token(
             } else {
                 info!(
                     context,
-                    "Regenerate OAuth2 access_token by refresh_token...",
+                    0, "Regenerate OAuth2 access_token by refresh_token...",
                 );
                 (
                     context
@@ -131,7 +134,7 @@ pub fn dc_get_oauth2_access_token(
         if response.is_err() {
             warn!(
                 context,
-                "Error calling OAuth2 at {}: {:?}", token_url, response
+                0, "Error calling OAuth2 at {}: {:?}", token_url, response
             );
             return None;
         }
@@ -139,6 +142,7 @@ pub fn dc_get_oauth2_access_token(
         if !response.status().is_success() {
             warn!(
                 context,
+                0,
                 "Error calling OAuth2 at {}: {:?}",
                 token_url,
                 response.status()
@@ -150,7 +154,7 @@ pub fn dc_get_oauth2_access_token(
         if parsed.is_err() {
             warn!(
                 context,
-                "Failed to parse OAuth2 JSON response from {}: error: {:?}", token_url, parsed
+                0, "Failed to parse OAuth2 JSON response from {}: error: {:?}", token_url, parsed
             );
             return None;
         }
@@ -191,12 +195,12 @@ pub fn dc_get_oauth2_access_token(
                     .ok();
             }
         } else {
-            warn!(context, "Failed to find OAuth2 access token");
+            warn!(context, 0, "Failed to find OAuth2 access token");
         }
 
         response.access_token
     } else {
-        warn!(context, "Internal OAuth2 error: 2");
+        warn!(context, 0, "Internal OAuth2 error: 2");
 
         None
     }
@@ -264,12 +268,17 @@ impl Oauth2 {
         // }
         let response = reqwest::Client::new().get(&userinfo_url).send();
         if response.is_err() {
-            warn!(context, "Error getting userinfo: {:?}", response);
+            warn!(context, 0, "Error getting userinfo: {:?}", response);
             return None;
         }
         let mut response = response.unwrap();
         if !response.status().is_success() {
-            warn!(context, "Error getting userinfo: {:?}", response.status());
+            warn!(
+                context,
+                0,
+                "Error getting userinfo: {:?}",
+                response.status()
+            );
             return None;
         }
 
@@ -277,19 +286,19 @@ impl Oauth2 {
         if parsed.is_err() {
             warn!(
                 context,
-                "Failed to parse userinfo JSON response: {:?}", parsed
+                0, "Failed to parse userinfo JSON response: {:?}", parsed
             );
             return None;
         }
         if let Ok(response) = parsed {
             let addr = response.get("email");
             if addr.is_none() {
-                warn!(context, "E-mail missing in userinfo.");
+                warn!(context, 0, "E-mail missing in userinfo.");
             }
 
             addr.map(|addr| addr.to_string())
         } else {
-            warn!(context, "Failed to parse userinfo.");
+            warn!(context, 0, "Failed to parse userinfo.");
             None
         }
     }

src/param.rs

@@ -4,7 +4,6 @@ use std::str;
 
 use num_traits::FromPrimitive;
 
-use crate::dc_mimeparser::SystemMessage;
 use crate::error;
 
 /// Available param keys.
@@ -95,7 +94,7 @@ impl fmt::Display for Params {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         for (i, (key, value)) in self.inner.iter().enumerate() {
             if i > 0 {
-                writeln!(f)?;
+                write!(f, "\n")?;
             }
             write!(f, "{}={}", *key as u8 as char, value)?;
         }
@@ -114,7 +113,7 @@ impl str::FromStr for Params {
                 continue;
             }
             // TODO: probably nicer using a regex
-            ensure!(pair.len() > 1, "Invalid key pair: '{}'", pair);
+            ensure!(pair.len() > 2, "Invalid key pair: '{}'", pair);
             let mut split = pair.splitn(2, '=');
             let key = split.next();
             let value = split.next();
@@ -179,13 +178,6 @@ impl Params {
         self.get(key).and_then(|s| s.parse().ok())
     }
 
-    /// Get the parameter behind `Param::Cmd` interpreted as `SystemMessage`.
-    pub fn get_cmd(&self) -> SystemMessage {
-        self.get_int(Param::Cmd)
-            .and_then(SystemMessage::from_i32)
-            .unwrap_or_default()
-    }
-
     /// Get the given parameter and parse as `f64`.
     pub fn get_float(&self, key: Param) -> Option<f64> {
         self.get(key).and_then(|s| s.parse().ok())
@@ -243,12 +235,4 @@ mod tests {
         assert!(p1.is_empty());
         assert_eq!(p1.len(), 0)
     }
-
-    #[test]
-    fn test_regression() {
-        let p1: Params = "a=cli%40deltachat.de\nn=\ni=TbnwJ6lSvD5\ns=0ejvbdFSQxB"
-            .parse()
-            .unwrap();
-        assert_eq!(p1.get(Param::Forwarded).unwrap(), "cli%40deltachat.de");
-    }
 }

src/peerstate.rs

@@ -4,9 +4,9 @@ use std::fmt;
 use num_traits::FromPrimitive;
 
 use crate::aheader::*;
-use crate::chat::*;
 use crate::constants::*;
 use crate::context::Context;
+use crate::dc_chat::*;
 use crate::key::*;
 use crate::sql::{self, Sql};
 
@@ -85,7 +85,7 @@ pub enum DegradeEvent {
 }
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
-enum VerifiedKey {
+pub enum VerifiedKey {
     Gossip,
     Public,
     None,
@@ -178,11 +178,8 @@ impl<'a> Peerstate<'a> {
                      OR gossip_key_fingerprint=? COLLATE NOCASE  \
                      ORDER BY public_key_fingerprint=? DESC;";
 
-        Self::from_stmt(
-            context,
-            query,
-            params![fingerprint, fingerprint, fingerprint],
-        )
+        let fp = fingerprint.as_bytes();
+        Self::from_stmt(context, query, params![fp, fp, fp])
     }
 
     fn from_stmt<P>(context: &'a Context, query: &str, params: P) -> Option<Self>
@@ -469,7 +466,7 @@ impl<'a> Peerstate<'a> {
         }
 
         if self.to_save == Some(ToSave::All) || create {
-            reset_gossiped_timestamp(self.context, 0);
+            dc_reset_gossiped_timestamp(self.context, 0);
         }
 
         success
@@ -526,10 +523,6 @@ mod tests {
         // clear to_save, as that is not persissted
         peerstate.to_save = None;
         assert_eq!(peerstate, peerstate_new);
-        let peerstate_new2 =
-            Peerstate::from_fingerprint(&ctx.ctx, &ctx.ctx.sql, &pub_key.fingerprint())
-                .expect("failed to load peerstate from db");
-        assert_eq!(peerstate, peerstate_new2);
     }
 
     #[test]

src/pgp.rs

@@ -1,7 +1,7 @@
 use std::collections::HashSet;
 use std::convert::TryInto;
+use std::ffi::CStr;
 use std::io::Cursor;
-use std::ptr;
 
 use pgp::composed::{
     Deserializable, KeyType as PgpKeyType, Message, SecretKeyParamsBuilder, SignedPublicKey,
@@ -14,6 +14,7 @@ use rand::thread_rng;
 use crate::dc_tools::*;
 use crate::key::*;
 use crate::keyring::*;
+use crate::types::*;
 use crate::x::*;
 
 pub unsafe fn dc_split_armored_data(
@@ -24,23 +25,23 @@ pub unsafe fn dc_split_armored_data(
     ret_base64: *mut *const libc::c_char,
 ) -> bool {
     let mut success = false;
-    let mut line_chars: libc::size_t = 0;
+    let mut line_chars: size_t = 0i32 as size_t;
     let mut line: *mut libc::c_char = buf;
     let mut p1: *mut libc::c_char = buf;
     let mut p2: *mut libc::c_char;
-    let mut headerline: *mut libc::c_char = ptr::null_mut();
-    let mut base64: *mut libc::c_char = ptr::null_mut();
+    let mut headerline: *mut libc::c_char = 0 as *mut libc::c_char;
+    let mut base64: *mut libc::c_char = 0 as *mut libc::c_char;
     if !ret_headerline.is_null() {
-        *ret_headerline = ptr::null()
+        *ret_headerline = 0 as *const libc::c_char
     }
     if !ret_setupcodebegin.is_null() {
-        *ret_setupcodebegin = ptr::null_mut();
+        *ret_setupcodebegin = 0 as *const libc::c_char
     }
     if !ret_preferencrypt.is_null() {
-        *ret_preferencrypt = ptr::null();
+        *ret_preferencrypt = 0 as *const libc::c_char
     }
     if !ret_base64.is_null() {
-        *ret_base64 = ptr::null();
+        *ret_base64 = 0 as *const libc::c_char
     }
     if !(buf.is_null() || ret_headerline.is_null()) {
         dc_remove_cr_chars(buf);
@@ -104,7 +105,7 @@ pub unsafe fn dc_split_armored_data(
                 }
                 p1 = p1.offset(1isize);
                 line = p1;
-                line_chars = 0;
+                line_chars = 0i32 as size_t
             } else {
                 p1 = p1.offset(1isize);
                 line_chars = line_chars.wrapping_add(1)
@@ -142,7 +143,7 @@ pub fn dc_pgp_create_keypair(addr: impl AsRef<str>) -> Option<(Key, Key)> {
         .key_type(PgpKeyType::Rsa(2048))
         .can_create_certificates(true)
         .can_sign(true)
-        .primary_user_id(user_id)
+        .primary_user_id(user_id.into())
         .passphrase(None)
         .preferred_symmetric_algorithms(smallvec![
             SymmetricKeyAlgorithm::AES256,
@@ -186,11 +187,15 @@ pub fn dc_pgp_create_keypair(addr: impl AsRef<str>) -> Option<(Key, Key)> {
 }
 
 pub fn dc_pgp_pk_encrypt(
-    plain: &[u8],
+    plain_text: *const libc::c_void,
+    plain_bytes: size_t,
     public_keys_for_encryption: &Keyring,
     private_key_for_signing: Option<&Key>,
 ) -> Option<String> {
-    let lit_msg = Message::new_literal_bytes("", plain);
+    assert!(!plain_text.is_null() && !plain_bytes > 0, "invalid input");
+
+    let bytes = unsafe { std::slice::from_raw_parts(plain_text as *const u8, plain_bytes) };
+    let lit_msg = Message::new_literal_bytes("", bytes);
     let pkeys: Vec<&SignedPublicKey> = public_keys_for_encryption
         .keys()
         .into_iter()
@@ -221,11 +226,16 @@ pub fn dc_pgp_pk_encrypt(
 }
 
 pub fn dc_pgp_pk_decrypt(
-    ctext: &[u8],
+    ctext: *const libc::c_void,
+    ctext_bytes: size_t,
     private_keys_for_decryption: &Keyring,
     public_keys_for_validation: &Keyring,
     ret_signature_fingerprints: Option<&mut HashSet<String>>,
 ) -> Option<Vec<u8>> {
+    assert!(!ctext.is_null() && ctext_bytes > 0, "invalid input");
+
+    let ctext = unsafe { std::slice::from_raw_parts(ctext as *const u8, ctext_bytes) };
+
     // TODO: proper error handling
     if let Ok((msg, _)) = Message::from_armor_single(Cursor::new(ctext)) {
         let skeys: Vec<&SignedSecretKey> = private_keys_for_decryption
@@ -272,25 +282,44 @@ pub fn dc_pgp_pk_decrypt(
 }
 
 /// Symmetric encryption.
-pub fn dc_pgp_symm_encrypt(passphrase: &str, plain: &[u8]) -> Option<String> {
+pub fn dc_pgp_symm_encrypt(
+    passphrase: *const libc::c_char,
+    plain: *const libc::c_void,
+    plain_bytes: size_t,
+) -> Option<String> {
+    assert!(!passphrase.is_null(), "invalid passphrase");
+    assert!(!plain.is_null() && !plain_bytes > 0, "invalid input");
+
+    let pw = unsafe { CStr::from_ptr(passphrase).to_str().unwrap() };
+    let bytes = unsafe { std::slice::from_raw_parts(plain as *const u8, plain_bytes) };
+
     let mut rng = thread_rng();
-    let lit_msg = Message::new_literal_bytes("", plain);
+    let lit_msg = Message::new_literal_bytes("", bytes);
 
     let s2k = StringToKey::new_default(&mut rng);
-    let msg =
-        lit_msg.encrypt_with_password(&mut rng, s2k, Default::default(), || passphrase.into());
+    let msg = lit_msg.encrypt_with_password(&mut rng, s2k, Default::default(), || pw.into());
 
     msg.and_then(|msg| msg.to_armored_string(None)).ok()
 }
 
 /// Symmetric decryption.
-pub fn dc_pgp_symm_decrypt(passphrase: &str, ctext: &[u8]) -> Option<Vec<u8>> {
-    let enc_msg = Message::from_bytes(Cursor::new(ctext));
+pub fn dc_pgp_symm_decrypt(
+    passphrase: *const libc::c_char,
+    ctext: *const libc::c_void,
+    ctext_bytes: size_t,
+) -> Option<Vec<u8>> {
+    assert!(!passphrase.is_null(), "invalid passphrase");
+    assert!(!ctext.is_null() && !ctext_bytes > 0, "invalid input");
+
+    let pw = unsafe { CStr::from_ptr(passphrase).to_str().unwrap() };
+    let bytes = unsafe { std::slice::from_raw_parts(ctext as *const u8, ctext_bytes) };
+
+    let enc_msg = Message::from_bytes(Cursor::new(bytes));
 
     enc_msg
         .and_then(|msg| {
             let mut decryptor = msg
-                .decrypt_with_password(|| passphrase.into())
+                .decrypt_with_password(|| pw.into())
                 .expect("failed decryption");
             decryptor.next().expect("no message")
         })

src/qr.rs

@@ -1,469 +0,0 @@
-use lazy_static::lazy_static;
-use percent_encoding::percent_decode_str;
-
-use crate::chat;
-use crate::constants::Blocked;
-use crate::contact::*;
-use crate::context::Context;
-use crate::error::Error;
-use crate::key::dc_format_fingerprint;
-use crate::key::*;
-use crate::lot::{Lot, LotState};
-use crate::param::*;
-use crate::peerstate::*;
-
-const OPENPGP4FPR_SCHEME: &str = "OPENPGP4FPR:"; // yes: uppercase
-const MAILTO_SCHEME: &str = "mailto:";
-const MATMSG_SCHEME: &str = "MATMSG:";
-const VCARD_SCHEME: &str = "BEGIN:VCARD";
-const SMTP_SCHEME: &str = "SMTP:";
-const HTTP_SCHEME: &str = "http://";
-const HTTPS_SCHEME: &str = "https://";
-
-// Make it easy to convert errors into the final `Lot`.
-impl Into<Lot> for Error {
-    fn into(self) -> Lot {
-        let mut l = Lot::new();
-        l.state = LotState::QrError;
-        l.text1 = Some(self.to_string());
-
-        l
-    }
-}
-
-/// Check a scanned QR code.
-/// The function should be called after a QR code is scanned.
-/// The function takes the raw text scanned and checks what can be done with it.
-pub fn check_qr(context: &Context, qr: impl AsRef<str>) -> Lot {
-    let qr = qr.as_ref();
-
-    info!(context, "Scanned QR code: {}", qr);
-
-    if qr.starts_with(OPENPGP4FPR_SCHEME) {
-        decode_openpgp(context, qr)
-    } else if qr.starts_with(MAILTO_SCHEME) {
-        decode_mailto(context, qr)
-    } else if qr.starts_with(SMTP_SCHEME) {
-        decode_smtp(context, qr)
-    } else if qr.starts_with(MATMSG_SCHEME) {
-        decode_matmsg(context, qr)
-    } else if qr.starts_with(VCARD_SCHEME) {
-        decode_vcard(context, qr)
-    } else if qr.starts_with(HTTP_SCHEME) || qr.starts_with(HTTPS_SCHEME) {
-        Lot::from_url(qr)
-    } else {
-        Lot::from_text(qr)
-    }
-}
-
-/// scheme: `OPENPGP4FPR:FINGERPRINT#a=ADDR&n=NAME&i=INVITENUMBER&s=AUTH`
-///     or: `OPENPGP4FPR:FINGERPRINT#a=ADDR&g=GROUPNAME&x=GROUPID&i=INVITENUMBER&s=AUTH`
-fn decode_openpgp(context: &Context, qr: &str) -> Lot {
-    let payload = &qr[OPENPGP4FPR_SCHEME.len()..];
-
-    let (fingerprint, fragment) = match payload.find('#').map(|offset| {
-        let (fp, rest) = payload.split_at(offset);
-        // need to remove the # from the fragment
-        (fp, &rest[1..])
-    }) {
-        Some(pair) => pair,
-        None => return format_err!("Invalid OPENPGP4FPR found").into(),
-    };
-
-    dbg!(fingerprint);
-    dbg!(fragment);
-
-    // replace & with \n to match expected param format
-    let fragment = fragment.replace('&', "\n");
-    dbg!(&fragment);
-
-    // Then parse the parameters
-    let param: Params = match fragment.parse() {
-        Ok(params) => params,
-        Err(err) => return err.into(),
-    };
-    dbg!(&param);
-
-    let addr = if let Some(addr) = param.get(Param::Forwarded) {
-        match normalize_address(addr) {
-            Ok(addr) => addr,
-            Err(err) => return err.into(),
-        }
-    } else {
-        return format_err!("Missing address").into();
-    };
-
-    // what is up with that param name?
-    let name = if let Some(encoded_name) = param.get(Param::SetLongitude) {
-        match percent_decode_str(encoded_name).decode_utf8() {
-            Ok(name) => name.to_string(),
-            Err(err) => return format_err!("Invalid name: {}", err).into(),
-        }
-    } else {
-        "".to_string()
-    };
-
-    let invitenumber = param.get(Param::ProfileImage).map(|s| s.to_string());
-    let auth = param.get(Param::Auth).map(|s| s.to_string());
-    let grpid = param.get(Param::GroupId).map(|s| s.to_string());
-
-    let grpname = if grpid.is_some() {
-        if let Some(encoded_name) = param.get(Param::GroupName) {
-            match percent_decode_str(encoded_name).decode_utf8() {
-                Ok(name) => Some(name.to_string()),
-                Err(err) => return format_err!("Invalid group name: {}", err).into(),
-            }
-        } else {
-            None
-        }
-    } else {
-        None
-    };
-
-    let fingerprint = dc_normalize_fingerprint(fingerprint);
-
-    // ensure valid fingerprint
-    if fingerprint.len() != 40 {
-        return format_err!("Bad fingerprint length in QR code").into();
-    }
-
-    println!(
-        "{:?} {:?} {:?} {:?} {:?} {:?} {:?}",
-        addr, name, invitenumber, auth, grpid, grpname, fingerprint
-    );
-
-    let mut lot = Lot::new();
-
-    // retrieve known state for this fingerprint
-    let peerstate = Peerstate::from_fingerprint(context, &context.sql, &fingerprint);
-
-    if invitenumber.is_none() || auth.is_none() {
-        if let Some(peerstate) = peerstate {
-            lot.state = LotState::QrFprOk;
-            let addr = peerstate
-                .addr
-                .as_ref()
-                .map(|s| s.as_str())
-                .unwrap_or_else(|| "");
-
-            lot.id = Contact::add_or_lookup(context, name, addr, Origin::UnhandledQrScan)
-                .map(|(id, _)| id)
-                .unwrap_or_default();
-
-            let (id, _) = chat::create_or_lookup_by_contact_id(context, lot.id, Blocked::Deaddrop)
-                .unwrap_or_default();
-
-            chat::add_device_msg(
-                context,
-                id,
-                format!("{} verified.", peerstate.addr.unwrap_or_default()),
-            );
-        } else {
-            lot.state = LotState::QrFprWithoutAddr;
-            lot.text1 = Some(dc_format_fingerprint(&fingerprint));
-        }
-    } else {
-        if grpid.is_some() && grpname.is_some() {
-            lot.state = LotState::QrAskVerifyGroup;
-            lot.text1 = grpname;
-            lot.text2 = grpid
-        } else {
-            lot.state = LotState::QrAskVerifyContact;
-        }
-        lot.id = Contact::add_or_lookup(context, &name, &addr, Origin::UnhandledQrScan)
-            .map(|(id, _)| id)
-            .unwrap_or_default();
-
-        lot.fingerprint = Some(fingerprint);
-        lot.invitenumber = invitenumber;
-        lot.auth = auth;
-    }
-
-    lot
-}
-
-/// Extract address for the mailto scheme.
-///
-/// Scheme: `mailto:addr...?subject=...&body=..`
-fn decode_mailto(context: &Context, qr: &str) -> Lot {
-    let payload = &qr[MAILTO_SCHEME.len()..];
-
-    let addr = if let Some(query_index) = payload.find('?') {
-        &payload[..query_index]
-    } else {
-        return format_err!("Invalid mailto found").into();
-    };
-
-    let addr = match normalize_address(addr) {
-        Ok(addr) => addr,
-        Err(err) => return err.into(),
-    };
-
-    let name = "".to_string();
-    Lot::from_address(context, name, addr)
-}
-
-/// Extract address for the smtp scheme.
-///
-/// Scheme: `SMTP:addr...:subject...:body...`
-fn decode_smtp(context: &Context, qr: &str) -> Lot {
-    let payload = &qr[SMTP_SCHEME.len()..];
-
-    let addr = if let Some(query_index) = payload.find(':') {
-        &payload[..query_index]
-    } else {
-        return format_err!("Invalid SMTP found").into();
-    };
-
-    let addr = match normalize_address(addr) {
-        Ok(addr) => addr,
-        Err(err) => return err.into(),
-    };
-
-    let name = "".to_string();
-    Lot::from_address(context, name, addr)
-}
-
-/// Extract address for the matmsg scheme.
-///
-/// Scheme: `MATMSG:TO:addr...;SUB:subject...;BODY:body...;`
-///
-/// There may or may not be linebreaks after the fields.
-fn decode_matmsg(context: &Context, qr: &str) -> Lot {
-    // Does not work when the text `TO:` is used in subject/body _and_ TO: is not the first field.
-    // we ignore this case.
-    let addr = if let Some(to_index) = qr.find("TO:") {
-        let addr = qr[to_index + 3..].trim();
-        if let Some(semi_index) = addr.find(';') {
-            addr[..semi_index].trim()
-        } else {
-            addr
-        }
-    } else {
-        return format_err!("Invalid MATMSG found").into();
-    };
-
-    let addr = match normalize_address(addr) {
-        Ok(addr) => addr,
-        Err(err) => return err.into(),
-    };
-
-    let name = "".to_string();
-    Lot::from_address(context, name, addr)
-}
-
-lazy_static! {
-    static ref VCARD_NAME_RE: regex::Regex =
-        regex::Regex::new(r"(?m)^N:([^;]*);([^;\n]*)").unwrap();
-    static ref VCARD_EMAIL_RE: regex::Regex =
-        regex::Regex::new(r"(?m)^EMAIL([^:\n]*):([^;\n]*)").unwrap();
-}
-
-/// Extract address for the matmsg scheme.
-///
-/// Scheme: `VCARD:BEGIN\nN:last name;first name;...;\nEMAIL;<type>:addr...;
-fn decode_vcard(context: &Context, qr: &str) -> Lot {
-    let name = VCARD_NAME_RE
-        .captures(qr)
-        .map(|caps| {
-            let last_name = &caps[1];
-            let first_name = &caps[2];
-
-            format!("{} {}", first_name.trim(), last_name.trim())
-        })
-        .unwrap_or_default();
-
-    let addr = if let Some(caps) = VCARD_EMAIL_RE.captures(qr) {
-        match normalize_address(caps[2].trim()) {
-            Ok(addr) => addr,
-            Err(err) => return err.into(),
-        }
-    } else {
-        return format_err!("Bad e-mail address").into();
-    };
-
-    Lot::from_address(context, name, addr)
-}
-
-impl Lot {
-    pub fn from_text(text: impl AsRef<str>) -> Self {
-        let mut l = Lot::new();
-        l.state = LotState::QrText;
-        l.text1 = Some(text.as_ref().to_string());
-
-        l
-    }
-
-    pub fn from_url(url: impl AsRef<str>) -> Self {
-        let mut l = Lot::new();
-        l.state = LotState::QrUrl;
-        l.text1 = Some(url.as_ref().to_string());
-
-        l
-    }
-
-    pub fn from_address(context: &Context, name: String, addr: String) -> Self {
-        let mut l = Lot::new();
-        l.state = LotState::QrAddr;
-        l.id = match Contact::add_or_lookup(context, name, addr, Origin::UnhandledQrScan) {
-            Ok((id, _)) => id,
-            Err(err) => return err.into(),
-        };
-
-        l
-    }
-}
-
-/// URL decodes a given address, does basic email validation on the result.
-fn normalize_address(addr: &str) -> Result<String, Error> {
-    // urldecoding is needed at least for OPENPGP4FPR but should not hurt in the other cases
-    let new_addr = percent_decode_str(addr).decode_utf8()?;
-    let new_addr = addr_normalize(&new_addr);
-
-    ensure!(may_be_valid_addr(&new_addr), "Bad e-mail address");
-
-    Ok(new_addr.to_string())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    use crate::test_utils::dummy_context;
-
-    #[test]
-    fn test_decode_http() {
-        let ctx = dummy_context();
-
-        let res = check_qr(&ctx.ctx, "http://www.hello.com");
-
-        assert_eq!(res.get_state(), LotState::QrUrl);
-        assert_eq!(res.get_id(), 0);
-        assert_eq!(res.get_text1().unwrap(), "http://www.hello.com");
-        assert!(res.get_text2().is_none());
-    }
-
-    #[test]
-    fn test_decode_https() {
-        let ctx = dummy_context();
-
-        let res = check_qr(&ctx.ctx, "https://www.hello.com");
-
-        assert_eq!(res.get_state(), LotState::QrUrl);
-        assert_eq!(res.get_id(), 0);
-        assert_eq!(res.get_text1().unwrap(), "https://www.hello.com");
-        assert!(res.get_text2().is_none());
-    }
-
-    #[test]
-    fn test_decode_text() {
-        let ctx = dummy_context();
-
-        let res = check_qr(&ctx.ctx, "I am so cool");
-
-        assert_eq!(res.get_state(), LotState::QrText);
-        assert_eq!(res.get_id(), 0);
-        assert_eq!(res.get_text1().unwrap(), "I am so cool");
-        assert!(res.get_text2().is_none());
-    }
-
-    #[test]
-    fn test_decode_vcard() {
-        let ctx = dummy_context();
-
-        let res = check_qr(
-            &ctx.ctx,
-            "BEGIN:VCARD\nVERSION:3.0\nN:Last;First\nEMAIL;TYPE=INTERNET:stress@test.local\nEND:VCARD"
-        );
-
-        println!("{:?}", res);
-        assert_eq!(res.get_state(), LotState::QrAddr);
-        assert_ne!(res.get_id(), 0);
-
-        let contact = Contact::get_by_id(&ctx.ctx, res.get_id()).unwrap();
-        assert_eq!(contact.get_addr(), "stress@test.local");
-        assert_eq!(contact.get_name(), "First Last");
-    }
-
-    #[test]
-    fn test_decode_matmsg() {
-        let ctx = dummy_context();
-
-        let res = check_qr(
-            &ctx.ctx,
-            "MATMSG:TO:\n\nstress@test.local ; \n\nSUB:\n\nSubject here\n\nBODY:\n\nhelloworld\n;;",
-        );
-
-        println!("{:?}", res);
-        assert_eq!(res.get_state(), LotState::QrAddr);
-        assert_ne!(res.get_id(), 0);
-
-        let contact = Contact::get_by_id(&ctx.ctx, res.get_id()).unwrap();
-        assert_eq!(contact.get_addr(), "stress@test.local");
-    }
-
-    #[test]
-    fn test_decode_mailto() {
-        let ctx = dummy_context();
-
-        let res = check_qr(
-            &ctx.ctx,
-            "mailto:stress@test.local?subject=hello&body=world",
-        );
-
-        println!("{:?}", res);
-        assert_eq!(res.get_state(), LotState::QrAddr);
-        assert_ne!(res.get_id(), 0);
-
-        let contact = Contact::get_by_id(&ctx.ctx, res.get_id()).unwrap();
-        assert_eq!(contact.get_addr(), "stress@test.local");
-    }
-
-    #[test]
-    fn test_decode_smtp() {
-        let ctx = dummy_context();
-
-        let res = check_qr(&ctx.ctx, "SMTP:stress@test.local:subjecthello:bodyworld");
-
-        println!("{:?}", res);
-        assert_eq!(res.get_state(), LotState::QrAddr);
-        assert_ne!(res.get_id(), 0);
-
-        let contact = Contact::get_by_id(&ctx.ctx, res.get_id()).unwrap();
-        assert_eq!(contact.get_addr(), "stress@test.local");
-    }
-
-    #[test]
-    fn test_decode_openpgp_group() {
-        let ctx = dummy_context();
-
-        let res = check_qr(
-            &ctx.ctx,
-            "OPENPGP4FPR:79252762C34C5096AF57958F4FC3D21A81B0F0A7#a=cli%40deltachat.de&g=testtesttest&x=h-0oKQf2CDK&i=9JEXlxAqGM0&s=0V7LzL9cxRL"
-        );
-
-        println!("{:?}", res);
-        assert_eq!(res.get_state(), LotState::QrAskVerifyGroup);
-        assert_ne!(res.get_id(), 0);
-
-        let contact = Contact::get_by_id(&ctx.ctx, res.get_id()).unwrap();
-        assert_eq!(contact.get_addr(), "cli@deltachat.de");
-    }
-
-    #[test]
-    fn test_decode_openpgp_secure_join() {
-        let ctx = dummy_context();
-
-        let res = check_qr(
-            &ctx.ctx,
-            "OPENPGP4FPR:79252762C34C5096AF57958F4FC3D21A81B0F0A7#a=cli%40deltachat.de&n=&i=TbnwJ6lSvD5&s=0ejvbdFSQxB"
-        );
-
-        println!("{:?}", res);
-        assert_eq!(res.get_state(), LotState::QrAskVerifyContact);
-        assert_ne!(res.get_id(), 0);
-
-        let contact = Contact::get_by_id(&ctx.ctx, res.get_id()).unwrap();
-        assert_eq!(contact.get_addr(), "cli@deltachat.de");
-    }
-}

src/securejoin.rs

@@ -1,747 +0,0 @@
-use percent_encoding::{utf8_percent_encode, AsciiSet, NON_ALPHANUMERIC};
-
-use crate::aheader::EncryptPreference;
-use crate::chat::{self, Chat};
-use crate::config::*;
-use crate::configure::*;
-use crate::constants::*;
-use crate::contact::*;
-use crate::context::Context;
-use crate::dc_mimeparser::*;
-use crate::e2ee::*;
-use crate::error::Error;
-use crate::events::Event;
-use crate::key::*;
-use crate::lot::LotState;
-use crate::message::*;
-use crate::param::*;
-use crate::peerstate::*;
-use crate::qr::check_qr;
-use crate::stock::StockMessage;
-use crate::token;
-
-pub const NON_ALPHANUMERIC_WITHOUT_DOT: &AsciiSet = &NON_ALPHANUMERIC.remove(b'.');
-
-macro_rules! joiner_progress {
-    ($context:tt, $contact_id:expr, $progress:expr) => {
-        assert!(
-            $progress >= 0 && $progress <= 1000,
-            "value in range 0..1000 expected with: 0=error, 1..999=progress, 1000=success"
-        );
-        $context.call_cb($crate::events::Event::SecurejoinJoinerProgress {
-            contact_id: $contact_id,
-            progress: $progress,
-        });
-    };
-}
-
-macro_rules! inviter_progress {
-    ($context:tt, $contact_id:expr, $progress:expr) => {
-        assert!(
-            $progress >= 0 && $progress <= 1000,
-            "value in range 0..1000 expected with: 0=error, 1..999=progress, 1000=success"
-        );
-        $context.call_cb($crate::events::Event::SecurejoinInviterProgress {
-            contact_id: $contact_id,
-            progress: $progress,
-        });
-    };
-}
-
-macro_rules! get_qr_attr {
-    ($context:tt, $attr:ident) => {
-        $context
-            .bob
-            .read()
-            .unwrap()
-            .qr_scan
-            .as_ref()
-            .unwrap()
-            .$attr
-            .as_ref()
-            .unwrap()
-    };
-}
-
-pub fn dc_get_securejoin_qr(context: &Context, group_chat_id: u32) -> Option<String> {
-    /* =========================================================
-    ====             Alice - the inviter side            ====
-    ====   Step 1 in "Setup verified contact" protocol   ====
-    ========================================================= */
-
-    let fingerprint: String;
-
-    ensure_secret_key_exists(context).ok();
-    let invitenumber = token::lookup_or_new(context, token::Namespace::InviteNumber, group_chat_id);
-    let auth = token::lookup_or_new(context, token::Namespace::Auth, group_chat_id);
-    let self_addr = match context.get_config(Config::ConfiguredAddr) {
-        Some(addr) => addr,
-        None => {
-            error!(context, "Not configured, cannot generate QR code.",);
-            return None;
-        }
-    };
-
-    let self_name = context
-        .sql
-        .get_config(context, "displayname")
-        .unwrap_or_default();
-
-    fingerprint = match get_self_fingerprint(context) {
-        Some(fp) => fp,
-        None => {
-            return None;
-        }
-    };
-
-    let self_addr_urlencoded =
-        utf8_percent_encode(&self_addr, NON_ALPHANUMERIC_WITHOUT_DOT).to_string();
-    let self_name_urlencoded =
-        utf8_percent_encode(&self_name, NON_ALPHANUMERIC_WITHOUT_DOT).to_string();
-
-    let qr = if 0 != group_chat_id {
-        if let Ok(chat) = Chat::load_from_db(context, group_chat_id) {
-            let group_name = chat.get_name();
-            let group_name_urlencoded =
-                utf8_percent_encode(&group_name, NON_ALPHANUMERIC).to_string();
-
-            Some(format!(
-                "OPENPGP4FPR:{}#a={}&g={}&x={}&i={}&s={}",
-                fingerprint,
-                self_addr_urlencoded,
-                &group_name_urlencoded,
-                &chat.grpid,
-                &invitenumber,
-                &auth,
-            ))
-        } else {
-            error!(context, "Cannot get QR-code for chat-id {}", group_chat_id,);
-            return None;
-        }
-    } else {
-        Some(format!(
-            "OPENPGP4FPR:{}#a={}&n={}&i={}&s={}",
-            fingerprint, self_addr_urlencoded, self_name_urlencoded, &invitenumber, &auth,
-        ))
-    };
-
-    info!(context, "Generated QR code: {}", qr.as_ref().unwrap());
-
-    qr
-}
-
-fn get_self_fingerprint(context: &Context) -> Option<String> {
-    if let Some(self_addr) = context.get_config(Config::ConfiguredAddr) {
-        if let Some(key) = Key::from_self_public(context, self_addr, &context.sql) {
-            return Some(key.fingerprint());
-        }
-    }
-    None
-}
-
-pub fn dc_join_securejoin(context: &Context, qr: &str) -> u32 {
-    let cleanup =
-        |context: &Context, contact_chat_id: u32, ongoing_allocated: bool, join_vg: bool| {
-            let mut bob = context.bob.write().unwrap();
-            bob.expects = 0;
-            let ret_chat_id = if bob.status == DC_BOB_SUCCESS {
-                if join_vg {
-                    chat::get_chat_id_by_grpid(
-                        context,
-                        bob.qr_scan.as_ref().unwrap().text2.as_ref().unwrap(),
-                    )
-                    .0
-                } else {
-                    contact_chat_id
-                }
-            } else {
-                0
-            };
-            bob.qr_scan = None;
-
-            if ongoing_allocated {
-                dc_free_ongoing(context);
-            }
-            ret_chat_id as u32
-        };
-    /* ==========================================================
-    ====             Bob - the joiner's side             =====
-    ====   Step 2 in "Setup verified contact" protocol   =====
-    ========================================================== */
-    let mut contact_chat_id: u32 = 0;
-    let mut join_vg: bool = false;
-
-    info!(context, "Requesting secure-join ...",);
-    ensure_secret_key_exists(context).ok();
-    if !dc_alloc_ongoing(context) {
-        return cleanup(&context, contact_chat_id, false, join_vg);
-    }
-    let qr_scan = check_qr(context, &qr);
-    if qr_scan.state != LotState::QrAskVerifyContact && qr_scan.state != LotState::QrAskVerifyGroup
-    {
-        error!(context, "Unknown QR code.",);
-        return cleanup(&context, contact_chat_id, true, join_vg);
-    }
-    contact_chat_id = chat::create_by_contact_id(context, qr_scan.id).unwrap_or_default();
-    if contact_chat_id == 0 {
-        error!(context, "Unknown contact.",);
-        return cleanup(&context, contact_chat_id, true, join_vg);
-    }
-    if check_exit(context) {
-        return cleanup(&context, contact_chat_id, true, join_vg);
-    }
-    join_vg = qr_scan.get_state() == LotState::QrAskVerifyGroup;
-    {
-        let mut bob = context.bob.write().unwrap();
-        bob.status = 0;
-        bob.qr_scan = Some(qr_scan);
-    }
-    if fingerprint_equals_sender(
-        context,
-        context
-            .bob
-            .read()
-            .unwrap()
-            .qr_scan
-            .as_ref()
-            .unwrap()
-            .fingerprint
-            .as_ref()
-            .unwrap(),
-        contact_chat_id,
-    ) {
-        info!(context, "Taking protocol shortcut.");
-        context.bob.write().unwrap().expects = DC_VC_CONTACT_CONFIRM;
-        joiner_progress!(context, chat_id_2_contact_id(context, contact_chat_id), 400);
-        let own_fingerprint = get_self_fingerprint(context).unwrap();
-        send_handshake_msg(
-            context,
-            contact_chat_id,
-            if join_vg {
-                "vg-request-with-auth"
-            } else {
-                "vc-request-with-auth"
-            },
-            get_qr_attr!(context, auth).to_string(),
-            Some(own_fingerprint),
-            if join_vg {
-                get_qr_attr!(context, text2).to_string()
-            } else {
-                "".to_string()
-            },
-        );
-    } else {
-        context.bob.write().unwrap().expects = DC_VC_AUTH_REQUIRED;
-        send_handshake_msg(
-            context,
-            contact_chat_id,
-            if join_vg { "vg-request" } else { "vc-request" },
-            get_qr_attr!(context, invitenumber),
-            None,
-            "",
-        );
-    }
-
-    // Bob -> Alice
-    while !check_exit(&context) {
-        std::thread::sleep(std::time::Duration::new(0, 3_000_000));
-    }
-    cleanup(&context, contact_chat_id, true, join_vg)
-}
-
-fn check_exit(context: &Context) -> bool {
-    context
-        .running_state
-        .clone()
-        .read()
-        .unwrap()
-        .shall_stop_ongoing
-}
-
-fn send_handshake_msg(
-    context: &Context,
-    contact_chat_id: u32,
-    step: &str,
-    param2: impl AsRef<str>,
-    fingerprint: Option<String>,
-    grpid: impl AsRef<str>,
-) {
-    let mut msg = dc_msg_new_untyped();
-    msg.type_0 = Viewtype::Text;
-    msg.text = Some(format!("Secure-Join: {}", step));
-    msg.hidden = true;
-    msg.param.set_int(Param::Cmd, 7);
-    if step.is_empty() {
-        msg.param.remove(Param::Arg);
-    } else {
-        msg.param.set(Param::Arg, step);
-    }
-    if !param2.as_ref().is_empty() {
-        msg.param.set(Param::Arg2, param2);
-    }
-    if let Some(fp) = fingerprint {
-        msg.param.set(Param::Arg3, fp);
-    }
-    if !grpid.as_ref().is_empty() {
-        msg.param.set(Param::Arg4, grpid.as_ref());
-    }
-    if step == "vg-request" || step == "vc-request" {
-        msg.param.set_int(
-            Param::ForcePlaintext,
-            ForcePlaintext::AddAutocryptHeader as i32,
-        );
-    } else {
-        msg.param.set_int(Param::GuranteeE2ee, 1);
-    }
-    // TODO. handle cleanup on error
-    chat::send_msg(context, contact_chat_id, &mut msg).unwrap();
-}
-
-fn chat_id_2_contact_id(context: &Context, contact_chat_id: u32) -> u32 {
-    let contacts = chat::get_chat_contacts(context, contact_chat_id);
-    if contacts.len() == 1 {
-        contacts[0]
-    } else {
-        0
-    }
-}
-
-fn fingerprint_equals_sender(
-    context: &Context,
-    fingerprint: impl AsRef<str>,
-    contact_chat_id: u32,
-) -> bool {
-    let contacts = chat::get_chat_contacts(context, contact_chat_id);
-
-    if contacts.len() == 1 {
-        if let Ok(contact) = Contact::load_from_db(context, contacts[0]) {
-            if let Some(peerstate) = Peerstate::from_addr(context, &context.sql, contact.get_addr())
-            {
-                let fingerprint_normalized = dc_normalize_fingerprint(fingerprint.as_ref());
-                if peerstate.public_key_fingerprint.is_some()
-                    && &fingerprint_normalized == peerstate.public_key_fingerprint.as_ref().unwrap()
-                {
-                    return true;
-                }
-            }
-        }
-    }
-    false
-}
-
-/* library private: secure-join */
-pub fn handle_securejoin_handshake(
-    context: &Context,
-    mimeparser: &MimeParser,
-    contact_id: u32,
-) -> libc::c_int {
-    let own_fingerprint: String;
-
-    if contact_id <= DC_CONTACT_ID_LAST_SPECIAL {
-        return 0;
-    }
-    let step = match mimeparser.lookup_optional_field("Secure-Join") {
-        Some(s) => s,
-        None => {
-            return 0;
-        }
-    };
-    info!(
-        context,
-        ">>>>>>>>>>>>>>>>>>>>>>>>> secure-join message \'{}\' received", step,
-    );
-    let (contact_chat_id, contact_chat_id_blocked) =
-        chat::create_or_lookup_by_contact_id(context, contact_id, Blocked::Not).unwrap_or_default();
-
-    if contact_chat_id_blocked != Blocked::Not {
-        chat::unblock(context, contact_chat_id);
-    }
-    let mut ret: libc::c_int = DC_HANDSHAKE_STOP_NORMAL_PROCESSING;
-    let join_vg = step.starts_with("vg-");
-
-    match step.as_str() {
-        "vg-request" | "vc-request" => {
-            /* =========================================================
-            ====             Alice - the inviter side            ====
-            ====   Step 3 in "Setup verified contact" protocol   ====
-            ========================================================= */
-            // this message may be unencrypted (Bob, the joinder and the sender, might not have Alice's key yet)
-            // it just ensures, we have Bobs key now. If we do _not_ have the key because eg. MitM has removed it,
-            // send_message() will fail with the error "End-to-end-encryption unavailable unexpectedly.", so, there is no additional check needed here.
-            // verify that the `Secure-Join-Invitenumber:`-header matches invitenumber written to the QR code
-            let invitenumber = match mimeparser.lookup_optional_field("Secure-Join-Invitenumber") {
-                Some(n) => n,
-                None => {
-                    warn!(context, "Secure-join denied (invitenumber missing).",);
-                    return ret;
-                }
-            };
-            if !token::exists(context, token::Namespace::InviteNumber, &invitenumber) {
-                warn!(context, "Secure-join denied (bad invitenumber).",);
-                return ret;
-            }
-            info!(context, "Secure-join requested.",);
-
-            inviter_progress!(context, contact_id, 300);
-            send_handshake_msg(
-                context,
-                contact_chat_id,
-                &format!("{}-auth-required", &step[..2]),
-                "",
-                None,
-                "",
-            );
-        }
-        "vg-auth-required" | "vc-auth-required" => {
-            let cond = {
-                let bob = context.bob.read().unwrap();
-                let scan = bob.qr_scan.as_ref();
-                scan.is_none()
-                    || bob.expects != DC_VC_AUTH_REQUIRED
-                    || join_vg && scan.unwrap().state != LotState::QrAskVerifyGroup
-            };
-
-            if cond {
-                warn!(context, "auth-required message out of sync.",);
-                // no error, just aborted somehow or a mail from another handshake
-                return ret;
-            }
-            let scanned_fingerprint_of_alice = get_qr_attr!(context, fingerprint).to_string();
-            let auth = get_qr_attr!(context, auth).to_string();
-
-            if !encrypted_and_signed(mimeparser, &scanned_fingerprint_of_alice) {
-                could_not_establish_secure_connection(
-                    context,
-                    contact_chat_id,
-                    if mimeparser.e2ee_helper.encrypted {
-                        "No valid signature."
-                    } else {
-                        "Not encrypted."
-                    },
-                );
-                end_bobs_joining(context, DC_BOB_ERROR);
-                return ret;
-            }
-            if !fingerprint_equals_sender(context, &scanned_fingerprint_of_alice, contact_chat_id) {
-                could_not_establish_secure_connection(
-                    context,
-                    contact_chat_id,
-                    "Fingerprint mismatch on joiner-side.",
-                );
-                end_bobs_joining(context, DC_BOB_ERROR);
-                return ret;
-            }
-            info!(context, "Fingerprint verified.",);
-            own_fingerprint = get_self_fingerprint(context).unwrap();
-            joiner_progress!(context, contact_id, 400);
-            context.bob.write().unwrap().expects = DC_VC_CONTACT_CONFIRM;
-
-            send_handshake_msg(
-                context,
-                contact_chat_id,
-                &format!("{}-request-with-auth", &step[..2]),
-                auth,
-                Some(own_fingerprint),
-                if join_vg {
-                    get_qr_attr!(context, text2).to_string()
-                } else {
-                    "".to_string()
-                },
-            );
-        }
-        "vg-request-with-auth" | "vc-request-with-auth" => {
-            /* ============================================================
-            ====              Alice - the inviter side              ====
-            ====   Steps 5+6 in "Setup verified contact" protocol   ====
-            ====  Step 6 in "Out-of-band verified groups" protocol  ====
-            ============================================================ */
-            // verify that Secure-Join-Fingerprint:-header matches the fingerprint of Bob
-            let fingerprint = match mimeparser.lookup_optional_field("Secure-Join-Fingerprint") {
-                Some(fp) => fp,
-                None => {
-                    could_not_establish_secure_connection(
-                        context,
-                        contact_chat_id,
-                        "Fingerprint not provided.",
-                    );
-                    return ret;
-                }
-            };
-            if !encrypted_and_signed(mimeparser, &fingerprint) {
-                could_not_establish_secure_connection(
-                    context,
-                    contact_chat_id,
-                    "Auth not encrypted.",
-                );
-                return ret;
-            }
-            if !fingerprint_equals_sender(context, &fingerprint, contact_chat_id) {
-                could_not_establish_secure_connection(
-                    context,
-                    contact_chat_id,
-                    "Fingerprint mismatch on inviter-side.",
-                );
-                return ret;
-            }
-            info!(context, "Fingerprint verified.",);
-            // verify that the `Secure-Join-Auth:`-header matches the secret written to the QR code
-            let auth_0 = match mimeparser.lookup_optional_field("Secure-Join-Auth") {
-                Some(auth) => auth,
-                None => {
-                    could_not_establish_secure_connection(
-                        context,
-                        contact_chat_id,
-                        "Auth not provided.",
-                    );
-                    return ret;
-                }
-            };
-            if !token::exists(context, token::Namespace::Auth, &auth_0) {
-                could_not_establish_secure_connection(context, contact_chat_id, "Auth invalid.");
-                return ret;
-            }
-            if mark_peer_as_verified(context, fingerprint).is_err() {
-                could_not_establish_secure_connection(
-                    context,
-                    contact_chat_id,
-                    "Fingerprint mismatch on inviter-side.",
-                );
-                return ret;
-            }
-            Contact::scaleup_origin_by_id(context, contact_id, Origin::SecurejoinInvited);
-            info!(context, "Auth verified.",);
-            secure_connection_established(context, contact_chat_id);
-            emit_event!(context, Event::ContactsChanged(Some(contact_id)));
-            inviter_progress!(context, contact_id, 600);
-            if join_vg {
-                let field_grpid = mimeparser
-                    .lookup_optional_field("Secure-Join-Group")
-                    .unwrap_or_default();
-                let (group_chat_id, _, _) = chat::get_chat_id_by_grpid(context, &field_grpid);
-                if group_chat_id == 0 {
-                    error!(context, "Chat {} not found.", &field_grpid);
-                    return ret;
-                } else {
-                    chat::add_contact_to_chat_ex(context, group_chat_id, contact_id, 0x1i32);
-                }
-            } else {
-                send_handshake_msg(context, contact_chat_id, "vc-contact-confirm", "", None, "");
-                inviter_progress!(context, contact_id, 1000);
-            }
-        }
-        "vg-member-added" | "vc-contact-confirm" => {
-            if join_vg {
-                ret = DC_HANDSHAKE_CONTINUE_NORMAL_PROCESSING;
-            }
-            if context.bob.read().unwrap().expects != DC_VC_CONTACT_CONFIRM {
-                info!(context, "Message belongs to a different handshake.",);
-                return ret;
-            }
-            let cond = {
-                let bob = context.bob.read().unwrap();
-                let scan = bob.qr_scan.as_ref();
-                scan.is_none() || join_vg && scan.unwrap().state != LotState::QrAskVerifyGroup
-            };
-            if cond {
-                warn!(
-                    context,
-                    "Message out of sync or belongs to a different handshake.",
-                );
-                return ret;
-            }
-            let scanned_fingerprint_of_alice = get_qr_attr!(context, fingerprint).to_string();
-
-            let vg_expect_encrypted = if join_vg {
-                let group_id = get_qr_attr!(context, text2).to_string();
-                let (_, is_verified_group, _) = chat::get_chat_id_by_grpid(context, group_id);
-                // when joining a non-verified group
-                // the vg-member-added message may be unencrypted
-                // when not all group members have keys or prefer encryption.
-                // So only expect encryption if this is a verified group
-                is_verified_group
-            } else {
-                // setup contact is always encrypted
-                true
-            };
-            if vg_expect_encrypted
-                && !encrypted_and_signed(mimeparser, &scanned_fingerprint_of_alice)
-            {
-                could_not_establish_secure_connection(
-                    context,
-                    contact_chat_id,
-                    "Contact confirm message not encrypted.",
-                );
-                end_bobs_joining(context, DC_BOB_ERROR);
-                return ret;
-            }
-
-            if mark_peer_as_verified(context, &scanned_fingerprint_of_alice).is_err() {
-                could_not_establish_secure_connection(
-                    context,
-                    contact_chat_id,
-                    "Fingerprint mismatch on joiner-side.",
-                );
-                return ret;
-            }
-            Contact::scaleup_origin_by_id(context, contact_id, Origin::SecurejoinJoined);
-            emit_event!(context, Event::ContactsChanged(None));
-            let cg_member_added = mimeparser
-                .lookup_optional_field("Chat-Group-Member-Added")
-                .unwrap_or_default();
-            if join_vg && !addr_equals_self(context, cg_member_added) {
-                info!(context, "Message belongs to a different handshake (scaled up contact anyway to allow creation of group).");
-                return ret;
-            }
-            secure_connection_established(context, contact_chat_id);
-            context.bob.write().unwrap().expects = 0;
-            if join_vg {
-                send_handshake_msg(
-                    context,
-                    contact_chat_id,
-                    "vg-member-added-received",
-                    "",
-                    None,
-                    "",
-                );
-            }
-            end_bobs_joining(context, DC_BOB_SUCCESS);
-        }
-        "vg-member-added-received" => {
-            /* ============================================================
-            ====              Alice - the inviter side              ====
-            ====  Step 8 in "Out-of-band verified groups" protocol  ====
-            ============================================================ */
-            if let Ok(contact) = Contact::get_by_id(context, contact_id) {
-                if contact.is_verified(context) == VerifiedStatus::Unverified {
-                    warn!(context, "vg-member-added-received invalid.",);
-                    return ret;
-                }
-                inviter_progress!(context, contact_id, 800);
-                inviter_progress!(context, contact_id, 1000);
-            } else {
-                warn!(context, "vg-member-added-received invalid.",);
-                return ret;
-            }
-        }
-        _ => {
-            warn!(context, "invalid step: {}", step);
-        }
-    }
-    if ret == DC_HANDSHAKE_STOP_NORMAL_PROCESSING {
-        ret |= DC_HANDSHAKE_ADD_DELETE_JOB;
-    }
-    ret
-}
-
-fn end_bobs_joining(context: &Context, status: libc::c_int) {
-    context.bob.write().unwrap().status = status;
-    dc_stop_ongoing_process(context);
-}
-
-fn secure_connection_established(context: &Context, contact_chat_id: u32) {
-    let contact_id: u32 = chat_id_2_contact_id(context, contact_chat_id);
-    let contact = Contact::get_by_id(context, contact_id);
-    let addr = if let Ok(ref contact) = contact {
-        contact.get_addr()
-    } else {
-        "?"
-    };
-    let msg = context.stock_string_repl_str(StockMessage::ContactVerified, addr);
-    chat::add_device_msg(context, contact_chat_id, msg);
-    emit_event!(context, Event::ChatModified(contact_chat_id));
-}
-
-fn could_not_establish_secure_connection(context: &Context, contact_chat_id: u32, details: &str) {
-    let contact_id = chat_id_2_contact_id(context, contact_chat_id);
-    let contact = Contact::get_by_id(context, contact_id);
-    let msg = context.stock_string_repl_str(
-        StockMessage::ContactNotVerified,
-        if let Ok(ref contact) = contact {
-            contact.get_addr()
-        } else {
-            "?"
-        },
-    );
-
-    chat::add_device_msg(context, contact_chat_id, &msg);
-    error!(context, "{} ({})", &msg, details);
-}
-
-fn mark_peer_as_verified(context: &Context, fingerprint: impl AsRef<str>) -> Result<(), Error> {
-    if let Some(ref mut peerstate) =
-        Peerstate::from_fingerprint(context, &context.sql, fingerprint.as_ref())
-    {
-        if peerstate.set_verified(1, fingerprint.as_ref(), 2) {
-            peerstate.prefer_encrypt = EncryptPreference::Mutual;
-            peerstate.to_save = Some(ToSave::All);
-            peerstate.save_to_db(&context.sql, false);
-            return Ok(());
-        }
-    }
-    bail!(
-        "could not mark peer as verified for fingerprint {}",
-        fingerprint.as_ref()
-    );
-}
-
-/* ******************************************************************************
- * Tools: Misc.
- ******************************************************************************/
-
-fn encrypted_and_signed(mimeparser: &MimeParser, expected_fingerprint: impl AsRef<str>) -> bool {
-    if !mimeparser.e2ee_helper.encrypted {
-        warn!(mimeparser.context, "Message not encrypted.",);
-        false
-    } else if mimeparser.e2ee_helper.signatures.len() <= 0 {
-        warn!(mimeparser.context, "Message not signed.",);
-        false
-    } else if expected_fingerprint.as_ref().is_empty() {
-        warn!(mimeparser.context, "Fingerprint for comparison missing.",);
-        false
-    } else if !mimeparser
-        .e2ee_helper
-        .signatures
-        .contains(expected_fingerprint.as_ref())
-    {
-        warn!(
-            mimeparser.context,
-            "Message does not match expected fingerprint {}.",
-            expected_fingerprint.as_ref(),
-        );
-        false
-    } else {
-        true
-    }
-}
-
-pub fn handle_degrade_event(context: &Context, peerstate: &Peerstate) {
-    // - we do not issue an warning for DC_DE_ENCRYPTION_PAUSED as this is quite normal
-    // - currently, we do not issue an extra warning for DC_DE_VERIFICATION_LOST - this always comes
-    //   together with DC_DE_FINGERPRINT_CHANGED which is logged, the idea is not to bother
-    //   with things they cannot fix, so the user is just kicked from the verified group
-    //   (and he will know this and can fix this)
-    if Some(DegradeEvent::FingerprintChanged) == peerstate.degrade_event {
-        let contact_id: i32 = context
-            .sql
-            .query_get_value(
-                context,
-                "SELECT id FROM contacts WHERE addr=?;",
-                params![&peerstate.addr],
-            )
-            .unwrap_or_default();
-        if contact_id > 0 {
-            let (contact_chat_id, _) =
-                chat::create_or_lookup_by_contact_id(context, contact_id as u32, Blocked::Deaddrop)
-                    .unwrap_or_default();
-
-            let peeraddr: &str = match peerstate.addr {
-                Some(ref addr) => &addr,
-                None => "",
-            };
-            let msg = context.stock_string_repl_str(StockMessage::ContactSetupChanged, peeraddr);
-
-            chat::add_device_msg(context, contact_chat_id, msg);
-            emit_event!(context, Event::ChatModified(contact_chat_id));
-        }
-    }
-}

src/smtp.rs

@@ -1,20 +1,18 @@
 use lettre::smtp::client::net::*;
 use lettre::*;
 
+use crate::constants::Event;
 use crate::constants::*;
 use crate::context::Context;
-use crate::events::Event;
-use crate::login_param::LoginParam;
+use crate::dc_loginparam::*;
 use crate::oauth2::*;
 
-#[derive(DebugStub)]
 pub struct Smtp {
-    #[debug_stub(some = "SmtpTransport")]
     transport: Option<lettre::smtp::SmtpTransport>,
     transport_connected: bool,
     /// Email address we are sending from.
     from: Option<EmailAddress>,
-    pub error: Option<String>,
+    pub error: *mut libc::c_char,
 }
 
 impl Smtp {
@@ -24,7 +22,7 @@ impl Smtp {
             transport: None,
             transport_connected: false,
             from: None,
-            error: None,
+            error: std::ptr::null_mut(),
         }
     }
 
@@ -45,14 +43,14 @@ impl Smtp {
     }
 
     /// Connect using the provided login params
-    pub fn connect(&mut self, context: &Context, lp: &LoginParam) -> bool {
+    pub fn connect(&mut self, context: &Context, lp: &dc_loginparam_t) -> bool {
         if self.is_connected() {
-            warn!(context, "SMTP already connected.");
+            warn!(context, 0, "SMTP already connected.");
             return true;
         }
 
         if lp.send_server.is_empty() || lp.send_port == 0 {
-            context.call_cb(Event::ErrorNetwork("SMTP bad parameters.".into()));
+            log_event!(context, Event::ERROR_NETWORK, 0, "SMTP bad parameters.",);
         }
 
         self.from = if let Ok(addr) = EmailAddress::new(lp.addr.clone()) {
@@ -111,14 +109,17 @@ impl Smtp {
                     .credentials(creds)
                     .connection_reuse(lettre::smtp::ConnectionReuseParameters::ReuseUnlimited);
                 self.transport = Some(client.transport());
-                context.call_cb(Event::SmtpConnected(format!(
+                log_event!(
+                    context,
+                    Event::SMTP_CONNECTED,
+                    0,
                     "SMTP-LOGIN as {} ok",
                     lp.send_user,
-                )));
+                );
                 true
             }
             Err(err) => {
-                warn!(context, "SMTP: failed to establish connection {:?}", err);
+                warn!(context, 0, "SMTP: failed to establish connection {:?}", err);
                 false
             }
         }
@@ -140,15 +141,17 @@ impl Smtp {
 
             match transport.send(mail) {
                 Ok(_) => {
-                    context.call_cb(Event::SmtpMessageSent(
-                        "Message was sent to SMTP server".into(),
-                    ));
+                    log_event!(
+                        context,
+                        Event::SMTP_MESSAGE_SENT,
+                        0,
+                        "Message was sent to SMTP server",
+                    );
                     self.transport_connected = true;
                     1
                 }
                 Err(err) => {
-                    warn!(context, "SMTP failed to send message: {}", err);
-                    self.error = Some(format!("{}", err));
+                    warn!(context, 0, "SMTP failed to send message: {}", err);
                     0
                 }
             }

src/sql.rs

@@ -13,10 +13,8 @@ use crate::peerstate::*;
 const DC_OPEN_READONLY: usize = 0x01;
 
 /// A wrapper around the underlying Sqlite3 object.
-#[derive(DebugStub)]
 pub struct Sql {
     pool: RwLock<Option<r2d2::Pool<r2d2_sqlite::SqliteConnectionManager>>>,
-    #[debug_stub = "ThreadLocal<String>"]
     in_use: Arc<ThreadLocal<String>>,
 }
 
@@ -37,7 +35,7 @@ impl Sql {
         self.in_use.remove();
         // drop closes the connection
 
-        info!(context, "Database closed.");
+        info!(context, 0, "Database closed.");
     }
 
     // return true on success, false on failure
@@ -157,13 +155,19 @@ impl Sql {
             .unwrap_or_default()
     }
 
-    pub fn query_get_value<P, T>(&self, context: &Context, query: &str, params: P) -> Option<T>
+    pub fn query_row_col<P, T>(
+        &self,
+        context: &Context,
+        query: &str,
+        params: P,
+        column: usize,
+    ) -> Option<T>
     where
         P: IntoIterator,
         P::Item: rusqlite::ToSql,
         T: rusqlite::types::FromSql,
     {
-        match self.query_row(query, params, |row| row.get::<_, T>(0)) {
+        match self.query_row(query, params, |row| row.get::<_, T>(column)) {
             Ok(res) => Some(res),
             Err(Error::Sql(rusqlite::Error::QueryReturnedNoRows)) => None,
             Err(Error::Sql(rusqlite::Error::InvalidColumnType(
@@ -172,7 +176,7 @@ impl Sql {
                 rusqlite::types::Type::Null,
             ))) => None,
             Err(err) => {
-                error!(context, "sql: Failed query_row: {}", err);
+                error!(context, 0, "sql: Failed query_row: {}", err);
                 None
             }
         }
@@ -189,7 +193,7 @@ impl Sql {
         value: Option<&str>,
     ) -> Result<()> {
         if !self.is_open() {
-            error!(context, "set_config(): Database not ready.");
+            error!(context, 0, "set_config(): Database not ready.");
             return Err(Error::SqlNoConnection);
         }
 
@@ -223,7 +227,7 @@ impl Sql {
         match res {
             Ok(_) => Ok(()),
             Err(err) => {
-                error!(context, "set_config(): Cannot change value. {:?}", &err);
+                error!(context, 0, "set_config(): Cannot change value. {:?}", &err);
                 Err(err.into())
             }
         }
@@ -234,10 +238,11 @@ impl Sql {
         if !self.is_open() || key.as_ref().is_empty() {
             return None;
         }
-        self.query_get_value(
+        self.query_row_col(
             context,
             "SELECT value FROM config WHERE keyname=?;",
             params![key.as_ref()],
+            0,
         )
     }
 
@@ -254,20 +259,6 @@ impl Sql {
         self.get_config(context, key).and_then(|s| s.parse().ok())
     }
 
-    pub fn get_config_bool(&self, context: &Context, key: impl AsRef<str>) -> bool {
-        // Not the most obvious way to encode bool as string, but it is matter
-        // of backward compatibility.
-        self.get_config_int(context, key).unwrap_or_default() > 0
-    }
-
-    pub fn set_config_bool<T>(&self, context: &Context, key: T, value: bool) -> Result<()>
-    where
-        T: AsRef<str>,
-    {
-        let value = if value { Some("1") } else { None };
-        self.set_config(context, key, value)
-    }
-
     pub fn set_config_int64(
         &self,
         context: &Context,
@@ -295,7 +286,7 @@ impl Sql {
 
 fn table_exists(conn: &Connection, name: impl AsRef<str>) -> Result<bool> {
     let mut exists = false;
-    conn.pragma(None, "table_info", &name.as_ref().to_string(), |_row| {
+    conn.pragma(None, "table_info", &format!("{}", name.as_ref()), |_row| {
         // will only be executed if the info was found
         exists = true;
         Ok(())
@@ -312,6 +303,7 @@ fn open(
     if sql.is_open() {
         error!(
             context,
+            0,
             "Cannot open, database \"{:?}\" already opened.",
             dbfile.as_ref(),
         );
@@ -345,6 +337,7 @@ fn open(
         if !sql.table_exists("config") {
             info!(
                 context,
+                0,
                 "First time init: creating tables in {:?}.",
                 dbfile.as_ref(),
             );
@@ -460,6 +453,7 @@ fn open(
             {
                 error!(
                     context,
+                    0,
                     "Cannot create tables in new database \"{:?}\".",
                     dbfile.as_ref(),
                 );
@@ -680,7 +674,7 @@ fn open(
             sql.set_config_int(context, "dbversion", 46)?;
         }
         if dbversion < 47 {
-            info!(context, "[migration] v47");
+            info!(context, 0, "[migration] v47");
             sql.execute(
                 "ALTER TABLE jobs ADD COLUMN tries INTEGER DEFAULT 0;",
                 params![],
@@ -689,7 +683,7 @@ fn open(
             sql.set_config_int(context, "dbversion", 47)?;
         }
         if dbversion < 48 {
-            info!(context, "[migration] v48");
+            info!(context, 0, "[migration] v48");
             sql.execute(
                 "ALTER TABLE msgs ADD COLUMN move_state INTEGER DEFAULT 1;",
                 params![],
@@ -699,7 +693,7 @@ fn open(
             sql.set_config_int(context, "dbversion", 48)?;
         }
         if dbversion < 49 {
-            info!(context, "[migration] v49");
+            info!(context, 0, "[migration] v49");
             sql.execute(
                 "ALTER TABLE chats ADD COLUMN gossiped_timestamp INTEGER DEFAULT 0;",
                 params![],
@@ -708,7 +702,7 @@ fn open(
             sql.set_config_int(context, "dbversion", 49)?;
         }
         if dbversion < 50 {
-            info!(context, "[migration] v50");
+            info!(context, 0, "[migration] v50");
             if 0 != exists_before_update {
                 sql.set_config_int(context, "show_emails", 2)?;
             }
@@ -716,7 +710,7 @@ fn open(
             sql.set_config_int(context, "dbversion", 50)?;
         }
         if dbversion < 53 {
-            info!(context, "[migration] v53");
+            info!(context, 0, "[migration] v53");
             sql.execute(
                 "CREATE TABLE locations ( id INTEGER PRIMARY KEY AUTOINCREMENT, latitude REAL DEFAULT 0.0, longitude REAL DEFAULT 0.0, accuracy REAL DEFAULT 0.0, timestamp INTEGER DEFAULT 0, chat_id INTEGER DEFAULT 0, from_id INTEGER DEFAULT 0);",
                 params![]
@@ -749,7 +743,7 @@ fn open(
             sql.set_config_int(context, "dbversion", 53)?;
         }
         if dbversion < 54 {
-            info!(context, "[migration] v54");
+            info!(context, 0, "[migration] v54");
             sql.execute(
                 "ALTER TABLE msgs ADD COLUMN location_id INTEGER DEFAULT 0;",
                 params![],
@@ -789,11 +783,11 @@ fn open(
             // for newer versions, we copy files always to the blob directory and store relative paths.
             // this snippet converts older databases and can be removed after some time.
 
-            info!(context, "[open] update file paths");
+            info!(context, 0, "[open] update file paths");
 
             let repl_from = sql
                 .get_config(context, "backup_for")
-                .unwrap_or_else(|| context.get_blobdir().to_string_lossy().into());
+                .unwrap_or_else(|| to_string(context.get_blobdir()));
 
             let repl_from = dc_ensure_no_slash_safe(&repl_from);
             sql.execute(
@@ -816,7 +810,7 @@ fn open(
         }
     }
 
-    info!(context, "Opened {:?}.", dbfile.as_ref(),);
+    info!(context, 0, "Opened {:?}.", dbfile.as_ref(),);
 
     Ok(())
 }
@@ -831,11 +825,12 @@ where
         Err(err) => {
             error!(
                 context,
+                0,
                 "execute failed: {:?} for {}",
                 &err,
                 querystr.as_ref()
             );
-            Err(err)
+            Err(err.into())
         }
     }
 }
@@ -847,6 +842,7 @@ pub fn try_execute(context: &Context, sql: &Sql, querystr: impl AsRef<str>) -> R
         Err(err) => {
             warn!(
                 context,
+                0,
                 "Try-execute for \"{}\" failed: {}",
                 querystr.as_ref(),
                 &err,
@@ -890,7 +886,7 @@ pub fn get_rowid_with_conn(
         Err(err) => {
             error!(
                 context,
-                "sql: Failed to retrieve rowid: {} in {}", err, query
+                0, "sql: Failed to retrieve rowid: {} in {}", err, query
             );
             0
         }
@@ -937,7 +933,7 @@ pub fn get_rowid2_with_conn(
     ) {
         Ok(id) => id,
         Err(err) => {
-            error!(context, "sql: Failed to retrieve rowid2: {}", err);
+            error!(context, 0, "sql: Failed to retrieve rowid2: {}", err);
             0
         }
     }
@@ -947,7 +943,7 @@ pub fn housekeeping(context: &Context) {
     let mut files_in_use = HashSet::new();
     let mut unreferenced_count = 0;
 
-    info!(context, "Start housekeeping...");
+    info!(context, 0, "Start housekeeping...");
     maybe_add_from_param(
         context,
         &mut files_in_use,
@@ -987,12 +983,12 @@ pub fn housekeeping(context: &Context) {
             },
         )
         .unwrap_or_else(|err| {
-            warn!(context, "sql: failed query: {}", err);
+            warn!(context, 0, "sql: failed query: {}", err);
         });
 
-    info!(context, "{} files in use.", files_in_use.len(),);
+    info!(context, 0, "{} files in use.", files_in_use.len(),);
     /* go through directory and delete unused files */
-    let p = context.get_blobdir();
+    let p = std::path::Path::new(as_str(context.get_blobdir()));
     match std::fs::read_dir(p) {
         Ok(dir_handle) => {
             /* avoid deletion of files that are just created to build a message object */
@@ -1007,10 +1003,10 @@ pub fn housekeeping(context: &Context) {
                 let name_f = entry.file_name();
                 let name_s = name_f.to_string_lossy();
 
-                if is_file_in_use(&files_in_use, None, &name_s)
-                    || is_file_in_use(&files_in_use, Some(".increation"), &name_s)
-                    || is_file_in_use(&files_in_use, Some(".waveform"), &name_s)
-                    || is_file_in_use(&files_in_use, Some("-preview.jpg"), &name_s)
+                if is_file_in_use(&mut files_in_use, None, &name_s)
+                    || is_file_in_use(&mut files_in_use, Some(".increation"), &name_s)
+                    || is_file_in_use(&mut files_in_use, Some(".waveform"), &name_s)
+                    || is_file_in_use(&mut files_in_use, Some("-preview.jpg"), &name_s)
                 {
                     continue;
                 }
@@ -1019,16 +1015,17 @@ pub fn housekeeping(context: &Context) {
 
                 match std::fs::metadata(entry.path()) {
                     Ok(stats) => {
-                        let recently_created = stats.created().is_ok()
+                        let created = stats.created().is_ok()
                             && stats.created().unwrap() > keep_files_newer_than;
-                        let recently_modified = stats.modified().is_ok()
+                        let modified = stats.modified().is_ok()
                             && stats.modified().unwrap() > keep_files_newer_than;
-                        let recently_accessed = stats.accessed().is_ok()
+                        let accessed = stats.accessed().is_ok()
                             && stats.accessed().unwrap() > keep_files_newer_than;
 
-                        if recently_created || recently_modified || recently_accessed {
+                        if created || modified || accessed {
                             info!(
                                 context,
+                                0,
                                 "Housekeeping: Keeping new unreferenced file #{}: {:?}",
                                 unreferenced_count,
                                 entry.file_name(),
@@ -1040,6 +1037,7 @@ pub fn housekeeping(context: &Context) {
                 }
                 info!(
                     context,
+                    0,
                     "Housekeeping: Deleting unreferenced file #{}: {:?}",
                     unreferenced_count,
                     entry.file_name()
@@ -1051,14 +1049,15 @@ pub fn housekeeping(context: &Context) {
         Err(err) => {
             warn!(
                 context,
+                0,
                 "Housekeeping: Cannot open {}. ({})",
-                context.get_blobdir().display(),
+                as_str(context.get_blobdir()),
                 err
             );
         }
     }
 
-    info!(context, "Housekeeping done.",);
+    info!(context, 0, "Housekeeping done.",);
 }
 
 fn is_file_in_use(files_in_use: &HashSet<String>, namespc_opt: Option<&str>, name: &str) -> bool {
@@ -1091,22 +1090,15 @@ fn maybe_add_from_param(
 ) {
     context
         .sql
-        .query_map(
-            query,
-            NO_PARAMS,
-            |row| row.get::<_, String>(0),
-            |rows| {
-                for row in rows {
-                    let param: Params = row?.parse().unwrap_or_default();
-                    if let Some(file) = param.get(param_id) {
-                        maybe_add_file(files_in_use, file);
-                    }
-                }
-                Ok(())
-            },
-        )
+        .query_row(query, NO_PARAMS, |row| {
+            let param: Params = row.get::<_, String>(0)?.parse().unwrap_or_default();
+            if let Some(file) = param.get(param_id) {
+                maybe_add_file(files_in_use, file);
+            }
+            Ok(())
+        })
         .unwrap_or_else(|err| {
-            warn!(context, "sql: failed to add_from_param: {}", err);
+            warn!(context, 0, "sql: failed to add_from_param: {}", err);
         });
 }
 

src/stock.rs

@@ -3,10 +3,10 @@ use std::borrow::Cow;
 use strum::EnumProperty;
 use strum_macros::EnumProperty;
 
+use crate::constants::Event;
 use crate::contact::*;
 use crate::context::Context;
 use crate::dc_tools::*;
-use crate::events::Event;
 use libc::free;
 
 /// Stock strings
@@ -128,7 +128,7 @@ impl Context {
     /// translation, then this string will be returned.  Otherwise a
     /// default (English) string is returned.
     pub fn stock_str(&self, id: StockMessage) -> Cow<str> {
-        let ptr = self.call_cb(Event::GetString { id, count: 0 }) as *mut libc::c_char;
+        let ptr = self.call_cb(Event::GET_STRING, id as usize, 0) as *mut libc::c_char;
         if ptr.is_null() {
             Cow::Borrowed(id.fallback())
         } else {
@@ -140,14 +140,12 @@ impl Context {
 
     /// Return stock string, replacing placeholders with provided string.
     ///
-    /// This replaces both the *first* `%1$s`, `%1$d` and `%1$@`
+    /// This replaces both the *first* `%1$s` **and** `%1$d`
     /// placeholders with the provided string.
-    /// (the `%1$@` variant is used on iOS, the other are used on Android and Desktop)
     pub fn stock_string_repl_str(&self, id: StockMessage, insert: impl AsRef<str>) -> String {
         self.stock_str(id)
             .replacen("%1$s", insert.as_ref(), 1)
             .replacen("%1$d", insert.as_ref(), 1)
-            .replacen("%1$@", insert.as_ref(), 1)
     }
 
     /// Return stock string, replacing placeholders with provided int.
@@ -160,10 +158,9 @@ impl Context {
 
     /// Return stock string, replacing 2 placeholders with provided string.
     ///
-    /// This replaces both the *first* `%1$s`, `%1$d` and `%1$@`
+    /// This replaces both the *first* `%1$s` **and** `%1$d`
     /// placeholders with the string in `insert` and does the same for
-    /// `%2$s`, `%2$d` and `%2$@` for `insert2`.
-    /// (the `%1$@` variant is used on iOS, the other are used on Android and Desktop)
+    /// `%2$s` and `%2$d` for `insert2`.
     fn stock_string_repl_str2(
         &self,
         id: StockMessage,
@@ -173,10 +170,8 @@ impl Context {
         self.stock_str(id)
             .replacen("%1$s", insert.as_ref(), 1)
             .replacen("%1$d", insert.as_ref(), 1)
-            .replacen("%1$@", insert.as_ref(), 1)
             .replacen("%2$s", insert2.as_ref(), 1)
             .replacen("%2$d", insert2.as_ref(), 1)
-            .replacen("%2$@", insert2.as_ref(), 1)
     }
 
     /// Return some kind of stock message
@@ -237,8 +232,11 @@ mod tests {
     use super::*;
     use crate::test_utils::*;
 
+    use std::ffi::CString;
+
     use crate::constants::DC_CONTACT_ID_SELF;
-    use libc::uintptr_t;
+    use crate::context::dc_context_new;
+    use crate::types::uintptr_t;
 
     use num_traits::ToPrimitive;
 
@@ -255,32 +253,36 @@ mod tests {
 
     #[test]
     fn test_stock_str() {
-        let t = dummy_context();
-        assert_eq!(t.ctx.stock_str(StockMessage::NoMessages), "No messages.");
+        let ctx = dc_context_new(None, std::ptr::null_mut(), None);
+        assert_eq!(ctx.stock_str(StockMessage::NoMessages), "No messages.");
     }
 
-    fn test_stock_str_no_fallback_cb(_ctx: &Context, evt: Event) -> uintptr_t {
-        match evt {
-            Event::GetString {
-                id: StockMessage::NoMessages,
-                ..
-            } => unsafe { "Hello there".strdup() as usize },
-            _ => 0,
+    unsafe extern "C" fn test_stock_str_no_fallback_cb(
+        _ctx: &Context,
+        evt: Event,
+        d1: uintptr_t,
+        _d2: uintptr_t,
+    ) -> uintptr_t {
+        if evt == Event::GET_STRING && d1 == StockMessage::NoMessages.to_usize().unwrap() {
+            let tmp = CString::new("Hello there").unwrap();
+            dc_strdup(tmp.as_ptr()) as usize
+        } else {
+            0
         }
     }
 
     #[test]
     fn test_stock_str_no_fallback() {
-        let t = test_context(Some(Box::new(test_stock_str_no_fallback_cb)));
+        let t = test_context(Some(test_stock_str_no_fallback_cb));
         assert_eq!(t.ctx.stock_str(StockMessage::NoMessages), "Hello there");
     }
 
     #[test]
     fn test_stock_string_repl_str() {
-        let t = dummy_context();
+        let ctx = dc_context_new(None, std::ptr::null_mut(), None);
         // uses %1$s substitution
         assert_eq!(
-            t.ctx.stock_string_repl_str(StockMessage::Member, "42"),
+            ctx.stock_string_repl_str(StockMessage::Member, "42"),
             "42 member(s)"
         );
         // We have no string using %1$d to test...
@@ -288,42 +290,40 @@ mod tests {
 
     #[test]
     fn test_stock_string_repl_int() {
-        let t = dummy_context();
+        let ctx = dc_context_new(None, std::ptr::null_mut(), None);
         assert_eq!(
-            t.ctx.stock_string_repl_int(StockMessage::Member, 42),
+            ctx.stock_string_repl_int(StockMessage::Member, 42),
             "42 member(s)"
         );
     }
 
     #[test]
     fn test_stock_string_repl_str2() {
-        let t = dummy_context();
+        let ctx = dc_context_new(None, std::ptr::null_mut(), None);
         assert_eq!(
-            t.ctx
-                .stock_string_repl_str2(StockMessage::ServerResponse, "foo", "bar"),
+            ctx.stock_string_repl_str2(StockMessage::ServerResponse, "foo", "bar"),
             "Response from foo: bar"
         );
     }
 
     #[test]
     fn test_stock_system_msg_simple() {
-        let t = dummy_context();
+        let ctx = dc_context_new(None, std::ptr::null_mut(), None);
         assert_eq!(
-            t.ctx
-                .stock_system_msg(StockMessage::MsgLocationEnabled, "", "", 0),
+            ctx.stock_system_msg(StockMessage::MsgLocationEnabled, "", "", 0),
             "Location streaming enabled."
         )
     }
 
     #[test]
     fn test_stock_system_msg_add_member_by_me() {
-        let t = dummy_context();
+        let ctx = dc_context_new(None, std::ptr::null_mut(), None);
         assert_eq!(
-            t.ctx.stock_system_msg(
+            ctx.stock_system_msg(
                 StockMessage::MsgAddMember,
                 "alice@example.com",
                 "",
-                DC_CONTACT_ID_SELF
+                DC_CONTACT_ID_SELF as u32
             ),
             "Member alice@example.com added by me."
         )
@@ -338,7 +338,7 @@ mod tests {
                 StockMessage::MsgAddMember,
                 "alice@example.com",
                 "",
-                DC_CONTACT_ID_SELF
+                DC_CONTACT_ID_SELF as u32
             ),
             "Member Alice (alice@example.com) added by me."
         );
@@ -373,7 +373,7 @@ mod tests {
                 StockMessage::MsgGrpName,
                 "Some chat",
                 "Other chat",
-                DC_CONTACT_ID_SELF
+                DC_CONTACT_ID_SELF as u32
             ),
             "Group name changed from \"Some chat\" to \"Other chat\" by me."
         )

src/test_utils.rs

@@ -2,14 +2,16 @@
 //!
 //! This module is only compiled for test runs.
 
+use std::ffi::CStr;
+
 use libc::uintptr_t;
 use tempfile::{tempdir, TempDir};
 
 use crate::config::Config;
-use crate::constants::KeyType;
-use crate::context::{Context, ContextCallback};
-use crate::events::Event;
+use crate::constants::{Event, KeyType};
+use crate::context::{dc_context_new, dc_open, Context};
 use crate::key;
+use crate::types::dc_callback_t;
 
 /// A Context and temporary directory.
 ///
@@ -26,15 +28,18 @@ pub struct TestContext {
 /// "db.sqlite" in the [TestContext.dir] directory.
 ///
 /// [Context]: crate::context::Context
-pub fn test_context(callback: Option<Box<ContextCallback>>) -> TestContext {
-    let dir = tempdir().unwrap();
-    let dbfile = dir.path().join("db.sqlite");
-    let cb: Box<ContextCallback> = match callback {
-        Some(cb) => cb,
-        None => Box::new(|_, _| 0),
-    };
-    let ctx = Context::new(cb, "FakeOs".into(), dbfile).unwrap();
-    TestContext { ctx: ctx, dir: dir }
+pub fn test_context(cb: Option<dc_callback_t>) -> TestContext {
+    unsafe {
+        let mut ctx = dc_context_new(cb, std::ptr::null_mut(), None);
+        let dir = tempdir().unwrap();
+        let dbfile = dir.path().join("db.sqlite");
+        assert!(
+            dc_open(&mut ctx, dbfile.to_str().unwrap(), None),
+            "Failed to open {}",
+            dbfile.display(),
+        );
+        TestContext { ctx: ctx, dir: dir }
+    }
 }
 
 /// Return a dummy [TestContext].
@@ -46,11 +51,17 @@ pub fn dummy_context() -> TestContext {
     test_context(None)
 }
 
-pub fn logging_cb(_ctx: &Context, evt: Event) -> uintptr_t {
+pub unsafe extern "C" fn logging_cb(
+    _ctx: &Context,
+    evt: Event,
+    _d1: uintptr_t,
+    d2: uintptr_t,
+) -> uintptr_t {
+    let to_str = |x| CStr::from_ptr(x as *const libc::c_char).to_str().unwrap();
     match evt {
-        Event::Info(msg) => println!("I: {}", msg),
-        Event::Warning(msg) => println!("W: {}", msg),
-        Event::Error(msg) => println!("E: {}", msg),
+        Event::INFO => println!("I: {}", to_str(d2)),
+        Event::WARNING => println!("W: {}", to_str(d2)),
+        Event::ERROR => println!("E: {}", to_str(d2)),
         _ => (),
     }
     0

src/token.rs

@@ -1,57 +0,0 @@
-//! Functions to read/write token from/to the database. A token is any string associated with a key.
-
-use deltachat_derive::*;
-
-use crate::context::Context;
-use crate::dc_tools::*;
-use crate::sql;
-
-// Token namespaces
-#[derive(Debug, Display, Clone, Copy, PartialEq, Eq, FromPrimitive, ToPrimitive, ToSql, FromSql)]
-#[repr(i32)]
-pub enum Namespace {
-    Unknown = 0,
-    Auth = 110,
-    InviteNumber = 100,
-}
-
-impl Default for Namespace {
-    fn default() -> Self {
-        Namespace::Unknown
-    }
-}
-
-pub fn save(context: &Context, namespace: Namespace, foreign_id: u32) -> String {
-    // foreign_id may be 0
-    let token = dc_create_id();
-    sql::execute(
-        context,
-        &context.sql,
-        "INSERT INTO tokens (namespc, foreign_id, token, timestamp) VALUES (?, ?, ?, ?);",
-        params![namespace, foreign_id as i32, &token, time()],
-    )
-    .ok();
-    token
-}
-
-pub fn lookup(context: &Context, namespace: Namespace, foreign_id: u32) -> Option<String> {
-    context.sql.query_get_value::<_, String>(
-        context,
-        "SELECT token FROM tokens WHERE namespc=? AND foreign_id=?;",
-        params![namespace, foreign_id as i32],
-    )
-}
-
-pub fn lookup_or_new(context: &Context, namespace: Namespace, foreign_id: u32) -> String {
-    lookup(context, namespace, foreign_id).unwrap_or_else(|| save(context, namespace, foreign_id))
-}
-
-pub fn exists(context: &Context, namespace: Namespace, token: &str) -> bool {
-    context
-        .sql
-        .exists(
-            "SELECT id FROM tokens WHERE namespc=? AND token=?;",
-            params![namespace, token],
-        )
-        .unwrap_or_default()
-}

src/top_evil_rs.py

@@ -1,26 +1,24 @@
 #!/usr/bin/env python3
 
 
-from pathlib import Path
 import os
 import re
 
 if __name__ == "__main__":
-    if Path('src/top_evil_rs.py').exists():
-        os.chdir('src')
     filestats = []
-    for fn in Path(".").glob("**/*.rs"):
-        s = fn.read_text()
-        s = re.sub(r"(?m)///.*$", "", s)  # remove comments
-        unsafe = s.count("unsafe")
-        free = s.count("free(")
-        gotoblocks = s.count("ok_to_continue") + s.count('OK_TO_CONTINUE')
-        filestats.append((fn, unsafe, free, gotoblocks))
+    for fn in os.listdir():
+        if fn.endswith(".rs"):
+            s = open(fn).read()
+            s = re.sub(r'(?m)///.*$', '', s) # remove comments
+            unsafe = s.count("unsafe")
+            free = s.count("free(")
+            gotoblocks = s.count("current_block =")
+            filestats.append((fn, unsafe, free, gotoblocks))
 
     sum_unsafe, sum_free, sum_gotoblocks = 0, 0, 0
 
     for fn, unsafe, free, gotoblocks in reversed(sorted(filestats, key=lambda x: sum(x[1:]))):
-        print("{0: <30} unsafe: {1: >3} free: {2: >3} ok_to_continue: {3: >3}".format(str(fn), unsafe, free, gotoblocks))
+        print("{0: <30} unsafe: {1: >3} free: {2: >3} goto-blocks: {3: >3}".format(fn, unsafe, free, gotoblocks))
         sum_unsafe += unsafe
         sum_free += free
         sum_gotoblocks += gotoblocks
@@ -29,5 +27,5 @@ if __name__ == "__main__":
     print()
     print("total unsafe:", sum_unsafe)
     print("total free:", sum_free)
-    print("total ok_to_continue:", sum_gotoblocks)
+    print("total gotoblocks:", sum_gotoblocks)
 

src/types.rs

@@ -0,0 +1,48 @@
+#![allow(non_camel_case_types)]
+use crate::constants::Event;
+use crate::context::Context;
+
+pub use mmime::clist::*;
+pub use rusqlite::ffi::*;
+
+/// Callback function that should be given to dc_context_new().
+///
+/// @memberof Context
+/// @param context The context object as returned by dc_context_new().
+/// @param event one of the @ref DC_EVENT constants
+/// @param data1 depends on the event parameter
+/// @param data2 depends on the event parameter
+/// @return return 0 unless stated otherwise in the event parameter documentation
+pub type dc_callback_t =
+    unsafe extern "C" fn(_: &Context, _: Event, _: uintptr_t, _: uintptr_t) -> uintptr_t;
+
+pub type dc_receive_imf_t = unsafe fn(
+    _: &Context,
+    _: *const libc::c_char,
+    _: size_t,
+    _: &str,
+    _: uint32_t,
+    _: uint32_t,
+) -> ();
+
+/* Purpose: Reading from IMAP servers with no dependencies to the database.
+Context is only used for logging and to get information about
+the online state. */
+
+pub type dc_precheck_imf_t =
+    unsafe fn(_: &Context, _: *const libc::c_char, _: &str, _: u32) -> libc::c_int;
+pub type dc_set_config_t = fn(_: &Context, _: &str, _: Option<&str>) -> ();
+pub type dc_get_config_t = fn(_: &Context, _: &str) -> Option<String>;
+
+pub type sqlite_int64 = i64;
+pub type sqlite3_int64 = sqlite_int64;
+
+pub type int32_t = i32;
+pub type int64_t = i64;
+pub type uintptr_t = libc::uintptr_t;
+pub type size_t = libc::size_t;
+pub type ssize_t = libc::ssize_t;
+pub type uint32_t = libc::c_uint;
+pub type uint8_t = libc::c_uchar;
+pub type uint16_t = libc::c_ushort;
+pub type uint64_t = u64;

src/x.rs

@@ -54,6 +54,27 @@ pub(crate) unsafe fn strcasecmp(s1: *const libc::c_char, s2: *const libc::c_char
     }
 }
 
+pub(crate) unsafe fn strncasecmp(
+    s1: *const libc::c_char,
+    s2: *const libc::c_char,
+    n: libc::size_t,
+) -> libc::c_int {
+    let s1 = std::ffi::CStr::from_ptr(s1)
+        .to_string_lossy()
+        .to_lowercase();
+    let s2 = std::ffi::CStr::from_ptr(s2)
+        .to_string_lossy()
+        .to_lowercase();
+    let m1 = std::cmp::min(n, s1.len());
+    let m2 = std::cmp::min(n, s2.len());
+
+    if s1[..m1] == s2[..m2] {
+        0
+    } else {
+        1
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;

tests/stress.rs

@@ -1,21 +1,31 @@
 //! Stress some functions for testing; if used as a lib, this file is obsolete.
 
 use std::collections::HashSet;
-use std::ptr;
+use std::ffi::CString;
 
+use mmime::mailimf_types::*;
 use tempfile::{tempdir, TempDir};
 
-use deltachat::chat::{self, Chat};
 use deltachat::config;
+use deltachat::constants::*;
 use deltachat::contact::*;
 use deltachat::context::*;
+use deltachat::dc_chat::*;
+use deltachat::dc_configure::*;
 use deltachat::dc_imex::*;
+use deltachat::dc_location::*;
+use deltachat::dc_lot::*;
+use deltachat::dc_mimeparser::*;
+use deltachat::dc_qr::*;
+use deltachat::dc_saxparser::*;
+use deltachat::dc_securejoin::*;
 use deltachat::dc_tools::*;
+use deltachat::key::*;
 use deltachat::keyring::*;
 use deltachat::oauth2::*;
 use deltachat::pgp::*;
+use deltachat::types::*;
 use deltachat::x::*;
-use deltachat::Event;
 use libc;
 
 /* some data used for testing
@@ -29,99 +39,125 @@ static mut S_EM_SETUPFILE: *const libc::c_char =
         as *const u8 as *const libc::c_char;
 
 unsafe fn stress_functions(context: &Context) {
-    if dc_file_exist(context, "$BLOBDIR/foobar")
-        || dc_file_exist(context, "$BLOBDIR/dada")
-        || dc_file_exist(context, "$BLOBDIR/foobar.dadada")
-        || dc_file_exist(context, "$BLOBDIR/foobar-folder")
-    {
-        dc_delete_file(context, "$BLOBDIR/foobar");
-        dc_delete_file(context, "$BLOBDIR/dada");
-        dc_delete_file(context, "$BLOBDIR/foobar.dadada");
-        dc_delete_file(context, "$BLOBDIR/foobar-folder");
-    }
-    dc_write_file(
-        context,
-        b"$BLOBDIR/foobar\x00" as *const u8 as *const libc::c_char,
-        b"content\x00" as *const u8 as *const libc::c_char as *const libc::c_void,
-        7,
+    let mut saxparser: dc_saxparser_t = dc_saxparser_t {
+        starttag_cb: None,
+        endtag_cb: None,
+        text_cb: None,
+        userdata: 0 as *mut libc::c_void,
+    };
+    dc_saxparser_init(&mut saxparser, 0 as *mut libc::c_void);
+    dc_saxparser_parse(
+        &mut saxparser,
+        b"<tag attr=val=\x00" as *const u8 as *const libc::c_char,
+    );
+    dc_saxparser_parse(
+        &mut saxparser,
+        b"<tag attr=\"val\"=\x00" as *const u8 as *const libc::c_char,
     );
-    assert!(dc_file_exist(context, "$BLOBDIR/foobar",));
-    assert!(!dc_file_exist(context, "$BLOBDIR/foobarx"));
-    assert_eq!(dc_get_filebytes(context, "$BLOBDIR/foobar",), 7);
 
-    let abs_path = context
-        .get_blobdir()
-        .join("foobar")
-        .to_string_lossy()
-        .to_string();
-
-    assert!(dc_is_blobdir_path(context, &abs_path));
-    assert!(dc_is_blobdir_path(context, "$BLOBDIR/fofo",));
-    assert!(!dc_is_blobdir_path(context, "/BLOBDIR/fofo",));
-    assert!(dc_file_exist(context, &abs_path));
-
-    assert!(dc_copy_file(context, "$BLOBDIR/foobar", "$BLOBDIR/dada",));
-    assert_eq!(dc_get_filebytes(context, "$BLOBDIR/dada",), 7);
-
-    let mut buf: *mut libc::c_void = ptr::null_mut();
-    let mut buf_bytes: libc::size_t = 0;
-
-    assert_eq!(
-        dc_read_file(
+    if 0 != dc_is_open(context) {
+        if dc_file_exist(context, "$BLOBDIR/foobar")
+            || dc_file_exist(context, "$BLOBDIR/dada")
+            || dc_file_exist(context, "$BLOBDIR/foobar.dadada")
+            || dc_file_exist(context, "$BLOBDIR/foobar-folder")
+        {
+            dc_delete_file(context, "$BLOBDIR/foobar");
+            dc_delete_file(context, "$BLOBDIR/dada");
+            dc_delete_file(context, "$BLOBDIR/foobar.dadada");
+            dc_delete_file(context, "$BLOBDIR/foobar-folder");
+        }
+        dc_write_file(
             context,
-            b"$BLOBDIR/dada\x00" as *const u8 as *const libc::c_char,
-            &mut buf,
-            &mut buf_bytes,
-        ),
-        1
-    );
-    assert_eq!(buf_bytes, 7);
-    assert_eq!(
-        std::str::from_utf8(std::slice::from_raw_parts(buf as *const u8, buf_bytes)).unwrap(),
-        "content"
-    );
+            b"$BLOBDIR/foobar\x00" as *const u8 as *const libc::c_char,
+            b"content\x00" as *const u8 as *const libc::c_char as *const libc::c_void,
+            7i32 as size_t,
+        );
+        assert!(dc_file_exist(context, "$BLOBDIR/foobar",));
+        assert!(!dc_file_exist(context, "$BLOBDIR/foobarx"));
+        assert_eq!(
+            dc_get_filebytes(context, "$BLOBDIR/foobar",),
+            7i32 as libc::c_ulonglong
+        );
 
-    free(buf as *mut _);
-    assert!(dc_delete_file(context, "$BLOBDIR/foobar"));
-    assert!(dc_delete_file(context, "$BLOBDIR/dada"));
-    assert!(dc_create_folder(context, "$BLOBDIR/foobar-folder"));
-    assert!(dc_file_exist(context, "$BLOBDIR/foobar-folder",));
-    assert!(!dc_delete_file(context, "$BLOBDIR/foobar-folder"));
-    let fn0: *mut libc::c_char = dc_get_fine_pathNfilename(
-        context,
-        b"$BLOBDIR\x00" as *const u8 as *const libc::c_char,
-        b"foobar.dadada\x00" as *const u8 as *const libc::c_char,
-    );
-    assert!(!fn0.is_null());
-    assert_eq!(
-        strcmp(
+        let abs_path: *mut libc::c_char = dc_mprintf(
+            b"%s/%s\x00" as *const u8 as *const libc::c_char,
+            context.get_blobdir(),
+            b"foobar\x00" as *const u8 as *const libc::c_char,
+        );
+        assert!(dc_is_blobdir_path(context, abs_path));
+        assert!(dc_is_blobdir_path(
+            context,
+            b"$BLOBDIR/fofo\x00" as *const u8 as *const libc::c_char,
+        ));
+        assert!(!dc_is_blobdir_path(
+            context,
+            b"/BLOBDIR/fofo\x00" as *const u8 as *const libc::c_char,
+        ));
+        assert!(dc_file_exist(context, as_path(abs_path)));
+        free(abs_path as *mut libc::c_void);
+        assert!(dc_copy_file(context, "$BLOBDIR/foobar", "$BLOBDIR/dada",));
+        assert_eq!(dc_get_filebytes(context, "$BLOBDIR/dada",), 7);
+
+        let mut buf: *mut libc::c_void = 0 as *mut libc::c_void;
+        let mut buf_bytes: size_t = 0;
+
+        assert_eq!(
+            dc_read_file(
+                context,
+                b"$BLOBDIR/dada\x00" as *const u8 as *const libc::c_char,
+                &mut buf,
+                &mut buf_bytes,
+            ),
+            1
+        );
+        assert_eq!(buf_bytes, 7);
+        assert_eq!(
+            std::str::from_utf8(std::slice::from_raw_parts(buf as *const u8, buf_bytes)).unwrap(),
+            "content"
+        );
+
+        free(buf as *mut _);
+        assert!(dc_delete_file(context, "$BLOBDIR/foobar"));
+        assert!(dc_delete_file(context, "$BLOBDIR/dada"));
+        assert!(dc_create_folder(context, "$BLOBDIR/foobar-folder"));
+        assert!(dc_file_exist(context, "$BLOBDIR/foobar-folder",));
+        assert!(dc_delete_file(context, "$BLOBDIR/foobar-folder"));
+        let fn0: *mut libc::c_char = dc_get_fine_pathNfilename(
+            context,
+            b"$BLOBDIR\x00" as *const u8 as *const libc::c_char,
+            b"foobar.dadada\x00" as *const u8 as *const libc::c_char,
+        );
+        assert!(!fn0.is_null());
+        assert_eq!(
+            strcmp(
+                fn0,
+                b"$BLOBDIR/foobar.dadada\x00" as *const u8 as *const libc::c_char,
+            ),
+            0
+        );
+        dc_write_file(
+            context,
             fn0,
-            b"$BLOBDIR/foobar.dadada\x00" as *const u8 as *const libc::c_char,
-        ),
-        0
-    );
-    dc_write_file(
-        context,
-        fn0,
-        b"content\x00" as *const u8 as *const libc::c_char as *const libc::c_void,
-        7,
-    );
-    let fn1: *mut libc::c_char = dc_get_fine_pathNfilename(
-        context,
-        b"$BLOBDIR\x00" as *const u8 as *const libc::c_char,
-        b"foobar.dadada\x00" as *const u8 as *const libc::c_char,
-    );
-    assert!(!fn1.is_null());
-    assert_eq!(
-        strcmp(
-            fn1,
-            b"$BLOBDIR/foobar-1.dadada\x00" as *const u8 as *const libc::c_char,
-        ),
-        0
-    );
-    assert!(dc_delete_file(context, as_path(fn0)));
-    free(fn0 as *mut libc::c_void);
-    free(fn1 as *mut libc::c_void);
+            b"content\x00" as *const u8 as *const libc::c_char as *const libc::c_void,
+            7i32 as size_t,
+        );
+        let fn1: *mut libc::c_char = dc_get_fine_pathNfilename(
+            context,
+            b"$BLOBDIR\x00" as *const u8 as *const libc::c_char,
+            b"foobar.dadada\x00" as *const u8 as *const libc::c_char,
+        );
+        assert!(!fn1.is_null());
+        assert_eq!(
+            strcmp(
+                fn1,
+                b"$BLOBDIR/foobar-1.dadada\x00" as *const u8 as *const libc::c_char,
+            ),
+            0
+        );
+        assert!(dc_delete_file(context, as_path(fn0)));
+        free(fn0 as *mut libc::c_void);
+        free(fn1 as *mut libc::c_void);
+    }
 
     let res = context.get_config(config::Config::SysConfigKeys).unwrap();
 
@@ -155,10 +191,10 @@ unsafe fn stress_functions(context: &Context) {
     assert!(res.contains(" configured_server_flags "));
 
     let mut buf_0: *mut libc::c_char;
-    let mut headerline: *const libc::c_char = ptr::null();
-    let mut setupcodebegin: *const libc::c_char = ptr::null();
-    let mut preferencrypt: *const libc::c_char = ptr::null();
-    let mut base64: *const libc::c_char = ptr::null();
+    let mut headerline: *const libc::c_char = 0 as *const libc::c_char;
+    let mut setupcodebegin: *const libc::c_char = 0 as *const libc::c_char;
+    let mut preferencrypt: *const libc::c_char = 0 as *const libc::c_char;
+    let mut base64: *const libc::c_char = 0 as *const libc::c_char;
     buf_0 = strdup(
         b"-----BEGIN PGP MESSAGE-----\nNoVal:\n\ndata\n-----END PGP MESSAGE-----\x00" as *const u8
             as *const libc::c_char,
@@ -167,7 +203,7 @@ unsafe fn stress_functions(context: &Context) {
         buf_0,
         &mut headerline,
         &mut setupcodebegin,
-        ptr::null_mut(),
+        0 as *mut *const libc::c_char,
         &mut base64,
     );
     assert!(ok);
@@ -192,7 +228,7 @@ unsafe fn stress_functions(context: &Context) {
         buf_0,
         &mut headerline,
         &mut setupcodebegin,
-        ptr::null_mut(),
+        0 as *mut *const libc::c_char,
         &mut base64,
     );
 
@@ -219,7 +255,7 @@ unsafe fn stress_functions(context: &Context) {
         buf_0,
         &mut headerline,
         &mut setupcodebegin,
-        ptr::null_mut(),
+        0 as *mut *const libc::c_char,
         &mut base64,
     );
 
@@ -244,7 +280,7 @@ unsafe fn stress_functions(context: &Context) {
         buf_0,
         &mut headerline,
         &mut setupcodebegin,
-        ptr::null_mut(),
+        0 as *mut *const libc::c_char,
         &mut base64,
     );
 
@@ -257,7 +293,7 @@ unsafe fn stress_functions(context: &Context) {
         buf_0,
         &mut headerline,
         &mut setupcodebegin,
-        ptr::null_mut(),
+        0 as *mut *const libc::c_char,
         &mut base64,
     );
     assert!(ok);
@@ -290,7 +326,7 @@ unsafe fn stress_functions(context: &Context) {
     let ok = dc_split_armored_data(
         buf_0,
         &mut headerline,
-        ptr::null_mut(),
+        0 as *mut *const libc::c_char,
         &mut preferencrypt,
         &mut base64,
     );
@@ -346,16 +382,16 @@ unsafe fn stress_functions(context: &Context) {
     );
     free(norm as *mut libc::c_void);
     let mut buf_1: *mut libc::c_char;
-    let mut headerline_0: *const libc::c_char = ptr::null();
-    let mut setupcodebegin_0: *const libc::c_char = ptr::null();
-    let mut preferencrypt_0: *const libc::c_char = ptr::null();
+    let mut headerline_0: *const libc::c_char = 0 as *const libc::c_char;
+    let mut setupcodebegin_0: *const libc::c_char = 0 as *const libc::c_char;
+    let mut preferencrypt_0: *const libc::c_char = 0 as *const libc::c_char;
     buf_1 = strdup(S_EM_SETUPFILE);
     assert!(dc_split_armored_data(
         buf_1,
         &mut headerline_0,
         &mut setupcodebegin_0,
         &mut preferencrypt_0,
-        ptr::null_mut(),
+        0 as *mut *const libc::c_char,
     ));
     assert!(!headerline_0.is_null());
     assert_eq!(
@@ -381,7 +417,7 @@ unsafe fn stress_functions(context: &Context) {
         &mut headerline_0,
         &mut setupcodebegin_0,
         &mut preferencrypt_0,
-        ptr::null_mut(),
+        0 as *mut *const libc::c_char,
     ));
     assert!(!headerline_0.is_null());
     assert_eq!(
@@ -401,168 +437,237 @@ unsafe fn stress_functions(context: &Context) {
         0
     );
     free(buf_1 as *mut libc::c_void);
+    if 0 != dc_is_configured(context) {
+        let setupcode = dc_create_setup_code(context);
+        let setupcode_c = CString::yolo(setupcode.clone());
+        let setupfile = dc_render_setup_file(context, &setupcode).unwrap();
+        let setupfile_c = CString::yolo(setupfile);
+        let payload: *mut libc::c_char;
+        let mut headerline_2: *const libc::c_char = 0 as *const libc::c_char;
+        payload = dc_decrypt_setup_file(context, setupcode_c.as_ptr(), setupfile_c.as_ptr());
+        assert!(payload.is_null());
+        assert!(!dc_split_armored_data(
+            payload,
+            &mut headerline_2,
+            0 as *mut *const libc::c_char,
+            0 as *mut *const libc::c_char,
+            0 as *mut *const libc::c_char,
+        ));
+        assert!(!headerline_2.is_null());
+        assert_eq!(
+            strcmp(
+                headerline_2,
+                b"-----BEGIN PGP PRIVATE KEY BLOCK-----\x00" as *const u8 as *const libc::c_char,
+            ),
+            0
+        );
+        free(payload as *mut libc::c_void);
+    }
 
-    // Cant check, no configured context
-    // assert!(dc_is_configured(context) != 0, "Missing configured context");
+    if 0 != dc_is_configured(context) {
+        let qr: *mut libc::c_char = dc_get_securejoin_qr(context, 0i32 as uint32_t);
+        assert!(
+            !(strlen(qr) > 55
+                && strncmp(
+                    qr,
+                    b"OPENPGP4FPR:\x00" as *const u8 as *const libc::c_char,
+                    12,
+                ) == 0i32
+                && strncmp(
+                    &mut *qr.offset(52isize),
+                    b"#a=\x00" as *const u8 as *const libc::c_char,
+                    3,
+                ) == 0i32)
+        );
+        let mut res: *mut dc_lot_t = dc_check_qr(context, qr);
+        assert!(res.is_null());
+        assert!(!((*res).state == 200i32 || (*res).state == 220i32 || (*res).state == 230i32));
 
-    // let setupcode = dc_create_setup_code(context);
-    // let setupcode_c = CString::yolo(setupcode.clone());
-    // let setupfile = dc_render_setup_file(context, &setupcode).unwrap();
-    // let setupfile_c = CString::yolo(setupfile);
-    // let mut headerline_2: *const libc::c_char = ptr::null();
-    // let payload = dc_decrypt_setup_file(context, setupcode_c.as_ptr(), setupfile_c.as_ptr());
-
-    // assert!(payload.is_null());
-    // assert!(!dc_split_armored_data(
-    //     payload,
-    //     &mut headerline_2,
-    //     ptr::null_mut(),
-    //     ptr::null_mut(),
-    //     ptr::null_mut(),
-    // ));
-    // assert!(!headerline_2.is_null());
-    // assert_eq!(
-    //     strcmp(
-    //         headerline_2,
-    //         b"-----BEGIN PGP PRIVATE KEY BLOCK-----\x00" as *const u8 as *const libc::c_char,
-    //     ),
-    //     0
-    // );
-    // free(payload as *mut libc::c_void);
-
-    // Cant check, no configured context
-    // assert!(dc_is_configured(context) != 0, "missing configured context");
-
-    // let qr = dc_get_securejoin_qr(context, 0);
-    // assert!(!qr.is_null(), "Invalid qr code generated");
-    // let qr_r = as_str(qr);
-
-    // assert!(qr_r.len() > 55);
-    // assert!(qr_r.starts_with("OPENPGP4FPR:"));
-
-    // let res = dc_check_qr(context, qr);
-    // let s = res.get_state();
-
-    // assert!(
-    //     s == QrState::AskVerifyContact
-    //         || s == QrState::FprMissmatch
-    //         || s == QrState::FprWithoutAddr
-    // );
-
-    // free(qr.cast());
+        dc_lot_unref(res);
+        free(qr as *mut libc::c_void);
+        res =
+            dc_check_qr(context,
+                        b"BEGIN:VCARD\nVERSION:3.0\nN:Last;First\nEMAIL;TYPE=INTERNET:stress@test.local\nEND:VCARD\x00"
+                            as *const u8 as *const libc::c_char);
+        assert!(res.is_null());
+        assert!(!((*res).state == 320i32));
+        assert!(!((*res).id != 0i32 as libc::c_uint));
+        dc_lot_unref(res);
+    };
 }
 
 #[test]
 #[ignore] // is too expensive
 fn test_encryption_decryption() {
-    let (public_key, private_key) = dc_pgp_create_keypair("foo@bar.de").unwrap();
+    unsafe {
+        let mut bad_data: [libc::c_uchar; 4096] = [0; 4096];
+        let mut i_0: libc::c_int = 0i32;
+        while i_0 < 4096i32 {
+            bad_data[i_0 as usize] = (i_0 & 0xffi32) as libc::c_uchar;
+            i_0 += 1
+        }
+        let mut j: libc::c_int = 0i32;
 
-    private_key.split_key().unwrap();
+        while j < 4096 / 40 {
+            let bad_key = Key::from_binary(
+                &mut *bad_data.as_mut_ptr().offset(j as isize) as *const u8,
+                4096 / 2 + j,
+                if 0 != j & 1 {
+                    KeyType::Public
+                } else {
+                    KeyType::Private
+                },
+            );
 
-    let (public_key2, private_key2) = dc_pgp_create_keypair("two@zwo.de").unwrap();
+            assert!(bad_key.is_none());
+            j += 1
+        }
 
-    assert_ne!(public_key, public_key2);
+        let (public_key, private_key) = dc_pgp_create_keypair("foo@bar.de").unwrap();
 
-    let original_text = b"This is a test";
-    let mut keyring = Keyring::default();
-    keyring.add_owned(public_key.clone());
-    keyring.add_ref(&public_key2);
+        private_key.split_key().unwrap();
 
-    let ctext_signed = dc_pgp_pk_encrypt(original_text, &keyring, Some(&private_key)).unwrap();
-    assert!(!ctext_signed.is_empty());
-    assert!(ctext_signed.starts_with("-----BEGIN PGP MESSAGE-----"));
+        let (public_key2, private_key2) = dc_pgp_create_keypair("two@zwo.de").unwrap();
 
-    let ctext_unsigned = dc_pgp_pk_encrypt(original_text, &keyring, None).unwrap();
-    assert!(!ctext_unsigned.is_empty());
-    assert!(ctext_unsigned.starts_with("-----BEGIN PGP MESSAGE-----"));
+        assert_ne!(public_key, public_key2);
 
-    let mut keyring = Keyring::default();
-    keyring.add_owned(private_key);
+        let original_text: *const libc::c_char =
+            b"This is a test\x00" as *const u8 as *const libc::c_char;
+        let mut keyring = Keyring::default();
+        keyring.add_owned(public_key.clone());
+        keyring.add_ref(&public_key2);
 
-    let mut public_keyring = Keyring::default();
-    public_keyring.add_ref(&public_key);
+        let ctext = dc_pgp_pk_encrypt(
+            original_text as *const libc::c_void,
+            strlen(original_text),
+            &keyring,
+            Some(&private_key),
+        )
+        .unwrap();
 
-    let mut public_keyring2 = Keyring::default();
-    public_keyring2.add_owned(public_key2.clone());
+        assert!(!ctext.is_empty());
+        assert!(ctext.starts_with("-----BEGIN PGP MESSAGE-----"));
 
-    let mut valid_signatures: HashSet<String> = Default::default();
+        let ctext_signed_bytes = ctext.len();
+        let ctext_signed = CString::yolo(ctext);
 
-    let plain = dc_pgp_pk_decrypt(
-        ctext_signed.as_bytes(),
-        &keyring,
-        &public_keyring,
-        Some(&mut valid_signatures),
-    )
-    .unwrap();
+        let ctext = dc_pgp_pk_encrypt(
+            original_text as *const libc::c_void,
+            strlen(original_text),
+            &keyring,
+            None,
+        )
+        .unwrap();
+        assert!(!ctext.is_empty());
+        assert!(ctext.starts_with("-----BEGIN PGP MESSAGE-----"));
 
-    assert_eq!(plain, original_text,);
-    assert_eq!(valid_signatures.len(), 1);
+        let ctext_unsigned_bytes = ctext.len();
+        let ctext_unsigned = CString::yolo(ctext);
 
-    valid_signatures.clear();
+        let mut keyring = Keyring::default();
+        keyring.add_owned(private_key);
 
-    let empty_keyring = Keyring::default();
-    let plain = dc_pgp_pk_decrypt(
-        ctext_signed.as_bytes(),
-        &keyring,
-        &empty_keyring,
-        Some(&mut valid_signatures),
-    )
-    .unwrap();
-    assert_eq!(plain, original_text);
-    assert_eq!(valid_signatures.len(), 0);
+        let mut public_keyring = Keyring::default();
+        public_keyring.add_ref(&public_key);
 
-    valid_signatures.clear();
+        let mut public_keyring2 = Keyring::default();
+        public_keyring2.add_owned(public_key2.clone());
 
-    let plain = dc_pgp_pk_decrypt(
-        ctext_signed.as_bytes(),
-        &keyring,
-        &public_keyring2,
-        Some(&mut valid_signatures),
-    )
-    .unwrap();
-    assert_eq!(plain, original_text);
-    assert_eq!(valid_signatures.len(), 0);
+        let mut valid_signatures: HashSet<String> = Default::default();
 
-    valid_signatures.clear();
+        let plain = dc_pgp_pk_decrypt(
+            ctext_signed.as_ptr() as *const _,
+            ctext_signed_bytes,
+            &keyring,
+            &public_keyring,
+            Some(&mut valid_signatures),
+        )
+        .unwrap();
 
-    public_keyring2.add_ref(&public_key);
+        assert_eq!(std::str::from_utf8(&plain).unwrap(), as_str(original_text),);
+        assert_eq!(valid_signatures.len(), 1);
 
-    let plain = dc_pgp_pk_decrypt(
-        ctext_signed.as_bytes(),
-        &keyring,
-        &public_keyring2,
-        Some(&mut valid_signatures),
-    )
-    .unwrap();
-    assert_eq!(plain, original_text);
-    assert_eq!(valid_signatures.len(), 1);
+        valid_signatures.clear();
 
-    valid_signatures.clear();
+        let empty_keyring = Keyring::default();
+        let plain = dc_pgp_pk_decrypt(
+            ctext_signed.as_ptr() as *const _,
+            ctext_signed_bytes,
+            &keyring,
+            &empty_keyring,
+            Some(&mut valid_signatures),
+        )
+        .unwrap();
+        assert_eq!(std::str::from_utf8(&plain).unwrap(), as_str(original_text),);
+        assert_eq!(valid_signatures.len(), 0);
 
-    let plain = dc_pgp_pk_decrypt(
-        ctext_unsigned.as_bytes(),
-        &keyring,
-        &public_keyring,
-        Some(&mut valid_signatures),
-    )
-    .unwrap();
+        valid_signatures.clear();
 
-    assert_eq!(plain, original_text);
+        let plain = dc_pgp_pk_decrypt(
+            ctext_signed.as_ptr() as *const _,
+            ctext_signed_bytes,
+            &keyring,
+            &public_keyring2,
+            Some(&mut valid_signatures),
+        )
+        .unwrap();
+        assert_eq!(std::str::from_utf8(&plain).unwrap(), as_str(original_text),);
+        assert_eq!(valid_signatures.len(), 0);
 
-    valid_signatures.clear();
+        valid_signatures.clear();
 
-    let mut keyring = Keyring::default();
-    keyring.add_ref(&private_key2);
-    let mut public_keyring = Keyring::default();
-    public_keyring.add_ref(&public_key);
+        public_keyring2.add_ref(&public_key);
 
-    let plain =
-        dc_pgp_pk_decrypt(ctext_signed.as_bytes(), &keyring, &public_keyring, None).unwrap();
+        let plain = dc_pgp_pk_decrypt(
+            ctext_signed.as_ptr() as *const _,
+            ctext_signed_bytes,
+            &keyring,
+            &public_keyring2,
+            Some(&mut valid_signatures),
+        )
+        .unwrap();
+        assert_eq!(std::str::from_utf8(&plain).unwrap(), as_str(original_text),);
+        assert_eq!(valid_signatures.len(), 1);
 
-    assert_eq!(plain, original_text);
+        valid_signatures.clear();
+
+        let plain = dc_pgp_pk_decrypt(
+            ctext_unsigned.as_ptr() as *const _,
+            ctext_unsigned_bytes,
+            &keyring,
+            &public_keyring,
+            Some(&mut valid_signatures),
+        )
+        .unwrap();
+
+        assert_eq!(std::str::from_utf8(&plain).unwrap(), as_str(original_text),);
+
+        valid_signatures.clear();
+
+        let mut keyring = Keyring::default();
+        keyring.add_ref(&private_key2);
+        let mut public_keyring = Keyring::default();
+        public_keyring.add_ref(&public_key);
+
+        let plain = dc_pgp_pk_decrypt(
+            ctext_signed.as_ptr() as *const _,
+            ctext_signed_bytes,
+            &keyring,
+            &public_keyring,
+            None,
+        )
+        .unwrap();
+
+        assert_eq!(std::str::from_utf8(&plain).unwrap(), as_str(original_text),);
+    }
 }
 
-fn cb(_context: &Context, _event: Event) -> libc::uintptr_t {
+unsafe extern "C" fn cb(
+    _context: &Context,
+    _event: Event,
+    _data1: uintptr_t,
+    _data2: uintptr_t,
+) -> uintptr_t {
     0
 }
 
@@ -572,16 +677,89 @@ struct TestContext {
     dir: TempDir,
 }
 
-fn create_test_context() -> TestContext {
+unsafe fn create_test_context() -> TestContext {
+    let mut ctx = dc_context_new(Some(cb), std::ptr::null_mut(), None);
     let dir = tempdir().unwrap();
     let dbfile = dir.path().join("db.sqlite");
-    let ctx = Context::new(Box::new(cb), "FakeOs".into(), dbfile).unwrap();
+    assert!(
+        dc_open(&mut ctx, dbfile.to_str().unwrap(), None),
+        "Failed to open {}",
+        dbfile.display()
+    );
     TestContext { ctx: ctx, dir: dir }
 }
 
+#[test]
+fn test_dc_kml_parse() {
+    unsafe {
+        let context = create_test_context();
+
+        let xml: *const libc::c_char =
+        b"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<kml xmlns=\"http://www.opengis.net/kml/2.2\">\n<Document addr=\"user@example.org\">\n<Placemark><Timestamp><when>2019-03-06T21:09:57Z</when></Timestamp><Point><coordinates accuracy=\"32.000000\">9.423110,53.790302</coordinates></Point></Placemark>\n<PlaceMARK>\n<Timestamp><WHEN > \n\t2018-12-13T22:11:12Z\t</wHeN></Timestamp><Point><coordinates aCCuracy=\"2.500000\"> 19.423110 \t , \n 63.790302\n </coordinates></Point></Placemark>\n</Document>\n</kml>\x00"
+            as *const u8 as *const libc::c_char;
+
+        let mut kml = dc_kml_parse(&context.ctx, xml, strlen(xml));
+
+        assert!(!kml.addr.is_null());
+        assert_eq!(as_str(kml.addr as *const libc::c_char), "user@example.org",);
+
+        let locations_ref = &kml.locations.as_ref().unwrap();
+        assert_eq!(locations_ref.len(), 2);
+
+        assert!(locations_ref[0].latitude > 53.6f64);
+        assert!(locations_ref[0].latitude < 53.8f64);
+        assert!(locations_ref[0].longitude > 9.3f64);
+        assert!(locations_ref[0].longitude < 9.5f64);
+        assert!(locations_ref[0].accuracy > 31.9f64);
+        assert!(locations_ref[0].accuracy < 32.1f64);
+        assert_eq!(locations_ref[0].timestamp, 1551906597);
+
+        assert!(locations_ref[1].latitude > 63.6f64);
+        assert!(locations_ref[1].latitude < 63.8f64);
+        assert!(locations_ref[1].longitude > 19.3f64);
+        assert!(locations_ref[1].longitude < 19.5f64);
+        assert!(locations_ref[1].accuracy > 2.4f64);
+        assert!(locations_ref[1].accuracy < 2.6f64);
+        assert_eq!(locations_ref[1].timestamp, 1544739072);
+
+        dc_kml_unref(&mut kml);
+    }
+}
+
+#[test]
+fn test_dc_mimeparser_with_context() {
+    unsafe {
+        let context = create_test_context();
+
+        let mut mimeparser = dc_mimeparser_new(&context.ctx);
+        let raw: *const libc::c_char =
+        b"Content-Type: multipart/mixed; boundary=\"==break==\";\nSubject: outer-subject\nX-Special-A: special-a\nFoo: Bar\nChat-Version: 0.0\n\n--==break==\nContent-Type: text/plain; protected-headers=\"v1\";\nSubject: inner-subject\nX-Special-B: special-b\nFoo: Xy\nChat-Version: 1.0\n\ntest1\n\n--==break==--\n\n\x00"
+            as *const u8 as *const libc::c_char;
+
+        dc_mimeparser_parse(&mut mimeparser, raw, strlen(raw));
+        assert_eq!(
+            as_str(mimeparser.subject as *const libc::c_char),
+            "inner-subject",
+        );
+
+        let mut of: *mut mailimf_optional_field =
+            dc_mimeparser_lookup_optional_field(&mimeparser, "X-Special-A");
+        assert_eq!(as_str((*of).fld_value as *const libc::c_char), "special-a",);
+
+        of = dc_mimeparser_lookup_optional_field(&mimeparser, "Foo");
+        assert_eq!(as_str((*of).fld_value as *const libc::c_char), "Bar",);
+
+        of = dc_mimeparser_lookup_optional_field(&mimeparser, "Chat-Version");
+        assert_eq!(as_str((*of).fld_value as *const libc::c_char), "1.0",);
+        assert_eq!(mimeparser.parts.len(), 1);
+
+        dc_mimeparser_unref(&mut mimeparser);
+    }
+}
+
 #[test]
 fn test_dc_get_oauth2_url() {
-    let ctx = create_test_context();
+    let ctx = unsafe { create_test_context() };
     let addr = "dignifiedquire@gmail.com";
     let redirect_uri = "chat.delta:/com.b44t.messenger";
     let res = dc_get_oauth2_url(&ctx.ctx, addr, redirect_uri);
@@ -591,7 +769,7 @@ fn test_dc_get_oauth2_url() {
 
 #[test]
 fn test_dc_get_oauth2_addr() {
-    let ctx = create_test_context();
+    let ctx = unsafe { create_test_context() };
     let addr = "dignifiedquire@gmail.com";
     let code = "fail";
     let res = dc_get_oauth2_addr(&ctx.ctx, addr, code);
@@ -601,7 +779,7 @@ fn test_dc_get_oauth2_addr() {
 
 #[test]
 fn test_dc_get_oauth2_token() {
-    let ctx = create_test_context();
+    let ctx = unsafe { create_test_context() };
     let addr = "dignifiedquire@gmail.com";
     let code = "fail";
     let res = dc_get_oauth2_access_token(&ctx.ctx, addr, code, 0);
@@ -619,33 +797,52 @@ fn test_stress_tests() {
 
 #[test]
 fn test_get_contacts() {
-    let context = create_test_context();
-    let contacts = Contact::get_all(&context.ctx, 0, Some("some2")).unwrap();
-    assert_eq!(contacts.len(), 0);
+    unsafe {
+        let context = create_test_context();
+        let contacts = Contact::get_all(&context.ctx, 0, Some("some2")).unwrap();
+        assert_eq!(contacts.len(), 0);
 
-    let id = Contact::create(&context.ctx, "bob", "bob@mail.de").unwrap();
-    assert_ne!(id, 0);
+        let id = Contact::create(&context.ctx, "bob", "bob@mail.de").unwrap();
+        assert_ne!(id, 0);
 
-    let contacts = Contact::get_all(&context.ctx, 0, Some("bob")).unwrap();
-    assert_eq!(contacts.len(), 1);
+        let contacts = Contact::get_all(&context.ctx, 0, Some("bob")).unwrap();
+        assert_eq!(contacts.len(), 1);
 
-    let contacts = Contact::get_all(&context.ctx, 0, Some("alice")).unwrap();
-    assert_eq!(contacts.len(), 0);
+        let contacts = Contact::get_all(&context.ctx, 0, Some("alice")).unwrap();
+        assert_eq!(contacts.len(), 0);
+    }
 }
 
 #[test]
 fn test_chat() {
-    let context = create_test_context();
-    let contact1 = Contact::create(&context.ctx, "bob", "bob@mail.de").unwrap();
-    assert_ne!(contact1, 0);
+    unsafe {
+        let context = create_test_context();
+        let contact1 = Contact::create(&context.ctx, "bob", "bob@mail.de").unwrap();
+        assert_ne!(contact1, 0);
 
-    let chat_id = chat::create_by_contact_id(&context.ctx, contact1).unwrap();
-    assert!(chat_id > 9, "chat_id too small {}", chat_id);
-    let chat = Chat::load_from_db(&context.ctx, chat_id).unwrap();
+        let chat_id = dc_create_chat_by_contact_id(&context.ctx, contact1);
+        assert!(chat_id > 9, "chat_id too small {}", chat_id);
+        let chat = dc_chat_new(&context.ctx);
+        assert!(dc_chat_load_from_db(chat, chat_id));
 
-    let chat2_id = chat::create_by_contact_id(&context.ctx, contact1).unwrap();
-    assert_eq!(chat2_id, chat_id);
-    let chat2 = Chat::load_from_db(&context.ctx, chat2_id).unwrap();
+        let chat2_id = dc_create_chat_by_contact_id(&context.ctx, contact1);
+        assert_eq!(chat2_id, chat_id);
+        let chat2 = dc_chat_new(&context.ctx);
+        assert!(dc_chat_load_from_db(chat2, chat2_id));
 
-    assert_eq!(chat2.name, chat.name);
+        assert_eq!(as_str((*chat2).name), as_str((*chat).name));
+    }
+}
+
+#[test]
+fn test_wrong_db() {
+    unsafe {
+        let mut ctx = dc_context_new(Some(cb), std::ptr::null_mut(), None);
+        let dir = tempdir().unwrap();
+        let dbfile = dir.path().join("db.sqlite");
+        std::fs::write(&dbfile, b"123").unwrap();
+
+        let res = dc_open(&mut ctx, dbfile.to_str().unwrap(), None);
+        assert!(!res);
+    }
 }