some real tests

starting on provider tests, two basic tests pass for me on a three provider file
2026-06-27 10:06:36 +03:00 · 2021-05-12 19:07:47 +02:00 · 2021-05-12 19:07:47 +02:00
34 changed files with 260 additions and 758 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -27,10 +27,7 @@ jobs:
      - checkout
      # the following commands on success produces
      # workspace/{wheelhouse,py-docs} as artefact directories
-      - run:
-          # building aarch64 packages under qemu is very slow
-          no_output_timeout: 60m
-          command: bash scripts/remote_python_packaging.sh
+      - run: bash scripts/remote_python_packaging.sh
      - persist_to_workspace:
          root: workspace
          paths:
@@ -54,24 +51,18 @@ workflows:
    jobs:
      - remote_python_packaging:
          filters:
-            tags:
-              only: /.+/
            branches:
-              ignore: /.*/
-
-      - build_doxygen:
-          filters:
-            tags:
-              only: /.+/
-            branches:
-              ignore: /.*/
+              only: master

      - upload_docs_wheels:
          requires:
             - remote_python_packaging
             - build_doxygen
          filters:
-            tags:
-              only: /.+/
            branches:
-              ignore: /.*/
+              only: master
+
+      - build_doxygen:
+          filters:
+            branches:
+              only: master
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -65,16 +65,26 @@ jobs:

  build_and_test:
    name: Build and test
+    runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ matrix.experimental }}
    strategy:
      matrix:
-        include:
-          - os: ubuntu-latest
-            rust: 1.50.0
-            python: 3.6
-          - os: windows-latest
-            rust: 1.50.0
-            python: false # Python bindings compilation on Windows is not supported.
-    runs-on: ${{ matrix.os }}
+        # macOS disabled due to random failures related to caching
+        #os: [ubuntu-latest, windows-latest, macOS-latest]
+        os: [ubuntu-latest, windows-latest]
+        rust: [1.50.0]
+        experimental: [false]
+#        include:
+#          - os: ubuntu-latest
+#            rust: nightly
+#            experimental: true
+#          - os: windows-latest
+#            rust: nightly
+#            experimental: true
+#          - os: macOS-latest
+#            rust: nightly
+#            experimental: true
+
    steps:
    - uses: actions/checkout@master

@@ -115,29 +125,3 @@ jobs:
      with:
        command: test
        args: --all
-
-    - name: install python
-      if: ${{ matrix.python }}
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python }}
-
-    - name: install tox
-      if: ${{ matrix.python }}
-      run: pip install tox
-
-    - name: build C library
-      if: ${{ matrix.python }}
-      uses: actions-rs/cargo@v1
-      with:
-        command: build
-        args: -p deltachat_ffi
-
-    - name: run python tests
-      if: ${{ matrix.python }}
-      env:
-        DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
-        DCC_RS_TARGET: debug
-        DCC_RS_DEV: ${{ github.workspace }}
-      working-directory: python
-      run: tox -e lint,doc,py3
--- a/.github/workflows/remote_tests.yml
+++ b/.github/workflows/remote_tests.yml
@@ -0,0 +1,18 @@
+name: Remote tests
+on: [push]
+jobs:
+  remote_tests_python:
+    name: Remote Python tests
+    runs-on: ubuntu-latest
+    env:
+      DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
+    steps:
+      - uses: actions/checkout@v2
+      - run: mkdir -m 700 -p ~/.ssh
+      - run: touch ~/.ssh/id_ed25519
+      - run: chmod 600 ~/.ssh/id_ed25519
+      - run: 'echo "$SSH_KEY" | base64 -d > ~/.ssh/id_ed25519'
+        shell: bash
+        env:
+          SSH_KEY: ${{ secrets.SSH_KEY }}
+      - run: scripts/remote_tests_python.sh "deltachat-core/python/${{ github.ref }}/${{ github.run_number }}"
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.16)
-project(deltachat LANGUAGES C)
+project(deltachat)

 find_program(CARGO cargo)

