add a test for failing e2e encryption and some info statement to hunt where the e2e encryption failure comes from

ci_scripts/ci_run.sh

@@ -16,7 +16,7 @@ export BRANCH=${CIRCLE_BRANCH:-test7}
 #fi
 
 # run everything else inside docker (TESTS, DOCS, WHEELS) 
-docker run -e DCC_PY_LIVECONFIG -e BRANCH -e TESTS -e DOCS \
+docker run -e BRANCH -e TESTS -e DOCS \
            --rm -it -v $(pwd):/mnt -w /mnt \
            deltachat/coredeps ci_scripts/run_all.sh
 

ci_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 nightly-2019-07-10 -y
+curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2019-04-19 -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/
+rm -rf /root/.rustup/toolchains/nightly-2019-04-19-x86_64-unknown-linux-gnu/share/

ci_scripts/run_all.sh

@@ -37,10 +37,6 @@ if [ -n "$TESTS" ]; then
     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
     popd
 fi

deltachat-ffi/src/lib.rs

@@ -44,14 +44,11 @@ pub unsafe extern "C" fn dc_context_new(
     Box::into_raw(Box::new(ctx))
 }
 
-/// Release the context structure.
-///
-/// This function releases the memory of the `dc_context_t` structure.
 #[no_mangle]
 pub unsafe extern "C" fn dc_context_unref(context: *mut dc_context_t) {
     assert!(!context.is_null());
     let context = &mut *context;
-    context::dc_close(context);
+    context::dc_context_unref(context);
     Box::from_raw(context);
 }
 
@@ -864,12 +861,7 @@ pub unsafe extern "C" fn dc_get_contact_encrinfo(
     assert!(!context.is_null());
     let context = &*context;
 
-    Contact::get_encrinfo(context, contact_id)
-        .map(|s| s.strdup())
-        .unwrap_or_else(|e| {
-            error!(context, 0, "{}", e);
-            std::ptr::null_mut()
-        })
+    Contact::get_encrinfo(context, contact_id).strdup()
 }
 
 #[no_mangle]

examples/repl/cmdline.rs

@@ -1091,7 +1091,7 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
 
             let mut res = format!("Contact info for: {}:\n\n", name_n_addr);
 
-            res += &Contact::get_encrinfo(context, contact_id)?;
+            res += &Contact::get_encrinfo(context, contact_id);
 
             let chatlist = Chatlist::try_load(context, 0, None, Some(contact_id))?;
             let chatlist_cnt = chatlist.len();

examples/repl/main.rs

