chore(release): prepare for 1.139.2

Otherwise it fails to upload new packages with provenance.

.github/workflows/deltachat-rpc-server.yml

@@ -401,6 +401,6 @@ jobs:
         working-directory: deltachat-rpc-server/npm-package
         run: |
           ls -lah platform_package
-          for platform in *.tgz; do npm publish --provenance "$platform"; done
+          for platform in *.tgz; do npm publish --provenance "$platform" --access public; done
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/jsonrpc-client-npm-package.yml

@@ -33,6 +33,6 @@ jobs:
 
       - name: Publish
         working-directory: deltachat-jsonrpc/typescript
-        run: npm publish --provenance deltachat-jsonrpc-client-*
+        run: npm publish --provenance deltachat-jsonrpc-client-* --access public
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

CHANGELOG.md

@@ -1,5 +1,59 @@
 # Changelog
 
+## [1.139.2] - 2024-05-18
+
+### Build system
+
+- Add repository URL to @deltachat/jsonrpc-client.
+
+## [1.139.1] - 2024-05-18
+
+### CI
+
+- Set `--access public` when publishing to npm.
+
+## [1.139.0] - 2024-05-18
+
+### Features / Changes
+
+- Ephemeral peer channels ([#5346](https://github.com/deltachat/deltachat-core-rust/pull/5346)).
+
+### Fixes
+
+- Save override sender displayname for outgoing messages.
+- Do not mark the message as seen if it has `location.kml`.
+- @deltachat/stdio-rpc-server: fix version check when deltachat-rpc-server is found in path ([#5579](https://github.com/deltachat/deltachat-core-rust/pull/5579)).
+- @deltachat/stdio-rpc-server: fix local desktop development ([#5583](https://github.com/deltachat/deltachat-core-rust/pull/5583)).
+- @deltachat/stdio-rpc-server: rename `shutdown` method to `close` and add `muteStdErr` option to mute the stderr output ([#5588](https://github.com/deltachat/deltachat-core-rust/pull/5588))
+- @deltachat/stdio-rpc-server: fix `convert_platform.py`: 32bit `i32` -> `ia32` ([#5589](https://github.com/deltachat/deltachat-core-rust/pull/5589))
+- @deltachat/stdio-rpc-server: fix example ([#5580](https://github.com/deltachat/deltachat-core-rust/pull/5580))
+
+### API-Changes
+
+- deltachat-jsonrpc: Return vcard contact directly in MessageObject.
+- deltachat-jsonrpc: Add api `migrate_account` and `get_blob_dir` ([#5584](https://github.com/deltachat/deltachat-core-rust/pull/5584)).
+- deltachat-rpc-client: Add ViewType.VCARD constant.
+- deltachat-rpc-client: Add Contact.make_vcard().
+- deltachat-rpc-client: Add Chat.send_contact().
+
+### CI
+
+- Publish @deltachat/jsonrpc-client directly to npm.
+- Check that constants are always up-to-date.
+
+### Build system
+
+- nix: Add git-cliff to flake.
+- nix: Use rust-analyzer nightly
+
+### Miscellaneous Tasks
+
+- cargo: Downgrade libc from 0.2.154 to 0.2.153.
+
+### Tests
+
+- deltachat-rpc-client: Test sending vCard.
+
 ## [1.138.5] - 2024-05-16
 
 ### API-Changes
@@ -4165,3 +4219,6 @@ https://github.com/deltachat/deltachat-core-rust/pulls?q=is%3Apr+is%3Aclosed
 [1.138.3]: https://github.com/deltachat/deltachat-core-rust/compare/v1.138.2...v1.138.3
 [1.138.4]: https://github.com/deltachat/deltachat-core-rust/compare/v1.138.3...v1.138.4
 [1.138.5]: https://github.com/deltachat/deltachat-core-rust/compare/v1.138.4...v1.138.5
+[1.139.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.138.5...v1.139.0
+[1.139.1]: https://github.com/deltachat/deltachat-core-rust/compare/v1.139.0...v1.139.1
+[1.139.1]: https://github.com/deltachat/deltachat-core-rust/compare/v1.139.1...v1.139.2

Cargo.lock

@@ -1347,7 +1347,7 @@ dependencies = [
 
 [[package]]
 name = "deltachat"
-version = "1.138.5"
+version = "1.139.2"
 dependencies = [
  "ansi_term",
  "anyhow",
@@ -1426,8 +1426,6 @@ dependencies = [
  "tokio-tar",
  "tokio-util",
  "toml",
- "tracing",
- "tracing-subscriber",
  "url",
  "uuid",
 ]
@@ -1445,7 +1443,7 @@ dependencies = [
 
 [[package]]
 name = "deltachat-jsonrpc"
-version = "1.138.5"
+version = "1.139.2"
 dependencies = [
  "anyhow",
  "async-channel 2.2.1",
@@ -1470,7 +1468,7 @@ dependencies = [
 
 [[package]]
 name = "deltachat-repl"
-version = "1.138.5"
+version = "1.139.2"
 dependencies = [
  "ansi_term",
  "anyhow",
@@ -1485,7 +1483,7 @@ dependencies = [
 
 [[package]]
 name = "deltachat-rpc-server"
-version = "1.138.5"
+version = "1.139.2"
 dependencies = [
  "anyhow",
  "deltachat",
@@ -1497,7 +1495,6 @@ dependencies = [
  "serde_json",
  "tokio",
  "tokio-util",
- "tracing-subscriber",
  "yerpc",
 ]
 
@@ -1515,7 +1512,7 @@ dependencies = [
 
 [[package]]
 name = "deltachat_ffi"
-version = "1.138.5"
+version = "1.139.2"
 dependencies = [
  "anyhow",
  "deltachat",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat"
-version = "1.138.5"
+version = "1.139.2"
 edition = "2021"
 license = "MPL-2.0"
 rust-version = "1.77"
@@ -61,8 +61,8 @@ hickory-resolver = "0.24"
 humansize = "2"
 image = { version = "0.25.1", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
 iroh_old = { version = "0.4.2", default-features = false, package = "iroh"}
-iroh-net = { git = "https://github.com/link2xt/iroh", branch="link2xt/keep-connection" }
-iroh-gossip = { git = "https://github.com/link2xt/iroh", branch="link2xt/keep-connection", features = ["net"] }
+iroh-net = "0.16.2"
+iroh-gossip = { version = "0.16.2", features = ["net"] }
 quinn = "0.10.0"
 kamadak-exif = "0.5.3"
 lettre_email = { git = "https://github.com/deltachat/lettre", branch = "master" }
@@ -104,7 +104,6 @@ tokio-util = "0.7.9"
 toml = "0.8"
 url = "2"
 uuid = { version = "1", features = ["serde", "v4"] }
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 # Pin OpenSSL to 3.1 releases.
 # OpenSSL 3.2 has a regression tracked at <https://github.com/openssl/openssl/issues/23376>
@@ -113,8 +112,6 @@ tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 # According to <https://www.openssl.org/policies/releasestrat.html>
 # 3.1 branch will be supported until 2025-03-14.
 openssl-src = "~300.1"
-tracing = "0.1.40"
-
 
 [dev-dependencies]
 ansi_term = "0.12.0"
@@ -184,4 +181,4 @@ vendored = [
   "async-native-tls/vendored",
   "rusqlite/bundled-sqlcipher-vendored-openssl",
   "reqwest/native-tls-vendored"
-]
+]

deltachat-ffi/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.138.5"
+version = "1.139.2"
 description = "Deltachat FFI"
 edition = "2018"
 readme = "README.md"

deltachat-jsonrpc/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-jsonrpc"
-version = "1.138.5"
+version = "1.139.2"
 description = "DeltaChat JSON-RPC API"
 edition = "2021"
 default-run = "deltachat-jsonrpc-server"

deltachat-jsonrpc/typescript/package.json

@@ -32,6 +32,10 @@
   "license": "MPL-2.0",
   "main": "dist/deltachat.js",
   "name": "@deltachat/jsonrpc-client",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/deltachat/deltachat-core-rust.git"
+  },
   "scripts": {
     "build": "run-s generate-bindings extract-constants build:tsc build:bundle build:cjs",
     "build:bundle": "esbuild --format=esm --bundle dist/deltachat.js --outfile=dist/deltachat.bundle.js",
@@ -54,5 +58,5 @@
   },
   "type": "module",
   "types": "dist/deltachat.d.ts",
-  "version": "1.138.5"
+  "version": "1.139.2"
 }

deltachat-repl/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-repl"
-version = "1.138.5"
+version = "1.139.2"
 license = "MPL-2.0"
 edition = "2021"
 repository = "https://github.com/deltachat/deltachat-core-rust"

deltachat-repl/src/cmdline.rs

@@ -19,7 +19,6 @@ use deltachat::location;
 use deltachat::log::LogExt;
 use deltachat::message::{self, Message, MessageState, MsgId, Viewtype};
 use deltachat::mimeparser::SystemMessage;
-use deltachat::peer_channels::{send_webxdc_realtime_advertisement, send_webxdc_realtime_data};
 use deltachat::peerstate::*;
 use deltachat::qr::*;
 use deltachat::reaction::send_reaction;
@@ -643,30 +642,6 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
             println!("{cnt} chats");
             println!("{time_needed:?} to create this list");
         }
-        "start-realtime" => {
-            if arg1.is_empty() {
-                bail!("missing msgid");
-            }
-            let msg_id = MsgId::new(arg1.parse()?);
-            let res = send_webxdc_realtime_advertisement(&context, msg_id).await?;
-
-            if let Some(res) = res {
-                println!("waiting for peer channel join");
-                res.await?;
-            }
-            println!("joined peer channel");
-        }
-        "send-realtime" => {
-            if arg1.is_empty() {
-                bail!("missing msgid");
-            }
-            if arg2.is_empty() {
-                bail!("no message");
-            }
-            let msg_id = MsgId::new(arg1.parse()?);
-            send_webxdc_realtime_data(&context, msg_id, arg2.as_bytes().to_vec()).await?;
-            println!("sent realtime message");
-        }
         "chat" => {
             if sel_chat.is_none() && arg1.is_empty() {
                 bail!("Argument [chat-id] is missing.");

deltachat-rpc-client/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "deltachat-rpc-client"
-version = "1.138.5"
+version = "1.139.2"
 description = "Python client for Delta Chat core JSON-RPC interface"
 classifiers = [
     "Development Status :: 5 - Production/Stable",

deltachat-rpc-client/src/deltachat_rpc_client/chat.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import calendar
 from dataclasses import dataclass
+from tempfile import NamedTemporaryFile
 from typing import TYPE_CHECKING, Optional, Union
 
 from ._utils import AttrDict
@@ -265,3 +266,11 @@ class Chat:
             location["message"] = Message(self.account, location.msg_id)
             locations.append(location)
         return locations
+
+    def send_contact(self, contact: Contact):
+        """Send contact to the chat."""
+        vcard = contact.make_vcard()
+        with NamedTemporaryFile(suffix=".vcard") as f:
+            f.write(vcard.encode())
+            f.flush()
+            self._rpc.send_msg(self.account.id, self.id, {"viewtype": ViewType.VCARD, "file": f.name})

deltachat-rpc-client/src/deltachat_rpc_client/const.py

@@ -62,7 +62,6 @@ class EventType(str, Enum):
     CHATLIST_CHANGED = "ChatlistChanged"
     CHATLIST_ITEM_CHANGED = "ChatlistItemChanged"
     CONFIG_SYNCED = "ConfigSynced"
-    WEBXDC_REALTIME_DATA = "WebxdcRealtimeData"
 
 
 class ChatId(IntEnum):
@@ -115,6 +114,7 @@ class ViewType(str, Enum):
     FILE = "File"
     VIDEOCHAT_INVITATION = "VideochatInvitation"
     WEBXDC = "Webxdc"
+    VCARD = "Vcard"
 
 
 class SystemMessageType(str, Enum):

deltachat-rpc-client/src/deltachat_rpc_client/contact.py

@@ -60,3 +60,6 @@ class Contact:
             self.account,
             self._rpc.create_chat_by_contact_id(self.account.id, self.id),
         )
+
+    def make_vcard(self) -> str:
+        return self._rpc.make_vcard(self.account.id, [self.id])

deltachat-rpc-client/src/deltachat_rpc_client/rpc.py

@@ -177,7 +177,7 @@ class Rpc:
                 account_id = event["contextId"]
                 queue = self.get_queue(account_id)
                 event = event["event"]
-                print("account_id=%d got an event %s" % (account_id, event), file=sys.stderr)
+                logging.debug("account_id=%d got an event %s", account_id, event)
                 queue.put(event)
         except Exception:
             # Log an exception if the event loop dies.

deltachat-rpc-client/tests/test_vcard.py

@@ -0,0 +1,15 @@
+def test_vcard(acfactory) -> None:
+    alice, bob = acfactory.get_online_accounts(2)
+
+    bob_addr = bob.get_config("addr")
+    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
+    alice_contact_charlie = alice.create_contact("charlie@example.org", "Charlie")
+
+    alice_chat_bob = alice_contact_bob.create_chat()
+    alice_chat_bob.send_contact(alice_contact_charlie)
+
+    event = bob.wait_for_incoming_msg_event()
+    message = bob.get_message_by_id(event.msg_id)
+    snapshot = message.get_snapshot()
+    assert snapshot.vcard_contact
+    assert snapshot.vcard_contact.addr == "charlie@example.org"

deltachat-rpc-client/tests/test_webxdc_iroh.py

@@ -1,123 +0,0 @@
-#!/usr/bin/env python3
-"""
-Testing webxdc iroh connectivity
-
-If you want to debug iroh at rust-trace/log level set
-
-    RUST_LOG=iroh_net=trace,iroh_gossip=trace
-"""
-
-import pytest
-
-import time
-import os
-import sys
-import logging
-import random
-import itertools
-import sys
-
-from deltachat_rpc_client import DeltaChat, EventType, SpecialContactId
-
-
-@pytest.fixture()
-def path_to_webxdc():
-    return "../test-data/webxdc/chess.xdc"
-
-
-def test_realtime_sequentially(acfactory, path_to_webxdc):
-    """Test two peers trying to establish connection sequentially."""
-    ac1, ac2 = acfactory.get_online_accounts(2)
-    ac1.create_chat(ac2)
-    ac2.create_chat(ac1)
-    acfactory.send_message(from_account=ac1, to_account=ac2, text="ping0")
-    snapshot = ac2.get_message_by_id(ac2.wait_for_incoming_msg_event().msg_id).get_snapshot()
-    assert snapshot.text == "ping0"
-
-    def log(msg):
-        print()
-        print("*" * 80 + "\n" + msg + "\n", file=sys.stderr)
-        print()
-
-    # share a webxdc app between ac1 and ac2
-    ac1_webxdc_msg = acfactory.send_message(from_account=ac1, to_account=ac2, text="play", file=path_to_webxdc)
-    ac2_webxdc_msg = ac2.get_message_by_id(ac2.wait_for_incoming_msg_event().msg_id)
-    snapshot = ac2_webxdc_msg.get_snapshot()
-    assert snapshot.text == "play"
-
-    # send iroh announcements sequentially
-    log("sending ac1 -> ac2 realtime advertisement and additional message")
-    ac1._rpc.send_webxdc_realtime_advertisement(ac1.id, ac1_webxdc_msg.id)
-    acfactory.send_message(from_account=ac1, to_account=ac2, text="ping1")
-
-    log("waiting for incoming message on ac2")
-    snapshot = ac2.get_message_by_id(ac2.wait_for_incoming_msg_event().msg_id).get_snapshot()
-    assert snapshot.text == "ping1"
-
-    log("sending ac2 -> ac1 realtime advertisement and additional message")
-    ac2._rpc.send_webxdc_realtime_advertisement(ac2.id, ac2_webxdc_msg.id)
-    acfactory.send_message(from_account=ac2, to_account=ac1, text="ping2")
-
-    log("waiting for incoming message on ac1")
-    snapshot = ac1.get_message_by_id(ac1.wait_for_incoming_msg_event().msg_id).get_snapshot()
-    assert snapshot.text == "ping2"
-
-    log("sending realtime data ac1 -> ac2")
-    ac1._rpc.send_webxdc_realtime_data(ac1.id, ac1_webxdc_msg.id, [13, 15, 17])
-
-    log("ac2: waiting for realtime data")
-    while 1:
-        event = ac2.wait_for_event()
-        if event.kind == EventType.WEBXDC_REALTIME_DATA:
-            assert event.data == [13, 15, 17]
-            break
-
-
-def test_realtime_simultaneously(acfactory, path_to_webxdc):
-    """Test two peers trying to establish connection simultaneously."""
-    ac1, ac2 = acfactory.get_online_accounts(2)
-    ac1.create_chat(ac2)
-    ac2.create_chat(ac1)
-    acfactory.send_message(from_account=ac1, to_account=ac2, text="ping0")
-    snapshot = ac2.get_message_by_id(ac2.wait_for_incoming_msg_event().msg_id).get_snapshot()
-    assert snapshot.text == "ping0"
-
-    def log(msg):
-        print()
-        print("*" * 80 + "\n" + msg + "\n", file=sys.stderr)
-        print()
-
-    # share a webxdc app between ac1 and ac2
-    ac1_webxdc_msg = acfactory.send_message(from_account=ac1, to_account=ac2, text="play", file=path_to_webxdc)
-    ac2_webxdc_msg = ac2.get_message_by_id(ac2.wait_for_incoming_msg_event().msg_id)
-    snapshot = ac2_webxdc_msg.get_snapshot()
-    assert snapshot.text == "play"
-
-    # send iroh announcements simultaneously
-    log("sending ac1 -> ac2 realtime advertisement and additional message")
-    ac1._rpc.send_webxdc_realtime_advertisement(ac1.id, ac1_webxdc_msg.id)
-    acfactory.send_message(from_account=ac1, to_account=ac2, text="ping1")
-
-    log("sending ac2 -> ac1 realtime advertisement and additional message")
-    ac2._rpc.send_webxdc_realtime_advertisement(ac2.id, ac2_webxdc_msg.id)
-    acfactory.send_message(from_account=ac2, to_account=ac1, text="ping2")
-
-    # Ensure that advertisements have been received.
-
-    log("waiting for incoming message on ac2")
-    snapshot = ac2.get_message_by_id(ac2.wait_for_incoming_msg_event().msg_id).get_snapshot()
-    assert snapshot.text == "ping1"
-
-    log("waiting for incoming message on ac1")
-    snapshot = ac1.get_message_by_id(ac1.wait_for_incoming_msg_event().msg_id).get_snapshot()
-    assert snapshot.text == "ping2"
-
-    log("sending realtime data ac1 -> ac2")
-    ac1._rpc.send_webxdc_realtime_data(ac1.id, ac1_webxdc_msg.id, [13, 15, 17])
-
-    log("ac2: waiting for realtime data")
-    while 1:
-        event = ac2.wait_for_event()
-        if event.kind == EventType.WEBXDC_REALTIME_DATA:
-            assert event.data == [13, 15, 17]
-            break

deltachat-rpc-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-rpc-server"
-version = "1.138.5"
+version = "1.139.2"
 description = "DeltaChat JSON-RPC server"
 edition = "2021"
 readme = "README.md"
@@ -22,7 +22,6 @@ serde = { version = "1.0", features = ["derive"] }
 tokio = { version = "1.37.0", features = ["io-std"] }
 tokio-util = "0.7.9"
 yerpc = { version = "0.5.2", features = ["anyhow_expose", "openrpc"] }
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 [features]
 default = ["vendored"]

deltachat-rpc-server/npm-package/README.md

@@ -20,7 +20,9 @@ import { C } from "@deltachat/jsonrpc-client";
 async function main() {
     const dc = await startDeltaChat("deltachat-data");
     console.log(await dc.rpc.getSystemInfo());
+    dc.close()
 }
+main()
 ```
 
 For a more complete example refer to https://github.com/deltachat-bot/echo/pull/69/files (TODO change link when pr is merged).

deltachat-rpc-server/npm-package/package.json

@@ -15,5 +15,5 @@
   },
   "type": "module",
   "types": "index.d.ts",
-  "version": "1.138.5"
+  "version": "1.139.2"
 }

deltachat-rpc-server/src/main.rs

@@ -11,7 +11,6 @@ use deltachat::constants::DC_VERSION_STR;
 use deltachat_jsonrpc::api::{Accounts, CommandApi};
 use futures_lite::stream::StreamExt;
 use tokio::io::{self, AsyncBufReadExt, BufReader};
-use tracing_subscriber::{prelude::*, EnvFilter};
 use yerpc::RpcServer as _;
 
 #[cfg(target_family = "unix")]
@@ -63,12 +62,6 @@ async fn main_impl() -> Result<()> {
 
     env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("info")).init();
 
-    tracing_subscriber::registry()
-        .with(tracing_subscriber::fmt::layer().with_writer(std::io::stderr))
-        .with(EnvFilter::builder().from_env_lossy())
-        .try_init()
-        .ok();
-
     let path = std::env::var("DC_ACCOUNTS_PATH").unwrap_or_else(|_| "accounts".to_string());
     log::info!("Starting with accounts directory `{}`.", path);
     let writable = true;

package.json

@@ -55,5 +55,5 @@
     "test:mocha": "mocha node/test/test.mjs --growl --reporter=spec --bail --exit"
   },
   "types": "node/dist/index.d.ts",
-  "version": "1.138.5"
+  "version": "1.139.2"
 }

python/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "deltachat"
-version = "1.138.5"
+version = "1.139.2"
 description = "Python bindings for the Delta Chat Core library using CFFI against the Rust-implemented libdeltachat"
 readme = "README.rst"
 requires-python = ">=3.7"

release-date.in

@@ -1 +1 @@
-2024-05-16
+2024-05-18

src/context.rs

@@ -339,6 +339,7 @@ impl Context {
     ) -> Result<Context> {
         let context =
             Self::new_closed(dbfile, id, events, stock_strings, Default::default()).await?;
+
         // Open the database if is not encrypted.
         if context.check_passphrase("".to_string()).await? {
             context.sql.open(&context, "".to_string()).await?;
@@ -1375,43 +1376,6 @@ pub fn get_version_str() -> &'static str {
     &DC_VERSION_STR
 }
 
-#[derive(Default, Debug)]
-struct CollectVisitor(HashMap<String, String>);
-
-impl tracing::field::Visit for CollectVisitor {
-    fn record_f64(&mut self, field: &tracing::field::Field, value: f64) {
-        self.0.insert(field.to_string(), value.to_string());
-    }
-
-    fn record_i64(&mut self, field: &tracing::field::Field, value: i64) {
-        self.0.insert(field.to_string(), value.to_string());
-    }
-
-    fn record_u64(&mut self, field: &tracing::field::Field, value: u64) {
-        self.0.insert(field.to_string(), value.to_string());
-    }
-
-    fn record_bool(&mut self, field: &tracing::field::Field, value: bool) {
-        self.0.insert(field.to_string(), value.to_string());
-    }
-
-    fn record_str(&mut self, field: &tracing::field::Field, value: &str) {
-        self.0.insert(field.to_string(), value.to_string());
-    }
-
-    fn record_error(
-        &mut self,
-        field: &tracing::field::Field,
-        value: &(dyn std::error::Error + 'static),
-    ) {
-        self.0.insert(field.to_string(), value.to_string());
-    }
-
-    fn record_debug(&mut self, field: &tracing::field::Field, value: &dyn std::fmt::Debug) {
-        self.0.insert(field.to_string(), format!("{:?}", value));
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use anyhow::Context as _;

src/location.rs

@@ -885,6 +885,7 @@ mod tests {
 
     use super::*;
     use crate::config::Config;
+    use crate::message::MessageState;
     use crate::receive_imf::receive_imf;
     use crate::test_utils::{TestContext, TestContextManager};
     use crate::tools::SystemTime;
@@ -1015,6 +1016,54 @@ Content-Disposition: attachment; filename="location.kml"
         Ok(())
     }
 
+    /// Tests that `location.kml` is not hidden and not seen if it contains a message.
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn receive_visible_location_kml() -> Result<()> {
+        let alice = TestContext::new_alice().await;
+
+        receive_imf(
+            &alice,
+            br#"Subject: locations
+MIME-Version: 1.0
+To: <alice@example.org>
+From: <bob@example.net>
+Date: Tue, 21 Dec 2021 00:00:00 +0000
+Chat-Version: 1.0
+Message-ID: <foobar@localhost>
+Content-Type: multipart/mixed; boundary="U8BOG8qNXfB0GgLiQ3PKUjlvdIuLRF"
+
+
+--U8BOG8qNXfB0GgLiQ3PKUjlvdIuLRF
+Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no
+
+Text message.
+
+
+--U8BOG8qNXfB0GgLiQ3PKUjlvdIuLRF
+Content-Type: application/vnd.google-earth.kml+xml
+Content-Disposition: attachment; filename="location.kml"
+
+<?xml version="1.0" encoding="UTF-8"?>
+<kml xmlns="http://www.opengis.net/kml/2.2">
+<Document addr="bob@example.net">
+<Placemark><Timestamp><when>2021-11-21T00:00:00Z</when></Timestamp><Point><coordinates accuracy="1.0000000000000000">10.00000000000000,20.00000000000000</coordinates></Point></Placemark>
+</Document>
+</kml>
+
+--U8BOG8qNXfB0GgLiQ3PKUjlvdIuLRF--"#,
+            false,
+        )
+        .await?;
+
+        let received_msg = alice.get_last_msg().await;
+        assert_eq!(received_msg.text, "Text message.");
+        assert_eq!(received_msg.state, MessageState::InFresh);
+
+        let locations = get_range(&alice, None, None, 0, 0).await?;
+        assert_eq!(locations.len(), 1);
+        Ok(())
+    }
+
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn test_send_locations_to_chat() -> Result<()> {
         let alice = TestContext::new_alice().await;

src/message.rs

@@ -2292,6 +2292,7 @@ mod tests {
     async fn test_set_override_sender_name() {
         // send message with overridden sender name
         let alice = TestContext::new_alice().await;
+        let alice2 = TestContext::new_alice().await;
         let bob = TestContext::new_bob().await;
         let chat = alice.create_chat(&bob).await;
         let contact_id = *chat::get_chat_contacts(&alice, chat.id)
@@ -2311,6 +2312,7 @@ mod tests {
         assert_eq!(msg.get_sender_name(&contact), "over ride".to_string());
         assert_ne!(contact.get_display_name(), "over ride".to_string());
         chat::send_msg(&alice, chat.id, &mut msg).await.unwrap();
+        let sent_msg = alice.pop_sent_msg().await;
 
         // bob receives that message
         let chat = bob.create_chat(&alice).await;
@@ -2320,7 +2322,7 @@ mod tests {
             .first()
             .unwrap();
         let contact = Contact::get_by_id(&bob, contact_id).await.unwrap();
-        let msg = bob.recv_msg(&alice.pop_sent_msg().await).await;
+        let msg = bob.recv_msg(&sent_msg).await;
         assert_eq!(msg.chat_id, chat.id);
         assert_eq!(msg.text, "bla blubb");
         assert_eq!(
@@ -2334,6 +2336,13 @@ mod tests {
         // (mailing lists may also use `Sender:`-header)
         let chat = Chat::load_from_db(&bob, msg.chat_id).await.unwrap();
         assert_ne!(chat.typ, Chattype::Mailinglist);
+
+        // Alice receives message on another device.
+        let msg = alice2.recv_msg(&sent_msg).await;
+        assert_eq!(
+            msg.get_override_sender_name(),
+            Some("over ride".to_string())
+        );
     }
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]

src/peer_channels.rs

@@ -25,7 +25,6 @@
 
 use anyhow::{anyhow, Context as _, Result};
 use email::Header;
-use futures_lite::StreamExt;
 use iroh_gossip::net::{Gossip, JoinTopicFut, GOSSIP_ALPN};
 use iroh_gossip::proto::{Event as IrohEvent, TopicId};
 use iroh_net::relay::{RelayMap, RelayUrl};
@@ -102,6 +101,11 @@ impl Iroh {
             self.endpoint.add_node_addr(peer.clone())?;
         }
 
+        let connect_future = self
+            .gossip
+            .join(topic, peers.into_iter().map(|addr| addr.node_id).collect())
+            .await?;
+
         let ctx = ctx.clone();
         let gossip = self.gossip.clone();
         let subscribe_loop = tokio::spawn(async move {
@@ -110,11 +114,6 @@ impl Iroh {
             }
         });
 
-        let connect_future = self
-            .gossip
-            .join(topic, peers.into_iter().map(|addr| addr.node_id).collect())
-            .await?;
-
         self.iroh_channels
             .write()
             .await
@@ -123,21 +122,6 @@ impl Iroh {
         Ok(Some(connect_future))
     }
 
-    /// Add gossip peers to realtime channel if it is already active.
-    pub async fn maybe_add_gossip_peers(&self, topic: TopicId, peers: Vec<NodeAddr>) -> Result<()> {
-        if let Some(state) = self.iroh_channels.read().await.get(&topic) {
-            if state.subscribe_loop.is_some() {
-                for peer in &peers {
-                    self.endpoint.add_node_addr(peer.clone())?;
-                }
-                self.gossip
-                    .join(topic, peers.into_iter().map(|peer| peer.node_id).collect())
-                    .await?;
-            }
-        }
-        Ok(())
-    }
-
     /// Send realtime data to the gossip swarm.
     pub async fn send_webxdc_realtime_data(
         &self,
@@ -242,15 +226,7 @@ impl Context {
 
         // Shuts down on deltachat shutdown
         tokio::spawn(endpoint_loop(context, endpoint.clone(), gossip.clone()));
-        let endp = endpoint.clone();
-        let gsp = gossip.clone();
-        tokio::spawn(async move {
-            let mut stream = endp.local_endpoints();
-            while let Some(endpoints) = stream.next().await {
-                gsp.update_endpoints(&endpoints)?;
-            }
-            anyhow::Ok(())
-        });
+
         Ok(Iroh {
             endpoint,
             gossip,
@@ -456,10 +432,13 @@ async fn subscribe_loop(
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use crate::{
         chat::send_msg,
         message::{Message, Viewtype},
+        peer_channels::{
+            get_iroh_gossip_peers, get_iroh_topic_for_msg, leave_webxdc_realtime,
+            send_webxdc_realtime_advertisement,
+        },
         test_utils::TestContextManager,
         EventType,
     };
@@ -729,73 +708,4 @@ mod tests {
             false
         });
     }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_parallel_connect() {
-        let mut tcm = TestContextManager::new();
-        let alice = &mut tcm.alice().await;
-        let bob = &mut tcm.bob().await;
-
-        // Alice sends webxdc to bob
-        let alice_chat = alice.create_chat(bob).await;
-        let mut instance = Message::new(Viewtype::File);
-        instance
-            .set_file_from_bytes(
-                alice,
-                "minimal.xdc",
-                include_bytes!("../test-data/webxdc/minimal.xdc"),
-                None,
-            )
-            .await
-            .unwrap();
-        send_msg(alice, alice_chat.id, &mut instance).await.unwrap();
-        let alice_webxdc = alice.get_last_msg().await;
-
-        let webxdc = alice.pop_sent_msg().await;
-        let bob_webxdc = bob.recv_msg(&webxdc).await;
-        assert_eq!(bob_webxdc.get_viewtype(), Viewtype::Webxdc);
-
-        bob_webxdc.chat_id.accept(bob).await.unwrap();
-
-        eprintln!("Sending advertisements");
-        // Alice advertises herself.
-        let alice_advertisement_future = send_webxdc_realtime_advertisement(alice, alice_webxdc.id)
-            .await
-            .unwrap()
-            .unwrap();
-        let alice_advertisement = alice.pop_sent_msg().await;
-
-        send_webxdc_realtime_advertisement(bob, bob_webxdc.id)
-            .await
-            .unwrap();
-        let bob_advertisement = bob.pop_sent_msg().await;
-
-        eprintln!("Receiving advertisements");
-        bob.recv_msg_trash(&alice_advertisement).await;
-        alice.recv_msg_trash(&bob_advertisement).await;
-
-        eprintln!("Alice waits for connection");
-        alice_advertisement_future.await;
-
-        // Alice sends ephemeral message
-        eprintln!("Sending ephemeral message");
-        send_webxdc_realtime_data(alice, alice_webxdc.id, b"alice -> bob".into())
-            .await
-            .unwrap();
-
-        eprintln!("Waiting for ephemeral message");
-        loop {
-            let event = bob.evtracker.recv().await.unwrap();
-            if let EventType::WebxdcRealtimeData { data, .. } = event.typ {
-                if data == b"alice -> bob" {
-                    break;
-                } else {
-                    panic!(
-                        "Unexpected status update: {}",
-                        String::from_utf8_lossy(&data)
-                    );
-                }
-            }
-        }
-    }
 }

src/receive_imf.rs

@@ -755,6 +755,17 @@ async fn add_parts(
     let state: MessageState;
     let mut hidden = false;
     let mut needs_delete_job = false;
+
+    // if contact renaming is prevented (for mailinglists and bots),
+    // we use name from From:-header as override name
+    if prevent_rename {
+        if let Some(name) = &mime_parser.from.display_name {
+            for part in &mut mime_parser.parts {
+                part.param.set(Param::OverrideSenderDisplayname, name);
+            }
+        }
+    }
+
     if mime_parser.incoming {
         to_id = ContactId::SELF;
 
@@ -918,16 +929,6 @@ async fn add_parts(
             apply_mailinglist_changes(context, mime_parser, chat_id).await?;
         }
 
-        // if contact renaming is prevented (for mailinglists and bots),
-        // we use name from From:-header as override name
-        if prevent_rename {
-            if let Some(name) = &mime_parser.from.display_name {
-                for part in &mut mime_parser.parts {
-                    part.param.set(Param::OverrideSenderDisplayname, name);
-                }
-            }
-        }
-
         if chat_id.is_none() {
             // try to create a normal chat
             let create_blocked = if from_id == ContactId::SELF {
@@ -1018,7 +1019,6 @@ async fn add_parts(
             || fetching_existing_messages
             || is_mdn
             || is_reaction
-            || is_location_kml
             || chat_id_blocked == Blocked::Yes
         {
             MessageState::InSeen
@@ -1443,8 +1443,7 @@ async fn add_parts(
                 let relay_server = node_addr.relay_url().map(|relay| relay.as_str());
                 let topic = get_iroh_topic_for_msg(context, instance_id).await?;
                 iroh_add_peer_for_topic(context, instance_id, topic, node_id, relay_server).await?;
-                let iroh = context.get_or_try_init_peer_channel().await?;
-                iroh.maybe_add_gossip_peers(topic, vec![node_addr]).await?;
+
                 chat_id = DC_CHAT_ID_TRASH;
             }
             Err(err) => {