--- a/Cargo.lock
+++ b/Cargo.lock
@@ -374,9 +374,9 @@ dependencies = [

 [[package]]
 name = "async-std-resolver"
-version = "0.20.3"
+version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed4e2c3da14d8ad45acb1e3191db7a918e9505b6f155b218e70a7c9a1a48c638"
+checksum = "4d613d619c2886fc0f4b5a777eceab405b23de82d73f0fc61ae402fdb9bc6fb2"
 dependencies = [
 "async-std",
 "async-trait",
@@ -637,27 +637,6 @@ version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"

-[[package]]
-name = "bzip2"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42b7c3cbf0fa9c1b82308d57191728ca0256cb821220f4e2fd410a72ade26e3b"
-dependencies = [
- "bzip2-sys",
- "libc",
-]
-
-[[package]]
-name = "bzip2-sys"
-version = "0.1.10+1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17fa3d1ac1ca21c5c4e36a97f3c3eb25084576f6fc47bf0139c1123434216c6c"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
-]
-
 [[package]]
 name = "cache-padded"
 version = "1.1.1"
@@ -769,17 +748,6 @@ dependencies = [
 "cc",
 ]

-[[package]]
-name = "clipboard-win"
-version = "4.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e4ea1881992efc993e4dc50a324cdbd03216e41bdc8385720ff47efc9bd2ca8"
-dependencies = [
- "error-code",
- "str-buf",
- "winapi",
-]
-
 [[package]]
 name = "color_quant"
 version = "1.1.0"
@@ -847,12 +815,9 @@ checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b"

 [[package]]
 name = "cpufeatures"
-version = "0.1.1"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dec1028182c380cc45a2e2c5ec841134f2dfd0f8f5f0a5bcd68004f81b5efdf4"
-dependencies = [
- "libc",
-]
+checksum = "5cd5a7748210e7ec1a9696610b1015e6e31fbf58f77a160801f124bd1c36592a"

 [[package]]
 name = "cpuid-bool"
@@ -1196,7 +1161,6 @@ dependencies = [
 "toml",
 "url",
 "uuid",
- "zip",
 ]

 [[package]]
@@ -1488,16 +1452,6 @@ dependencies = [
 "termcolor",
 ]

-[[package]]
-name = "error-code"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5115567ac25674e0043e472be13d14e537f37ea8aa4bdc4aef0c89add1db1ff"
-dependencies = [
- "libc",
- "str-buf",
-]
-
 [[package]]
 name = "escaper"
 version = "0.1.1"
@@ -1543,16 +1497,6 @@ dependencies = [
 "instant",
 ]

-[[package]]
-name = "fd-lock"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0010f02effd88c702318c5dde0463206be67495d0b4d906ba7c0a8f166cc7f06"
-dependencies = [
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "filetime"
 version = "0.2.14"
@@ -1609,10 +1553,20 @@ dependencies = [
 ]

 [[package]]
-name = "futures"
-version = "0.3.15"
+name = "fs2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e7e43a803dae2fa37c1f6a8fe121e1f7bf9548b4dfc0522a42f34145dadfc27"
+checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "futures"
+version = "0.3.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9d5813545e459ad3ca1bff9915e9ad7f1a47dc6a91b627ce321d5863b7dd253"
 dependencies = [
 "futures-channel",
 "futures-core",
@@ -1625,9 +1579,9 @@ dependencies = [

 [[package]]
 name = "futures-channel"
-version = "0.3.15"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e682a68b29a882df0545c143dc3646daefe80ba479bcdede94d5a703de2871e2"
+checksum = "ce79c6a52a299137a6013061e0cf0e688fce5d7f1bc60125f520912fdb29ec25"
 dependencies = [
 "futures-core",
 "futures-sink",
@@ -1635,15 +1589,15 @@ dependencies = [

 [[package]]
 name = "futures-core"
-version = "0.3.15"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0402f765d8a89a26043b889b26ce3c4679d268fa6bb22cd7c6aad98340e179d1"
+checksum = "098cd1c6dda6ca01650f1a37a794245eb73181d0d4d4e955e2f3c37db7af1815"

 [[package]]
 name = "futures-executor"
-version = "0.3.15"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "badaa6a909fac9e7236d0620a2f57f7664640c56575b71a7552fbd68deafab79"
+checksum = "10f6cb7042eda00f0049b1d2080aa4b93442997ee507eb3828e8bd7577f94c9d"
 dependencies = [
 "futures-core",
 "futures-task",
@@ -1652,9 +1606,9 @@ dependencies = [

 [[package]]
 name = "futures-io"
-version = "0.3.15"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acc499defb3b348f8d8f3f66415835a9131856ff7714bf10dadfc4ec4bdb29a1"
+checksum = "365a1a1fb30ea1c03a830fdb2158f5236833ac81fa0ad12fe35b29cddc35cb04"

 [[package]]
 name = "futures-lite"
@@ -1673,11 +1627,10 @@ dependencies = [

 [[package]]
 name = "futures-macro"
-version = "0.3.15"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4c40298486cdf52cc00cd6d6987892ba502c7656a16a4192a9992b1ccedd121"
+checksum = "668c6733a182cd7deb4f1de7ba3bf2120823835b3bcfbeacf7d2c4a773c1bb8b"
 dependencies = [
- "autocfg 1.0.1",
 "proc-macro-hack",
 "proc-macro2",
 "quote",
@@ -1686,23 +1639,22 @@ dependencies = [

 [[package]]
 name = "futures-sink"
-version = "0.3.15"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a57bead0ceff0d6dde8f465ecd96c9338121bb7717d3e7b108059531870c4282"
+checksum = "5c5629433c555de3d82861a7a4e3794a4c40040390907cfbfd7143a92a426c23"

 [[package]]
 name = "futures-task"
-version = "0.3.15"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a16bef9fc1a4dddb5bee51c989e3fbba26569cbb0e31f5b303c184e3dd33dae"
+checksum = "ba7aa51095076f3ba6d9a1f702f74bd05ec65f555d70d2033d55ba8d69f581bc"

 [[package]]
 name = "futures-util"
-version = "0.3.15"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "feb5c238d27e2bf94ffdfd27b2c29e3df4a68c4193bb6427384259e2bf191967"
+checksum = "3c144ad54d60f23927f0a6b6d816e4271278b64f005ad65e4e35291d2de9c025"
 dependencies = [
- "autocfg 1.0.1",
 "futures-channel",
 "futures-core",
 "futures-io",
@@ -2150,9 +2102,9 @@ dependencies = [

 [[package]]
 name = "libc"
-version = "0.2.95"
+version = "0.2.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "789da6d93f1b866ffe175afc5322a4d76c038605a1c3319bb57b06967ca98a36"
+checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e"

 [[package]]
 name = "libm"
@@ -3202,15 +3154,14 @@ dependencies = [

 [[package]]
 name = "rustyline"
-version = "8.2.0"
+version = "8.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbd4eaf7a7738f76c98e4f0395253ae853be3eb018f7b0bb57fe1b6c17e31874"
+checksum = "b9e1b597fcd1eeb1d6b25b493538e5aa19629eb08932184b85fef931ba87e893"
 dependencies = [
 "bitflags",
 "cfg-if 1.0.0",
- "clipboard-win",
 "dirs-next",
- "fd-lock",
+ "fs2",
 "libc",
 "log",
 "memchr",
@@ -3320,9 +3271,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"

 [[package]]
 name = "serde"
-version = "1.0.126"
+version = "1.0.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03"
+checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171"
 dependencies = [
 "serde_derive",
 ]
@@ -3339,9 +3290,9 @@ dependencies = [

 [[package]]
 name = "serde_derive"
-version = "1.0.126"
+version = "1.0.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43"
+checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -3385,9 +3336,9 @@ dependencies = [

 [[package]]
 name = "sha-1"
-version = "0.9.6"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c4cfa741c5832d0ef7fab46cabed29c2aae926db0b11bb2069edd8db5e64e16"
+checksum = "b659df5fc3ce22274daac600ffb845300bd2125bcfaec047823075afdab81c00"
 dependencies = [
 "block-buffer",
 "cfg-if 1.0.0",
@@ -3404,9 +3355,9 @@ checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"

 [[package]]
 name = "sha2"
-version = "0.9.5"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b362ae5752fd2137731f9fa25fd4d9058af34666ca1966fb969119cc35719f12"
+checksum = "d8f6b75b17576b792bef0db1bcc4b8b8bcdf9506744cf34b974195487af6cff2"
 dependencies = [
 "block-buffer",
 "cfg-if 1.0.0",
@@ -3591,12 +3542,6 @@ dependencies = [
 "pin-project-lite",
 ]

-[[package]]
-name = "str-buf"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d44a3643b4ff9caf57abcee9c2c621d6c03d9135e0d8b589bd9afb5992cb176a"
-
 [[package]]
 name = "stream-cipher"
 version = "0.7.1"
@@ -3713,18 +3658,18 @@ dependencies = [

 [[package]]
 name = "thiserror"
-version = "1.0.25"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa6f76457f59514c7eeb4e59d891395fab0b2fd1d40723ae737d64153392e9c6"
+checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e"
 dependencies = [
 "thiserror-impl",
 ]

 [[package]]
 name = "thiserror-impl"
-version = "1.0.25"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a36768c0fbf1bb15eca10defa29526bda730a2376c2ab4393ccfa16fb1a318d"
+checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -3826,9 +3771,9 @@ dependencies = [

 [[package]]
 name = "trust-dns-proto"
-version = "0.20.3"
+version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0d7f5db438199a6e2609debe3f69f808d074e0a2888ee0bccb45fe234d03f4"
+checksum = "952a078337565ba39007de99b151770f41039253a31846f0a3d5cd5a4ac8eedf"
 dependencies = [
 "async-trait",
 "cfg-if 1.0.0",
@@ -3850,9 +3795,9 @@ dependencies = [

 [[package]]
 name = "trust-dns-resolver"
-version = "0.20.3"
+version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ad17b608a64bd0735e67bde16b0636f8aa8591f831a25d18443ed00a699770"
+checksum = "da9c97f7d103e0f94dbe384a57908833505ae5870126492f166821b7cf685589"
 dependencies = [
 "cfg-if 1.0.0",
 "futures-util",
@@ -4234,17 +4179,3 @@ dependencies = [
 "syn",
 "synstructure",
 ]
-
-[[package]]
-name = "zip"
-version = "0.5.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c83dc9b784d252127720168abd71ea82bf8c3d96b17dc565b5e2a02854f2b27"
-dependencies = [
- "byteorder",
- "bzip2",
- "crc32fast",
- "flate2",
- "thiserror",
- "time 0.1.44",
-]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,7 +19,7 @@ anyhow = "1.0.40"
 async-imap = "0.5.0"
 async-native-tls = { version = "0.3.3" }
 async-smtp = { git = "https://github.com/async-email/async-smtp", rev="2275fd8d13e39b2c58d6605c786ff06ff9e05708" }
-async-std-resolver = "0.20.3"
+async-std-resolver = "0.20.2"
 async-std = { version = "~1.9.0", features = ["unstable"] }
 async-tar = "0.3.0"
 async-trait = "0.1.50"
@@ -33,14 +33,14 @@ dirs = { version = "3.0.2", optional=true }
 email = { git = "https://github.com/deltachat/rust-email", branch = "master" }
 encoded-words = { git = "https://github.com/async-email/encoded-words", branch="master" }
 escaper = "0.1.1"
-futures = "0.3.15"
+futures = "0.3.14"
 hex = "0.4.0"
 image = { version = "0.23.5", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
 indexmap = "1.3.0"
 itertools = "0.10.0"
 kamadak-exif = "0.5"
 lettre_email = { git = "https://github.com/deltachat/lettre", branch = "master" }
-libc = "0.2.95"
+libc = "0.2.51"
 log = {version = "0.4.8", optional = true }
 mailparse = "0.13.4"
 native-tls = "0.2.3"
@@ -58,22 +58,21 @@ rand = "0.7.0"
 regex = "1.4.6"
 rusqlite = "0.25"
 rust-hsluv = "0.1.4"
-rustyline = { version = "8.2.0", optional = true }
+rustyline = { version = "8.0.0", optional = true }
 sanitize-filename = "0.3.0"
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-sha-1 = "0.9.6"
-sha2 = "0.9.5"
+sha-1 = "0.9.5"
+sha2 = "0.9.4"
 smallvec = "1.0.0"
 stop-token = "0.2.0"
 strum = "0.20.0"
 strum_macros = "0.20.1"
 surf = { version = "2.0.0-alpha.4", default-features = false, features = ["h1-client"] }
-thiserror = "1.0.25"
+thiserror = "1.0.14"
 toml = "0.5.6"
 url = "2.2.2"
 uuid = { version = "0.8", features = ["serde", "v4"] }
-zip = "0.5.12"

 [dev-dependencies]
 ansi_term = "0.12.0"
--- a/README.md
+++ b/README.md
@@ -3,6 +3,7 @@
 > Deltachat-core written in Rust 

 [![Rust CI](https://github.com/deltachat/deltachat-core-rust/actions/workflows/ci.yml/badge.svg)](https://github.com/deltachat/deltachat-core-rust/actions/workflows/ci.yml)
+[![Remote tests](https://github.com/deltachat/deltachat-core-rust/actions/workflows/remote_tests.yml/badge.svg)](https://github.com/deltachat/deltachat-core-rust/actions/workflows/remote_tests.yml)
 [![CircleCI](https://circleci.com/gh/deltachat/deltachat-core-rust.svg?style=shield)](https://circleci.com/gh/deltachat/deltachat-core-rust/)

 ## Installing Rust and Cargo
--- a/benches/contacts.rs
+++ b/benches/contacts.rs
@@ -17,7 +17,7 @@ async fn address_book_benchmark(n: u32, read_count: u32) {
        .collect::<Vec<String>>()
        .join("");

-    Contact::add_address_book(&context, &book).await.unwrap();
+    Contact::add_address_book(&context, book).await.unwrap();

    let query: Option<&str> = None;
    for _ in 0..read_count {
--- a/deltachat-ffi/Cargo.toml
+++ b/deltachat-ffi/Cargo.toml
@@ -22,7 +22,7 @@ num-traits = "0.2.6"
 serde_json = "1.0"
 async-std = "1.9.0"
 anyhow = "1.0.40"
-thiserror = "1.0.25"
+thiserror = "1.0.14"
 rand = "0.7.3"

 [features]
--- a/examples/repl/cmdline.rs
+++ b/examples/repl/cmdline.rs
@@ -13,8 +13,6 @@ use deltachat::contact::*;
 use deltachat::context::*;
 use deltachat::dc_receive_imf::*;
 use deltachat::dc_tools::*;
-use deltachat::error::Error;
-use deltachat::export_chat::export_chat_to_zip;
 use deltachat::imex::*;
 use deltachat::location;
 use deltachat::log::LogExt;
@@ -389,7 +387,6 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                 protect <chat-id>\n\
                 unprotect <chat-id>\n\
                 delchat <chat-id>\n\
-                 export-chat <chat-id> <destination-file>\n\
                 ===========================Contact requests==\n\
                 decidestartchat <msg-id>\n\
                 decideblock <msg-id>\n\
@@ -1025,13 +1022,6 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
            let chat_id = ChatId::new(arg1.parse()?);
            chat_id.delete(&context).await?;
        }
-        "export-chat" => {
-            ensure!(!arg1.is_empty(), "Argument <chat-id> missing.");
-            ensure!(!arg2.is_empty(), "Argument <destination file> missing.");
-            let chat_id = ChatId::new(arg1.parse()?);
-            // todo check if path is valid (dest dir exists) and ends in .zip
-            export_chat_to_zip(&context, chat_id, arg2).await;
-        }
        "msginfo" => {
            ensure!(!arg1.is_empty(), "Argument <msg-id> missing.");
            let id = MsgId::new(arg1.parse()?);
--- a/examples/repl/main.rs
+++ b/examples/repl/main.rs
@@ -169,7 +169,7 @@ const DB_COMMANDS: [&str; 9] = [
    "housekeeping",
 ];

-const CHAT_COMMANDS: [&str; 35] = [
+const CHAT_COMMANDS: [&str; 34] = [
    "listchats",
    "listarchived",
    "chat",
@@ -204,7 +204,6 @@ const CHAT_COMMANDS: [&str; 35] = [
    "protect",
    "unprotect",
    "delchat",
-    "export-chat",
 ];
 const MESSAGE_COMMANDS: [&str; 6] = [
    "listmsgs",
--- a/python/src/deltachat/testplugin.py
+++ b/python/src/deltachat/testplugin.py
@@ -18,6 +18,8 @@ from .capi import lib
 from .events import FFIEventLogger, FFIEventTracker
 from _pytest._code import Source
 from deltachat import direct_imap
+from deltachat.account import parseaddr
+

 import deltachat

@@ -36,6 +38,9 @@ def pytest_addoption(parser):
        "--strict-tls", action="store_true",
        help="Never accept invalid TLS certificates for test accounts",
    )
+    parser.addoption(
+        "--provider-file", "-P", default=None,
+        help="file which contains config settings for real-world providers")


 def pytest_configure(config):
@@ -125,17 +130,30 @@ def pytest_report_header(config, startdir):
    return summary


+def parse_accountfile(fn):
+    if fn is None:
+        return []
+
+    for line in open(fn):
+        if line.strip() and not line.strip().startswith('#'):
+            config_dict = {}
+            for part in line.split():
+                name, value = part.split("=")
+                config_dict[name] = value
+            yield config_dict
+
+
+def pytest_generate_tests(metafunc):
+    if "real_provider_config" in metafunc.fixturenames:
+        account_configs = list(parse_accountfile(metafunc.config.getoption("--provider-file")))
+        ids = [parseaddr(cfg["addr"])[1] for cfg in account_configs]
+        metafunc.parametrize("real_provider_config", account_configs, ids=ids)
+
+
 class SessionLiveConfigFromFile:
    def __init__(self, fn):
        self.fn = fn
-        self.configlist = []
-        for line in open(fn):
-            if line.strip() and not line.strip().startswith('#'):
-                d = {}
-                for part in line.split():
-                    name, value = part.split("=")
-                    d[name] = value
-                self.configlist.append(d)
+        self.configlist = list(parse_accountfile(fn))

    def get(self, index):
        return self.configlist[index]
@@ -232,6 +250,15 @@ def acfactory(pytestconfig, tmpdir, request, session_liveconfig, data):
                acc.disable_logging()
            deltachat.unregister_global_plugin(direct_imap)

+        def make_account_from_real_config(self, provider_config):
+            configdict = provider_config
+            addr = parseaddr(configdict["addr"])[1]
+            domain = addr.split("@")[1]
+            if "e2ee_enabled" not in configdict:
+                configdict["e2ee_enabled"] = "1"
+            tmpdb = tmpdir.join(domain)
+            return self.make_account(tmpdb.strpath, logid=domain)
+
        def make_account(self, path, logid, quiet=False):
            ac = Account(path, logging=self._logging)
            ac._evtracker = ac.add_account_plugin(FFIEventTracker(ac))
@@ -361,6 +388,11 @@ def acfactory(pytestconfig, tmpdir, request, session_liveconfig, data):
                accounts = self._accounts[:]
            started_accounts = []
            for acc in accounts:
+                if hasattr(acc, "_configtracker"):
+                    acc._configtracker.wait_finish()
+                    acc._evtracker.consume_events()
+                    acc.get_device_chat().mark_noticed()
+                    del acc._configtracker
                if acc not in started_accounts:
                    self.wait_configure(acc)
                    acc.set_config("bcc_self", "0")
@@ -369,6 +401,7 @@ def acfactory(pytestconfig, tmpdir, request, session_liveconfig, data):
                        started_accounts.append(acc)
                    print("{}: {} account was started".format(
                        acc.get_config("displayname"), acc.get_config("addr")))
+
            for acc in started_accounts:
                acc._evtracker.wait_all_initial_fetches()

--- a/python/tests/auditwheels.py
+++ b/python/tests/auditwheels.py
@@ -1,17 +1,15 @@

 import os
-import platform
-import subprocess
 import sys
+import subprocess


 if __name__ == "__main__":
    assert len(sys.argv) == 2
    workspacedir = sys.argv[1]
-    arch = platform.machine()
    for relpath in os.listdir(workspacedir):
        if relpath.startswith("deltachat"):
            p = os.path.join(workspacedir, relpath)
            subprocess.check_call(
                ["auditwheel", "repair", p, "-w", workspacedir,
-                 "--plat", "manylinux2014_" + arch])
+                 "--plat", "manylinux2014_x86_64"])
--- a/python/tests/real_providers.py
+++ b/python/tests/real_providers.py
@@ -0,0 +1,72 @@
+import pytest
+
+
+@pytest.fixture
+def acprovider(acfactory, real_provider_config):
+    ac = acfactory.make_account_from_real_config(real_provider_config)
+    ac.update_config(real_provider_config)
+    ac._configtracker = ac.configure()
+    return ac
+
+
+@pytest.fixture
+def actest(acfactory):
+    return acfactory.get_online_configuring_account()
+
+
+def test_configure_success(acfactory, acprovider, lp):
+    lp.sec("waiting for successful configuration of provider account")
+    acfactory.wait_configure_and_start_io()
+
+    assert acprovider.is_configured()
+    for name in ("inbox", "mvbox", "sentbox"):
+        folder = acprovider.get_config("configured_" + name + "_folder")
+        if not folder:
+            lp.sec("found no {} folder".format(name))
+            continue
+
+        lp.sec("removing provider account IMAP folder {}".format(folder))
+        acprovider.direct_imap.select_folder(folder)
+        acprovider.direct_imap.delete("1:*")
+
+
+def test_basic_send_receive(acprovider, actest, acfactory, lp):
+    acfactory.wait_configure_and_start_io()
+
+    lp.sec("sending message from test account to provider account")
+    chat = actest.create_chat(acprovider)
+    chat.send_text("hello")
+
+    lp.sec("receiving message with the provider account")
+    msg = acprovider._evtracker.wait_next_messages_changed()
+    assert msg.chat.is_deaddrop() and not msg.is_encrypted()
+
+    lp.sec("sending message back from provider to test account")
+    back_chat = acprovider.create_chat(actest)
+    back_chat.send_text("world")
+
+    lp.sec("waiting with test account for provider mail")
+    msg = actest._evtracker.wait_next_incoming_message()
+    assert msg.text == "world"
+    assert msg.is_encrypted()
+
+
+def test_group_messages(acprovider, actest, acfactory, lp):
+    acfactory.wait_configure_and_start_io()
+
+    lp.sec("sending message from test account to provider account")
+    chat = actest.create_chat(acprovider)
+    chat.send_text("hello")
+
+    lp.sec("receiving message with the provider account")
+    msg = acprovider._evtracker.wait_next_messages_changed()
+    assert msg.chat.is_deaddrop() and not msg.is_encrypted()
+
+    lp.sec("sending message back from provider to test account")
+    back_chat = acprovider.create_chat(actest)
+    back_chat.send_text("world")
+
+    lp.sec("waiting with test account for provider mail")
+    msg = actest._evtracker.wait_next_incoming_message()
+    assert msg.text == "world"
+    assert msg.is_encrypted()
--- a/python/tests/test_account.py
+++ b/python/tests/test_account.py
@@ -1033,33 +1033,6 @@ class TestOnlineAccount:
        except queue.Empty:
            pass  # mark_seen_messages() has generated events before it returns

-    def test_moved_markseen(self, acfactory, lp):
-        """Test that message already moved to DeltaChat folder is marked as seen."""
-        ac1 = acfactory.get_online_configuring_account(mvbox=True, config={"inbox_watch": "0"})
-        ac2 = acfactory.get_online_configuring_account()
-        acfactory.wait_configure_and_start_io([ac1, ac2])
-        ac1.set_config("bcc_self", "1")
-
-        ac1.direct_imap.idle_start()
-        ac1.create_chat(ac2).send_text("Hello!")
-        ac1.direct_imap.idle_check(terminate=True)
-        ac1.stop_io()
-
-        # Emulate moving of the message to DeltaChat folder by Sieve rule.
-        # mailcow server contains this rule by default.
-        ac1.direct_imap.conn.move(["*"], "DeltaChat")
-
-        ac1.direct_imap.select_folder("DeltaChat")
-        ac1.direct_imap.idle_start()
-        ac1.start_io()
-        ac1.direct_imap.idle_wait_for_seen()
-        ac1.direct_imap.idle_done()
-
-        fetch = list(ac1.direct_imap.conn.fetch("*", b'FLAGS').values())
-        flags = fetch[-1][b'FLAGS']
-        is_seen = b'\\Seen' in flags
-        assert is_seen
-
    def test_message_override_sender_name(self, acfactory, lp):
        ac1, ac2 = acfactory.get_two_online_accounts()
        chat = acfactory.get_accepted_chat(ac1, ac2)
@@ -1098,10 +1071,10 @@ class TestOnlineAccount:
        # We had so many problems with markseen, if in doubt, rather create another test, it can't harm.
        ac1 = acfactory.get_online_configuring_account(move=mvbox_move, mvbox=mvbox_move)
        ac2 = acfactory.get_online_configuring_account(move=mvbox_move, mvbox=mvbox_move)
-
        acfactory.wait_configure_and_start_io()
-        # Do not send BCC to self, we only want to test MDN on ac1.
-        ac1.set_config("bcc_self", "0")
+
+        acfactory.get_accepted_chat(ac1, ac2).send_text("hi")
+        msg = ac2._evtracker.wait_next_incoming_message()

        folder = "mvbox" if mvbox_move else "inbox"
        ac1.direct_imap.select_config_folder(folder)
@@ -1109,9 +1082,6 @@ class TestOnlineAccount:
        ac1.direct_imap.idle_start()
        ac2.direct_imap.idle_start()

-        acfactory.get_accepted_chat(ac1, ac2).send_text("hi")
-        msg = ac2._evtracker.wait_next_incoming_message()
-
        ac2.mark_seen_messages([msg])

        ac1.direct_imap.idle_wait_for_seen()  # Check that the mdn is marked as seen
@@ -2426,31 +2396,26 @@ class TestOnlineAccount:
        assert received_reply.quoted_text == "hello"
        assert received_reply.quote.id == out_msg.id

-    @pytest.mark.parametrize("folder,move,expected_destination,inbox_watch,", [
-        ("xyz", False, "xyz", "1"),  # Test that emails are recognized in a random folder but not moved
-        ("xyz", True, "DeltaChat", "1"),  # ...emails are found in a random folder and moved to DeltaChat
-        ("Spam", False, "INBOX", "1"),  # ...emails are moved from the spam folder to the Inbox
-        ("INBOX", False, "INBOX", "0"),  # ...emails are found in the `Inbox` folder even if `inbox_watch` is "0"
+    @pytest.mark.parametrize("folder,move,expected_destination,", [
+        ("xyz", False, "xyz"),  # Test that emails are recognized in a random folder but not moved
+        ("xyz", True, "DeltaChat"),  # ...emails are found in a random folder and moved to DeltaChat
+        ("Spam", False, "INBOX")  # ...emails are moved from the spam folder to the Inbox
    ])
    # Testrun.org does not support the CREATE-SPECIAL-USE capability, which means that we can't create a folder with
    # the "\Junk" flag (see https://tools.ietf.org/html/rfc6154). So, we can't test spam folder detection by flag.
-    def test_scan_folders(self, acfactory, lp, folder, move, expected_destination, inbox_watch):
+    def test_scan_folders(self, acfactory, lp, folder, move, expected_destination):
        """Delta Chat periodically scans all folders for new messages to make sure we don't miss any."""
        variant = folder + "-" + str(move) + "-" + expected_destination
        lp.sec("Testing variant " + variant)
        ac1 = acfactory.get_online_configuring_account(move=move)
        ac2 = acfactory.get_online_configuring_account()
-        ac1.set_config("inbox_watch", inbox_watch)

        acfactory.wait_configure(ac1)
        ac1.direct_imap.create_folder(folder)

        acfactory.wait_configure_and_start_io()
        # Wait until each folder was selected once and we are IDLEing:
-        if inbox_watch == "1":
-            ac1._evtracker.get_info_contains("INBOX: Idle entering wait-on-remote state")
-        else:
-            ac1._evtracker.get_info_contains("IMAP-fake-IDLE: no folder, waiting for interrupt")
+        ac1._evtracker.get_info_contains("INBOX: Idle entering wait-on-remote state")
        ac1.stop_io()

        # Send a message to ac1 and move it to the mvbox:
@@ -2467,10 +2432,7 @@ class TestOnlineAccount:
        assert msg.text == "hello"

        # Wait until the message was moved (if at all) and we are IDLEing again:
-        if inbox_watch == "1":
-            ac1._evtracker.get_info_contains("INBOX: Idle entering wait-on-remote state")
-        else:
-            ac1._evtracker.get_info_contains("IMAP-fake-IDLE: no folder, waiting for interrupt")
+        ac1._evtracker.get_info_contains("INBOX: Idle entering wait-on-remote state")
        ac1.direct_imap.select_folder(expected_destination)
        assert len(ac1.direct_imap.get_all_messages()) == 1
        if folder != expected_destination:
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -48,7 +48,3 @@ to avoid the relatively large download::
    cd scripts  # where all CI things are 
    docker build -t deltachat/coredeps docker-coredeps
    docker build -t deltachat/doxygen docker-doxygen 
-
-Additionally, you can install qemu and build arm64 docker image:
-    apt-get install qemu binfmt-support qemu-user-static
-    docker build -t deltachat/coredeps-arm64 docker-coredeps-arm64
--- a/scripts/docker-coredeps-arm64/Dockerfile
+++ b/scripts/docker-coredeps-arm64/Dockerfile
@@ -1,21 +0,0 @@
-FROM quay.io/pypa/manylinux2014_aarch64
-
-# Configure ld.so/ldconfig and pkg-config
-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
-
-# Install a recent Perl, needed to install the openssl crate
-ADD deps/build_perl.sh /builder/build_perl.sh
-RUN rm /usr/bin/perl
-RUN mkdir tmp1 && cd tmp1 && bash /builder/build_perl.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
-ADD deps/build_rust.sh /builder/build_rust.sh
-RUN mkdir tmp1 && cd tmp1 && bash /builder/build_rust.sh && cd .. && rm -r tmp1
--- a/scripts/docker-coredeps-arm64/deps/build_openssl.sh
+++ b/scripts/docker-coredeps-arm64/deps/build_openssl.sh
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-set -e -x
-
-OPENSSL_VERSION=1.1.1a
-OPENSSL_SHA256=fc20130f8b7cbd2fb918b2f14e2f429e109c31ddd0fb38fc5d71d9ffed3f9f41
-
-curl -O https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz
-echo "${OPENSSL_SHA256}  openssl-${OPENSSL_VERSION}.tar.gz" | sha256sum -c -
-tar xzf openssl-${OPENSSL_VERSION}.tar.gz
-cd openssl-${OPENSSL_VERSION} 
-./config shared no-ssl2 no-ssl3 -fPIC --prefix=/usr/local
-
-sed -i "s/^SHLIB_MAJOR=.*/SHLIB_MAJOR=200/" Makefile && \
-sed -i "s/^SHLIB_MINOR=.*/SHLIB_MINOR=0.0/" Makefile && \
-sed -i "s/^SHLIB_VERSION_NUMBER=.*/SHLIB_VERSION_NUMBER=200.0.0/" Makefile
-
-make depend
-make 
-make install_sw install_ssldirs
-ldconfig -v | grep ssl 
--- a/scripts/docker-coredeps-arm64/deps/build_perl.sh
+++ b/scripts/docker-coredeps-arm64/deps/build_perl.sh
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-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}
-
-./Configure -de
-make
-make install
--- a/scripts/docker-coredeps-arm64/deps/build_python.sh
+++ b/scripts/docker-coredeps-arm64/deps/build_python.sh
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-set -x -e
-
-# we use the python3.6 environment as the base environment 
-/opt/python/cp36-cp36m/bin/pip install tox devpi-client auditwheel 
-
-pushd /usr/bin
-
-ln -s /opt/_internal/cpython-3.6.*/bin/tox
-ln -s /opt/_internal/cpython-3.6.*/bin/devpi
-ln -s /opt/_internal/cpython-3.6.*/bin/auditwheel
-
-popd
--- a/scripts/docker-coredeps-arm64/deps/build_rust.sh
+++ b/scripts/docker-coredeps-arm64/deps/build_rust.sh
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-set -e -x
-
-# Install Rust
-#
-# Path from https://forge.rust-lang.org/infra/other-installation-methods.html
-#
-# Avoid using rustup here as it depends on reading /proc/self/exe and
-# has problems running under QEMU.
-curl "https://static.rust-lang.org/dist/rust-1.52.1-$(uname -m)-unknown-linux-gnu.tar.gz" | tar xz
-cd "rust-1.52.1-$(uname -m)-unknown-linux-gnu"
-./install.sh --prefix=/usr --components=rustc,cargo,"rust-std-$(uname -m)-unknown-linux-gnu"
-rustc --version
-cd ..
-rm -fr "rust-1.52.1-$(uname -m)-unknown-linux-gnu"
--- a/scripts/docker-coredeps/Dockerfile
+++ b/scripts/docker-coredeps/Dockerfile
@@ -5,7 +5,7 @@ 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

-# Install a recent Perl, needed to install the openssl crate
+# Install a recent Perl, needed to install the openssl crate 
 ADD deps/build_perl.sh /builder/build_perl.sh
 RUN rm /usr/bin/perl
 RUN mkdir tmp1 && cd tmp1 && bash /builder/build_perl.sh && cd .. && rm -r tmp1
--- a/scripts/docker-coredeps/deps/build_python.sh
+++ b/scripts/docker-coredeps/deps/build_python.sh
@@ -2,13 +2,13 @@

 set -x -e

-# we use the python3.6 environment as the base environment
-/opt/python/cp36-cp36m/bin/pip install tox devpi-client auditwheel
+# we use the python3.5 environment as the base environment 
+/opt/python/cp35-cp35m/bin/pip install tox devpi-client auditwheel 

 pushd /usr/bin

-ln -s /opt/_internal/cpython-3.6.*/bin/tox
-ln -s /opt/_internal/cpython-3.6.*/bin/devpi
-ln -s /opt/_internal/cpython-3.6.*/bin/auditwheel
+ln -s /opt/_internal/cpython-3.5.*/bin/tox
+ln -s /opt/_internal/cpython-3.5.*/bin/devpi
+ln -s /opt/_internal/cpython-3.5.*/bin/auditwheel

 popd
--- a/scripts/docker-coredeps/deps/build_rust.sh
+++ b/scripts/docker-coredeps/deps/build_rust.sh
@@ -3,9 +3,9 @@
 set -e -x

 # Install Rust
-curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain "1.50.0-$(uname -m)-unknown-linux-gnu" -y
+curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.50.0-x86_64-unknown-linux-gnu -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/1.50.0-$(uname -m)-unknown-linux-gnu/share"
+rm -rf /root/.rustup/toolchains/1.50.0-x86_64-unknown-linux-gnu/share
--- a/scripts/remote_python_packaging.sh
+++ b/scripts/remote_python_packaging.sh
@@ -15,7 +15,6 @@ git ls-files >.rsynclist
 # we seem to need .git for setuptools_scm versioning 
 find .git >>.rsynclist
 rsync --delete --files-from=.rsynclist -az ./ "$SSHTARGET:$BUILDDIR"
-rsync --delete --files-from=.rsynclist -az ./ "$SSHTARGET:$BUILDDIR-arm64"

 set +x

@@ -27,41 +26,24 @@ set +x
 # everything is terminated/cleaned up and we have no orphaned
 # useless still-running docker-containers consuming resources. 

-for arch in "" "-arm64"; do
-
-ssh $SSHTARGET bash -c "cat >${BUILDDIR}${arch}/exec_docker_run" <<_HERE
+ssh $SSHTARGET bash -c "cat >$BUILDDIR/exec_docker_run" <<_HERE
    set +x -e
    shopt -s huponexit
-    cd ${BUILDDIR}${arch}
+    cd $BUILDDIR
    export DCC_NEW_TMP_EMAIL=$DCC_NEW_TMP_EMAIL
    set -x

    # run everything else inside docker 
    docker run -e DCC_NEW_TMP_EMAIL \
       --rm -it -v \$(pwd):/mnt -w /mnt \
-       deltachat/coredeps${arch} scripts/run_all.sh
+       deltachat/coredeps scripts/run_all.sh

 _HERE

-done
-
 echo "--- Running $CIRCLE_JOB remotely"

-echo "--- Building aarch64 wheels"
-ssh -o ServerAliveInterval=30 -t $SSHTARGET bash "$BUILDDIR-arm64/exec_docker_run"
-
-echo "--- Building x86_64 wheels"
-ssh -o ServerAliveInterval=30 -t $SSHTARGET bash "$BUILDDIR/exec_docker_run"
-
+ssh -t $SSHTARGET bash "$BUILDDIR/exec_docker_run"
 mkdir -p workspace 
-
-# Wheels
-for arch in "" "-arm64"; do
-rsync -avz "$SSHTARGET:$BUILDDIR${arch}/python/.docker-tox/wheelhouse/*manylinux201*" workspace/wheelhouse/
-done
-
-# Source packages
-rsync -avz "$SSHTARGET:$BUILDDIR${arch}/python/.docker-tox/dist/*" workspace/wheelhouse/
-
-# Documentation
+rsync -avz "$SSHTARGET:$BUILDDIR/python/.docker-tox/wheelhouse/*manylinux201*" workspace/wheelhouse/
+rsync -avz "$SSHTARGET:$BUILDDIR/python/.docker-tox/dist/*" workspace/wheelhouse/
 rsync -avz "$SSHTARGET:$BUILDDIR/python/doc/_build/" workspace/py-docs
--- a/scripts/run_all.sh
+++ b/scripts/run_all.sh
@@ -19,17 +19,14 @@ export DCC_RS_TARGET=release

 # Configure access to a base python and to several python interpreters
 # needed by tox below.
-export PATH=$PATH:/opt/python/cp36-cp36m/bin
+export PATH=$PATH:/opt/python/cp35-cp35m/bin
 export PYTHONDONTWRITEBYTECODE=1
 pushd /bin
-rm -f python3.6
+rm -f python3.5
+ln -s /opt/python/cp35-cp35m/bin/python3.5
 ln -s /opt/python/cp36-cp36m/bin/python3.6
-rm -f python3.7
 ln -s /opt/python/cp37-cp37m/bin/python3.7
-rm -f python3.8
 ln -s /opt/python/cp38-cp38/bin/python3.8
-rm -f python3.9
-ln -s /opt/python/cp39-cp39/bin/python3.9
 popd

 pushd python
@@ -43,7 +40,7 @@ mkdir -p $TOXWORKDIR
 # Note that the independent remote_tests_python step does all kinds of
 # live-testing already. 
 unset DCC_NEW_TMP_EMAIL
-tox --workdir "$TOXWORKDIR" -e py37,py38,py39,auditwheels
+tox --workdir "$TOXWORKDIR" -e py35,py36,py37,py38,auditwheels
 popd


--- a/src/contact.rs
+++ b/src/contact.rs
@@ -541,7 +541,7 @@ impl Contact {
            {
                row_id = u32::try_from(new_row_id)?;
                sth_modified = Modifier::Created;
-                info!(context, "added contact id={} addr={}", row_id, &addr);
+                info!(context, "added contact id={} addr={} origin={:?}", row_id, &addr, &origin);
            } else {
                error!(context, "Cannot add contact.");
            }
--- a/src/dc_receive_imf.rs
+++ b/src/dc_receive_imf.rs
@@ -3986,33 +3986,4 @@ YEAAAAAA!.
            .await,
        );
    }
-
-    #[async_std::test]
-    async fn test_dont_show_all_outgoing_msgs_in_self_chat() {
-        // Regression test for https://github.com/deltachat/deltachat-android/issues/1940:
-        // Some servers add a `Bcc: <Self>` header, which caused all outgoing messages to
-        // be shown in the self-chat.
-        let t = TestContext::new_alice().await;
-
-        dc_receive_imf(
-            &t,
-            b"Bcc: alice@example.com
-Received: from [127.0.0.1]
-Subject: s
-Chat-Version: 1.0
-Message-ID: <abcd@gmail.com>
-To: <me@other.maildomain.com>
-From: <alice@example.com>
-
-Message content",
-            "Inbox",
-            1,
-            false,
-        )
-        .await
-        .unwrap();
-
-        let msg = t.get_last_msg().await;
-        assert_ne!(msg.chat_id, t.get_self_chat().await.id);
-    }
 }
--- a/src/export_chat.rs
+++ b/src/export_chat.rs
@@ -1,339 +0,0 @@
-//! Export chats module
-//!
-//! ## Export Format
-//! The format of an exported chat is a zip file with the following structure:
-//! ```text
-//! ├── blobs/          # all files that are referenced by the chat
-//! ├── msg_info/
-//! │   └── [msg_id].txt # message info
-//! ├── msg_source/
-//! │   └── [msg_id].eml # email sourcecode of messages if availible¹
-//! └── chat.json        # chat info, messages and message authors
-//! ```
-//! ##### ¹ Saving Mime header
-//! To save the mime header you need to have the config option [`SaveMimeHeaders`] enabled.
-//! This option saves the mime headers on future messages. Normaly the original email source code is discarded to save space.
-//! You can use the repl tool to do this job:
-//! ```sh
-//! $ cargo run --example repl --features=repl /path/to/account/db.sqlite
-//! > set save_mime_headers 1
-//! ```
-//! [`SaveMimeHeaders`]: ../config/enum.Config.html#variant.SaveMimeHeaders
-
-use crate::chat::*;
-use crate::constants::Viewtype;
-use crate::constants::DC_GCM_ADDDAYMARKER;
-use crate::contact::*;
-use crate::context::Context;
-// use crate::error::Error;
-use crate::dc_tools::time;
-use crate::message::*;
-use std::collections::HashMap;
-use std::fs::File;
-use std::io::prelude::*;
-use std::path::Path;
-use zip::write::FileOptions;
-
-use crate::location::Location;
-use serde::Serialize;
-
-#[derive(Debug)]
-struct ExportChatResult {
-    chat_json: String,
-    // locations_geo_json: String,
-    message_ids: Vec<MsgId>,
-    referenced_blobs: Vec<String>,
-}
-
-pub async fn export_chat_to_zip(context: &Context, chat_id: ChatId, filename: &str) {
-    let res = export_chat_data(&context, chat_id).await;
-    let destination = std::path::Path::new(filename);
-    let pack_res = pack_exported_chat(&context, res, destination).await;
-    match &pack_res {
-        Ok(()) => println!("Exported chat successfully to {}", filename),
-        Err(err) => println!("Error {:?}", err),
-    };
-}
-
-async fn pack_exported_chat(
-    context: &Context,
-    artifact: ExportChatResult,
-    destination: &Path,
-) -> zip::result::ZipResult<()> {
-    let file = std::fs::File::create(&destination).unwrap();
-
-    let mut zip = zip::ZipWriter::new(file);
-
-    zip.start_file("chat.json", Default::default())?;
-    zip.write_all(artifact.chat_json.as_bytes())?;
-
-    zip.add_directory("blobs/", Default::default())?;
-
-    let options = FileOptions::default();
-    for blob_name in artifact.referenced_blobs {
-        let path = context.get_blobdir().join(&blob_name);
-
-        // println!("adding file {:?} as {:?} ...", path, &blob_name);
-        zip.start_file(format!("blobs/{}", &blob_name), options)?;
-        let mut f = File::open(path)?;
-
-        let mut buffer = Vec::new();
-        f.read_to_end(&mut buffer)?;
-        zip.write_all(&*buffer)?;
-        buffer.clear();
-    }
-
-    zip.add_directory("msg_info/", Default::default())?;
-    zip.add_directory("msg_source/", Default::default())?;
-    for id in artifact.message_ids {
-        zip.start_file(format!("msg_info/{}.txt", id.to_u32()), options)?;
-        zip.write_all((get_msg_info(&context, id).await).as_bytes())?;
-        if let Some(mime_headers) = get_mime_headers(&context, id).await {
-            zip.start_file(format!("msg_source/{}.eml", id.to_u32()), options)?;
-            zip.write_all((mime_headers).as_bytes())?;
-        }
-    }
-
-    zip.finish()?;
-    Ok(())
-}
-
-#[derive(Serialize)]
-struct ChatJSON {
-    chat_json_version: u8,
-    export_timestamp: i64,
-    name: String,
-    color: String,
-    profile_img: Option<String>,
-    contacts: HashMap<u32, ContactJSON>,
-    referenced_external_messages:Vec<ChatItemJSON>,
-    messages: Vec<ChatItemJSON>,
-    locations: Vec<Location>,
-}
-
-#[derive(Serialize)]
-struct ContactJSON {
-    name: String,
-    email: String,
-    color: String,
-    profile_img: Option<String>,
-}
-
-#[derive(Serialize)]
-struct FileReference {
-    name: String,
-    filesize: u64,
-    mime: String,
-    path: String,
-}
-
-#[derive(Serialize)]
-struct Qoute {
-    quoted_text: String,
-    message_id: Option<u32>,
-}
-
-#[derive(Serialize)]
-#[serde(tag = "type")]
-enum ChatItemJSON {
-    Message {
-        id: u32,
-        author_id: u32, // from_id
-        view_type: Viewtype,
-        timestamp_sort: i64,
-        timestamp_sent: i64,
-        timestamp_rcvd: i64,
-        text: Option<String>,
-        attachment: Option<FileReference>,
-        location_id: Option<u32>,
-        is_info_message: bool,
-        show_padlock: bool,
-        state: MessageState,
-        is_forwarded: bool,
-        quote: Option<Qoute>
-    },
-    MessageError {
-        id: u32,
-        error: String,
-    },
-    DayMarker {
-        timestamp: i64,
-    },
-}
-
-impl ChatItemJSON {
-    pub async fn from_message(message: &Message, context: &Context) -> ChatItemJSON {
-        let msg_id = message.get_id();
-        ChatItemJSON::Message {
-            id: msg_id.to_u32(),
-            author_id: message.get_from_id(), // from_id
-            view_type: message.get_viewtype(),
-            timestamp_sort: message.timestamp_sort,
-            timestamp_sent: message.timestamp_sent,
-            timestamp_rcvd: message.timestamp_rcvd,
-            text: message.get_text(),
-            attachment: match message.get_file(context) {
-                Some(file) => Some(FileReference {
-                    name: message.get_filename().unwrap_or_else(|| "".to_owned()),
-                    filesize: message.get_filebytes(context).await,
-                    mime: message.get_filemime().unwrap_or_else(|| "".to_owned()),
-                    path: format!(
-                        "blobs/{}",
-                        file.file_name()
-                            .unwrap_or_else(|| std::ffi::OsStr::new(""))
-                            .to_str()
-                            .unwrap()
-                    ),
-                }),
-                None => None,
-            },
-            location_id: match message.has_location() {
-                true => Some(message.location_id),
-                false => None,
-            },
-            is_info_message: message.is_info(),
-            show_padlock: message.get_showpadlock(),
-            state: message.get_state(),
-            is_forwarded: message.is_forwarded(),
-            quote: match message.quoted_text() {
-                Some(text) => match message.quoted_message(&context).await {
-                    Ok(Some(msg)) => Some(Qoute {
-                        quoted_text: text,
-                        message_id: Some(msg.get_id().to_u32())
-                    }),
-                    Err(_) | Ok(None) => Some(Qoute {
-                        quoted_text: text,
-                        message_id: None
-                    })
-                }
-                None => None
-            }
-        }
-    }
-}
-
-async fn export_chat_data(context: &Context, chat_id: ChatId) -> ExportChatResult {
-    let mut blobs = Vec::new();
-    let mut chat_author_ids = Vec::new();
-    // message_ids var is used for writing message info to files
-    let mut message_ids: Vec<MsgId> = Vec::new();
-    let mut message_json: Vec<ChatItemJSON> = Vec::new();
-    let mut referenced_external_messages: Vec<ChatItemJSON> = Vec::new();
-
-    for item in get_chat_msgs(context, chat_id, DC_GCM_ADDDAYMARKER, None).await {
-        if let Some(json_item) = match item {
-            ChatItem::Message { msg_id } => match Message::load_from_db(context, msg_id).await {
-                Ok(message) => {
-                    let filename = message.get_filename();
-                    if let Some(file) = filename {
-                        // push referenced blobs (attachments)
-                        blobs.push(file);
-                    }
-                    message_ids.push(message.id);
-                    // populate contactid list
-                    chat_author_ids.push(message.from_id);
-
-                    if let Ok(Some(ex_msg)) = message.quoted_message(&context).await {
-                        if ex_msg.get_chat_id() != chat_id {
-                            // if external add it to the file
-                            referenced_external_messages.push(ChatItemJSON::from_message(&ex_msg, &context).await)
-                            // contacts don't need to be referenced, because these should only be private replies
-                        }
-                    }
-
-                    Some(ChatItemJSON::from_message(&message, &context).await)
-                }
-                Err(error_message) => Some(ChatItemJSON::MessageError {
-                    id: msg_id.to_u32(),
-                    error: error_message.to_string(),
-                }),
-            },
-            ChatItem::DayMarker { timestamp } => Some(ChatItemJSON::DayMarker { timestamp }),
-            ChatItem::Marker1 => None,
-        } {
-            message_json.push(json_item)
-        }
-    }
-
-    // deduplicate contact list and load the contacts
-    chat_author_ids.sort();
-    chat_author_ids.dedup();
-    // load information about the authors
-    let mut chat_authors: HashMap<u32, ContactJSON> = HashMap::new();
-    chat_authors.insert(
-        0,
-        ContactJSON {
-            name: "Err: Contact not found".to_owned(),
-            email: "error@localhost".to_owned(),
-            profile_img: None,
-            color: "grey".to_owned(),
-        },
-    );
-    for author_id in chat_author_ids {
-        let contact = Contact::get_by_id(context, author_id).await;
-        if let Ok(c) = contact {
-            let profile_img_path: String;
-            if let Some(path) = c.get_profile_image(context).await {
-                profile_img_path = path
-                    .file_name()
-                    .unwrap_or_else(|| std::ffi::OsStr::new(""))
-                    .to_str()
-                    .unwrap()
-                    .to_owned();
-                // push referenced blobs (avatars)
-                blobs.push(profile_img_path.clone());
-            } else {
-                profile_img_path = "".to_owned();
-            }
-            chat_authors.insert(
-                author_id,
-                ContactJSON {
-                    name: c.get_display_name().to_owned(),
-                    email: c.get_addr().to_owned(),
-                    profile_img: match profile_img_path != "" {
-                        true => Some(profile_img_path),
-                        false => None,
-                    },
-                    color: format!("{:#}", c.get_color()), // TODO
-                },
-            );
-        }
-    }
-
-    // Load information about the chat
-    let chat: Chat = Chat::load_from_db(context, chat_id).await.unwrap();
-    let chat_avatar = match chat.get_profile_image(context).await {
-        Some(img) => {
-            let path = img
-                .file_name()
-                .unwrap_or_else(|| std::ffi::OsStr::new(""))
-                .to_str()
-                .unwrap()
-                .to_owned();
-            blobs.push(path.clone());
-            Some(format!("blobs/{}", path))
-        }
-        None => None,
-    };
-
-    let chat_json = ChatJSON {
-        chat_json_version: 1,
-        export_timestamp: time(),
-        name: chat.get_name().to_owned(),
-        color: format!("{:#}", chat.get_color(&context).await),
-        profile_img: chat_avatar,
-        contacts: chat_authors,
-        referenced_external_messages,
-        messages: message_json,
-        locations: crate::location::get_range(&context, chat_id, 0, 0, crate::dc_tools::time())
-            .await,
-    };
-
-    blobs.sort();
-    blobs.dedup();
-    ExportChatResult {
-        chat_json: serde_json::to_string(&chat_json).unwrap(),
-        message_ids,
-        referenced_blobs: blobs,
-    }
-}
--- a/src/imap/scan_folders.rs
+++ b/src/imap/scan_folders.rs
@@ -25,7 +25,7 @@ impl Imap {
        }
        info!(context, "Starting full folder scan");

-        self.connect_configured(context).await?;
+        self.setup_handle(context).await?;
        let session = self.session.as_mut();
        let session = session.context("scan_folders(): IMAP No Connection established")?;
        let folders: Vec<_> = session.list(Some(""), Some("*")).await?.collect().await;
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -51,7 +51,6 @@ pub mod contact;
 pub mod context;
 mod e2ee;
 pub mod ephemeral;
-pub mod export_chat;
 mod imap;
 pub mod imex;
 mod scheduler;
--- a/src/location.rs
+++ b/src/location.rs
@@ -16,8 +16,9 @@ use crate::message::{Message, MsgId};
 use crate::mimeparser::SystemMessage;
 use crate::param::Params;
 use crate::stock_str;
-use serde::Serialize;
-#[derive(Debug, Clone, Default, Serialize)]
+
+/// Location record
+#[derive(Debug, Clone, Default)]
 pub struct Location {
    pub location_id: u32,
    pub latitude: f64,
--- a/src/mimeparser.rs
+++ b/src/mimeparser.rs
@@ -1585,7 +1585,7 @@ fn get_attachment_filename(
 /// Returned addresses are normalized and lowercased.
 pub(crate) fn get_recipients(headers: &[MailHeader]) -> Vec<SingleInfo> {
    get_all_addresses_from_header(headers, |header_key| {
-        header_key == "to" || header_key == "cc"
+        header_key == "to" || header_key == "cc" || header_key == "bcc"
    })
 }

--- a/src/qr.rs
+++ b/src/qr.rs
@@ -113,6 +113,7 @@ async fn decode_openpgp(context: &Context, qr: &str) -> Lot {
        None
    };

+    // what is up with that param name?
    let name = if let Some(encoded_name) = param.get("n") {
        let encoded_name = encoded_name.replace("+", "%20"); // sometimes spaces are encoded as `+`
        match percent_decode_str(&encoded_name).decode_utf8() {
Author	SHA1	Message	Date
holger krekel	a7835ae2d0	some real tests	2021-05-12 19:07:47 +02:00
holger krekel	9f988f68a1	starting on provider tests, two basic tests pass for me on a three provider file	2021-05-12 19:07:47 +02:00