@@ -456,6 +456,12 @@ fn main_0(args: Vec<String>) -> Result<(), failure::Error> {
     println!("history saved");
     {
         stop_threads(&ctx.read().unwrap());
+
+        unsafe {
+            let mut ctx = ctx.write().unwrap();
+            dc_close(&mut ctx);
+            dc_context_unref(&mut ctx);
+        }
     }
 
     Ok(())

python/README.rst

@@ -15,7 +15,7 @@ without any "build-from-source" steps.
 1. `Install virtualenv <https://virtualenv.pypa.io/en/stable/installation/>`_,
    then create a fresh python environment and activate it in your shell::
 
-        virtualenv venv  # or: python -m venv
+        virtualenv -p python3 venv
         source venv/bin/activate
 
    Afterwards, invoking ``python`` or ``pip install`` will only
@@ -39,12 +39,6 @@ and push them to a python package index. To install the latest github ``master``
 
     pip install -i https://m.devpi.net/dc/master deltachat
 
-.. note::
-
-    If you can help to automate the building of wheels for Mac or Windows,
-    that'd be much appreciated! please then get
-    `in contact with us <https://delta.chat/en/contribute>`_.
-
 
 Installing bindings from source
 ===============================
@@ -54,55 +48,34 @@ to core deltachat library::
 
     git clone https://github.com/deltachat/deltachat-core-rust
     cd deltachat-core-rust
+    cargo build -p deltachat_ffi --release
+
+This will result in a ``libdeltachat.so`` and ``libdeltachat.a`` files
+in the ``target/release`` directory. These files are needed for
+creating the python bindings for deltachat::
+
     cd python
+    DCC_RS_DEV=`pwd`/.. pip install -e .
 
-If you don't have one active, create and activate a python "virtualenv":
+Now test if the bindings find the correct library::
 
-    python virtualenv venv  # or python -m venv
-    source venv/bin/activate
+    python -c 'import deltachat ; print(deltachat.__version__)'
 
-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
-
-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
-which is prohibitively slow in debug mode.
-
-After succcessul binding installation you can finally run the tests::
-
-    pytest -v tests
+This should print your deltachat bindings version.
 
 .. note::
 
-    Some tests are sometimes failing/hanging because of
-    https://github.com/deltachat/deltachat-core-rust/issues/331
-    and
-    https://github.com/deltachat/deltachat-core-rust/issues/326
+    If you can help to automate the building of wheels for Mac or Windows,
+    that'd be much appreciated! please then get
+    `in contact with us <https://delta.chat/en/contribute>`_.
 
+Using a system-installed deltachat-core-rust
+--------------------------------------------
 
-running "live" tests (experimental)
------------------------------------
-
-If you want to run "liveconfig" functional tests you can set
-``DCC_PY_LIVECONFIG`` to:
-
-- a particular https-url that you can ask for from the delta
-  chat devs.
-
-- or the path of a file that contains two lines, each describing
-  via "addr=... mail_pwd=..." a test account login that will
-  be used for the live tests.
-
-With ``DCC_PY_LIVECONFIG`` set pytest invocations will use real
-e-mail accounts and run through all functional "liveconfig" tests.
-
+When calling ``pip`` without specifying the ``DCC_RS_DEV`` environment
+variable cffi will try to use a ``deltachat.h`` from a system location
+like ``/usr/local/include`` and will try to dynamically link against a
+``libdeltachat.so`` in a similar location (e.g. ``/usr/local/lib``).
 
 
 Code examples
@@ -111,34 +84,68 @@ Code examples
 You may look at `examples <https://py.delta.chat/examples.html>`_.
 
 
+Running tests
+=============
+
+Get a checkout of the `deltachat-core-rust github repository`_ and type::
+
+    pip install tox
+    ./run-integration-tests.sh
+
+If you want to run functional tests with real
+e-mail test accounts, generate a "liveconfig" file where each
+lines contains test account settings, for example::
+
+    # 'liveconfig' file specifying imap/smtp accounts
+    addr=some-email@example.org mail_pw=password
+    addr=other-email@example.org mail_pw=otherpassword
+
+The "keyword=value" style allows to specify any
+`deltachat account config setting <https://c.delta.chat/classdc__context__t.html#aff3b894f6cfca46cab5248fdffdf083d>`_ so you can also specify smtp or imap servers, ports, ssl modes etc.
+Typically DC's automatic configuration allows to not specify these settings.
+
+The ``run-integration-tests.sh`` script will automatically use
+``python/liveconfig`` if it exists, to manually run tests with this
+``liveconfig`` file use::
+
+    tox -- --liveconfig liveconfig
+
+
 .. _`deltachat-core-rust github repository`: https://github.com/deltachat/deltachat-core-rust
 .. _`deltachat-core`: https://github.com/deltachat/deltachat-core-rust
 
+Running test using a debug build
+--------------------------------
+
+If you need to examine e.g. a coredump you may want to run the tests
+using a debug build::
+
+   DCC_RS_TARGET=debug ./run-integration-tests.sh -e py37 -- -x -v -k failing_test
+
 
 Building manylinux1 wheels
 ==========================
 
-.. note::
-
-   This section may not fully work.
-
 Building portable manylinux1 wheels which come with libdeltachat.so
 and all it's dependencies is easy using the provided docker tooling.
 
 using docker pull / premade images
 ------------------------------------
 
-We publish a build environment under the ``deltachat/coredeps`` tag so
+We publish a build environment under the ``deltachat/wheel`` tag so
 that you can pull it from the ``hub.docker.com`` site's "deltachat"
 organization::
 
-    $ docker pull deltachat/coredeps
+    $ docker pull deltachat/wheel
 
-This docker image can be used to run tests and build Python wheels for all interpreters::
+The ``deltachat/wheel`` image can be used to build both libdeltachat.so
+and the Python wheels::
 
-    $ bash ci_scripts/ci_run.sh
+    $ docker run --rm -it -v $(pwd):/io/ deltachat/wheel /io/python/wheelbuilder/build-wheels.sh
 
-This command runs tests and build-wheel scripts in a docker container.
+This command runs a script within the image, after mounting ``$(pwd)`` as ``/io`` within
+the docker image.  The script is specified as a path within the docker image's filesystem.
+The resulting wheel files will be in ``python/wheelhouse``.
 
 
 Optionally build your own docker image
@@ -147,10 +154,10 @@ Optionally build your own docker image
 If you want to build your own custom docker image you can do this::
 
    $ cd deltachat-core # cd to deltachat-core checkout directory
-   $ docker build -t deltachat/coredeps ci_scripts/docker_coredeps
+   $ docker build -t deltachat/wheel python/wheelbuilder/
 
-This will use the ``ci_scripts/docker_coredeps/Dockerfile`` to build
-up docker image called ``deltachat/coredeps``.  You can afterwards
+This will use the ``python/wheelbuilder/Dockerfile`` to build
+up docker image called ``deltachat/wheel``.  You can afterwards
 find it with::
 
    $ docker images

python/install_python_bindings.py

@@ -6,18 +6,29 @@
 
 import os
 import subprocess
-import os
 
 if __name__ == "__main__":
     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
 
-    os.environ["RUSTFLAGS"] = "-g"
-    subprocess.check_call([
-        "cargo", "build", "-p", "deltachat_ffi", "--" + target
-    ])
+    toml = os.path.join(os.getcwd(), "..", "Cargo.toml")
+    assert os.path.exists(toml)
+    with open(toml) as f:
+        s = orig = f.read()
+    s += "\n"
+    s += "[profile.release]\n"
+    s += "debug = true\n"
+    with open(toml, "w") as f:
+        f.write(s)
+    print("temporarily modifying Cargo.toml to provide release build with debug symbols ")
+    try:
+        subprocess.check_call([
+            "cargo", "build", "-p", "deltachat_ffi", "--" + target
+        ])
+    finally:
+        with open(toml, "w") as f:
+            f.write(orig)
+        print("\nreseted Cargo.toml to previous original state")
+
     subprocess.check_call("rm -rf build/ src/deltachat/*.so" , shell=True)
 
     subprocess.check_call([

python/src/deltachat/_build.py

@@ -6,15 +6,10 @@ import platform
 import os
 import cffi
 import shutil
-from os.path import dirname as dn
-from os.path import abspath
 
 
 def ffibuilder():
     projdir = os.environ.get('DCC_RS_DEV')
-    if not projdir:
-        p = dn(dn(dn(dn(abspath(__file__)))))
-        projdir = os.environ["DCC_RS_DEV"] = p
     target = os.environ.get('DCC_RS_TARGET', 'release')
     if projdir:
         if platform.system() == 'Darwin':

python/src/deltachat/account.py

@@ -50,9 +50,8 @@ class Account(object):
         self._configkeys = self.get_config("sys.config_keys").split()
         self._imex_completed = threading.Event()
 
-    # XXX this can cause "illegal instructions" at test ends so we omit it for now
-    # def __del__(self):
-    #    self.shutdown()
+    def __del__(self):
+        self.shutdown()
 
     def _check_config_key(self, name):
         if name not in self._configkeys:

python/tests/conftest.py

@@ -1,9 +1,9 @@
 from __future__ import print_function
 import os
 import pytest
-import requests
 import time
 from deltachat import Account
+from deltachat import props
 from deltachat.capi import lib
 import tempfile
 
@@ -36,8 +36,6 @@ def pytest_runtest_call(item):
 
 
 def pytest_report_header(config, startdir):
-    summary = []
-
     t = tempfile.mktemp()
     try:
         ac = Account(t, eventlogging=False)
@@ -45,18 +43,13 @@ def pytest_report_header(config, startdir):
         ac.shutdown()
     finally:
         os.remove(t)
-    summary.extend(['Deltachat core={} sqlite={}'.format(
+    summary = ['Deltachat core={} sqlite={}'.format(
          info['deltachat_core_version'],
          info['sqlite_version'],
-     )])
-
-    cfg = config.option.liveconfig
+     )]
+    cfg = config.getoption('--liveconfig')
     if cfg:
-        if "#" in cfg:
-            url, token = cfg.split("#", 1)
-            summary.append('Liveconfig provider: {}#<token ommitted>'.format(url))
-        else:
-            summary.append('Liveconfig file: {}'.format(cfg))
+        summary.append('Liveconfig: {}'.format(os.path.abspath(cfg)))
     return summary
 
 
@@ -73,56 +66,9 @@ def data():
     return Data()
 
 
-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)
-
-    def get(self, index):
-        return self.configlist[index]
-
-    def exists(self):
-        return bool(self.configlist)
-
-
-class SessionLiveConfigFromURL:
-    def __init__(self, url, create_token):
-        self.configlist = []
-        for i in range(2):
-            res = requests.post(url, json={"token_create_user": int(create_token)})
-            if res.status_code != 200:
-                pytest.skip("creating newtmpuser failed {!r}".format(res))
-            d = res.json()
-            config = dict(addr=d["email"], mail_pw=d["password"])
-            self.configlist.append(config)
-
-    def get(self, index):
-        return self.configlist[index]
-
-    def exists(self):
-        return bool(self.configlist)
-
-
-@pytest.fixture(scope="session")
-def session_liveconfig(request):
-    liveconfig_opt = request.config.option.liveconfig
-    if liveconfig_opt:
-        if liveconfig_opt.startswith("http"):
-            url, create_token = liveconfig_opt.split("#", 1)
-            return SessionLiveConfigFromURL(url, create_token)
-        else:
-            return SessionLiveConfigFromFile(liveconfig_opt)
-
-
 @pytest.fixture
-def acfactory(pytestconfig, tmpdir, request, session_liveconfig):
+def acfactory(pytestconfig, tmpdir, request):
+    fn = pytestconfig.getoption("--liveconfig")
 
     class AccountMaker:
         def __init__(self):
@@ -136,6 +82,18 @@ def acfactory(pytestconfig, tmpdir, request, session_liveconfig):
                 fin = self._finalizers.pop()
                 fin()
 
+        @props.cached
+        def configlist(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
+                    configlist.append(d)
+            return configlist
+
         def get_unconfigured_account(self):
             self.offline_count += 1
             tmpdb = tmpdir.join("offlinedb%d" % self.offline_count)
@@ -158,10 +116,10 @@ def acfactory(pytestconfig, tmpdir, request, session_liveconfig):
             return ac
 
         def get_online_configuring_account(self):
-            if not session_liveconfig:
-                pytest.skip("specify DCC_PY_LIVECONFIG or --liveconfig")
-            configdict = session_liveconfig.get(self.live_count)
+            if not fn:
+                pytest.skip("specify a --liveconfig file to run tests with real accounts")
             self.live_count += 1
+            configdict = self.configlist.pop(0)
             if "e2ee_enabled" not in configdict:
                 configdict["e2ee_enabled"] = "1"
             tmpdb = tmpdir.join("livedb%d" % self.live_count)

python/tox.ini

@@ -19,7 +19,6 @@ deps =
     pytest
     pytest-faulthandler
     pdbpp
-    requests
 
 [testenv:auditwheels]
 skipsdist = True
@@ -52,7 +51,6 @@ commands =
 
 
 [pytest]
-addopts = -v -rs
 python_files = tests/test_*.py 
 norecursedirs = .tox 
 xfail_strict=true

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" ]; then
     export DCC_PY_LIVECONFIG=liveconfig
 fi
 tox "$@"

src/constants.rs

@@ -6,29 +6,10 @@ use rusqlite::types::*;
 
 pub const DC_VERSION_STR: &'static [u8; 14] = b"1.0.0-alpha.3\x00";
 
-#[repr(u8)]
-#[derive(Debug, Display, Clone, Copy, PartialEq, Eq, FromPrimitive, ToPrimitive)]
-pub enum MoveState {
-    Undefined = 0,
-    Pending = 1,
-    Stay = 2,
-    Moving = 3,
-}
-
-impl ToSql for MoveState {
-    fn to_sql(&self) -> sql::Result<ToSqlOutput> {
-        let num = *self as i64;
-
-        Ok(ToSqlOutput::Owned(Value::Integer(num)))
-    }
-}
-
-impl FromSql for MoveState {
-    fn column_result(col: ValueRef) -> FromSqlResult<Self> {
-        let inner = FromSql::column_result(col)?;
-        FromPrimitive::from_i64(inner).ok_or(FromSqlError::InvalidType)
-    }
-}
+pub const DC_MOVE_STATE_MOVING: u32 = 3;
+pub const DC_MOVE_STATE_STAY: u32 = 2;
+pub const DC_MOVE_STATE_PENDING: u32 = 1;
+pub const DC_MOVE_STATE_UNDEFINED: u32 = 0;
 
 pub const DC_GCL_ARCHIVED_ONLY: usize = 0x01;
 pub const DC_GCL_NO_SPECIALS: usize = 0x02;

src/contact.rs

@@ -584,12 +584,7 @@ impl<'a> Contact<'a> {
             .unwrap_or_else(|_| std::ptr::null_mut())
     }
 
-    /// Returns a textual summary of the encryption state for the contact.
-    ///
-    /// This function returns a string explaining the encryption state
-    /// of the contact and if the connection is encrypted the
-    /// fingerprints of the keys involved.
-    pub fn get_encrinfo(context: &Context, contact_id: u32) -> Result<String> {
+    pub fn get_encrinfo(context: &Context, contact_id: u32) -> String {
         let mut ret = String::new();
 
         if let Ok(contact) = Contact::load_from_db(context, contact_id) {
@@ -608,7 +603,7 @@ impl<'a> Contact<'a> {
                     });
                 ret += &p;
                 if self_key.is_none() {
-                    dc_ensure_secret_key_exists(context)?;
+                    unsafe { dc_ensure_secret_key_exists(context) };
                     self_key = Key::from_self_public(context, &loginparam.addr, &context.sql);
                 }
                 let p = context.stock_str(StockMessage::FingerPrints);
@@ -651,7 +646,7 @@ impl<'a> Contact<'a> {
             }
         }
 
-        Ok(ret)
+        ret
     }
 
     /// Delete a contact. The contact is deleted from the local device. It may happen that this is not

src/context.rs

@@ -20,6 +20,7 @@ use crate::sql::Sql;
 use crate::types::*;
 use crate::x::*;
 
+#[repr(C)]
 pub struct Context {
     pub userdata: *mut libc::c_void,
     pub dbfile: Arc<RwLock<*mut libc::c_char>>,
@@ -76,14 +77,6 @@ impl Context {
     }
 }
 
-impl Drop for Context {
-    fn drop(&mut self) {
-        unsafe {
-            dc_close(&self);
-        }
-    }
-}
-
 impl Default for RunningState {
     fn default() -> Self {
         RunningState {
@@ -172,6 +165,16 @@ pub fn dc_context_new(
     }
 }
 
+#[cfg(test)]
+mod tests {
+    use super::*;
+    #[test]
+    fn no_crashes_on_context_deref() {
+        let mut ctx = dc_context_new(None, std::ptr::null_mut(), Some("Test OS".into()));
+        unsafe { dc_context_unref(&mut ctx) };
+    }
+}
+
 unsafe fn cb_receive_imf(
     context: &Context,
     imf_raw_not_terminated: *const libc::c_char,
@@ -226,7 +229,7 @@ unsafe fn cb_precheck_imf(
                 "[move] detected moved message {}",
                 as_str(rfc724_mid),
             );
-            dc_update_msg_move_state(context, rfc724_mid, MoveState::Stay);
+            dc_update_msg_move_state(context, rfc724_mid, DC_MOVE_STATE_STAY);
         }
         if as_str(old_server_folder) != server_folder || old_server_uid != server_uid {
             dc_update_server_uid(context, rfc724_mid, server_folder, server_uid);
@@ -255,6 +258,12 @@ fn cb_get_config(context: &Context, key: &str) -> Option<String> {
     context.sql.get_config(context, key)
 }
 
+pub unsafe fn dc_context_unref(context: &mut Context) {
+    if 0 != dc_is_open(context) {
+        dc_close(context);
+    }
+}
+
 pub unsafe fn dc_close(context: &Context) {
     info!(context, 0, "disconnecting INBOX-watch",);
     context.inbox.read().unwrap().disconnect(context);
@@ -582,24 +591,3 @@ pub fn dc_is_mvbox(context: &Context, folder_name: impl AsRef<str>) -> bool {
         false
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn no_crashes_on_context_deref() {
-        let ctx = dc_context_new(None, std::ptr::null_mut(), Some("Test OS".into()));
-        std::mem::drop(ctx);
-    }
-
-    #[test]
-    fn test_context_double_close() {
-        let ctx = dc_context_new(None, std::ptr::null_mut(), None);
-        unsafe {
-            dc_close(&ctx);
-            dc_close(&ctx);
-        }
-        std::mem::drop(ctx);
-    }
-}

src/dc_configure.rs

@@ -101,7 +101,7 @@ pub fn dc_stop_ongoing_process(context: &Context) {
 }
 
 // the other dc_job_do_DC_JOB_*() functions are declared static in the c-file
-#[allow(non_snake_case, unused_must_use)]
+#[allow(non_snake_case)]
 pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context, _job: *mut dc_job_t) {
     let flags: libc::c_int;
     let mut current_block: u64;

src/dc_e2ee.rs

@@ -16,12 +16,10 @@ use mmime::mmapstring::*;
 use mmime::{mailmime_substitute, MAILIMF_NO_ERROR, MAIL_NO_ERROR};
 
 use crate::aheader::*;
-use crate::config::Config;
 use crate::context::Context;
 use crate::dc_mimeparser::*;
 use crate::dc_securejoin::*;
 use crate::dc_tools::*;
-use crate::error::*;
 use crate::key::*;
 use crate::keyring::*;
 use crate::peerstate::*;
@@ -78,6 +76,11 @@ pub unsafe fn dc_e2ee_encrypt(
     let mut peerstates: Vec<Peerstate> = Vec::new();
     *helper = Default::default();
 
+    info!(
+        context,
+        0, "dc_e2ee_encrypt guaruanteed={}", e2ee_guaranteed
+    );
+
     if !(recipients_addr.is_null()
         || in_out_message.is_null()
         || !(*in_out_message).mm_parent.is_null()
@@ -108,6 +111,10 @@ pub unsafe fn dc_e2ee_encrypt(
                     iter1 = (*recipients_addr).first;
                     while !iter1.is_null() {
                         let recipient_addr = to_string((*iter1).data as *const libc::c_char);
+                        info!(
+                            context,
+                            0, "dc_e2ee_encrypt recipient_addr {}", recipient_addr
+                        );
                         if recipient_addr != addr {
                             let peerstate =
                                 Peerstate::from_addr(context, &context.sql, &recipient_addr);
@@ -587,6 +594,7 @@ pub unsafe fn dc_e2ee_decrypt(
                 }
             } else if let Some(ref header) = autocryptheader {
                 let p = Peerstate::from_header(context, header, message_time);
+                info!(context, 0, "setting peerstate from header for {:?}", p.addr);
                 assert!(p.save_to_db(&context.sql, true));
                 peerstate = Some(p);
             }
@@ -1047,53 +1055,33 @@ pub unsafe fn dc_e2ee_thanks(helper: &mut dc_e2ee_helper_t) {
     helper.cdata_to_free = 0 as *mut libc::c_void;
 }
 
-/// Ensures a private key exists for the configured user.
-///
-/// Normally the private key is generated when the first message is
-/// sent (allowing the use of some extra random seed from the message
-/// content) 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 dc_ensure_secret_key_exists(context: &Context) -> Result<String> {
-    let self_addr = context
-        .get_config(Config::ConfiguredAddr)
-        .ok_or(format_err!(concat!(
-            "Failed to get self address, ",
-            "cannot ensure secret key if not configured."
-        )))?;
-    unsafe {
-        load_or_generate_self_public_key(context, &self_addr, 0 as *mut mailmime)
-            .ok_or(format_err!("Failed to generate private key."))?;
+/* makes sure, the private key exists, needed only for exporting keys and the case no message was sent before */
+// TODO should return bool /rtn
+pub unsafe fn dc_ensure_secret_key_exists(context: &Context) -> libc::c_int {
+    /* normally, the key is generated as soon as the first mail is send
+    (this is to gain some extra-random-seed by the message content and the timespan between program start and message sending) */
+    let mut success: libc::c_int = 0i32;
+
+    let self_addr = context.sql.get_config(context, "configured_addr");
+    if self_addr.is_none() {
+        warn!(
+            context,
+            0, "Cannot ensure secret key if context is not configured.",
+        );
+    } else if load_or_generate_self_public_key(context, self_addr.unwrap(), 0 as *mut mailmime)
+        .is_some()
+    {
+        /*no random text data for seeding available*/
+        success = 1;
     }
-    Ok(self_addr)
+
+    success
 }
 
 #[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!(dc_ensure_secret_key_exists(&t.ctx).unwrap(), test_addr);
-        }
-
-        #[test]
-        fn test_not_configured() {
-            let t = dummy_context();
-            assert!(dc_ensure_secret_key_exists(&t.ctx).is_err());
-        }
-    }
-
     #[test]
     fn test_mailmime_parse() {
         let plain = b"Chat-Disposition-Notification-To: holger@deltachat.de

src/dc_imex.rs

@@ -194,15 +194,20 @@ pub unsafe fn dc_initiate_key_transfer(context: &Context) -> *mut libc::c_char {
     setup_code.strdup()
 }
 
-/// Renders HTML body of a setup file message.
-///
-/// The `passphrase` must be at least 2 characters long.
 pub fn dc_render_setup_file(context: &Context, passphrase: &str) -> Result<String> {
     ensure!(
         passphrase.len() >= 2,
         "Passphrase must be at least 2 chars long."
     );
-    let self_addr = dc_ensure_secret_key_exists(context)?;
+    unsafe {
+        ensure!(
+            !(dc_ensure_secret_key_exists(context) == 0),
+            "No secret key available."
+        );
+    }
+    let self_addr = context
+        .get_config(Config::ConfiguredAddr)
+        .ok_or(format_err!("Failed to get self address."))?;
     let private_key = Key::from_self_private(context, self_addr, &context.sql)
         .ok_or(format_err!("Failed to get private key."))?;
     let ac_headers = match context
@@ -529,7 +534,7 @@ pub unsafe fn dc_job_do_DC_JOB_IMEX_IMAP(context: &Context, job: *mut dc_job_t)
             } else {
                 if what == 1 || what == 11 {
                     /* before we export anything, make sure the private key exists */
-                    if dc_ensure_secret_key_exists(context).is_err() {
+                    if 0 == dc_ensure_secret_key_exists(context) {
                         error!(
                             context,
                             0,
@@ -1279,15 +1284,147 @@ unsafe fn export_key_to_asc_file(
 mod tests {
     use super::*;
 
+    use std::ffi::CStr;
+
     use num_traits::ToPrimitive;
 
+    use crate::config::Config;
+    use crate::key;
     use crate::test_utils::*;
 
+    unsafe extern "C" fn logging_cb(
+        _ctx: &Context,
+        evt: Event,
+        _d1: uintptr_t,
+        d2: uintptr_t,
+    ) -> uintptr_t {
+        let to_str = |x| CStr::from_ptr(x as *const libc::c_char).to_str().unwrap();
+        match evt {
+            Event::INFO => println!("I: {}", to_str(d2)),
+            Event::WARNING => println!("W: {}", to_str(d2)),
+            Event::ERROR => println!("E: {}", to_str(d2)),
+            _ => (),
+        }
+        0
+    }
+
+    /// Create Alice with a pre-generated keypair.
+    fn create_alice_keypair(ctx: &Context) {
+        ctx.set_config(Config::ConfiguredAddr, Some("alice@example.org"))
+            .unwrap();
+
+        // The keypair was created using:
+        //   let (public, private) = crate::pgp::dc_pgp_create_keypair("alice@example.com")
+        //       .unwrap();
+        //   println!("{}", public.to_base64(64));
+        //   println!("{}", private.to_base64(64));
+        let public = key::Key::from_base64(
+            concat!(
+                "xsBNBF086ewBCACmJKuoxIO6T87yi4Q3MyNpMch3Y8KrtHDQyUszU36eqM3Pmd1l",
+                "FrbcCd8ZWo2pq6OJSwsM/jjRGn1zo2YOaQeJRRrC+KrKGqSUtRSYQBPrPjE2YjSX",
+                "AMbu8jBI6VVUhHeghriBkK79PY9O/oRhIJC0p14IJe6CQ6OI2fTmTUHF9i/nJ3G4",
+                "Wb3/K1bU3yVfyPZjTZQPYPvvh03vxHULKurtYkX5DTEMSWsF4qzLMps+l87VuLV9",
+                "iQnbN7YMRLHHx2KkX5Ivi7JCefhCa54M0K3bDCCxuVWAM5wjQwNZjzR+WL+dYchw",
+                "oFvuF8NrlzjM9dSv+2rn+J7f99ijSXarzPC7ABEBAAHNEzxhbGljZUBleGFtcGxl",
+                "LmNvbT7CwIkEEAEIADMCGQEFAl086fgCGwMECwkIBwYVCAkKCwIDFgIBFiEE+iai",
+                "x4d0doj87Q0ek6DcNkbrcegACgkQk6DcNkbrcei3ogf/cruUmQ+th52TFHTHdkw9",
+                "OHUl3MrXtZ7QmHyOAFvbXE/6n5Eeh+eZoF8MWWV72m14Wbs+vTcNQkFVTdOPptkK",
+                "A8e4cJqwDOHsyAnvQXZ7WNje9+BMzcoipIUawHP4ORFaPDsKLZQ0b4wBbKn8ziea",
+                "6zjGF0/qljTdoxTtsYpv5wXYuhwbYklrLOqgSa5M7LXUe7E3g9mbg+9iX1GuB8m6",
+                "GkquJN814Y+xny4xhZzGOfue6SeP12jJMNSjSP7416dRq7794VGnkkW9V/7oFEUK",
+                "u5wO9FFbgDySOSlEjByGejSGuBmho0iJSjcPjZ7EY/j3M3orq4dpza5C82OeSvxD",
+                "Fc7ATQRdPOnsAQgA5oLxXRLnyugzOmNCy7dxV3JrDZscA6JNlJlDWIShT0YSs+zG",
+                "9JzDeQql+sYXgUSxOoIayItuXtnFn7tstwGoOnYvadm/e5/7V5fKAQRtCtdN51av",
+                "62n18Venlm0yNKpROPcZ6M/sc4m6uU6YRZ/a1idal8VGY0wLKlghjIBuIiBoVQ/R",
+                "noW+/fhmwIg08dQ5m8hQe3GEOZEeLrTWL/9awPlXK7Y+DmJOoR4qbHWEcRfbzS6q",
+                "4zW8vk2ztB8ngwbnqYy8zrN1DCICN1gYdlU++uVw6Bb1XfY8Cdldh1VLKpF35mAm",
+                "jxLZfVDcoObFH3Cv2GB7BEYxv86KC2Y6T74Q/wARAQABwsB2BBgBCAAgBQJdPOn4",
+                "AhsMFiEE+iaix4d0doj87Q0ek6DcNkbrcegACgkQk6DcNkbrcegLxwf/dXshJnoW",
+                "qEnRsf6rVb9/Mc66ti+NVQLfNd275dybh/QIJdK3NmSxdnTPIEJRVspJywJoupwX",
+                "FNrnHG2Ff6QPvHqI+/oNu986r9d7Z1oQibbLHKt8t6kpOfg/xGxotagJuiCQvR9m",
+                "MjD1DqsdB37SjDxGupZOOJSXWi6KX60IE+uM+QOBfeOZziQwuFmA5wV6RDXIeYJf",
+                "qrcbeXeR1d0nfNpPHQR1gBiqmxNb6KBbdXD2+EXW60axC7D2b1APmzMlammDliPw",
+                "sK9U1rc9nuquEBvGDOJf4K+Dzn+mDCqRpP6uAuQ7RKHyim4uyN0wwKObzPqgJCGw",
+                "jTglkixw+aSTXw=="
+            ),
+            KeyType::Public,
+        )
+        .unwrap();
+        let private = key::Key::from_base64(
+            concat!(
+                "xcLYBF086ewBCACmJKuoxIO6T87yi4Q3MyNpMch3Y8KrtHDQyUszU36eqM3Pmd1l",
+                "FrbcCd8ZWo2pq6OJSwsM/jjRGn1zo2YOaQeJRRrC+KrKGqSUtRSYQBPrPjE2YjSX",
+                "AMbu8jBI6VVUhHeghriBkK79PY9O/oRhIJC0p14IJe6CQ6OI2fTmTUHF9i/nJ3G4",
+                "Wb3/K1bU3yVfyPZjTZQPYPvvh03vxHULKurtYkX5DTEMSWsF4qzLMps+l87VuLV9",
+                "iQnbN7YMRLHHx2KkX5Ivi7JCefhCa54M0K3bDCCxuVWAM5wjQwNZjzR+WL+dYchw",
+                "oFvuF8NrlzjM9dSv+2rn+J7f99ijSXarzPC7ABEBAAEACAChqzVOuErmVRqvcYtq",
+                "m1xt1H+ZjX20z5Sn1fhTLYAcq236AWMqJvwxCXoKlc8bt2UfB+Ls9cQb1YcVq353",
+                "r0QiExiDeK3YlCxqd/peXJwFYTNKFC3QcnUhtpG9oS/jWjN+BRotGbjtu6Vj3M68",
+                "JJAq+mHJ0/9OyrqrREvGfo7uLZt7iMGemDlrDakvrbIyZrPLgay+nZ3dEFKeOQ6F",
+                "FrU05jyUVdoHBy0Tqx/6VpFUX9+IHcMHL2lTJB0nynBj+XZ/G4aX3WYoo3YlixHb",
+                "Iu35fGFA0TChoGaGPzqcI/kg2Z+b/BryG9NM3LA2cO8iGrGXAE1nPFp91jmCrQ3V",
+                "WushBADERP+uojjjfdO5J+RkmcFe9mFYDdtkhN+kV+LdePjiNNtcXMBhasstio0S",
+                "ut0GKnE7DFRhX7mkN9w2apJ2ooeFeVVWot18eSdp6Rzh6/1Z7TmhYFJ3oUxxLbnQ",
+                "sWIXIec1SzqWBFJUCn3IP0mCnJktFg/uGW6yLs01r5ds52uSBQQA2LSWiTwk9tEm",
+                "dr9mz3tHnmrkyGiyKhKGM1Z7Rch63D5yQc1s4kUMBlyuLL2QtM/e4dtaz2JAkO8k",
+                "QrYCnNgJ+2roTAK3kDZgYtymjdvK3HpQNtjVo7dds5RJVb6U618phZwU5WNFAEJW",
+                "yyImmycGfjLv+18cW/3mq0QVZejkM78D/2kHaIeJAowtBOFY2zDrKyDRoBHaUSgj",
+                "5BjGoviRC5rYihWDEyYDQ6mBJQstAD0Ty3MYzyUxl6ruB/BMWnMDFq5+TqtdBzu3",
+                "jCtZ8OEyH8A5Kdo68Wzo/PGxzMtusOdNj9+3PBmSq4yibJxbLSrn59aVUYpGLjeG",
+                "Kyvm9OTKkrOGN27NEzxhbGljZUBleGFtcGxlLmNvbT7CwIkEEAEIADMCGQEFAl08",
+                "6fgCGwMECwkIBwYVCAkKCwIDFgIBFiEE+iaix4d0doj87Q0ek6DcNkbrcegACgkQ",
+                "k6DcNkbrcei3ogf/cruUmQ+th52TFHTHdkw9OHUl3MrXtZ7QmHyOAFvbXE/6n5Ee",
+                "h+eZoF8MWWV72m14Wbs+vTcNQkFVTdOPptkKA8e4cJqwDOHsyAnvQXZ7WNje9+BM",
+                "zcoipIUawHP4ORFaPDsKLZQ0b4wBbKn8ziea6zjGF0/qljTdoxTtsYpv5wXYuhwb",
+                "YklrLOqgSa5M7LXUe7E3g9mbg+9iX1GuB8m6GkquJN814Y+xny4xhZzGOfue6SeP",
+                "12jJMNSjSP7416dRq7794VGnkkW9V/7oFEUKu5wO9FFbgDySOSlEjByGejSGuBmh",
+                "o0iJSjcPjZ7EY/j3M3orq4dpza5C82OeSvxDFcfC2ARdPOnsAQgA5oLxXRLnyugz",
+                "OmNCy7dxV3JrDZscA6JNlJlDWIShT0YSs+zG9JzDeQql+sYXgUSxOoIayItuXtnF",
+                "n7tstwGoOnYvadm/e5/7V5fKAQRtCtdN51av62n18Venlm0yNKpROPcZ6M/sc4m6",
+                "uU6YRZ/a1idal8VGY0wLKlghjIBuIiBoVQ/RnoW+/fhmwIg08dQ5m8hQe3GEOZEe",
+                "LrTWL/9awPlXK7Y+DmJOoR4qbHWEcRfbzS6q4zW8vk2ztB8ngwbnqYy8zrN1DCIC",
+                "N1gYdlU++uVw6Bb1XfY8Cdldh1VLKpF35mAmjxLZfVDcoObFH3Cv2GB7BEYxv86K",
+                "C2Y6T74Q/wARAQABAAgAhSvFEYZoj1sSrXrHDjZOrryViGjCCH9t3pmkxLDrGIdd",
+                "KsFyN8ORUo6KUZS745yx3yFnI9EZ1IZvm9aF+jxk2lGJFtgLvfoxFOvGckwCSy8T",
+                "/MCiJZkz01hWo5s2VCLJheWL/GqTKjS5wXDcm+y8Wtilh+UawycdlDsSNr/D4MZL",
+                "j3Chq9K03l5UIR8DcC7SavNi55R2oGOfboXsdvwOlrNZdCkZOlXDI4ZKFwbDHCtp",
+                "Do5FS30hnJi2TecUPZWB1CaGFWnevINd4ikugVjcAoZj/QAIvfrOCgqisF/Ylg9u",
+                "RMUPBapmcJUueILwd0iQqvGG0aCqtchvSmlg15/lQQQA9G1NNjNAH+NQrXvDJFJe",
+                "/V1U3F3pz7jCjQa69c0dxSBUeNX1pG8XXD6tSkkd4Ni1mzZGcZXOmVUM6cA9I7RH",
+                "95RqV+QIfnXVneCRrlCjV8m6OBlkivkESXc3nW5wtCIfw7oKg9w1xuVNUaAlbCt9",
+                "QVLaxXJiY7ad0f5U9XJ1+w8EAPFs+M/+GZK1wOZYBL1vo7x0gL9ZggmjC4B+viBJ",
+                "8Q60mqTrphYFsbXHuwKV0g9aIoZMucKyEE0QLR7imttiLEz1nD8bfEScbGy9ZG//",
+                "wRfyJmCVAjA0pQ6LtB93d70PSVzzJrMHgbLKrDuSd6RChl7n9BIEdVyk7LEph0Yg",
+                "9UsRBADm6DvpKL+P3lQ0eLTfAgcQTOqLZDYmI3PvqqSkHb1kHChqOXXs8hGOSSwK",
+                "Gjcd4CZeNOGWR42rZyRhVgtkt6iYviIaVAWUfme6K+sLQBCeyMlmEGtykAA+LmPB",
+                "f4zdyUNADfoxgZF3EKHf6I3nlVn5cdT+o/9vjdY2XAOwcls1RzaFwsB2BBgBCAAg",
+                "BQJdPOn4AhsMFiEE+iaix4d0doj87Q0ek6DcNkbrcegACgkQk6DcNkbrcegLxwf/",
+                "dXshJnoWqEnRsf6rVb9/Mc66ti+NVQLfNd275dybh/QIJdK3NmSxdnTPIEJRVspJ",
+                "ywJoupwXFNrnHG2Ff6QPvHqI+/oNu986r9d7Z1oQibbLHKt8t6kpOfg/xGxotagJ",
+                "uiCQvR9mMjD1DqsdB37SjDxGupZOOJSXWi6KX60IE+uM+QOBfeOZziQwuFmA5wV6",
+                "RDXIeYJfqrcbeXeR1d0nfNpPHQR1gBiqmxNb6KBbdXD2+EXW60axC7D2b1APmzMl",
+                "ammDliPwsK9U1rc9nuquEBvGDOJf4K+Dzn+mDCqRpP6uAuQ7RKHyim4uyN0wwKOb",
+                "zPqgJCGwjTglkixw+aSTXw=="
+            ),
+            KeyType::Private,
+        )
+        .unwrap();
+        let saved = key::dc_key_save_self_keypair(
+            &ctx,
+            &public,
+            &private,
+            "alice@example.org",
+            1,
+            &ctx.sql,
+        );
+        assert_eq!(saved, true, "Failed to save Alice's key");
+    }
+
     #[test]
     fn test_render_setup_file() {
         let t = test_context(Some(logging_cb));
 
-        configure_alice_keypair(&t.ctx);
+        create_alice_keypair(&t.ctx); // Trick things to think we're configured.
         let msg = dc_render_setup_file(&t.ctx, "hello").unwrap();
         println!("{}", &msg);
         // Check some substrings, indicating things got substituted.
@@ -1319,7 +1456,7 @@ mod tests {
     #[test]
     fn test_render_setup_file_newline_replace() {
         let t = test_context(Some(ac_setup_msg_cb));
-        configure_alice_keypair(&t.ctx);
+        create_alice_keypair(&t.ctx);
         let msg = dc_render_setup_file(&t.ctx, "pw").unwrap();
         println!("{}", &msg);
         assert!(msg.contains("<p>hello<br>there</p>"));

src/dc_job.rs

@@ -447,7 +447,7 @@ unsafe fn dc_job_do_DC_JOB_MOVE_MSG(context: &Context, job: &mut dc_job_t) {
                 let dest_folder = context.sql.get_config(context, "configured_mvbox_folder");
 
                 if let Some(dest_folder) = dest_folder {
-                    let server_folder = (*msg).server_folder.as_ref().unwrap();
+                    let server_folder = as_str((*msg).server_folder);
 
                     match inbox.mv(
                         context,
@@ -582,7 +582,7 @@ unsafe fn dc_job_do_DC_JOB_MARKSEEN_MSG_ON_IMAP(context: &Context, job: &mut dc_
     match current_block {
         15240798224410183470 => {
             if dc_msg_load_from_db(msg, context, job.foreign_id) {
-                let server_folder = (*msg).server_folder.as_ref().unwrap();
+                let server_folder = CStr::from_ptr((*msg).server_folder).to_str().unwrap();
                 match inbox.set_seen(context, server_folder, (*msg).server_uid) as libc::c_uint {
                     0 => {}
                     1 => {
@@ -598,7 +598,8 @@ unsafe fn dc_job_do_DC_JOB_MARKSEEN_MSG_ON_IMAP(context: &Context, job: &mut dc_
                                         .get_config_int(context, "mdns_enabled")
                                         .unwrap_or_else(|| 1)
                                 {
-                                    let folder = (*msg).server_folder.as_ref().unwrap();
+                                    let folder =
+                                        CStr::from_ptr((*msg).server_folder).to_str().unwrap();
                                     match inbox.set_mdnsent(context, folder, (*msg).server_uid)
                                         as libc::c_uint
                                     {
@@ -651,7 +652,8 @@ unsafe fn dc_job_do_DC_JOB_MARKSEEN_MSG_ON_IMAP(context: &Context, job: &mut dc_
                                         .get_config_int(context, "mdns_enabled")
                                         .unwrap_or_else(|| 1)
                                 {
-                                    let folder = (*msg).server_folder.as_ref().unwrap();
+                                    let folder =
+                                        CStr::from_ptr((*msg).server_folder).to_str().unwrap();
 
                                     match inbox.set_mdnsent(context, folder, (*msg).server_uid)
                                         as libc::c_uint
@@ -896,7 +898,7 @@ unsafe fn dc_job_do_DC_JOB_DELETE_MSG_ON_IMAP(context: &Context, job: &mut dc_jo
                 8913536887710889399 => {}
                 _ => {
                     let mid = CStr::from_ptr((*msg).rfc724_mid).to_str().unwrap();
-                    let server_folder = (*msg).server_folder.as_ref().unwrap();
+                    let server_folder = CStr::from_ptr((*msg).server_folder).to_str().unwrap();
                     if 0 == inbox.delete_msg(context, mid, server_folder, &mut (*msg).server_uid) {
                         dc_job_try_again_later(job, -1i32, 0 as *const libc::c_char);
                         current_block = 8913536887710889399;

src/dc_lot.rs

@@ -6,6 +6,8 @@ use crate::dc_tools::*;
 use crate::stock::StockMessage;
 use crate::types::*;
 use crate::x::*;
+use std::ffi::CString;
+use std::ptr;
 
 /* * Structure behind dc_lot_t */
 #[derive(Copy, Clone)]
@@ -169,15 +171,14 @@ pub unsafe fn dc_lot_fill(
         }
     }
 
-    let message_text = (*msg).text.as_ref().unwrap();
+    let msgtext_c = (*msg)
+        .text
+        .as_ref()
+        .map(|s| CString::yolo(String::as_str(s)));
+    let msgtext_ptr = msgtext_c.map_or(ptr::null(), |s| s.as_ptr());
 
-    (*lot).text2 = dc_msg_get_summarytext_by_raw(
-        (*msg).type_0,
-        message_text.strdup(),
-        &mut (*msg).param,
-        160,
-        context,
-    );
+    (*lot).text2 =
+        dc_msg_get_summarytext_by_raw((*msg).type_0, msgtext_ptr, &mut (*msg).param, 160, context);
 
     (*lot).timestamp = dc_msg_get_timestamp(msg);
     (*lot).state = (*msg).state;

src/dc_mimefactory.rs

@@ -1041,6 +1041,11 @@ pub unsafe fn dc_mimefactory_render(mut factory: *mut dc_mimefactory_t) -> libc:
                     &mut e2ee_helper,
                 );
             }
+            info!(
+                (*factory).context,
+                0, "encryption successful {}", e2ee_helper.encryption_successfull
+            );
+
             if 0 != e2ee_helper.encryption_successfull {
                 (*factory).out_encrypted = 1;
                 if 0 != do_gossip {

src/dc_mimeparser.rs

@@ -1112,7 +1112,7 @@ unsafe fn dc_mimeparser_add_single_part_if_known(
     /* must not be free()'d */
     let mut decoded_data: *const libc::c_char = 0 as *const libc::c_char;
     let mut decoded_data_bytes = 0;
-    let mut simplifier: Option<Simplify> = None;
+    let mut simplifier: Option<dc_simplify_t> = None;
     if !(mime.is_null() || (*mime).mm_data.mm_single.is_null()) {
         mime_type = mailmime_get_mime_type(mime, &mut msg_type, &mut raw_mime);
         mime_data = (*mime).mm_data.mm_single;
@@ -1134,7 +1134,7 @@ unsafe fn dc_mimeparser_add_single_part_if_known(
                 match mime_type {
                     60 | 70 => {
                         if simplifier.is_none() {
-                            simplifier = Some(Simplify::new());
+                            simplifier = Some(dc_simplify_t::new());
                         }
                         /* get from `Content-Type: text/...; charset=utf-8`; must not be free()'d */
                         let charset = mailmime_content_charset_get((*mime).mm_content_type);
@@ -1192,7 +1192,7 @@ unsafe fn dc_mimeparser_add_single_part_if_known(
                                 let simplified_txt = simplifier.unwrap().simplify(
                                     decoded_data,
                                     decoded_data_bytes as libc::c_int,
-                                    mime_type == 70i32,
+                                    if mime_type == 70i32 { 1i32 } else { 0i32 },
                                     is_msgrmsg,
                                 );
                                 if !simplified_txt.is_null()
@@ -1208,7 +1208,7 @@ unsafe fn dc_mimeparser_add_single_part_if_known(
                                 } else {
                                     free(simplified_txt as *mut libc::c_void);
                                 }
-                                if simplifier.unwrap().is_forwarded {
+                                if 0 != simplifier.unwrap().is_forwarded {
                                     mimeparser.is_forwarded = 1i32
                                 }
                                 current_block = 10261677128829721533;

src/dc_move.rs

@@ -27,13 +27,13 @@ pub unsafe fn dc_do_heuristics_moves(context: &Context, folder: &str, msg_id: u3
     }
 
     if dc_is_mvbox(context, folder) {
-        dc_update_msg_move_state(context, (*msg).rfc724_mid, MoveState::Stay);
+        dc_update_msg_move_state(context, (*msg).rfc724_mid, DC_MOVE_STATE_STAY);
     }
 
     // 1 = dc message, 2 = reply to dc message
     if 0 != (*msg).is_dc_message {
         dc_job_add(context, 200, (*msg).id as libc::c_int, Params::new(), 0);
-        dc_update_msg_move_state(context, (*msg).rfc724_mid, MoveState::Moving);
+        dc_update_msg_move_state(context, (*msg).rfc724_mid, DC_MOVE_STATE_MOVING);
     }
 
     dc_msg_unref(msg);

src/dc_msg.rs

@@ -25,7 +25,7 @@ pub struct dc_msg_t<'a> {
     pub from_id: uint32_t,
     pub to_id: uint32_t,
     pub chat_id: uint32_t,
-    pub move_state: MoveState,
+    pub move_state: dc_move_state_t,
     pub type_0: Viewtype,
     pub state: libc::c_int,
     pub hidden: libc::c_int,
@@ -36,7 +36,7 @@ pub struct dc_msg_t<'a> {
     pub context: &'a Context,
     pub rfc724_mid: *mut libc::c_char,
     pub in_reply_to: *mut libc::c_char,
-    pub server_folder: Option<String>,
+    pub server_folder: *mut libc::c_char,
     pub server_uid: uint32_t,
     pub is_dc_message: libc::c_int,
     pub starred: libc::c_int,
@@ -196,10 +196,12 @@ pub unsafe fn dc_get_msg_info(context: &Context, msg_id: u32) -> *mut libc::c_ch
     if !(*msg).rfc724_mid.is_null() && 0 != *(*msg).rfc724_mid.offset(0) as libc::c_int {
         ret += &format!("\nMessage-ID: {}", (*msg).rfc724_mid as libc::c_int);
     }
-    if let Some(ref server_folder) = (*msg).server_folder {
-        if server_folder != "" {
-            ret += &format!("\nLast seen as: {}/{}", server_folder, (*msg).server_uid);
-        }
+    if !(*msg).server_folder.is_null() && 0 != *(*msg).server_folder.offset(0) as libc::c_int {
+        ret += &format!(
+            "\nLast seen as: {}/{}",
+            to_string((*msg).server_folder),
+            (*msg).server_uid as libc::c_int,
+        );
     }
 
     dc_msg_unref(msg);
@@ -227,7 +229,7 @@ pub unsafe fn dc_msg_new<'a>(context: &'a Context, viewtype: Viewtype) -> *mut d
         from_id: 0,
         to_id: 0,
         chat_id: 0,
-        move_state: MoveState::Undefined,
+        move_state: 0,
         type_0: viewtype,
         state: 0,
         hidden: 0,
@@ -238,7 +240,7 @@ pub unsafe fn dc_msg_new<'a>(context: &'a Context, viewtype: Viewtype) -> *mut d
         context,
         rfc724_mid: std::ptr::null_mut(),
         in_reply_to: std::ptr::null_mut(),
-        server_folder: None,
+        server_folder: std::ptr::null_mut(),
         server_uid: 0,
         is_dc_message: 0,
         starred: 0,
@@ -267,6 +269,8 @@ pub unsafe fn dc_msg_empty(mut msg: *mut dc_msg_t) {
     (*msg).rfc724_mid = 0 as *mut libc::c_char;
     free((*msg).in_reply_to as *mut libc::c_void);
     (*msg).in_reply_to = 0 as *mut libc::c_char;
+    free((*msg).server_folder as *mut libc::c_void);
+    (*msg).server_folder = 0 as *mut libc::c_char;
     (*msg).param = Params::new();
     (*msg).hidden = 0i32;
 }
@@ -456,7 +460,7 @@ pub fn dc_msg_load_from_db<'a>(msg: *mut dc_msg_t<'a>, context: &'a Context, id:
                     Some(s) => s.strdup(),
                     None => std::ptr::null_mut(),
                 };
-                (*msg).server_folder = row.get::<_, Option<String>>(3)?;
+                (*msg).server_folder = row.get::<_, String>(3)?.strdup();
                 (*msg).server_uid = row.get(4)?;
                 (*msg).move_state = row.get(5)?;
                 (*msg).chat_id = row.get(6)?;
@@ -782,7 +786,7 @@ pub unsafe fn dc_msg_get_summary<'a>(
     msg: *mut dc_msg_t<'a>,
     mut chat: *const Chat<'a>,
 ) -> *mut dc_lot_t {
-    let mut ok_to_continue = true;
+    let current_block: u64;
     let ret: *mut dc_lot_t = dc_lot_new();
     let mut chat_to_delete: *mut Chat = 0 as *mut Chat;
 
@@ -790,21 +794,27 @@ pub unsafe fn dc_msg_get_summary<'a>(
         if chat.is_null() {
             chat_to_delete = dc_get_chat((*msg).context, (*msg).chat_id);
             if chat_to_delete.is_null() {
-                ok_to_continue = false;
+                current_block = 15204159476013091401;
             } else {
                 chat = chat_to_delete;
+                current_block = 7815301370352969686;
             }
+        } else {
+            current_block = 7815301370352969686;
         }
-        if ok_to_continue {
-            let contact = if (*msg).from_id != DC_CONTACT_ID_SELF as libc::c_uint
-                && ((*chat).type_0 == 120 || (*chat).type_0 == 130)
-            {
-                Contact::get_by_id((*chat).context, (*msg).from_id).ok()
-            } else {
-                None
-            };
+        match current_block {
+            15204159476013091401 => {}
+            _ => {
+                let contact = if (*msg).from_id != DC_CONTACT_ID_SELF as libc::c_uint
+                    && ((*chat).type_0 == 120 || (*chat).type_0 == 130)
+                {
+                    Contact::get_by_id((*chat).context, (*msg).from_id).ok()
+                } else {
+                    None
+                };
 
-            dc_lot_fill(ret, msg, chat, contact.as_ref(), (*msg).context);
+                dc_lot_fill(ret, msg, chat, contact.as_ref(), (*msg).context);
+            }
         }
     }
 
@@ -1177,7 +1187,7 @@ pub unsafe fn dc_msg_exists(context: &Context, msg_id: uint32_t) -> libc::c_int
 pub fn dc_update_msg_move_state(
     context: &Context,
     rfc724_mid: *const libc::c_char,
-    state: MoveState,
+    state: dc_move_state_t,
 ) -> bool {
     // we update the move_state for all messages belonging to a given Message-ID
     // so that the state stay intact when parts are deleted

src/dc_securejoin.rs

@@ -42,7 +42,7 @@ pub unsafe fn dc_get_securejoin_qr(
     let mut group_name_urlencoded = 0 as *mut libc::c_char;
     let mut qr: Option<String> = None;
 
-    dc_ensure_secret_key_exists(context).ok();
+    dc_ensure_secret_key_exists(context);
     invitenumber = dc_token_lookup(context, DC_TOKEN_INVITENUMBER, group_chat_id);
     if invitenumber.is_null() {
         invitenumber = dc_create_id().strdup();
@@ -149,7 +149,7 @@ pub unsafe fn dc_join_securejoin(context: &Context, qr: *const libc::c_char) ->
     let mut join_vg: libc::c_int = 0i32;
     let mut qr_scan: *mut dc_lot_t = 0 as *mut dc_lot_t;
     info!(context, 0, "Requesting secure-join ...",);
-    dc_ensure_secret_key_exists(context).ok();
+    dc_ensure_secret_key_exists(context);
     ongoing_allocated = dc_alloc_ongoing(context);
     if !(ongoing_allocated == 0i32) {
         qr_scan = dc_check_qr(context, qr);

src/dc_simplify.rs

@@ -3,18 +3,19 @@ use crate::dc_tools::*;
 use crate::x::*;
 
 #[derive(Copy, Clone)]
-pub struct Simplify {
-    pub is_forwarded: bool,
-    pub is_cut_at_begin: bool,
-    pub is_cut_at_end: bool,
+#[repr(C)]
+pub struct dc_simplify_t {
+    pub is_forwarded: libc::c_int,
+    pub is_cut_at_begin: libc::c_int,
+    pub is_cut_at_end: libc::c_int,
 }
 
-impl Simplify {
+impl dc_simplify_t {
     pub fn new() -> Self {
-        Simplify {
-            is_forwarded: false,
-            is_cut_at_begin: false,
-            is_cut_at_end: false,
+        dc_simplify_t {
+            is_forwarded: 0,
+            is_cut_at_begin: 0,
+            is_cut_at_end: 0,
         }
     }
 
@@ -25,7 +26,7 @@ impl Simplify {
         &mut self,
         in_unterminated: *const libc::c_char,
         in_bytes: libc::c_int,
-        is_html: bool,
+        is_html: libc::c_int,
         is_msgrmsg: libc::c_int,
     ) -> *mut libc::c_char {
         if in_bytes <= 0 {
@@ -35,9 +36,9 @@ impl Simplify {
         /* 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;
+        self.is_forwarded = 0i32;
+        self.is_cut_at_begin = 0i32;
+        self.is_cut_at_end = 0i32;
         out = strndup(
             in_unterminated as *mut libc::c_char,
             in_bytes as libc::c_ulong,
@@ -45,7 +46,7 @@ impl Simplify {
         if out.is_null() {
             return dc_strdup(b"\x00" as *const u8 as *const libc::c_char);
         }
-        if is_html {
+        if 0 != is_html {
             temp = dc_dehtml(out);
             if !temp.is_null() {
                 free(out as *mut libc::c_void);
@@ -95,7 +96,7 @@ impl Simplify {
                 || strcmp(line, b"----\x00" as *const u8 as *const libc::c_char) == 0i32
             {
                 footer_mark = 1i32;
-                self.is_cut_at_end = true
+                self.is_cut_at_end = 1i32
             }
             if 0 != footer_mark {
                 l_last = l;
@@ -114,7 +115,7 @@ impl Simplify {
                 && strncmp(line1, b"From: \x00" as *const u8 as *const libc::c_char, 6) == 0i32
                 && *line2.offset(0isize) as libc::c_int == 0i32
             {
-                self.is_forwarded = true;
+                self.is_forwarded = 1i32;
                 l_first += 3
             }
         }
@@ -127,7 +128,7 @@ impl Simplify {
                 || strncmp(line, b"~~~~~\x00" as *const u8 as *const libc::c_char, 5) == 0i32
             {
                 l_last = l;
-                self.is_cut_at_end = true;
+                self.is_cut_at_end = 1i32;
                 /* done */
                 break;
             }
@@ -144,7 +145,7 @@ impl Simplify {
             }
             if l_lastQuotedLine.is_some() {
                 l_last = l_lastQuotedLine.unwrap();
-                self.is_cut_at_end = true;
+                self.is_cut_at_end = 1i32;
                 if l_last > 1 {
                     if is_empty_line(lines[l_last - 1]) {
                         l_last -= 1
@@ -179,12 +180,12 @@ impl Simplify {
             }
             if l_lastQuotedLine_0.is_some() {
                 l_first = l_lastQuotedLine_0.unwrap() + 1;
-                self.is_cut_at_begin = true
+                self.is_cut_at_begin = 1i32
             }
         }
         /* re-create buffer from the remaining lines */
         let mut ret = String::new();
-        if self.is_cut_at_begin {
+        if 0 != self.is_cut_at_begin {
             ret += "[...]";
         }
         /* we write empty lines only in case and non-empty line follows */
@@ -210,7 +211,7 @@ impl Simplify {
                 pending_linebreaks = 1i32
             }
         }
-        if self.is_cut_at_end && (!self.is_cut_at_begin || 0 != content_lines_added) {
+        if 0 != self.is_cut_at_end && (0 == self.is_cut_at_begin || 0 != content_lines_added) {
             ret += " [...]";
         }
         dc_free_splitted_lines(lines);
@@ -267,11 +268,11 @@ mod tests {
     #[test]
     fn test_simplify_trim() {
         unsafe {
-            let mut simplify = Simplify::new();
+            let mut simplify = dc_simplify_t::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);
+                simplify.simplify(html, strlen(html) as libc::c_int, 1, 0);
 
             assert_eq!(
                 CStr::from_ptr(plain as *const libc::c_char)
@@ -287,11 +288,11 @@ mod tests {
     #[test]
     fn test_simplify_parse_href() {
         unsafe {
-            let mut simplify = Simplify::new();
+            let mut simplify = dc_simplify_t::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);
+                simplify.simplify(html, strlen(html) as libc::c_int, 1, 0);
 
             assert_eq!(
                 CStr::from_ptr(plain as *const libc::c_char)
@@ -307,12 +308,12 @@ mod tests {
     #[test]
     fn test_simplify_bold_text() {
         unsafe {
-            let mut simplify = Simplify::new();
+            let mut simplify = dc_simplify_t::new();
             let html: *const libc::c_char =
                 b"<!DOCTYPE name [<!DOCTYPE ...>]><!-- comment -->text <b><?php echo ... ?>bold</b><![CDATA[<>]]>\x00"
                 as *const u8 as *const libc::c_char;
             let plain: *mut libc::c_char =
-                simplify.simplify(html, strlen(html) as libc::c_int, true, 0);
+                simplify.simplify(html, strlen(html) as libc::c_int, 1, 0);
 
             assert_eq!(
                 CStr::from_ptr(plain as *const libc::c_char)
@@ -328,12 +329,12 @@ mod tests {
     #[test]
     fn test_simplify_html_encoded() {
         unsafe {
-            let mut simplify = Simplify::new();
+            let mut simplify = dc_simplify_t::new();
             let html: *const libc::c_char =
                 b"&lt;&gt;&quot;&apos;&amp; &auml;&Auml;&ouml;&Ouml;&uuml;&Uuml;&szlig; foo&AElig;&ccedil;&Ccedil; &diams;&noent;&lrm;&rlm;&zwnj;&zwj;\x00"
                 as *const u8 as *const libc::c_char;
             let plain: *mut libc::c_char =
-                simplify.simplify(html, strlen(html) as libc::c_int, true, 0);
+                simplify.simplify(html, strlen(html) as libc::c_int, 1, 0);
 
             assert_eq!(
                 strcmp(plain,

src/dc_tools.rs

@@ -23,21 +23,8 @@ pub fn dc_exactly_one_bit_set(v: libc::c_int) -> bool {
     0 != v && 0 == v & v - 1i32
 }
 
-/// Duplicates a string
-///
-/// returns an empty string if NULL is given, never returns NULL (exits on errors)
-///
-/// # Examples
-///
-/// ```
-/// use deltachat::dc_tools::{dc_strdup, to_string};
-/// 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(str_a_copy), "foobar");
-///     assert_ne!(str_a, str_a_copy);
-/// }
-/// ```
+/* string tools */
+/* dc_strdup() returns empty string if NULL is given, never returns NULL (exits on errors) */
 pub unsafe fn dc_strdup(s: *const libc::c_char) -> *mut libc::c_char {
     let ret: *mut libc::c_char;
     if !s.is_null() {
@@ -51,21 +38,7 @@ pub unsafe fn dc_strdup(s: *const libc::c_char) -> *mut libc::c_char {
     ret
 }
 
-/// Duplicates a string, returns null if given string is null
-///
-/// # Examples
-///
-/// ```
-/// use deltachat::dc_tools::{dc_strdup_keep_null, to_string};
-/// use std::ffi::{CStr};
-///
-/// unsafe {
-///     let str_a = b"foobar\x00" as *const u8 as *const libc::c_char;
-///     let str_a_copy = dc_strdup_keep_null(str_a);
-///     assert_eq!(to_string(str_a_copy), "foobar");
-///     assert_ne!(str_a, str_a_copy);
-/// }
-/// ```
+/* strdup(NULL) is undefined, safe_strdup_keep_null(NULL) returns NULL in this case */
 pub unsafe fn dc_strdup_keep_null(s: *const libc::c_char) -> *mut libc::c_char {
     return if !s.is_null() {
         dc_strdup(s)
@@ -94,14 +67,50 @@ pub unsafe fn dc_str_replace(
     haystack: *mut *mut libc::c_char,
     needle: *const libc::c_char,
     replacement: *const libc::c_char,
-) {
-    let haystack_s = to_string(*haystack);
-    let needle_s = to_string(needle);
-    let replacement_s = to_string(replacement);
+) -> libc::c_int {
+    let mut replacements: libc::c_int = 0i32;
+    let mut start_search_pos: libc::c_int = 0i32;
+    let needle_len: libc::c_int;
+    let replacement_len: libc::c_int;
+    if haystack.is_null()
+        || (*haystack).is_null()
+        || needle.is_null()
+        || *needle.offset(0isize) as libc::c_int == 0i32
+    {
+        return 0i32;
+    }
+    needle_len = strlen(needle) as libc::c_int;
+    replacement_len = (if !replacement.is_null() {
+        strlen(replacement)
+    } else {
+        0
+    }) as libc::c_int;
+    loop {
+        let mut p2: *mut libc::c_char =
+            strstr((*haystack).offset(start_search_pos as isize), needle);
+        if p2.is_null() {
+            break;
+        }
+        start_search_pos =
+            (p2.wrapping_offset_from(*haystack) + replacement_len as isize) as libc::c_int;
+        *p2 = 0i32 as libc::c_char;
+        p2 = p2.offset(needle_len as isize);
+        let new_string: *mut libc::c_char = dc_mprintf(
+            b"%s%s%s\x00" as *const u8 as *const libc::c_char,
+            *haystack,
+            if !replacement.is_null() {
+                replacement
+            } else {
+                b"\x00" as *const u8 as *const libc::c_char
+            },
+            p2,
+        );
+        free(*haystack as *mut libc::c_void);
+        *haystack = new_string;
+        replacements += 1
+    }
 
-    free(*haystack as *mut libc::c_void);
-
-    *haystack = haystack_s.replace(&needle_s, &replacement_s).strdup();
+    replacements
 }
 
 pub unsafe fn dc_ftoa(f: libc::c_double) -> *mut libc::c_char {
@@ -1453,9 +1462,9 @@ pub trait StrExt {
     ///
     /// 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].
     ///
-    /// [CString.as_ptr]: std::ffi::CString.as_ptr
+    /// [CString::as_ptr]: std::ffi::CString::as_ptr
     ///
     /// # Panics
     ///
@@ -1564,49 +1573,6 @@ mod tests {
     use super::*;
     use std::ffi::CStr;
 
-    #[test]
-    fn test_dc_strdup() {
-        unsafe {
-            let str_a = b"foobar\x00" as *const u8 as *const libc::c_char;
-            let str_a_copy = dc_strdup(str_a);
-
-            // Value of str_a_copy should equal foobar
-            assert_eq!(
-                CStr::from_ptr(str_a_copy),
-                CString::new("foobar").unwrap().as_c_str()
-            );
-            // Address of str_a should be different from str_a_copy
-            assert_ne!(str_a, str_a_copy);
-
-            let str_a = std::ptr::null() as *const libc::c_char;
-            let str_a_copy = dc_strdup(str_a);
-            // Value of str_a_copy should equal ""
-            assert_eq!(
-                CStr::from_ptr(str_a_copy),
-                CString::new("").unwrap().as_c_str()
-            );
-            assert_ne!(str_a, str_a_copy);
-        }
-    }
-
-    #[test]
-    fn test_dc_strdup_keep_null() {
-        unsafe {
-            let str_a = b"foobar\x00" as *const u8 as *const libc::c_char;
-            let str_a_copy = dc_strdup_keep_null(str_a);
-            assert_eq!(
-                CStr::from_ptr(str_a_copy),
-                CString::new("foobar").unwrap().as_c_str()
-            );
-            assert_ne!(str_a, str_a_copy);
-
-            let str_a = 0 as *const u8 as *const libc::c_char;
-            let str_a_copy = dc_strdup_keep_null(str_a);
-            assert_eq!(str_a.is_null(), true);
-            assert_eq!(str_a_copy.is_null(), true);
-        }
-    }
-
     #[test]
     fn test_dc_ltrim() {
         unsafe {
@@ -1681,7 +1647,7 @@ mod tests {
     fn test_dc_str_replace() {
         unsafe {
             let mut str: *mut libc::c_char = strdup(b"aaa\x00" as *const u8 as *const libc::c_char);
-            dc_str_replace(
+            let replacements: libc::c_int = dc_str_replace(
                 &mut str,
                 b"a\x00" as *const u8 as *const libc::c_char,
                 b"ab\x00" as *const u8 as *const libc::c_char,
@@ -1690,6 +1656,7 @@ mod tests {
                 CStr::from_ptr(str as *const libc::c_char).to_str().unwrap(),
                 "ababab"
             );
+            assert_eq!(replacements, 3);
             free(str as *mut libc::c_void);
         }
     }

src/peerstate.rs

@@ -166,6 +166,7 @@ impl<'a> Peerstate<'a> {
 
     pub fn from_addr(context: &'a Context, _sql: &Sql, addr: &str) -> Option<Self> {
         let query = "SELECT addr, last_seen, last_seen_autocrypt, prefer_encrypted, public_key, gossip_timestamp, gossip_key, public_key_fingerprint, gossip_key_fingerprint, verified_key, verified_key_fingerprint FROM acpeerstates  WHERE addr=? COLLATE NOCASE;";
+        info!(context, 0, "peerstate.from_addr {}", addr);
         Self::from_stmt(context, query, &[addr])
     }
 
@@ -187,6 +188,7 @@ impl<'a> Peerstate<'a> {
         P: IntoIterator,
         P::Item: rusqlite::ToSql,
     {
+        info!(context, 0, "from_stmt query {:?}", query);
         context
             .sql
             .query_row(query, params, |row| {
@@ -198,38 +200,28 @@ impl<'a> Peerstate<'a> {
                 let mut res = Self::new(context);
 
                 res.addr = Some(row.get(0)?);
+                info!(context, 0, "from_stmt res.addr {:?} starting", res.addr);
                 res.last_seen = row.get(1)?;
                 res.last_seen_autocrypt = row.get(2)?;
                 res.prefer_encrypt = EncryptPreference::from_i32(row.get(3)?).unwrap_or_default();
                 res.gossip_timestamp = row.get(5)?;
+                let pkf: String = row.get(7)?;
+                res.public_key_fingerprint = if pkf.is_empty() { None } else { Some(pkf) };
+
+                let t: Result<String, rusqlite::Error> = row.get(8);
+                let gkf: String = match t {
+                    Err(_) => String::from(""),
+                    Ok(res) => res,
+                };
+                res.gossip_key_fingerprint = if gkf.is_empty() { None } else { Some(gkf) };
+
+                let t: Result<String, rusqlite::Error> = row.get(10);
+                let vkf: String = match t {
+                    Err(_) => String::from(""),
+                    Ok(res) => res,
+                };
+                res.verified_key_fingerprint = if vkf.is_empty() { None } else { Some(vkf) };
 
-                res.public_key_fingerprint = row.get(7)?;
-                if res
-                    .public_key_fingerprint
-                    .as_ref()
-                    .map(|s| s.is_empty())
-                    .unwrap_or_default()
-                {
-                    res.public_key_fingerprint = None;
-                }
-                res.gossip_key_fingerprint = row.get(8)?;
-                if res
-                    .gossip_key_fingerprint
-                    .as_ref()
-                    .map(|s| s.is_empty())
-                    .unwrap_or_default()
-                {
-                    res.gossip_key_fingerprint = None;
-                }
-                res.verified_key_fingerprint = row.get(10)?;
-                if res
-                    .verified_key_fingerprint
-                    .as_ref()
-                    .map(|s| s.is_empty())
-                    .unwrap_or_default()
-                {
-                    res.verified_key_fingerprint = None;
-                }
                 res.public_key = row
                     .get(4)
                     .ok()
@@ -242,7 +234,6 @@ impl<'a> Peerstate<'a> {
                     .get(9)
                     .ok()
                     .and_then(|blob: Vec<u8>| Key::from_slice(&blob, KeyType::Public));
-
                 res.verified_key = if vk == res.gossip_key && res.gossip_key.is_some() {
                     VerifiedKey::Gossip
                 } else if vk == res.public_key {
@@ -426,6 +417,10 @@ impl<'a> Peerstate<'a> {
         }
 
         if self.to_save == Some(ToSave::All) || create {
+            info!(
+                self.context,
+                0, "update acpeerstates with peerstate {:?}", self
+            );
             success = sql::execute(
                 self.context,
                 sql,

src/sql.rs

@@ -4,6 +4,7 @@ use std::sync::{Arc, RwLock};
 use rusqlite::{Connection, OpenFlags, Statement, NO_PARAMS};
 use thread_local_object::ThreadLocal;
 
+use crate::constants::*;
 use crate::context::Context;
 use crate::dc_tools::*;
 use crate::error::{Error, Result};
@@ -688,6 +689,10 @@ fn open(
                 "ALTER TABLE msgs ADD COLUMN move_state INTEGER DEFAULT 1;",
                 params![],
             )?;
+            assert_eq!(DC_MOVE_STATE_UNDEFINED as libc::c_int, 0);
+            assert_eq!(DC_MOVE_STATE_PENDING as libc::c_int, 1);
+            assert_eq!(DC_MOVE_STATE_STAY as libc::c_int, 2);
+            assert_eq!(DC_MOVE_STATE_MOVING as libc::c_int, 3);
 
             dbversion = 48;
             sql.set_config_int(context, "dbversion", 48)?;

src/test_utils.rs

@@ -2,15 +2,9 @@
 //!
 //! This module is only compiled for test runs.
 
-use std::ffi::CStr;
-
-use libc::uintptr_t;
 use tempfile::{tempdir, TempDir};
 
-use crate::config::Config;
-use crate::constants::{Event, KeyType};
 use crate::context::{dc_context_new, dc_open, Context};
-use crate::key;
 use crate::types::dc_callback_t;
 
 /// A Context and temporary directory.
@@ -50,127 +44,3 @@ pub fn test_context(cb: Option<dc_callback_t>) -> TestContext {
 pub fn dummy_context() -> TestContext {
     test_context(None)
 }
-
-pub unsafe extern "C" fn logging_cb(
-    _ctx: &Context,
-    evt: Event,
-    _d1: uintptr_t,
-    d2: uintptr_t,
-) -> uintptr_t {
-    let to_str = |x| CStr::from_ptr(x as *const libc::c_char).to_str().unwrap();
-    match evt {
-        Event::INFO => println!("I: {}", to_str(d2)),
-        Event::WARNING => println!("W: {}", to_str(d2)),
-        Event::ERROR => println!("E: {}", to_str(d2)),
-        _ => (),
-    }
-    0
-}
-
-/// Creates Alice with a pre-generated keypair.
-///
-/// Returns the address of the keypair created (alice@example.org).
-pub fn configure_alice_keypair(ctx: &Context) -> String {
-    let addr = String::from("alice@example.org");
-    ctx.set_config(Config::ConfiguredAddr, Some(&addr)).unwrap();
-
-    // The keypair was created using:
-    //   let (public, private) = crate::pgp::dc_pgp_create_keypair("alice@example.com")
-    //       .unwrap();
-    //   println!("{}", public.to_base64(64));
-    //   println!("{}", private.to_base64(64));
-    let public = key::Key::from_base64(
-        concat!(
-            "xsBNBF086ewBCACmJKuoxIO6T87yi4Q3MyNpMch3Y8KrtHDQyUszU36eqM3Pmd1l",
-            "FrbcCd8ZWo2pq6OJSwsM/jjRGn1zo2YOaQeJRRrC+KrKGqSUtRSYQBPrPjE2YjSX",
-            "AMbu8jBI6VVUhHeghriBkK79PY9O/oRhIJC0p14IJe6CQ6OI2fTmTUHF9i/nJ3G4",
-            "Wb3/K1bU3yVfyPZjTZQPYPvvh03vxHULKurtYkX5DTEMSWsF4qzLMps+l87VuLV9",
-            "iQnbN7YMRLHHx2KkX5Ivi7JCefhCa54M0K3bDCCxuVWAM5wjQwNZjzR+WL+dYchw",
-            "oFvuF8NrlzjM9dSv+2rn+J7f99ijSXarzPC7ABEBAAHNEzxhbGljZUBleGFtcGxl",
-            "LmNvbT7CwIkEEAEIADMCGQEFAl086fgCGwMECwkIBwYVCAkKCwIDFgIBFiEE+iai",
-            "x4d0doj87Q0ek6DcNkbrcegACgkQk6DcNkbrcei3ogf/cruUmQ+th52TFHTHdkw9",
-            "OHUl3MrXtZ7QmHyOAFvbXE/6n5Eeh+eZoF8MWWV72m14Wbs+vTcNQkFVTdOPptkK",
-            "A8e4cJqwDOHsyAnvQXZ7WNje9+BMzcoipIUawHP4ORFaPDsKLZQ0b4wBbKn8ziea",
-            "6zjGF0/qljTdoxTtsYpv5wXYuhwbYklrLOqgSa5M7LXUe7E3g9mbg+9iX1GuB8m6",
-            "GkquJN814Y+xny4xhZzGOfue6SeP12jJMNSjSP7416dRq7794VGnkkW9V/7oFEUK",
-            "u5wO9FFbgDySOSlEjByGejSGuBmho0iJSjcPjZ7EY/j3M3orq4dpza5C82OeSvxD",
-            "Fc7ATQRdPOnsAQgA5oLxXRLnyugzOmNCy7dxV3JrDZscA6JNlJlDWIShT0YSs+zG",
-            "9JzDeQql+sYXgUSxOoIayItuXtnFn7tstwGoOnYvadm/e5/7V5fKAQRtCtdN51av",
-            "62n18Venlm0yNKpROPcZ6M/sc4m6uU6YRZ/a1idal8VGY0wLKlghjIBuIiBoVQ/R",
-            "noW+/fhmwIg08dQ5m8hQe3GEOZEeLrTWL/9awPlXK7Y+DmJOoR4qbHWEcRfbzS6q",
-            "4zW8vk2ztB8ngwbnqYy8zrN1DCICN1gYdlU++uVw6Bb1XfY8Cdldh1VLKpF35mAm",
-            "jxLZfVDcoObFH3Cv2GB7BEYxv86KC2Y6T74Q/wARAQABwsB2BBgBCAAgBQJdPOn4",
-            "AhsMFiEE+iaix4d0doj87Q0ek6DcNkbrcegACgkQk6DcNkbrcegLxwf/dXshJnoW",
-            "qEnRsf6rVb9/Mc66ti+NVQLfNd275dybh/QIJdK3NmSxdnTPIEJRVspJywJoupwX",
-            "FNrnHG2Ff6QPvHqI+/oNu986r9d7Z1oQibbLHKt8t6kpOfg/xGxotagJuiCQvR9m",
-            "MjD1DqsdB37SjDxGupZOOJSXWi6KX60IE+uM+QOBfeOZziQwuFmA5wV6RDXIeYJf",
-            "qrcbeXeR1d0nfNpPHQR1gBiqmxNb6KBbdXD2+EXW60axC7D2b1APmzMlammDliPw",
-            "sK9U1rc9nuquEBvGDOJf4K+Dzn+mDCqRpP6uAuQ7RKHyim4uyN0wwKObzPqgJCGw",
-            "jTglkixw+aSTXw=="
-        ),
-        KeyType::Public,
-    )
-    .unwrap();
-    let private = key::Key::from_base64(
-        concat!(
-            "xcLYBF086ewBCACmJKuoxIO6T87yi4Q3MyNpMch3Y8KrtHDQyUszU36eqM3Pmd1l",
-            "FrbcCd8ZWo2pq6OJSwsM/jjRGn1zo2YOaQeJRRrC+KrKGqSUtRSYQBPrPjE2YjSX",
-            "AMbu8jBI6VVUhHeghriBkK79PY9O/oRhIJC0p14IJe6CQ6OI2fTmTUHF9i/nJ3G4",
-            "Wb3/K1bU3yVfyPZjTZQPYPvvh03vxHULKurtYkX5DTEMSWsF4qzLMps+l87VuLV9",
-            "iQnbN7YMRLHHx2KkX5Ivi7JCefhCa54M0K3bDCCxuVWAM5wjQwNZjzR+WL+dYchw",
-            "oFvuF8NrlzjM9dSv+2rn+J7f99ijSXarzPC7ABEBAAEACAChqzVOuErmVRqvcYtq",
-            "m1xt1H+ZjX20z5Sn1fhTLYAcq236AWMqJvwxCXoKlc8bt2UfB+Ls9cQb1YcVq353",
-            "r0QiExiDeK3YlCxqd/peXJwFYTNKFC3QcnUhtpG9oS/jWjN+BRotGbjtu6Vj3M68",
-            "JJAq+mHJ0/9OyrqrREvGfo7uLZt7iMGemDlrDakvrbIyZrPLgay+nZ3dEFKeOQ6F",
-            "FrU05jyUVdoHBy0Tqx/6VpFUX9+IHcMHL2lTJB0nynBj+XZ/G4aX3WYoo3YlixHb",
-            "Iu35fGFA0TChoGaGPzqcI/kg2Z+b/BryG9NM3LA2cO8iGrGXAE1nPFp91jmCrQ3V",
-            "WushBADERP+uojjjfdO5J+RkmcFe9mFYDdtkhN+kV+LdePjiNNtcXMBhasstio0S",
-            "ut0GKnE7DFRhX7mkN9w2apJ2ooeFeVVWot18eSdp6Rzh6/1Z7TmhYFJ3oUxxLbnQ",
-            "sWIXIec1SzqWBFJUCn3IP0mCnJktFg/uGW6yLs01r5ds52uSBQQA2LSWiTwk9tEm",
-            "dr9mz3tHnmrkyGiyKhKGM1Z7Rch63D5yQc1s4kUMBlyuLL2QtM/e4dtaz2JAkO8k",
-            "QrYCnNgJ+2roTAK3kDZgYtymjdvK3HpQNtjVo7dds5RJVb6U618phZwU5WNFAEJW",
-            "yyImmycGfjLv+18cW/3mq0QVZejkM78D/2kHaIeJAowtBOFY2zDrKyDRoBHaUSgj",
-            "5BjGoviRC5rYihWDEyYDQ6mBJQstAD0Ty3MYzyUxl6ruB/BMWnMDFq5+TqtdBzu3",
-            "jCtZ8OEyH8A5Kdo68Wzo/PGxzMtusOdNj9+3PBmSq4yibJxbLSrn59aVUYpGLjeG",
-            "Kyvm9OTKkrOGN27NEzxhbGljZUBleGFtcGxlLmNvbT7CwIkEEAEIADMCGQEFAl08",
-            "6fgCGwMECwkIBwYVCAkKCwIDFgIBFiEE+iaix4d0doj87Q0ek6DcNkbrcegACgkQ",
-            "k6DcNkbrcei3ogf/cruUmQ+th52TFHTHdkw9OHUl3MrXtZ7QmHyOAFvbXE/6n5Ee",
-            "h+eZoF8MWWV72m14Wbs+vTcNQkFVTdOPptkKA8e4cJqwDOHsyAnvQXZ7WNje9+BM",
-            "zcoipIUawHP4ORFaPDsKLZQ0b4wBbKn8ziea6zjGF0/qljTdoxTtsYpv5wXYuhwb",
-            "YklrLOqgSa5M7LXUe7E3g9mbg+9iX1GuB8m6GkquJN814Y+xny4xhZzGOfue6SeP",
-            "12jJMNSjSP7416dRq7794VGnkkW9V/7oFEUKu5wO9FFbgDySOSlEjByGejSGuBmh",
-            "o0iJSjcPjZ7EY/j3M3orq4dpza5C82OeSvxDFcfC2ARdPOnsAQgA5oLxXRLnyugz",
-            "OmNCy7dxV3JrDZscA6JNlJlDWIShT0YSs+zG9JzDeQql+sYXgUSxOoIayItuXtnF",
-            "n7tstwGoOnYvadm/e5/7V5fKAQRtCtdN51av62n18Venlm0yNKpROPcZ6M/sc4m6",
-            "uU6YRZ/a1idal8VGY0wLKlghjIBuIiBoVQ/RnoW+/fhmwIg08dQ5m8hQe3GEOZEe",
-            "LrTWL/9awPlXK7Y+DmJOoR4qbHWEcRfbzS6q4zW8vk2ztB8ngwbnqYy8zrN1DCIC",
-            "N1gYdlU++uVw6Bb1XfY8Cdldh1VLKpF35mAmjxLZfVDcoObFH3Cv2GB7BEYxv86K",
-            "C2Y6T74Q/wARAQABAAgAhSvFEYZoj1sSrXrHDjZOrryViGjCCH9t3pmkxLDrGIdd",
-            "KsFyN8ORUo6KUZS745yx3yFnI9EZ1IZvm9aF+jxk2lGJFtgLvfoxFOvGckwCSy8T",
-            "/MCiJZkz01hWo5s2VCLJheWL/GqTKjS5wXDcm+y8Wtilh+UawycdlDsSNr/D4MZL",
-            "j3Chq9K03l5UIR8DcC7SavNi55R2oGOfboXsdvwOlrNZdCkZOlXDI4ZKFwbDHCtp",
-            "Do5FS30hnJi2TecUPZWB1CaGFWnevINd4ikugVjcAoZj/QAIvfrOCgqisF/Ylg9u",
-            "RMUPBapmcJUueILwd0iQqvGG0aCqtchvSmlg15/lQQQA9G1NNjNAH+NQrXvDJFJe",
-            "/V1U3F3pz7jCjQa69c0dxSBUeNX1pG8XXD6tSkkd4Ni1mzZGcZXOmVUM6cA9I7RH",
-            "95RqV+QIfnXVneCRrlCjV8m6OBlkivkESXc3nW5wtCIfw7oKg9w1xuVNUaAlbCt9",
-            "QVLaxXJiY7ad0f5U9XJ1+w8EAPFs+M/+GZK1wOZYBL1vo7x0gL9ZggmjC4B+viBJ",
-            "8Q60mqTrphYFsbXHuwKV0g9aIoZMucKyEE0QLR7imttiLEz1nD8bfEScbGy9ZG//",
-            "wRfyJmCVAjA0pQ6LtB93d70PSVzzJrMHgbLKrDuSd6RChl7n9BIEdVyk7LEph0Yg",
-            "9UsRBADm6DvpKL+P3lQ0eLTfAgcQTOqLZDYmI3PvqqSkHb1kHChqOXXs8hGOSSwK",
-            "Gjcd4CZeNOGWR42rZyRhVgtkt6iYviIaVAWUfme6K+sLQBCeyMlmEGtykAA+LmPB",
-            "f4zdyUNADfoxgZF3EKHf6I3nlVn5cdT+o/9vjdY2XAOwcls1RzaFwsB2BBgBCAAg",
-            "BQJdPOn4AhsMFiEE+iaix4d0doj87Q0ek6DcNkbrcegACgkQk6DcNkbrcegLxwf/",
-            "dXshJnoWqEnRsf6rVb9/Mc66ti+NVQLfNd275dybh/QIJdK3NmSxdnTPIEJRVspJ",
-            "ywJoupwXFNrnHG2Ff6QPvHqI+/oNu986r9d7Z1oQibbLHKt8t6kpOfg/xGxotagJ",
-            "uiCQvR9mMjD1DqsdB37SjDxGupZOOJSXWi6KX60IE+uM+QOBfeOZziQwuFmA5wV6",
-            "RDXIeYJfqrcbeXeR1d0nfNpPHQR1gBiqmxNb6KBbdXD2+EXW60axC7D2b1APmzMl",
-            "ammDliPwsK9U1rc9nuquEBvGDOJf4K+Dzn+mDCqRpP6uAuQ7RKHyim4uyN0wwKOb",
-            "zPqgJCGwjTglkixw+aSTXw=="
-        ),
-        KeyType::Private,
-    )
-    .unwrap();
-    let saved = key::dc_key_save_self_keypair(&ctx, &public, &private, &addr, 1, &ctx.sql);
-    assert_eq!(saved, true, "Failed to save Alice's key");
-    addr
-}

src/types.rs

@@ -16,6 +16,8 @@ pub use rusqlite::ffi::*;
 pub type dc_callback_t =
     unsafe extern "C" fn(_: &Context, _: Event, _: uintptr_t, _: uintptr_t) -> uintptr_t;
 
+pub type dc_move_state_t = u32;
+
 pub type dc_receive_imf_t = unsafe fn(
     _: &Context,
     _: *const libc::c_char,