Merge branch 'stable'

Cargo.toml

@@ -53,6 +53,7 @@ fd-lock = "3.0.11"
 futures = "0.3"
 futures-lite = "1.13.0"
 hex = "0.4.0"
+hickory-resolver = "0.24"
 humansize = "2"
 image = { version = "0.24.7", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
 iroh = { version = "0.4.1", default-features = false }
@@ -93,7 +94,6 @@ tokio-stream = { version = "0.1.14", features = ["fs"] }
 tokio-tar = { version = "0.3" } # TODO: integrate tokio into async-tar
 tokio-util = "0.7.9"
 toml = "0.7"
-trust-dns-resolver = "0.23"
 url = "2"
 uuid = { version = "1", features = ["serde", "v4"] }
 

deltachat-ffi/deltachat.h

@@ -384,7 +384,12 @@ char*           dc_get_blobdir               (const dc_context_t* context);
 /**
  * Configure the context. The configuration is handled by key=value pairs as:
  *
- * - `addr`         = address to display (always needed)
+ * - `addr`         = Email address to use for configuration.
+ *                    If dc_configure() fails this is not the email address actually in use.
+ *                    Use `configured_addr` to find out the email address actually in use.
+ * - `configured_addr` = Email address actually in use.
+ *                    Unless for testing, do not set this value using dc_set_config().
+ *                    Instead, set `addr` and call dc_configure().
  * - `mail_server`  = IMAP-server, guessed if left out
  * - `mail_user`    = IMAP-username, guessed if left out
  * - `mail_pw`      = IMAP-password (always needed)

src/provider.rs

@@ -3,7 +3,7 @@
 mod data;
 
 use anyhow::Result;
-use trust_dns_resolver::{config, AsyncResolver, TokioAsyncResolver};
+use hickory_resolver::{config, AsyncResolver, TokioAsyncResolver};
 
 use crate::config::Config;
 use crate::context::Context;

src/sql/migrations.rs

@@ -730,21 +730,22 @@ CREATE INDEX smtp_messageid ON imap(rfc724_mid);
         )
         .await?;
     }
+
+    // Add is_bot column to contacts table with default false.
     if dbversion < 102 {
         sql.execute_migration(
-            "CREATE TABLE download (
-            msg_id INTEGER NOT NULL -- id of the message stub in msgs table
-            )",
+            "ALTER TABLE contacts ADD COLUMN is_bot INTEGER NOT NULL DEFAULT 0",
             102,
         )
         .await?;
     }
 
-    // Add is_bot column to contacts table with default false.
-    if dbversion < 102 {
+    if dbversion < 103 {
         sql.execute_migration(
-            "ALTER TABLE contacts ADD COLUMN is_bot INTEGER NOT NULL DEFAULT 0",
-            102,
+            "CREATE TABLE download (
+            msg_id INTEGER NOT NULL -- id of the message stub in msgs table
+            )",
+            103,
         )
         .await?;
     }