bump to beta11

fix doc

.circleci/config.yml

@@ -1,10 +1,12 @@
 version: 2.1
-
 executors:
   default:
     docker:
       - image: filecoin/rust:latest
     working_directory: /mnt/crate
+  doxygen:
+    docker:
+      - image: hrektts/doxygen
 
 restore-workspace: &restore-workspace
   attach_workspace:
@@ -13,7 +15,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-v3-{{ checksum "rust-toolchain" }}-{{ checksum "Cargo.toml" }}-{{ checksum "Cargo.lock" }}-{{ arch }}
       - repo-source-{{ .Branch }}-{{ .Revision }}
 
 commands:
@@ -24,20 +26,9 @@ commands:
     steps:
       - *restore-workspace
       - *restore-cache
-      - setup_remote_docker:
-          docker_layer_caching: true
-      # TODO: move into image
-      - run:
-          name: Install Docker client
-          command: |
-            set -x
-            VER="18.09.2"
-            curl -L -o /tmp/docker-$VER.tgz https://download.docker.com/linux/static/stable/x86_64/docker-$VER.tgz
-            tar -xz -C /tmp -f /tmp/docker-$VER.tgz
-            mv /tmp/docker/* /usr/bin
       - run:
           name: Test (<< parameters.target >>)
-          command: TARGET=<< parameters.target >> ci/run.sh
+          command: TARGET=<< parameters.target >> ci_scripts/run-rust-test.sh
           no_output_timeout: 15m
 
 jobs:
@@ -53,7 +44,7 @@ jobs:
           command: cargo generate-lockfile
       - restore_cache:
           keys:
-            - cargo-v1-{{ checksum "rust-toolchain" }}-{{ checksum "Cargo.toml" }}-{{ checksum "Cargo.lock" }}-{{ arch }}
+            - cargo-v3-{{ 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
@@ -62,13 +53,14 @@ jobs:
       - run: cargo fetch
       - run: rustc +stable --version
       - run: rustc +$(cat rust-toolchain) --version
-      - run: rm -rf .git
+      # make sure this git repo doesn't grow too big
+      - run: git gc
       - persist_to_workspace:
           root: /mnt
           paths:
             - crate
       - save_cache:
-          key: cargo-v1-{{ checksum "rust-toolchain" }}-{{ checksum "Cargo.toml" }}-{{ checksum "Cargo.lock" }}-{{ arch }}
+          key: cargo-v3-{{ checksum "rust-toolchain" }}-{{ checksum "Cargo.toml" }}-{{ checksum "Cargo.lock" }}-{{ arch }}
           paths:
             - "~/.cargo"
             - "~/.rustup"
@@ -103,7 +95,7 @@ jobs:
       - run: cargo fetch
       - run:
           name: Test
-          command: TARGET=x86_64-apple-darwin ci/run.sh
+          command: TARGET=x86_64-apple-darwin ci_scripts/run-rust-test.sh
 
   test_x86_64-unknown-linux-gnu:
     executor: default
@@ -124,42 +116,69 @@ jobs:
           target: "aarch64-linux-android"
 
 
-  build_test_docs_wheel:
-    machine: True
+  build_doxygen:
+    executor: doxygen
     steps:
       - checkout
-      # - run: docker pull deltachat/doxygen
-      - run: docker pull deltachat/coredeps
-      - run:
-          name: build docs, run tests and build wheels
-          command: ci_scripts/ci_run.sh
-          environment:
-            TESTS: 1
-            DOCS: 1
-
-      - run:
-           name: copying docs and wheels to workspace
-           command: |
-             mkdir -p workspace/python
-             # cp -av docs workspace/c-docs
-             cp -av python/.docker-tox/wheelhouse workspace/
-             cp -av python/doc/_build/ workspace/py-docs
-
+      - run: bash ci_scripts/run-doxygen.sh
+      - run: mkdir -p workspace/c-docs
+      - run: cp -av deltachat-ffi/{html,xml} workspace/c-docs/
       - persist_to_workspace:
           root: workspace
           paths:
-            # - c-docs
-            - py-docs
-            - wheelhouse
+            - c-docs
+
+  # build_test_docs_wheel:
+  #   docker:
+  #     - image: deltachat/coredeps
+  #       environment:
+  #           TESTS: 1
+  #           DOCS: 1
+  #   working_directory: /mnt/crate
+  #   steps:
+  #     - *restore-workspace
+  #     - *restore-cache
+  #     - run:
+  #         name: build docs, run tests and build wheels
+  #         command: ci_scripts/run-python.sh
+  #     - run:
+  #          name: copying docs and wheels to workspace
+  #          command: |
+  #            mkdir -p workspace/python
+  #            # cp -av docs workspace/c-docs
+  #            cp -av python/.docker-tox/wheelhouse workspace/
+  #            cp -av python/doc/_build/ workspace/py-docs
+  #     - persist_to_workspace:
+  #         root: workspace
+  #         paths:
+  #           # - c-docs
+  #           - py-docs
+  #           - wheelhouse
+
+  remote_tests_rust:
+    machine: true
+    steps:
+      - checkout
+      - run: ci_scripts/remote_tests_rust.sh
+    
+  remote_tests_python:
+    machine: true
+    steps:
+      - checkout
+      #- attach_workspace:
+      #    at: workspace
+      - run: ci_scripts/remote_tests_python.sh
+    # workspace/py-docs workspace/wheelhouse workspace/c-docs
 
   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
+      - run: ci_scripts/ci_upload.sh workspace/py-docs workspace/wheelhouse workspace/c-docs
 
   clippy:
     executor: default
@@ -176,23 +195,29 @@ workflows:
 
   test:
     jobs:
-      - build_test_docs_wheel
-      - upload_docs_wheels:
-          requires:
-            - build_test_docs_wheel
       - cargo_fetch
+
+      - remote_tests_rust
+
+      - remote_tests_python
+
+      # - upload_docs_wheels:
+      #     requires:
+      #       - build_test_docs_wheel
+      #       - build_doxygen
       - rustfmt:
           requires:
             - cargo_fetch
-
       - clippy:
           requires:
-            - cargo_fetch
+           - cargo_fetch
+
+      - build_doxygen
 
       # Linux Desktop 64bit
-      - test_x86_64-unknown-linux-gnu:
-          requires:
-            - cargo_fetch
+      # - test_x86_64-unknown-linux-gnu:
+      #     requires:
+      #       - cargo_fetch
 
       # Linux Desktop 32bit
       # - test_i686-unknown-linux-gnu:

.gitattributes

@@ -2,6 +2,10 @@
 # ensures this even if the user has not set core.autocrlf.
 *  text=auto
 
+# This directory contains email messages verbatim, and changing CRLF to
+# LF will corrupt them.
+test-data/* text=false
+
 # binary files should be detected by git, however, to be sure, you can add them here explicitly
 *.png  binary
 *.jpg  binary

.gitignore

@@ -16,5 +16,12 @@ python/.tox
 *.egg-info
 __pycache__
 python/src/deltachat/capi*.so
+python/.venv/
 
 python/liveconfig*
+
+# ignore doxgen generated files
+deltachat-ffi/html
+deltachat-ffi/xml
+
+.rsynclist

CHANGELOG.md

@@ -0,0 +1,173 @@
+# Changelog 
+
+## 1.0.0-beta.11
+
+- trigger reconnect more often on imap error states.  Should fix an 
+  issue observed when trying to empty a folder.  @hpk42
+
+- un-split qr tests: we fixed qr-securejoin protocol flakyness 
+  last weeks. @hpk42
+
+## 1.0.0-beta.10
+
+- fix grpid-determination from in-reply-to and references headers. @hpk42
+
+- only send Autocrypt-gossip headers on encrypted messages. @dignifiedquire
+
+- fix reply-to-encrypted message to also be encrypted. @hpk42
+
+- remove last unsafe code from dc_receive_imf :) @hpk42
+
+- add experimental new dc_chat_get_info_json FFI/API so that desktop devs
+  can play with using it. @jikstra
+
+- fix encoding of subjects and attachment-filenames @hpk42
+  @dignifiedquire . 
+
+## 1.0.0-beta.9
+
+- historic: we now use the mailparse crate and lettre-email to generate mime
+  messages.  This got rid of mmime completely, the C2rust generated port of the libetpan 
+  mime-parse -- IOW 22KLocs of cumbersome code removed! see 
+  https://github.com/deltachat/deltachat-core-rust/pull/904#issuecomment-561163330
+  many thanks @dignifiedquire for making everybody's life easier 
+  and @jonhoo (from rust-imap fame) for suggesting to use the mailparse crate :) 
+
+- lots of improvements and better error handling in many rust modules 
+  thanks @link2xt @flub @r10s, @hpk42 and @dignifiedquire 
+
+- @r10s introduced a new device chat which has an initial
+  welcome message.  See 
+  https://c.delta.chat/classdc__context__t.html#a1a2aad98bd23c1d21ee42374e241f389
+  for the main new FFI-API.
+
+- fix moving self-sent messages, thanks @r10s, @flub, @hpk42
+
+- fix flakyness/sometimes-failing verified/join-protocols, 
+  thanks @flub, @r10s, @hpk42
+
+- fix reply-to-encrypted message to keep encryption 
+
+- new DC_EVENT_SECUREJOIN_MEMBER_ADDED event 
+
+- many little fixes and rustifications (@link2xt, @flub, @hpk42)
+
+
+## 1.0.0-beta.8
+
+- now uses async-email/async-imap as the new base 
+  which makes imap-idle interruptible and thus fixes
+  several issues around the imap thread being in zombie state . 
+  thanks @dignifiedquire, @hpk42 and @link2xt. 
+
+- fixes imap-protocol parsing bugs that lead to infinitely
+  repeated crashing while trying to receive messages with
+  a subjec that contained non-utf8. thanks @link2xt
+
+- fixed logic to find encryption subkey -- previously 
+  delta chat would use the primary key for encryption
+  (which works with RSA but not ECC). thanks @link2xt
+
+- introduce a new device chat where core and UIs can 
+  add "device" messages.  Android uses it for an initial
+  welcome message. thanks @r10s
+
+- fix time smearing (when two message are virtually send
+  in the same second, there would be misbehaviour because
+  we didn't persist smeared time). thanks @r10s
+
+- fix double-dotted extensions like .html.zip or .tar.gz  
+  to not mangle them when creating blobfiles.  thanks @flub
+
+- fix backup/exports where the wrong sql file would be modified,
+  leading to problems when exporting twice.  thanks @hpk42
+
+- several other little fixes and improvements 
+
+
+## 1.0.0-beta.7
+
+- fix location-streaming #782
+
+- fix display of messages that could not be decrypted #785
+ 
+- fix smtp MAILER-DAEMON bug #786 
+
+- fix a logging of durations #783
+
+- add more error logging #779
+
+- do not panic on some bad utf-8 mime #776
+
+## 1.0.0-beta.6
+
+- fix chatlist.get_msg_id to return id, instead of wrongly erroring
+
+## 1.0.0-beta.5
+
+- fix dc_get_msg() to return empty messages when asked for special ones 
+
+## 1.0.0-beta.4
+
+- fix more than one sending of autocrypt setup message
+
+- fix recognition of mailto-address-qr-codes, add tests
+
+- tune down error to warning when adding self to chat
+
+## 1.0.0-beta.3
+
+- add back `dc_empty_server()` #682
+
+- if `show_emails` is set to `DC_SHOW_EMAILS_ALL`,
+  email-based contact requests are added to the chatlist directly
+
+- fix IMAP hangs #717 and cleanups
+
+- several rPGP fixes
+
+- code streamlining and rustifications
+
+
+## 1.0.0-beta.2
+
+- https://c.delta.chat docs are now regenerated again through our CI 
+
+- several rPGP cleanups, security fixes and better multi-platform support 
+
+- reconnect on io errors and broken pipes (imap)
+
+- probe SMTP with real connection not just setup
+
+- various imap/smtp related fixes
+
+- use to_string_lossy in most places instead of relying on valid utf-8
+  encodings
+ 
+- rework, rustify and test autoconfig-reading and parsing 
+
+- some rustifications/boolifications of c-ints 
+
+
+## 1.0.0-beta.1 
+
+- first beta of the Delta Chat Rust core library. many fixes of crashes
+  and other issues compared to 1.0.0-alpha.5.
+
+- Most code is now "rustified" and does not do manual memory allocation anymore. 
+
+- The `DC_EVENT_GET_STRING` event is not used anymore, removing the last
+  event where the core requested a return value from the event callback. 
+
+  Please now use `dc_set_stock_translation()` API for core messages
+  to be properly localized. 
+
+- Deltachat FFI docs are automatically generated and available here: 
+  https://c.delta.chat 
+
+- New events ImapMessageMoved and ImapMessageDeleted
+
+For a full list of changes, please see our closed Pull Requests: 
+
+https://github.com/deltachat/deltachat-core-rust/pulls?q=is%3Apr+is%3Aclosed
+

Cargo.toml

@@ -1,31 +1,28 @@
 [package]
 name = "deltachat"
-version = "1.0.0-alpha.4"
-authors = ["dignifiedquire <dignifiedquire@gmail.com>"]
+version = "1.0.0-beta.11"
+authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2018"
 license = "MPL"
 
-[build-dependencies]
-cc = "1.0.35"
-pkg-config = "0.3"
-
 [dependencies]
 deltachat_derive = { path = "./deltachat_derive" }
+
 libc = "0.2.51"
-pgp = { version = "0.2", default-features = false }
-hex = "0.3.2"
+pgp = { git = "https://github.com/rpgp/rpgp", branch = "master", default-features = false }
+hex = "0.4.0"
 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"
+reqwest = { version = "0.9.15", default-features = false, features = ["rustls-tls"] }
 num-derive = "0.2.5"
 num-traits = "0.2.6"
-native-tls = "0.2.3"
-lettre = "0.9.0"
-imap = "1.0.1"
-mmime = "0.1.0"
-base64 = "0.10"
+lettre = { git = "https://github.com/deltachat/lettre", branch = "feat/mail" }
+lettre_email = { git = "https://github.com/deltachat/lettre", branch = "feat/mail" }
+async-imap = { git = "https://github.com/async-email/async-imap", branch="master" }
+async-tls = "0.6"
+async-std = { version = "1.0", features = ["unstable"] }
+base64 = "0.11"
 charset = "0.1"
 percent-encoding = "2.0"
 serde = { version = "1.0", features = ["derive"] }
@@ -35,13 +32,13 @@ failure = "0.1.5"
 failure_derive = "0.1.5"
 # TODO: make optional
 rustyline = "4.1.0"
-lazy_static = "1.3.0"
+lazy_static = "1.4.0"
 regex = "1.1.6"
 rusqlite = { version = "0.20", features = ["bundled"] }
 r2d2_sqlite = "0.12.0"
 r2d2 = "0.8.5"
-strum = "0.15.0"
-strum_macros = "0.15.0"
+strum = "0.16.0"
+strum_macros = "0.16.0"
 thread-local-object = "0.1.0"
 backtrace = "0.3.33"
 byteorder = "1.3.1"
@@ -49,11 +46,21 @@ itertools = "0.8.0"
 image-meta = "0.1.0"
 quick-xml = "0.15.0"
 escaper = "0.1.0"
+bitflags = "1.1.0"
+debug_stub_derive = "0.3.0"
+sanitize-filename = "0.2.1"
+stop-token = { version = "0.1.1", features = ["unstable"] }
+rustls = "0.16.0"
+webpki-roots = "0.18.0"
+webpki = "0.21.0"
+mailparse = "0.10.1"
+encoded-words = { git = "https://github.com/async-email/encoded-words", branch="master" }
 
 [dev-dependencies]
 tempfile = "3.0"
 pretty_assertions = "0.6.1"
 pretty_env_logger = "0.3.0"
+proptest = "0.9.4"
 
 [workspace]
 members = [
@@ -72,6 +79,6 @@ path = "examples/repl/main.rs"
 
 [features]
 default = ["nightly", "ringbuf"]
-vendored = ["native-tls/vendored", "reqwest/default-tls-vendored"]
+vendored = []
 nightly = ["pgp/nightly"]
 ringbuf = ["pgp/ringbuf"]

README.md

@@ -1,11 +1,9 @@
 # Delta Chat Rust
 
-> Project porting deltachat-core to rust
+> Deltachat-core written in Rust 
 
 [![CircleCI build status][circle-shield]][circle] [![Appveyor build status][appveyor-shield]][appveyor]
 
-Current commit on deltachat/deltachat-core: `12ef73c8e76185f9b78e844ea673025f56a959ab`.
-
 ## Installing Rust and Cargo
 
 To download and install the official compiler for the Rust programming language, and the Cargo package manager, run the command in your user environment:
@@ -16,7 +14,7 @@ curl https://sh.rustup.rs -sSf | sh
 
 ## Using the CLI client
 
-Compile and run Delta Chat Core using `cargo`:
+Compile and run Delta Chat Core command line utility, using `cargo`:
 
 ```
 cargo run --example repl -- /path/to/db
@@ -89,6 +87,15 @@ $ cargo test --all
 $ cargo build -p deltachat_ffi --release
 ```
 
+## Debugging environment variables 
+
+- `DCC_IMAP_DEBUG`: if set IMAP protocol commands and responses will be
+  printed
+
+- `DCC_MIME_DEBUG`: if set outgoing and incoming message will be printed 
+
+
+
 ### Expensive tests
 
 Some tests are expensive and marked with `#[ignore]`, to run these

Xargo.toml

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

appveyor.yml

@@ -13,7 +13,7 @@ install:
 build: false
 
 test_script:
-  - cargo test --release
+  - cargo test --release --all
 
 cache:
   - target

assets/icon-device.svg

@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="0.92.4 5da689c313, 2019-01-14"
+   sodipodi:docname="icon-device.svg"
+   id="svg4344"
+   preserveAspectRatio="xMidYMid meet"
+   viewBox="0 0 45 45"
+   height="60"
+   width="60"
+   version="1.0"
+   inkscape:export-filename="/home/kerle/Workspace/deltachat-core-rust/assets/icon-device.png"
+   inkscape:export-xdpi="409.60001"
+   inkscape:export-ydpi="409.60001">
+  <defs
+     id="defs4348" />
+  <sodipodi:namedview
+     inkscape:current-layer="svg4344"
+     inkscape:window-maximized="0"
+     inkscape:window-y="0"
+     inkscape:window-x="0"
+     inkscape:cy="28.471578"
+     inkscape:cx="28.03926"
+     inkscape:zoom="5.6"
+     units="px"
+     showgrid="false"
+     id="namedview4346"
+     inkscape:window-height="1019"
+     inkscape:window-width="1248"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     inkscape:document-rotation="0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     inkscape:snap-global="false" />
+  <metadata
+     id="metadata4336">
+Created by potrace 1.15, written by Peter Selinger 2001-2017
+<rdf:RDF>
+  <cc:Work
+     rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type
+       rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+    <dc:title />
+  </cc:Work>
+</rdf:RDF>
+</metadata>
+  <circle
+     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke-width:0.731071"
+     id="path859"
+     cx="22.5"
+     cy="22.5"
+     r="22.5" />
+  <circle
+     r="22.5"
+     cy="22.5"
+     cx="22.5"
+     id="path4917"
+     style="fill:#364e54;fill-opacity:0.67681497;stroke-width:0.58855402"
+     inkscape:export-xdpi="409"
+     inkscape:export-ydpi="409" />
+  <g
+     id="g4342"
+     transform="matrix(0.00255113,0,0,-0.00255113,5.586152,38.200477)"
+     style="fill:#ffffff;fill-opacity:1"
+     stroke="none"
+     fill="#000000">
+    <path
+       inkscape:connector-curvature="0"
+       id="path4338"
+       d="m 8175,12765 c -703,-114 -1248,-608 -1387,-1258 -17,-82 -21,-136 -22,-277 0,-202 15,-307 70,-470 149,-446 499,-733 1009,-828 142,-26 465,-23 619,6 691,131 1201,609 1328,1244 31,158 31,417 0,565 -114,533 -482,889 -1038,1004 -133,27 -448,35 -579,14 z"
+       style="fill:#ffffff;fill-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4340"
+       d="m 7070,9203 c -212,-20 -275,-27 -397,-48 -691,-117 -1400,-444 -2038,-940 -182,-142 -328,-270 -585,-517 -595,-571 -911,-974 -927,-1181 -6,-76 11,-120 69,-184 75,-80 159,-108 245,-79 109,37 263,181 632,595 539,606 774,826 1035,969 135,75 231,105 341,106 82,1 94,-2 138,-27 116,-68 161,-209 122,-376 -9,-36 -349,-868 -757,-1850 -407,-982 -785,-1892 -838,-2021 -287,-694 -513,-1389 -615,-1889 -70,-342 -90,-683 -52,-874 88,-440 381,-703 882,-792 124,-23 401,-30 562,-16 783,69 1674,461 2561,1125 796,596 1492,1354 1607,1751 43,146 -33,308 -168,360 -61,23 -100,15 -173,-36 -105,-74 -202,-170 -539,-529 -515,-551 -762,-783 -982,-927 -251,-164 -437,-186 -543,-65 -56,64 -74,131 -67,247 13,179 91,434 249,815 135,324 1588,4102 1646,4280 106,325 151,561 159,826 9,281 -22,463 -112,652 -58,122 -114,199 -211,292 -245,233 -582,343 -1044,338 -91,-1 -181,-3 -200,-5 z"
+       style="fill:#ffffff;fill-opacity:1" />
+  </g>
+</svg>

assets/icon-saved-messages.svg

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="0.92.4 5da689c313, 2019-01-14"
+   sodipodi:docname="icon-saved-messages.svg"
+   id="svg4344"
+   preserveAspectRatio="xMidYMid meet"
+   viewBox="0 0 45 45"
+   height="60"
+   width="60"
+   version="1.0"
+   inkscape:export-filename="/home/kerle/test-icon.png"
+   inkscape:export-xdpi="409.60001"
+   inkscape:export-ydpi="409.60001">
+  <defs
+     id="defs4348" />
+  <sodipodi:namedview
+     inkscape:lockguides="false"
+     inkscape:current-layer="svg4344"
+     inkscape:window-maximized="0"
+     inkscape:window-y="130"
+     inkscape:window-x="89"
+     inkscape:cy="43.28624"
+     inkscape:cx="-21.066324"
+     inkscape:zoom="4"
+     units="px"
+     showgrid="false"
+     id="namedview4346"
+     inkscape:window-height="855"
+     inkscape:window-width="1395"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     inkscape:document-rotation="0"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <metadata
+     id="metadata4336">
+Created by potrace 1.15, written by Peter Selinger 2001-2017
+<rdf:RDF>
+  <cc:Work
+     rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type
+       rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+    <dc:title />
+  </cc:Work>
+</rdf:RDF>
+</metadata>
+  <circle
+     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke-width:0.731071"
+     id="path859"
+     cx="22.5"
+     cy="22.5"
+     r="22.5" />
+  <circle
+     r="22.5"
+     cy="22.50293"
+     cx="22.5"
+     id="path4917"
+     style="fill:#87aade;fill-opacity:1;stroke-width:0.58855402" />
+  <path
+     inkscape:connector-curvature="0"
+     d="M 13.5,7.5 V 39 h 0.08654 L 22.533801,29.370239 31.482419,39 h 0.01758 V 7.5 Z m 9.004056,4.108698 1.879508,4.876388 5.039514,0.359779 -3.879358,3.363728 1.227764,5.095749 -4.276893,-2.796643 -4.280949,2.788618 1.237229,-5.093073 -3.873949,-3.371754 5.040866,-0.350417 z"
+     style="fill:#ffffff;stroke-width:0.58409804"
+     id="rect846" />
+</svg>

build.rs

@@ -1,38 +0,0 @@
-extern crate cc;
-
-fn link_static(lib: &str) {
-    println!("cargo:rustc-link-lib=static={}", lib);
-}
-
-fn link_framework(fw: &str) {
-    println!("cargo:rustc-link-lib=framework={}", fw);
-}
-
-fn add_search_path(p: &str) {
-    println!("cargo:rustc-link-search={}", p);
-}
-
-fn build_tools() {
-    let mut config = cc::Build::new();
-    config.file("misc.c").compile("libtools.a");
-
-    println!("rerun-if-changed=build.rs");
-    println!("rerun-if-changed=misc.h");
-    println!("rerun-if-changed=misc.c");
-}
-
-fn main() {
-    build_tools();
-
-    add_search_path("/usr/local/lib");
-
-    let target = std::env::var("TARGET").unwrap();
-    if target.contains("-apple") || target.contains("-darwin") {
-        link_framework("CoreFoundation");
-        link_framework("CoreServices");
-        link_framework("Security");
-    }
-
-    // local tools
-    link_static("tools");
-}

ci_scripts/README.md

@@ -1,52 +1,46 @@
-
 # Continuous Integration Scripts for Delta Chat
 
-Continuous Integration is run through CircleCI
-but is largely independent of it. 
+Continuous Integration, run through CircleCI and an own build machine.
+
+## Description of scripts 
+
+- `../.circleci/config.yml` describing the build jobs that are run
+  by Circle-CI
+
+- `remote_tests_python.sh` rsyncs to a build machine and runs
+  `run-python-test.sh` remotely on the build machine. 
+
+- `remote_tests_rust.sh` rsyncs to the build machine and runs
+  `run-rust-test.sh` remotely on the build machine. 
+
+- `doxygen/Dockerfile` specifies an image that contains
+  the doxygen tool which is used by `run-doxygen.sh` 
+  to generate C-docs which are then uploaded 
+  via `ci_upload.sh` to `https://c.delta.chat/_unofficial_unreleased_docs/<BRANCH>`
+  (and the master branch is linked to https://c.delta.chat proper). 
 
 
-## Generating docker containers for performing build step work 
+## Triggering runs on the build machine locally (fast!)
 
-All tests, docs and wheel building is run in docker containers:
+There is experimental support for triggering a remote Python or Rust test run 
+from your local checkout/branch. You will need to be authorized to login to 
+the build machine (ask your friendly sysadmin on #deltachat freenode) to type::
 
-- **coredeps/Dockerfile** specifies an image that contains all 
-  of Delta Chat's core dependencies as linkable libraries. 
-  It also serves to run python tests and build wheels 
-  (binary packages for Python). 
+    ci_scripts/manual_remote_tests.sh rust
+    ci_scripts/manual_remote_tests.sh python
 
-- **doxygen/Dockerfile** specifies an image that contains
-  the doxygen tool which is used to generate C-docs. 
+This will **rsync** your current checkout to the remote build machine 
+(no need to commit before) and then run either rust or python tests. 
 
-To run tests locally you can pull existing images from "docker.io",
-the hub for sharing Docker images::
+# Outdated files (for later re-use)
 
-    docker pull deltachat/coredeps
-    docker pull deltachat/doxygen 
+`coredeps/Dockerfile` specifies an image that contains all 
+of Delta Chat's core dependencies. It used to run 
+python tests and build wheels (binary packages for Python)
 
-or you can build the docker images yourself locally
+You can build the docker images yourself locally
 to avoid the relatively large download:: 
  
     cd ci_scripts  # where all CI things are 
     docker build -t deltachat/coredeps docker-coredeps
     docker build -t deltachat/doxygen docker-doxygen 
-
-## ci_run.sh (main entrypoint called by circle-ci)
-
-Once you have the docker images available 
-you can run python testing, documentation generation 
-and building binary wheels:: 
-
-    sh DOCS=1 TESTS=1 ci_scripts/ci_run.sh 
-    
-## ci_upload.sh (uploading artifacts on success) 
-
-- python docs to `https://py.delta.chat/_unofficial_unreleased_docs/<BRANCH>`
-
-- doxygen docs to `https://c.delta.chat/_unofficial_unreleased_docs/<BRANCH>`
-
-- python wheels to `https://m.devpi.net/dc/<BRANCH>`
-  so that you install fully self-contained wheels like this:
-  `pip install -U -i https://m.devpi.net/dc/<BRANCH> deltachat`
-
-
-

ci_scripts/ci_run.sh

@@ -1,22 +0,0 @@
-# perform CI jobs on PRs and after merges to master.
-# triggered from .circleci/config.yml
-
-set -e -x
-
-export BRANCH=${CIRCLE_BRANCH:-test7}
-    
-# run doxygen on c-source (needed by later doc-generation steps).
-# XXX modifies the host filesystem docs/xml and docs/html directories
-# XXX which you can then only remove with sudo as they belong to root
-
-# XXX we don't do doxygen doc generation with Rust anymore, needs to be
-# substituted with rust-docs 
-#if [ -n "$DOCS" ] ; then 
-#    docker run --rm -it -v $PWD:/mnt -w /mnt/docs deltachat/doxygen doxygen
-#fi
-
-# run everything else inside docker (TESTS, DOCS, WHEELS) 
-docker run -e DCC_PY_LIVECONFIG -e BRANCH -e TESTS -e DOCS \
-           --rm -it -v $(pwd):/mnt -w /mnt \
-           deltachat/coredeps ci_scripts/run_all.sh
-

ci_scripts/ci_upload.sh

@@ -7,25 +7,30 @@ fi
 
 set -xe
 
-#DOXYDOCDIR=${1:?directory where doxygen docs to be found}
 PYDOCDIR=${1:?directory with python docs}
 WHEELHOUSEDIR=${2:?directory with pre-built wheels}
+DOXYDOCDIR=${3:?directory where doxygen docs to be found}
 
 export BRANCH=${CIRCLE_BRANCH:?specify branch for uploading purposes}
 
 
-# python docs to py.delta.chat
-ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null delta@py.delta.chat mkdir -p build/${BRANCH}
-rsync -avz \
-  -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" \
-  "$PYDOCDIR/html/" \
-  delta@py.delta.chat:build/${BRANCH}
-
-# C docs to c.delta.chat
+# DISABLED: python docs to py.delta.chat
+#ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null delta@py.delta.chat mkdir -p build/${BRANCH}
 #rsync -avz \
 #  -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" \
-#  "$DOXYDOCDIR/html/" \
-#  delta@py.delta.chat:build-c/${BRANCH}
+#  "$PYDOCDIR/html/" \
+#  delta@py.delta.chat:build/${BRANCH}
+
+# C docs to c.delta.chat
+ssh -o BatchMode=yes -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null delta@c.delta.chat mkdir -p build-c/${BRANCH}
+rsync -avz \
+  -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" \
+  "$DOXYDOCDIR/html/" \
+  delta@c.delta.chat:build-c/${BRANCH}
+
+exit 0
+
+# OUTDATED -- for re-use from python release-scripts 
 
 echo -----------------------
 echo upload wheels 
@@ -34,7 +39,7 @@ echo -----------------------
 # Bundle external shared libraries into the wheels
 pushd $WHEELHOUSEDIR
 
-pip install devpi-client
+pip3 install devpi-client
 devpi use https://m.devpi.net
 devpi login dc --password $DEVPI_LOGIN
 

ci_scripts/docker-coredeps/Dockerfile

@@ -5,16 +5,6 @@ RUN echo /usr/local/lib64 > /etc/ld.so.conf.d/local.conf && \
     echo /usr/local/lib >> /etc/ld.so.conf.d/local.conf
 ENV PKG_CONFIG_PATH /usr/local/lib64/pkgconfig:/usr/local/lib/pkgconfig
 
-ENV PIP_DISABLE_PIP_VERSION_CHECK 1
-
-# Install python tools (auditwheels,tox, ...)
-ADD deps/build_python.sh /builder/build_python.sh
-RUN mkdir tmp1 && cd tmp1 && bash /builder/build_python.sh && cd .. && rm -r tmp1
-
-# Install Rust nightly 
-ADD deps/build_rust.sh /builder/build_rust.sh
-RUN mkdir tmp1 && cd tmp1 && bash /builder/build_rust.sh && cd .. && rm -r tmp1
-
 # Install a recent Perl, needed to install OpenSSL
 ADD deps/build_perl.sh /builder/build_perl.sh
 RUN mkdir tmp1 && cd tmp1 && bash /builder/build_perl.sh && cd .. && rm -r tmp1
@@ -23,3 +13,12 @@ RUN mkdir tmp1 && cd tmp1 && bash /builder/build_perl.sh && cd .. && rm -r tmp1
 ADD deps/build_openssl.sh /builder/build_openssl.sh
 RUN mkdir tmp1 && cd tmp1 && bash /builder/build_openssl.sh && cd .. && rm -r tmp1
 
+ENV PIP_DISABLE_PIP_VERSION_CHECK 1
+
+# Install python tools (auditwheels,tox, ...)
+ADD deps/build_python.sh /builder/build_python.sh
+RUN mkdir tmp1 && cd tmp1 && bash /builder/build_python.sh && cd .. && rm -r tmp1
+
+# Install Rust nightly
+ADD deps/build_rust.sh /builder/build_rust.sh
+RUN mkdir tmp1 && cd tmp1 && bash /builder/build_rust.sh && cd .. && rm -r tmp1

ci_scripts/docker-coredeps/deps/build_perl.sh

@@ -1,11 +1,11 @@
 #!/bin/bash
 
-PERL_VERSION=5.28.0
-PERL_SHA256=7e929f64d4cb0e9d1159d4a59fc89394e27fa1f7004d0836ca0d514685406ea8
+PERL_VERSION=5.30.0
+# PERL_SHA256=7e929f64d4cb0e9d1159d4a59fc89394e27fa1f7004d0836ca0d514685406ea8
 curl -O https://www.cpan.org/src/5.0/perl-${PERL_VERSION}.tar.gz
-echo "${PERL_SHA256}  perl-${PERL_VERSION}.tar.gz" | sha256sum -c -
-tar xzf perl-${PERL_VERSION}.tar.gz
-cd perl-${PERL_VERSION} 
+# echo "${PERL_SHA256}  perl-${PERL_VERSION}.tar.gz" | sha256sum -c -
+tar -xzf perl-${PERL_VERSION}.tar.gz
+cd perl-${PERL_VERSION}
 
 ./Configure -de
 make

ci_scripts/docker-coredeps/deps/build_rust.sh

@@ -1,11 +1,8 @@
 #!/bin/bash
 
-set -e -x 
+set -e -x
 
-# Install Rust 
-curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2019-07-10 -y
+# Install Rust
+curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2019-09-12 -y
 export PATH=/root/.cargo/bin:$PATH
 rustc --version
-
-# remove some 300-400 MB that we don't need for automated builds
-rm -rf /root/.rustup/toolchains/nightly-2019-07-10-x86_64-unknown-linux-gnu/share/

ci_scripts/manual_remote_tests.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -xe
+export CIRCLE_JOB=remote_tests_${1:?need to specify 'rust' or 'python'} 
+export CIRCLE_BUILD_NUM=$USER
+export CIRCLE_BRANCH=`git branch | grep \* | cut -d ' ' -f2`
+export CIRCLE_PROJECT_REPONAME=$(basename `git rev-parse --show-toplevel`)
+
+time bash ci_scripts/$CIRCLE_JOB.sh 

ci_scripts/old/gh-actions-rust.yml

@@ -0,0 +1,77 @@
+name: CI
+
+on:
+  pull_request:
+  push:
+
+env:
+  RUSTFLAGS: -Dwarnings
+
+jobs:
+  build_and_test:
+    name: Build and test
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macOS-latest]
+        rust: [nightly]
+
+    steps:
+    - uses: actions/checkout@master
+
+    - name: Install ${{ matrix.rust }}
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: ${{ matrix.rust }}
+        override: true
+
+    - name: check
+      uses: actions-rs/cargo@v1
+      if: matrix.rust == 'nightly'
+      with:
+        command:  check
+        args: --all --bins --examples --tests
+
+    - name: tests
+      uses: actions-rs/cargo@v1
+      with:
+        command: test
+        args: --all
+
+    - name: tests ignored
+      uses: actions-rs/cargo@v1
+      with:
+        command: test
+        args: --all --release -- --ignored
+
+  check_fmt:
+    name: Checking fmt and docs
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+
+    - uses: actions-rs/toolchain@v1
+      with:
+          profile: minimal
+          toolchain: nightly
+          override: true
+          components: rustfmt
+
+    - name: fmt
+      run: cargo fmt --all -- --check
+
+#  clippy_check:
+#    name: Clippy check
+#    runs-on: ubuntu-latest
+#
+#    steps:
+#    - uses: actions/checkout@v1
+#    - uses: actions-rs/toolchain@v1
+#      with:
+#          profile: minimal
+#          toolchain: nightly
+#          override: true
+#          components: clippy
+#
+#    - name: clippy
+#      run: cargo clippy --all

ci_scripts/old/run-python.sh

@@ -36,19 +36,25 @@ if [ -n "$TESTS" ]; then
     rm -rf src/deltachat/__pycache__
     export PYTHONDONTWRITEBYTECODE=1
 
-    # 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
-
-    tox --workdir "$TOXWORKDIR" -e lint,py27,py35,py36,py37,auditwheels
+    # run tox. The circle-ci project env-var-setting DCC_PY_LIVECONFIG 
+    # allows running of "liveconfig" tests but for speed reasons
+    # we run them only for the highest python version we support
+    
+    # we split out qr-tests run to minimize likelyness of flaky tests
+    # (some qr tests are pretty heavy in terms of send/received
+    # messages and rust's imap code likely has concurrency problems) 
+    tox --workdir "$TOXWORKDIR" -e py37 -- --reruns 3 -k "not qr"
+    tox --workdir "$TOXWORKDIR" -e py37 -- --reruns 3 -k "qr"
+    unset DCC_PY_LIVECONFIG
+    tox --workdir "$TOXWORKDIR" -p4 -e lint,py35,py36,doc
+    tox --workdir "$TOXWORKDIR" -e auditwheels
     popd
 fi
 
 
-if [ -n "$DOCS" ]; then
-    echo -----------------------
-    echo generating python docs
-    echo -----------------------
-    (cd python && tox --workdir "$TOXWORKDIR" -e doc)
-fi
+# if [ -n "$DOCS" ]; then
+#     echo -----------------------
+#     echo generating python docs
+#     echo -----------------------
+#     (cd python && tox --workdir "$TOXWORKDIR" -e doc)
+# fi

ci_scripts/remote_tests_python.sh

@@ -0,0 +1,46 @@
+#!/bin/bash 
+
+export BRANCH=${CIRCLE_BRANCH:?branch to build}
+export REPONAME=${CIRCLE_PROJECT_REPONAME:?repository name}
+export SSHTARGET=ci@b1.delta.chat
+
+# we construct the BUILDDIR such that we can easily share the
+# CARGO_TARGET_DIR between runs ("..")
+export BUILDDIR=ci_builds/$REPONAME/$BRANCH/${CIRCLE_JOB:?jobname}/${CIRCLE_BUILD_NUM:?circle-build-number}
+
+echo "--- Copying files to $SSHTARGET:$BUILDDIR"
+
+set -xe
+
+ssh -oBatchMode=yes -oStrictHostKeyChecking=no  $SSHTARGET mkdir -p "$BUILDDIR"
+git ls-files >.rsynclist 
+# we seem to need .git for setuptools_scm versioning 
+find .git >>.rsynclist
+rsync --delete --files-from=.rsynclist -az ./ "$SSHTARGET:$BUILDDIR"
+
+set +x
+
+echo "--- Running $CIRCLE_JOB remotely"
+
+ssh $SSHTARGET <<_HERE
+    set +x -e
+    cd $BUILDDIR
+    # let's share the target dir with our last run on this branch/job-type
+    # cargo will make sure to block/unblock us properly 
+    export CARGO_TARGET_DIR=\`pwd\`/../target
+    export TARGET=release
+    export DCC_PY_LIVECONFIG=$DCC_PY_LIVECONFIG
+
+    #we rely on tox/virtualenv being available in the host
+    #rm -rf virtualenv venv
+    #virtualenv -q -p python3.7 venv 
+    #source venv/bin/activate
+    #pip install -q tox virtualenv
+
+    set -x
+    which python
+    source \$HOME/venv/bin/activate
+    which python
+
+    bash ci_scripts/run-python-test.sh 
+_HERE

ci_scripts/remote_tests_rust.sh

@@ -0,0 +1,32 @@
+#!/bin/bash 
+
+export BRANCH=${CIRCLE_BRANCH:?branch to build}
+export REPONAME=${CIRCLE_PROJECT_REPONAME:?repository name}
+export SSHTARGET=ci@b1.delta.chat
+
+# we construct the BUILDDIR such that we can easily share the
+# CARGO_TARGET_DIR between runs ("..")
+export BUILDDIR=ci_builds/$REPONAME/$BRANCH/${CIRCLE_JOB:?jobname}/${CIRCLE_BUILD_NUM:?circle-build-number}
+
+set -e
+
+echo "--- Copying files to $SSHTARGET:$BUILDDIR"
+
+ssh -oBatchMode=yes -oStrictHostKeyChecking=no  $SSHTARGET mkdir -p "$BUILDDIR"
+git ls-files >.rsynclist 
+rsync --delete --files-from=.rsynclist -az ./ "$SSHTARGET:$BUILDDIR"
+
+echo "--- Running $CIRCLE_JOB remotely"
+
+ssh $SSHTARGET <<_HERE
+    set +x -e
+    cd $BUILDDIR
+    # let's share the target dir with our last run on this branch/job-type
+    # cargo will make sure to block/unblock us properly 
+    export CARGO_TARGET_DIR=\`pwd\`/../target
+    export TARGET=x86_64-unknown-linux-gnu
+    export RUSTC_WRAPPER=sccache
+
+    bash ci_scripts/run-rust-test.sh
+_HERE
+

ci_scripts/run-doxygen.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -ex
+
+cd deltachat-ffi 
+doxygen 
+

ci_scripts/run-python-test.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+#
+# Run functional tests for Delta Chat core using the python bindings 
+# and tox/pytest. 
+
+set -e -x
+
+# for core-building and python install step
+export DCC_RS_TARGET=release
+export DCC_RS_DEV=`pwd`
+
+cd python
+
+python install_python_bindings.py onlybuild
+
+# remove and inhibit writing PYC files 
+rm -rf tests/__pycache__
+rm -rf src/deltachat/__pycache__
+export PYTHONDONTWRITEBYTECODE=1
+
+# run python tests (tox invokes pytest to run tests in python/tests)
+#TOX_PARALLEL_NO_SPINNER=1 tox -e lint,doc
+tox -e lint
+tox -e doc,py37

ci_scripts/run-rust-test.sh

@@ -2,7 +2,7 @@
 
 set -ex
 
-export RUST_TEST_THREADS=1
+#export RUST_TEST_THREADS=1
 export RUST_BACKTRACE=1
 export RUSTFLAGS='--deny warnings'
 export OPT="--target=$TARGET"
@@ -31,16 +31,15 @@ fi
 if [[ $NORUN == "1" ]]; then
     export CARGO_SUBCMD="build"
 else
-    export CARGO_SUBCMD="test"
+    export CARGO_SUBCMD="test --all"
     export OPT="${OPT} "
     export OPT_RELEASE="${OPT_RELEASE} "
     export OPT_RELEASE_IGNORED="${OPT_RELEASE} -- --ignored"
 fi
 
-# Run all the test configurations:
+# Run all the test configurations 
+# RUSTC_WRAPPER=SCCACHE seems to destroy parallelism / prolong the test
+unset RUSTC_WRAPPER
 $CARGO_CMD $CARGO_SUBCMD $OPT
 $CARGO_CMD $CARGO_SUBCMD $OPT_RELEASE
 $CARGO_CMD $CARGO_SUBCMD $OPT_RELEASE_IGNORED
-
-# Build the ffi lib
-$CARGO_CMD $CARGO_SUBCMD $OPT_FFI_RELEASE

deltachat-ffi/Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "deltachat_ffi"
-version = "1.0.0-alpha.4"
+version = "1.0.0-beta.11"
 description = "Deltachat FFI"
-authors = ["dignifiedquire <dignifiedquire@gmail.com>"]
+authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2018"
 readme = "README.md"
 license = "MIT OR Apache-2.0"
@@ -16,9 +16,11 @@ crate-type = ["cdylib", "staticlib"]
 
 [dependencies]
 deltachat = { path = "../", default-features = false }
+deltachat-provider-database = "0.2.1"
 libc = "0.2"
 human-panic = "1.0.1"
 num-traits = "0.2.6"
+failure = "0.1.6"
 
 [features]
 default = ["vendored", "nightly", "ringbuf"]

deltachat-ffi/Doxyfile.css

@@ -0,0 +1,7 @@
+
+/* 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 +1,10 @@
 # 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-ffi/src/providers.rs

@@ -0,0 +1,93 @@
+extern crate deltachat_provider_database;
+
+use std::ptr;
+
+use crate::string::{to_string_lossy, StrExt};
+use deltachat_provider_database::StatusState;
+
+#[no_mangle]
+pub type dc_provider_t = deltachat_provider_database::Provider;
+
+#[no_mangle]
+pub unsafe extern "C" fn dc_provider_new_from_domain(
+    domain: *const libc::c_char,
+) -> *const dc_provider_t {
+    match deltachat_provider_database::get_provider_info(&to_string_lossy(domain)) {
+        Some(provider) => provider,
+        None => ptr::null(),
+    }
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn dc_provider_new_from_email(
+    email: *const libc::c_char,
+) -> *const dc_provider_t {
+    let email = to_string_lossy(email);
+    let domain = deltachat_provider_database::get_domain_from_email(&email);
+    match deltachat_provider_database::get_provider_info(domain) {
+        Some(provider) => provider,
+        None => ptr::null(),
+    }
+}
+
+macro_rules! null_guard {
+    ($context:tt) => {
+        if $context.is_null() {
+            return ptr::null_mut() as *mut libc::c_char;
+        }
+    };
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn dc_provider_get_overview_page(
+    provider: *const dc_provider_t,
+) -> *mut libc::c_char {
+    null_guard!(provider);
+    format!(
+        "{}/{}",
+        deltachat_provider_database::PROVIDER_OVERVIEW_URL,
+        (*provider).overview_page
+    )
+    .strdup()
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn dc_provider_get_name(provider: *const dc_provider_t) -> *mut libc::c_char {
+    null_guard!(provider);
+    (*provider).name.strdup()
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn dc_provider_get_markdown(
+    provider: *const dc_provider_t,
+) -> *mut libc::c_char {
+    null_guard!(provider);
+    (*provider).markdown.strdup()
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn dc_provider_get_status_date(
+    provider: *const dc_provider_t,
+) -> *mut libc::c_char {
+    null_guard!(provider);
+    (*provider).status.date.strdup()
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn dc_provider_get_status(provider: *const dc_provider_t) -> u32 {
+    if provider.is_null() {
+        return 0;
+    }
+    match (*provider).status.state {
+        StatusState::OK => 1,
+        StatusState::PREPARATION => 2,
+        StatusState::BROKEN => 3,
+    }
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn dc_provider_unref(_provider: *const dc_provider_t) {
+    ()
+}
+
+// TODO expose general provider overview url?

deltachat-ffi/src/string.rs

@@ -0,0 +1,350 @@
+use failure::Fail;
+use std::ffi::{CStr, CString};
+
+/// Duplicates a string
+///
+/// returns an empty string if NULL is given, never returns NULL (exits on errors)
+///
+/// # Examples
+///
+/// ```rust,norun
+/// use deltachat::dc_tools::{dc_strdup, to_string_lossy};
+/// unsafe {
+///     let str_a = b"foobar\x00" as *const u8 as *const libc::c_char;
+///     let str_a_copy = dc_strdup(str_a);
+///     assert_eq!(to_string_lossy(str_a_copy), "foobar");
+///     assert_ne!(str_a, str_a_copy);
+/// }
+/// ```
+pub unsafe fn dc_strdup(s: *const libc::c_char) -> *mut libc::c_char {
+    let ret: *mut libc::c_char;
+    if !s.is_null() {
+        ret = libc::strdup(s);
+        assert!(!ret.is_null());
+    } else {
+        ret = libc::calloc(1, 1) as *mut libc::c_char;
+        assert!(!ret.is_null());
+    }
+
+    ret
+}
+
+/// Error type for the [OsStrExt] trait
+#[derive(Debug, Fail, PartialEq)]
+pub enum CStringError {
+    /// The string contains an interior null byte
+    #[fail(display = "String contains an interior null byte")]
+    InteriorNullByte,
+    /// The string is not valid Unicode
+    #[fail(display = "String is not valid unicode")]
+    NotUnicode,
+}
+
+/// Extra convenience methods on [std::ffi::OsStr] to work with `*libc::c_char`.
+///
+/// The primary function of this trait is to more easily convert
+/// [OsStr], [OsString] or [Path] into pointers to C strings.  This always
+/// allocates a new string since it is very common for the source
+/// string not to have the required terminal null byte.
+///
+/// It is implemented for `AsRef<std::ffi::OsStr>>` trait, which
+/// allows any type which implements this trait to transparently use
+/// this.  This is how the conversion for [Path] works.
+///
+/// [OsStr]: std::ffi::OsStr
+/// [OsString]: std::ffi::OsString
+/// [Path]: std::path::Path
+///
+/// # Example
+///
+/// ```
+/// use deltachat::dc_tools::{dc_strdup, OsStrExt};
+/// let path = std::path::Path::new("/some/path");
+/// let path_c = path.to_c_string().unwrap();
+/// unsafe {
+///     let mut c_ptr: *mut libc::c_char = dc_strdup(path_c.as_ptr());
+/// }
+/// ```
+pub trait OsStrExt {
+    /// Convert a  [std::ffi::OsStr] to an [std::ffi::CString]
+    ///
+    /// This is useful to convert e.g. a [std::path::Path] to
+    /// [*libc::c_char] by using
+    /// [Path::as_os_str()](std::path::Path::as_os_str) and
+    /// [CStr::as_ptr()](std::ffi::CStr::as_ptr).
+    ///
+    /// This returns [CString] and not [&CStr] because not all [OsStr]
+    /// slices end with a null byte, particularly those coming from
+    /// [Path] do not have a null byte and having to handle this as
+    /// the caller would defeat the point of this function.
+    ///
+    /// On Windows this requires that the [OsStr] contains valid
+    /// unicode, which should normally be the case for a [Path].
+    ///
+    /// [CString]: std::ffi::CString
+    /// [CStr]: std::ffi::CStr
+    /// [OsStr]: std::ffi::OsStr
+    /// [Path]: std::path::Path
+    ///
+    /// # Errors
+    ///
+    /// Since a C `*char` is terminated by a NULL byte this conversion
+    /// will fail, when the [OsStr] has an interior null byte.  The
+    /// function will return
+    /// `[Err]([CStringError::InteriorNullByte])`.  When converting
+    /// from a [Path] it should be safe to
+    /// [`.unwrap()`](std::result::Result::unwrap) this anyway since a
+    /// [Path] should not contain interior null bytes.
+    ///
+    /// On windows when the string contains invalid Unicode
+    /// `[Err]([CStringError::NotUnicode])` is returned.
+    fn to_c_string(&self) -> Result<CString, CStringError>;
+}
+
+impl<T: AsRef<std::ffi::OsStr>> OsStrExt for T {
+    #[cfg(not(target_os = "windows"))]
+    fn to_c_string(&self) -> Result<CString, CStringError> {
+        use std::os::unix::ffi::OsStrExt;
+        CString::new(self.as_ref().as_bytes()).map_err(|err| match err {
+            std::ffi::NulError { .. } => CStringError::InteriorNullByte,
+        })
+    }
+
+    #[cfg(target_os = "windows")]
+    fn to_c_string(&self) -> Result<CString, CStringError> {
+        os_str_to_c_string_unicode(&self)
+    }
+}
+
+// Implementation for os_str_to_c_string on windows.
+#[allow(dead_code)]
+fn os_str_to_c_string_unicode(
+    os_str: &dyn AsRef<std::ffi::OsStr>,
+) -> Result<CString, CStringError> {
+    match os_str.as_ref().to_str() {
+        Some(val) => CString::new(val.as_bytes()).map_err(|err| match err {
+            std::ffi::NulError { .. } => CStringError::InteriorNullByte,
+        }),
+        None => Err(CStringError::NotUnicode),
+    }
+}
+
+/// Convenience methods/associated functions for working with [CString]
+///
+/// This is helps transitioning from unsafe code.
+pub trait CStringExt {
+    /// Create a new [CString], yolo style
+    ///
+    /// This unwrap the result, panicking when there are embedded NULL
+    /// bytes.
+    fn yolo<T: Into<Vec<u8>>>(t: T) -> CString {
+        CString::new(t).expect("String contains null byte, can not be CString")
+    }
+}
+
+impl CStringExt for CString {}
+
+/// Convenience methods to make transitioning from raw C strings easier.
+///
+/// To interact with (legacy) C APIs we often need to convert from
+/// Rust strings to raw C strings.  This can be clumsy to do correctly
+/// and the compiler sometimes allows it in an unsafe way.  These
+/// methods make it more succinct and help you get it right.
+pub trait StrExt {
+    /// Allocate a new raw C `*char` version of this string.
+    ///
+    /// This allocates a new raw C string which must be freed using
+    /// `free`.  It takes care of some common pitfalls with using
+    /// [CString.as_ptr].
+    ///
+    /// [CString.as_ptr]: std::ffi::CString.as_ptr
+    ///
+    /// # Panics
+    ///
+    /// This function will panic when the original string contains an
+    /// interior null byte as this can not be represented in raw C
+    /// strings.
+    unsafe fn strdup(&self) -> *mut libc::c_char;
+}
+
+impl<T: AsRef<str>> StrExt for T {
+    unsafe fn strdup(&self) -> *mut libc::c_char {
+        let tmp = CString::yolo(self.as_ref());
+        dc_strdup(tmp.as_ptr())
+    }
+}
+
+pub fn to_string_lossy(s: *const libc::c_char) -> String {
+    if s.is_null() {
+        return "".into();
+    }
+
+    let cstr = unsafe { CStr::from_ptr(s) };
+
+    cstr.to_string_lossy().to_string()
+}
+
+pub fn to_opt_string_lossy(s: *const libc::c_char) -> Option<String> {
+    if s.is_null() {
+        return None;
+    }
+
+    Some(to_string_lossy(s))
+}
+
+/// Convert a C `*char` pointer to a [std::path::Path] slice.
+///
+/// This converts a `*libc::c_char` pointer to a [Path] slice.  This
+/// essentially has to convert the pointer to [std::ffi::OsStr] to do
+/// so and thus is the inverse of [OsStrExt::to_c_string].  Just like
+/// [OsStrExt::to_c_string] requires valid Unicode on Windows, this
+/// requires that the pointer contains valid UTF-8 on Windows.
+///
+/// Because this returns a reference the [Path] silce can not outlive
+/// the original pointer.
+///
+/// [Path]: std::path::Path
+#[cfg(not(target_os = "windows"))]
+pub fn as_path<'a>(s: *const libc::c_char) -> &'a std::path::Path {
+    assert!(!s.is_null(), "cannot be used on null pointers");
+    use std::os::unix::ffi::OsStrExt;
+    unsafe {
+        let c_str = std::ffi::CStr::from_ptr(s).to_bytes();
+        let os_str = std::ffi::OsStr::from_bytes(c_str);
+        std::path::Path::new(os_str)
+    }
+}
+
+// as_path() implementation for windows, documented above.
+#[cfg(target_os = "windows")]
+pub fn as_path<'a>(s: *const libc::c_char) -> &'a std::path::Path {
+    as_path_unicode(s)
+}
+
+// Implementation for as_path() on Windows.
+//
+// Having this as a separate function means it can be tested on unix
+// too.
+#[allow(dead_code)]
+fn as_path_unicode<'a>(s: *const libc::c_char) -> &'a std::path::Path {
+    assert!(!s.is_null(), "cannot be used on null pointers");
+
+    let cstr = unsafe { CStr::from_ptr(s) };
+    let str = cstr.to_str().unwrap_or_else(|err| panic!("{}", err));
+
+    std::path::Path::new(str)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use libc::{free, strcmp};
+
+    #[test]
+    fn test_os_str_to_c_string_cwd() {
+        let some_dir = std::env::current_dir().unwrap();
+        some_dir.as_os_str().to_c_string().unwrap();
+    }
+
+    #[test]
+    fn test_os_str_to_c_string_unicode() {
+        let some_str = String::from("/some/valid/utf8");
+        let some_dir = std::path::Path::new(&some_str);
+        assert_eq!(
+            some_dir.as_os_str().to_c_string().unwrap(),
+            CString::new("/some/valid/utf8").unwrap()
+        );
+    }
+
+    #[test]
+    fn test_os_str_to_c_string_nul() {
+        let some_str = std::ffi::OsString::from("foo\x00bar");
+        assert_eq!(
+            some_str.to_c_string().err().unwrap(),
+            CStringError::InteriorNullByte
+        )
+    }
+
+    #[test]
+    fn test_path_to_c_string_cwd() {
+        let some_dir = std::env::current_dir().unwrap();
+        some_dir.to_c_string().unwrap();
+    }
+
+    #[test]
+    fn test_path_to_c_string_unicode() {
+        let some_str = String::from("/some/valid/utf8");
+        let some_dir = std::path::Path::new(&some_str);
+        assert_eq!(
+            some_dir.as_os_str().to_c_string().unwrap(),
+            CString::new("/some/valid/utf8").unwrap()
+        );
+    }
+
+    #[test]
+    fn test_os_str_to_c_string_unicode_fn() {
+        let some_str = std::ffi::OsString::from("foo");
+        assert_eq!(
+            os_str_to_c_string_unicode(&some_str).unwrap(),
+            CString::new("foo").unwrap()
+        );
+    }
+
+    #[test]
+    fn test_path_to_c_string_unicode_fn() {
+        let some_str = String::from("/some/path");
+        let some_path = std::path::Path::new(&some_str);
+        assert_eq!(
+            os_str_to_c_string_unicode(&some_path).unwrap(),
+            CString::new("/some/path").unwrap()
+        );
+    }
+
+    #[test]
+    fn test_os_str_to_c_string_unicode_fn_nul() {
+        let some_str = std::ffi::OsString::from("fooz\x00bar");
+        assert_eq!(
+            os_str_to_c_string_unicode(&some_str).err().unwrap(),
+            CStringError::InteriorNullByte
+        );
+    }
+
+    #[test]
+    fn test_as_path() {
+        let some_path = CString::new("/some/path").unwrap();
+        let ptr = some_path.as_ptr();
+        assert_eq!(as_path(ptr), std::ffi::OsString::from("/some/path"))
+    }
+
+    #[test]
+    fn test_as_path_unicode_fn() {
+        let some_path = CString::new("/some/path").unwrap();
+        let ptr = some_path.as_ptr();
+        assert_eq!(as_path_unicode(ptr), std::ffi::OsString::from("/some/path"));
+    }
+
+    #[test]
+    fn test_cstring_yolo() {
+        assert_eq!(CString::new("hello").unwrap(), CString::yolo("hello"));
+    }
+
+    #[test]
+    fn test_strdup_str() {
+        unsafe {
+            let s = "hello".strdup();
+            let cmp = strcmp(s, b"hello\x00" as *const u8 as *const libc::c_char);
+            free(s as *mut libc::c_void);
+            assert_eq!(cmp, 0);
+        }
+    }
+
+    #[test]
+    fn test_strdup_string() {
+        unsafe {
+            let s = String::from("hello").strdup();
+            let cmp = strcmp(s, b"hello\x00" as *const u8 as *const libc::c_char);
+            free(s as *mut libc::c_void);
+            assert_eq!(cmp, 0);
+        }
+    }
+}

deltachat_derive/src/lib.rs

@@ -36,7 +36,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)?;
-                num_traits::FromPrimitive::from_i64(inner).ok_or(rusqlite::types::FromSqlError::InvalidType)
+                Ok(num_traits::FromPrimitive::from_i64(inner).unwrap_or_default())
             }
         }
     };

examples/repl/cmdline.rs

@@ -1,36 +1,33 @@
-use std::ffi::CString;
+use std::path::Path;
 use std::str::FromStr;
 
 use deltachat::chat::{self, Chat};
 use deltachat::chatlist::*;
 use deltachat::config;
-use deltachat::configure::*;
 use deltachat::constants::*;
 use deltachat::contact::*;
 use deltachat::context::*;
-use deltachat::dc_imex::*;
-use deltachat::dc_location::*;
 use deltachat::dc_receive_imf::*;
 use deltachat::dc_tools::*;
 use deltachat::error::Error;
+use deltachat::imex::*;
 use deltachat::job::*;
+use deltachat::location;
 use deltachat::lot::LotState;
-use deltachat::message::*;
+use deltachat::message::{self, Message, MessageState, MsgId};
 use deltachat::peerstate::*;
 use deltachat::qr::*;
 use deltachat::sql;
-use deltachat::types::*;
-use deltachat::x::*;
-use num_traits::FromPrimitive;
+use deltachat::Event;
 
 /// Reset database tables. This function is called from Core cmdline.
 /// Argument is a bitmask, executing single or multiple actions in one call.
 /// e.g. bitmask 7 triggers actions definded with bits 1, 2 and 4.
-pub unsafe fn dc_reset_tables(context: &Context, bits: i32) -> i32 {
-    info!(context, 0, "Resetting tables ({})...", bits);
+pub fn dc_reset_tables(context: &Context, bits: i32) -> i32 {
+    info!(context, "Resetting tables ({})...", bits);
     if 0 != bits & 1 {
         sql::execute(context, &context.sql, "DELETE FROM jobs;", params![]).unwrap();
-        info!(context, 0, "(1) Jobs reset.");
+        info!(context, "(1) Jobs reset.");
     }
     if 0 != bits & 2 {
         sql::execute(
@@ -40,11 +37,11 @@ pub unsafe fn dc_reset_tables(context: &Context, bits: i32) -> i32 {
             params![],
         )
         .unwrap();
-        info!(context, 0, "(2) Peerstates reset.");
+        info!(context, "(2) Peerstates reset.");
     }
     if 0 != bits & 4 {
         sql::execute(context, &context.sql, "DELETE FROM keypairs;", params![]).unwrap();
-        info!(context, 0, "(4) Private keypairs reset.");
+        info!(context, "(4) Private keypairs reset.");
     }
     if 0 != bits & 8 {
         sql::execute(
@@ -83,217 +80,177 @@ pub unsafe fn dc_reset_tables(context: &Context, bits: i32) -> i32 {
         )
         .unwrap();
         sql::execute(context, &context.sql, "DELETE FROM leftgrps;", params![]).unwrap();
-        info!(context, 0, "(8) Rest but server config reset.");
+        info!(context, "(8) Rest but server config reset.");
     }
 
-    context.call_cb(Event::MSGS_CHANGED, 0, 0);
+    context.call_cb(Event::MsgsChanged {
+        chat_id: 0,
+        msg_id: MsgId::new(0),
+    });
 
     1
 }
 
-unsafe fn dc_poke_eml_file(context: &Context, filename: *const libc::c_char) -> libc::c_int {
-    /* mainly for testing, may be called by dc_import_spec() */
-    let mut success: libc::c_int = 0i32;
-    let mut data: *mut libc::c_char = 0 as *mut libc::c_char;
-    let mut data_bytes: size_t = 0;
-    if !(dc_read_file(
-        context,
-        filename,
-        &mut data as *mut *mut libc::c_char as *mut *mut libc::c_void,
-        &mut data_bytes,
-    ) == 0i32)
-    {
-        dc_receive_imf(context, data, data_bytes, "import", 0, 0);
-        success = 1;
-    }
-    free(data as *mut libc::c_void);
+fn dc_poke_eml_file(context: &Context, filename: impl AsRef<Path>) -> Result<(), Error> {
+    let data = dc_read_file(context, filename)?;
 
-    success
+    dc_receive_imf(context, &data, "import", 0, 0);
+    Ok(())
 }
 
 /// Import a file to the database.
 /// For testing, import a folder with eml-files, a single eml-file, e-mail plus public key and so on.
-/// For normal importing, use dc_imex().
+/// For normal importing, use imex().
 ///
 /// @private @memberof Context
 /// @param context The context as created by dc_context_new().
 /// @param spec The file or directory to import. NULL for the last command.
 /// @return 1=success, 0=error.
-unsafe fn poke_spec(context: &Context, spec: *const libc::c_char) -> libc::c_int {
+fn poke_spec(context: &Context, spec: Option<&str>) -> libc::c_int {
     if !context.sql.is_open() {
-        error!(context, 0, "Import: Database not opened.");
+        error!(context, "Import: Database not opened.");
         return 0;
     }
 
-    let ok_to_continue;
-    let mut success: libc::c_int = 0;
-    let real_spec: *mut libc::c_char;
-    let mut suffix: *mut libc::c_char = 0 as *mut libc::c_char;
-    let mut read_cnt: libc::c_int = 0;
+    let mut read_cnt = 0;
+
+    let real_spec: String;
 
     /* if `spec` is given, remember it for later usage; if it is not given, try to use the last one */
-    if !spec.is_null() {
-        real_spec = dc_strdup(spec);
+    if let Some(spec) = spec {
+        real_spec = spec.to_string();
         context
             .sql
-            .set_config(context, "import_spec", Some(as_str(real_spec)))
+            .set_raw_config(context, "import_spec", Some(&real_spec))
             .unwrap();
-        ok_to_continue = true;
     } else {
-        let rs = context.sql.get_config(context, "import_spec");
+        let rs = context.sql.get_raw_config(context, "import_spec");
         if rs.is_none() {
-            error!(context, 0, "Import: No file or folder given.");
-            ok_to_continue = false;
-        } else {
-            ok_to_continue = true;
+            error!(context, "Import: No file or folder given.");
+            return 0;
         }
-        real_spec = rs.unwrap_or_default().strdup();
+        real_spec = rs.unwrap();
     }
-    if ok_to_continue {
-        let ok_to_continue2;
-        suffix = dc_get_filesuffix_lc(as_str(real_spec));
-        if !suffix.is_null() && strcmp(suffix, b"eml\x00" as *const u8 as *const libc::c_char) == 0
-        {
-            if 0 != dc_poke_eml_file(context, real_spec) {
-                read_cnt += 1
-            }
-            ok_to_continue2 = true;
+    if let Some(suffix) = dc_get_filesuffix_lc(&real_spec) {
+        if suffix == "eml" && dc_poke_eml_file(context, &real_spec).is_ok() {
+            read_cnt += 1
+        }
+    } else {
+        /* import a directory */
+        let dir_name = std::path::Path::new(&real_spec);
+        let dir = std::fs::read_dir(dir_name);
+        if dir.is_err() {
+            error!(context, "Import: Cannot open directory \"{}\".", &real_spec,);
+            return 0;
         } else {
-            /* import a directory */
-            let dir_name = std::path::Path::new(as_str(real_spec));
-            let dir = std::fs::read_dir(dir_name);
-            if dir.is_err() {
-                error!(
-                    context,
-                    0,
-                    "Import: Cannot open directory \"{}\".",
-                    as_str(real_spec),
-                );
-                ok_to_continue2 = false;
-            } else {
-                let dir = dir.unwrap();
-                for entry in dir {
-                    if entry.is_err() {
-                        break;
-                    }
-                    let entry = entry.unwrap();
-                    let name_f = entry.file_name();
-                    let name = name_f.to_string_lossy();
-                    if name.ends_with(".eml") {
-                        let path_plus_name = format!("{}/{}", as_str(real_spec), name);
-                        info!(context, 0, "Import: {}", path_plus_name);
-                        let path_plus_name_c = CString::yolo(path_plus_name);
-                        if 0 != dc_poke_eml_file(context, path_plus_name_c.as_ptr()) {
-                            read_cnt += 1
-                        }
+            let dir = dir.unwrap();
+            for entry in dir {
+                if entry.is_err() {
+                    break;
+                }
+                let entry = entry.unwrap();
+                let name_f = entry.file_name();
+                let name = name_f.to_string_lossy();
+                if name.ends_with(".eml") {
+                    let path_plus_name = format!("{}/{}", &real_spec, name);
+                    info!(context, "Import: {}", path_plus_name);
+                    if dc_poke_eml_file(context, path_plus_name).is_ok() {
+                        read_cnt += 1
                     }
                 }
-                ok_to_continue2 = true;
             }
         }
-        if ok_to_continue2 {
-            info!(
-                context,
-                0,
-                "Import: {} items read from \"{}\".",
-                read_cnt,
-                as_str(real_spec)
-            );
-            if read_cnt > 0 {
-                context.call_cb(Event::MSGS_CHANGED, 0 as uintptr_t, 0 as uintptr_t);
-            }
-            success = 1
-        }
     }
-
-    free(real_spec as *mut libc::c_void);
-    free(suffix as *mut libc::c_void);
-    success
+    info!(
+        context,
+        "Import: {} items read from \"{}\".", read_cnt, &real_spec
+    );
+    if read_cnt > 0 {
+        context.call_cb(Event::MsgsChanged {
+            chat_id: 0,
+            msg_id: MsgId::new(0),
+        });
+    }
+    1
 }
 
-unsafe fn log_msg(context: &Context, prefix: impl AsRef<str>, msg: &Message) {
-    let contact = Contact::get_by_id(context, dc_msg_get_from_id(msg)).expect("invalid contact");
+fn log_msg(context: &Context, prefix: impl AsRef<str>, msg: &Message) {
+    let contact = Contact::get_by_id(context, msg.get_from_id()).expect("invalid contact");
     let contact_name = contact.get_name();
     let contact_id = contact.get_id();
 
-    let statestr = match dc_msg_get_state(msg) {
+    let statestr = match msg.get_state() {
         MessageState::OutPending => " o",
         MessageState::OutDelivered => " √",
         MessageState::OutMdnRcvd => " √√",
         MessageState::OutFailed => " !!",
         _ => "",
     };
-    let temp2 = dc_timestamp_to_str(dc_msg_get_timestamp(msg));
-    let msgtext = dc_msg_get_text(msg);
+    let temp2 = dc_timestamp_to_str(msg.get_timestamp());
+    let msgtext = msg.get_text();
     info!(
         context,
-        0,
-        "{}#{}{}{}: {} (Contact#{}): {} {}{}{}{} [{}]",
+        "{}{}{}{}: {} (Contact#{}): {} {}{}{}{}{} [{}]",
         prefix.as_ref(),
-        dc_msg_get_id(msg) as libc::c_int,
-        if 0 != dc_msg_get_showpadlock(msg) {
-            "🔒"
-        } else {
-            ""
-        },
-        if dc_msg_has_location(msg) { "📍" } else { "" },
+        msg.get_id(),
+        if msg.get_showpadlock() { "🔒" } else { "" },
+        if msg.has_location() { "📍" } else { "" },
         &contact_name,
         contact_id,
-        as_str(msgtext),
-        if dc_msg_is_starred(msg) { "★" } else { "" },
-        if dc_msg_get_from_id(msg) == 1 as libc::c_uint {
+        msgtext.unwrap_or_default(),
+        if msg.is_starred() { "★" } else { "" },
+        if msg.get_from_id() == 1 as libc::c_uint {
             ""
-        } else if dc_msg_get_state(msg) == MessageState::InSeen {
+        } else if msg.get_state() == MessageState::InSeen {
             "[SEEN]"
-        } else if dc_msg_get_state(msg) == MessageState::InNoticed {
+        } else if msg.get_state() == MessageState::InNoticed {
             "[NOTICED]"
         } else {
             "[FRESH]"
         },
-        if 0 != dc_msg_is_info(msg) {
-            "[INFO]"
+        if msg.is_info() { "[INFO]" } else { "" },
+        if msg.is_forwarded() {
+            "[FORWARDED]"
         } else {
             ""
         },
         statestr,
         &temp2,
     );
-    free(msgtext as *mut libc::c_void);
 }
 
-unsafe fn log_msglist(context: &Context, msglist: &Vec<u32>) -> Result<(), Error> {
+fn log_msglist(context: &Context, msglist: &Vec<MsgId>) -> Result<(), Error> {
     let mut lines_out = 0;
     for &msg_id in msglist {
-        if msg_id == 9 as libc::c_uint {
+        if msg_id.is_daymarker() {
             info!(
                 context,
-                0,
                 "--------------------------------------------------------------------------------"
             );
 
             lines_out += 1
-        } else if msg_id > 0 {
+        } else if !msg_id.is_special() {
             if lines_out == 0 {
                 info!(
-                    context, 0,
+                    context,
                     "--------------------------------------------------------------------------------",
                 );
                 lines_out += 1
             }
-            let msg = dc_get_msg(context, msg_id)?;
-            log_msg(context, "Msg", &msg);
+            let msg = Message::load_from_db(context, msg_id)?;
+            log_msg(context, "", &msg);
         }
     }
     if lines_out > 0 {
         info!(
             context,
-            0, "--------------------------------------------------------------------------------"
+            "--------------------------------------------------------------------------------"
         );
     }
     Ok(())
 }
 
-unsafe fn log_contactlist(context: &Context, contacts: &Vec<u32>) {
+fn log_contactlist(context: &Context, contacts: &Vec<u32>) {
     let mut contacts = contacts.clone();
     if !contacts.contains(&1) {
         contacts.push(1);
@@ -304,7 +261,7 @@ unsafe fn log_contactlist(context: &Context, contacts: &Vec<u32>) {
         if let Ok(contact) = Contact::get_by_id(context, contact_id) {
             let name = contact.get_name();
             let addr = contact.get_addr();
-            let verified_state = contact.is_verified();
+            let verified_state = contact.is_verified(context);
             let verified_str = if VerifiedStatus::Unverified != verified_state {
                 if verified_state == VerifiedStatus::BidirectVerified {
                     " √√"
@@ -336,22 +293,16 @@ unsafe fn log_contactlist(context: &Context, contacts: &Vec<u32>) {
                 );
             }
 
-            info!(context, 0, "Contact#{}: {}{}", contact_id, line, line2);
+            info!(context, "Contact#{}: {}{}", contact_id, line, line2);
         }
     }
 }
 
-static mut S_IS_AUTH: libc::c_int = 0;
-
-pub unsafe fn dc_cmdline_skip_auth() {
-    S_IS_AUTH = 1;
-}
-
 fn chat_prefix(chat: &Chat) -> &'static str {
     chat.typ.into()
 }
 
-pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {
+pub fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::Error> {
     let chat_id = *context.cmdline_sel_chat_id.read().unwrap();
     let mut sel_chat = if chat_id > 0 {
         Chat::load_from_db(context, chat_id).ok()
@@ -362,18 +313,9 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
     let mut args = line.splitn(3, ' ');
     let arg0 = args.next().unwrap_or_default();
     let arg1 = args.next().unwrap_or_default();
-    let arg1_c = if arg1.is_empty() {
-        std::ptr::null()
-    } else {
-        arg1.strdup() as *const _
-    };
     let arg2 = args.next().unwrap_or_default();
-    let arg2_c = if arg2.is_empty() {
-        std::ptr::null()
-    } else {
-        arg2.strdup() as *const _
-    };
 
+    let blobdir = context.get_blobdir();
     match arg0 {
         "help" | "?" => match arg1 {
             // TODO: reuse commands definition in main.rs.
@@ -404,6 +346,7 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
                  configure\n\
                  connect\n\
                  disconnect\n\
+                 interrupt\n\
                  maybenetwork\n\
                  housekeeping\n\
                  help imex (Import/Export)\n\
@@ -427,8 +370,9 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
                  send <text>\n\
                  send-garbage\n\
                  sendimage <file> [<text>]\n\
-                 sendfile <file>\n\
+                 sendfile <file> [<text>]\n\
                  draft [<text>]\n\
+                 devicemsg <text>\n\
                  listmedia\n\
                  archive <chat-id>\n\
                  unarchive <chat-id>\n\
@@ -455,59 +399,32 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
                  checkqr <qr-content>\n\
                  event <event-id to test>\n\
                  fileinfo <file>\n\
+                 emptyserver <flags> (1=MVBOX 2=INBOX)\n\
                  clear -- clear screen\n\
                  exit or quit\n\
                  ============================================="
             ),
         },
-        "auth" => {
-            if 0 == S_IS_AUTH {
-                let is_pw = context
-                    .get_config(config::Config::MailPw)
-                    .unwrap_or_default();
-                if arg1 == is_pw {
-                    S_IS_AUTH = 1;
-                } else {
-                    println!("Bad password.");
-                }
-            } else {
-                println!("Already authorized.");
-            }
-        }
-        "open" => {
-            ensure!(!arg1.is_empty(), "Argument <file> missing");
-            dc_close(context);
-            ensure!(dc_open(context, arg1, None), "Open failed");
-        }
-        "close" => {
-            dc_close(context);
-        }
-        "initiate-key-transfer" => {
-            let setup_code = dc_initiate_key_transfer(context);
-            if !setup_code.is_null() {
-                println!(
-                    "Setup code for the transferred setup message: {}",
-                    as_str(setup_code),
-                );
-                free(setup_code as *mut libc::c_void);
-            } else {
-                bail!("Failed to generate setup code");
-            };
-        }
+        "initiate-key-transfer" => match initiate_key_transfer(context) {
+            Ok(setup_code) => println!(
+                "Setup code for the transferred setup message: {}",
+                setup_code,
+            ),
+            Err(err) => bail!("Failed to generate setup code: {}", err),
+        },
         "get-setupcodebegin" => {
             ensure!(!arg1.is_empty(), "Argument <msg-id> missing.");
-            let msg_id: u32 = arg1.parse()?;
-            let msg = dc_get_msg(context, msg_id)?;
-            if dc_msg_is_setupmessage(&msg) {
-                let setupcodebegin = dc_msg_get_setupcodebegin(&msg);
+            let msg_id: MsgId = MsgId::new(arg1.parse()?);
+            let msg = Message::load_from_db(context, msg_id)?;
+            if msg.is_setupmessage() {
+                let setupcodebegin = msg.get_setupcodebegin(context);
                 println!(
-                    "The setup code for setup message Msg#{} starts with: {}",
+                    "The setup code for setup message {} starts with: {}",
                     msg_id,
-                    as_str(setupcodebegin),
+                    setupcodebegin.unwrap_or_default(),
                 );
-                free(setupcodebegin as *mut libc::c_void);
             } else {
-                bail!("Msg#{} is no setup message.", msg_id,);
+                bail!("{} is no setup message.", msg_id,);
             }
         }
         "continue-key-transfer" => {
@@ -515,46 +432,37 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
                 !arg1.is_empty() && !arg2.is_empty(),
                 "Arguments <msg-id> <setup-code> expected"
             );
-            if 0 == dc_continue_key_transfer(context, arg1.parse()?, arg2_c) {
-                bail!("Continue key transfer failed");
-            }
+            continue_key_transfer(context, MsgId::new(arg1.parse()?), &arg2)?;
         }
         "has-backup" => {
-            let ret = dc_imex_has_backup(context, context.get_blobdir());
-            if ret.is_null() {
-                println!("No backup found.");
-            }
+            has_backup(context, blobdir)?;
         }
         "export-backup" => {
-            dc_imex(context, 11, context.get_blobdir(), 0 as *const libc::c_char);
+            imex(context, ImexMode::ExportBackup, Some(blobdir));
         }
         "import-backup" => {
             ensure!(!arg1.is_empty(), "Argument <backup-file> missing.");
-            dc_imex(context, 12, arg1_c, 0 as *const libc::c_char);
+            imex(context, ImexMode::ImportBackup, Some(arg1));
         }
         "export-keys" => {
-            dc_imex(context, 1, context.get_blobdir(), 0 as *const libc::c_char);
+            imex(context, ImexMode::ExportSelfKeys, Some(blobdir));
         }
         "import-keys" => {
-            dc_imex(context, 2, context.get_blobdir(), 0 as *const libc::c_char);
+            imex(context, ImexMode::ImportSelfKeys, Some(blobdir));
         }
         "export-setup" => {
-            let setup_code = dc_create_setup_code(context);
-            let file_name: *mut libc::c_char = dc_mprintf(
-                b"%s/autocrypt-setup-message.html\x00" as *const u8 as *const libc::c_char,
-                context.get_blobdir(),
-            );
-            let file_content = dc_render_setup_file(context, &setup_code)?;
-            std::fs::write(as_str(file_name), file_content)?;
+            let setup_code = create_setup_code(context);
+            let file_name = blobdir.join("autocrypt-setup-message.html");
+            let file_content = render_setup_file(context, &setup_code)?;
+            std::fs::write(&file_name, file_content)?;
             println!(
                 "Setup message written to: {}\nSetup code: {}",
-                as_str(file_name),
+                file_name.display(),
                 &setup_code,
             );
-            free(file_name as *mut libc::c_void);
         }
         "poke" => {
-            ensure!(0 != poke_spec(context, arg1_c), "Poke failed");
+            ensure!(0 != poke_spec(context, Some(arg1)), "Poke failed");
         }
         "reset" => {
             ensure!(!arg1.is_empty(), "Argument <bits> missing: 1=jobs, 2=peerstates, 4=private keys, 8=rest but server config");
@@ -563,7 +471,7 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
             ensure!(0 != dc_reset_tables(context, bits), "Reset failed");
         }
         "stop" => {
-            dc_stop_ongoing_process(context);
+            context.stop_ongoing();
         }
         "set" => {
             ensure!(!arg1.is_empty(), "Argument <key> missing.");
@@ -578,7 +486,10 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
             println!("{}={:?}", key, val);
         }
         "info" => {
-            println!("{}", to_string(dc_get_info(context)));
+            println!("{:#?}", context.get_info());
+        }
+        "interrupt" => {
+            interrupt_inbox_idle(context, true);
         }
         "maybenetwork" => {
             maybe_network(context);
@@ -598,25 +509,21 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
             let cnt = chatlist.len();
             if cnt > 0 {
                 info!(
-                    context, 0,
+                    context,
                     "================================================================================"
                 );
 
                 for i in (0..cnt).rev() {
                     let chat = Chat::load_from_db(context, chatlist.get_chat_id(i))?;
-                    let temp_subtitle = chat.get_subtitle();
-                    let temp_name = chat.get_name();
                     info!(
                         context,
-                        0,
-                        "{}#{}: {} [{}] [{} fresh]",
+                        "{}#{}: {} [{} fresh]",
                         chat_prefix(&chat),
                         chat.get_id(),
-                        temp_name,
-                        temp_subtitle,
+                        chat.get_name(),
                         chat::get_fresh_msg_cnt(context, chat.get_id()),
                     );
-                    let lot = chatlist.get_summary(i, Some(&chat));
+                    let lot = chatlist.get_summary(context, i, Some(&chat));
                     let statestr = if chat.is_archived() {
                         " [Archived]"
                     } else {
@@ -633,7 +540,6 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
                     let text2 = lot.get_text2();
                     info!(
                         context,
-                        0,
                         "{}{}{}{} [{}]{}",
                         text1.unwrap_or(""),
                         if text1.is_some() { ": " } else { "" },
@@ -647,13 +553,13 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
                         },
                     );
                     info!(
-                        context, 0,
+                        context,
                         "================================================================================"
                     );
                 }
             }
-            if dc_is_sending_locations_to_chat(context, 0 as uint32_t) {
-                info!(context, 0, "Location streaming enabled.");
+            if location::is_sending_locations_to_chat(context, 0) {
+                info!(context, "Location streaming enabled.");
             }
             println!("{} chats", cnt);
         }
@@ -671,25 +577,38 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
             ensure!(sel_chat.is_some(), "Failed to select chat");
             let sel_chat = sel_chat.as_ref().unwrap();
 
-            let msglist = chat::get_chat_msgs(context, sel_chat.get_id(), 0x1, 0);
-            let temp2 = sel_chat.get_subtitle();
-            let temp_name = sel_chat.get_name();
+            let msglist = chat::get_chat_msgs(context, sel_chat.get_id(), 0x1, None);
+            let members = chat::get_chat_contacts(context, sel_chat.id);
+            let subtitle = if sel_chat.is_device_talk() {
+                "device-talk".to_string()
+            } else if sel_chat.get_type() == Chattype::Single && !members.is_empty() {
+                let contact = Contact::get_by_id(context, members[0])?;
+                contact.get_addr().to_string()
+            } else {
+                format!("{} member(s)", members.len())
+            };
             info!(
                 context,
-                0,
-                "{}#{}: {} [{}]{}",
+                "{}#{}: {} [{}]{}{}",
                 chat_prefix(sel_chat),
                 sel_chat.get_id(),
-                temp_name,
-                temp2,
+                sel_chat.get_name(),
+                subtitle,
                 if sel_chat.is_sending_locations() {
                     "📍"
                 } else {
                     ""
                 },
+                match sel_chat.get_profile_image(context) {
+                    Some(icon) => match icon.to_str() {
+                        Some(icon) => format!(" Icon: {}", icon),
+                        _ => " Icon: Err".to_string(),
+                    },
+                    _ => "".to_string(),
+                },
             );
             log_msglist(context, &msglist)?;
-            if let Ok(draft) = chat::get_draft(context, sel_chat.get_id()) {
+            if let Some(draft) = chat::get_draft(context, sel_chat.get_id())? {
                 log_msg(context, "Draft", &draft);
             }
 
@@ -702,13 +621,13 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
         "createchat" => {
             ensure!(!arg1.is_empty(), "Argument <contact-id> missing.");
             let contact_id: libc::c_int = arg1.parse()?;
-            let chat_id = chat::create_by_contact_id(context, contact_id as uint32_t)?;
+            let chat_id = chat::create_by_contact_id(context, contact_id as u32)?;
 
             println!("Single#{} created successfully.", chat_id,);
         }
         "createchatbymsg" => {
             ensure!(!arg1.is_empty(), "Argument <msg-id> missing");
-            let msg_id: u32 = arg1.parse()?;
+            let msg_id = MsgId::new(arg1.parse()?);
             let chat_id = chat::create_by_msg_id(context, msg_id)?;
             let chat = Chat::load_from_db(context, chat_id)?;
 
@@ -731,10 +650,10 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
             ensure!(!arg1.is_empty(), "Argument <contact-id> missing.");
 
             let contact_id_0: libc::c_int = arg1.parse()?;
-            if 0 != chat::add_contact_to_chat(
+            if chat::add_contact_to_chat(
                 context,
                 sel_chat.as_ref().unwrap().get_id(),
-                contact_id_0 as uint32_t,
+                contact_id_0 as u32,
             ) {
                 println!("Contact added to chat.");
             } else {
@@ -748,7 +667,7 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
             chat::remove_contact_from_chat(
                 context,
                 sel_chat.as_ref().unwrap().get_id(),
-                contact_id_1 as uint32_t,
+                contact_id_1 as u32,
             )?;
 
             println!("Contact added to chat.");
@@ -772,20 +691,23 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
             ensure!(sel_chat.is_some(), "No chat selected.");
 
             let contacts = chat::get_chat_contacts(context, sel_chat.as_ref().unwrap().get_id());
-            info!(context, 0, "Memberlist:");
+            info!(context, "Memberlist:");
 
             log_contactlist(context, &contacts);
             println!(
                 "{} contacts\nLocation streaming: {}",
                 contacts.len(),
-                dc_is_sending_locations_to_chat(context, sel_chat.as_ref().unwrap().get_id()),
+                location::is_sending_locations_to_chat(
+                    context,
+                    sel_chat.as_ref().unwrap().get_id()
+                ),
             );
         }
         "getlocations" => {
             ensure!(sel_chat.is_some(), "No chat selected.");
 
             let contact_id = arg1.parse().unwrap_or_default();
-            let locations = dc_get_locations(
+            let locations = location::get_range(
                 context,
                 sel_chat.as_ref().unwrap().get_id(),
                 contact_id,
@@ -797,8 +719,7 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
                 let marker = location.marker.as_ref().unwrap_or(&default_marker);
                 info!(
                     context,
-                    0,
-                    "Loc#{}: {}: lat={} lng={} acc={} Chat#{} Contact#{} Msg#{} {}",
+                    "Loc#{}: {}: lat={} lng={} acc={} Chat#{} Contact#{} {} {}",
                     location.location_id,
                     dc_timestamp_to_str(location.timestamp),
                     location.latitude,
@@ -811,7 +732,7 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
                 );
             }
             if locations.is_empty() {
-                info!(context, 0, "No locations.");
+                info!(context, "No locations.");
             }
         }
         "sendlocations" => {
@@ -819,7 +740,7 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
             ensure!(!arg1.is_empty(), "No timeout given.");
 
             let seconds = arg1.parse()?;
-            dc_send_locations_to_chat(context, sel_chat.as_ref().unwrap().get_id(), seconds);
+            location::send_locations_to_chat(context, sel_chat.as_ref().unwrap().get_id(), seconds);
             println!(
                 "Locations will be sent to Chat#{} for {} seconds. Use 'setlocation <lat> <lng>' to play around.",
                 sel_chat.as_ref().unwrap().get_id(),
@@ -834,15 +755,15 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
             let latitude = arg1.parse()?;
             let longitude = arg2.parse()?;
 
-            let continue_streaming = dc_set_location(context, latitude, longitude, 0.);
-            if 0 != continue_streaming {
+            let continue_streaming = location::set(context, latitude, longitude, 0.);
+            if continue_streaming {
                 println!("Success, streaming should be continued.");
             } else {
                 println!("Success, streaming can be stoppped.");
             }
         }
         "dellocations" => {
-            dc_delete_all_locations(context);
+            location::delete_all(context)?;
         }
         "send" => {
             ensure!(sel_chat.is_some(), "No chat selected.");
@@ -858,18 +779,17 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
         }
         "sendimage" | "sendfile" => {
             ensure!(sel_chat.is_some(), "No chat selected.");
-            ensure!(!arg1.is_empty() && !arg2.is_empty(), "No file given.");
+            ensure!(!arg1.is_empty(), "No file given.");
 
-            let mut msg = dc_msg_new(
-                context,
-                if arg0 == "sendimage" {
-                    Viewtype::Image
-                } else {
-                    Viewtype::File
-                },
-            );
-            dc_msg_set_file(&mut msg, arg1_c, 0 as *const libc::c_char);
-            dc_msg_set_text(&mut msg, arg2_c);
+            let mut msg = Message::new(if arg0 == "sendimage" {
+                Viewtype::Image
+            } else {
+                Viewtype::File
+            });
+            msg.set_file(arg1, None);
+            if !arg2.is_empty() {
+                msg.set_text(Some(arg2.to_string()));
+            }
             chat::send_msg(context, sel_chat.as_ref().unwrap().get_id(), &mut msg)?;
         }
         "listmsgs" => {
@@ -881,7 +801,7 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
                 0 as libc::c_uint
             };
 
-            let msglist = dc_search_msgs(context, chat, arg1_c);
+            let msglist = context.search_msgs(chat, arg1);
 
             log_msglist(context, &msglist)?;
             println!("{} messages.", msglist.len());
@@ -890,8 +810,8 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
             ensure!(sel_chat.is_some(), "No chat selected.");
 
             if !arg1.is_empty() {
-                let mut draft = dc_msg_new(context, Viewtype::Text);
-                dc_msg_set_text(&mut draft, arg1_c);
+                let mut draft = Message::new(Viewtype::Text);
+                draft.set_text(Some(arg1.to_string()));
                 chat::set_draft(
                     context,
                     sel_chat.as_ref().unwrap().get_id(),
@@ -903,6 +823,18 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
                 println!("Draft deleted.");
             }
         }
+        "devicemsg" => {
+            ensure!(
+                !arg1.is_empty(),
+                "Please specify text to add as device message."
+            );
+            let mut msg = Message::new(Viewtype::Text);
+            msg.set_text(Some(arg1.to_string()));
+            chat::add_device_msg(context, None, Some(&mut msg))?;
+        }
+        "updatedevicechats" => {
+            context.update_device_chats()?;
+        }
         "listmedia" => {
             ensure!(sel_chat.is_some(), "No chat selected.");
 
@@ -916,9 +848,9 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
             println!("{} images or videos: ", images.len());
             for (i, data) in images.iter().enumerate() {
                 if 0 == i {
-                    print!("Msg#{}", data);
+                    print!("{}", data);
                 } else {
-                    print!(", Msg#{}", data);
+                    print!(", {}", data);
                 }
             }
             print!("\n");
@@ -926,11 +858,7 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
         "archive" | "unarchive" => {
             ensure!(!arg1.is_empty(), "Argument <chat-id> missing.");
             let chat_id = arg1.parse()?;
-            chat::archive(
-                context,
-                chat_id,
-                if arg0 == "archive" { true } else { false },
-            )?;
+            chat::archive(context, chat_id, arg0 == "archive")?;
         }
         "delchat" => {
             ensure!(!arg1.is_empty(), "Argument <chat-id> missing.");
@@ -939,49 +867,44 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
         }
         "msginfo" => {
             ensure!(!arg1.is_empty(), "Argument <msg-id> missing.");
-            let id = arg1.parse()?;
-            let res = dc_get_msg_info(context, id);
-            println!("{}", as_str(res));
+            let id = MsgId::new(arg1.parse()?);
+            let res = message::get_msg_info(context, id);
+            println!("{}", res);
         }
         "listfresh" => {
-            let msglist = dc_get_fresh_msgs(context);
+            let msglist = context.get_fresh_msgs();
 
             log_msglist(context, &msglist)?;
             print!("{} fresh messages.", msglist.len());
         }
         "forward" => {
             ensure!(
-                !arg1.is_empty() && arg2.is_empty(),
+                !arg1.is_empty() && !arg2.is_empty(),
                 "Arguments <msg-id> <chat-id> expected"
             );
 
-            let mut msg_ids = [0; 1];
+            let mut msg_ids = [MsgId::new(0); 1];
             let chat_id = arg2.parse()?;
-            msg_ids[0] = arg1.parse()?;
-            chat::forward_msgs(context, msg_ids.as_mut_ptr(), 1, chat_id);
+            msg_ids[0] = MsgId::new(arg1.parse()?);
+            chat::forward_msgs(context, &msg_ids, chat_id)?;
         }
         "markseen" => {
             ensure!(!arg1.is_empty(), "Argument <msg-id> missing.");
-            let mut msg_ids = [0; 1];
-            msg_ids[0] = arg1.parse()?;
-            dc_markseen_msgs(context, msg_ids.as_mut_ptr(), 1);
+            let mut msg_ids = [MsgId::new(0); 1];
+            msg_ids[0] = MsgId::new(arg1.parse()?);
+            message::markseen_msgs(context, &msg_ids);
         }
         "star" | "unstar" => {
             ensure!(!arg1.is_empty(), "Argument <msg-id> missing.");
-            let mut msg_ids = [0; 1];
-            msg_ids[0] = arg1.parse()?;
-            dc_star_msgs(
-                context,
-                msg_ids.as_mut_ptr(),
-                1,
-                if arg0 == "star" { 1 } else { 0 },
-            );
+            let mut msg_ids = [MsgId::new(0); 1];
+            msg_ids[0] = MsgId::new(arg1.parse()?);
+            message::star_msgs(context, &msg_ids, arg0 == "star");
         }
         "delmsg" => {
             ensure!(!arg1.is_empty(), "Argument <msg-id> missing.");
-            let mut ids = [0; 1];
-            ids[0] = arg1.parse()?;
-            dc_delete_msgs(context, ids.as_mut_ptr(), 1);
+            let mut ids = [MsgId::new(0); 1];
+            ids[0] = MsgId::new(arg1.parse()?);
+            message::delete_msgs(context, &ids);
         }
         "listcontacts" | "contacts" | "listverified" => {
             let contacts = Contact::get_all(
@@ -1050,32 +973,35 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
                 res.get_text2()
             );
         }
-        "event" => {
-            ensure!(!arg1.is_empty(), "Argument <id> missing.");
-            let event = arg1.parse()?;
-            let event = Event::from_u32(event).ok_or(format_err!("Event::from_u32({})", event))?;
-            let r = context.call_cb(event, 0 as uintptr_t, 0 as uintptr_t);
-            println!(
-                "Sending event {:?}({}), received value {}.",
-                event, event as usize, r as libc::c_int,
-            );
-        }
+        // TODO: implement this again, unclear how to match this through though, without writing a parser.
+        // "event" => {
+        //     ensure!(!arg1.is_empty(), "Argument <id> missing.");
+        //     let event = arg1.parse()?;
+        //     let event = Event::from_u32(event).ok_or(format_err!("Event::from_u32({})", event))?;
+        //     let r = context.call_cb(event, 0 as libc::uintptr_t, 0 as libc::uintptr_t);
+        //     println!(
+        //         "Sending event {:?}({}), received value {}.",
+        //         event, event as usize, r as libc::c_int,
+        //     );
+        // }
         "fileinfo" => {
             ensure!(!arg1.is_empty(), "Argument <file> missing.");
 
-            if let Some(buf) = dc_read_file_safe(context, &arg1) {
+            if let Ok(buf) = dc_read_file(context, &arg1) {
                 let (width, height) = dc_get_filemeta(&buf)?;
                 println!("width={}, height={}", width, height);
             } else {
                 bail!("Command failed.");
             }
         }
+        "emptyserver" => {
+            ensure!(!arg1.is_empty(), "Argument <flags> missing");
+
+            message::dc_empty_server(context, arg1.parse()?);
+        }
         "" => (),
         _ => bail!("Unknown command: \"{}\" type ? for help.", arg0),
     }
 
-    free(arg1_c as *mut _);
-    free(arg2_c as *mut _);
-
     Ok(())
 }

examples/repl/main.rs

@@ -14,19 +14,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_securejoin::*;
-use deltachat::dc_tools::*;
 use deltachat::job::*;
 use deltachat::oauth2::*;
-use deltachat::types::*;
-use deltachat::x::*;
+use deltachat::securejoin::*;
+use deltachat::Event;
 use rustyline::completion::{Completer, FilenameCompleter, Pair};
 use rustyline::config::OutputStreamType;
 use rustyline::error::ReadlineError;
@@ -41,96 +41,74 @@ use self::cmdline::*;
 
 // Event Handler
 
-unsafe extern "C" fn receive_event(
-    _context: &Context,
-    event: Event,
-    data1: uintptr_t,
-    data2: uintptr_t,
-) -> uintptr_t {
+fn receive_event(_context: &Context, event: Event) -> libc::uintptr_t {
     match event {
-        Event::GET_STRING => {}
-        Event::INFO => {
+        Event::Info(msg) => {
             /* do not show the event as this would fill the screen */
-            println!("{}", to_string(data2 as *const _),);
+            println!("{}", msg);
         }
-        Event::SMTP_CONNECTED => {
-            println!("[DC_EVENT_SMTP_CONNECTED] {}", to_string(data2 as *const _));
+        Event::SmtpConnected(msg) => {
+            println!("[DC_EVENT_SMTP_CONNECTED] {}", msg);
         }
-        Event::IMAP_CONNECTED => {
-            println!("[DC_EVENT_IMAP_CONNECTED] {}", to_string(data2 as *const _),);
+        Event::ImapConnected(msg) => {
+            println!("[DC_EVENT_IMAP_CONNECTED] {}", msg);
         }
-        Event::SMTP_MESSAGE_SENT => {
-            println!(
-                "[DC_EVENT_SMTP_MESSAGE_SENT] {}",
-                to_string(data2 as *const _),
-            );
+        Event::SmtpMessageSent(msg) => {
+            println!("[DC_EVENT_SMTP_MESSAGE_SENT] {}", msg);
         }
-        Event::WARNING => {
-            println!("[Warning] {}", to_string(data2 as *const _),);
+        Event::Warning(msg) => {
+            println!("[Warning] {}", msg);
         }
-        Event::ERROR => {
-            println!(
-                "\x1b[31m[DC_EVENT_ERROR] {}\x1b[0m",
-                to_string(data2 as *const _),
-            );
+        Event::Error(msg) => {
+            println!("\x1b[31m[DC_EVENT_ERROR] {}\x1b[0m", msg);
         }
-        Event::ERROR_NETWORK => {
-            println!(
-                "\x1b[31m[DC_EVENT_ERROR_NETWORK] first={}, msg={}\x1b[0m",
-                data1 as usize,
-                to_string(data2 as *const _),
-            );
+        Event::ErrorNetwork(msg) => {
+            println!("\x1b[31m[DC_EVENT_ERROR_NETWORK] msg={}\x1b[0m", msg);
         }
-        Event::ERROR_SELF_NOT_IN_GROUP => {
-            println!(
-                "\x1b[31m[DC_EVENT_ERROR_SELF_NOT_IN_GROUP] {}\x1b[0m",
-                to_string(data2 as *const _),
-            );
+        Event::ErrorSelfNotInGroup(msg) => {
+            println!("\x1b[31m[DC_EVENT_ERROR_SELF_NOT_IN_GROUP] {}\x1b[0m", msg);
         }
-        Event::MSGS_CHANGED => {
+        Event::MsgsChanged { chat_id, msg_id } => {
             print!(
-                "\x1b[33m{{Received DC_EVENT_MSGS_CHANGED({}, {})}}\n\x1b[0m",
-                data1 as usize, data2 as usize,
+                "\x1b[33m{{Received DC_EVENT_MSGS_CHANGED(chat_id={}, msg_id={})}}\n\x1b[0m",
+                chat_id, msg_id,
             );
         }
-        Event::CONTACTS_CHANGED => {
+        Event::ContactsChanged(_) => {
             print!("\x1b[33m{{Received DC_EVENT_CONTACTS_CHANGED()}}\n\x1b[0m");
         }
-        Event::LOCATION_CHANGED => {
+        Event::LocationChanged(contact) => {
             print!(
-                "\x1b[33m{{Received DC_EVENT_LOCATION_CHANGED(contact={})}}\n\x1b[0m",
-                data1 as usize,
+                "\x1b[33m{{Received DC_EVENT_LOCATION_CHANGED(contact={:?})}}\n\x1b[0m",
+                contact,
             );
         }
-        Event::CONFIGURE_PROGRESS => {
+        Event::ConfigureProgress(progress) => {
             print!(
                 "\x1b[33m{{Received DC_EVENT_CONFIGURE_PROGRESS({} ‰)}}\n\x1b[0m",
-                data1 as usize,
+                progress,
             );
         }
-        Event::IMEX_PROGRESS => {
+        Event::ImexProgress(progress) => {
             print!(
                 "\x1b[33m{{Received DC_EVENT_IMEX_PROGRESS({} ‰)}}\n\x1b[0m",
-                data1 as usize,
+                progress,
             );
         }
-        Event::IMEX_FILE_WRITTEN => {
+        Event::ImexFileWritten(file) => {
             print!(
                 "\x1b[33m{{Received DC_EVENT_IMEX_FILE_WRITTEN({})}}\n\x1b[0m",
-                to_string(data1 as *const _)
+                file.display()
             );
         }
-        Event::CHAT_MODIFIED => {
+        Event::ChatModified(chat) => {
             print!(
                 "\x1b[33m{{Received DC_EVENT_CHAT_MODIFIED({})}}\n\x1b[0m",
-                data1 as usize,
+                chat
             );
         }
         _ => {
-            print!(
-                "\x1b[33m{{Received {:?}({}, {})}}\n\x1b[0m",
-                event, data1 as usize, data2 as usize,
-            );
+            print!("\x1b[33m{{Received {:?}}}\n\x1b[0m", event);
         }
     }
 
@@ -172,11 +150,11 @@ 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());
+            perform_inbox_jobs(&ctx.read().unwrap());
+            perform_inbox_fetch(&ctx.read().unwrap());
             while_running!({
                 let context = ctx.read().unwrap();
-                perform_imap_idle(&context);
+                perform_inbox_idle(&context);
             });
         });
     });
@@ -224,7 +202,7 @@ fn stop_threads(context: &Context) {
         println!("Stopping threads");
         IS_RUNNING.store(false, Ordering::Relaxed);
 
-        interrupt_imap_idle(context);
+        interrupt_inbox_idle(context, true);
         interrupt_mvbox_idle(context);
         interrupt_sentbox_idle(context);
         interrupt_smtp_idle(context);
@@ -257,7 +235,7 @@ impl Completer for DcHelper {
     }
 }
 
-const IMEX_COMMANDS: [&'static str; 12] = [
+const IMEX_COMMANDS: [&str; 12] = [
     "initiate-key-transfer",
     "get-setupcodebegin",
     "continue-key-transfer",
@@ -272,7 +250,7 @@ const IMEX_COMMANDS: [&'static str; 12] = [
     "stop",
 ];
 
-const DB_COMMANDS: [&'static str; 11] = [
+const DB_COMMANDS: [&str; 11] = [
     "info",
     "open",
     "close",
@@ -286,7 +264,7 @@ const DB_COMMANDS: [&'static str; 11] = [
     "housekeeping",
 ];
 
-const CHAT_COMMANDS: [&'static str; 24] = [
+const CHAT_COMMANDS: [&str; 24] = [
     "listchats",
     "listarchived",
     "chat",
@@ -312,7 +290,7 @@ const CHAT_COMMANDS: [&'static str; 24] = [
     "unarchive",
     "delchat",
 ];
-const MESSAGE_COMMANDS: [&'static str; 8] = [
+const MESSAGE_COMMANDS: [&str; 8] = [
     "listmsgs",
     "msginfo",
     "listfresh",
@@ -322,7 +300,7 @@ const MESSAGE_COMMANDS: [&'static str; 8] = [
     "unstar",
     "delmsg",
 ];
-const CONTACT_COMMANDS: [&'static str; 6] = [
+const CONTACT_COMMANDS: [&str; 6] = [
     "listcontacts",
     "listverified",
     "addcontact",
@@ -330,7 +308,7 @@ const CONTACT_COMMANDS: [&'static str; 6] = [
     "delcontact",
     "cleanupcontacts",
 ];
-const MISC_COMMANDS: [&'static str; 9] = [
+const MISC_COMMANDS: [&str; 9] = [
     "getqr", "getbadqr", "checkqr", "event", "fileinfo", "clear", "exit", "quit", "help",
 ];
 
@@ -356,8 +334,8 @@ impl Hinter for DcHelper {
     }
 }
 
-static COLORED_PROMPT: &'static str = "\x1b[1;32m> \x1b[0m";
-static PROMPT: &'static str = "> ";
+static COLORED_PROMPT: &str = "\x1b[1;32m> \x1b[0m";
+static PROMPT: &str = "> ";
 
 impl Highlighter for DcHelper {
     fn highlight_prompt<'p>(&self, prompt: &'p str) -> Cow<'p, str> {
@@ -384,21 +362,15 @@ impl Highlighter for DcHelper {
 impl Helper for DcHelper {}
 
 fn main_0(args: Vec<String>) -> Result<(), failure::Error> {
-    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 {
+    if args.len() < 2 {
         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.");
 
@@ -431,7 +403,7 @@ fn main_0(args: Vec<String>) -> Result<(), failure::Error> {
                 // TODO: ignore "set mail_pw"
                 rl.add_history_entry(line.as_str());
                 let ctx = ctx.clone();
-                match unsafe { handle_cmd(line.trim(), ctx) } {
+                match handle_cmd(line.trim(), ctx) {
                     Ok(ExitResult::Continue) => {}
                     Ok(ExitResult::Exit) => break,
                     Err(err) => println!("Error: {}", err),
@@ -462,15 +434,10 @@ enum ExitResult {
     Exit,
 }
 
-unsafe fn handle_cmd(line: &str, ctx: Arc<RwLock<Context>>) -> Result<ExitResult, failure::Error> {
+fn handle_cmd(line: &str, ctx: Arc<RwLock<Context>>) -> Result<ExitResult, failure::Error> {
     let mut args = line.splitn(2, ' ');
     let arg0 = args.next().unwrap_or_default();
     let arg1 = args.next().unwrap_or_default();
-    let arg1_c = if arg1.is_empty() {
-        std::ptr::null()
-    } else {
-        arg1.strdup()
-    };
 
     match arg0 {
         "connect" => {
@@ -488,9 +455,9 @@ unsafe fn handle_cmd(line: &str, ctx: Arc<RwLock<Context>>) -> Result<ExitResult
         }
         "imap-jobs" => {
             if HANDLE.clone().lock().unwrap().is_some() {
-                println!("imap-jobs are already running in a thread.");
+                println!("inbox-jobs are already running in a thread.");
             } else {
-                perform_imap_jobs(&ctx.read().unwrap());
+                perform_inbox_jobs(&ctx.read().unwrap());
             }
         }
         "configure" => {
@@ -519,38 +486,33 @@ unsafe fn handle_cmd(line: &str, ctx: Arc<RwLock<Context>>) -> Result<ExitResult
         }
         "getqr" | "getbadqr" => {
             start_threads(ctx.clone());
-            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
+            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")
                     }
+                    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_c);
+                dc_join_securejoin(&ctx.read().unwrap(), arg1);
             }
         }
         "exit" | "quit" => return Ok(ExitResult::Exit),
         _ => dc_cmdline(&ctx.read().unwrap(), line)?,
     }
 
-    free(arg1_c as *mut _);
-
     Ok(ExitResult::Continue)
 }
 

examples/simple.rs

@@ -1,6 +1,5 @@
 extern crate deltachat;
 
-use std::ffi::CStr;
 use std::sync::{Arc, RwLock};
 use std::{thread, time};
 use tempfile::tempdir;
@@ -9,127 +8,108 @@ 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,
+    perform_inbox_fetch, perform_inbox_idle, perform_inbox_jobs, perform_smtp_idle,
+    perform_smtp_jobs,
 };
+use deltachat::Event;
 
-extern "C" fn cb(_ctx: &Context, event: Event, data1: usize, data2: usize) -> usize {
-    println!("[{:?}]", event);
+fn cb(_ctx: &Context, event: Event) -> usize {
+    print!("[{:?}]", event);
 
     match event {
-        Event::CONFIGURE_PROGRESS => {
-            println!("  progress: {}", data1);
+        Event::ConfigureProgress(progress) => {
+            print!("  progress: {}\n", progress);
             0
         }
-        Event::INFO | Event::WARNING | Event::ERROR | Event::ERROR_NETWORK => {
-            println!(
-                "  {}",
-                unsafe { CStr::from_ptr(data2 as *const _) }
-                    .to_str()
-                    .unwrap()
-            );
+        Event::Info(msg) | Event::Warning(msg) | Event::Error(msg) | Event::ErrorNetwork(msg) => {
+            print!("  {}\n", msg);
+            0
+        }
+        _ => {
+            print!("\n");
             0
         }
-        _ => 0,
     }
 }
 
 fn main() {
-    unsafe {
-        let ctx = dc_context_new(Some(cb), std::ptr::null_mut(), None);
-        let running = Arc::new(RwLock::new(true));
-        let info = dc_get_info(&ctx);
-        let info_s = CStr::from_ptr(info);
-        let duration = time::Duration::from_millis(4000);
-        println!("info: {}", info_s.to_str().unwrap());
+    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 running = Arc::new(RwLock::new(true));
+    let info = ctx.get_info();
+    let duration = time::Duration::from_millis(4000);
+    println!("info: {:#?}", info);
+
+    let ctx = Arc::new(ctx);
+    let ctx1 = ctx.clone();
+    let r1 = running.clone();
+    let t1 = thread::spawn(move || {
+        while *r1.read().unwrap() {
+            perform_inbox_jobs(&ctx1);
+            if *r1.read().unwrap() {
+                perform_inbox_fetch(&ctx1);
 
-        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);
                 if *r1.read().unwrap() {
-                    perform_imap_fetch(&ctx1);
-
-                    if *r1.read().unwrap() {
-                        perform_imap_idle(&ctx1);
-                    }
+                    perform_inbox_idle(&ctx1);
                 }
             }
-        });
-
-        let ctx1 = ctx.clone();
-        let r1 = running.clone();
-        let t2 = thread::spawn(move || {
-            while *r1.read().unwrap() {
-                perform_smtp_jobs(&ctx1);
-                if *r1.read().unwrap() {
-                    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");
-        let pw = args[1].clone();
-        ctx.set_config(config::Config::Addr, Some("d@testrun.org"))
-            .unwrap();
-        ctx.set_config(config::Config::MailPw, Some(&pw)).unwrap();
-        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();
-
-        println!("fetching chats..");
-        let chats = Chatlist::try_load(&ctx, 0, None, None).unwrap();
-
-        for i in 0..chats.len() {
-            let summary = chats.get_summary(0, None);
-            let text1 = summary.get_text1();
-            let text2 = summary.get_text2();
-            println!("chat: {} - {:?} - {:?}", i, text1, text2,);
         }
+    });
 
-        thread::sleep(duration);
+    let ctx1 = ctx.clone();
+    let r1 = running.clone();
+    let t2 = thread::spawn(move || {
+        while *r1.read().unwrap() {
+            perform_smtp_jobs(&ctx1);
+            if *r1.read().unwrap() {
+                perform_smtp_idle(&ctx1);
+            }
+        }
+    });
 
-        // let msglist = dc_get_chat_msgs(&ctx, chat_id, 0, 0);
-        // for i in 0..dc_array_get_cnt(msglist) {
-        //     let msg_id = dc_array_get_id(msglist, i);
-        //     let msg = dc_get_msg(context, msg_id);
-        //     let text = CStr::from_ptr(dc_msg_get_text(msg)).unwrap();
-        //     println!("Message {}: {}\n", i + 1, text.to_str().unwrap());
-        //     dc_msg_unref(msg);
-        // }
-        // dc_array_unref(msglist);
+    println!("configuring");
+    let args = std::env::args().collect::<Vec<String>>();
+    assert_eq!(args.len(), 2, "missing password");
+    let pw = args[1].clone();
+    ctx.set_config(config::Config::Addr, Some("d@testrun.org"))
+        .unwrap();
+    ctx.set_config(config::Config::MailPw, Some(&pw)).unwrap();
+    configure(&ctx);
 
-        println!("stopping threads");
+    thread::sleep(duration);
 
-        *running.clone().write().unwrap() = false;
-        deltachat::job::interrupt_imap_idle(&ctx);
-        deltachat::job::interrupt_smtp_idle(&ctx);
+    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();
 
-        println!("joining");
-        t1.join().unwrap();
-        t2.join().unwrap();
+    println!("fetching chats..");
+    let chats = Chatlist::try_load(&ctx, 0, None, None).unwrap();
 
-        println!("closing");
-        dc_close(&ctx);
+    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,);
     }
+
+    thread::sleep(duration);
+
+    println!("stopping threads");
+
+    *running.write().unwrap() = false;
+    deltachat::job::interrupt_inbox_idle(&ctx, true);
+    deltachat::job::interrupt_smtp_idle(&ctx);
+
+    println!("joining");
+    t1.join().unwrap();
+    t2.join().unwrap();
+
+    println!("closing");
 }

misc.c

@@ -1,52 +0,0 @@
-#include <stdlib.h>
-#include <stdarg.h>
-#include <ctype.h>
-#include <string.h>
-#include <stdio.h>
-#include "misc.h"
-
-
-static char* internal_dc_strdup(const char* s) /* strdup(NULL) is undefined, save_strdup(NULL) returns an empty string in this case */
-{
-	char* ret = NULL;
-	if (s) {
-		if ((ret=strdup(s))==NULL) {
-			exit(16); /* cannot allocate (little) memory, unrecoverable error */
-		}
-	}
-	else {
-		if ((ret=(char*)calloc(1, 1))==NULL) {
-			exit(17); /* cannot allocate little memory, unrecoverable error */
-		}
-	}
-	return ret;
-}
-
-char* dc_mprintf(const char* format, ...)
-{
-	char  testbuf[1];
-	char* buf = NULL;
-	int   char_cnt_without_zero = 0;
-
-	va_list argp;
-	va_list argp_copy;
-	va_start(argp, format);
-	va_copy(argp_copy, argp);
-
-	char_cnt_without_zero = vsnprintf(testbuf, 0, format, argp);
-	va_end(argp);
-	if (char_cnt_without_zero < 0) {
-		va_end(argp_copy);
-		return internal_dc_strdup("ErrFmt");
-	}
-
-	buf = malloc(char_cnt_without_zero+2 /* +1 would be enough, however, protect against off-by-one-errors */);
-	if (buf==NULL) {
-		va_end(argp_copy);
-		return internal_dc_strdup("ErrMem");
-	}
-
-	vsnprintf(buf, char_cnt_without_zero+1, format, argp_copy);
-	va_end(argp_copy);
-	return buf;
-}

misc.h

@@ -1 +0,0 @@
-char* dc_mprintf                 (const char* format, ...); /* The result must be free()'d. */

proptest-regressions/dc_mimeparser.txt

@@ -0,0 +1,7 @@
+# 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 03cab93c6d1f3a8245f63cf84dacb307944294fe6333c1e38f078a6600659c7a # shrinks to data = "a\t0aA\ta\t0 \ta\t0 \ta a\t\ta  A\tAA0a0a 0\t a\t aA   \t a\t  A0\t  AAa\taA0\taAAaA\t0\taa0a\ta Aa Aaaa A0A\t  a aA 0\t  A\t0\t0\t\t\t\t\t\tA \t\t a\tA Aa aAA0A0AA0aaA A\t\t  aa0\ta\t  \tAa\taA\t00  AA  A a\tA a aAAa \t 00\t0 \t\t  a A  0\t\t\t aAA Aa \taAAAA0a A0A\t\t1\\E$\t$R\tc\t^=\t\"\tQ<Uk\t\t>A\t\t&\t}v&\tM^\'|\tW5?dn\t\t+\t\tP\te`\t\t>:Brlq--?\t$#Q\tK=zJ\tb\"9*.\"\t`\tF&T*\tBs,\tg\'*\\\t:\t?l$\t\t|A\"HR:Hk\t\\KkV\t\t{=&!^e%:|_*0wV\t[$`\t:\t$%f\t\t[!\"Y. \tP\t\th\'?\'/?%:++NfQo#@\"+?\t(\\??{\t\'\'$Dzj\t0.?{s4?&?Y=/yj]Z=\t4n\t?Ja\"\t{I\t$\t;I}_8V\t&\t?N\'\tI2/\t9.\tFT%9%`\'\tz\to7Y\t|AXP&@G12g\t\'w\t\t%??\t\"h$?F\"\"6%q\\\\{\tT\t\"]$87$}h\'\t<\t$\tc%U:mT2:<v\t#Rl!;U\t\t\"^D\tRZ(BZ{n\t%[$fgH`\t{B}:*\t\t%%*F`%W\t//B}PQ\t\tsu2\tLz<1*!p-X\tnKv&&0\thm4<n\\.\\/.w\'\t<)E1g3#ood\t`?\t\\({N?,8_?h\ty\t0%\t*$A\t\t*w-ViQUj\tTiH\t%\t%&0p\'\'\tA%r**Fo\'Z\\\tNI*ely4=I?}$.o`\t$\ts\'&lt\t\",:~=Nv/0O%=+<LS\t%P\'\t$r%d.\t{G{/L:\t&I&8-`cy*\"{\t/%fP9.P<\t\t\'/`\t\t`\t\t`!t:\t::\t\tW\'X^\t@.uL&a\tN\t\t\t.\t?0*\tvUK>UJ\\\tQbj%w]P=Js\t\"R\t&s^?</=%\t\'VI:\" kT`{b*<\t\tF&?Y\t\t:/\t!C\'e0`\t\t\tx-\t*\\N\\wwu.I4\tb/y\t\"P:P%\"\t\tQ][\\\t^x\t\t):\t\t&s\t$1-\t\t\tXt`0\t;\t/UeCP*\"G\t\t\':\tk@91Hf&#\t(Uzz&`p2;\t{]\t\"I_%=\\%,XD\"\'06QfCd<;$:q^\t8:\"*\"H\t\to\t&xK/\t\ty0/<}<j<|*`~::b\t=S.=}=Ki\t<Y.\'{\tf\t{Ub*H%(_4*?*\tn2\t/\'\t\t\t/,4]\tt\t<y\t\t\tWi\t\tT&\"\t\t\t\t\t=/1Wu?\t\'A\"W-P\t$?e\\\t`\t6`vD\t8`\t\tccD J\tY&jI//?_\t\\j\t_\tsiq$\t?9\tQ\t.^%&..?%Jm??A%+<\tN&*\t.g\tS$W\"\"\tMpq\t\t:&\\\thTz&<iz%/%T&\'F\t\\]&\t\t}\t\t\tXr=dtp`:+<,\t%60Y*<(&K*kJ\todO\t=<V?&\tMU/\"\t= Y!)<\tV\t9\t)\t&v8q{\t\t&pT\t3\ttB,qcq\'i$;gv%j_%M_{[\"&;\t\t\t.B;6Y\\%\t\"\tY/a\t\\`:?\t<\t?]\taNwD;\\\t%l*74%5T?QS :~yR/E*R\t\t=u\t\\\t\t.Q<;\\\t_S/{&F$^\tw_>\'h=|%\t\t:W!\\<U2\'$\tb&`\t=|=L9\t\t\t\\WZ:! }{\t ;\t;\t\t 0.*\t.%\"\'r%{<Mh_t[[}\t-\tJo\"b/AC*-=`=T\tz$2\tC\t\t/k{47\"\t\t,q%\tZ\tT3\t\tf>%\t\'?%@^tx\t7\"1Bk{b{n\t\"Pj3\tHc\t\tt\tY<\t#?\tSh\\yk/N\\\t8 7=R4*9Cw&m\t\\-\'f\t|\'#t(Etu.Hdu(E\t%&v:\'aqW~A5\t\t w.s{J%lX<\"\t\'*%m<&:/B<&\':U}$&`.{)\t\t6S\t:/$*kQ-Z\t^\'t${/tH*\'v\t3\t=\t\tDyp:B\t`I_R&4SO\t\t&-j=*.\t87&\'e*( \t\t\t\'<$\\DJ<$p?{}\'&\tv\t\\Xk<Y:Y`!$K{\tF&\tzd\t\t*i$\tj\'\t<)R*\t%?\t!.\t=\"@#~:=*\t\tXO=_T,1\"\'.%%\"`{\\:\t\"\tfkeOb/\'$I~\ta\t|&\t[\\KK\"1&Z\t<k\t\t)%\'-~\"2n\tj\tW?*<@w{g%d\ta\\\'\'I\t;:ySR%ke:4\tc\t$=\t&9P]x4\tJ=\t6C6%a\t`0\tF\tm-\tTr\t}\t\tQum\t&@\typ|w2&\t\t3`i&t\t\tT5\"\t.&b&e*/==1.\'*\\[U*\tqPL%?$-0/}~|q`\t\t}\t$\tq==o+T$\'!H\t\ti&um\"?\"%%\t/\'p\tg>?{0{J{\t\t/\t\t{zKZ&>=\t[\"1h<H%z/8,/]s\tv{7\t\t:j*H,M//\t\t\td\'.)\t"

proptest-regressions/dc_strencode.txt

@@ -0,0 +1,8 @@
+# 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"
+cc e34960438edb2426904b44fb4215154e7e2880f2fd1c3183b98bfcc76fec4882 # shrinks to input = " 0"

proptest-regressions/dc_tools.txt

@@ -0,0 +1,9 @@
+# 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 requests
+    pip install pytest pytest-timeout pytest-rerunfailures 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 neccessary because some tests generate RSA keys
+The release mode is necessary because some tests generate RSA keys
 which is prohibitively slow in debug mode.
 
-After succcessul binding installation you can finally run the tests::
+After successful binding installation you can finally run the tests::
 
     pytest -v tests
 
@@ -97,7 +97,7 @@ If you want to run "liveconfig" functional tests you can set
   chat devs.
 
 - or the path of a file that contains two lines, each describing
-  via "addr=... mail_pwd=..." a test account login that will
+  via "addr=... mail_pw=..." a test account login that will
   be used for the live tests.
 
 With ``DCC_PY_LIVECONFIG`` set pytest invocations will use real

python/doc/_templates/globaltoc.html

@@ -6,7 +6,6 @@
   <li><a href="{{ pathto('install') }}">install</a></li>
   <li><a href="{{ pathto('api') }}">high level API</a></li>
   <li><a href="{{ pathto('lapi') }}">low level API</a></li>
-  <li><a href="{{ pathto('capi') }}">C deltachat.h</a></li>
 </ul>
 <b>external links:</b>
 <ul>

python/doc/api.rst

@@ -8,8 +8,8 @@ high level API reference
 
 - :class:`deltachat.account.Account` (your main entry point, creates the
   other classes)
-- :class:`deltachat.chatting.Contact`
-- :class:`deltachat.chatting.Chat`
+- :class:`deltachat.contact.Contact`
+- :class:`deltachat.chat.Chat`
 - :class:`deltachat.message.Message`
 
 Account
@@ -22,13 +22,13 @@ Account
 Contact
 -------
 
-.. autoclass:: deltachat.chatting.Contact
+.. autoclass:: deltachat.contact.Contact
     :members:
 
 Chat
 ----
 
-.. autoclass:: deltachat.chatting.Chat
+.. autoclass:: deltachat.chat.Chat
     :members:
 
 Message

python/doc/lapi.rst

@@ -2,7 +2,13 @@
 low level API reference
 ===================================
 
-for full C-docs, defines and function checkout :doc:`capi`
+for full doxygen-generated C-docs, defines and functions please checkout
+
+https://c.delta.chat
+
+
+Python low-level capi calls
+---------------------------
 
 
 .. automodule:: deltachat.capi.lib

python/install_python_bindings.py

@@ -6,20 +6,26 @@
 
 import os
 import subprocess
-import os
+import sys
 
 if __name__ == "__main__":
-    os.environ["DCC_RS_TARGET"] = target = "release"
+    target = os.environ.get("DCC_RS_TARGET")
+    if target is None:
+        os.environ["DCC_RS_TARGET"] = target = "release"
     if "DCC_RS_DEV" not in os.environ:
         dn = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
         os.environ["DCC_RS_DEV"] = dn
 
+    # build the core library  in release + debug mode because
+    # as of Nov 2019 rPGP generates RSA keys which take
+    # prohibitively long for non-release installs
     os.environ["RUSTFLAGS"] = "-g"
     subprocess.check_call([
         "cargo", "build", "-p", "deltachat_ffi", "--" + target
     ])
     subprocess.check_call("rm -rf build/ src/deltachat/*.so" , shell=True)
 
-    subprocess.check_call([
-        "pip", "install", "-e", "."
-    ])
+    if len(sys.argv) <= 1 or sys.argv[1] != "onlybuild":
+        subprocess.check_call([
+            sys.executable, "-m", "pip", "install", "-e", "."
+        ])

python/src/deltachat/_build.py

@@ -29,7 +29,10 @@ def ffibuilder():
             extra_link_args = []
         else:
             raise NotImplementedError("Compilation not supported yet on Windows, can you help?")
-        objs = [os.path.join(projdir, 'target', target, 'libdeltachat.a')]
+        target_dir = os.environ.get("CARGO_TARGET_DIR")
+        if target_dir is None:
+            target_dir = os.path.join(projdir, 'target')
+        objs = [os.path.join(target_dir, target, 'libdeltachat.a')]
         assert os.path.exists(objs[0]), objs
         incs = [os.path.join(projdir, 'deltachat-ffi')]
     else:

python/src/deltachat/account.py

@@ -1,8 +1,8 @@
 """ Account class implementation. """
 
 from __future__ import print_function
+import atexit
 import threading
-import os
 import re
 import time
 from array import array
@@ -14,16 +14,18 @@ except ImportError:
 import deltachat
 from . import const
 from .capi import ffi, lib
-from .cutil import as_dc_charpointer, from_dc_charpointer, iter_array
-from .chatting import Contact, Chat, Message
+from .cutil import as_dc_charpointer, from_dc_charpointer, iter_array, DCLot
+from .chat import Chat
+from .message import Message
+from .contact import Contact
 
 
 class Account(object):
     """ Each account is tied to a sqlite database file which is fully managed
-    by the underlying deltachat c-library.  All public Account methods are
+    by the underlying deltachat core library.  All public Account methods are
     meant to be memory-safe and return memory-safe objects.
     """
-    def __init__(self, db_path, logid=None, eventlogging=True):
+    def __init__(self, db_path, logid=None, eventlogging=True, debug=True):
         """ initialize account object.
 
         :param db_path: a path to the account database. The database
@@ -31,13 +33,14 @@ class Account(object):
         :param logid: an optional logging prefix that should be used with
                       the default internal logging.
         :param eventlogging: if False no eventlogging and no context callback will be configured
+        :param debug: turn on debug logging for events.
         """
         self._dc_context = ffi.gc(
             lib.dc_context_new(lib.py_dc_callback, ffi.NULL, ffi.NULL),
             _destroy_dc_context,
         )
         if eventlogging:
-            self._evlogger = EventLogger(self._dc_context, logid)
+            self._evlogger = EventLogger(self._dc_context, logid, debug)
             deltachat.set_context_callback(self._dc_context, self._process_event)
             self._threads = IOThreads(self._dc_context, self._evlogger._log_event)
         else:
@@ -48,9 +51,9 @@ class Account(object):
         if not lib.dc_open(self._dc_context, db_path, ffi.NULL):
             raise ValueError("Could not dc_open: {}".format(db_path))
         self._configkeys = self.get_config("sys.config_keys").split()
-        self._imex_completed = threading.Event()
+        self._imex_events = Queue()
+        atexit.register(self.shutdown)
 
-    # XXX this can cause "illegal instructions" at test ends so we omit it for now
     # def __del__(self):
     #    self.shutdown()
 
@@ -70,6 +73,18 @@ class Account(object):
             d[key.lower()] = value
         return d
 
+    def set_stock_translation(self, id, string):
+        """ set stock translation string.
+
+        :param id: id of stock string (const.DC_STR_*)
+        :param value: string to set as new transalation
+        :returns: None
+        """
+        string = string.encode("utf8")
+        res = lib.dc_set_stock_translation(self._dc_context, id, string)
+        if res == 0:
+            raise ValueError("could not set translation string")
+
     def set_config(self, name, value):
         """ set configuration values.
 
@@ -122,11 +137,30 @@ class Account(object):
         if not self.is_configured():
             raise ValueError("need to configure first")
 
+    def empty_server_folders(self, inbox=False, mvbox=False):
+        """ empty server folders. """
+        flags = 0
+        if inbox:
+            flags |= const.DC_EMPTY_INBOX
+        if mvbox:
+            flags |= const.DC_EMPTY_MVBOX
+        if not flags:
+            raise ValueError("no flags set")
+        lib.dc_empty_server(self._dc_context, flags)
+
     def get_infostring(self):
         """ return info of the configured account. """
         self.check_is_configured()
         return from_dc_charpointer(lib.dc_get_info(self._dc_context))
 
+    def get_latest_backupfile(self, backupdir):
+        """ return the latest backup file in a given directory.
+        """
+        res = lib.dc_imex_has_backup(self._dc_context, as_dc_charpointer(backupdir))
+        if res == ffi.NULL:
+            return None
+        return from_dc_charpointer(res)
+
     def get_blobdir(self):
         """ return the directory for files.
 
@@ -136,9 +170,9 @@ class Account(object):
         return from_dc_charpointer(lib.dc_get_blobdir(self._dc_context))
 
     def get_self_contact(self):
-        """ return this account's identity as a :class:`deltachat.chatting.Contact`.
+        """ return this account's identity as a :class:`deltachat.contact.Contact`.
 
-        :returns: :class:`deltachat.chatting.Contact`
+        :returns: :class:`deltachat.contact.Contact`
         """
         self.check_is_configured()
         return Contact(self._dc_context, const.DC_CONTACT_ID_SELF)
@@ -150,7 +184,7 @@ class Account(object):
 
         :param email: email-address (text type)
         :param name: display name for this contact (optional)
-        :returns: :class:`deltachat.chatting.Contact` instance.
+        :returns: :class:`deltachat.contact.Contact` instance.
         """
         name = as_dc_charpointer(name)
         email = as_dc_charpointer(email)
@@ -176,7 +210,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.contact.Contact` objects.
         """
         flags = 0
         query = as_dc_charpointer(query)
@@ -194,7 +228,7 @@ class Account(object):
         """ create or get an existing 1:1 chat object for the specified contact or contact id.
 
         :param contact: chat_id (int) or contact object.
-        :returns: a :class:`deltachat.chatting.Chat` object.
+        :returns: a :class:`deltachat.chat.Chat` object.
         """
         if hasattr(contact, "id"):
             if contact._dc_context != self._dc_context:
@@ -211,7 +245,7 @@ class Account(object):
         the specified message.
 
         :param message: messsage id or message instance.
-        :returns: a :class:`deltachat.chatting.Chat` object.
+        :returns: a :class:`deltachat.chat.Chat` object.
         """
         if hasattr(message, "id"):
             if self._dc_context != message._dc_context:
@@ -229,16 +263,16 @@ class Account(object):
         Chats are unpromoted until the first message is sent.
 
         :param verified: if true only verified contacts can be added.
-        :returns: a :class:`deltachat.chatting.Chat` object.
+        :returns: a :class:`deltachat.chat.Chat` object.
         """
         bytes_name = name.encode("utf8")
-        chat_id = lib.dc_create_group_chat(self._dc_context, verified, bytes_name)
+        chat_id = lib.dc_create_group_chat(self._dc_context, int(verified), bytes_name)
         return Chat(self, chat_id)
 
     def get_chats(self):
         """ return list of chats.
 
-        :returns: a list of :class:`deltachat.chatting.Chat` objects.
+        :returns: a list of :class:`deltachat.chat.Chat` objects.
         """
         dc_chatlist = ffi.gc(
             lib.dc_get_chatlist(self._dc_context, 0, ffi.NULL, 0),
@@ -256,9 +290,24 @@ class Account(object):
         return Chat(self, const.DC_CHAT_ID_DEADDROP)
 
     def get_message_by_id(self, msg_id):
-        """ return Message instance. """
+        """ return Message instance.
+        :param msg_id: integer id of this message.
+        :returns: :class:`deltachat.message.Message` instance.
+        """
         return Message.from_db(self, msg_id)
 
+    def get_chat_by_id(self, chat_id):
+        """ return Chat instance.
+        :param chat_id: integer id of this chat.
+        :returns: :class:`deltachat.chat.Chat` instance.
+        :raises: ValueError if chat does not exist.
+        """
+        res = lib.dc_get_chat(self._dc_context, chat_id)
+        if res == ffi.NULL:
+            raise ValueError("cannot get chat with id={}".format(chat_id))
+        lib.dc_chat_unref(res)
+        return Chat(self, chat_id)
+
     def mark_seen_messages(self, messages):
         """ mark the given set of messages as seen.
 
@@ -275,7 +324,7 @@ class Account(object):
         """ Forward list of messages to a chat.
 
         :param messages: list of :class:`deltachat.message.Message` object.
-        :param chat: :class:`deltachat.chatting.Chat` object.
+        :param chat: :class:`deltachat.chat.Chat` object.
         :returns: None
         """
         msg_ids = [msg.id for msg in messages]
@@ -290,31 +339,64 @@ class Account(object):
         msg_ids = [msg.id for msg in messages]
         lib.dc_delete_msgs(self._dc_context, msg_ids, len(msg_ids))
 
-    def export_to_dir(self, backupdir):
-        """return after all delta chat state is exported to a new file in
-        the specified directory.
+    def export_self_keys(self, path):
+        """ export public and private keys to the specified directory. """
+        return self._export(path, imex_cmd=1)
+
+    def export_all(self, path):
+        """return new file containing a backup of all database state
+        (chats, contacts, keys, media, ...). The file is created in the
+        the `path` directory.
         """
-        snap_files = os.listdir(backupdir)
-        self._imex_completed.clear()
-        lib.dc_imex(self._dc_context, 11, as_dc_charpointer(backupdir), ffi.NULL)
+        export_files = self._export(path, 11)
+        if len(export_files) != 1:
+            raise RuntimeError("found more than one new file")
+        return export_files[0]
+
+    def _imex_events_clear(self):
+        try:
+            while True:
+                self._imex_events.get_nowait()
+        except Empty:
+            pass
+
+    def _export(self, path, imex_cmd):
+        self._imex_events_clear()
+        lib.dc_imex(self._dc_context, imex_cmd, as_dc_charpointer(path), ffi.NULL)
         if not self._threads.is_started():
             lib.dc_perform_imap_jobs(self._dc_context)
-        self._imex_completed.wait()
-        for x in os.listdir(backupdir):
-            if x not in snap_files:
-                return os.path.join(backupdir, x)
+        files_written = []
+        while True:
+            ev = self._imex_events.get()
+            if isinstance(ev, str):
+                files_written.append(ev)
+            elif isinstance(ev, bool):
+                if not ev:
+                    raise ValueError("export failed, exp-files: {}".format(files_written))
+                return files_written
 
-    def import_from_file(self, path):
-        """import delta chat state from the specified backup file.
+    def import_self_keys(self, path):
+        """ Import private keys found in the `path` directory.
+        The last imported key is made the default keys unless its name
+        contains the string legacy. Public keys are not imported.
+        """
+        self._import(path, imex_cmd=2)
+
+    def import_all(self, path):
+        """import delta chat state from the specified backup `path` (a file).
 
         The account must be in unconfigured state for import to attempted.
         """
         assert not self.is_configured(), "cannot import into configured account"
-        self._imex_completed.clear()
-        lib.dc_imex(self._dc_context, 12, as_dc_charpointer(path), ffi.NULL)
+        self._import(path, imex_cmd=12)
+
+    def _import(self, path, imex_cmd):
+        self._imex_events_clear()
+        lib.dc_imex(self._dc_context, imex_cmd, as_dc_charpointer(path), ffi.NULL)
         if not self._threads.is_started():
             lib.dc_perform_imap_jobs(self._dc_context)
-        self._imex_completed.wait()
+        if not self._imex_events.get():
+            raise ValueError("import from path '{}' failed".format(path))
 
     def initiate_key_transfer(self):
         """return setup code after a Autocrypt setup message
@@ -329,7 +411,69 @@ class Account(object):
             raise RuntimeError("could not send out autocrypt setup message")
         return from_dc_charpointer(res)
 
-    def start_threads(self):
+    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.chat.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.chat.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 stop_ongoing(self):
+        lib.dc_stop_ongoing_process(self._dc_context)
+
+    #
+    # meta API for start/stop and event based processing
+    #
+
+    def wait_next_incoming_message(self):
+        """ wait for and return next incoming message. """
+        ev = self._evlogger.get_matching("DC_EVENT_INCOMING_MSG")
+        return self.get_message_by_id(ev[2])
+
+    def start_threads(self, mvbox=False, sentbox=False):
         """ start IMAP/SMTP threads (and configure account if it hasn't happened).
 
         :raises: ValueError if 'addr' or 'mail_pw' are not configured.
@@ -337,21 +481,24 @@ class Account(object):
         """
         if not self.is_configured():
             self.configure()
-        self._threads.start()
+        self._threads.start(mvbox=mvbox, sentbox=sentbox)
 
     def stop_threads(self, wait=True):
         """ stop IMAP/SMTP threads. """
-        lib.dc_stop_ongoing_process(self._dc_context)
-        self._threads.stop(wait=wait)
+        if self._threads.is_started():
+            self.stop_ongoing()
+            self._threads.stop(wait=wait)
 
     def shutdown(self, wait=True):
         """ stop threads and close and remove underlying dc_context and callbacks. """
         if hasattr(self, "_dc_context") and hasattr(self, "_threads"):
-            self.stop_threads(wait=False)  # to interrupt idle and tell python threads to stop
+            # print("SHUTDOWN", self)
+            self.stop_threads(wait=False)
             lib.dc_close(self._dc_context)
             self.stop_threads(wait=wait)  # to wait for threads
             deltachat.clear_context_callback(self._dc_context)
             del self._dc_context
+            atexit.unregister(self.shutdown)
 
     def _process_event(self, ctx, evt_name, data1, data2):
         assert ctx == self._dc_context
@@ -364,7 +511,26 @@ class Account(object):
 
     def on_dc_event_imex_progress(self, data1, data2):
         if data1 == 1000:
-            self._imex_completed.set()
+            self._imex_events.put(True)
+        elif data1 == 0:
+            self._imex_events.put(False)
+
+    def on_dc_event_imex_file_written(self, data1, data2):
+        self._imex_events.put(data1)
+
+    def set_location(self, latitude=0.0, longitude=0.0, accuracy=0.0):
+        """set a new location. It effects all chats where we currently
+        have enabled location streaming.
+
+        :param latitude: float (use 0.0 if not known)
+        :param longitude: float (use 0.0 if not known)
+        :param accuracy: float (use 0.0 if not known)
+        :raises: ValueError if no chat is currently streaming locations
+        :returns: None
+        """
+        dc_res = lib.dc_set_location(self._dc_context, latitude, longitude, accuracy)
+        if dc_res == 0:
+            raise ValueError("no chat is streaming locations")
 
 
 class IOThreads:
@@ -377,10 +543,14 @@ class IOThreads:
     def is_started(self):
         return len(self._name2thread) > 0
 
-    def start(self, imap=True, smtp=True):
+    def start(self, imap=True, smtp=True, mvbox=False, sentbox=False):
         assert not self.is_started()
         if imap:
-            self._start_one_thread("imap", self.imap_thread_run)
+            self._start_one_thread("inbox", self.imap_thread_run)
+        if mvbox:
+            self._start_one_thread("mvbox", self.mvbox_thread_run)
+        if sentbox:
+            self._start_one_thread("sentbox", self.sentbox_thread_run)
         if smtp:
             self._start_one_thread("smtp", self.smtp_thread_run)
 
@@ -393,17 +563,37 @@ class IOThreads:
         self._thread_quitflag = True
         lib.dc_interrupt_imap_idle(self._dc_context)
         lib.dc_interrupt_smtp_idle(self._dc_context)
+        lib.dc_interrupt_mvbox_idle(self._dc_context)
+        lib.dc_interrupt_sentbox_idle(self._dc_context)
         if wait:
             for name, thread in self._name2thread.items():
                 thread.join()
 
     def imap_thread_run(self):
-        self._log_event("py-bindings-info", 0, "IMAP THREAD START")
+        self._log_event("py-bindings-info", 0, "INBOX THREAD START")
         while not self._thread_quitflag:
             lib.dc_perform_imap_jobs(self._dc_context)
-            lib.dc_perform_imap_fetch(self._dc_context)
-            lib.dc_perform_imap_idle(self._dc_context)
-        self._log_event("py-bindings-info", 0, "IMAP THREAD FINISHED")
+            if not self._thread_quitflag:
+                lib.dc_perform_imap_fetch(self._dc_context)
+            if not self._thread_quitflag:
+                lib.dc_perform_imap_idle(self._dc_context)
+        self._log_event("py-bindings-info", 0, "INBOX THREAD FINISHED")
+
+    def mvbox_thread_run(self):
+        self._log_event("py-bindings-info", 0, "MVBOX THREAD START")
+        while not self._thread_quitflag:
+            lib.dc_perform_mvbox_jobs(self._dc_context)
+            lib.dc_perform_mvbox_fetch(self._dc_context)
+            lib.dc_perform_mvbox_idle(self._dc_context)
+        self._log_event("py-bindings-info", 0, "MVBOX THREAD FINISHED")
+
+    def sentbox_thread_run(self):
+        self._log_event("py-bindings-info", 0, "SENTBOX THREAD START")
+        while not self._thread_quitflag:
+            lib.dc_perform_sentbox_jobs(self._dc_context)
+            lib.dc_perform_sentbox_fetch(self._dc_context)
+            lib.dc_perform_sentbox_idle(self._dc_context)
+        self._log_event("py-bindings-info", 0, "SENTBOX THREAD FINISHED")
 
     def smtp_thread_run(self):
         self._log_event("py-bindings-info", 0, "SMTP THREAD START")
@@ -433,6 +623,10 @@ 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)
@@ -451,11 +645,11 @@ class EventLogger:
             else:
                 assert not rex.match(ev[0]), "event found {}".format(ev)
 
-    def get_matching(self, event_name_regex, check_error=True):
+    def get_matching(self, event_name_regex, check_error=True, timeout=None):
         self._log("-- waiting for event with regex: {} --".format(event_name_regex))
         rex = re.compile("(?:{}).*".format(event_name_regex))
         while 1:
-            ev = self.get()
+            ev = self.get(timeout=timeout, check_error=check_error)
             if rex.match(ev[0]):
                 return ev
 
@@ -492,3 +686,18 @@ 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/chat.py

@@ -1,57 +1,16 @@
-""" chatting related objects: Contact, Chat, Message. """
+""" Chat and Location related API. """
 
 import mimetypes
-from . import props
+import calendar
+import json
+from datetime import datetime
+import os
 from .cutil import as_dc_charpointer, from_dc_charpointer, iter_array
 from .capi import lib, ffi
 from . import const
 from .message import Message
 
 
-class Contact(object):
-    """ Delta-Chat Contact.
-
-    You obtain instances of it through :class:`deltachat.account.Account`.
-    """
-    def __init__(self, dc_context, id):
-        self._dc_context = dc_context
-        self.id = id
-
-    def __eq__(self, other):
-        return self._dc_context == other._dc_context and self.id == other.id
-
-    def __ne__(self, other):
-        return not (self == other)
-
-    def __repr__(self):
-        return "<Contact id={} addr={} dc_context={}>".format(self.id, self.addr, self._dc_context)
-
-    @property
-    def _dc_contact(self):
-        return ffi.gc(
-            lib.dc_get_contact(self._dc_context, self.id),
-            lib.dc_contact_unref
-        )
-
-    @props.with_doc
-    def addr(self):
-        """ normalized e-mail address for this account. """
-        return from_dc_charpointer(lib.dc_contact_get_addr(self._dc_contact))
-
-    @props.with_doc
-    def display_name(self):
-        """ display name for this contact. """
-        return from_dc_charpointer(lib.dc_contact_get_display_name(self._dc_contact))
-
-    def is_blocked(self):
-        """ Return True if the contact is blocked. """
-        return lib.dc_contact_is_blocked(self._dc_contact)
-
-    def is_verified(self):
-        """ Return True if the contact is verified. """
-        return lib.dc_contact_is_verified(self._dc_contact)
-
-
 class Chat(object):
     """ Chat object which manages members and through which you can send and retrieve messages.
 
@@ -108,6 +67,13 @@ class Chat(object):
         """
         return not lib.dc_chat_is_unpromoted(self._dc_chat)
 
+    def is_verified(self):
+        """ return True if this chat is a verified group.
+
+        :returns: True if chat is verified, False otherwise.
+        """
+        return lib.dc_chat_is_verified(self._dc_chat)
+
     def get_name(self):
         """ return name of this chat.
 
@@ -131,6 +97,16 @@ 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):
@@ -267,6 +243,12 @@ class Chat(object):
         """
         return lib.dc_marknoticed_chat(self._dc_context, self.id)
 
+    def get_summary(self):
+        """ return dictionary with summary information. """
+        dc_res = lib.dc_chat_get_info_json(self._dc_context, self.id)
+        s = from_dc_charpointer(dc_res)
+        return json.loads(s)
+
     # ------  group management API ------------------------------
 
     def add_contact(self, contact):
@@ -294,10 +276,10 @@ class Chat(object):
     def get_contacts(self):
         """ get all contacts for this chat.
         :params: contact object.
-        :raises ValueError: if contact could not be added
-        :returns: list of :class:`deltachat.chatting.Contact` objects for this chat
+        :returns: list of :class:`deltachat.contact.Contact` objects for this chat
 
         """
+        from .contact import Contact
         dc_array = ffi.gc(
             lib.dc_get_chat_contacts(self._dc_context, self.id),
             lib.dc_array_unref
@@ -305,3 +287,123 @@ 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)
+
+    def get_color(self):
+        """return the color of the chat.
+        :returns: color as 0x00rrggbb
+        """
+        return lib.dc_chat_get_color(self._dc_chat)
+
+    def get_subtitle(self):
+        """return the subtitle of the chat
+        :returns: the subtitle
+        """
+        return from_dc_charpointer(lib.dc_chat_get_subtitle(self._dc_chat))
+
+    # ------  location streaming API ------------------------------
+
+    def is_sending_locations(self):
+        """return True if this chat has location-sending enabled currently.
+        :returns: True if location sending is enabled.
+        """
+        return lib.dc_is_sending_locations_to_chat(self._dc_context, self.id)
+
+    def is_archived(self):
+        """return True if this chat is archived.
+        :returns: True if archived.
+        """
+        return lib.dc_chat_get_archived(self._dc_chat)
+
+    def enable_sending_locations(self, seconds):
+        """enable sending locations for this chat.
+
+        all subsequent messages will carry a location with them.
+        """
+        lib.dc_send_locations_to_chat(self._dc_context, self.id, seconds)
+
+    def get_locations(self, contact=None, timestamp_from=None, timestamp_to=None):
+        """return list of locations for the given contact in the given timespan.
+
+        :param contact: the contact for which locations shall be returned.
+        :param timespan_from: a datetime object or None (indicating "since beginning")
+        :param timespan_to: a datetime object or None (indicating up till now)
+        :returns: list of :class:`deltachat.chat.Location` objects.
+        """
+        if timestamp_from is None:
+            time_from = 0
+        else:
+            time_from = calendar.timegm(timestamp_from.utctimetuple())
+        if timestamp_to is None:
+            time_to = 0
+        else:
+            time_to = calendar.timegm(timestamp_to.utctimetuple())
+
+        if contact is None:
+            contact_id = 0
+        else:
+            contact_id = contact.id
+
+        dc_array = lib.dc_get_locations(self._dc_context, self.id, contact_id, time_from, time_to)
+        return [
+            Location(
+                latitude=lib.dc_array_get_latitude(dc_array, i),
+                longitude=lib.dc_array_get_longitude(dc_array, i),
+                accuracy=lib.dc_array_get_accuracy(dc_array, i),
+                timestamp=datetime.utcfromtimestamp(lib.dc_array_get_timestamp(dc_array, i)))
+            for i in range(lib.dc_array_get_cnt(dc_array))
+        ]
+
+
+class Location:
+    def __init__(self, latitude, longitude, accuracy, timestamp):
+        assert isinstance(timestamp, datetime)
+        self.latitude = latitude
+        self.longitude = longitude
+        self.accuracy = accuracy
+        self.timestamp = timestamp
+
+    def __eq__(self, other):
+        return self.__dict__ == other.__dict__

python/src/deltachat/const.py

@@ -13,6 +13,15 @@ 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
@@ -38,19 +47,40 @@ DC_STATE_OUT_FAILED = 24
 DC_STATE_OUT_DELIVERED = 26
 DC_STATE_OUT_MDN_RCVD = 28
 DC_CONTACT_ID_SELF = 1
-DC_CONTACT_ID_DEVICE = 2
+DC_CONTACT_ID_INFO = 2
+DC_CONTACT_ID_DEVICE = 5
 DC_CONTACT_ID_LAST_SPECIAL = 9
 DC_MSG_TEXT = 10
 DC_MSG_IMAGE = 20
 DC_MSG_GIF = 21
+DC_MSG_STICKER = 23
 DC_MSG_AUDIO = 40
 DC_MSG_VOICE = 41
 DC_MSG_VIDEO = 50
 DC_MSG_FILE = 60
+DC_LP_AUTH_OAUTH2 = 0x2
+DC_LP_AUTH_NORMAL = 0x4
+DC_LP_IMAP_SOCKET_STARTTLS = 0x100
+DC_LP_IMAP_SOCKET_SSL = 0x200
+DC_LP_IMAP_SOCKET_PLAIN = 0x400
+DC_LP_SMTP_SOCKET_STARTTLS = 0x10000
+DC_LP_SMTP_SOCKET_SSL = 0x20000
+DC_LP_SMTP_SOCKET_PLAIN = 0x40000
+DC_CERTCK_AUTO = 0
+DC_CERTCK_STRICT = 1
+DC_CERTCK_ACCEPT_INVALID_HOSTNAMES = 2
+DC_CERTCK_ACCEPT_INVALID_CERTIFICATES = 3
+DC_EMPTY_MVBOX = 0x01
+DC_EMPTY_INBOX = 0x02
 DC_EVENT_INFO = 100
 DC_EVENT_SMTP_CONNECTED = 101
 DC_EVENT_IMAP_CONNECTED = 102
 DC_EVENT_SMTP_MESSAGE_SENT = 103
+DC_EVENT_IMAP_MESSAGE_DELETED = 104
+DC_EVENT_IMAP_MESSAGE_MOVED = 105
+DC_EVENT_IMAP_FOLDER_EMPTIED = 106
+DC_EVENT_NEW_BLOB_FILE = 150
+DC_EVENT_DELETED_BLOB_FILE = 151
 DC_EVENT_WARNING = 300
 DC_EVENT_ERROR = 400
 DC_EVENT_ERROR_NETWORK = 401
@@ -68,16 +98,67 @@ DC_EVENT_IMEX_PROGRESS = 2051
 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_SECUREJOIN_MEMBER_ADDED = 2062
 DC_EVENT_FILE_COPIED = 2055
 DC_EVENT_IS_OFFLINE = 2081
+DC_EVENT_GET_STRING = 2091
+DC_STR_SELFNOTINGRP = 21
+DC_PROVIDER_STATUS_OK = 1
+DC_PROVIDER_STATUS_PREPARATION = 2
+DC_PROVIDER_STATUS_BROKEN = 3
+DC_STR_NOMESSAGES = 1
+DC_STR_SELF = 2
+DC_STR_DRAFT = 3
+DC_STR_MEMBER = 4
+DC_STR_CONTACT = 6
+DC_STR_VOICEMESSAGE = 7
+DC_STR_DEADDROP = 8
+DC_STR_IMAGE = 9
+DC_STR_VIDEO = 10
+DC_STR_AUDIO = 11
+DC_STR_FILE = 12
+DC_STR_STATUSLINE = 13
+DC_STR_NEWGROUPDRAFT = 14
+DC_STR_MSGGRPNAME = 15
+DC_STR_MSGGRPIMGCHANGED = 16
+DC_STR_MSGADDMEMBER = 17
+DC_STR_MSGDELMEMBER = 18
+DC_STR_MSGGROUPLEFT = 19
+DC_STR_GIF = 23
+DC_STR_ENCRYPTEDMSG = 24
+DC_STR_E2E_AVAILABLE = 25
+DC_STR_ENCR_TRANSP = 27
+DC_STR_ENCR_NONE = 28
+DC_STR_CANTDECRYPT_MSG_BODY = 29
+DC_STR_FINGERPRINTS = 30
+DC_STR_READRCPT = 31
+DC_STR_READRCPT_MAILBODY = 32
+DC_STR_MSGGRPIMGDELETED = 33
+DC_STR_E2E_PREFERRED = 34
+DC_STR_CONTACT_VERIFIED = 35
+DC_STR_CONTACT_NOT_VERIFIED = 36
+DC_STR_CONTACT_SETUP_CHANGED = 37
+DC_STR_ARCHIVEDCHATS = 40
+DC_STR_STARREDMSGS = 41
+DC_STR_AC_SETUP_MSG_SUBJECT = 42
+DC_STR_AC_SETUP_MSG_BODY = 43
+DC_STR_SELFTALK_SUBTITLE = 50
+DC_STR_CANNOT_LOGIN = 60
+DC_STR_SERVER_RESPONSE = 61
+DC_STR_MSGACTIONBYUSER = 62
+DC_STR_MSGACTIONBYME = 63
+DC_STR_MSGLOCATIONENABLED = 64
+DC_STR_MSGLOCATIONDISABLED = 65
+DC_STR_LOCATION = 66
+DC_STR_STICKER = 67
+DC_STR_DEVICE_MESSAGES = 68
+DC_STR_COUNT = 68
 # end const generated
 
 
 def read_event_defines(f):
-    rex = re.compile(r'#define\s+((?:DC_EVENT_|DC_MSG|DC_STATE_|DC_CONTACT_ID_|DC_GCL|DC_CHAT)\S+)\s+([x\d]+).*')
+    rex = re.compile(r'#define\s+((?:DC_EVENT|DC_QR|DC_MSG|DC_LP|DC_EMPTY|DC_CERTCK|DC_STATE|DC_STR|'
+                     r'DC_CONTACT_ID|DC_GCL|DC_CHAT|DC_PROVIDER)_\S+)\s+([x\d]+).*')
     for line in f:
         m = rex.match(line)
         if m:
@@ -90,7 +171,7 @@ if __name__ == "__main__":
     if len(sys.argv) >= 2:
         deltah = sys.argv[1]
     else:
-        deltah = joinpath(dirname(dirname(dirname(here_dir))), "src", "deltachat.h")
+        deltah = joinpath(dirname(dirname(dirname(here_dir))), "deltachat-ffi", "deltachat.h")
     assert os.path.exists(deltah)
 
     lines = []

python/src/deltachat/contact.py

@@ -0,0 +1,49 @@
+""" Contact object. """
+
+from . import props
+from .cutil import from_dc_charpointer
+from .capi import lib, ffi
+
+
+class Contact(object):
+    """ Delta-Chat Contact.
+
+    You obtain instances of it through :class:`deltachat.account.Account`.
+    """
+    def __init__(self, dc_context, id):
+        self._dc_context = dc_context
+        self.id = id
+
+    def __eq__(self, other):
+        return self._dc_context == other._dc_context and self.id == other.id
+
+    def __ne__(self, other):
+        return not (self == other)
+
+    def __repr__(self):
+        return "<Contact id={} addr={} dc_context={}>".format(self.id, self.addr, self._dc_context)
+
+    @property
+    def _dc_contact(self):
+        return ffi.gc(
+            lib.dc_get_contact(self._dc_context, self.id),
+            lib.dc_contact_unref
+        )
+
+    @props.with_doc
+    def addr(self):
+        """ normalized e-mail address for this account. """
+        return from_dc_charpointer(lib.dc_contact_get_addr(self._dc_contact))
+
+    @props.with_doc
+    def display_name(self):
+        """ display name for this contact. """
+        return from_dc_charpointer(lib.dc_contact_get_display_name(self._dc_contact))
+
+    def is_blocked(self):
+        """ Return True if the contact is blocked. """
+        return lib.dc_contact_is_blocked(self._dc_contact)
+
+    def is_verified(self):
+        """ Return True if the contact is verified. """
+        return lib.dc_contact_is_verified(self._dc_contact)

python/src/deltachat/cutil.py

@@ -1,5 +1,6 @@
 from .capi import lib
 from .capi import ffi
+from datetime import datetime
 
 
 def as_dc_charpointer(obj):
@@ -17,3 +18,29 @@ 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)

python/src/deltachat/message.py

@@ -1,4 +1,4 @@
-""" chatting related objects: Contact, Chat, Message. """
+""" The Message object. """
 
 import os
 import shutil
@@ -13,7 +13,7 @@ class Message(object):
     """ Message object.
 
     You obtain instances of it through :class:`deltachat.account.Account` or
-    :class:`deltachat.chatting.Chat`.
+    :class:`deltachat.chat.Chat`.
     """
     def __init__(self, account, dc_msg):
         self.account = account
@@ -58,8 +58,6 @@ class Message(object):
 
     def set_text(self, text):
         """set text of this message. """
-        assert self.id > 0, "message not prepared"
-        assert self.is_out_preparing()
         lib.dc_msg_set_text(self._dc_msg, as_dc_charpointer(text))
 
     @props.with_doc
@@ -101,6 +99,18 @@ class Message(object):
         """ return True if this message is a setup message. """
         return lib.dc_msg_is_setupmessage(self._dc_msg)
 
+    def get_setupcodebegin(self):
+        """ return the first characters of a setup code in a setup message. """
+        return from_dc_charpointer(lib.dc_msg_get_setupcodebegin(self._dc_msg))
+
+    def is_encrypted(self):
+        """ return True if this message was encrypted. """
+        return bool(lib.dc_msg_get_showpadlock(self._dc_msg))
+
+    def is_forwarded(self):
+        """ return True if this message was forwarded. """
+        return bool(lib.dc_msg_is_forwarded(self._dc_msg))
+
     def get_message_info(self):
         """ Return informational text for a single message.
 
@@ -110,7 +120,13 @@ class Message(object):
 
     def continue_key_transfer(self, setup_code):
         """ extract key and use it as primary key for this account. """
-        lib.dc_continue_key_transfer(self._dc_context, self.id, as_dc_charpointer(setup_code))
+        res = lib.dc_continue_key_transfer(
+                self._dc_context,
+                self.id,
+                as_dc_charpointer(setup_code)
+        )
+        if res == 0:
+            raise ValueError("could not decrypt")
 
     @props.with_doc
     def time_sent(self):
@@ -144,25 +160,25 @@ class Message(object):
         if mime_headers:
             s = ffi.string(ffi.gc(mime_headers, lib.dc_str_unref))
             if isinstance(s, bytes):
-                s = s.decode("ascii")
+                return email.message_from_bytes(s)
             return email.message_from_string(s)
 
     @property
     def chat(self):
         """chat this message was posted in.
 
-        :returns: :class:`deltachat.chatting.Chat` object
+        :returns: :class:`deltachat.chat.Chat` object
         """
-        from .chatting import Chat
+        from .chat import Chat
         chat_id = lib.dc_msg_get_chat_id(self._dc_msg)
         return Chat(self.account, chat_id)
 
     def get_sender_contact(self):
         """return the contact of who wrote the message.
 
-        :returns: :class:`deltachat.chatting.Contact` instance
+        :returns: :class:`deltachat.chat.Contact` instance
         """
-        from .chatting import Contact
+        from .contact import Contact
         contact_id = lib.dc_msg_get_from_id(self._dc_msg)
         return Contact(self._dc_context, contact_id)
 

python/src/deltachat/provider.py

@@ -0,0 +1,67 @@
+"""Provider info class."""
+
+from .capi import ffi, lib
+from .cutil import as_dc_charpointer, from_dc_charpointer
+
+
+class ProviderNotFoundError(Exception):
+    """The provider information was not found."""
+
+
+class Provider(object):
+    """Provider information.
+
+    :param domain: The domain to get the provider info for, this is
+    normally the part following the `@` of the domain.
+    """
+
+    def __init__(self, domain):
+        provider = ffi.gc(
+            lib.dc_provider_new_from_domain(as_dc_charpointer(domain)),
+            lib.dc_provider_unref,
+        )
+        if provider == ffi.NULL:
+            raise ProviderNotFoundError("Provider not found")
+        self._provider = provider
+
+    @classmethod
+    def from_email(cls, email):
+        """Create provider info from an email address.
+
+        :param email: Email address to get provider info for.
+        """
+        return cls(email.split('@')[-1])
+
+    @property
+    def overview_page(self):
+        """URL to the overview page of the provider on providers.delta.chat."""
+        return from_dc_charpointer(
+            lib.dc_provider_get_overview_page(self._provider))
+
+    @property
+    def name(self):
+        """The name of the provider."""
+        return from_dc_charpointer(lib.dc_provider_get_name(self._provider))
+
+    @property
+    def markdown(self):
+        """Content of the information page, formatted as markdown."""
+        return from_dc_charpointer(
+            lib.dc_provider_get_markdown(self._provider))
+
+    @property
+    def status_date(self):
+        """The date the provider info was last updated, as a string."""
+        return from_dc_charpointer(
+            lib.dc_provider_get_status_date(self._provider))
+
+    @property
+    def status(self):
+        """The status of the provider information.
+
+        This is one of the
+        :attr:`deltachat.const.DC_PROVIDER_STATUS_OK`,
+        :attr:`deltachat.const.DC_PROVIDER_STATUS_PREPARATION` or
+        :attr:`deltachat.const.DC_PROVIDER_STATUS_BROKEN` constants.
+        """
+        return lib.dc_provider_get_status(self._provider)

python/tests/conftest.py

@@ -4,6 +4,7 @@ import pytest
 import requests
 import time
 from deltachat import Account
+from deltachat import const
 from deltachat.capi import lib
 import tempfile
 
@@ -24,17 +25,6 @@ def pytest_configure(config):
             config.option.liveconfig = cfg
 
 
-@pytest.hookimpl(trylast=True)
-def pytest_runtest_call(item):
-    # perform early finalization because we otherwise get cloberred
-    # output from concurrent threads printing between execution
-    # of the test function and the teardown phase of that test function
-    if "acfactory" in item.funcargs:
-        print("*"*30, "finalizing", "*"*30)
-        acfactory = item.funcargs["acfactory"]
-        acfactory.finalize()
-
-
 def pytest_report_header(config, startdir):
     summary = []
 
@@ -136,13 +126,17 @@ def acfactory(pytestconfig, tmpdir, request, session_liveconfig):
                 fin = self._finalizers.pop()
                 fin()
 
+        def make_account(self, path, logid):
+            ac = Account(path, logid=logid)
+            self._finalizers.append(ac.shutdown)
+            return ac
+
         def get_unconfigured_account(self):
             self.offline_count += 1
             tmpdb = tmpdir.join("offlinedb%d" % self.offline_count)
-            ac = Account(tmpdb.strpath, logid="ac{}".format(self.offline_count))
+            ac = self.make_account(tmpdb.strpath, logid="ac{}".format(self.offline_count))
             ac._evlogger.init_time = self.init_time
             ac._evlogger.set_timeout(2)
-            self._finalizers.append(ac.shutdown)
             return ac
 
         def get_configured_offline_account(self):
@@ -157,34 +151,63 @@ def acfactory(pytestconfig, tmpdir, request, session_liveconfig):
             lib.dc_set_config(ac._dc_context, b"configured", b"1")
             return ac
 
-        def get_online_configuring_account(self):
+        def peek_online_config(self):
+            if not session_liveconfig:
+                pytest.skip("specify DCC_PY_LIVECONFIG or --liveconfig")
+            return session_liveconfig.get(self.live_count)
+
+        def get_online_config(self):
             if not session_liveconfig:
                 pytest.skip("specify DCC_PY_LIVECONFIG or --liveconfig")
             configdict = session_liveconfig.get(self.live_count)
             self.live_count += 1
             if "e2ee_enabled" not in configdict:
                 configdict["e2ee_enabled"] = "1"
+
+            # Enable strict certificate checks for online accounts
+            configdict["imap_certificate_checks"] = str(const.DC_CERTCK_STRICT)
+            configdict["smtp_certificate_checks"] = str(const.DC_CERTCK_STRICT)
+
             tmpdb = tmpdir.join("livedb%d" % self.live_count)
-            ac = Account(tmpdb.strpath, logid="ac{}".format(self.live_count))
+            ac = self.make_account(tmpdb.strpath, logid="ac{}".format(self.live_count))
             ac._evlogger.init_time = self.init_time
             ac._evlogger.set_timeout(30)
+            return ac, dict(configdict)
+
+        def get_online_configuring_account(self, mvbox=False, sentbox=False):
+            ac, configdict = self.get_online_config()
             ac.configure(**configdict)
-            ac.start_threads()
-            self._finalizers.append(ac.shutdown)
+            ac.start_threads(mvbox=mvbox, sentbox=sentbox)
             return ac
 
+        def get_one_online_account(self):
+            ac1 = self.get_online_configuring_account()
+            wait_successful_IMAP_SMTP_connection(ac1)
+            wait_configuration_progress(ac1, 1000)
+            return ac1
+
+        def get_two_online_accounts(self):
+            ac1 = self.get_online_configuring_account()
+            ac2 = self.get_online_configuring_account()
+            wait_successful_IMAP_SMTP_connection(ac1)
+            wait_configuration_progress(ac1, 1000)
+            wait_successful_IMAP_SMTP_connection(ac2)
+            wait_configuration_progress(ac2, 1000)
+            return ac1, ac2
+
         def clone_online_account(self, account):
             self.live_count += 1
             tmpdb = tmpdir.join("livedb%d" % self.live_count)
-            ac = Account(tmpdb.strpath, logid="ac{}".format(self.live_count))
+            ac = self.make_account(tmpdb.strpath, logid="ac{}".format(self.live_count))
             ac._evlogger.init_time = self.init_time
             ac._evlogger.set_timeout(30)
             ac.configure(addr=account.get_config("addr"), mail_pw=account.get_config("mail_pw"))
             ac.start_threads()
-            self._finalizers.append(ac.shutdown)
             return ac
 
-    return AccountMaker()
+    am = AccountMaker()
+    request.addfinalizer(am.finalize)
+    return am
 
 
 @pytest.fixture
@@ -204,12 +227,22 @@ def lp():
     return Printer()
 
 
-def wait_configuration_progress(account, target):
+def wait_configuration_progress(account, min_target, max_target=1001):
+    min_target = min(min_target, max_target)
     while 1:
         evt_name, data1, data2 = \
             account._evlogger.get_matching("DC_EVENT_CONFIGURE_PROGRESS")
-        if data1 >= target:
-            print("** CONFIG PROGRESS {}".format(target), account)
+        if data1 >= min_target and data1 <= max_target:
+            print("** CONFIG PROGRESS {}".format(min_target), account)
+            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
 
 

python/tests/test_account.py

@@ -1,10 +1,12 @@
 from __future__ import print_function
 import pytest
 import os
+import queue
+import time
 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
+from conftest import wait_configuration_progress, wait_successful_IMAP_SMTP_connection, wait_securejoin_inviter_progress
 
 
 class TestOfflineAccountBasic:
@@ -19,6 +21,7 @@ class TestOfflineAccountBasic:
         d = ac1.get_info()
         assert d["arch"]
         assert d["number_of_chats"] == "0"
+        assert d["bcc_self"] == "0"
 
     def test_is_not_configured(self, acfactory):
         ac1 = acfactory.get_unconfigured_account()
@@ -37,6 +40,11 @@ class TestOfflineAccountBasic:
         ac1 = acfactory.get_unconfigured_account()
         assert "save_mime_headers" in ac1.get_config("sys.config_keys").split()
 
+    def test_has_bccself(self, acfactory):
+        ac1 = acfactory.get_unconfigured_account()
+        assert "bcc_self" in ac1.get_config("sys.config_keys").split()
+        assert ac1.get_config("bcc_self") == "0"
+
     def test_selfcontact_if_unconfigured(self, acfactory):
         ac1 = acfactory.get_unconfigured_account()
         with pytest.raises(ValueError):
@@ -93,8 +101,9 @@ class TestOfflineContact:
         ac1 = acfactory.get_configured_offline_account()
         contact1 = ac1.create_contact(email="some1@example.com", name="some1")
         chat = ac1.create_chat_by_contact(contact1)
-        chat.send_text("one messae")
+        msg = chat.send_text("one message")
         assert not ac1.delete_contact(contact1)
+        assert not msg.filemime
 
 
 class TestOfflineChat:
@@ -106,13 +115,19 @@ class TestOfflineChat:
     def chat1(self, ac1):
         contact1 = ac1.create_contact("some1@hello.com", name="some1")
         chat = ac1.create_chat_by_contact(contact1)
-        assert chat.id >= const.DC_CHAT_ID_LAST_SPECIAL, chat.id
+        assert chat.id > const.DC_CHAT_ID_LAST_SPECIAL, chat.id
         return chat
 
     def test_display(self, chat1):
         str(chat1)
         repr(chat1)
 
+    def test_chat_by_id(self, chat1):
+        chat2 = chat1.account.get_chat_by_id(chat1.id)
+        assert chat2 == chat1
+        with pytest.raises(ValueError):
+            chat1.account.get_chat_by_id(123123)
+
     def test_chat_idempotent(self, chat1, ac1):
         contact1 = chat1.get_contacts()[0]
         chat2 = ac1.create_chat_by_contact(contact1.id)
@@ -140,6 +155,55 @@ class TestOfflineChat:
         chat.set_name("title2")
         assert chat.get_name() == "title2"
 
+        d = chat.get_summary()
+        print(d)
+        assert d["id"] == chat.id
+        assert d["type"] == chat.get_type()
+        assert d["name"] == chat.get_name()
+        assert d["archived"] == chat.is_archived()
+        # assert d["param"] == chat.param
+        assert d["color"] == chat.get_color()
+        assert d["profile_image"] == "" if chat.get_profile_image() is None else chat.get_profile_image()
+        assert d["subtitle"] == chat.get_subtitle()
+        assert d["draft"] == "" if chat.get_draft() is None else chat.get_draft()
+
+    def test_group_chat_creation_with_translation(self, ac1):
+        ac1.set_stock_translation(const.DC_STR_NEWGROUPDRAFT, "xyz %1$s")
+        ac1._evlogger.consume_events()
+        with pytest.raises(ValueError):
+            ac1.set_stock_translation(const.DC_STR_NEWGROUPDRAFT, "xyz %2$s")
+        ac1._evlogger.get_matching("DC_EVENT_WARNING")
+        with pytest.raises(ValueError):
+            ac1.set_stock_translation(500, "xyz %1$s")
+        ac1._evlogger.get_matching("DC_EVENT_WARNING")
+        contact1 = ac1.create_contact("some1@hello.com", name="some1")
+        contact2 = ac1.create_contact("some2@hello.com", name="some2")
+        chat = ac1.create_group_chat(name="title1")
+        chat.add_contact(contact1)
+        chat.add_contact(contact2)
+        assert chat.get_name() == "title1"
+        assert contact1 in chat.get_contacts()
+        assert contact2 in chat.get_contacts()
+        assert not chat.is_promoted()
+        msg = chat.get_draft()
+        assert msg.text == "xyz title1"
+
+    @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")
@@ -205,7 +269,9 @@ class TestOfflineChat:
             chat1.send_image(path="notexists")
         fn = data.get_path("d.png")
         lp.sec("sending image")
+        chat1.account._evlogger.consume_events()
         msg = chat1.send_image(fn)
+        chat1.account._evlogger.get_matching("DC_EVENT_NEW_BLOB_FILE")
         assert msg.is_image()
         assert msg
         assert msg.id > 0
@@ -277,10 +343,10 @@ class TestOfflineChat:
         assert contact == ac1.get_self_contact()
         assert not backupdir.listdir()
 
-        path = ac1.export_to_dir(backupdir.strpath)
+        path = ac1.export_all(backupdir.strpath)
         assert os.path.exists(path)
         ac2 = acfactory.get_unconfigured_account()
-        ac2.import_from_file(path)
+        ac2.import_all(path)
         contacts = ac2.get_contacts(query="some1")
         assert len(contacts) == 1
         contact2 = contacts[0]
@@ -306,87 +372,221 @@ 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):
-        ac1 = acfactory.get_online_configuring_account()
-        wait_successful_IMAP_SMTP_connection(ac1)
-        wait_configuration_progress(ac1, 1000)
-
-    def test_one_account_send(self, acfactory):
-        ac1 = acfactory.get_online_configuring_account()
-        c2 = ac1.create_contact(email=ac1.get_config("addr"))
-        chat = ac1.create_chat_by_contact(c2)
-        assert chat.id >= const.DC_CHAT_ID_LAST_SPECIAL
-        wait_successful_IMAP_SMTP_connection(ac1)
-        wait_configuration_progress(ac1, 1000)
-
-        msg_out = chat.send_text("message2")
-        # wait for own account to receive
-        ev = ac1._evlogger.get_matching("DC_EVENT_INCOMING_MSG|DC_EVENT_MSGS_CHANGED")
-        assert ev[1] == msg_out.id
-
-    def test_two_accounts_send_receive(self, acfactory):
-        ac1 = acfactory.get_online_configuring_account()
-        ac2 = acfactory.get_online_configuring_account()
+    def get_chat(self, ac1, ac2, both_created=False):
         c2 = ac1.create_contact(email=ac2.get_config("addr"))
         chat = ac1.create_chat_by_contact(c2)
-        assert chat.id >= const.DC_CHAT_ID_LAST_SPECIAL
+        assert chat.id > const.DC_CHAT_ID_LAST_SPECIAL
+        if both_created:
+            ac2.create_chat_by_contact(ac2.create_contact(email=ac1.get_config("addr")))
+        return chat
+
+    def test_configure_canceled(self, acfactory):
+        ac1 = acfactory.get_online_configuring_account()
+        wait_configuration_progress(ac1, 200)
+        ac1.stop_ongoing()
+        wait_configuration_progress(ac1, 0, 0)
+
+    def test_export_import_self_keys(self, acfactory, tmpdir):
+        ac1, ac2 = acfactory.get_two_online_accounts()
+        dir = tmpdir.mkdir("exportdir")
+        export_files = ac1.export_self_keys(dir.strpath)
+        assert len(export_files) == 2
+        for x in export_files:
+            assert x.startswith(dir.strpath)
+        ac1._evlogger.consume_events()
+        ac1.import_self_keys(dir.strpath)
+
+    def test_one_account_send_bcc_setting(self, acfactory, lp):
+        ac1 = acfactory.get_online_configuring_account()
+        ac2_config = acfactory.peek_online_config()
+        c2 = ac1.create_contact(email=ac2_config["addr"])
+        chat = ac1.create_chat_by_contact(c2)
+        assert chat.id > const.DC_CHAT_ID_LAST_SPECIAL
         wait_successful_IMAP_SMTP_connection(ac1)
         wait_configuration_progress(ac1, 1000)
-        wait_successful_IMAP_SMTP_connection(ac2)
-        wait_configuration_progress(ac2, 1000)
 
-        msg_out = chat.send_text("message1")
+        lp.sec("ac1: setting bcc_self=1")
+        ac1.set_config("bcc_self", "1")
 
-        # wait for other account to receive
-        ev = ac2._evlogger.get_matching("DC_EVENT_INCOMING_MSG|DC_EVENT_MSGS_CHANGED")
+        lp.sec("send out message with bcc to ourselves")
+        msg_out = chat.send_text("message2")
+        ev = ac1._evlogger.get_matching("DC_EVENT_MSGS_CHANGED")
         assert ev[2] == msg_out.id
-        msg_in = ac2.get_message_by_id(msg_out.id)
-        assert msg_in.text == "message1"
+        # wait for send out (BCC)
+        assert ac1.get_config("bcc_self") == "1"
+        self_addr = ac1.get_config("addr")
+        ev = ac1._evlogger.get_matching("DC_EVENT_SMTP_MESSAGE_SENT")
+        assert self_addr in ev[2]
+        ev = ac1._evlogger.get_matching("DC_EVENT_DELETED_BLOB_FILE")
 
-    def test_forward_messages(self, acfactory):
-        ac1 = acfactory.get_online_configuring_account()
+        ac1._evlogger.consume_events()
+        lp.sec("send out message without bcc")
+        ac1.set_config("bcc_self", "0")
+        msg_out = chat.send_text("message3")
+        assert not msg_out.is_forwarded()
+        ev = ac1._evlogger.get_matching("DC_EVENT_MSGS_CHANGED")
+        assert ev[2] == msg_out.id
+        ev = ac1._evlogger.get_matching("DC_EVENT_SMTP_MESSAGE_SENT")
+        assert self_addr not in ev[2]
+        ev = ac1._evlogger.get_matching("DC_EVENT_DELETED_BLOB_FILE")
+
+    def test_prepare_file_with_unicode(self, acfactory, lp):
+        ac1, ac2 = acfactory.get_two_online_accounts()
+        chat = self.get_chat(ac1, ac2)
+
+        lp.sec("ac1: prepare and send attachment + text to ac2")
+        blobdir = ac1.get_blobdir()
+        basename = "somedäüta.txt"
+        p = os.path.join(blobdir, basename)
+        with open(p, "w") as f:
+            f.write("some data")
+        msg = Message.new_empty(ac1, "file")
+        msg.set_text("hello ä world")
+        msg.set_file(p)
+        message = chat.prepare_message(msg)
+        assert message.is_out_preparing()
+        assert message.text == "hello ä world"
+        chat.send_prepared(message)
+
+        lp.sec("ac2: receive message")
+        ev = ac2._evlogger.get_matching("DC_EVENT_INCOMING_MSG|DC_EVENT_MSGS_CHANGED")
+        assert ev[2] > const.DC_CHAT_ID_LAST_SPECIAL
+        msg = ac2.get_message_by_id(ev[1])
+        assert msg.text == "hello ä world"
+        assert open(msg.filename).read() == "some data"
+        assert msg.filename.endswith(basename)
+
+    def test_mvbox_sentbox_threads(self, acfactory, lp):
+        lp.sec("ac1: start with mvbox thread")
+        ac1 = acfactory.get_online_configuring_account(mvbox=True, sentbox=True)
+
+        lp.sec("ac2: start without mvbox/sentbox threads")
         ac2 = acfactory.get_online_configuring_account()
-        c2 = ac1.create_contact(email=ac2.get_config("addr"))
-        chat = ac1.create_chat_by_contact(c2)
-        assert chat.id >= const.DC_CHAT_ID_LAST_SPECIAL
-        wait_successful_IMAP_SMTP_connection(ac1)
-        wait_configuration_progress(ac1, 1000)
-        wait_successful_IMAP_SMTP_connection(ac2)
+
+        lp.sec("ac2: waiting for configuration")
         wait_configuration_progress(ac2, 1000)
 
+        lp.sec("ac1: waiting for configuration")
+        wait_configuration_progress(ac1, 1000)
+
+        lp.sec("ac1: send message and wait for ac2 to receive it")
+        chat = self.get_chat(ac1, ac2)
+        chat.send_text("message1")
+        ev = ac2._evlogger.get_matching("DC_EVENT_INCOMING_MSG|DC_EVENT_MSGS_CHANGED")
+        assert ev[2] > const.DC_CHAT_ID_LAST_SPECIAL
+        lp.sec("test finished")
+
+    def test_move_works(self, acfactory):
+        ac1 = acfactory.get_online_configuring_account()
+        ac2 = acfactory.get_online_configuring_account(mvbox=True)
+        wait_configuration_progress(ac2, 1000)
+        wait_configuration_progress(ac1, 1000)
+        chat = self.get_chat(ac1, ac2)
+        chat.send_text("message1")
+        ev = ac2._evlogger.get_matching("DC_EVENT_INCOMING_MSG|DC_EVENT_MSGS_CHANGED")
+        assert ev[2] > const.DC_CHAT_ID_LAST_SPECIAL
+        ev = ac2._evlogger.get_matching("DC_EVENT_IMAP_MESSAGE_MOVED")
+
+    def test_move_works_on_self_sent(self, acfactory):
+        ac1 = acfactory.get_online_configuring_account(mvbox=True)
+        ac1.set_config("bcc_self", "1")
+        ac2 = acfactory.get_online_configuring_account()
+        wait_configuration_progress(ac2, 1000)
+        wait_configuration_progress(ac1, 1000)
+        chat = self.get_chat(ac1, ac2)
+        chat.send_text("message1")
+        chat.send_text("message2")
+        chat.send_text("message3")
+        ac1._evlogger.get_matching("DC_EVENT_IMAP_MESSAGE_MOVED")
+        ac1._evlogger.get_matching("DC_EVENT_IMAP_MESSAGE_MOVED")
+        ac1._evlogger.get_matching("DC_EVENT_IMAP_MESSAGE_MOVED")
+
+    def test_forward_messages(self, acfactory, lp):
+        ac1, ac2 = acfactory.get_two_online_accounts()
+        chat = self.get_chat(ac1, ac2)
+
+        lp.sec("ac1: send message to ac2")
         msg_out = chat.send_text("message2")
 
-        # wait for other account to receive
+        lp.sec("ac2: wait for receive")
         ev = ac2._evlogger.get_matching("DC_EVENT_INCOMING_MSG|DC_EVENT_MSGS_CHANGED")
         assert ev[2] == msg_out.id
         msg_in = ac2.get_message_by_id(msg_out.id)
         assert msg_in.text == "message2"
 
-        # check the message arrived in contact-requests/deaddrop
+        lp.sec("ac2: check that the message arrive in deaddrop")
         chat2 = msg_in.chat
         assert msg_in in chat2.get_messages()
+        assert not msg_in.is_forwarded()
         assert chat2.is_deaddrop()
         assert chat2 == ac2.get_deaddrop_chat()
+
+        lp.sec("ac2: create new chat and forward message to it")
         chat3 = ac2.create_group_chat("newgroup")
         assert not chat3.is_promoted()
         ac2.forward_messages([msg_in], chat3)
+
+        lp.sec("ac2: check new chat has a forwarded message")
         assert chat3.is_promoted()
         messages = chat3.get_messages()
+        msg = messages[-1]
+        assert msg.is_forwarded()
         ac2.delete_messages(messages)
         assert not chat3.get_messages()
 
-    def test_send_and_receive_message(self, acfactory, lp):
-        lp.sec("starting accounts, waiting for configuration")
-        ac1 = acfactory.get_online_configuring_account()
-        ac2 = acfactory.get_online_configuring_account()
-        c2 = ac1.create_contact(email=ac2.get_config("addr"))
-        chat = ac1.create_chat_by_contact(c2)
-        assert chat.id >= const.DC_CHAT_ID_LAST_SPECIAL
+    def test_forward_own_message(self, acfactory, lp):
+        ac1, ac2 = acfactory.get_two_online_accounts()
+        chat = self.get_chat(ac1, ac2, both_created=True)
 
-        wait_configuration_progress(ac1, 1000)
-        wait_configuration_progress(ac2, 1000)
+        lp.sec("sending message")
+        msg_out = chat.send_text("message2")
+
+        lp.sec("receiving message")
+        ev = ac2._evlogger.get_matching("DC_EVENT_INCOMING_MSG")
+        msg_in = ac2.get_message_by_id(ev[2])
+        assert msg_in.text == "message2"
+        assert not msg_in.is_forwarded()
+
+        lp.sec("ac1: creating group chat, and forward own message")
+        group = ac1.create_group_chat("newgroup2")
+        group.add_contact(ac1.create_contact(ac2.get_config("addr")))
+        ac1.forward_messages([msg_out], group)
+
+        # wait for other account to receive
+        ev = ac2._evlogger.get_matching("DC_EVENT_INCOMING_MSG")
+        msg_in = ac2.get_message_by_id(ev[2])
+        assert msg_in.text == "message2"
+        assert msg_in.is_forwarded()
+
+    def test_send_self_message_and_empty_folder(self, acfactory, lp):
+        ac1 = acfactory.get_one_online_account()
+        lp.sec("ac1: create self chat")
+        chat = ac1.create_chat_by_contact(ac1.get_self_contact())
+        chat.send_text("hello")
+        ac1._evlogger.get_matching("DC_EVENT_SMTP_MESSAGE_SENT")
+        ac1.empty_server_folders(inbox=True, mvbox=True)
+        ev = ac1._evlogger.get_matching("DC_EVENT_IMAP_FOLDER_EMPTIED")
+        assert ev[2] == "DeltaChat"
+        ev = ac1._evlogger.get_matching("DC_EVENT_IMAP_FOLDER_EMPTIED")
+        assert ev[2] == "INBOX"
+
+    def test_send_and_receive_message_markseen(self, acfactory, lp):
+        ac1, ac2 = acfactory.get_two_online_accounts()
+
+        lp.sec("ac1: create chat with ac2")
+        chat = self.get_chat(ac1, ac2)
 
         lp.sec("sending text message from ac1 to ac2")
         msg_out = chat.send_text("message1")
@@ -401,6 +601,7 @@ class TestOnlineAccount:
         assert ev[2] == msg_out.id
         msg_in = ac2.get_message_by_id(msg_out.id)
         assert msg_in.text == "message1"
+        assert not msg_in.is_forwarded()
 
         lp.sec("check the message arrived in contact-requets/deaddrop")
         chat2 = msg_in.chat
@@ -422,24 +623,28 @@ class TestOnlineAccount:
         ac2.mark_seen_messages([msg_in])
         lp.step("1")
         ev = ac1._evlogger.get_matching("DC_EVENT_MSG_READ")
-        assert ev[1] >= const.DC_CHAT_ID_LAST_SPECIAL
-        assert ev[2] >= const.DC_MSG_ID_LAST_SPECIAL
+        assert ev[1] > const.DC_CHAT_ID_LAST_SPECIAL
+        assert ev[2] > const.DC_MSG_ID_LAST_SPECIAL
         lp.step("2")
         assert msg_out.is_out_mdn_received()
 
-    def test_send_and_receive_will_encrypt_decrypt(self, acfactory, lp):
-        lp.sec("starting accounts, waiting for configuration")
-        ac1 = acfactory.get_online_configuring_account()
-        ac2 = acfactory.get_online_configuring_account()
-        c2 = ac1.create_contact(email=ac2.get_config("addr"))
-        chat = ac1.create_chat_by_contact(c2)
-        assert chat.id >= const.DC_CHAT_ID_LAST_SPECIAL
+        lp.sec("check that a second call to mark_seen does not create change or smtp job")
+        ac2._evlogger.consume_events()
+        ac2.mark_seen_messages([msg_in])
+        try:
+            ac2._evlogger.get_matching("DC_EVENT_MSG_READ", timeout=0.01)
+        except queue.Empty:
+            pass  # mark_seen_messages() has generated events before it returns
 
-        wait_configuration_progress(ac1, 1000)
-        wait_configuration_progress(ac2, 1000)
+    def test_send_and_receive_will_encrypt_decrypt(self, acfactory, lp):
+        ac1, ac2 = acfactory.get_two_online_accounts()
+
+        lp.sec("ac1: create chat with ac2")
+        chat = self.get_chat(ac1, ac2)
 
         lp.sec("sending text message from ac1 to ac2")
         msg_out = chat.send_text("message1")
+        assert not msg_out.is_encrypted()
 
         lp.sec("wait for ac2 to receive message")
         ev = ac2._evlogger.get_matching("DC_EVENT_MSGS_CHANGED")
@@ -457,16 +662,88 @@ class TestOnlineAccount:
         assert ev[2] > msg_out.id
         msg_back = ac1.get_message_by_id(ev[2])
         assert msg_back.text == "message-back"
+        assert msg_back.is_encrypted()
+
+        lp.sec("create group chat with two members, one of which has no encrypt state")
+        chat = ac1.create_group_chat("encryption test")
+        chat.add_contact(ac1.create_contact(ac2.get_config("addr")))
+        chat.add_contact(ac1.create_contact("notexisting@testrun.org"))
+        msg = chat.send_text("test not encrypt")
+        ev = ac1._evlogger.get_matching("DC_EVENT_SMTP_MESSAGE_SENT")
+        assert not msg.is_encrypted()
+
+    def test_send_first_message_as_long_unicode_with_cr(self, acfactory, lp):
+        ac1, ac2 = acfactory.get_two_online_accounts()
+        ac2.set_config("save_mime_headers", "1")
+
+        lp.sec("ac1: create chat with ac2")
+        chat = self.get_chat(ac1, ac2, both_created=True)
+
+        lp.sec("sending multi-line non-unicode message from ac1 to ac2")
+        text1 = "hello\nworld"
+        msg_out = chat.send_text(text1)
+        assert not msg_out.is_encrypted()
+
+        lp.sec("sending multi-line unicode text message from ac1 to ac2")
+        text2 = "äalis\nthis is ßßÄ"
+        msg_out = chat.send_text(text2)
+        assert not msg_out.is_encrypted()
+
+        lp.sec("wait for ac2 to receive multi-line non-unicode message")
+        msg_in = ac2.wait_next_incoming_message()
+        assert msg_in.text == text1
+
+        lp.sec("wait for ac2 to receive multi-line unicode message")
+        msg_in = ac2.wait_next_incoming_message()
+        assert msg_in.text == text2
+        assert ac1.get_config("addr") in msg_in.chat.get_name()
+
+    def test_reply_encrypted(self, acfactory, lp):
+        ac1, ac2 = acfactory.get_two_online_accounts()
+
+        lp.sec("ac1: create chat with ac2")
+        chat = self.get_chat(ac1, ac2)
+
+        lp.sec("sending text message from ac1 to ac2")
+        msg_out = chat.send_text("message1")
+        assert not msg_out.is_encrypted()
+
+        lp.sec("wait for ac2 to receive message")
+        ev = ac2._evlogger.get_matching("DC_EVENT_MSGS_CHANGED")
+        msg_in = ac2.get_message_by_id(msg_out.id)
+        assert msg_in.text == "message1"
+        assert not msg_in.is_encrypted()
+
+        lp.sec("create new chat with contact and send back (encrypted) message")
+        chat2b = ac2.create_chat_by_message(msg_in)
+        chat2b.send_text("message-back")
+
+        lp.sec("wait for ac1 to receive message")
+        ev = ac1._evlogger.get_matching("DC_EVENT_INCOMING_MSG")
+        assert ev[1] == chat.id
+        msg_back = ac1.get_message_by_id(ev[2])
+        assert msg_back.text == "message-back"
+        assert msg_back.is_encrypted()
+
+        lp.sec("ac1: e2ee_enabled=0 and see if reply is encrypted")
+        print("ac1: e2ee_enabled={}".format(ac1.get_config("e2ee_enabled")))
+        print("ac2: e2ee_enabled={}".format(ac2.get_config("e2ee_enabled")))
+        ac1.set_config("e2ee_enabled", "0")
+        chat.send_text("message2 -- should be encrypted")
+
+        lp.sec("wait for ac2 to receive message")
+        ev = ac2._evlogger.get_matching("DC_EVENT_INCOMING_MSG")
+        msg_in = ac2.get_message_by_id(ev[2])
+        assert msg_in.text == "message2 -- should be encrypted"
+        assert msg_in.is_encrypted()
 
     def test_saved_mime_on_received_message(self, acfactory, lp):
-        lp.sec("starting accounts, waiting for configuration")
-        ac1 = acfactory.get_online_configuring_account()
-        ac2 = acfactory.get_online_configuring_account()
+        ac1, ac2 = acfactory.get_two_online_accounts()
+
+        lp.sec("configure ac2 to save mime headers, create ac1/ac2 chat")
         ac2.set_config("save_mime_headers", "1")
-        c2 = ac1.create_contact(email=ac2.get_config("addr"))
-        chat = ac1.create_chat_by_contact(c2)
-        wait_configuration_progress(ac1, 1000)
-        wait_configuration_progress(ac2, 1000)
+        chat = self.get_chat(ac1, ac2)
+
         lp.sec("sending text message from ac1 to ac2")
         msg_out = chat.send_text("message1")
         ac1._evlogger.get_matching("DC_EVENT_MSG_DELIVERED")
@@ -480,14 +757,8 @@ class TestOnlineAccount:
         assert mime.get_all("Received")
 
     def test_send_and_receive_image(self, acfactory, lp, data):
-        lp.sec("starting accounts, waiting for configuration")
-        ac1 = acfactory.get_online_configuring_account()
-        ac2 = acfactory.get_online_configuring_account()
-        c2 = ac1.create_contact(email=ac2.get_config("addr"))
-        chat = ac1.create_chat_by_contact(c2)
-
-        wait_configuration_progress(ac1, 1000)
-        wait_configuration_progress(ac2, 1000)
+        ac1, ac2 = acfactory.get_two_online_accounts()
+        chat = self.get_chat(ac1, ac2)
 
         lp.sec("sending image message from ac1 to ac2")
         path = data.get_path("d.png")
@@ -506,19 +777,30 @@ class TestOnlineAccount:
         assert os.path.exists(msg_in.filename)
         assert os.stat(msg_in.filename).st_size == os.stat(path).st_size
 
-    def test_import_export_online(self, acfactory, tmpdir):
-        backupdir = tmpdir.mkdir("backup")
+    def test_import_export_online_all(self, acfactory, tmpdir, lp):
         ac1 = acfactory.get_online_configuring_account()
         wait_configuration_progress(ac1, 1000)
 
+        lp.sec("create some chat content")
         contact1 = ac1.create_contact("some1@hello.com", name="some1")
         chat = ac1.create_chat_by_contact(contact1)
         chat.send_text("msg1")
-        path = ac1.export_to_dir(backupdir.strpath)
-        assert os.path.exists(path)
+        backupdir = tmpdir.mkdir("backup")
 
+        lp.sec("export all to {}".format(backupdir))
+        path = ac1.export_all(backupdir.strpath)
+        assert os.path.exists(path)
+        t = time.time()
+
+        lp.sec("get fresh empty account")
         ac2 = acfactory.get_unconfigured_account()
-        ac2.import_from_file(path)
+
+        lp.sec("get latest backup file")
+        path2 = ac2.get_latest_backupfile(backupdir.strpath)
+        assert path2 == path
+
+        lp.sec("import backup and check it's proper")
+        ac2.import_all(path)
         contacts = ac2.get_contacts(query="some1")
         assert len(contacts) == 1
         contact2 = contacts[0]
@@ -528,7 +810,18 @@ class TestOnlineAccount:
         assert len(messages) == 1
         assert messages[0].text == "msg1"
 
-    def test_ac_setup_message(self, acfactory):
+        # wait until a second passed since last backup
+        # because get_latest_backupfile() shall return the latest backup
+        # from a UI it's unlikely anyone manages to export two
+        # backups in one second.
+        time.sleep(max(0, 1 - (time.time() - t)))
+        lp.sec("Second-time export all to {}".format(backupdir))
+        path2 = ac1.export_all(backupdir.strpath)
+        assert os.path.exists(path2)
+        assert path2 != path
+        assert ac2.get_latest_backupfile(backupdir.strpath) == path2
+
+    def test_ac_setup_message(self, acfactory, lp):
         # note that the receiving account needs to be configured and running
         # before ther setup message is send. DC does not read old messages
         # as of Jul2019
@@ -536,13 +829,228 @@ class TestOnlineAccount:
         ac2 = acfactory.clone_online_account(ac1)
         wait_configuration_progress(ac2, 1000)
         wait_configuration_progress(ac1, 1000)
+        lp.sec("trigger ac setup message and return setupcode")
         assert ac1.get_info()["fingerprint"] != ac2.get_info()["fingerprint"]
         setup_code = ac1.initiate_key_transfer()
         ac2._evlogger.set_timeout(30)
         ev = ac2._evlogger.get_matching("DC_EVENT_INCOMING_MSG|DC_EVENT_MSGS_CHANGED")
         msg = ac2.get_message_by_id(ev[2])
         assert msg.is_setup_message()
+        assert msg.get_setupcodebegin() == setup_code[:2]
+        lp.sec("try a bad setup code")
+        with pytest.raises(ValueError):
+            msg.continue_key_transfer(str(reversed(setup_code)))
+        lp.sec("try a good setup code")
         print("*************** Incoming ASM File at: ", msg.filename)
         print("*************** Setup Code: ", setup_code)
         msg.continue_key_transfer(setup_code)
         assert ac1.get_info()["fingerprint"] == ac2.get_info()["fingerprint"]
+
+    def test_ac_setup_message_twice(self, acfactory, lp):
+        ac1 = acfactory.get_online_configuring_account()
+        ac2 = acfactory.clone_online_account(ac1)
+        ac2._evlogger.set_timeout(30)
+        wait_configuration_progress(ac2, 1000)
+        wait_configuration_progress(ac1, 1000)
+
+        lp.sec("trigger ac setup message but ignore")
+        assert ac1.get_info()["fingerprint"] != ac2.get_info()["fingerprint"]
+        ac1.initiate_key_transfer()
+        ac2._evlogger.get_matching("DC_EVENT_INCOMING_MSG|DC_EVENT_MSGS_CHANGED")
+
+        lp.sec("trigger second ac setup message, wait for receive ")
+        setup_code2 = ac1.initiate_key_transfer()
+        ev = ac2._evlogger.get_matching("DC_EVENT_INCOMING_MSG|DC_EVENT_MSGS_CHANGED")
+        msg = ac2.get_message_by_id(ev[2])
+        assert msg.is_setup_message()
+        assert msg.get_setupcodebegin() == setup_code2[:2]
+
+        lp.sec("process second setup message")
+        msg.continue_key_transfer(setup_code2)
+        assert ac1.get_info()["fingerprint"] == ac2.get_info()["fingerprint"]
+
+    def test_qr_setup_contact(self, acfactory, lp):
+        ac1, ac2 = acfactory.get_two_online_accounts()
+        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, ac2 = acfactory.get_two_online_accounts()
+        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
+        # check that at least some of the handshake messages are deleted
+        ac1._evlogger.get_matching("DC_EVENT_IMAP_MESSAGE_DELETED")
+        ac2._evlogger.get_matching("DC_EVENT_IMAP_MESSAGE_DELETED")
+        wait_securejoin_inviter_progress(ac1, 1000)
+        ac1._evlogger.get_matching("DC_EVENT_SECUREJOIN_MEMBER_ADDED")
+
+    def test_qr_verified_group_and_chatting(self, acfactory, lp):
+        ac1, ac2 = acfactory.get_two_online_accounts()
+        lp.sec("ac1: create verified-group QR, ac2 scans and joins")
+        chat1 = ac1.create_group_chat("hello", verified=True)
+        assert chat1.is_verified()
+        qr = chat1.get_join_qr()
+        lp.sec("ac2: start QR-code based join-group protocol")
+        chat2 = ac2.qr_join_chat(qr)
+        assert chat2.id >= 10
+        wait_securejoin_inviter_progress(ac1, 1000)
+        ac1._evlogger.get_matching("DC_EVENT_SECUREJOIN_MEMBER_ADDED")
+
+        lp.sec("ac2: read member added message")
+        msg = ac2.wait_next_incoming_message()
+        assert msg.is_encrypted()
+        assert "added" in msg.text.lower()
+
+        lp.sec("ac1: send message")
+        msg_out = chat1.send_text("hello")
+        assert msg_out.is_encrypted()
+
+        lp.sec("ac2: read message and check it's verified chat")
+        msg = ac2.wait_next_incoming_message()
+        assert msg.text == "hello"
+        assert msg.chat.is_verified()
+        assert msg.is_encrypted()
+
+        lp.sec("ac2: send message and let ac1 read it")
+        chat2.send_text("world")
+        msg = ac1.wait_next_incoming_message()
+        assert msg.text == "world"
+        assert msg.is_encrypted()
+
+    def test_set_get_profile_image(self, acfactory, data, lp):
+        ac1, ac2 = acfactory.get_two_online_accounts()
+
+        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
+
+    def test_send_receive_locations(self, acfactory, lp):
+        now = datetime.utcnow()
+        ac1, ac2 = acfactory.get_two_online_accounts()
+
+        lp.sec("ac1: create chat with ac2")
+        chat1 = self.get_chat(ac1, ac2)
+        chat2 = self.get_chat(ac2, ac1)
+
+        assert not chat1.is_sending_locations()
+        with pytest.raises(ValueError):
+            ac1.set_location(latitude=0.0, longitude=10.0)
+
+        ac1._evlogger.consume_events()
+        ac2._evlogger.consume_events()
+
+        lp.sec("ac1: enable location sending in chat")
+        chat1.enable_sending_locations(seconds=100)
+        assert chat1.is_sending_locations()
+        ac1._evlogger.get_matching("DC_EVENT_SMTP_MESSAGE_SENT")
+
+        ac1.set_location(latitude=2.0, longitude=3.0, accuracy=0.5)
+        ac1._evlogger.get_matching("DC_EVENT_LOCATION_CHANGED")
+        chat1.send_text("hello")
+        ac1._evlogger.get_matching("DC_EVENT_SMTP_MESSAGE_SENT")
+
+        lp.sec("ac2: wait for incoming location message")
+        ac2._evlogger.get_matching("DC_EVENT_INCOMING_MSG")  # "enabled-location streaming"
+
+        # currently core emits location changed before event_incoming message
+        ac2._evlogger.get_matching("DC_EVENT_LOCATION_CHANGED")
+        ac2._evlogger.get_matching("DC_EVENT_INCOMING_MSG")  # text message with location
+
+        locations = chat2.get_locations()
+        assert len(locations) == 1
+        assert locations[0].latitude == 2.0
+        assert locations[0].longitude == 3.0
+        assert locations[0].accuracy == 0.5
+        assert locations[0].timestamp > now
+
+        contact = ac2.create_contact(ac1.get_config("addr"))
+        locations2 = chat2.get_locations(contact=contact)
+        assert len(locations2) == 1
+        assert locations2 == locations
+
+        contact = ac2.create_contact("nonexisting@example.org")
+        locations3 = chat2.get_locations(contact=contact)
+        assert not locations3
+
+
+class TestOnlineConfigureFails:
+    def test_invalid_password(self, acfactory):
+        ac1, configdict = acfactory.get_online_config()
+        ac1.configure(addr=configdict["addr"], mail_pw="123")
+        ac1.start_threads()
+        wait_configuration_progress(ac1, 500)
+        ev1 = ac1._evlogger.get_matching("DC_EVENT_ERROR_NETWORK")
+        assert "cannot login" in ev1[2].lower()
+        wait_configuration_progress(ac1, 0, 0)
+
+    def test_invalid_user(self, acfactory):
+        ac1, configdict = acfactory.get_online_config()
+        ac1.configure(addr="x" + configdict["addr"], mail_pw=configdict["mail_pw"])
+        ac1.start_threads()
+        wait_configuration_progress(ac1, 500)
+        ev1 = ac1._evlogger.get_matching("DC_EVENT_ERROR_NETWORK")
+        assert "cannot login" in ev1[2].lower()
+        wait_configuration_progress(ac1, 0, 0)
+
+    def test_invalid_domain(self, acfactory):
+        ac1, configdict = acfactory.get_online_config()
+        ac1.configure(addr=configdict["addr"] + "x", mail_pw=configdict["mail_pw"])
+        ac1.start_threads()
+        wait_configuration_progress(ac1, 500)
+        ev1 = ac1._evlogger.get_matching("DC_EVENT_ERROR_NETWORK")
+        assert "could not connect" in ev1[2].lower()
+        wait_configuration_progress(ac1, 0, 0)

python/tests/test_increation.py

@@ -4,7 +4,7 @@ from deltachat import const
 from conftest import wait_configuration_progress, wait_msgs_changed
 
 
-class TestInCreation:
+class TestOnlineInCreation:
     def test_forward_increation(self, acfactory, data, lp):
         ac1 = acfactory.get_online_configuring_account()
         ac2 = acfactory.get_online_configuring_account()
@@ -57,13 +57,13 @@ class TestInCreation:
 
         lp.sec("wait1 for original or forwarded messages to arrive")
         ev1 = ac2._evlogger.get_matching("DC_EVENT_MSGS_CHANGED")
-        assert ev1[1] >= const.DC_CHAT_ID_LAST_SPECIAL
+        assert ev1[1] > const.DC_CHAT_ID_LAST_SPECIAL
         received_original = ac2.get_message_by_id(ev1[2])
         assert cmp(received_original.filename, path, False)
 
         lp.sec("wait2 for original or forwarded messages to arrive")
         ev2 = ac2._evlogger.get_matching("DC_EVENT_MSGS_CHANGED")
-        assert ev2[1] >= const.DC_CHAT_ID_LAST_SPECIAL
+        assert ev2[1] > const.DC_CHAT_ID_LAST_SPECIAL
         assert ev2[1] != ev1[1]
         received_copy = ac2.get_message_by_id(ev2[2])
         assert cmp(received_copy.filename, path, False)

python/tests/test_lowlevel.py

@@ -1,5 +1,5 @@
 from __future__ import print_function
-from deltachat import capi, const, set_context_callback, clear_context_callback
+from deltachat import capi, cutil, const, set_context_callback, clear_context_callback
 from deltachat.capi import ffi
 from deltachat.capi import lib
 from deltachat.account import EventLogger
@@ -17,11 +17,19 @@ def test_callback_None2int():
     clear_context_callback(ctx)
 
 
-def test_dc_close_events():
-    ctx = capi.lib.dc_context_new(capi.lib.py_dc_callback, ffi.NULL, ffi.NULL)
+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,
+    )
     evlog = EventLogger(ctx)
     evlog.set_timeout(5)
-    set_context_callback(ctx, lambda ctx, evt_name, data1, data2: evlog(evt_name, data1, data2))
+    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)
     capi.lib.dc_close(ctx)
 
     def find(info_string):
@@ -33,7 +41,7 @@ def test_dc_close_events():
             else:
                 print("skipping event", *ev)
 
-    find("disconnecting INBOX-watch")
+    find("disconnecting inbox-thread")
     find("disconnecting sentbox-thread")
     find("disconnecting mvbox-thread")
     find("disconnecting SMTP")
@@ -51,6 +59,16 @@ def test_wrong_db(tmpdir):
     assert not lib.dc_open(dc_context, p.strpath.encode("ascii"), ffi.NULL)
 
 
+def test_empty_blobdir(tmpdir):
+    # Apparently some client code expects this to be the same as passing NULL.
+    ctx = ffi.gc(
+        lib.dc_context_new(lib.py_dc_callback, ffi.NULL, ffi.NULL),
+        lib.dc_context_unref,
+    )
+    db_fname = tmpdir.join("hello.db")
+    assert lib.dc_open(ctx, db_fname.strpath.encode("ascii"), b"")
+
+
 def test_event_defines():
     assert const.DC_EVENT_INFO == 100
     assert const.DC_CONTACT_ID_SELF
@@ -75,3 +93,65 @@ def test_markseen_invalid_message_ids(acfactory):
     msg_ids = [9]
     lib.dc_markseen_msgs(ac1._dc_context, msg_ids, len(msg_ids))
     ac1._evlogger.ensure_event_not_queued("DC_EVENT_WARNING|DC_EVENT_ERROR")
+
+
+def test_get_special_message_id_returns_empty_message(acfactory):
+    ac1 = acfactory.get_configured_offline_account()
+    for i in range(1, 10):
+        msg = ac1.get_message_by_id(i)
+        assert msg.id == 0
+
+
+def test_provider_info():
+    provider = lib.dc_provider_new_from_email(cutil.as_dc_charpointer("ex@example.com"))
+    assert cutil.from_dc_charpointer(
+        lib.dc_provider_get_overview_page(provider)
+    ) == "https://providers.delta.chat/example.com"
+    assert cutil.from_dc_charpointer(lib.dc_provider_get_name(provider)) == "Example"
+    assert cutil.from_dc_charpointer(lib.dc_provider_get_markdown(provider)) == "\n..."
+    assert cutil.from_dc_charpointer(lib.dc_provider_get_status_date(provider)) == "2018-09"
+    assert lib.dc_provider_get_status(provider) == const.DC_PROVIDER_STATUS_PREPARATION
+
+
+def test_provider_info_none():
+    assert lib.dc_provider_new_from_email(cutil.as_dc_charpointer("email@unexistent.no")) == ffi.NULL
+
+
+def test_get_info_closed():
+    ctx = ffi.gc(
+        lib.dc_context_new(lib.py_dc_callback, ffi.NULL, ffi.NULL),
+        lib.dc_context_unref,
+    )
+    info = cutil.from_dc_charpointer(lib.dc_get_info(ctx))
+    assert 'deltachat_core_version' in info
+    assert 'database_dir' not in info
+
+
+def test_get_info_open(tmpdir):
+    ctx = ffi.gc(
+        lib.dc_context_new(lib.py_dc_callback, ffi.NULL, ffi.NULL),
+        lib.dc_context_unref,
+    )
+    db_fname = tmpdir.join("test.db")
+    lib.dc_open(ctx, db_fname.strpath.encode("ascii"), ffi.NULL)
+    info = cutil.from_dc_charpointer(lib.dc_get_info(ctx))
+    assert 'deltachat_core_version' in info
+    assert 'database_dir' in info
+
+
+def test_is_open_closed():
+    ctx = ffi.gc(
+        lib.dc_context_new(lib.py_dc_callback, ffi.NULL, ffi.NULL),
+        lib.dc_context_unref,
+    )
+    assert lib.dc_is_open(ctx) == 0
+
+
+def test_is_open_actually_open(tmpdir):
+    ctx = ffi.gc(
+        lib.dc_context_new(lib.py_dc_callback, ffi.NULL, ffi.NULL),
+        lib.dc_context_unref,
+    )
+    db_fname = tmpdir.join("test.db")
+    lib.dc_open(ctx, db_fname.strpath.encode("ascii"), ffi.NULL)
+    assert lib.dc_is_open(ctx) == 1

python/tests/test_provider_info.py

@@ -0,0 +1,27 @@
+import pytest
+
+from deltachat import const
+from deltachat import provider
+
+
+def test_provider_info_from_email():
+    example = provider.Provider.from_email("email@example.com")
+    assert example.overview_page == "https://providers.delta.chat/example.com"
+    assert example.name == "Example"
+    assert example.markdown == "\n..."
+    assert example.status_date == "2018-09"
+    assert example.status == const.DC_PROVIDER_STATUS_PREPARATION
+
+
+def test_provider_info_from_domain():
+    example = provider.Provider("example.com")
+    assert example.overview_page == "https://providers.delta.chat/example.com"
+    assert example.name == "Example"
+    assert example.markdown == "\n..."
+    assert example.status_date == "2018-09"
+    assert example.status == const.DC_PROVIDER_STATUS_PREPARATION
+
+
+def test_provider_info_none():
+    with pytest.raises(provider.ProviderNotFoundError):
+        provider.Provider.from_email("email@unexistent.no")

python/tox.ini

@@ -1,32 +1,35 @@
 [tox]
 # make sure to update environment list in travis.yml and appveyor.yml
 envlist =
-    py27
-    py35
+    py37
     lint
     auditwheels
 
 [testenv]
 commands = 
-    pytest -v -rsXx {posargs:tests}
-    python tests/package_wheels.py {toxworkdir}/wheelhouse
+    pytest -n6 --reruns 2 --reruns-delay 5 -v -rsXx {posargs:tests} 
+    # python tests/package_wheels.py {toxworkdir}/wheelhouse
 passenv = 
     TRAVIS 
     DCC_RS_DEV
     DCC_RS_TARGET
     DCC_PY_LIVECONFIG
+    CARGO_TARGET_DIR
+    RUSTC_WRAPPER
 deps = 
     pytest
-    pytest-faulthandler
+    pytest-rerunfailures
+    pytest-timeout
+    pytest-xdist
     pdbpp
     requests
 
 [testenv:auditwheels]
 skipsdist = True
+deps = auditwheel
 commands = 
     python tests/auditwheels.py {toxworkdir}/wheelhouse
 
-
 [testenv:lint]
 skipsdist = True
 usedevelop = True
@@ -41,22 +44,33 @@ commands =
     rst-lint --encoding 'utf-8' README.rst
 
 [testenv:doc]
-basepython = python3.5
+changedir=doc
 deps =
-    sphinx==2.0.1
+    sphinx==2.2.0
     breathe
-
-changedir = doc
 commands =
-    sphinx-build -w docker-toxdoc-warnings.log -b html . _build/html
+    sphinx-build -Q -w toxdoc-warnings.log -b html . _build/html
+
+
+[testenv:lintdoc]
+skipsdist = True
+usedevelop = True
+deps =
+    {[testenv:lint]deps}
+    {[testenv:doc]deps}
+commands =
+    {[testenv:lint]commands}
+    {[testenv:doc]commands}
+
 
 
 [pytest]
-addopts = -v -rs
+addopts = -v -rs 
 python_files = tests/test_*.py 
 norecursedirs = .tox 
 xfail_strict=true
-timeout = 60
+timeout = 60 
+timeout_method = thread
 
 [flake8]
 max-line-length = 120

run-integration-tests.sh

@@ -23,7 +23,7 @@ if [ $? != 0 ]; then
 fi
 
 pushd python
-if [ -e "./liveconfig" && -z "$DCC_PY_LIVECONFIG" ]; then
+if [ -e "./liveconfig" -a -z "$DCC_PY_LIVECONFIG" ]; then
     export DCC_PY_LIVECONFIG=liveconfig
 fi
 tox "$@"

rust-toolchain

@@ -1 +1 @@
-nightly-2019-08-13
+nightly-2019-11-06

set_core_version.py

@@ -0,0 +1,63 @@
+#!/usr/bin/env python
+
+import os
+import sys
+import re
+import pathlib
+import subprocess
+
+rex = re.compile(r'version = "(\S+)"')
+
+def read_toml_version(relpath):
+    p = pathlib.Path(relpath)
+    assert p.exists()
+    for line in open(str(p)):
+        m = rex.match(line)
+        if m is not None:
+            return m.group(1)
+    raise ValueError("no version found in {}".format(relpath))
+
+def replace_toml_version(relpath, newversion):
+    p = pathlib.Path(relpath)
+    assert p.exists()
+    tmp_path = str(p) + "_tmp"
+    with open(tmp_path, "w") as f:
+        for line in open(str(p)):
+            m = rex.match(line)
+            if m is not None:
+                f.write('version = "{}"\n'.format(newversion))
+            else:
+                f.write(line)
+    os.rename(tmp_path, str(p))
+
+if __name__ == "__main__":
+
+    if len(sys.argv) < 2:
+        for x in ("Cargo.toml", "deltachat-ffi/Cargo.toml"):
+            print("{}: {}".format(x, read_toml_version(x)))
+        raise SystemExit("need argument: new version, example 1.0.0-beta.27")
+    newversion = sys.argv[1]
+    if newversion.count(".") < 2:
+        raise SystemExit("need at least two dots in version")
+
+    core_toml = read_toml_version("Cargo.toml")
+    ffi_toml = read_toml_version("deltachat-ffi/Cargo.toml")
+    assert core_toml == ffi_toml, (core_toml, ffi_toml)
+
+    for line in open("CHANGELOG.md"):
+        ## 1.0.0-beta5
+        if line.startswith("## "):
+            if line[2:].strip().startswith(newversion):
+                break
+    else:
+        raise SystemExit("CHANGELOG.md contains no entry for version: {}".format(newversion))
+
+    replace_toml_version("Cargo.toml", newversion)
+    replace_toml_version("deltachat-ffi/Cargo.toml", newversion)
+
+    subprocess.call(["cargo", "update", "-p", "deltachat"])
+
+    print("after commit make sure to: ")
+    print("")
+    print("   git tag {}".format(newversion))
+    print("")

spec.md

@@ -0,0 +1,371 @@
+# Chat-over-Email specification
+
+Version 0.19.0
+
+This document describes how emails can be used
+to implement typical messenger functions
+while staying compatible to existing MUAs.
+
+- [Encryption](#encryption)
+- [Outgoing messages](#outgoing-messages)
+- [Incoming messages](#incoming-messages)
+- [Forwarded messages](#forwarded-messages)
+- [Groups](#groups)
+    - [Outgoing group messages](#outgoing-group-messages)
+    - [Incoming group messages](#incoming-group-messages)
+    - [Add and remove members](#add-and-remove-members)
+    - [Change group name](#change-group-name)
+    - [Set group image](#set-group-image)
+- [Set profile image](#set-profile-image)
+- [Miscellaneous](#miscellaneous)
+
+
+# Encryption
+
+Messages SHOULD be encrypted by the
+[Autocrypt](https://autocrypt.org/level1.html) standard;
+`prefer-encrypt=mutual` MAY be set by default.
+
+Meta data (at least the subject and all chat-headers) SHOULD be encrypted
+by the [Memoryhole](https://github.com/autocrypt/memoryhole) standard.
+If Memoryhole is not used,
+the subject of encrypted messages SHOULD be replaced by the string
+`Chat: Encrypted message` where the part after the colon MAY be localized.
+
+
+# Outgoing messages
+
+Messengers MUST add a `Chat-Version: 1.0` header to outgoing messages.
+For filtering and smart appearance of the messages in normal MUAs,
+the `Subject` header SHOULD start with the characters `Chat:`
+and SHOULD be an excerpt of the message.
+Replies to messages MAY follow the typical `Re:`-format.
+
+The body MAY contain text which MUST have the content type `text/plain`
+or `mulipart/alternative` containing `text/plain`.
+
+The text MAY be divided into a user-text-part and a footer-part using the
+line `-- ` (minus, minus, space, lineend).
+
+The user-text-part MUST contain only user generated content.
+User generated content are eg. texts a user has actually typed
+or pasted or forwarded from another user.
+Full quotes, footers or sth. like that MUST NOT go to the user-text-part.
+
+    From: sender@domain
+    To: rcpt@domain
+    Chat-Version: 1.0
+    Content-Type: text/plain
+    Subject: Chat: Hello ...
+
+    Hello world!
+
+
+# Incoming messages
+
+The `Chat-Version` header MAY be used
+to detect if a messages comes from a compatible messenger.
+
+The `Subject` header MUST NOT be used
+to detect compatible messengers, groups or whatever.
+
+Messenger SHOULD show the `Subject`
+if the message comes from a normal MUA together with the email-body.
+The email-body SHOULD be converted
+to plain text, full-quotes and similar regions SHOULD be cut.
+
+Attachments SHOULD be shown where possible.
+If an attachment cannot be shown, a non-distracting warning SHOULD be printed.
+
+
+# Forwarded messages
+
+Forwarded messages are outgoing messages that contain a forwarded-header
+before the user generated content.
+
+The forwarded header MUST contain two lines: 
+The first line contains the text
+`---------- Forwarded message ----------`
+(10 minus, space, text `Forwarded message`, space, 10 minus). 
+The second line starts with `From: ` followed by the original sender
+which SHOULD be anonymized or just a placeholder.
+
+    From: sender@domain
+    To: rcpt@domain
+    Chat-Version: 1.0
+    Content-Type: text/plain
+    Subject: Chat: Forwarded message
+
+    ---------- Forwarded message ----------
+    From: Messenger
+
+    Hello world!
+
+Incoming forwarded messages are detected by the header.
+The messenger SHOULD mark these messages in a way that
+it becomes obvious that the message is not created by the sender.
+Note that most messengers do not show the original sender of forwarded messages
+but MUAs typically expose the sender in the UI.
+
+
+# Groups
+
+Groups are chats with usually more than one recipient,
+each defined by an email-address.
+The sender plus the recipients are the group members.
+
+To allow different groups with the same members,
+groups are identified by a group-id.
+The group-id MUST be created only from the characters
+`0`-`9`, `A`-`Z`, `a`-`z` `_` and `-`
+and MUST have a length of at least 11 characters.
+
+Groups MUST have a group-name.
+The group-name is any non-zero-length UTF-8 string.
+
+Groups MAY have a group-image.
+
+
+## Outgoing groups messages
+
+All group members MUST be added to the `From`/`To` headers.
+The group-id MUST be written to the `Chat-Group-ID` header.
+The group-name MUST be written to `Chat-Group-Name` header
+(the forced presence of this header makes it easier
+to join a group chat on a second device any time).
+
+The `Subject` header of outgoing group messages
+SHOULD start with the characters `Chat:`
+followed by the group-name and a colon followed by an excerpt of the message.
+
+To identify the group-id on replies from normal MUAs,
+the group-id MUST also be added to the message-id of outgoing messages.
+The message-id MUST have the format `Gr.<group-id>.<unique data>`.
+
+    From: member1@domain
+    To: member2@domain, member3@domain
+    Chat-Version: 1.0
+    Chat-Group-ID: 12345uvwxyZ
+    Chat-Group-Name: My Group
+    Message-ID: Gr.12345uvwxyZ.0001@domain
+    Subject: Chat: My Group: Hello group ...
+
+    Hello group - this group contains three members
+
+Messengers adding the member list in the form `Name <email-address>`
+MUST take care only to spread the names authorized by the contacts themselves.
+Otherwise, names as _Daddy_ or _Honey_ may be spread
+(this issue is also true for normal MUAs, however,
+for more contact- and chat-centralized apps
+such situations happen more frequently).
+
+
+## Incoming group messages
+
+The messenger MUST search incoming messages for the group-id
+in the following headers: `Chat-Group-ID`,
+`Message-ID`, `In-Reply-To` and `References` (in this order).
+
+If the messenger finds a valid and existent group-id,
+the message SHOULD be assigned to the given group.
+If the messenger finds a valid but not existent group-id,
+the messenger MAY create a new group.
+If no group-id is found,
+the message MAY be assigned
+to a normal single-user chat with the email-address given in `From`.
+
+
+## Add and remove members
+
+Messenger clients MUST construct the member list
+from the `From`/`To` headers only on the first group message
+or if they see a `Chat-Group-Member-Added`
+or `Chat-Group-Member-Removed` action header.
+Both headers MUST have the email-address
+of the added or removed member as the value.
+Messenger clients MUST NOT construct the member list
+on other group messages
+(this is to avoid accidentally altered To-lists in normal MUAs;
+the user does not expect adding a user to a _message_
+will also add him to the _group_ "forever").
+
+The messenger SHOULD send an explicit mail for each added or removed member.
+The body of the message SHOULD contain
+a localized description about what happened
+and the message SHOULD appear as a message or action from the sender.
+
+    From: member1@domain
+    To: member2@domain, member3@domain, member4@domain
+    Chat-Version: 1.0
+    Chat-Group-ID: 12345uvwxyZ
+    Chat-Group-Name: My Group
+    Chat-Group-Member-Added: member4@domain
+    Message-ID: Gr.12345uvwxyZ.0002@domain
+    Subject: Chat: My Group: Hello, ...
+
+    Hello, I've added member4@domain to our group.  Now we have 4 members.
+
+To remove a member:
+
+    From: member1@domain
+    To: member2@domain, member3@domain
+    Chat-Version: 1.0
+    Chat-Group-ID: 12345uvwxyZ
+    Chat-Group-Name: My Group
+    Chat-Group-Member-Removed: member4@domain
+    Message-ID: Gr.12345uvwxyZ.0003@domain
+    Subject: Chat: My Group: Hello, ...
+
+    Hello, I've removed member4@domain from our group.  Now we have 3 members.
+
+
+## Change group name
+
+To change the group-name,
+the messenger MUST send the action header `Chat-Group-Name-Changed`
+with the value set to the old group name to all group members.
+The new group name goes to the header `Chat-Group-Name`.
+
+The messenger SHOULD send an explicit mail for each name change.
+The body of the message SHOULD contain
+a localized description about what happened
+and the message SHOULD appear as a message or action from the sender.
+
+    From: member1@domain
+    To: member2@domain, member3@domain
+    Chat-Version: 1.0
+    Chat-Group-ID: 12345uvwxyZ
+    Chat-Group-Name: Our Group
+    Chat-Group-Name-Changed: My Group
+    Message-ID: Gr.12345uvwxyZ.0004@domain
+    Subject: Chat: Our Group: Hello, ...
+
+    Hello, I've changed the group name from "My Group" to "Our Group".
+
+
+## Set group image
+
+A group MAY have a group-image.
+To change or set the group-image,
+the messenger MUST attach an image file to a message
+and MUST add the header `Chat-Group-Image`
+with the value set to the image name.
+
+To remove the group-image,
+the messenger MUST add the header `Chat-Group-Image: 0`.
+
+The messenger SHOULD send an explicit mail for each group image change.
+The body of the message SHOULD contain
+a localized description about what happened
+and the message SHOULD appear as a message or action from the sender.
+
+
+    From: member1@domain
+    To: member2@domain, member3@domain
+    Chat-Version: 1.0
+    Chat-Group-ID: 12345uvwxyZ
+    Chat-Group-Name: Our Group
+    Chat-Group-Image: image.jpg
+    Message-ID: Gr.12345uvwxyZ.0005@domain
+    Subject: Chat: Our Group: Hello, ...
+    Content-Type: multipart/mixed; boundary="==break=="
+
+    --==break==
+    Content-Type: text/plain
+
+    Hello, I've changed the group image.
+    --==break==
+    Content-Type: image/jpeg
+    Content-Disposition: attachment; filename="image.jpg"
+
+    /9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAYEBQYFBAYGBQYHBw ...
+    --==break==--
+
+The image format SHOULD be image/jpeg or image/png.
+To save data, it is RECOMMENDED
+to add a `Chat-Group-Image` only on image changes.
+
+
+# Set profile image
+
+A user MAY have a profile-image that MAY be spread to his contacts.
+To change or set the profile-image,
+the messenger MUST attach an image file to a message
+and MUST add the header `Chat-Profile-Image`
+with the value set to the image name.
+
+To remove the profile-image,
+the messenger MUST add the header `Chat-Profile-Image: 0`.
+
+To spread the image,
+the messenger MAY send the profile image
+together with the next mail to a given contact
+(to do this only once,
+the messenger has to keep a `profile_image_update_state` somewhere).
+Alternatively, the messenger MAY send an explicit mail
+for each profile-image change to all contacts using a compatible messenger.
+The messenger SHOULD NOT send an explicit mail to normal MUAs.
+
+    From: sender@domain
+    To: rcpt@domain
+    Chat-Version: 1.0
+    Chat-Profile-Image: photo.jpg
+    Subject: Chat: Hello, ...
+    Content-Type: multipart/mixed; boundary="==break=="
+
+    --==break==
+    Content-Type: text/plain
+
+    Hello, I've changed my profile image.
+    --==break==
+    Content-Type: image/jpeg
+    Content-Disposition: attachment; filename="photo.jpg"
+
+    AKCgkJi3j4l5kjoldfUAKCgkJi3j4lldfHjgWICwgIEBQYFBA ...
+    --==break==--
+
+The image format SHOULD be image/jpeg or image/png.
+Note that `Chat-Profile-Image` may appear together with all other headers,
+eg. there may be a `Chat-Profile-Image` and a `Chat-Group-Image` header
+in the same message.
+To save data, it is RECOMMENDED to add a `Chat-Profile-Image` header
+only on image changes.
+
+
+# Miscellaneous
+
+Messengers SHOULD use the header `In-Reply-To` as usual.
+
+Messengers SHOULD add a `Chat-Voice-message: 1` header
+if an attached audio file is a voice message.
+
+Messengers MAY add a `Chat-Duration` header
+to specify the duration of attached audio or video files.
+The value MUST be the duration in milliseconds.
+This allows the receiver to show the time without knowing the file format.
+
+    In-Reply-To: Gr.12345uvwxyZ.0005@domain
+    Chat-Voice-Message: 1
+    Chat-Duration: 10000
+
+Messengers MAY send and receive Message Disposition Notifications
+(MDNs, [RFC 8098](https://tools.ietf.org/html/rfc8098),
+[RFC 3503](https://tools.ietf.org/html/rfc3503))
+using the `Chat-Disposition-Notification-To` header
+instead of the `Disposition-Notification-To`
+(which unfortunately forces many other MUAs
+to send weird mails not following any standard).
+
+
+## Sync messages
+
+If some action is required by a message header,
+the action should only be performed if the _effective date_ is newer
+than the date the last action was performed.
+
+We define the effective date of a message
+as the sending time of the message as indicated by its Date header,
+or the time of first receipt if that date is in the future or unavailable.
+
+
+Copyright © 2017-2019 Delta Chat contributors.

src/aheader.rs

@@ -1,13 +1,14 @@
+//! # Autocrypt header module
+//!
+//! Parse and create [Autocrypt-headers](https://autocrypt.org/en/latest/level1.html#the-autocrypt-header).
+
 use std::collections::BTreeMap;
-use std::ffi::CStr;
 use std::str::FromStr;
 use std::{fmt, str};
 
-use mmime::mailimf_types::*;
-
 use crate::constants::*;
 use crate::contact::*;
-use crate::dc_tools::as_str;
+use crate::context::Context;
 use crate::key::*;
 
 /// Possible values for encryption preference
@@ -41,13 +42,13 @@ impl str::FromStr for EncryptPreference {
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         match s {
             "mutual" => Ok(EncryptPreference::Mutual),
-            "reset" => Ok(EncryptPreference::Reset),
-            _ => Ok(EncryptPreference::NoPreference),
+            "nopreference" => Ok(EncryptPreference::NoPreference),
+            _ => Err(()),
         }
     }
 }
 
-/// Parse and create [Autocrypt-headers](https://autocrypt.org/en/latest/level1.html#the-autocrypt-header).
+/// Autocrypt header
 #[derive(Debug)]
 pub struct Aheader {
     pub addr: String,
@@ -56,6 +57,7 @@ pub struct Aheader {
 }
 
 impl Aheader {
+    /// Creates new autocrypt header
     pub fn new(addr: String, public_key: Key, prefer_encrypt: EncryptPreference) -> Self {
         Aheader {
             addr,
@@ -64,54 +66,30 @@ impl Aheader {
         }
     }
 
-    pub fn from_imffields(
-        wanted_from: *const libc::c_char,
-        header: *const mailimf_fields,
+    pub fn from_headers(
+        context: &Context,
+        wanted_from: &str,
+        headers: &[mailparse::MailHeader<'_>],
     ) -> Option<Self> {
-        if wanted_from.is_null() || header.is_null() {
-            return None;
-        }
+        use mailparse::MailHeaderMap;
 
-        let mut fine_header = None;
-        let mut cur = unsafe { (*(*header).fld_list).first };
-
-        while !cur.is_null() {
-            let field = unsafe { (*cur).data as *mut mailimf_field };
-            if !field.is_null()
-                && unsafe { (*field).fld_type } == MAILIMF_FIELD_OPTIONAL_FIELD as libc::c_int
-            {
-                let optional_field = unsafe { (*field).fld_data.fld_optional_field };
-                if !optional_field.is_null()
-                    && unsafe { !(*optional_field).fld_name.is_null() }
-                    && unsafe { CStr::from_ptr((*optional_field).fld_name).to_str().unwrap() }
-                        == "Autocrypt"
-                {
-                    let value = unsafe {
-                        CStr::from_ptr((*optional_field).fld_value)
-                            .to_str()
-                            .unwrap()
-                    };
-
-                    match Self::from_str(value) {
-                        Ok(test) => {
-                            if addr_cmp(&test.addr, as_str(wanted_from)) {
-                                if fine_header.is_none() {
-                                    fine_header = Some(test);
-                                } else {
-                                    // TODO: figure out what kind of error case this is
-                                    return None;
-                                }
-                            }
-                        }
-                        _ => {}
+        if let Ok(Some(value)) = headers.get_first_value("Autocrypt") {
+            match Self::from_str(&value) {
+                Ok(header) => {
+                    if addr_cmp(&header.addr, wanted_from) {
+                        return Some(header);
                     }
                 }
+                Err(err) => {
+                    warn!(
+                        context,
+                        "found invalid autocrypt header {}: {:?}", value, err
+                    );
+                }
             }
-
-            cur = unsafe { (*cur).next };
         }
 
-        fine_header
+        None
     }
 }
 
@@ -135,9 +113,9 @@ impl str::FromStr for Aheader {
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         let mut attributes: BTreeMap<String, String> = s
-            .split(";")
+            .split(';')
             .filter_map(|a| {
-                let attribute: Vec<&str> = a.trim().splitn(2, "=").collect();
+                let attribute: Vec<&str> = a.trim().splitn(2, '=').collect();
                 if attribute.len() < 2 {
                     return None;
                 }
@@ -182,7 +160,7 @@ impl str::FromStr for Aheader {
 
         // Autocrypt-Level0: unknown attributes starting with an underscore can be safely ignored
         // Autocrypt-Level0: unknown attribute, treat the header as invalid
-        if attributes.keys().find(|k| !k.starts_with("_")).is_some() {
+        if attributes.keys().any(|k| !k.starts_with('_')) {
             return Err(());
         }
 

src/blob.rs

@@ -0,0 +1,595 @@
+//! # Blob directory management
+
+use std::ffi::OsStr;
+use std::fmt;
+use std::fs;
+use std::io::Write;
+use std::path::{Path, PathBuf};
+
+use crate::context::Context;
+use crate::events::Event;
+
+/// Represents a file in the blob directory.
+///
+/// The object has a name, which will always be valid UTF-8.  Having a
+/// blob object does not imply the respective file exists, however
+/// when using one of the `create*()` methods a unique file is
+/// created.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct BlobObject<'a> {
+    blobdir: &'a Path,
+    name: String,
+}
+
+impl<'a> BlobObject<'a> {
+    /// Creates a new blob object with a unique name.
+    ///
+    /// Creates a new file in the blob directory.  The name will be
+    /// derived from the platform-agnostic basename of the suggested
+    /// name, followed by a random number and followed by a possible
+    /// extension.  The `data` will be written into the file without
+    /// race-conditions.
+    ///
+    /// # Errors
+    ///
+    /// [BlobError::CreateFailure] is used when the file could not
+    /// be created.  You can expect [BlobError.cause] to contain an
+    /// underlying error.
+    ///
+    /// [BlobError::WriteFailure] is used when the file could not
+    /// be written to.  You can expect [BlobError.cause] to contain an
+    /// underlying error.
+    pub fn create(
+        context: &'a Context,
+        suggested_name: impl AsRef<str>,
+        data: &[u8],
+    ) -> std::result::Result<BlobObject<'a>, BlobError> {
+        let blobdir = context.get_blobdir();
+        let (stem, ext) = BlobObject::sanitise_name(suggested_name.as_ref());
+        let (name, mut file) = BlobObject::create_new_file(&blobdir, &stem, &ext)?;
+        file.write_all(data)
+            .map_err(|err| BlobError::WriteFailure {
+                blobdir: blobdir.to_path_buf(),
+                blobname: name.clone(),
+                cause: err,
+                backtrace: failure::Backtrace::new(),
+            })?;
+        let blob = BlobObject {
+            blobdir,
+            name: format!("$BLOBDIR/{}", name),
+        };
+        context.call_cb(Event::NewBlobFile(blob.as_name().to_string()));
+        Ok(blob)
+    }
+
+    // Creates a new file, returning a tuple of the name and the handle.
+    fn create_new_file(dir: &Path, stem: &str, ext: &str) -> Result<(String, fs::File), BlobError> {
+        let max_attempt = 15;
+        let mut name = format!("{}{}", stem, ext);
+        for attempt in 0..max_attempt {
+            let path = dir.join(&name);
+            match fs::OpenOptions::new()
+                .create_new(true)
+                .write(true)
+                .open(&path)
+            {
+                Ok(file) => return Ok((name, file)),
+                Err(err) => {
+                    if attempt == max_attempt {
+                        return Err(BlobError::CreateFailure {
+                            blobdir: dir.to_path_buf(),
+                            blobname: name,
+                            cause: err,
+                            backtrace: failure::Backtrace::new(),
+                        });
+                    } else {
+                        name = format!("{}-{}{}", stem, rand::random::<u32>(), ext);
+                    }
+                }
+            }
+        }
+        // This is supposed to be unreachable, but the compiler doesn't know.
+        Err(BlobError::CreateFailure {
+            blobdir: dir.to_path_buf(),
+            blobname: name,
+            cause: std::io::Error::new(std::io::ErrorKind::Other, "supposedly unreachable"),
+            backtrace: failure::Backtrace::new(),
+        })
+    }
+
+    /// Creates a new blob object with unique name by copying an existing file.
+    ///
+    /// This creates a new blob as described in [BlobObject::create]
+    /// but also copies an existing file into it.  This is done in a
+    /// in way which avoids race-conditions when multiple files are
+    /// concurrently created.
+    ///
+    /// # Errors
+    ///
+    /// In addition to the errors in [BlobObject::create] the
+    /// [BlobError::CopyFailure] is used when the data can not be
+    /// copied.
+    pub fn create_and_copy(
+        context: &'a Context,
+        src: impl AsRef<Path>,
+    ) -> std::result::Result<BlobObject<'a>, BlobError> {
+        let mut src_file = fs::File::open(src.as_ref()).map_err(|err| BlobError::CopyFailure {
+            blobdir: context.get_blobdir().to_path_buf(),
+            blobname: String::from(""),
+            src: src.as_ref().to_path_buf(),
+            cause: err,
+            backtrace: failure::Backtrace::new(),
+        })?;
+        let (stem, ext) = BlobObject::sanitise_name(&src.as_ref().to_string_lossy());
+        let (name, mut dst_file) = BlobObject::create_new_file(context.get_blobdir(), &stem, &ext)?;
+        let name_for_err = name.clone();
+        std::io::copy(&mut src_file, &mut dst_file).map_err(|err| {
+            {
+                // Attempt to remove the failed file, swallow errors resulting from that.
+                let path = context.get_blobdir().join(&name_for_err);
+                fs::remove_file(path).ok();
+            }
+            BlobError::CopyFailure {
+                blobdir: context.get_blobdir().to_path_buf(),
+                blobname: name_for_err,
+                src: src.as_ref().to_path_buf(),
+                cause: err,
+                backtrace: failure::Backtrace::new(),
+            }
+        })?;
+        let blob = BlobObject {
+            blobdir: context.get_blobdir(),
+            name: format!("$BLOBDIR/{}", name),
+        };
+        context.call_cb(Event::NewBlobFile(blob.as_name().to_string()));
+        Ok(blob)
+    }
+
+    /// Creates a blob from a file, possibly copying it to the blobdir.
+    ///
+    /// If the source file is not a path to into the blob directory
+    /// the file will be copied into the blob directory first.  If the
+    /// source file is already in the blobdir it will not be copied
+    /// and only be created if it is a valid blobname, that is no
+    /// subdirectory is used and [BlobObject::sanitise_name] does not
+    /// modify the filename.
+    ///
+    /// # Errors
+    ///
+    /// This merely delegates to the [BlobObject::create_and_copy] and
+    /// the [BlobObject::from_path] methods.  See those for possible
+    /// errors.
+    pub fn create_from_path(
+        context: &Context,
+        src: impl AsRef<Path>,
+    ) -> std::result::Result<BlobObject, BlobError> {
+        if src.as_ref().starts_with(context.get_blobdir()) {
+            BlobObject::from_path(context, src)
+        } else {
+            BlobObject::create_and_copy(context, src)
+        }
+    }
+
+    /// Returns a [BlobObject] for an existing blob from a path.
+    ///
+    /// The path must designate a file directly in the blobdir and
+    /// must use a valid blob name.  That is after sanitisation the
+    /// name must still be the same, that means it must be valid UTF-8
+    /// and not have any special characters in it.
+    ///
+    /// # Errors
+    ///
+    /// [BlobError::WrongBlobdir] is used if the path is not in
+    /// the blob directory.
+    ///
+    /// [BlobError::WrongName] is used if the file name does not
+    /// remain identical after sanitisation.
+    pub fn from_path(
+        context: &Context,
+        path: impl AsRef<Path>,
+    ) -> std::result::Result<BlobObject, BlobError> {
+        let rel_path = path
+            .as_ref()
+            .strip_prefix(context.get_blobdir())
+            .map_err(|_| BlobError::WrongBlobdir {
+                blobdir: context.get_blobdir().to_path_buf(),
+                src: path.as_ref().to_path_buf(),
+                backtrace: failure::Backtrace::new(),
+            })?;
+        if !BlobObject::is_acceptible_blob_name(&rel_path) {
+            return Err(BlobError::WrongName {
+                blobname: path.as_ref().to_path_buf(),
+                backtrace: failure::Backtrace::new(),
+            });
+        }
+        let name = rel_path.to_str().ok_or_else(|| BlobError::WrongName {
+            blobname: path.as_ref().to_path_buf(),
+            backtrace: failure::Backtrace::new(),
+        })?;
+        BlobObject::from_name(context, name.to_string())
+    }
+
+    /// Returns a [BlobObject] for an existing blob.
+    ///
+    /// The `name` may optionally be prefixed with the `$BLOBDIR/`
+    /// prefixed, as returned by [BlobObject::as_name].  This is how
+    /// you want to create a [BlobObject] for a filename read from the
+    /// database.
+    ///
+    /// # Errors
+    ///
+    /// [BlobError::WrongName] is used if the name is not a valid
+    /// blobname, i.e. if [BlobObject::sanitise_name] does modify the
+    /// provided name.
+    pub fn from_name(
+        context: &'a Context,
+        name: String,
+    ) -> std::result::Result<BlobObject<'a>, BlobError> {
+        let name: String = match name.starts_with("$BLOBDIR/") {
+            true => name.splitn(2, '/').last().unwrap().to_string(),
+            false => name,
+        };
+        if !BlobObject::is_acceptible_blob_name(&name) {
+            return Err(BlobError::WrongName {
+                blobname: PathBuf::from(name),
+                backtrace: failure::Backtrace::new(),
+            });
+        }
+        Ok(BlobObject {
+            blobdir: context.get_blobdir(),
+            name: format!("$BLOBDIR/{}", name),
+        })
+    }
+
+    /// Returns the absolute path to the blob in the filesystem.
+    pub fn to_abs_path(&self) -> PathBuf {
+        let fname = Path::new(&self.name).strip_prefix("$BLOBDIR/").unwrap();
+        self.blobdir.join(fname)
+    }
+
+    /// Returns the blob name, as stored in the database.
+    ///
+    /// This returns the blob in the `$BLOBDIR/<name>` format used in
+    /// the database.  Do not use this unless you're about to store
+    /// this string in the database or [Params].  Eventually even
+    /// those conversions should be handled by the type system.
+    ///
+    /// [Params]: crate::param::Params
+    pub fn as_name(&self) -> &str {
+        &self.name
+    }
+
+    /// Returns the filename of the blob.
+    pub fn as_file_name(&self) -> &str {
+        self.name.rsplitn(2, '/').next().unwrap()
+    }
+
+    /// The path relative in the blob directory.
+    pub fn as_rel_path(&self) -> &Path {
+        Path::new(self.as_file_name())
+    }
+
+    /// Returns the extension of the blob.
+    ///
+    /// If a blob's filename has an extension, it is always guaranteed
+    /// to be lowercase.
+    pub fn suffix(&self) -> Option<&str> {
+        let ext = self.name.rsplitn(2, '.').next();
+        if ext == Some(&self.name) {
+            None
+        } else {
+            ext
+        }
+    }
+
+    /// Create a safe name based on a messy input string.
+    ///
+    /// The safe name will be a valid filename on Unix and Windows and
+    /// not contain any path separators.  The input can contain path
+    /// segments separated by either Unix or Windows path separators,
+    /// the rightmost non-empty segment will be used as name,
+    /// sanitised for special characters.
+    ///
+    /// The resulting name is returned as a tuple, the first part
+    /// being the stem or basename and the second being an extension,
+    /// including the dot.  E.g. "foo.txt" is returned as `("foo",
+    /// ".txt")` while "bar" is returned as `("bar", "")`.
+    ///
+    /// The extension part will always be lowercased.
+    fn sanitise_name(name: &str) -> (String, String) {
+        let mut name = name.to_string();
+        for part in name.rsplit('/') {
+            if !part.is_empty() {
+                name = part.to_string();
+                break;
+            }
+        }
+        for part in name.rsplit('\\') {
+            if !part.is_empty() {
+                name = part.to_string();
+                break;
+            }
+        }
+        let opts = sanitize_filename::Options {
+            truncate: true,
+            windows: true,
+            replacement: "",
+        };
+
+        let clean = sanitize_filename::sanitize_with_options(name, opts);
+        let mut iter = clean.splitn(2, '.');
+        let mut stem = iter.next().unwrap_or_default().to_string();
+        let mut ext = iter.next().unwrap_or_default().to_string();
+        stem.truncate(64);
+        ext.truncate(32);
+        match ext.len() {
+            0 => (stem, "".to_string()),
+            _ => (stem, format!(".{}", ext).to_lowercase()),
+        }
+    }
+
+    /// Checks whether a name is a valid blob name.
+    ///
+    /// This is slightly less strict than stanitise_name, presumably
+    /// someone already created a file with such a name so we just
+    /// ensure it's not actually a path in disguise is actually utf-8.
+    fn is_acceptible_blob_name(name: impl AsRef<OsStr>) -> bool {
+        let uname = match name.as_ref().to_str() {
+            Some(name) => name,
+            None => return false,
+        };
+        if uname.find('/').is_some() {
+            return false;
+        }
+        if uname.find('\\').is_some() {
+            return false;
+        }
+        if uname.find('\0').is_some() {
+            return false;
+        }
+        true
+    }
+}
+
+impl<'a> fmt::Display for BlobObject<'a> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "$BLOBDIR/{}", self.name)
+    }
+}
+
+/// Errors for the [BlobObject].
+#[derive(Fail, Debug)]
+pub enum BlobError {
+    CreateFailure {
+        blobdir: PathBuf,
+        blobname: String,
+        #[cause]
+        cause: std::io::Error,
+        backtrace: failure::Backtrace,
+    },
+    WriteFailure {
+        blobdir: PathBuf,
+        blobname: String,
+        #[cause]
+        cause: std::io::Error,
+        backtrace: failure::Backtrace,
+    },
+    CopyFailure {
+        blobdir: PathBuf,
+        blobname: String,
+        src: PathBuf,
+        #[cause]
+        cause: std::io::Error,
+        backtrace: failure::Backtrace,
+    },
+    WrongBlobdir {
+        blobdir: PathBuf,
+        src: PathBuf,
+        backtrace: failure::Backtrace,
+    },
+    WrongName {
+        blobname: PathBuf,
+        backtrace: failure::Backtrace,
+    },
+}
+
+// Implementing Display is done by hand because the failure
+// #[fail(display = "...")] syntax does not allow using
+// `blobdir.display()`.
+impl fmt::Display for BlobError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        // Match on the data rather than kind, they are equivalent for
+        // identifying purposes but contain the actual data we need.
+        match &self {
+            BlobError::CreateFailure {
+                blobdir, blobname, ..
+            } => write!(
+                f,
+                "Failed to create blob {} in {}",
+                blobname,
+                blobdir.display()
+            ),
+            BlobError::WriteFailure {
+                blobdir, blobname, ..
+            } => write!(
+                f,
+                "Failed to write data to blob {} in {}",
+                blobname,
+                blobdir.display()
+            ),
+            BlobError::CopyFailure {
+                blobdir,
+                blobname,
+                src,
+                ..
+            } => write!(
+                f,
+                "Failed to copy data from {} to blob {} in {}",
+                src.display(),
+                blobname,
+                blobdir.display(),
+            ),
+            BlobError::WrongBlobdir { blobdir, src, .. } => write!(
+                f,
+                "File path {} is not in blobdir {}",
+                src.display(),
+                blobdir.display(),
+            ),
+            BlobError::WrongName { blobname, .. } => {
+                write!(f, "Blob has a bad name: {}", blobname.display(),)
+            }
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    use crate::test_utils::*;
+
+    #[test]
+    fn test_create() {
+        let t = dummy_context();
+        let blob = BlobObject::create(&t.ctx, "foo", b"hello").unwrap();
+        let fname = t.ctx.get_blobdir().join("foo");
+        let data = fs::read(fname).unwrap();
+        assert_eq!(data, b"hello");
+        assert_eq!(blob.as_name(), "$BLOBDIR/foo");
+        assert_eq!(blob.to_abs_path(), t.ctx.get_blobdir().join("foo"));
+    }
+
+    #[test]
+    fn test_lowercase_ext() {
+        let t = dummy_context();
+        let blob = BlobObject::create(&t.ctx, "foo.TXT", b"hello").unwrap();
+        assert_eq!(blob.as_name(), "$BLOBDIR/foo.txt");
+    }
+
+    #[test]
+    fn test_as_file_name() {
+        let t = dummy_context();
+        let blob = BlobObject::create(&t.ctx, "foo.txt", b"hello").unwrap();
+        assert_eq!(blob.as_file_name(), "foo.txt");
+    }
+
+    #[test]
+    fn test_as_rel_path() {
+        let t = dummy_context();
+        let blob = BlobObject::create(&t.ctx, "foo.txt", b"hello").unwrap();
+        assert_eq!(blob.as_rel_path(), Path::new("foo.txt"));
+    }
+
+    #[test]
+    fn test_suffix() {
+        let t = dummy_context();
+        let blob = BlobObject::create(&t.ctx, "foo.txt", b"hello").unwrap();
+        assert_eq!(blob.suffix(), Some("txt"));
+        let blob = BlobObject::create(&t.ctx, "bar", b"world").unwrap();
+        assert_eq!(blob.suffix(), None);
+    }
+
+    #[test]
+    fn test_create_dup() {
+        let t = dummy_context();
+        BlobObject::create(&t.ctx, "foo.txt", b"hello").unwrap();
+        let foo_path = t.ctx.get_blobdir().join("foo.txt");
+        assert!(foo_path.exists());
+        BlobObject::create(&t.ctx, "foo.txt", b"world").unwrap();
+        for dirent in fs::read_dir(t.ctx.get_blobdir()).unwrap() {
+            let fname = dirent.unwrap().file_name();
+            if fname == foo_path.file_name().unwrap() {
+                assert_eq!(fs::read(&foo_path).unwrap(), b"hello");
+            } else {
+                let name = fname.to_str().unwrap();
+                assert!(name.starts_with("foo"));
+                assert!(name.ends_with(".txt"));
+            }
+        }
+    }
+
+    #[test]
+    fn test_double_ext_preserved() {
+        let t = dummy_context();
+        BlobObject::create(&t.ctx, "foo.tar.gz", b"hello").unwrap();
+        let foo_path = t.ctx.get_blobdir().join("foo.tar.gz");
+        assert!(foo_path.exists());
+        BlobObject::create(&t.ctx, "foo.tar.gz", b"world").unwrap();
+        for dirent in fs::read_dir(t.ctx.get_blobdir()).unwrap() {
+            let fname = dirent.unwrap().file_name();
+            if fname == foo_path.file_name().unwrap() {
+                assert_eq!(fs::read(&foo_path).unwrap(), b"hello");
+            } else {
+                let name = fname.to_str().unwrap();
+                println!("{}", name);
+                assert!(name.starts_with("foo"));
+                assert!(name.ends_with(".tar.gz"));
+            }
+        }
+    }
+
+    #[test]
+    fn test_create_long_names() {
+        let t = dummy_context();
+        let s = "1".repeat(150);
+        let blob = BlobObject::create(&t.ctx, &s, b"data").unwrap();
+        let blobname = blob.as_name().split('/').last().unwrap();
+        assert!(blobname.len() < 128);
+    }
+
+    #[test]
+    fn test_create_and_copy() {
+        let t = dummy_context();
+        let src = t.dir.path().join("src");
+        fs::write(&src, b"boo").unwrap();
+        let blob = BlobObject::create_and_copy(&t.ctx, &src).unwrap();
+        assert_eq!(blob.as_name(), "$BLOBDIR/src");
+        let data = fs::read(blob.to_abs_path()).unwrap();
+        assert_eq!(data, b"boo");
+
+        let whoops = t.dir.path().join("whoops");
+        assert!(BlobObject::create_and_copy(&t.ctx, &whoops).is_err());
+        let whoops = t.ctx.get_blobdir().join("whoops");
+        assert!(!whoops.exists());
+    }
+
+    #[test]
+    fn test_create_from_path() {
+        let t = dummy_context();
+
+        let src_ext = t.dir.path().join("external");
+        fs::write(&src_ext, b"boo").unwrap();
+        let blob = BlobObject::create_from_path(&t.ctx, &src_ext).unwrap();
+        assert_eq!(blob.as_name(), "$BLOBDIR/external");
+        let data = fs::read(blob.to_abs_path()).unwrap();
+        assert_eq!(data, b"boo");
+
+        let src_int = t.ctx.get_blobdir().join("internal");
+        fs::write(&src_int, b"boo").unwrap();
+        let blob = BlobObject::create_from_path(&t.ctx, &src_int).unwrap();
+        assert_eq!(blob.as_name(), "$BLOBDIR/internal");
+        let data = fs::read(blob.to_abs_path()).unwrap();
+        assert_eq!(data, b"boo");
+    }
+    #[test]
+    fn test_create_from_name_long() {
+        let t = dummy_context();
+        let src_ext = t.dir.path().join("autocrypt-setup-message-4137848473.html");
+        fs::write(&src_ext, b"boo").unwrap();
+        let blob = BlobObject::create_from_path(&t.ctx, &src_ext).unwrap();
+        assert_eq!(
+            blob.as_name(),
+            "$BLOBDIR/autocrypt-setup-message-4137848473.html"
+        );
+    }
+
+    #[test]
+    fn test_is_blob_name() {
+        assert!(BlobObject::is_acceptible_blob_name("foo"));
+        assert!(BlobObject::is_acceptible_blob_name("foo.txt"));
+        assert!(BlobObject::is_acceptible_blob_name("f".repeat(128)));
+        assert!(!BlobObject::is_acceptible_blob_name("foo/bar"));
+        assert!(!BlobObject::is_acceptible_blob_name("foo\\bar"));
+        assert!(!BlobObject::is_acceptible_blob_name("foo\x00bar"));
+    }
+}

src/chatlist.rs

@@ -1,10 +1,12 @@
+//! # Chat list module
+
 use crate::chat::*;
 use crate::constants::*;
 use crate::contact::*;
 use crate::context::*;
 use crate::error::Result;
 use crate::lot::Lot;
-use crate::message::*;
+use crate::message::{Message, MessageState, MsgId};
 use crate::stock::StockMessage;
 
 /// An object representing a single chatlist in memory.
@@ -31,17 +33,13 @@ 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.
-pub struct Chatlist<'a> {
-    context: &'a Context,
+#[derive(Debug)]
+pub struct Chatlist {
     /// Stores pairs of `chat_id, message_id`
-    ids: Vec<(u32, u32)>,
+    ids: Vec<(u32, MsgId)>,
 }
 
-impl<'a> Chatlist<'a> {
-    pub fn get_context(&self) -> &Context {
-        self.context
-    }
-
+impl Chatlist {
     /// Get a list of chats.
     /// The list can be filtered by query parameters.
     ///
@@ -62,7 +60,7 @@ impl<'a> Chatlist<'a> {
     ///   or "Not now".
     ///   The UI can also offer a "Close" button that calls dc_marknoticed_contact() then.
     /// - DC_CHAT_ID_ARCHIVED_LINK (6) - this special chat is present if the user has
-    ///   archived _any_ chat using dc_archive_chat(). The UI should show a link as
+    ///   archived *any* chat using dc_archive_chat(). The UI should show a link as
     ///   "Show archived chats", if the user clicks this item, the UI should show a
     ///   list of all archived chats that can be created by this function hen using
     ///   the DC_GCL_ARCHIVED_ONLY flag.
@@ -73,7 +71,7 @@ impl<'a> Chatlist<'a> {
     /// The `listflags` is a combination of flags:
     /// - if the flag DC_GCL_ARCHIVED_ONLY is set, only archived chats are returned.
     ///   if DC_GCL_ARCHIVED_ONLY is not set, only unarchived chats are returned and
-    ///   the pseudo-chat DC_CHAT_ID_ARCHIVED_LINK is added if there are _any_ archived
+    ///   the pseudo-chat DC_CHAT_ID_ARCHIVED_LINK is added if there are *any* archived
     ///   chats
     /// - if the flag DC_GCL_NO_SPECIALS is set, deaddrop and archive link are not added
     ///   to the list (may be used eg. for selecting chats on forwarding, the flag is
@@ -85,30 +83,17 @@ impl<'a> Chatlist<'a> {
     /// `query_contact_id`: An optional contact ID for filtering the list. Only chats including this contact ID
     ///     are returned.
     pub fn try_load(
-        context: &'a Context,
+        context: &Context,
         listflags: usize,
         query: Option<&str>,
         query_contact_id: Option<u32>,
     ) -> Result<Self> {
-        let mut add_archived_link_item = 0;
-
-        // select with left join and minimum:
-        // - the inner select must use `hidden` and _not_ `m.hidden`
-        //   which would refer the outer select and take a lot of time
-        // - `GROUP BY` is needed several messages may have the same timestamp
-        // - the list starts with the newest chats
-        // nb: the query currently shows messages from blocked contacts in groups.
-        // however, for normal-groups, this is okay as the message is also returned by dc_get_chat_msgs()
-        // (otherwise it would be hard to follow conversations, wa and tg do the same)
-        // for the deaddrop, however, they should really be hidden, however, _currently_ the deaddrop is not
-        // shown at all permanent in the chatlist.
+        let mut add_archived_link_item = false;
 
         let process_row = |row: &rusqlite::Row| {
-            let chat_id: i32 = row.get(0)?;
-            // TODO: verify that it is okay for this to be Null
-            let msg_id: i32 = row.get(1).unwrap_or_default();
-
-            Ok((chat_id as u32, msg_id as u32))
+            let chat_id: u32 = row.get(0)?;
+            let msg_id: MsgId = row.get(1).unwrap_or_default();
+            Ok((chat_id, msg_id))
         };
 
         let process_rows = |rows: rusqlite::MappedRows<_>| {
@@ -116,37 +101,60 @@ impl<'a> Chatlist<'a> {
                 .map_err(Into::into)
         };
 
-        // nb: the query currently shows messages from blocked contacts in groups.
-        // however, for normal-groups, this is okay as the message is also returned by dc_get_chat_msgs()
-        // (otherwise it would be hard to follow conversations, wa and tg do the same)
-        // for the deaddrop, however, they should really be hidden, however, _currently_ the deaddrop is not
+        // select with left join and minimum:
+        //
+        // - the inner select must use `hidden` and _not_ `m.hidden`
+        //   which would refer the outer select and take a lot of time
+        // - `GROUP BY` is needed several messages may have the same
+        //   timestamp
+        // - the list starts with the newest chats
+        //
+        // nb: the query currently shows messages from blocked
+        // contacts in groups.  however, for normal-groups, this is
+        // okay as the message is also returned by dc_get_chat_msgs()
+        // (otherwise it would be hard to follow conversations, wa and
+        // tg do the same) for the deaddrop, however, they should
+        // really be hidden, however, _currently_ the deaddrop is not
         // shown at all permanent in the chatlist.
-
         let mut ids = if let Some(query_contact_id) = query_contact_id {
             // show chats shared with a given contact
             context.sql.query_map(
-            "SELECT c.id, m.id FROM chats c  LEFT JOIN msgs m         \
-             ON c.id=m.chat_id        \
-             AND m.timestamp=( SELECT MAX(timestamp)   \
-             FROM msgs  WHERE chat_id=c.id    \
-             AND (hidden=0 OR (hidden=1 AND state=19))) WHERE c.id>9   \
-             AND c.blocked=0 AND c.id IN(SELECT chat_id FROM chats_contacts WHERE contact_id=?)  \
-             GROUP BY c.id  ORDER BY IFNULL(m.timestamp,0) DESC, m.id DESC;",
-            params![query_contact_id as i32],
-            process_row,
-            process_rows,
-        )?
+                "SELECT c.id, m.id
+                 FROM chats c
+                 LEFT JOIN msgs m
+                        ON c.id=m.chat_id
+                       AND m.timestamp=(
+                               SELECT MAX(timestamp)
+                                 FROM msgs
+                                WHERE chat_id=c.id
+                                  AND (hidden=0 OR state=?))
+                 WHERE c.id>9
+                   AND c.blocked=0
+                   AND c.id IN(SELECT chat_id FROM chats_contacts WHERE contact_id=?)
+                 GROUP BY c.id
+                 ORDER BY IFNULL(m.timestamp,c.created_timestamp) DESC, m.id DESC;",
+                params![MessageState::OutDraft, query_contact_id as i32],
+                process_row,
+                process_rows,
+            )?
         } else if 0 != listflags & DC_GCL_ARCHIVED_ONLY {
             // show archived chats
             context.sql.query_map(
-                "SELECT c.id, m.id FROM chats c  LEFT JOIN msgs m         \
-                 ON c.id=m.chat_id        \
-                 AND m.timestamp=( SELECT MAX(timestamp)   \
-                 FROM msgs  WHERE chat_id=c.id    \
-                 AND (hidden=0 OR (hidden=1 AND state=19))) WHERE c.id>9   \
-                 AND c.blocked=0 AND c.archived=1  GROUP BY c.id  \
-                 ORDER BY IFNULL(m.timestamp,0) DESC, m.id DESC;",
-                params![],
+                "SELECT c.id, m.id
+                 FROM chats c
+                 LEFT JOIN msgs m
+                        ON c.id=m.chat_id
+                       AND m.timestamp=(
+                               SELECT MAX(timestamp)
+                                 FROM msgs
+                                WHERE chat_id=c.id
+                                  AND (hidden=0 OR state=?))
+                 WHERE c.id>9
+                   AND c.blocked=0
+                   AND c.archived=1
+                 GROUP BY c.id
+                 ORDER BY IFNULL(m.timestamp,c.created_timestamp) DESC, m.id DESC;",
+                params![MessageState::OutDraft],
                 process_row,
                 process_rows,
             )?
@@ -156,51 +164,62 @@ impl<'a> Chatlist<'a> {
 
             let str_like_cmd = format!("%{}%", query);
             context.sql.query_map(
-                "SELECT c.id, m.id FROM chats c  LEFT JOIN msgs m         \
-                 ON c.id=m.chat_id        \
-                 AND m.timestamp=( SELECT MAX(timestamp)   \
-                 FROM msgs  WHERE chat_id=c.id    \
-                 AND (hidden=0 OR (hidden=1 AND state=19))) WHERE c.id>9   \
-                 AND c.blocked=0 AND c.name LIKE ?  \
-                 GROUP BY c.id  ORDER BY IFNULL(m.timestamp,0) DESC, m.id DESC;",
-                params![str_like_cmd],
+                "SELECT c.id, m.id
+                 FROM chats c
+                 LEFT JOIN msgs m
+                        ON c.id=m.chat_id
+                       AND m.timestamp=(
+                               SELECT MAX(timestamp)
+                                 FROM msgs
+                                WHERE chat_id=c.id
+                                  AND (hidden=0 OR state=?))
+                 WHERE c.id>9
+                   AND c.blocked=0
+                   AND c.name LIKE ?
+                 GROUP BY c.id
+                 ORDER BY IFNULL(m.timestamp,c.created_timestamp) DESC, m.id DESC;",
+                params![MessageState::OutDraft, str_like_cmd],
                 process_row,
                 process_rows,
             )?
         } else {
             //  show normal chatlist
             let mut ids = context.sql.query_map(
-                "SELECT c.id, m.id FROM chats c  \
-                 LEFT JOIN msgs m         \
-                 ON c.id=m.chat_id        \
-                 AND m.timestamp=( SELECT MAX(timestamp)   \
-                 FROM msgs  WHERE chat_id=c.id    \
-                 AND (hidden=0 OR (hidden=1 AND state=19))) WHERE c.id>9   \
-                 AND c.blocked=0 AND c.archived=0  \
-                 GROUP BY c.id  \
-                 ORDER BY IFNULL(m.timestamp,0) DESC, m.id DESC;",
-                params![],
+                "SELECT c.id, m.id
+                 FROM chats c
+                 LEFT JOIN msgs m
+                        ON c.id=m.chat_id
+                       AND m.timestamp=(
+                               SELECT MAX(timestamp)
+                                 FROM msgs
+                                WHERE chat_id=c.id
+                                  AND (hidden=0 OR state=?))
+                 WHERE c.id>9
+                   AND c.blocked=0
+                   AND c.archived=0
+                 GROUP BY c.id
+                 ORDER BY IFNULL(m.timestamp,c.created_timestamp) DESC, m.id DESC;",
+                params![MessageState::OutDraft],
                 process_row,
                 process_rows,
             )?;
             if 0 == listflags & DC_GCL_NO_SPECIALS {
-                let last_deaddrop_fresh_msg_id = get_last_deaddrop_fresh_msg(context);
-                if last_deaddrop_fresh_msg_id > 0 {
-                    ids.push((1, last_deaddrop_fresh_msg_id));
+                if let Some(last_deaddrop_fresh_msg_id) = get_last_deaddrop_fresh_msg(context) {
+                    ids.insert(0, (DC_CHAT_ID_DEADDROP, last_deaddrop_fresh_msg_id));
                 }
-                add_archived_link_item = 1;
+                add_archived_link_item = true;
             }
             ids
         };
 
-        if 0 != add_archived_link_item && dc_get_archived_cnt(context) > 0 {
+        if 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 as u32, 0));
+                ids.push((DC_CHAT_ID_ALLDONE_HINT, MsgId::new(0)));
             }
-            ids.push((DC_CHAT_ID_ARCHIVED_LINK as u32, 0));
+            ids.push((DC_CHAT_ID_ARCHIVED_LINK, MsgId::new(0)));
         }
 
-        Ok(Chatlist { context, ids })
+        Ok(Chatlist { ids })
     }
 
     /// Find out the number of chats.
@@ -208,6 +227,7 @@ impl<'a> Chatlist<'a> {
         self.ids.len()
     }
 
+    /// Returns true if chatlist is empty.
     pub fn is_empty(&self) -> bool {
         self.ids.is_empty()
     }
@@ -225,12 +245,9 @@ impl<'a> Chatlist<'a> {
     /// Get a single message ID of a chatlist.
     ///
     /// To get the message object from the message ID, use dc_get_msg().
-    pub fn get_msg_id(&self, index: usize) -> u32 {
-        if index >= self.ids.len() {
-            return 0;
-        }
-
-        self.ids[index].1
+    pub fn get_msg_id(&self, index: usize) -> Result<MsgId> {
+        ensure!(index < self.ids.len(), "Chatlist index out of range");
+        Ok(self.ids[index].1)
     }
 
     /// Get a summary for a chatlist index.
@@ -247,7 +264,7 @@ impl<'a> Chatlist<'a> {
     /// - 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 unsafe fn get_summary(&self, index: usize, chat: Option<&Chat<'a>>) -> Lot {
+    pub fn get_summary(&self, context: &Context, index: usize, chat: Option<&Chat>) -> Lot {
         // 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".
@@ -262,79 +279,109 @@ impl<'a> Chatlist<'a> {
         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 {
-            if let Ok(chat) = Chat::load_from_db(self.context, self.ids[index].0) {
-                chat_loaded = chat;
-                &chat_loaded
-            } else {
-                return ret;
-            }
+            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(self.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(self.context, lastmsg.from_id).ok();
-                }
-
-                Some(lastmsg)
-            } else {
-                None
+        let lastmsg = if let Ok(lastmsg) = Message::load_from_db(context, lastmsg_id) {
+            if lastmsg.from_id != DC_CONTACT_ID_SELF
+                && (chat.typ == Chattype::Group || chat.typ == Chattype::VerifiedGroup)
+            {
+                lastcontact = Contact::load_from_db(context, lastmsg.from_id).ok();
             }
+
+            Some(lastmsg)
         } else {
             None
         };
 
-        if chat.id == DC_CHAT_ID_ARCHIVED_LINK as u32 {
+        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 as u32
+        } else if lastmsg.is_none() || lastmsg.as_ref().unwrap().from_id == DC_CONTACT_ID_UNDEFINED
         {
-            ret.text2 = Some(self.context.stock_str(StockMessage::NoMessages).to_string());
+            ret.text2 = Some(context.stock_str(StockMessage::NoMessages).to_string());
         } else {
-            ret.fill(
-                &mut lastmsg.unwrap(),
-                chat,
-                lastcontact.as_ref(),
-                self.context,
-            );
+            ret.fill(&mut lastmsg.unwrap(), chat, lastcontact.as_ref(), context);
         }
 
         ret
     }
 }
 
+/// Get the number of archived chats
 pub fn dc_get_archived_cnt(context: &Context) -> u32 {
     context
         .sql
-        .query_row_col(
+        .query_get_value(
             context,
             "SELECT COUNT(*) FROM chats WHERE blocked=0 AND archived=1;",
             params![],
-            0,
         )
         .unwrap_or_default()
 }
 
-fn get_last_deaddrop_fresh_msg(context: &Context) -> u32 {
-    // We have an index over the state-column, this should be sufficient as there are typically
-    // only few fresh messages.
-    context
-        .sql
-        .query_row_col(
-            context,
-            "SELECT m.id  FROM msgs m  LEFT JOIN chats c ON c.id=m.chat_id  \
-             WHERE m.state=10   \
-             AND m.hidden=0    \
-             AND c.blocked=2 \
-             ORDER BY m.timestamp DESC, m.id DESC;",
-            params![],
-            0,
-        )
-        .unwrap_or_default()
+fn get_last_deaddrop_fresh_msg(context: &Context) -> Option<MsgId> {
+    // We have an index over the state-column, this should be
+    // sufficient as there are typically only few fresh messages.
+    context.sql.query_get_value(
+        context,
+        concat!(
+            "SELECT m.id",
+            " FROM msgs m",
+            " LEFT JOIN chats c",
+            "        ON c.id=m.chat_id",
+            " WHERE m.state=10",
+            "   AND m.hidden=0",
+            "   AND c.blocked=2",
+            " ORDER BY m.timestamp DESC, m.id DESC;"
+        ),
+        params![],
+    )
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    use crate::chat;
+    use crate::test_utils::*;
+
+    #[test]
+    fn test_try_load() {
+        let t = dummy_context();
+        let chat_id1 = create_group_chat(&t.ctx, VerifiedStatus::Unverified, "a chat").unwrap();
+        let chat_id2 = create_group_chat(&t.ctx, VerifiedStatus::Unverified, "b chat").unwrap();
+        let chat_id3 = create_group_chat(&t.ctx, VerifiedStatus::Unverified, "c chat").unwrap();
+
+        // check that the chatlist starts with the most recent message
+        let chats = Chatlist::try_load(&t.ctx, 0, None, None).unwrap();
+        assert_eq!(chats.len(), 3);
+        assert_eq!(chats.get_chat_id(0), chat_id3);
+        assert_eq!(chats.get_chat_id(1), chat_id2);
+        assert_eq!(chats.get_chat_id(2), chat_id1);
+
+        // drafts are sorted to the top
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text(Some("hello".to_string()));
+        set_draft(&t.ctx, chat_id2, Some(&mut msg));
+        let chats = Chatlist::try_load(&t.ctx, 0, None, None).unwrap();
+        assert_eq!(chats.get_chat_id(0), chat_id2);
+
+        // check chatlist query and archive functionality
+        let chats = Chatlist::try_load(&t.ctx, 0, Some("b"), None).unwrap();
+        assert_eq!(chats.len(), 1);
+
+        let chats = Chatlist::try_load(&t.ctx, DC_GCL_ARCHIVED_ONLY, None, None).unwrap();
+        assert_eq!(chats.len(), 0);
+
+        chat::archive(&t.ctx, chat_id1, true).ok();
+        let chats = Chatlist::try_load(&t.ctx, DC_GCL_ARCHIVED_ONLY, None, None).unwrap();
+        assert_eq!(chats.len(), 1);
+    }
 }

src/config.rs

@@ -1,10 +1,12 @@
+//! # Key-value configuration management
+
 use strum::{EnumProperty, IntoEnumIterator};
 use strum_macros::{AsRefStr, Display, EnumIter, EnumProperty, EnumString};
 
+use crate::blob::BlobObject;
 use crate::constants::DC_VERSION_STR;
 use crate::context::Context;
 use crate::dc_tools::*;
-use crate::error::Error;
 use crate::job::*;
 use crate::stock::StockMessage;
 
@@ -19,29 +21,45 @@ pub enum Config {
     MailUser,
     MailPw,
     MailPort,
+    ImapCertificateChecks,
     SendServer,
     SendUser,
     SendPw,
     SendPort,
+    SmtpCertificateChecks,
     ServerFlags,
+
     #[strum(props(default = "INBOX"))]
     ImapFolder,
+
     Displayname,
     Selfstatus,
     Selfavatar,
+
+    #[strum(props(default = "0"))]
+    BccSelf,
+
     #[strum(props(default = "1"))]
     E2eeEnabled,
+
     #[strum(props(default = "1"))]
     MdnsEnabled,
+
+    #[strum(props(default = "1"))]
     InboxWatch,
+
     #[strum(props(default = "1"))]
     SentboxWatch,
+
     #[strum(props(default = "1"))]
     MvboxWatch,
+
     #[strum(props(default = "1"))]
     MvboxMove,
-    #[strum(props(default = "0"))]
+
+    #[strum(props(default = "0"))] // also change ShowEmails.default() on changes
     ShowEmails,
+
     SaveMimeHeaders,
     ConfiguredAddr,
     ConfiguredMailServer,
@@ -49,19 +67,23 @@ pub enum Config {
     ConfiguredMailPw,
     ConfiguredMailPort,
     ConfiguredMailSecurity,
+    ConfiguredImapCertificateChecks,
     ConfiguredSendServer,
     ConfiguredSendUser,
     ConfiguredSendPw,
     ConfiguredSendPort,
+    ConfiguredSmtpCertificateChecks,
     ConfiguredServerFlags,
     ConfiguredSendSecurity,
     ConfiguredE2EEEnabled,
     Configured,
-    // Deprecated
+
     #[strum(serialize = "sys.version")]
     SysVersion,
+
     #[strum(serialize = "sys.msgsize_max_recommended")]
     SysMsgsizeMaxRecommended,
+
     #[strum(serialize = "sys.config_keys")]
     SysConfigKeys,
 }
@@ -71,13 +93,13 @@ impl Context {
     pub fn get_config(&self, key: Config) -> Option<String> {
         let value = match key {
             Config::Selfavatar => {
-                let rel_path = self.sql.get_config(self, key);
-                rel_path.map(|p| dc_get_abs_path_safe(self, &p).to_str().unwrap().to_string())
+                let rel_path = self.sql.get_raw_config(self, key);
+                rel_path.map(|p| dc_get_abs_path(self, &p).to_string_lossy().into_owned())
             }
             Config::SysVersion => Some((&*DC_VERSION_STR).clone()),
             Config::SysMsgsizeMaxRecommended => Some(format!("{}", 24 * 1024 * 1024 / 4 * 3)),
             Config::SysConfigKeys => Some(get_config_keys_string()),
-            _ => self.sql.get_config(self, key),
+            _ => self.sql.get_raw_config(self, key),
         };
 
         if value.is_some() {
@@ -91,27 +113,36 @@ impl Context {
         }
     }
 
+    pub fn get_config_int(&self, key: Config) -> i32 {
+        self.get_config(key)
+            .and_then(|s| s.parse().ok())
+            .unwrap_or_default()
+    }
+
+    pub fn get_config_bool(&self, key: Config) -> bool {
+        self.get_config_int(key) != 0
+    }
+
     /// Set the given config key.
     /// If `None` is passed as a value the value is cleared and set to the default if there is one.
-    pub fn set_config(&self, key: Config, value: Option<&str>) -> Result<(), Error> {
+    pub fn set_config(&self, key: Config, value: Option<&str>) -> crate::sql::Result<()> {
         match key {
             Config::Selfavatar if value.is_some() => {
-                let rel_path = std::fs::canonicalize(value.unwrap())?;
-                self.sql
-                    .set_config(self, key, Some(&rel_path.to_string_lossy()))
+                let blob = BlobObject::create_from_path(&self, value.unwrap())?;
+                self.sql.set_raw_config(self, key, Some(blob.as_name()))
             }
             Config::InboxWatch => {
-                let ret = self.sql.set_config(self, key, value);
-                interrupt_imap_idle(self);
+                let ret = self.sql.set_raw_config(self, key, value);
+                interrupt_inbox_idle(self, true);
                 ret
             }
             Config::SentboxWatch => {
-                let ret = self.sql.set_config(self, key, value);
+                let ret = self.sql.set_raw_config(self, key, value);
                 interrupt_sentbox_idle(self);
                 ret
             }
             Config::MvboxWatch => {
-                let ret = self.sql.set_config(self, key, value);
+                let ret = self.sql.set_raw_config(self, key, value);
                 interrupt_mvbox_idle(self);
                 ret
             }
@@ -123,9 +154,9 @@ impl Context {
                     value
                 };
 
-                self.sql.set_config(self, key, val)
+                self.sql.set_raw_config(self, key, val)
             }
-            _ => self.sql.set_config(self, key, value),
+            _ => self.sql.set_raw_config(self, key, value),
         }
     }
 }
@@ -148,6 +179,8 @@ mod tests {
     use std::str::FromStr;
     use std::string::ToString;
 
+    use crate::test_utils::*;
+
     #[test]
     fn test_to_string() {
         assert_eq!(Config::MailServer.to_string(), "mail_server");
@@ -164,4 +197,32 @@ mod tests {
     fn test_default_prop() {
         assert_eq!(Config::ImapFolder.get_str("default"), Some("INBOX"));
     }
+
+    #[test]
+    fn test_selfavatar() -> failure::Fallible<()> {
+        let t = dummy_context();
+        let avatar_src = t.dir.path().join("avatar.jpg");
+        std::fs::write(&avatar_src, b"avatar")?;
+        let avatar_blob = t.ctx.get_blobdir().join("avatar.jpg");
+        assert!(!avatar_blob.exists());
+        t.ctx
+            .set_config(Config::Selfavatar, Some(&avatar_src.to_str().unwrap()))?;
+        assert!(avatar_blob.exists());
+        assert_eq!(std::fs::read(&avatar_blob)?, b"avatar");
+        let avatar_cfg = t.ctx.get_config(Config::Selfavatar);
+        assert_eq!(avatar_cfg, avatar_blob.to_str().map(|s| s.to_string()));
+        Ok(())
+    }
+
+    #[test]
+    fn test_selfavatar_in_blobdir() -> failure::Fallible<()> {
+        let t = dummy_context();
+        let avatar_src = t.ctx.get_blobdir().join("avatar.jpg");
+        std::fs::write(&avatar_src, b"avatar")?;
+        t.ctx
+            .set_config(Config::Selfavatar, Some(&avatar_src.to_str().unwrap()))?;
+        let avatar_cfg = t.ctx.get_config(Config::Selfavatar);
+        assert_eq!(avatar_cfg, avatar_src.to_str().map(|s| s.to_string()));
+        Ok(())
+    }
 }

src/configure/auto_mozilla.rs

@@ -1,88 +1,112 @@
+//! # Thunderbird's Autoconfiguration implementation
+//!
+//! Documentation: https://developer.mozilla.org/en-US/docs/Mozilla/Thunderbird/Autoconfiguration */
+use failure::Fail;
+
 use quick_xml;
 use quick_xml::events::{BytesEnd, BytesStart, BytesText};
 
+use crate::constants::*;
 use crate::context::Context;
-use crate::dc_loginparam::*;
-use crate::dc_tools::*;
-use crate::x::*;
+use crate::login_param::LoginParam;
 
-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 dc_loginparam_t,
-    pub in_emaildomain: *mut libc::c_char,
-    pub in_emaillocalpart: *mut libc::c_char,
-    pub out: dc_loginparam_t,
-    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,
+use super::read_url::read_url;
+
+#[derive(Debug, Fail)]
+pub enum Error {
+    #[fail(display = "Invalid email address: {:?}", _0)]
+    InvalidEmailAddress(String),
+
+    #[fail(display = "XML error at position {}", position)]
+    InvalidXml {
+        position: usize,
+        #[cause]
+        error: quick_xml::Error,
+    },
+
+    #[fail(display = "Bad or incomplete autoconfig")]
+    IncompleteAutoconfig(LoginParam),
+
+    #[fail(display = "Failed to get URL {}", _0)]
+    ReadUrlError(#[cause] super::read_url::Error),
 }
 
-pub unsafe fn moz_autoconfigure(
-    context: &Context,
-    url: &str,
-    param_in: &dc_loginparam_t,
-) -> Option<dc_loginparam_t> {
-    let mut moz_ac = moz_autoconfigure_t {
-        in_0: param_in,
-        in_emaildomain: std::ptr::null_mut(),
-        in_emaillocalpart: std::ptr::null_mut(),
-        out: dc_loginparam_new(),
-        out_imap_set: 0,
-        out_smtp_set: 0,
-        tag_server: 0,
-        tag_config: 0,
-    };
+pub type Result<T> = std::result::Result<T, Error>;
 
-    let url_c = url.strdup();
-    let xml_raw = read_autoconf_file(context, url_c);
-    free(url_c as *mut libc::c_void);
-    if xml_raw.is_null() {
-        return None;
+impl From<super::read_url::Error> for Error {
+    fn from(err: super::read_url::Error) -> Error {
+        Error::ReadUrlError(err)
     }
+}
 
-    moz_ac.in_emaillocalpart = param_in.addr.strdup();
-    let p = strchr(moz_ac.in_emaillocalpart, '@' as i32);
+#[derive(Debug)]
+struct MozAutoconfigure<'a> {
+    pub in_emailaddr: &'a str,
+    pub in_emaildomain: &'a str,
+    pub in_emaillocalpart: &'a str,
+    pub out: LoginParam,
+    pub out_imap_set: bool,
+    pub out_smtp_set: bool,
+    pub tag_server: MozServer,
+    pub tag_config: MozConfigTag,
+}
 
-    if p.is_null() {
-        free(xml_raw as *mut libc::c_void);
-        free(moz_ac.in_emaildomain as *mut libc::c_void);
-        free(moz_ac.in_emaillocalpart as *mut libc::c_void);
-        return None;
-    }
+#[derive(Debug, PartialEq)]
+enum MozServer {
+    Undefined,
+    Imap,
+    Smtp,
+}
 
-    *p = 0 as libc::c_char;
-    moz_ac.in_emaildomain = dc_strdup(p.offset(1isize));
+#[derive(Debug)]
+enum MozConfigTag {
+    Undefined,
+    Hostname,
+    Port,
+    Sockettype,
+    Username,
+}
 
-    let mut reader = quick_xml::Reader::from_str(as_str(xml_raw));
+fn parse_xml(in_emailaddr: &str, xml_raw: &str) -> Result<LoginParam> {
+    let mut reader = quick_xml::Reader::from_str(xml_raw);
     reader.trim_text(true);
 
-    let mut buf = Vec::new();
+    // Split address into local part and domain part.
+    let p = in_emailaddr
+        .find('@')
+        .ok_or_else(|| Error::InvalidEmailAddress(in_emailaddr.to_string()))?;
+    let (in_emaillocalpart, in_emaildomain) = in_emailaddr.split_at(p);
+    let in_emaildomain = &in_emaildomain[1..];
 
+    let mut moz_ac = MozAutoconfigure {
+        in_emailaddr,
+        in_emaildomain,
+        in_emaillocalpart,
+        out: LoginParam::new(),
+        out_imap_set: false,
+        out_smtp_set: false,
+        tag_server: MozServer::Undefined,
+        tag_config: MozConfigTag::Undefined,
+    };
+
+    let mut buf = Vec::new();
     loop {
-        match reader.read_event(&mut buf) {
-            Ok(quick_xml::events::Event::Start(ref e)) => {
+        let event = reader
+            .read_event(&mut buf)
+            .map_err(|error| Error::InvalidXml {
+                position: reader.buffer_position(),
+                error,
+            })?;
+
+        match event {
+            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)) => {
+            quick_xml::events::Event::End(ref e) => moz_autoconfigure_endtag_cb(e, &mut moz_ac),
+            quick_xml::events::Event::Text(ref e) => {
                 moz_autoconfigure_text_cb(e, &mut moz_ac, &reader)
             }
-            Err(e) => {
-                error!(
-                    context,
-                    0,
-                    "Configure xml: Error at position {}: {:?}",
-                    reader.buffer_position(),
-                    e
-                );
-            }
-            Ok(quick_xml::events::Event::Eof) => break,
+            quick_xml::events::Event::Eof => break,
             _ => (),
         }
         buf.clear();
@@ -93,30 +117,39 @@ pub unsafe fn moz_autoconfigure(
         || moz_ac.out.send_server.is_empty()
         || moz_ac.out.send_port == 0
     {
-        let r = dc_loginparam_get_readable(&moz_ac.out);
-        warn!(context, 0, "Bad or incomplete autoconfig: {}", r,);
-        free(xml_raw as *mut libc::c_void);
-        free(moz_ac.in_emaildomain as *mut libc::c_void);
-        free(moz_ac.in_emaillocalpart as *mut libc::c_void);
-        return None;
+        Err(Error::IncompleteAutoconfig(moz_ac.out))
+    } else {
+        Ok(moz_ac.out)
     }
+}
 
-    free(xml_raw as *mut libc::c_void);
-    free(moz_ac.in_emaildomain as *mut libc::c_void);
-    free(moz_ac.in_emaillocalpart as *mut libc::c_void);
-    Some(moz_ac.out)
+pub fn moz_autoconfigure(
+    context: &Context,
+    url: &str,
+    param_in: &LoginParam,
+) -> Result<LoginParam> {
+    let xml_raw = read_url(context, url)?;
+
+    let res = parse_xml(&param_in.addr, &xml_raw);
+    if let Err(err) = &res {
+        warn!(
+            context,
+            "Failed to parse Thunderbird autoconfiguration XML: {}", err
+        );
+    }
+    res
 }
 
 fn moz_autoconfigure_text_cb<B: std::io::BufRead>(
     event: &BytesText,
-    moz_ac: &mut moz_autoconfigure_t,
+    moz_ac: &mut MozAutoconfigure,
     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 = as_str(moz_ac.in_emaillocalpart);
-    let email_domain = as_str(moz_ac.in_emaildomain);
+    let addr = moz_ac.in_emailaddr;
+    let email_local = moz_ac.in_emaillocalpart;
+    let email_domain = moz_ac.in_emaildomain;
 
     let val = val
         .trim()
@@ -124,66 +157,70 @@ fn moz_autoconfigure_text_cb<B: std::io::BufRead>(
         .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 => {
+    match moz_ac.tag_server {
+        MozServer::Imap => match moz_ac.tag_config {
+            MozConfigTag::Hostname => moz_ac.out.mail_server = val,
+            MozConfigTag::Port => moz_ac.out.mail_port = val.parse().unwrap_or_default(),
+            MozConfigTag::Username => moz_ac.out.mail_user = val,
+            MozConfigTag::Sockettype => {
                 let val_lower = val.to_lowercase();
                 if val_lower == "ssl" {
-                    moz_ac.out.server_flags |= 0x200
+                    moz_ac.out.server_flags |= DC_LP_IMAP_SOCKET_SSL as i32
                 }
                 if val_lower == "starttls" {
-                    moz_ac.out.server_flags |= 0x100
+                    moz_ac.out.server_flags |= DC_LP_IMAP_SOCKET_STARTTLS as i32
                 }
                 if val_lower == "plain" {
-                    moz_ac.out.server_flags |= 0x400
+                    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 => {
+        },
+        MozServer::Smtp => match moz_ac.tag_config {
+            MozConfigTag::Hostname => moz_ac.out.send_server = val,
+            MozConfigTag::Port => moz_ac.out.send_port = val.parse().unwrap_or_default(),
+            MozConfigTag::Username => moz_ac.out.send_user = val,
+            MozConfigTag::Sockettype => {
                 let val_lower = val.to_lowercase();
                 if val_lower == "ssl" {
-                    moz_ac.out.server_flags |= 0x20000
+                    moz_ac.out.server_flags |= DC_LP_SMTP_SOCKET_SSL as i32
                 }
                 if val_lower == "starttls" {
-                    moz_ac.out.server_flags |= 0x10000
+                    moz_ac.out.server_flags |= DC_LP_SMTP_SOCKET_STARTTLS as i32
                 }
                 if val_lower == "plain" {
-                    moz_ac.out.server_flags |= 0x40000
+                    moz_ac.out.server_flags |= DC_LP_SMTP_SOCKET_PLAIN as i32
                 }
             }
             _ => {}
-        }
+        },
+        MozServer::Undefined => {}
     }
 }
 
-fn moz_autoconfigure_endtag_cb(event: &BytesEnd, moz_ac: &mut moz_autoconfigure_t) {
+fn moz_autoconfigure_endtag_cb(event: &BytesEnd, moz_ac: &mut MozAutoconfigure) {
     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;
+        if moz_ac.tag_server == MozServer::Imap {
+            moz_ac.out_imap_set = true;
+        }
+        moz_ac.tag_server = MozServer::Undefined;
+        moz_ac.tag_config = MozConfigTag::Undefined;
     } else if tag == "outgoingserver" {
-        moz_ac.tag_server = 0;
-        moz_ac.tag_config = 0;
-        moz_ac.out_smtp_set = 1;
+        if moz_ac.tag_server == MozServer::Smtp {
+            moz_ac.out_smtp_set = true;
+        }
+        moz_ac.tag_server = MozServer::Undefined;
+        moz_ac.tag_config = MozConfigTag::Undefined;
     } else {
-        moz_ac.tag_config = 0;
+        moz_ac.tag_config = MozConfigTag::Undefined;
     }
 }
 
 fn moz_autoconfigure_starttag_cb<B: std::io::BufRead>(
     event: &BytesStart,
-    moz_ac: &mut moz_autoconfigure_t,
+    moz_ac: &mut MozAutoconfigure,
     reader: &quick_xml::Reader<B>,
 ) {
     let tag = String::from_utf8_lossy(event.name()).trim().to_lowercase();
@@ -200,25 +237,115 @@ fn moz_autoconfigure_starttag_cb<B: std::io::BufRead>(
                 .unwrap_or_default()
                 .to_lowercase();
 
-            if typ == "imap" && moz_ac.out_imap_set == 0 {
-                1
+            if typ == "imap" && !moz_ac.out_imap_set {
+                MozServer::Imap
             } else {
-                0
+                MozServer::Undefined
             }
         } else {
-            0
+            MozServer::Undefined
         };
-        moz_ac.tag_config = 0;
+        moz_ac.tag_config = MozConfigTag::Undefined;
     } else if tag == "outgoingserver" {
-        moz_ac.tag_server = if moz_ac.out_smtp_set == 0 { 2 } else { 0 };
-        moz_ac.tag_config = 0;
+        moz_ac.tag_server = if !moz_ac.out_smtp_set {
+            MozServer::Smtp
+        } else {
+            MozServer::Undefined
+        };
+        moz_ac.tag_config = MozConfigTag::Undefined;
     } else if tag == "hostname" {
-        moz_ac.tag_config = 10;
+        moz_ac.tag_config = MozConfigTag::Hostname;
     } else if tag == "port" {
-        moz_ac.tag_config = 11;
+        moz_ac.tag_config = MozConfigTag::Port;
     } else if tag == "sockettype" {
-        moz_ac.tag_config = 13;
+        moz_ac.tag_config = MozConfigTag::Sockettype;
     } else if tag == "username" {
-        moz_ac.tag_config = 12;
+        moz_ac.tag_config = MozConfigTag::Username;
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_parse_outlook_autoconfig() {
+        // Copied from https://autoconfig.thunderbird.net/v1.1/outlook.com on 2019-10-11
+        let xml_raw =
+"<clientConfig version=\"1.1\">
+  <emailProvider id=\"outlook.com\">
+    <domain>hotmail.com</domain>
+    <domain>hotmail.co.uk</domain>
+    <domain>hotmail.co.jp</domain>
+    <domain>hotmail.com.br</domain>
+    <domain>hotmail.de</domain>
+    <domain>hotmail.fr</domain>
+    <domain>hotmail.it</domain>
+    <domain>hotmail.es</domain>
+    <domain>live.com</domain>
+    <domain>live.co.uk</domain>
+    <domain>live.co.jp</domain>
+    <domain>live.de</domain>
+    <domain>live.fr</domain>
+    <domain>live.it</domain>
+    <domain>live.jp</domain>
+    <domain>msn.com</domain>
+    <domain>outlook.com</domain>
+    <displayName>Outlook.com (Microsoft)</displayName>
+    <displayShortName>Outlook</displayShortName>
+    <incomingServer type=\"exchange\">
+      <hostname>outlook.office365.com</hostname>
+      <port>443</port>
+      <username>%EMAILADDRESS%</username>
+      <socketType>SSL</socketType>
+      <authentication>OAuth2</authentication>
+      <owaURL>https://outlook.office365.com/owa/</owaURL>
+      <ewsURL>https://outlook.office365.com/ews/exchange.asmx</ewsURL>
+      <useGlobalPreferredServer>true</useGlobalPreferredServer>
+    </incomingServer>
+    <incomingServer type=\"imap\">
+      <hostname>outlook.office365.com</hostname>
+      <port>993</port>
+      <socketType>SSL</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILADDRESS%</username>
+    </incomingServer>
+    <incomingServer type=\"pop3\">
+      <hostname>outlook.office365.com</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILADDRESS%</username>
+      <pop3>
+        <leaveMessagesOnServer>true</leaveMessagesOnServer>
+        <!-- Outlook.com docs specifically mention that POP3 deletes have effect on the main inbox on webmail and IMAP -->
+      </pop3>
+    </incomingServer>
+    <outgoingServer type=\"smtp\">
+      <hostname>smtp.office365.com</hostname>
+      <port>587</port>
+      <socketType>STARTTLS</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILADDRESS%</username>
+    </outgoingServer>
+    <documentation url=\"http://windows.microsoft.com/en-US/windows/outlook/send-receive-from-app\">
+      <descr lang=\"en\">Set up an email app with Outlook.com</descr>
+    </documentation>
+  </emailProvider>
+  <webMail>
+    <loginPage url=\"https://www.outlook.com/\"/>
+    <loginPageInfo url=\"https://www.outlook.com/\">
+      <username>%EMAILADDRESS%</username>
+      <usernameField id=\"i0116\" name=\"login\"/>
+      <passwordField id=\"i0118\" name=\"passwd\"/>
+      <loginButton id=\"idSIButton9\" name=\"SI\"/>
+    </loginPageInfo>
+  </webMail>
+</clientConfig>";
+        let res = parse_xml("example@outlook.com", xml_raw).expect("XML parsing failed");
+        assert_eq!(res.mail_server, "outlook.office365.com");
+        assert_eq!(res.mail_port, 993);
+        assert_eq!(res.send_server, "smtp.office365.com");
+        assert_eq!(res.send_port, 587);
     }
 }

src/configure/auto_outlook.rs

@@ -1,213 +1,271 @@
+//! Outlook's Autodiscover
+
+use failure::Fail;
+
 use quick_xml;
-use quick_xml::events::{BytesEnd, BytesStart, BytesText};
+use quick_xml::events::BytesEnd;
 
+use crate::constants::*;
 use crate::context::Context;
-use crate::dc_loginparam::*;
-use crate::dc_tools::*;
-use crate::x::*;
-use std::ptr;
+use crate::login_param::LoginParam;
 
-use super::read_autoconf_file;
-/* ******************************************************************************
- * Outlook's Autodiscover
- ******************************************************************************/
-#[repr(C)]
-struct outlk_autodiscover_t<'a> {
-    pub in_0: &'a dc_loginparam_t,
-    pub out: dc_loginparam_t,
-    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,
+use super::read_url::read_url;
+
+#[derive(Debug, Fail)]
+pub enum Error {
+    #[fail(display = "XML error at position {}", position)]
+    InvalidXml {
+        position: usize,
+        #[cause]
+        error: quick_xml::Error,
+    },
+
+    #[fail(display = "Bad or incomplete autoconfig")]
+    IncompleteAutoconfig(LoginParam),
+
+    #[fail(display = "Failed to get URL {}", _0)]
+    ReadUrlError(#[cause] super::read_url::Error),
+
+    #[fail(display = "Number of redirection is exceeded")]
+    RedirectionError,
 }
 
-pub unsafe fn outlk_autodiscover(
-    context: &Context,
-    url__: &str,
-    param_in: &dc_loginparam_t,
-) -> Option<dc_loginparam_t> {
-    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: dc_loginparam_new(),
-        out_imap_set: 0,
-        out_smtp_set: 0,
-        tag_config: 0,
-        config: [ptr::null_mut(); 6],
-        redirect: ptr::null_mut(),
+pub type Result<T> = std::result::Result<T, Error>;
+
+impl From<super::read_url::Error> for Error {
+    fn from(err: super::read_url::Error) -> Error {
+        Error::ReadUrlError(err)
+    }
+}
+
+struct OutlookAutodiscover {
+    pub out: LoginParam,
+    pub out_imap_set: bool,
+    pub out_smtp_set: bool,
+    pub config_type: Option<String>,
+    pub config_server: String,
+    pub config_port: i32,
+    pub config_ssl: String,
+    pub config_redirecturl: Option<String>,
+}
+
+enum ParsingResult {
+    LoginParam(LoginParam),
+    RedirectUrl(String),
+}
+
+fn parse_xml(xml_raw: &str) -> Result<ParsingResult> {
+    let mut outlk_ad = OutlookAutodiscover {
+        out: LoginParam::new(),
+        out_imap_set: false,
+        out_smtp_set: false,
+        config_type: None,
+        config_server: String::new(),
+        config_port: 0,
+        config_ssl: String::new(),
+        config_redirecturl: None,
     };
-    let ok_to_continue;
-    let mut i = 0;
+
+    let mut reader = quick_xml::Reader::from_str(&xml_raw);
+    reader.trim_text(true);
+
+    let mut buf = Vec::new();
+
+    let mut current_tag: Option<String> = None;
+
     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, url);
-        if xml_raw.is_null() {
-            ok_to_continue = false;
-            break;
-        }
+        let event = reader
+            .read_event(&mut buf)
+            .map_err(|error| Error::InvalidXml {
+                position: reader.buffer_position(),
+                error,
+            })?;
 
-        let mut reader = quick_xml::Reader::from_str(as_str(xml_raw));
-        reader.trim_text(true);
+        match event {
+            quick_xml::events::Event::Start(ref e) => {
+                let tag = String::from_utf8_lossy(e.name()).trim().to_lowercase();
 
-        let mut buf = Vec::new();
+                if tag == "protocol" {
+                    outlk_ad.config_type = None;
+                    outlk_ad.config_server = String::new();
+                    outlk_ad.config_port = 0;
+                    outlk_ad.config_ssl = String::new();
+                    outlk_ad.config_redirecturl = None;
 
-        loop {
-            match reader.read_event(&mut buf) {
-                Ok(quick_xml::events::Event::Start(ref e)) => {
-                    outlk_autodiscover_starttag_cb(e, &mut outlk_ad)
+                    current_tag = None;
+                } else {
+                    current_tag = Some(tag);
                 }
-                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,
-                        0,
-                        "Configure xml: Error at position {}: {:?}",
-                        reader.buffer_position(),
-                        e
-                    );
-                }
-                Ok(quick_xml::events::Event::Eof) => break,
-                _ => (),
             }
-            buf.clear();
-        }
+            quick_xml::events::Event::End(ref e) => {
+                outlk_autodiscover_endtag_cb(e, &mut outlk_ad);
+                current_tag = None;
+            }
+            quick_xml::events::Event::Text(ref e) => {
+                let val = e.unescape_and_decode(&reader).unwrap_or_default();
 
-        if !(!outlk_ad.config[5].is_null()
-            && 0 != *outlk_ad.config[5usize].offset(0isize) as libc::c_int)
-        {
-            ok_to_continue = true;
-            break;
+                if let Some(ref tag) = current_tag {
+                    match tag.as_str() {
+                        "type" => {
+                            outlk_ad.config_type = Some(val.trim().to_lowercase().to_string())
+                        }
+                        "server" => outlk_ad.config_server = val.trim().to_string(),
+                        "port" => outlk_ad.config_port = val.trim().parse().unwrap_or_default(),
+                        "ssl" => outlk_ad.config_ssl = val.trim().to_string(),
+                        "redirecturl" => outlk_ad.config_redirecturl = Some(val.trim().to_string()),
+                        _ => {}
+                    };
+                }
+            }
+            quick_xml::events::Event::Eof => 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;
+        buf.clear();
     }
 
-    if ok_to_continue {
+    // XML redirect via redirecturl
+    let res = if outlk_ad.config_redirecturl.is_none()
+        || outlk_ad.config_redirecturl.as_ref().unwrap().is_empty()
+    {
         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 = dc_loginparam_get_readable(&outlk_ad.out);
-            warn!(context, 0, "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 Err(Error::IncompleteAutoconfig(outlk_ad.out));
+        }
+        ParsingResult::LoginParam(outlk_ad.out)
+    } else {
+        ParsingResult::RedirectUrl(outlk_ad.config_redirecturl.unwrap())
+    };
+    Ok(res)
+}
 
-            return None;
+pub fn outlk_autodiscover(
+    context: &Context,
+    url: &str,
+    _param_in: &LoginParam,
+) -> Result<LoginParam> {
+    let mut url = url.to_string();
+    /* Follow up to 10 xml-redirects (http-redirects are followed in read_url() */
+    for _i in 0..10 {
+        let xml_raw = read_url(context, &url)?;
+        let res = parse_xml(&xml_raw);
+        if let Err(err) = &res {
+            warn!(context, "{}", err);
+        }
+        match res? {
+            ParsingResult::RedirectUrl(redirect_url) => url = redirect_url,
+            ParsingResult::LoginParam(login_param) => return Ok(login_param),
         }
     }
-    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)
+    Err(Error::RedirectionError)
 }
 
-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] = 0 as *mut libc::c_char;
-    }
-}
-
-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) {
+fn outlk_autodiscover_endtag_cb(event: &BytesEnd, outlk_ad: &mut OutlookAutodiscover) {
     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]);
+        if let Some(type_) = &outlk_ad.config_type {
+            let port = outlk_ad.config_port;
+            let ssl_on = outlk_ad.config_ssl == "on";
+            let ssl_off = outlk_ad.config_ssl == "off";
+            if type_ == "imap" && !outlk_ad.out_imap_set {
+                outlk_ad.out.mail_server =
+                    std::mem::replace(&mut outlk_ad.config_server, String::new());
                 outlk_ad.out.mail_port = port;
-                if 0 != ssl_on {
-                    outlk_ad.out.server_flags |= 0x200
-                } else if 0 != ssl_off {
-                    outlk_ad.out.server_flags |= 0x400
+                if ssl_on {
+                    outlk_ad.out.server_flags |= DC_LP_IMAP_SOCKET_SSL as i32
+                } else if 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 |= 0x20000
-                } else if 0 != ssl_off {
-                    outlk_ad.out.server_flags |= 0x40000
+                outlk_ad.out_imap_set = true
+            } else if type_ == "smtp" && !outlk_ad.out_smtp_set {
+                outlk_ad.out.send_server =
+                    std::mem::replace(&mut outlk_ad.config_server, String::new());
+                outlk_ad.out.send_port = outlk_ad.config_port;
+                if ssl_on {
+                    outlk_ad.out.server_flags |= DC_LP_SMTP_SOCKET_SSL as i32
+                } else if ssl_off {
+                    outlk_ad.out.server_flags |= DC_LP_SMTP_SOCKET_PLAIN as i32
                 }
-                outlk_ad.out_smtp_set = 1
+                outlk_ad.out_smtp_set = true
             }
         }
-        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();
+#[cfg(test)]
+mod tests {
+    use super::*;
 
-    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
-    };
+    #[test]
+    fn test_parse_redirect() {
+        let res = parse_xml("
+<?xml version=\"1.0\" encoding=\"utf-8\"?>
+  <Autodiscover xmlns=\"http://schemas.microsoft.com/exchange/autodiscover/responseschema/2006\">
+    <Response xmlns=\"http://schemas.microsoft.com/exchange/autodiscover/outlook/responseschema/2006a\">
+      <Account>
+        <AccountType>email</AccountType>
+        <Action>redirectUrl</Action>
+        <RedirectUrl>https://mail.example.com/autodiscover/autodiscover.xml</RedirectUrl>
+      </Account>
+    </Response>
+  </Autodiscover>
+ ").expect("XML is not parsed successfully");
+        match res {
+            ParsingResult::LoginParam(_lp) => {
+                panic!("redirecturl is not found");
+            }
+            ParsingResult::RedirectUrl(url) => {
+                assert_eq!(
+                    url,
+                    "https://mail.example.com/autodiscover/autodiscover.xml"
+                );
+            }
+        }
+    }
+
+    #[test]
+    fn test_parse_loginparam() {
+        let res = parse_xml(
+            "\
+<?xml version=\"1.0\" encoding=\"utf-8\"?>
+<Autodiscover xmlns=\"http://schemas.microsoft.com/exchange/autodiscover/responseschema/2006\">
+  <Response xmlns=\"http://schemas.microsoft.com/exchange/autodiscover/outlook/responseschema/2006a\">
+    <Account>
+      <AccountType>email</AccountType>
+      <Action>settings</Action>
+      <Protocol>
+        <Type>IMAP</Type>
+        <Server>example.com</Server>
+        <Port>993</Port>
+        <SSL>on</SSL>
+        <AuthRequired>on</AuthRequired>
+      </Protocol>
+      <Protocol>
+        <Type>SMTP</Type>
+        <Server>smtp.example.com</Server>
+        <Port>25</Port>
+        <SSL>off</SSL>
+        <AuthRequired>on</AuthRequired>
+      </Protocol>
+    </Account>
+  </Response>
+</Autodiscover>",
+        )
+        .expect("XML is not parsed successfully");
+
+        match res {
+            ParsingResult::LoginParam(lp) => {
+                assert_eq!(lp.mail_server, "example.com");
+                assert_eq!(lp.mail_port, 993);
+                assert_eq!(lp.send_server, "smtp.example.com");
+                assert_eq!(lp.send_port, 25);
+            }
+            ParsingResult::RedirectUrl(_) => {
+                panic!("RedirectUrl is not expected");
+            }
+        }
+    }
 }

src/configure/read_url.rs

@@ -0,0 +1,27 @@
+use crate::context::Context;
+use failure::Fail;
+
+#[derive(Debug, Fail)]
+pub enum Error {
+    #[fail(display = "URL request error")]
+    GetError(#[cause] reqwest::Error),
+}
+
+pub type Result<T> = std::result::Result<T, Error>;
+
+pub fn read_url(context: &Context, url: &str) -> Result<String> {
+    info!(context, "Requesting URL {}", url);
+
+    match reqwest::Client::new()
+        .get(url)
+        .send()
+        .and_then(|mut res| res.text())
+    {
+        Ok(res) => Ok(res),
+        Err(err) => {
+            info!(context, "Can\'t read URL {}", url);
+
+            Err(Error::GetError(err))
+        }
+    }
+}

src/constants.rs

@@ -1,26 +1,15 @@
-//! Constants
+//! # Constants
 #![allow(non_camel_case_types, dead_code)]
 
-use lazy_static::lazy_static;
-
 use deltachat_derive::*;
+use lazy_static::lazy_static;
 
 lazy_static! {
     pub static ref DC_VERSION_STR: String = env!("CARGO_PKG_VERSION").to_string();
 }
 
-#[repr(u8)]
-#[derive(Debug, Display, Clone, Copy, PartialEq, Eq, FromPrimitive, ToPrimitive, ToSql, FromSql)]
-pub enum MoveState {
-    Undefined = 0,
-    Pending = 1,
-    Stay = 2,
-    Moving = 3,
-}
-
 // some defaults
 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;
@@ -40,9 +29,23 @@ impl Default for Blocked {
     }
 }
 
+#[derive(Debug, Display, Clone, Copy, PartialEq, Eq, FromPrimitive, ToPrimitive, FromSql, ToSql)]
+#[repr(u8)]
+pub enum ShowEmails {
+    Off = 0,
+    AcceptedContacts = 1,
+    All = 2,
+}
+
+impl Default for ShowEmails {
+    fn default() -> Self {
+        ShowEmails::Off // also change Config.ShowEmails props(default) on changes
+    }
+}
+
 pub const DC_IMAP_SEEN: u32 = 0x1;
 
-const DC_HANDSHAKE_CONTINUE_NORMAL_PROCESSING: i32 = 0x01;
+pub const DC_HANDSHAKE_CONTINUE_NORMAL_PROCESSING: i32 = 0x01;
 pub const DC_HANDSHAKE_STOP_NORMAL_PROCESSING: i32 = 0x02;
 pub const DC_HANDSHAKE_ADD_DELETE_JOB: i32 = 0x04;
 
@@ -50,34 +53,29 @@ 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: u32 = 0x01;
 
-const DC_GCL_VERIFIED_ONLY: 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;
-/// param1 is a directory where the keys are searched in and read from
-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;
-/// param1 is the file with the backup to import
-const DC_IMEX_IMPORT_BACKUP: usize = 12;
+// values for DC_PARAM_FORCE_PLAINTEXT
+pub(crate) const DC_FP_NO_AUTOCRYPT_HEADER: i32 = 2;
+pub(crate) const DC_FP_ADD_AUTOCRYPT_HEADER: i32 = 1;
 
 /// virtual chat showing all messages belonging to chats flagged with chats.blocked=2
-pub(crate) const DC_CHAT_ID_DEADDROP: usize = 1;
+pub(crate) const DC_CHAT_ID_DEADDROP: u32 = 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: usize = 3;
+pub const DC_CHAT_ID_TRASH: u32 = 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: usize = 4;
+const DC_CHAT_ID_MSGS_IN_CREATION: u32 = 4;
 /// virtual chat showing all messages flagged with msgs.starred=2
-const DC_CHAT_ID_STARRED: usize = 5;
+pub const DC_CHAT_ID_STARRED: u32 = 5;
 /// only an indicator in a chatlist
-pub const DC_CHAT_ID_ARCHIVED_LINK: usize = 6;
+pub const DC_CHAT_ID_ARCHIVED_LINK: u32 = 6;
 /// only an indicator in a chatlist
-pub const DC_CHAT_ID_ALLDONE_HINT: usize = 7;
+pub const DC_CHAT_ID_ALLDONE_HINT: u32 = 7;
 /// larger chat IDs are "real" chats, their messages are "real" messages.
-pub const DC_CHAT_ID_LAST_SPECIAL: usize = 9;
+pub const DC_CHAT_ID_LAST_SPECIAL: u32 = 9;
 
 #[derive(
     Debug,
@@ -106,21 +104,25 @@ impl Default for Chattype {
     }
 }
 
-pub const DC_MSG_ID_MARKER1: usize = 1;
-const DC_MSG_ID_DAYMARKER: usize = 9;
-pub const DC_MSG_ID_LAST_SPECIAL: usize = 9;
+pub const DC_MSG_ID_MARKER1: u32 = 1;
+pub const DC_MSG_ID_DAYMARKER: u32 = 9;
+pub const DC_MSG_ID_LAST_SPECIAL: u32 = 9;
 
 /// approx. max. length returned by dc_msg_get_text()
 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_CONTACT_ID_UNDEFINED: usize = 0;
-pub const DC_CONTACT_ID_SELF: usize = 1;
-const DC_CONTACT_ID_DEVICE: usize = 2;
-pub const DC_CONTACT_ID_LAST_SPECIAL: usize = 9;
+pub const DC_CONTACT_ID_UNDEFINED: u32 = 0;
+pub const DC_CONTACT_ID_SELF: u32 = 1;
+pub const DC_CONTACT_ID_INFO: u32 = 2;
+pub const DC_CONTACT_ID_DEVICE: u32 = 5;
+pub const DC_CONTACT_ID_LAST_SPECIAL: u32 = 9;
 
-pub const DC_CREATE_MVBOX: usize = 1;
+// Flags for empty server job
+
+pub const DC_EMPTY_MVBOX: u32 = 0x01;
+pub const DC_EMPTY_INBOX: u32 = 0x02;
 
 // Flags for configuring IMAP and SMTP servers.
 // These flags are optional
@@ -130,23 +132,23 @@ pub const DC_CREATE_MVBOX: usize = 1;
 /// Force OAuth2 authorization. This flag does not skip automatic configuration.
 /// Before calling 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;
+pub const DC_LP_AUTH_OAUTH2: i32 = 0x2;
 
 /// Force NORMAL authorization, this is the default.
 /// If this flag is set, automatic configuration is skipped.
-const DC_LP_AUTH_NORMAL: usize = 0x4;
+pub const DC_LP_AUTH_NORMAL: i32 = 0x4;
 
 /// Connect to IMAP via STARTTLS.
 /// If this flag is set, automatic configuration is skipped.
-pub const DC_LP_IMAP_SOCKET_STARTTLS: usize = 0x100;
+pub const DC_LP_IMAP_SOCKET_STARTTLS: i32 = 0x100;
 
 /// Connect to IMAP via SSL.
 /// If this flag is set, automatic configuration is skipped.
-const DC_LP_IMAP_SOCKET_SSL: usize = 0x200;
+pub const DC_LP_IMAP_SOCKET_SSL: i32 = 0x200;
 
 /// Connect to IMAP unencrypted, this should not be used.
 /// If this flag is set, automatic configuration is skipped.
-pub const DC_LP_IMAP_SOCKET_PLAIN: usize = 0x400;
+pub const DC_LP_IMAP_SOCKET_PLAIN: i32 = 0x400;
 
 /// Connect to SMTP via STARTTLS.
 /// If this flag is set, automatic configuration is skipped.
@@ -154,21 +156,27 @@ pub const DC_LP_SMTP_SOCKET_STARTTLS: usize = 0x10000;
 
 /// Connect to SMTP via SSL.
 /// If this flag is set, automatic configuration is skipped.
-const DC_LP_SMTP_SOCKET_SSL: usize = 0x20000;
+pub const DC_LP_SMTP_SOCKET_SSL: usize = 0x20000;
 
 /// Connect to SMTP unencrypted, this should not be used.
 /// If this flag is set, automatic configuration is skipped.
 pub const DC_LP_SMTP_SOCKET_PLAIN: usize = 0x40000;
 
 /// if none of these flags are set, the default is chosen
-const DC_LP_AUTH_FLAGS: usize = (DC_LP_AUTH_OAUTH2 | DC_LP_AUTH_NORMAL);
+pub const DC_LP_AUTH_FLAGS: i32 = (DC_LP_AUTH_OAUTH2 | DC_LP_AUTH_NORMAL);
 /// if none of these flags are set, the default is chosen
-const DC_LP_IMAP_SOCKET_FLAGS: usize =
+pub const DC_LP_IMAP_SOCKET_FLAGS: i32 =
     (DC_LP_IMAP_SOCKET_STARTTLS | DC_LP_IMAP_SOCKET_SSL | DC_LP_IMAP_SOCKET_PLAIN);
 /// if none of these flags are set, the default is chosen
-const DC_LP_SMTP_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 {
@@ -189,6 +197,11 @@ pub enum Viewtype {
     /// and retrieved via dc_msg_get_file(), dc_msg_get_width(), dc_msg_get_height().
     Gif = 21,
 
+    /// Message containing a sticker, similar to image.
+    /// If possible, the ui should display the image without borders in a transparent way.
+    /// A click on a sticker will offer to install the sticker set in some future.
+    Sticker = 23,
+
     /// Message containing an Audio file.
     /// File and duration are set via dc_msg_set_file(), dc_msg_set_duration()
     /// and retrieved via dc_msg_get_file(), dc_msg_get_duration().
@@ -214,6 +227,12 @@ pub enum Viewtype {
     File = 60,
 }
 
+impl Default for Viewtype {
+    fn default() -> Self {
+        Viewtype::Unknown
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -229,255 +248,14 @@ 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.
 
-#[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. 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 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,
-}
-
 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;
 
-/// 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;
-
 // TODO: Strings need some doumentation about used placeholders.
-// These constants are used to request strings using #DC_EVENT_GET_STRING.
+// These constants are used to set stock translation strings
 
 const DC_STR_NOMESSAGES: usize = 1;
 const DC_STR_SELF: usize = 2;
@@ -523,7 +301,8 @@ 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;
+const DC_STR_STICKER: usize = 67;
+const DC_STR_COUNT: usize = 67;
 
 pub const DC_JOB_DELETE_MSG_ON_IMAP: i32 = 110;
 
@@ -533,12 +312,3 @@ 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;
-const DC_CMD_SECUREJOIN_MESSAGE: libc::c_int = 7;
-pub const DC_CMD_LOCATION_STREAMING_ENABLED: libc::c_int = 8;
-const DC_CMD_LOCATION_ONLY: libc::c_int = 9;

src/contact.rs

@@ -1,40 +1,41 @@
+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_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::message::MessageState;
+use crate::login_param::LoginParam;
+use crate::message::{MessageState, MsgId};
 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;
 
 /// An object representing a single contact in memory.
+///
 /// The contact object is not updated.
 /// If you want an update, you have to recreate the object.
 ///
 /// The library makes sure
 /// only to use names _authorized_ by the contact in `To:` or `Cc:`.
-/// _Given-names _as "Daddy" or "Honey" are not used there.
+/// *Given-names* as "Daddy" or "Honey" are not used there.
 /// For this purpose, internally, two names are tracked -
-/// authorized-name and given-name.
+/// authorized name and given name.
 /// By default, these names are equal, but functions working with contact names
-pub struct Contact<'a> {
-    context: &'a Context,
+/// only affect the given name.
+#[derive(Debug)]
+pub struct Contact {
     /// The contact ID.
     ///
     /// Special message IDs:
@@ -48,8 +49,8 @@ pub struct Contact<'a> {
     /// May be empty, initially set to `authname`.
     name: String,
     /// Name authorized by the contact himself. Only this name may be spread to others,
-    /// e.g. in To:-lists. May be empty. It is recommended to use `Contact::get_name`,
-    /// `Contact::get_display_name` or `Contact::get_name_n_addr` to access this field.
+    /// e.g. in To:-lists. May be empty. It is recommended to use `Contact::get_authname`,
+    /// to access this field.
     authname: String,
     /// E-Mail-Address of the contact. It is recommended to use `Contact::get_addr`` to access this field.
     addr: String,
@@ -60,7 +61,9 @@ pub struct Contact<'a> {
 }
 
 /// Possible origins of a contact.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, FromPrimitive, ToPrimitive)]
+#[derive(
+    Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, FromPrimitive, ToPrimitive, FromSql, ToSql,
+)]
 #[repr(i32)]
 pub enum Origin {
     Unknown = 0,
@@ -98,29 +101,13 @@ pub enum Origin {
     ManuallyCreated = 0x4000000,
 }
 
-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)
+impl Default for Origin {
+    fn default() -> Self {
+        Origin::Unknown
     }
 }
 
 impl Origin {
-    /// Contacts that start a new "normal" chat, defaults to off.
-    pub fn is_start_new_chat(self) -> bool {
-        self as i32 >= 0x7FFFFFFF
-    }
-
     /// Contacts that are verified and known not to be spam.
     pub fn is_verified(self) -> bool {
         self as i32 >= 0x100
@@ -150,11 +137,10 @@ pub enum VerifiedStatus {
     BidirectVerified = 2,
 }
 
-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 {
+impl Contact {
+    pub fn load_from_db(context: &Context, contact_id: u32) -> crate::sql::Result<Self> {
+        if contact_id == DC_CONTACT_ID_SELF {
             let contact = Contact {
-                context,
                 id: contact_id,
                 name: context.stock_str(StockMessage::SelfMsg).into(),
                 authname: "".into(),
@@ -164,7 +150,16 @@ impl<'a> Contact<'a> {
                 blocked: false,
                 origin: Origin::Unknown,
             };
-
+            return Ok(contact);
+        } else if contact_id == DC_CONTACT_ID_DEVICE {
+            let contact = Contact {
+                id: contact_id,
+                name: context.stock_str(StockMessage::DeviceMessages).into(),
+                authname: "".into(),
+                addr: "device@localhost".into(),
+                blocked: false,
+                origin: Origin::Unknown,
+            };
             return Ok(contact);
         }
 
@@ -173,7 +168,6 @@ impl<'a> Contact<'a> {
             params![contact_id as i32],
             |row| {
                 let contact = Self {
-                    context,
                     id: contact_id,
                     name: row.get::<_, String>(0)?,
                     authname: row.get::<_, String>(4)?,
@@ -192,7 +186,7 @@ impl<'a> Contact<'a> {
     }
 
     /// Check if a contact is blocked.
-    pub fn is_blocked_load(context: &'a Context, id: u32) -> bool {
+    pub fn is_blocked_load(context: &Context, id: u32) -> bool {
         Self::load_from_db(context, id)
             .map(|contact| contact.blocked)
             .unwrap_or_default()
@@ -211,7 +205,7 @@ impl<'a> Contact<'a> {
     /// Add a single contact as a result of an _explicit_ user action.
     ///
     /// We assume, the contact name, if any, is entered by the user and is used "as is" therefore,
-    /// normalize() is _not_ called for the name. If the contact is blocked, it is unblocked.
+    /// normalize() is *not* called for the name. If the contact is blocked, it is unblocked.
     ///
     /// To add a number of contacts, see `dc_add_address_book()` which is much faster for adding
     /// a bunch of addresses.
@@ -226,15 +220,13 @@ impl<'a> Contact<'a> {
         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::CONTACTS_CHANGED,
-            (if sth_modified == Modifier::Created {
-                contact_id
+        context.call_cb(Event::ContactsChanged(
+            if sth_modified == Modifier::Created {
+                Some(contact_id)
             } else {
-                0
-            }) as uintptr_t,
-            0 as uintptr_t,
-        );
+                None
+            },
+        ));
         if blocked {
             Contact::unblock(context, contact_id);
         }
@@ -243,7 +235,7 @@ impl<'a> Contact<'a> {
     }
 
     /// Mark all messages sent by the given contact
-    /// as _noticed_.  See also dc_marknoticed_chat() and dc_markseen_msgs()
+    /// as *noticed*.  See also dc_marknoticed_chat() and dc_markseen_msgs()
     ///
     /// Calling this function usually results in the event `#DC_EVENT_MSGS_CHANGED`.
     pub fn mark_noticed(context: &Context, id: u32) {
@@ -255,7 +247,10 @@ impl<'a> Contact<'a> {
         )
         .is_ok()
         {
-            context.call_cb(Event::MSGS_CHANGED, 0, 0);
+            context.call_cb(Event::MsgsChanged {
+                chat_id: 0,
+                msg_id: MsgId::new(0),
+            });
         }
     }
 
@@ -274,11 +269,11 @@ impl<'a> Contact<'a> {
             .get_config(Config::ConfiguredAddr)
             .unwrap_or_default();
 
-        if addr_normalized == addr_self {
-            return 1;
+        if addr_cmp(addr_normalized, addr_self) {
+            return DC_CONTACT_ID_SELF;
         }
 
-        context.sql.query_row_col(
+        context.sql.query_get_value(
             context,
             "SELECT id FROM contacts WHERE addr=?1 COLLATE NOCASE AND id>?2 AND origin>=?3 AND blocked=0;",
             params![
@@ -286,7 +281,6 @@ impl<'a> Contact<'a> {
                 DC_CONTACT_ID_LAST_SPECIAL as i32,
                 DC_ORIGIN_MIN_CONTACT_LIST,
             ],
-            0
         ).unwrap_or_default()
     }
 
@@ -312,14 +306,13 @@ impl<'a> Contact<'a> {
             .get_config(Config::ConfiguredAddr)
             .unwrap_or_default();
 
-        if addr == addr_self {
-            return Ok((1, sth_modified));
+        if addr_cmp(addr, addr_self) {
+            return Ok((DC_CONTACT_ID_SELF, sth_modified));
         }
 
         if !may_be_valid_addr(&addr) {
             warn!(
                 context,
-                0,
                 "Bad address \"{}\" for contact \"{}\".",
                 addr,
                 if !name.as_ref().is_empty() {
@@ -343,19 +336,22 @@ impl<'a> Contact<'a> {
                 let row_id = row.get(0)?;
                 let row_name: String = row.get(1)?;
                 let row_addr: String = row.get(2)?;
-                let row_origin = row.get(3)?;
+                let row_origin: Origin = row.get(3)?;
                 let row_authname: String = row.get(4)?;
 
-                if !name.as_ref().is_empty() && !row_name.is_empty() {
-                    if origin >= row_origin && name.as_ref() != row_name {
+                if !name.as_ref().is_empty() {
+                    if !row_name.is_empty() {
+                        if origin >= row_origin && name.as_ref() != row_name {
+                            update_name = true;
+                        }
+                    } else {
                         update_name = true;
                     }
-                } else {
-                    update_name = true;
-                }
-                if origin == Origin::IncomingUnknownFrom && name.as_ref() != row_authname {
-                    update_authname = true;
+                    if origin == Origin::IncomingUnknownFrom && name.as_ref() != row_authname {
+                        update_authname = true;
+                    }
                 }
+
                 Ok((row_id, row_name, row_addr, row_origin, row_authname))
             },
         ) {
@@ -395,25 +391,23 @@ impl<'a> Contact<'a> {
                     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(), 100, row_id]
+                    params![name.as_ref(), Chattype::Single, row_id]
                 ).ok();
                 }
                 sth_modified = Modifier::Modified;
             }
+        } else if sql::execute(
+            context,
+            &context.sql,
+            "INSERT INTO contacts (name, addr, origin) VALUES(?, ?, ?);",
+            params![name.as_ref(), addr, origin,],
+        )
+        .is_ok()
+        {
+            row_id = sql::get_rowid(context, &context.sql, "contacts", "addr", addr);
+            sth_modified = Modifier::Created;
         } else {
-            if sql::execute(
-                context,
-                &context.sql,
-                "INSERT INTO contacts (name, addr, origin) VALUES(?, ?, ?);",
-                params![name.as_ref(), addr, origin,],
-            )
-            .is_ok()
-            {
-                row_id = sql::get_rowid(context, &context.sql, "contacts", "addr", addr);
-                sth_modified = Modifier::Created;
-            } else {
-                error!(context, 0, "Cannot add contact.");
-            }
+            error!(context, "Cannot add contact.");
         }
 
         Ok((row_id, sth_modified))
@@ -431,21 +425,15 @@ impl<'a> Contact<'a> {
     /// the event `DC_EVENT_CONTACTS_CHANGED` is sent.
     ///
     /// 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.
+    /// however, for adding a bunch of addresses, this function is much faster.
     ///
-    /// The `adr_book` is a multiline string in the format `Name one\nAddress one\nName two\nAddress two`.
+    /// The `addr_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, adr_book: impl AsRef<str>) -> Result<usize> {
+    pub fn add_address_book(context: &Context, addr_book: impl AsRef<str>) -> Result<usize> {
         let mut modify_cnt = 0;
 
-        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];
+        for (name, addr) in split_address_book(addr_book.as_ref()).into_iter() {
             let name = normalize_name(name);
             let (_, modified) = Contact::add_or_lookup(context, name, addr, Origin::AdressBook)?;
             if modified != Modifier::None {
@@ -453,7 +441,7 @@ impl<'a> Contact<'a> {
             }
         }
         if modify_cnt > 0 {
-            context.call_cb(Event::CONTACTS_CHANGED, 0 as uintptr_t, 0 as uintptr_t);
+            context.call_cb(Event::ContactsChanged(None));
         }
 
         Ok(modify_cnt)
@@ -479,8 +467,10 @@ impl<'a> Contact<'a> {
 
         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 (listflags & DC_GCL_VERIFIED_ONLY) > 0 || query.is_some() {
+        if flag_verified_only || query.is_some() {
             let s3str_like_cmd = format!(
                 "%{}%",
                 query
@@ -504,7 +494,7 @@ impl<'a> Contact<'a> {
                     0x100,
                     &s3str_like_cmd,
                     &s3str_like_cmd,
-                    if 0 != listflags & 0x1 { 0 } else { 1 },
+                    if flag_verified_only { 0 } else { 1 },
                 ],
                 |row| row.get::<_, i32>(0),
                 |ids| {
@@ -544,8 +534,8 @@ impl<'a> Contact<'a> {
             )?;
         }
 
-        if 0 != listflags & DC_GCL_ADD_SELF as u32 && add_self {
-            ret.push(DC_CONTACT_ID_SELF as u32);
+        if flag_add_self && add_self {
+            ret.push(DC_CONTACT_ID_SELF);
         }
 
         Ok(ret)
@@ -554,11 +544,10 @@ impl<'a> Contact<'a> {
     pub fn get_blocked_cnt(context: &Context) -> usize {
         context
             .sql
-            .query_row_col::<_, isize>(
+            .query_get_value::<_, 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
     }
@@ -589,11 +578,16 @@ impl<'a> Contact<'a> {
 
         if let Ok(contact) = Contact::load_from_db(context, contact_id) {
             let peerstate = Peerstate::from_addr(context, &context.sql, &contact.addr);
-            let loginparam = dc_loginparam_read(context, &context.sql, "configured_");
+            let loginparam = LoginParam::from_database(context, "configured_");
 
             let mut self_key = Key::from_self_public(context, &loginparam.addr, &context.sql);
 
-            if peerstate.is_some() && peerstate.as_ref().and_then(|p| p.peek_key(0)).is_some() {
+            if peerstate.is_some()
+                && peerstate
+                    .as_ref()
+                    .and_then(|p| p.peek_key(PeerstateVerifiedStatus::Unverified))
+                    .is_some()
+            {
                 let peerstate = peerstate.as_ref().unwrap();
                 let p =
                     context.stock_str(if peerstate.prefer_encrypt == EncryptPreference::Mutual {
@@ -603,7 +597,7 @@ impl<'a> Contact<'a> {
                     });
                 ret += &p;
                 if self_key.is_none() {
-                    dc_ensure_secret_key_exists(context)?;
+                    e2ee::ensure_secret_key_exists(context)?;
                     self_key = Key::from_self_public(context, &loginparam.addr, &context.sql);
                 }
                 let p = context.stock_str(StockMessage::FingerPrints);
@@ -613,25 +607,25 @@ impl<'a> Contact<'a> {
                     .map(|k| k.formatted_fingerprint())
                     .unwrap_or_default();
                 let fingerprint_other_verified = peerstate
-                    .peek_key(2)
+                    .peek_key(PeerstateVerifiedStatus::BidirectVerified)
                     .map(|k| k.formatted_fingerprint())
                     .unwrap_or_default();
                 let fingerprint_other_unverified = peerstate
-                    .peek_key(0)
+                    .peek_key(PeerstateVerifiedStatus::Unverified)
                     .map(|k| k.formatted_fingerprint())
                     .unwrap_or_default();
-                if peerstate.addr.is_some() && &loginparam.addr < peerstate.addr.as_ref().unwrap() {
+                if loginparam.addr < peerstate.addr {
                     cat_fingerprint(&mut ret, &loginparam.addr, &fingerprint_self, "");
                     cat_fingerprint(
                         &mut ret,
-                        peerstate.addr.as_ref().unwrap(),
+                        peerstate.addr.clone(),
                         &fingerprint_other_verified,
                         &fingerprint_other_unverified,
                     );
                 } else {
                     cat_fingerprint(
                         &mut ret,
-                        peerstate.addr.as_ref().unwrap(),
+                        peerstate.addr.clone(),
                         &fingerprint_other_verified,
                         &fingerprint_other_unverified,
                     );
@@ -655,28 +649,26 @@ impl<'a> Contact<'a> {
     /// 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 as u32,
+            contact_id > DC_CONTACT_ID_LAST_SPECIAL,
             "Can not delete special contact"
         );
 
         let count_contacts: i32 = context
             .sql
-            .query_row_col(
+            .query_get_value(
                 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_row_col(
+                .query_get_value(
                     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 {
@@ -691,19 +683,19 @@ impl<'a> Contact<'a> {
                 params![contact_id as i32],
             ) {
                 Ok(_) => {
-                    context.call_cb(Event::CONTACTS_CHANGED, 0, 0);
+                    context.call_cb(Event::ContactsChanged(None));
                     return Ok(());
                 }
                 Err(err) => {
-                    error!(context, 0, "delete_contact {} failed ({})", contact_id, err);
-                    return Err(err);
+                    error!(context, "delete_contact {} failed ({})", contact_id, err);
+                    return Err(err.into());
                 }
             }
         }
 
         info!(
             context,
-            0, "could not delete contact {}, there are {} messages with it", contact_id, count_msgs
+            "could not delete contact {}, there are {} messages with it", contact_id, count_msgs
         );
         bail!("Could not delete contact with messages in it");
     }
@@ -714,7 +706,7 @@ impl<'a> Contact<'a> {
     /// like "Me" in the selected language and the email address
     /// defined by dc_set_config().
     pub fn get_by_id(context: &Context, contact_id: u32) -> Result<Contact> {
-        Contact::load_from_db(context, contact_id)
+        Ok(Contact::load_from_db(context, contact_id)?)
     }
 
     /// Get the ID of the contact.
@@ -727,6 +719,7 @@ impl<'a> Contact<'a> {
         &self.addr
     }
 
+    /// Get name authorized by the contact.
     pub fn get_authname(&self) -> &str {
         &self.authname
     }
@@ -779,9 +772,11 @@ impl<'a> Contact<'a> {
     /// 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) -> Option<String> {
-        if self.id == DC_CONTACT_ID_SELF as u32 {
-            return self.context.get_config(Config::Selfavatar);
+    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));
+            }
         }
         // TODO: else get image_abs from contact param
         None
@@ -800,29 +795,33 @@ impl<'a> Contact<'a> {
     ///
     /// The UI may draw a checkbox or something like that beside verified contacts.
     ///
-    pub fn is_verified(&self) -> VerifiedStatus {
-        self.is_verified_ex(None)
+    pub fn is_verified(&self, context: &Context) -> VerifiedStatus {
+        self.is_verified_ex(context, 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, peerstate: Option<&Peerstate<'a>>) -> VerifiedStatus {
+    pub fn is_verified_ex(
+        &self,
+        context: &Context,
+        peerstate: Option<&Peerstate>,
+    ) -> 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 as u32 {
+        if self.id == DC_CONTACT_ID_SELF {
             return VerifiedStatus::BidirectVerified;
         }
 
         if let Some(peerstate) = peerstate {
-            if peerstate.verified_key().is_some() {
+            if peerstate.verified_key.is_some() {
                 return VerifiedStatus::BidirectVerified;
             }
         }
 
-        let peerstate = Peerstate::from_addr(self.context, &self.context.sql, &self.addr);
+        let peerstate = Peerstate::from_addr(context, &context.sql, &self.addr);
         if let Some(ps) = peerstate {
-            if ps.verified_key().is_some() {
+            if ps.verified_key.is_some() {
                 return VerifiedStatus::BidirectVerified;
             }
         }
@@ -838,7 +837,7 @@ impl<'a> Contact<'a> {
         if let Ok(contact) = Contact::load_from_db(context, contact_id) {
             if !contact.addr.is_empty() {
                 let normalized_addr = addr_normalize(addr.as_ref());
-                if &contact.addr == &normalized_addr {
+                if contact.addr == normalized_addr {
                     return true;
                 }
             }
@@ -854,11 +853,10 @@ impl<'a> Contact<'a> {
 
         context
             .sql
-            .query_row_col::<_, isize>(
+            .query_get_value::<_, isize>(
                 context,
                 "SELECT COUNT(*) FROM contacts WHERE id>?;",
                 params![DC_CONTACT_ID_LAST_SPECIAL as i32],
-                0,
             )
             .unwrap_or_default() as usize
     }
@@ -880,7 +878,7 @@ impl<'a> Contact<'a> {
     }
 
     pub fn real_exists_by_id(context: &Context, contact_id: u32) -> bool {
-        if !context.sql.is_open() || contact_id <= 9 {
+        if !context.sql.is_open() || contact_id <= DC_CONTACT_ID_LAST_SPECIAL {
             return false;
         }
 
@@ -904,7 +902,8 @@ impl<'a> Contact<'a> {
     }
 }
 
-fn get_first_name<'a>(full_name: &'a str) -> &'a str {
+/// Extracts first name from full name.
+fn get_first_name(full_name: &str) -> &str {
     full_name.splitn(2, ' ').next().unwrap_or_default()
 }
 
@@ -914,6 +913,7 @@ pub fn may_be_valid_addr(addr: &str) -> bool {
     res.is_ok()
 }
 
+/// Returns address with whitespace trimmed and `mailto:` prefix removed.
 pub fn addr_normalize(addr: &str) -> &str {
     let norm = addr.trim();
 
@@ -925,39 +925,34 @@ pub fn addr_normalize(addr: &str) -> &str {
 }
 
 fn set_block_contact(context: &Context, contact_id: u32, new_blocking: bool) {
-    if contact_id <= 9 {
+    if contact_id <= DC_CONTACT_ID_LAST_SPECIAL {
         return;
     }
 
     if let Ok(contact) = Contact::load_from_db(context, contact_id) {
-        if contact.blocked != new_blocking {
-            if sql::execute(
+        if contact.blocked != new_blocking
+            && sql::execute(
                 context,
                 &context.sql,
                 "UPDATE contacts SET blocked=? WHERE id=?;",
                 params![new_blocking as i32, contact_id as i32],
             )
             .is_ok()
-            {
-                // also (un)block all chats with _only_ this contact - we do not delete them to allow a
-                // non-destructive blocking->unblocking.
-                // (Maybe, beside normal chats (type=100) we should also block group chats with only this user.
-                // However, I'm not sure about this point; it may be confusing if the user wants to add other people;
-                // this would result in recreating the same group...)
-                if sql::execute(
+        {
+            // also (un)block all chats with _only_ this contact - we do not delete them to allow a
+            // non-destructive blocking->unblocking.
+            // (Maybe, beside normal chats (type=100) we should also block group chats with only this user.
+            // However, I'm not sure about this point; it may be confusing if the user wants to add other people;
+            // this would result in recreating the same group...)
+            if sql::execute(
                     context,
                     &context.sql,
                     "UPDATE chats SET blocked=? WHERE type=? AND id IN (SELECT chat_id FROM chats_contacts WHERE contact_id=?);",
                     params![new_blocking, 100, contact_id as i32],
                 ).is_ok() {
                     Contact::mark_noticed(context, contact_id);
-                    context.call_cb(
-                        Event::CONTACTS_CHANGED,
-                        0,
-                        0,
-                    );
+                    context.call_cb(Event::ContactsChanged(None));
                 }
-            }
         }
     }
 }
@@ -979,9 +974,9 @@ pub fn normalize_name(full_name: impl AsRef<str>) -> String {
     if len > 0 {
         let firstchar = full_name.as_bytes()[0];
         let lastchar = full_name.as_bytes()[len - 1];
-        if firstchar == '\'' as u8 && lastchar == '\'' as u8
-            || firstchar == '\"' as u8 && lastchar == '\"' as u8
-            || firstchar == '<' as u8 && lastchar == '>' as u8
+        if firstchar == b'\'' && lastchar == b'\''
+            || firstchar == b'\"' && lastchar == b'\"'
+            || firstchar == b'<' && lastchar == b'>'
         {
             full_name = &full_name[1..len - 1];
         }
@@ -1027,26 +1022,42 @@ fn cat_fingerprint(
 }
 
 pub fn addr_cmp(addr1: impl AsRef<str>, addr2: impl AsRef<str>) -> bool {
-    let norm1 = addr_normalize(addr1.as_ref());
-    let norm2 = addr_normalize(addr2.as_ref());
+    let norm1 = addr_normalize(addr1.as_ref()).to_lowercase();
+    let norm2 = addr_normalize(addr2.as_ref()).to_lowercase();
 
     norm1 == norm2
 }
 
 pub fn addr_equals_self(context: &Context, addr: impl AsRef<str>) -> bool {
     if !addr.as_ref().is_empty() {
-        let normalized_addr = addr_normalize(addr.as_ref());
         if let Some(self_addr) = context.get_config(Config::ConfiguredAddr) {
-            return normalized_addr == self_addr;
+            return addr_cmp(addr, self_addr);
         }
     }
     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::*;
 
+    use crate::test_utils::*;
+
     #[test]
     fn test_may_be_valid_addr() {
         assert_eq!(may_be_valid_addr(""), false);
@@ -1072,10 +1083,136 @@ mod tests {
     fn test_normalize_addr() {
         assert_eq!(addr_normalize("mailto:john@doe.com"), "john@doe.com");
         assert_eq!(addr_normalize("  hello@world.com   "), "hello@world.com");
+
+        // normalisation preserves case to allow user-defined spelling.
+        // however, case is ignored on addr_cmp()
+        assert_ne!(addr_normalize("John@Doe.com"), "john@doe.com");
     }
 
     #[test]
     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")]
+        )
+    }
+
+    #[test]
+    fn test_get_contacts() {
+        let context = dummy_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 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);
+    }
+
+    #[test]
+    fn test_add_or_lookup() {
+        // add some contacts, this also tests add_address_book()
+        let t = dummy_context();
+        let book = concat!(
+            "  Name one  \n one@eins.org \n",
+            "Name two\ntwo@deux.net\n",
+            "\nthree@drei.sam\n",
+            "Name two\ntwo@deux.net\n" // should not be added again
+        );
+        assert_eq!(Contact::add_address_book(&t.ctx, book).unwrap(), 3);
+
+        // check first added contact, this does not modify because of lower origin
+        let (contact_id, sth_modified) =
+            Contact::add_or_lookup(&t.ctx, "bla foo", "one@eins.org", Origin::IncomingUnknownTo)
+                .unwrap();
+        assert!(contact_id > DC_CONTACT_ID_LAST_SPECIAL);
+        assert_eq!(sth_modified, Modifier::None);
+        let contact = Contact::load_from_db(&t.ctx, contact_id).unwrap();
+        assert_eq!(contact.get_id(), contact_id);
+        assert_eq!(contact.get_name(), "Name one");
+        assert_eq!(contact.get_display_name(), "Name one");
+        assert_eq!(contact.get_addr(), "one@eins.org");
+        assert_eq!(contact.get_name_n_addr(), "Name one (one@eins.org)");
+
+        // modify first added contact
+        let (contact_id_test, sth_modified) = Contact::add_or_lookup(
+            &t.ctx,
+            "Real one",
+            " one@eins.org  ",
+            Origin::ManuallyCreated,
+        )
+        .unwrap();
+        assert_eq!(contact_id, contact_id_test);
+        assert_eq!(sth_modified, Modifier::Modified);
+        let contact = Contact::load_from_db(&t.ctx, contact_id).unwrap();
+        assert_eq!(contact.get_name(), "Real one");
+        assert_eq!(contact.get_addr(), "one@eins.org");
+        assert!(!contact.is_blocked());
+
+        // check third added contact (contact without name)
+        let (contact_id, sth_modified) =
+            Contact::add_or_lookup(&t.ctx, "", "three@drei.sam", Origin::IncomingUnknownTo)
+                .unwrap();
+        assert!(contact_id > DC_CONTACT_ID_LAST_SPECIAL);
+        assert_eq!(sth_modified, Modifier::None);
+        let contact = Contact::load_from_db(&t.ctx, contact_id).unwrap();
+        assert_eq!(contact.get_name(), "");
+        assert_eq!(contact.get_display_name(), "three@drei.sam");
+        assert_eq!(contact.get_addr(), "three@drei.sam");
+        assert_eq!(contact.get_name_n_addr(), "three@drei.sam");
+
+        // add name to third contact from incoming message (this becomes authorized name)
+        let (contact_id_test, sth_modified) = Contact::add_or_lookup(
+            &t.ctx,
+            "m. serious",
+            "three@drei.sam",
+            Origin::IncomingUnknownFrom,
+        )
+        .unwrap();
+        assert_eq!(contact_id, contact_id_test);
+        assert_eq!(sth_modified, Modifier::Modified);
+        let contact = Contact::load_from_db(&t.ctx, contact_id).unwrap();
+        assert_eq!(contact.get_name_n_addr(), "m. serious (three@drei.sam)");
+        assert!(!contact.is_blocked());
+
+        // manually edit name of third contact (does not changed authorized name)
+        let (contact_id_test, sth_modified) = Contact::add_or_lookup(
+            &t.ctx,
+            "schnucki",
+            "three@drei.sam",
+            Origin::ManuallyCreated,
+        )
+        .unwrap();
+        assert_eq!(contact_id, contact_id_test);
+        assert_eq!(sth_modified, Modifier::Modified);
+        let contact = Contact::load_from_db(&t.ctx, contact_id).unwrap();
+        assert_eq!(contact.get_authname(), "m. serious");
+        assert_eq!(contact.get_name_n_addr(), "schnucki (three@drei.sam)");
+        assert!(!contact.is_blocked());
+
+        // check SELF
+        let contact = Contact::load_from_db(&t.ctx, DC_CONTACT_ID_SELF).unwrap();
+        assert_eq!(DC_CONTACT_ID_SELF, 1);
+        assert_eq!(contact.get_name(), t.ctx.stock_str(StockMessage::SelfMsg));
+        assert_eq!(contact.get_addr(), ""); // we're not configured
+        assert!(!contact.is_blocked());
+    }
+
+    #[test]
+    fn test_addr_cmp() {
+        assert!(addr_cmp("AA@AA.ORG", "aa@aa.ORG"));
+        assert!(addr_cmp(" aa@aa.ORG ", "AA@AA.ORG"));
+        assert!(addr_cmp(" mailto:AA@AA.ORG", "Aa@Aa.orG"));
+    }
 }

src/dc_array.rs

@@ -1,11 +1,10 @@
-use crate::dc_location::dc_location;
-use crate::types::*;
+use crate::location::Location;
 
 /* * the structure behind dc_array_t */
-#[derive(Clone)]
+#[derive(Debug, Clone)]
 #[allow(non_camel_case_types)]
 pub enum dc_array_t {
-    Locations(Vec<dc_location>),
+    Locations(Vec<Location>),
     Uint(Vec<u32>),
 }
 
@@ -19,7 +18,7 @@ impl dc_array_t {
         dc_array_t::Locations(Vec::with_capacity(capacity))
     }
 
-    pub fn add_id(&mut self, item: uint32_t) {
+    pub fn add_id(&mut self, item: u32) {
         if let Self::Uint(array) = self {
             array.push(item);
         } else {
@@ -27,7 +26,7 @@ impl dc_array_t {
         }
     }
 
-    pub fn add_location(&mut self, location: dc_location) {
+    pub fn add_location(&mut self, location: Location) {
         if let Self::Locations(array) = self {
             array.push(location)
         } else {
@@ -35,14 +34,14 @@ impl dc_array_t {
         }
     }
 
-    pub fn get_id(&self, index: usize) -> uint32_t {
+    pub fn get_id(&self, index: usize) -> u32 {
         match self {
             Self::Locations(array) => array[index].location_id,
-            Self::Uint(array) => array[index] as uint32_t,
+            Self::Uint(array) => array[index] as u32,
         }
     }
 
-    pub fn get_location(&self, index: usize) -> &dc_location {
+    pub fn get_location(&self, index: usize) -> &Location {
         if let Self::Locations(array) = self {
             &array[index]
         } else {
@@ -108,8 +107,8 @@ impl From<Vec<u32>> for dc_array_t {
     }
 }
 
-impl From<Vec<dc_location>> for dc_array_t {
-    fn from(array: Vec<dc_location>) -> Self {
+impl From<Vec<Location>> for dc_array_t {
+    fn from(array: Vec<Location>) -> Self {
         dc_array_t::Locations(array)
     }
 }

src/dc_location.rs

@@ -1,776 +0,0 @@
-use quick_xml;
-use quick_xml::events::{BytesEnd, BytesStart, BytesText};
-
-use crate::chat;
-use crate::constants::Event;
-use crate::constants::*;
-use crate::context::*;
-use crate::dc_tools::*;
-use crate::job::*;
-use crate::message::*;
-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: 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 = 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 } 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);
-                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::CHAT_MODIFIED,
-                chat_id as uintptr_t,
-                0i32 as uintptr_t,
-            );
-            if 0 != seconds {
-                schedule_MAYBE_SEND_LOCATIONS(context, 0i32);
-                job_add(
-                    context,
-                    Action::MaybeSendLocationsEnded,
-                    chat_id as libc::c_int,
-                    Params::new(),
-                    seconds + 1,
-                );
-            }
-        }
-    }
-}
-
-/*******************************************************************************
- * 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 || !job_action_exists(context, Action::MaybeSendLocations) {
-        job_add(context, Action::MaybeSendLocations, 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,
-) -> Vec<dc_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 = 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,
-                    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 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();
-
-    if content_bytes > (1 * 1024 * 1024) {
-        warn!(
-            context,
-            0, "A kml-files with {} bytes is larger than reasonably expected.", content_bytes,
-        );
-        return kml;
-    }
-
-    let content_null = dc_null_terminate(content, content_bytes as libc::c_int);
-    if !content_null.is_null() {
-        let mut reader = quick_xml::Reader::from_str(as_str(content_null));
-        reader.trim_text(true);
-
-        kml.locations = Some(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, &mut kml, &reader),
-                Ok(quick_xml::events::Event::End(ref e)) => kml_endtag_cb(e, &mut kml),
-                Ok(quick_xml::events::Event::Text(ref e)) => kml_text_cb(e, &mut kml, &reader),
-                Err(e) => {
-                    error!(
-                        context,
-                        0,
-                        "Location parsing: Error at position {}: {:?}",
-                        reader.buffer_position(),
-                        e
-                    );
-                }
-                Ok(quick_xml::events::Event::Eof) => break,
-                _ => (),
-            }
-            buf.clear();
-        }
-    }
-
-    free(content_null.cast());
-
-    kml
-}
-
-fn kml_text_cb<B: std::io::BufRead>(
-    event: &BytesText,
-    kml: &mut dc_kml_t,
-    reader: &quick_xml::Reader<B>,
-) {
-    if 0 != kml.tag & (0x4 | 0x10) {
-        let val = event.unescape_and_decode(reader).unwrap_or_default();
-
-        let val = val
-            .replace("\n", "")
-            .replace("\r", "")
-            .replace("\t", "")
-            .replace(" ", "");
-
-        if 0 != kml.tag & 0x4 && 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) => {
-                    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 parts = val.splitn(2, ',').collect::<Vec<_>>();
-            if parts.len() == 2 {
-                kml.curr.longitude = parts[0].parse().unwrap_or_default();
-                kml.curr.latitude = parts[1].parse().unwrap_or_default();
-            }
-        }
-    }
-}
-
-fn kml_endtag_cb(event: &BytesEnd, kml: &mut dc_kml_t) {
-    let tag = String::from_utf8_lossy(event.name()).trim().to_lowercase();
-
-    if tag == "placemark" {
-        if 0 != kml.tag & 0x1
-            && 0 != kml.curr.timestamp
-            && 0. != kml.curr.latitude
-            && 0. != kml.curr.longitude
-        {
-            if let Some(ref mut locations) = kml.locations {
-                locations.push(std::mem::replace(&mut kml.curr, dc_location::new()));
-            }
-        }
-        kml.tag = 0
-    };
-}
-
-fn kml_starttag_cb<B: std::io::BufRead>(
-    event: &BytesStart,
-    kml: &mut dc_kml_t,
-    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()
-        }) {
-            kml.addr = unsafe {
-                addr.unwrap()
-                    .unescape_and_decode_value(reader)
-                    .unwrap_or_default()
-                    .strdup()
-            };
-        }
-    } else if tag == "placemark" {
-        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 tag == "timestamp" && 0 != kml.tag & 0x1 {
-        kml.tag = 0x1 | 0x2
-    } else if tag == "when" && 0 != kml.tag & 0x2 {
-        kml.tag = 0x1 | 0x2 | 0x4
-    } else if tag == "point" && 0 != kml.tag & 0x1 {
-        kml.tag = 0x1 | 0x8
-    } else if tag == "coordinates" && 0 != kml.tag & 0x8 {
-        kml.tag = 0x1 | 0x8 | 0x10;
-        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();
-
-            kml.curr.accuracy = v.trim().parse().unwrap_or_default();
-        }
-    }
-}
-
-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: &Job) {
-    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 = true;
-                            msg.param.set_int(Param::Cmd, 9);
-                            // TODO: handle cleanup on error
-                            chat::send_msg(context, chat_id as u32, &mut msg).unwrap();
-                        }
-                        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 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::CHAT_MODIFIED,
-                        chat_id as usize,
-                        0,
-                    );
-                }
-            }
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::test_utils::dummy_context;
-
-    #[test]
-    fn test_dc_kml_parse() {
-        unsafe {
-            let context = dummy_context();
-
-            let xml =
-                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);
-        }
-    }
-}

src/dc_loginparam.rs

@@ -1,214 +0,0 @@
-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_move.rs

@@ -1,44 +0,0 @@
-use crate::constants::*;
-use crate::context::*;
-use crate::job::*;
-use crate::message::*;
-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;
-    }
-
-    if let Ok(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
-            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 {
-            job_add(
-                context,
-                Action::MoveMsg,
-                msg.id as libc::c_int,
-                Params::new(),
-                0,
-            );
-            dc_update_msg_move_state(context, msg.rfc724_mid, MoveState::Moving);
-        }
-    }
-}

src/dc_simplify.rs

@@ -1,64 +1,47 @@
-use crate::dc_dehtml::*;
-use crate::dc_tools::*;
-use crate::x::*;
+use crate::dehtml::*;
 
 #[derive(Copy, Clone)]
 pub struct Simplify {
     pub is_forwarded: bool,
-    pub is_cut_at_begin: bool,
-    pub is_cut_at_end: 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, &line) in lines.iter().enumerate() {
+        // quoted-printable may encode `-- ` to `-- =20` which is converted
+        // back to `--  `
+        match line {
+            "-- " | "--  " => return (ix, false),
+            "--" | "---" | "----" => return (ix, true),
+            _ => (),
+        }
+    }
+    (lines.len(), false)
 }
 
 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 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();
-        }
+    pub fn simplify(&mut self, input: &str, is_html: bool, is_msgrmsg: bool) -> String {
+        let mut out = if is_html {
+            dehtml(input)
+        } else {
+            input.to_string()
+        };
 
-        /* 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.retain(|c| c != '\r');
+        out = self.simplify_plain_text(&out, is_msgrmsg);
+        out.retain(|c| c != '\r');
 
         out
     }
@@ -66,103 +49,74 @@ impl Simplify {
     /**
      * Simplify Plain Text
      */
-    #[allow(non_snake_case)]
-    unsafe fn simplify_plain_text(
-        &mut self,
-        buf_terminated: *const libc::c_char,
-        is_msgrmsg: libc::c_int,
-    ) -> *mut libc::c_char {
+    #[allow(non_snake_case, clippy::mut_range_bound)]
+    fn simplify_plain_text(&mut self, buf_terminated: &str, is_msgrmsg: bool) -> String {
         /* 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 = dc_split_into_lines(buf_terminated);
+        let lines: Vec<_> = buf_terminated.split('\n').collect();
         let mut l_first: usize = 0;
-        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;
-            }
-        }
+        let mut is_cut_at_begin = false;
+        let (mut l_last, mut is_cut_at_end) = find_message_footer(&lines);
+
         if l_last > l_first + 2 {
-            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
+            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()
             {
                 self.is_forwarded = true;
                 l_first += 3
             }
         }
         for l in l_first..l_last {
-            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
+            let line = lines[l];
+            if line == "-----"
+                || line == "_____"
+                || line == "====="
+                || line == "*****"
+                || line == "~~~~~"
             {
                 l_last = l;
-                self.is_cut_at_end = true;
+                is_cut_at_end = true;
                 /* done */
                 break;
             }
         }
-        if 0 == is_msgrmsg {
+        if !is_msgrmsg {
             let mut l_lastQuotedLine = None;
             for l in (l_first..l_last).rev() {
-                line = lines[l];
+                let line = lines[l];
                 if is_plain_quote(line) {
                     l_lastQuotedLine = Some(l)
                 } else if !is_empty_line(line) {
                     break;
                 }
             }
-            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 let Some(last_quoted_line) = l_lastQuotedLine {
+                l_last = last_quoted_line;
+                is_cut_at_end = true;
+                if l_last > 1 && is_empty_line(lines[l_last - 1]) {
+                    l_last -= 1
                 }
                 if l_last > 1 {
-                    line = lines[l_last - 1];
+                    let line = lines[l_last - 1];
                     if is_quoted_headline(line) {
                         l_last -= 1
                     }
                 }
             }
         }
-        if 0 == is_msgrmsg {
+        if !is_msgrmsg {
             let mut l_lastQuotedLine_0 = None;
             let mut hasQuotedHeadline = 0;
             for l in l_first..l_last {
-                line = lines[l];
+                let line = lines[l];
                 if is_plain_quote(line) {
                     l_lastQuotedLine_0 = Some(l)
                 } else if !is_empty_line(line) {
@@ -177,21 +131,21 @@ impl Simplify {
                     }
                 }
             }
-            if l_lastQuotedLine_0.is_some() {
-                l_first = l_lastQuotedLine_0.unwrap() + 1;
-                self.is_cut_at_begin = true
+            if let Some(last_quoted_line) = l_lastQuotedLine_0 {
+                l_first = last_quoted_line + 1;
+                is_cut_at_begin = true
             }
         }
         /* re-create buffer from the remaining lines */
         let mut ret = String::new();
-        if self.is_cut_at_begin {
+        if 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;
+        let mut pending_linebreaks = 0;
+        let mut content_lines_added = 0;
         for l in l_first..l_last {
-            line = lines[l];
+            let line = lines[l];
             if is_empty_line(line) {
                 pending_linebreaks += 1
             } else {
@@ -205,142 +159,115 @@ impl Simplify {
                     }
                 }
                 // the incoming message might contain invalid UTF8
-                ret += &to_string_lossy(line);
+                ret += line;
                 content_lines_added += 1;
                 pending_linebreaks = 1i32
             }
         }
-        if self.is_cut_at_end && (!self.is_cut_at_begin || 0 != content_lines_added) {
+        if is_cut_at_end && (!is_cut_at_begin || 0 != content_lines_added) {
             ret += " [...]";
         }
-        dc_free_splitted_lines(lines);
 
-        ret.strdup()
+        ret
     }
 }
 
 /**
  * Tools
  */
-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 {
+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 > ' ' {
             return false;
         }
-        p1 = p1.offset(1isize)
     }
 
     true
 }
 
-unsafe fn is_quoted_headline(buf: *const libc::c_char) -> bool {
+fn is_quoted_headline(buf: &str) -> 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;
-    }
 
-    false
+    buf.len() <= 80 && buf.ends_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
+fn is_plain_quote(buf: &str) -> bool {
+    buf.starts_with('>')
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
-    use std::ffi::CStr;
+    use proptest::prelude::*;
+
+    proptest! {
+        #[test]
+        // proptest does not support [[:graphical:][:space:]] regex.
+        fn test_simplify_plain_text_fuzzy(input in "[!-~\t \n]+") {
+            let output = Simplify::new().simplify_plain_text(&input, true);
+            assert!(output.split('\n').all(|s| s != "-- "));
+        }
+    }
 
     #[test]
     fn test_simplify_trim() {
-        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);
+        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);
 
-            assert_eq!(
-                CStr::from_ptr(plain as *const libc::c_char)
-                    .to_str()
-                    .unwrap(),
-                "line1\nline2",
-            );
-
-            free(plain as *mut libc::c_void);
-        }
+        assert_eq!(plain, "line1\nline2");
     }
 
     #[test]
     fn test_simplify_parse_href() {
-        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);
+        let mut simplify = Simplify::new();
+        let html = "<a href=url>text</a";
+        let plain = simplify.simplify(html, true, false);
 
-            assert_eq!(
-                CStr::from_ptr(plain as *const libc::c_char)
-                    .to_str()
-                    .unwrap(),
-                "[text](url)",
-            );
-
-            free(plain as *mut libc::c_void);
-        }
+        assert_eq!(plain, "[text](url)");
     }
 
     #[test]
     fn test_simplify_bold_text() {
-        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 = simplify.simplify(html, strlen(html) as libc::c_int, true, 0);
+        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);
 
-            assert_eq!(
-                CStr::from_ptr(plain as *const libc::c_char)
-                    .to_str()
-                    .unwrap(),
-                "text *bold*<>",
-            );
-
-            free(plain as *mut libc::c_void);
-        }
+        assert_eq!(plain, "text *bold*<>");
     }
 
     #[test]
     fn test_simplify_html_encoded() {
-        unsafe {
-            let mut simplify = Simplify::new();
-            let html =
-                b"&lt;&gt;&quot;&apos;&amp; &auml;&Auml;&ouml;&Ouml;&uuml;&Uuml;&szlig; foo&AElig;&ccedil;&Ccedil; &diams;&lrm;&rlm;&zwnj;&noent;&zwj;\x00"
-                as *const u8 as *const libc::c_char;
-            let plain = simplify.simplify(html, strlen(html) as libc::c_int, true, 0);
+        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;";
 
-            assert_eq!(
-                CStr::from_ptr(plain as *const libc::c_char)
-                    .to_str()
-                    .unwrap(),
-                "<>\"\'& äÄöÖüÜß fooÆçÇ \u{2666}\u{200e}\u{200f}\u{200c}&noent;\u{200d}"
-            );
+        let plain = simplify.simplify(html, true, false);
 
-            free(plain as *mut libc::c_void);
-        }
+        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(""));
     }
 }

src/dc_strencode.rs

@@ -1,916 +0,0 @@
-use std::ffi::{CStr, CString};
-
-use charset::Charset;
-use mmime::mailmime_decode::*;
-use mmime::mmapstring::*;
-use mmime::other::*;
-
-use crate::dc_tools::*;
-use crate::types::*;
-use crate::x::*;
-
-#[inline]
-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
-    }
-}
-
-/* ******************************************************************************
- * 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 = 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() {
-        ok_to_continue = false;
-    }
-    loop {
-        if !ok_to_continue {
-            if !mmapstr.is_null() {
-                mmap_string_free(mmapstr);
-            }
-            break;
-        } else {
-            if *cur as libc::c_int != '\u{0}' as i32 {
-                let begin: *const libc::c_char;
-                let mut end: *const libc::c_char;
-                let mut do_quote: bool;
-                let mut quote_words: libc::c_int;
-                begin = cur;
-                end = begin;
-                quote_words = 0i32;
-                do_quote = true;
-                while *cur as libc::c_int != '\u{0}' as i32 {
-                    get_word(cur, &mut cur, &mut do_quote);
-                    if !do_quote {
-                        break;
-                    }
-                    quote_words = 1i32;
-                    end = cur;
-                    if *cur as libc::c_int != '\u{0}' as i32 {
-                        cur = cur.offset(1isize)
-                    }
-                }
-                if 0 != quote_words {
-                    if !quote_word(
-                        b"utf-8\x00" as *const u8 as *const libc::c_char,
-                        mmapstr,
-                        begin,
-                        end.wrapping_offset_from(begin) as size_t,
-                    ) {
-                        ok_to_continue = false;
-                        continue;
-                    }
-                    if *end as libc::c_int == ' ' as i32 || *end as libc::c_int == '\t' as i32 {
-                        if mmap_string_append_c(mmapstr, *end).is_null() {
-                            ok_to_continue = false;
-                            continue;
-                        }
-                        end = end.offset(1isize)
-                    }
-                    if *end as libc::c_int != '\u{0}' as i32 {
-                        if mmap_string_append_len(
-                            mmapstr,
-                            end,
-                            cur.wrapping_offset_from(end) as size_t,
-                        )
-                        .is_null()
-                        {
-                            ok_to_continue = false;
-                            continue;
-                        }
-                    }
-                } else if mmap_string_append_len(
-                    mmapstr,
-                    begin,
-                    cur.wrapping_offset_from(begin) as size_t,
-                )
-                .is_null()
-                {
-                    ok_to_continue = false;
-                    continue;
-                }
-                if !(*cur as libc::c_int == ' ' as i32 || *cur as libc::c_int == '\t' as i32) {
-                    continue;
-                }
-                if mmap_string_append_c(mmapstr, *cur).is_null() {
-                    ok_to_continue = false;
-                    continue;
-                }
-                cur = cur.offset(1isize);
-            } else {
-                ret_str = strdup((*mmapstr).str_0);
-                ok_to_continue = false;
-            }
-        }
-    }
-
-    ret_str
-}
-
-unsafe fn quote_word(
-    display_charset: *const libc::c_char,
-    mmapstr: *mut MMAPString,
-    word: *const libc::c_char,
-    size: size_t,
-) -> bool {
-    let mut cur: *const libc::c_char;
-    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() {
-        return false;
-    }
-    if mmap_string_append(mmapstr, display_charset).is_null() {
-        return false;
-    }
-    if mmap_string_append(mmapstr, b"?Q?\x00" as *const u8 as *const libc::c_char).is_null() {
-        return false;
-    }
-    // col = (*mmapstr).len as libc::c_int;
-    cur = word;
-    while i < size {
-        let mut do_quote_char = false;
-        match *cur as u8 as char {
-            ',' | ':' | '!' | '"' | '#' | '$' | '@' | '[' | '\\' | ']' | '^' | '`' | '{' | '|'
-            | '}' | '~' | '=' | '?' | '_' => do_quote_char = true,
-            _ => {
-                if *cur as u8 >= 128 {
-                    do_quote_char = true;
-                }
-            }
-        }
-        if do_quote_char {
-            print_hex(hex.as_mut_ptr(), cur);
-            if mmap_string_append(mmapstr, hex.as_mut_ptr()).is_null() {
-                return false;
-            }
-        // col += 3i32
-        } else {
-            if *cur as libc::c_int == ' ' as i32 {
-                if mmap_string_append_c(mmapstr, '_' as i32 as libc::c_char).is_null() {
-                    return false;
-                }
-            } else if mmap_string_append_c(mmapstr, *cur).is_null() {
-                return false;
-            }
-            // col += 3i32
-        }
-        cur = cur.offset(1isize);
-        i = i.wrapping_add(1)
-    }
-    if mmap_string_append(mmapstr, b"?=\x00" as *const u8 as *const libc::c_char).is_null() {
-        return false;
-    }
-
-    true
-}
-
-unsafe fn get_word(
-    begin: *const libc::c_char,
-    pend: *mut *const libc::c_char,
-    pto_be_quoted: *mut bool,
-) {
-    let mut cur: *const libc::c_char = begin;
-    while *cur as libc::c_int != ' ' as i32
-        && *cur as libc::c_int != '\t' as i32
-        && *cur as libc::c_int != '\u{0}' as i32
-    {
-        cur = cur.offset(1isize)
-    }
-    *pto_be_quoted = to_be_quoted(begin, cur.wrapping_offset_from(begin) as size_t);
-    *pend = cur;
-}
-
-/* ******************************************************************************
- * Encode/decode header words, RFC 2047
- ******************************************************************************/
-
-/* see comment below */
-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: 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
-            | 61 | 63 | 95 => return true,
-            _ => {
-                if *cur as libc::c_uchar as libc::c_int >= 128i32 {
-                    return true;
-                }
-            }
-        }
-        cur = cur.offset(1isize);
-        i = i.wrapping_add(1)
-    }
-
-    false
-}
-
-pub unsafe fn dc_decode_header_words(in_0: *const libc::c_char) -> *mut libc::c_char {
-    if in_0.is_null() {
-        return 0 as *mut libc::c_char;
-    }
-    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,
-        strlen(in_0),
-        &mut cur_token,
-        b"utf-8\x00" as *const u8 as *const libc::c_char,
-        &mut out,
-    );
-    if r != MAILIMF_NO_ERROR as libc::c_int || out.is_null() {
-        out = dc_strdup(in_0)
-    }
-
-    out
-}
-
-#[cfg(test)]
-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;
-        }
-        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 {
-                    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;
-
-    res
-}
-
-/* ******************************************************************************
- * Encode/decode modified UTF-7 as needed for IMAP, see RFC 2192
- ******************************************************************************/
-
-// UTF7 modified base64 alphabet
-#[cfg(test)]
-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,
-];
-
-#[cfg(test)]
-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);
-    if !decoded.is_null() {
-        decoded
-    } else {
-        dc_strdup(to_decode)
-    }
-}
-
-unsafe fn print_hex(target: *mut libc::c_char, cur: *const libc::c_char) {
-    assert!(!target.is_null());
-    assert!(!cur.is_null());
-
-    let bytes = std::slice::from_raw_parts(cur as *const _, strlen(cur));
-    let raw = CString::yolo(format!("={}", &hex::encode_upper(bytes)[..2]));
-    libc::memcpy(target as *mut _, raw.as_ptr() as *const _, 4);
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use percent_encoding::{percent_encode, NON_ALPHANUMERIC};
-    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 {
-            let mut buf1: *mut libc::c_char = dc_decode_header_words(
-                b"=?utf-8?B?dGVzdMOkw7bDvC50eHQ=?=\x00" as *const u8 as *const libc::c_char,
-            );
-            assert_eq!(
-                strcmp(
-                    buf1,
-                    b"test\xc3\xa4\xc3\xb6\xc3\xbc.txt\x00" as *const u8 as *const libc::c_char
-                ),
-                0
-            );
-            free(buf1 as *mut libc::c_void);
-
-            buf1 =
-                dc_decode_header_words(b"just ascii test\x00" as *const u8 as *const libc::c_char);
-            assert_eq!(CStr::from_ptr(buf1).to_str().unwrap(), "just ascii test");
-            free(buf1 as *mut libc::c_void);
-
-            buf1 = dc_encode_header_words(b"abcdef\x00" as *const u8 as *const libc::c_char);
-            assert_eq!(CStr::from_ptr(buf1).to_str().unwrap(), "abcdef");
-            free(buf1 as *mut libc::c_void);
-
-            buf1 = dc_encode_header_words(
-                b"test\xc3\xa4\xc3\xb6\xc3\xbc.txt\x00" as *const u8 as *const libc::c_char,
-            );
-            assert_eq!(
-                strncmp(buf1, b"=?utf-8\x00" as *const u8 as *const libc::c_char, 7),
-                0
-            );
-
-            let buf2: *mut libc::c_char = dc_decode_header_words(buf1);
-            assert_eq!(
-                strcmp(
-                    buf2,
-                    b"test\xc3\xa4\xc3\xb6\xc3\xbc.txt\x00" as *const u8 as *const libc::c_char
-                ),
-                0
-            );
-            free(buf1 as *mut libc::c_void);
-            free(buf2 as *mut libc::c_void);
-
-            buf1 = dc_decode_header_words(
-                b"=?ISO-8859-1?Q?attachment=3B=0D=0A_filename=3D?= =?ISO-8859-1?Q?=22test=E4=F6=FC=2Etxt=22=3B=0D=0A_size=3D39?=\x00" as *const u8 as *const libc::c_char
-            );
-            assert_eq!(
-                strcmp(
-                    buf1,
-                    b"attachment;\r\n filename=\"test\xc3\xa4\xc3\xb6\xc3\xbc.txt\";\r\n size=39\x00" as *const u8 as *const libc::c_char,
-
-                ),
-                0
-            );
-            free(buf1 as *mut libc::c_void);
-        }
-    }
-
-    #[test]
-    fn test_dc_encode_ext_header() {
-        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);
-
-            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);
-
-            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);
-
-            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);
-
-            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);
-
-            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);
-
-            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() {
-        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]
-    fn test_print_hex() {
-        let mut hex: [libc::c_char; 4] = [0; 4];
-        let cur = b"helloworld" as *const u8 as *const libc::c_char;
-        unsafe { print_hex(hex.as_mut_ptr(), cur) };
-        assert_eq!(to_string(hex.as_ptr() as *const _), "=68");
-
-        let cur = b":" as *const u8 as *const libc::c_char;
-        unsafe { print_hex(hex.as_mut_ptr(), cur) };
-        assert_eq!(to_string(hex.as_ptr() as *const _), "=3A");
-    }
-
-    #[test]
-    fn test_dc_urlencode_urldecode() {
-        unsafe {
-            let buf1 = percent_encode(b"Bj\xc3\xb6rn Petersen", NON_ALPHANUMERIC)
-                .to_string()
-                .strdup();
-
-            assert_eq!(
-                CStr::from_ptr(buf1 as *const libc::c_char)
-                    .to_str()
-                    .unwrap(),
-                "Bj%C3%B6rn%20Petersen"
-            );
-
-            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

@@ -1,65 +0,0 @@
-use crate::context::Context;
-use crate::dc_tools::*;
-use crate::sql;
-
-// Token namespaces
-#[allow(non_camel_case_types)]
-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/dehtml.rs

@@ -1,10 +1,11 @@
+//! De-HTML
+//!
+//! A module to remove HTML tags from the email text
+
 use lazy_static::lazy_static;
 use quick_xml;
 use quick_xml::events::{BytesEnd, BytesStart, BytesText};
 
-use crate::dc_tools::*;
-use crate::x::*;
-
 lazy_static! {
     static ref LINE_RE: regex::Regex = regex::Regex::new(r"(\r?\n)+").unwrap();
 }
@@ -22,21 +23,18 @@ enum AddText {
     YesPreserveLineEnds,
 }
 
-// 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 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);
-    }
+// dehtml() returns way too many newlines; however, an optimisation on this issue is not needed as
+// the newlines are typically removed in further processing by the caller
+pub fn dehtml(buf: &str) -> String {
+    let buf = buf.trim();
 
     let mut dehtml = Dehtml {
-        strbuilder: String::with_capacity(strlen(buf_terminated)),
+        strbuilder: String::with_capacity(buf.len()),
         add_text: AddText::YesRemoveLineEnds,
         last_href: None,
     };
 
-    let mut reader = quick_xml::Reader::from_str(as_str(buf_terminated));
+    let mut reader = quick_xml::Reader::from_str(buf);
 
     let mut buf = Vec::new();
 
@@ -61,7 +59,7 @@ pub unsafe fn dc_dehtml(buf_terminated: *mut libc::c_char) -> *mut libc::c_char
         buf.clear();
     }
 
-    dehtml.strbuilder.strdup()
+    dehtml.strbuilder
 }
 
 fn dehtml_text_cb(event: &BytesText, dehtml: &mut Dehtml) {
@@ -167,3 +165,28 @@ fn dehtml_starttag_cb<B: std::io::BufRead>(
         _ => {}
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_dehtml() {
+        let cases = vec![
+            (
+                "<a href='https://example.com'> Foo </a>",
+                "[ Foo ](https://example.com)",
+            ),
+            ("<img href='/foo.png'>", ""),
+            ("<b> bar </b>", "* bar *"),
+            ("<b> bar <i> foo", "* bar _ foo"),
+            ("&amp; bar", "& bar"),
+            // Note missing '
+            ("<a href='/foo.png>Hi</a> ", ""),
+            ("", ""),
+        ];
+        for (input, output) in cases {
+            assert_eq!(dehtml(input), output);
+        }
+    }
+}

src/e2ee.rs

@@ -0,0 +1,447 @@
+//! End-to-end encryption support.
+
+use std::collections::HashSet;
+
+use mailparse::MailHeaderMap;
+use num_traits::FromPrimitive;
+
+use crate::aheader::*;
+use crate::config::Config;
+use crate::context::Context;
+use crate::error::*;
+use crate::key::*;
+use crate::keyring::*;
+use crate::peerstate::*;
+use crate::pgp;
+use crate::securejoin::handle_degrade_event;
+use crate::wrapmime;
+
+#[derive(Debug)]
+pub struct EncryptHelper {
+    pub prefer_encrypt: EncryptPreference,
+    pub addr: String,
+    pub public_key: Key,
+}
+
+impl EncryptHelper {
+    pub fn new(context: &Context) -> Result<EncryptHelper> {
+        let prefer_encrypt =
+            EncryptPreference::from_i32(context.get_config_int(Config::E2eeEnabled))
+                .unwrap_or_default();
+        let addr = match context.get_config(Config::ConfiguredAddr) {
+            None => {
+                bail!("addr not configured!");
+            }
+            Some(addr) => addr,
+        };
+
+        let public_key = load_or_generate_self_public_key(context, &addr)?;
+
+        Ok(EncryptHelper {
+            prefer_encrypt,
+            addr,
+            public_key,
+        })
+    }
+
+    pub fn get_aheader(&self) -> Aheader {
+        let pk = self.public_key.clone();
+        let addr = self.addr.to_string();
+        Aheader::new(addr, pk, self.prefer_encrypt)
+    }
+
+    /// Determines if we can and should encrypt.
+    pub fn should_encrypt(
+        &self,
+        context: &Context,
+        e2ee_guaranteed: bool,
+        peerstates: &[(Option<Peerstate>, &str)],
+    ) -> Result<bool> {
+        if !(self.prefer_encrypt == EncryptPreference::Mutual || e2ee_guaranteed) {
+            return Ok(false);
+        }
+
+        for (peerstate, addr) in peerstates {
+            match peerstate {
+                Some(peerstate) => {
+                    if peerstate.prefer_encrypt != EncryptPreference::Mutual && !e2ee_guaranteed {
+                        info!(context, "peerstate for {:?} is no-encrypt", addr);
+                        return Ok(false);
+                    }
+                }
+                None => {
+                    let msg = format!("peerstate for {:?} missing, cannot encrypt", addr);
+                    if e2ee_guaranteed {
+                        return Err(format_err!("{}", msg));
+                    } else {
+                        info!(context, "{}", msg);
+                        return Ok(false);
+                    }
+                }
+            }
+        }
+
+        Ok(true)
+    }
+
+    /// Tries to encrypt the passed in `mail`.
+    pub fn encrypt(
+        &mut self,
+        context: &Context,
+        min_verified: PeerstateVerifiedStatus,
+        mail_to_encrypt: lettre_email::PartBuilder,
+        peerstates: &[(Option<Peerstate>, &str)],
+    ) -> Result<String> {
+        let mut keyring = Keyring::default();
+
+        for (peerstate, addr) in peerstates
+            .iter()
+            .filter_map(|(state, addr)| state.as_ref().map(|s| (s, addr)))
+        {
+            let key = peerstate.peek_key(min_verified).ok_or_else(|| {
+                format_err!("proper enc-key for {} missing, cannot encrypt", addr)
+            })?;
+            keyring.add_ref(key);
+        }
+
+        keyring.add_ref(&self.public_key);
+        let sign_key = Key::from_self_private(context, self.addr.clone(), &context.sql)
+            .ok_or_else(|| format_err!("missing own private key"))?;
+
+        let raw_message = mail_to_encrypt.build().as_string().into_bytes();
+
+        let ctext = pgp::pk_encrypt(&raw_message, &keyring, Some(&sign_key))?;
+
+        Ok(ctext)
+    }
+}
+
+pub fn try_decrypt(
+    context: &Context,
+    mail: &mailparse::ParsedMail<'_>,
+    message_time: i64,
+) -> Result<(Option<Vec<u8>>, HashSet<String>)> {
+    let from = mail
+        .headers
+        .get_first_value("From")?
+        .and_then(|from_addr| mailparse::addrparse(&from_addr).ok())
+        .and_then(|from| from.extract_single_info())
+        .map(|from| from.addr)
+        .unwrap_or_default();
+
+    let mut peerstate = None;
+    let autocryptheader = Aheader::from_headers(context, &from, &mail.headers);
+
+    if message_time > 0 {
+        peerstate = Peerstate::from_addr(context, &context.sql, &from);
+
+        if let Some(ref mut peerstate) = peerstate {
+            if let Some(ref header) = autocryptheader {
+                peerstate.apply_header(&header, message_time);
+                peerstate.save_to_db(&context.sql, false)?;
+            } else if message_time > peerstate.last_seen_autocrypt && !contains_report(mail) {
+                peerstate.degrade_encryption(message_time);
+                peerstate.save_to_db(&context.sql, false)?;
+            }
+        } else if let Some(ref header) = autocryptheader {
+            let p = Peerstate::from_header(context, header, message_time);
+            p.save_to_db(&context.sql, true)?;
+            peerstate = Some(p);
+        }
+    }
+
+    /* possibly perform decryption */
+    let mut private_keyring = Keyring::default();
+    let mut public_keyring_for_validate = Keyring::default();
+    let mut out_mail = None;
+    let mut signatures = HashSet::default();
+    let self_addr = context.get_config(Config::ConfiguredAddr);
+
+    if let Some(self_addr) = self_addr {
+        if private_keyring.load_self_private_for_decrypting(context, self_addr, &context.sql) {
+            if peerstate.as_ref().map(|p| p.last_seen).unwrap_or_else(|| 0) == 0 {
+                peerstate = Peerstate::from_addr(&context, &context.sql, &from);
+            }
+            if let Some(ref peerstate) = peerstate {
+                if peerstate.degrade_event.is_some() {
+                    handle_degrade_event(context, &peerstate)?;
+                }
+                if let Some(ref key) = peerstate.gossip_key {
+                    public_keyring_for_validate.add_ref(key);
+                }
+                if let Some(ref key) = peerstate.public_key {
+                    public_keyring_for_validate.add_ref(key);
+                }
+            }
+
+            out_mail = decrypt_if_autocrypt_message(
+                context,
+                mail,
+                &private_keyring,
+                &public_keyring_for_validate,
+                &mut signatures,
+            )?;
+        }
+    }
+    Ok((out_mail, signatures))
+}
+
+/// Load public key from database or generate a new one.
+///
+/// This will load a public key from the database, generating and
+/// storing a new one when one doesn't exist yet.  Care is taken to
+/// only generate one key per context even when multiple threads call
+/// this function concurrently.
+fn load_or_generate_self_public_key(context: &Context, self_addr: impl AsRef<str>) -> Result<Key> {
+    if let Some(key) = Key::from_self_public(context, &self_addr, &context.sql) {
+        return Ok(key);
+    }
+    let _guard = context.generating_key_mutex.lock().unwrap();
+
+    // Check again in case the key was generated while we were waiting for the lock.
+    if let Some(key) = Key::from_self_public(context, &self_addr, &context.sql) {
+        return Ok(key);
+    }
+
+    let start = std::time::Instant::now();
+    info!(
+        context,
+        "Generating keypair with {} bits, e={} ...", 2048, 65537,
+    );
+    match pgp::create_keypair(&self_addr) {
+        Some((public_key, private_key)) => {
+            if dc_key_save_self_keypair(
+                context,
+                &public_key,
+                &private_key,
+                &self_addr,
+                true,
+                &context.sql,
+            ) {
+                info!(
+                    context,
+                    "Keypair generated in {:.3}s.",
+                    start.elapsed().as_secs()
+                );
+                Ok(public_key)
+            } else {
+                Err(format_err!("Failed to save keypair"))
+            }
+        }
+        None => Err(format_err!("Failed to generate keypair")),
+    }
+}
+
+fn decrypt_if_autocrypt_message<'a>(
+    context: &Context,
+    mail: &mailparse::ParsedMail<'a>,
+    private_keyring: &Keyring,
+    public_keyring_for_validate: &Keyring,
+    ret_valid_signatures: &mut HashSet<String>,
+) -> Result<Option<Vec<u8>>> {
+    //  The returned bool is true if we detected an Autocrypt-encrypted
+    // message and successfully decrypted it. Decryption then modifies the
+    // passed in mime structure in place. The returned bool is false
+    // if it was not an Autocrypt message.
+    //
+    // Errors are returned for failures related to decryption of AC-messages.
+
+    let encrypted_data_part = match wrapmime::get_autocrypt_mime(mail) {
+        Err(err) => {
+            // not a proper autocrypt message, abort and ignore
+            info!(context, "Not an autocrypt message: {:?}", err);
+            return Ok(None);
+        }
+        Ok(res) => res,
+    };
+
+    decrypt_part(
+        context,
+        encrypted_data_part,
+        private_keyring,
+        public_keyring_for_validate,
+        ret_valid_signatures,
+    )
+}
+
+/// Returns Ok(None) if nothing encrypted was found.
+fn decrypt_part(
+    _context: &Context,
+    mail: &mailparse::ParsedMail<'_>,
+    private_keyring: &Keyring,
+    public_keyring_for_validate: &Keyring,
+    ret_valid_signatures: &mut HashSet<String>,
+) -> Result<Option<Vec<u8>>> {
+    let data = mail.get_body_raw()?;
+
+    if has_decrypted_pgp_armor(&data) {
+        // we should only have one decryption happening
+        ensure!(ret_valid_signatures.is_empty(), "corrupt signatures");
+
+        let plain = pgp::pk_decrypt(
+            &data,
+            &private_keyring,
+            &public_keyring_for_validate,
+            Some(ret_valid_signatures),
+        )?;
+
+        ensure!(!ret_valid_signatures.is_empty(), "no valid signatures");
+        return Ok(Some(plain));
+    }
+
+    Ok(None)
+}
+
+fn has_decrypted_pgp_armor(input: &[u8]) -> bool {
+    if let Some(index) = input.iter().position(|b| *b > b' ') {
+        if input.len() - index > 26 {
+            let start = index;
+            let end = start + 27;
+
+            return &input[start..end] == b"-----BEGIN PGP MESSAGE-----";
+        }
+    }
+
+    false
+}
+
+/// Check if a MIME structure contains a multipart/report part.
+///
+/// As reports are often unencrypted, we do not reset the Autocrypt header in
+/// this case.
+///
+/// However, Delta Chat itself has no problem with encrypted multipart/report
+/// parts and MUAs should be encouraged to encrpyt multipart/reports as well so
+/// that we could use the normal Autocrypt processing.
+fn contains_report(mail: &mailparse::ParsedMail<'_>) -> bool {
+    mail.ctype.mimetype == "multipart/report"
+}
+
+/// Ensures a private key exists for the configured user.
+///
+/// Normally the private key is generated when the first message is
+/// sent but in a few locations there are no such guarantees,
+/// e.g. when exporting keys, and calling this function ensures a
+/// private key will be present.
+///
+/// If this succeeds you are also guaranteed that the
+/// [Config::ConfiguredAddr] is configured, this address is returned.
+pub fn ensure_secret_key_exists(context: &Context) -> Result<String> {
+    let self_addr = context.get_config(Config::ConfiguredAddr).ok_or_else(|| {
+        format_err!(concat!(
+            "Failed to get self address, ",
+            "cannot ensure secret key if not configured."
+        ))
+    })?;
+    load_or_generate_self_public_key(context, &self_addr)?;
+    Ok(self_addr)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    use crate::test_utils::*;
+
+    mod ensure_secret_key_exists {
+        use super::*;
+
+        #[test]
+        fn test_prexisting() {
+            let t = dummy_context();
+            let test_addr = configure_alice_keypair(&t.ctx);
+            assert_eq!(ensure_secret_key_exists(&t.ctx).unwrap(), test_addr);
+        }
+
+        #[test]
+        fn test_not_configured() {
+            let t = dummy_context();
+            assert!(ensure_secret_key_exists(&t.ctx).is_err());
+        }
+    }
+
+    #[test]
+    fn test_mailmime_parse() {
+        let plain = b"Chat-Disposition-Notification-To: hello@world.de
+Chat-Group-ID: CovhGgau8M-
+Chat-Group-Name: Delta Chat Dev
+Subject: =?utf-8?Q?Chat=3A?= Delta Chat =?utf-8?Q?Dev=3A?= sidenote for
+ =?utf-8?Q?all=3A?= rust core master ...
+Content-Type: text/plain; charset=\"utf-8\"; protected-headers=\"v1\"
+Content-Transfer-Encoding: quoted-printable
+
+sidenote for all: things are trick atm recomm=
+end not to try to run with desktop or ios unless you are ready to hunt bugs
+
+-- =20
+Sent with my Delta Chat Messenger: https://delta.chat";
+        let mail = mailparse::parse_mail(plain).expect("failed to parse valid message");
+
+        assert_eq!(mail.headers.len(), 6);
+        assert!(
+            mail.get_body().unwrap().starts_with(
+                "sidenote for all: things are trick atm recommend not to try to run with desktop or ios unless you are ready to hunt bugs")
+        );
+    }
+
+    mod load_or_generate_self_public_key {
+        use super::*;
+
+        #[test]
+        fn test_existing() {
+            let t = dummy_context();
+            let addr = configure_alice_keypair(&t.ctx);
+            let key = load_or_generate_self_public_key(&t.ctx, addr);
+            assert!(key.is_ok());
+        }
+
+        #[test]
+        #[ignore] // generating keys is expensive
+        fn test_generate() {
+            let t = dummy_context();
+            let addr = "alice@example.org";
+            let key0 = load_or_generate_self_public_key(&t.ctx, addr);
+            assert!(key0.is_ok());
+            let key1 = load_or_generate_self_public_key(&t.ctx, addr);
+            assert!(key1.is_ok());
+            assert_eq!(key0.unwrap(), key1.unwrap());
+        }
+
+        #[test]
+        #[ignore]
+        fn test_generate_concurrent() {
+            use std::sync::Arc;
+            use std::thread;
+
+            let t = dummy_context();
+            let ctx = Arc::new(t.ctx);
+            let ctx0 = Arc::clone(&ctx);
+            let thr0 =
+                thread::spawn(move || load_or_generate_self_public_key(&ctx0, "alice@example.org"));
+            let ctx1 = Arc::clone(&ctx);
+            let thr1 =
+                thread::spawn(move || load_or_generate_self_public_key(&ctx1, "alice@example.org"));
+            let res0 = thr0.join().unwrap();
+            let res1 = thr1.join().unwrap();
+            assert_eq!(res0.unwrap(), res1.unwrap());
+        }
+    }
+
+    #[test]
+    fn test_has_decrypted_pgp_armor() {
+        let data = b" -----BEGIN PGP MESSAGE-----";
+        assert_eq!(has_decrypted_pgp_armor(data), true);
+
+        let data = b"    \n-----BEGIN PGP MESSAGE-----";
+        assert_eq!(has_decrypted_pgp_armor(data), true);
+
+        let data = b"    -----BEGIN PGP MESSAGE---";
+        assert_eq!(has_decrypted_pgp_armor(data), false);
+
+        let data = b" -----BEGIN PGP MESSAGE-----";
+        assert_eq!(has_decrypted_pgp_armor(data), true);
+
+        let data = b"blas";
+        assert_eq!(has_decrypted_pgp_armor(data), false);
+    }
+}

src/error.rs

@@ -1,19 +1,14 @@
+//! # Error handling
+
 use failure::Fail;
+use lettre_email::mime;
 
 #[derive(Debug, Fail)]
 pub enum Error {
-    #[fail(display = "Sqlite Error: {:?}", _0)]
-    Sql(rusqlite::Error),
-    #[fail(display = "Sqlite Connection Pool Error: {:?}", _0)]
-    ConnectionPool(r2d2::Error),
     #[fail(display = "{:?}", _0)]
     Failure(failure::Error),
-    #[fail(display = "Sqlite: Connection closed")]
-    SqlNoConnection,
-    #[fail(display = "Sqlite: Already open")]
-    SqlAlreadyOpen,
-    #[fail(display = "Sqlite: Failed to open")]
-    SqlFailedToOpen,
+    #[fail(display = "SQL error: {:?}", _0)]
+    SqlError(#[cause] crate::sql::Error),
     #[fail(display = "{:?}", _0)]
     Io(std::io::Error),
     #[fail(display = "{:?}", _0)]
@@ -22,13 +17,37 @@ pub enum Error {
     Image(image_meta::ImageError),
     #[fail(display = "{:?}", _0)]
     Utf8(std::str::Utf8Error),
+    #[fail(display = "PGP: {:?}", _0)]
+    Pgp(pgp::errors::Error),
+    #[fail(display = "Base64Decode: {:?}", _0)]
+    Base64Decode(base64::DecodeError),
+    #[fail(display = "{:?}", _0)]
+    FromUtf8(std::string::FromUtf8Error),
+    #[fail(display = "{}", _0)]
+    BlobError(#[cause] crate::blob::BlobError),
+    #[fail(display = "Invalid Message ID.")]
+    InvalidMsgId,
+    #[fail(display = "Watch folder not found {:?}", _0)]
+    WatchFolderNotFound(String),
+    #[fail(display = "Inalid Email: {:?}", _0)]
+    MailParseError(#[cause] mailparse::MailParseError),
+    #[fail(display = "Building invalid Email: {:?}", _0)]
+    LettreError(#[cause] lettre_email::error::Error),
+    #[fail(display = "FromStr error: {:?}", _0)]
+    FromStr(#[cause] mime::FromStrError),
 }
 
 pub type Result<T> = std::result::Result<T, Error>;
 
-impl From<rusqlite::Error> for Error {
-    fn from(err: rusqlite::Error) -> Error {
-        Error::Sql(err)
+impl From<crate::sql::Error> for Error {
+    fn from(err: crate::sql::Error) -> Error {
+        Error::SqlError(err)
+    }
+}
+
+impl From<base64::DecodeError> for Error {
+    fn from(err: base64::DecodeError) -> Error {
+        Error::Base64Decode(err)
     }
 }
 
@@ -38,12 +57,6 @@ impl From<failure::Error> for Error {
     }
 }
 
-impl From<r2d2::Error> for Error {
-    fn from(err: r2d2::Error) -> Error {
-        Error::ConnectionPool(err)
-    }
-}
-
 impl From<std::io::Error> for Error {
     fn from(err: std::io::Error) -> Error {
         Error::Io(err)
@@ -62,6 +75,48 @@ impl From<image_meta::ImageError> for Error {
     }
 }
 
+impl From<pgp::errors::Error> for Error {
+    fn from(err: pgp::errors::Error) -> Error {
+        Error::Pgp(err)
+    }
+}
+
+impl From<std::string::FromUtf8Error> for Error {
+    fn from(err: std::string::FromUtf8Error) -> Error {
+        Error::FromUtf8(err)
+    }
+}
+
+impl From<crate::blob::BlobError> for Error {
+    fn from(err: crate::blob::BlobError) -> Error {
+        Error::BlobError(err)
+    }
+}
+
+impl From<crate::message::InvalidMsgId> for Error {
+    fn from(_err: crate::message::InvalidMsgId) -> Error {
+        Error::InvalidMsgId
+    }
+}
+
+impl From<mailparse::MailParseError> for Error {
+    fn from(err: mailparse::MailParseError) -> Error {
+        Error::MailParseError(err)
+    }
+}
+
+impl From<lettre_email::error::Error> for Error {
+    fn from(err: lettre_email::error::Error) -> Error {
+        Error::LettreError(err)
+    }
+}
+
+impl From<mime::FromStrError> for Error {
+    fn from(err: mime::FromStrError) -> Error {
+        Error::FromStr(err)
+    }
+}
+
 #[macro_export]
 macro_rules! bail {
     ($e:expr) => {

src/events.rs

@@ -0,0 +1,255 @@
+//! # Events specification
+
+use std::path::PathBuf;
+
+use strum::EnumProperty;
+
+use crate::message::MsgId;
+
+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),
+
+    /// Emitted when an IMAP message has been marked as deleted
+    ///
+    /// @return 0
+    #[strum(props(id = "104"))]
+    ImapMessageDeleted(String),
+
+    /// Emitted when an IMAP message has been moved
+    ///
+    /// @return 0
+    #[strum(props(id = "105"))]
+    ImapMessageMoved(String),
+
+    /// Emitted when an IMAP folder was emptied
+    ///
+    /// @return 0
+    #[strum(props(id = "106"))]
+    ImapFolderEmptied(String),
+
+    /// Emitted when an new file in the $BLOBDIR was created
+    ///
+    /// @return 0
+    #[strum(props(id = "150"))]
+    NewBlobFile(String),
+
+    /// Emitted when an new file in the $BLOBDIR was created
+    ///
+    /// @return 0
+    #[strum(props(id = "151"))]
+    DeletedBlobFile(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: MsgId },
+
+    /// 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: MsgId },
+
+    /// 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: MsgId },
+
+    /// 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: MsgId },
+
+    /// 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: MsgId },
+
+    /// 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 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 imex().
+    /// This event may be sent multiple times by a single call to 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 },
+
+    /// This event is sent out to the inviter when a joiner successfully joined a group.
+    /// @param data1 (int) chat_id
+    /// @param data2 (int) contact_id
+    /// @return 0
+    #[strum(props(id = "2062"))]
+    SecurejoinMemberAdded { chat_id: u32, contact_id: u32 },
+}