Merge remote-tracking branch 'origin/main' into hoc/channels-encryption-only-qrcodes

2026-05-22 16:26:31 +03:00 · 2025-09-09 10:11:39 +02:00
parent f8a46fe3cf 82bc1bf0b1
commit 18c84e838c
51 changed files with 749 additions and 528 deletions
--- a/deltachat-ffi/Cargo.toml
+++ b/deltachat-ffi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "2.12.0"
+version = "2.13.0"
 description = "Deltachat FFI"
 edition = "2018"
 readme = "README.md"
--- a/deltachat-ffi/deltachat.h
+++ b/deltachat-ffi/deltachat.h
@@ -415,7 +415,6 @@ char*           dc_get_blobdir               (const dc_context_t* context);
 *                    As for `displayname` and `selfstatus`, also the avatar is sent to the recipients.
 *                    To save traffic, however, the avatar is attached only as needed
 *                    and also recoded to a reasonable size.
- * - `e2ee_enabled` = 0=no end-to-end-encryption, 1=prefer end-to-end-encryption (default)
 * - `mdns_enabled` = 0=do not send or request read receipts,
 *                    1=send and request read receipts
 *                    default=send and request read receipts, only send but not request if `bot` is set
@@ -1217,21 +1216,21 @@ uint32_t        dc_init_webxdc_integration    (dc_context_t* context, uint32_t c

 /**
 * Start an outgoing call.
- * This sends a message with all relevant information to the callee,
+ * This sends a message of type #DC_MSG_CALL with all relevant information to the callee,
 * who will get informed by an #DC_EVENT_INCOMING_CALL event and rings.
 *
 * Possible actions during ringing:
 *
 * - caller cancels the call using dc_end_call():
- *   callee receives #DC_EVENT_CALL_ENDED
+ *   callee receives #DC_EVENT_CALL_ENDED and has a "Missed Call"
 *
 * - callee accepts using dc_accept_incoming_call():
 *   caller receives #DC_EVENT_OUTGOING_CALL_ACCEPTED.
 *   callee's devices receive #DC_EVENT_INCOMING_CALL_ACCEPTED, call starts
 *
- * - callee rejects using dc_end_call():
- *   caller receives #DC_EVENT_CALL_ENDED after 1 minute timeout.
- *   callee's other devices receive #DC_EVENT_CALL_ENDED
+ * - callee declines using dc_end_call():
+ *   caller receives #DC_EVENT_CALL_ENDED and has a "Declinced Call".
+ *   callee's other devices receive #DC_EVENT_CALL_ENDED and have a "Cancelled Call",
 *
 * - callee is already in a call:
 *   in this case, UI may decide to show a notification instead of ringing.
@@ -1241,7 +1240,9 @@ uint32_t        dc_init_webxdc_integration    (dc_context_t* context, uint32_t c
 *   after 1 minute without action,
 *   caller and callee receive #DC_EVENT_CALL_ENDED
 *   to prevent endless ringing of callee
- *   in case caller got offline without being able to send cancellation message
+ *   in case caller got offline without being able to send cancellation message.
+ *   for caller, this is a "Cancelled Call";
+ *   for callee, this is a "Missed Call"
 *
 * Actions during the call:
 *
@@ -1277,13 +1278,15 @@ uint32_t        dc_place_outgoing_call       (dc_context_t* context, uint32_t ch
 * All affected devices will receive
 * either #DC_EVENT_OUTGOING_CALL_ACCEPTED or #DC_EVENT_INCOMING_CALL_ACCEPTED.
 *
+ * If the call is already accepted or ended, nothing happens.
+ *
 * @memberof dc_context_t
 * @param context The context object.
 * @param msg_id The ID of the call to accept.
 *     This is the ID reported by #DC_EVENT_INCOMING_CALL
 *     and equals to the ID of the corresponding info message.
 * @param accept_call_info any data that other devices receive
- *     in #DC_EVENT_OUTGOING_CALL_ACCEPTED or #DC_EVENT_INCOMING_CALL_ACCEPTED.
+ *     in #DC_EVENT_OUTGOING_CALL_ACCEPTED.
 * @return 1=success, 0=error
 */
 int            dc_accept_incoming_call      (dc_context_t* context, uint32_t msg_id, const char* accept_call_info);
@@ -1292,17 +1295,13 @@ uint32_t        dc_place_outgoing_call       (dc_context_t* context, uint32_t ch
 /**
  * End incoming or outgoing call.
  *
-  * From the view of the caller, a "cancellation",
-  * from the view of callee, a "rejection".
+  * For unaccepted calls ended by the caller, this is a "cancellation".
+  * Unaccepted calls ended by the callee are a "decline".
  * If the call was accepted, this is a "hangup".
  *
-  * For accepted calls,
-  * all participant devices get informed about the ended call via #DC_EVENT_CALL_ENDED.
-  * For not accepted calls, only the caller will inform the callee.
+  * All participant devices get informed about the ended call via #DC_EVENT_CALL_ENDED.
  *
-  * If the callee rejects, the caller will get a timeout or give up at some point -
-  * same as for all other reasons the call cannot be established: Device not in reach, device muted, connectivity etc.
-  * This is to protect privacy of the callee, avoiding to check if callee is online.
+  * If the call is already ended, nothing happens.
  *
  * @memberof dc_context_t
  * @param context The context object.
@@ -4621,8 +4620,6 @@ int             dc_msg_is_info                (const dc_msg_t* msg);
 *   and also offer a way to fix the encryption, eg. by a button offering a QR scan
 * - DC_INFO_WEBXDC_INFO_MESSAGE (32) - Info-message created by webxdc app sending `update.info`
 * - DC_INFO_CHAT_E2EE (50) - Info-message for "Chat is end-to-end-encrypted"
- * - DC_INFO_OUTGOING_CALL (60) - Info-message refers to an outgoing call
- * - DC_INFO_INCOMING_CALL (65) - Info-message refers to an incoming call
 *
 * For the messages that refer to a CONTACT,
 * dc_msg_get_info_contact_id() returns the contact ID.
@@ -4679,8 +4676,6 @@ uint32_t        dc_msg_get_info_contact_id    (const dc_msg_t* msg);
 #define         DC_INFO_INVALID_UNENCRYPTED_MAIL  13
 #define         DC_INFO_WEBXDC_INFO_MESSAGE       32
 #define         DC_INFO_CHAT_E2EE                 50
-#define         DC_INFO_OUTGOING_CALL             60
-#define         DC_INFO_INCOMING_CALL             65


 /**
@@ -5717,6 +5712,12 @@ int64_t         dc_lot_get_timestamp     (const dc_lot_t* lot);
 #define DC_MSG_VIDEOCHAT_INVITATION 70


+/**
+ * Message indicating an incoming or outgoing call.
+ */
+#define DC_MSG_CALL 71
+
+
 /**
 * The message is a webxdc instance.
 *
@@ -6723,29 +6724,27 @@ void dc_event_unref(dc_event_t* event);
 * or show a notification if there is already a call in some profile.
 *
 * Together with this event,
- * an info-message is added to the corresponding chat.
- * The info-message, however, is _not_ additionally notified using #DC_EVENT_INCOMING_MSG,
- * if needed, this has to be done by the UI explicitly.
+ * a message of type #DC_MSG_CALL is added to the corresponding chat;
+ * this message is announced and updated by the usual even as #DC_EVENT_MSGS_CHANGED.
 *
 * If user takes action, dc_accept_incoming_call() or dc_end_call() should be called.
 *
 * Otherwise, ringing should end on #DC_EVENT_CALL_ENDED
 * or #DC_EVENT_INCOMING_CALL_ACCEPTED
 *
- * @param data1 (int) msg_id ID of the info-message referring to the call.
+ * @param data1 (int) msg_id ID of the message referring to the call.
 * @param data2 (char*) place_call_info, text passed to dc_place_outgoing_call()
 */
 #define DC_EVENT_INCOMING_CALL                            2550

 /**
- * The callee accepted an incoming call on another device using dc_accept_incoming_call().
+ * The callee accepted an incoming call on this or another device using dc_accept_incoming_call().
 * The caller gets the event #DC_EVENT_OUTGOING_CALL_ACCEPTED at the same time.
 *
 * The event is sent unconditionally when the corresponding message is received.
 * UI should only take action in case call UI was opened before, otherwise the event should be ignored.
 *
- * @param data1 (int) msg_id ID of the info-message referring to the call
- * @param data2 (char*) accept_call_info, text passed to dc_place_outgoing_call()
+ * @param data1 (int) msg_id ID of the message referring to the call
 */
 #define DC_EVENT_INCOMING_CALL_ACCEPTED                  2560

@@ -6755,7 +6754,7 @@ void dc_event_unref(dc_event_t* event);
 * The event is sent unconditionally when the corresponding message is received.
 * UI should only take action in case call UI was opened before, otherwise the event should be ignored.
 *
- * @param data1 (int) msg_id ID of the info-message referring to the call
+ * @param data1 (int) msg_id ID of the message referring to the call
 * @param data2 (char*) accept_call_info, text passed to dc_accept_incoming_call()
 */
 #define DC_EVENT_OUTGOING_CALL_ACCEPTED                   2570
@@ -6767,7 +6766,7 @@ void dc_event_unref(dc_event_t* event);
 * The event is sent unconditionally when the corresponding message is received.
 * UI should only take action in case call UI was opened before, otherwise the event should be ignored.
 *
- * @param data1 (int) msg_id ID of the info-message referring to the call
+ * @param data1 (int) msg_id ID of the message referring to the call
 */
 #define DC_EVENT_CALL_ENDED                               2580

--- a/deltachat-ffi/src/lib.rs
+++ b/deltachat-ffi/src/lib.rs
@@ -779,6 +779,7 @@ pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut
        | EventType::ChatlistChanged
        | EventType::AccountsChanged
        | EventType::AccountsItemChanged
+        | EventType::IncomingCallAccepted { .. }
        | EventType::WebxdcRealtimeAdvertisementReceived { .. } => ptr::null_mut(),
        EventType::IncomingCall {
            place_call_info, ..
@@ -786,10 +787,7 @@ pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut
            let data2 = place_call_info.to_c_string().unwrap_or_default();
            data2.into_raw()
        }
-        EventType::IncomingCallAccepted {
-            accept_call_info, ..
-        }
-        | EventType::OutgoingCallAccepted {
+        EventType::OutgoingCallAccepted {
            accept_call_info, ..
        } => {
            let data2 = accept_call_info.to_c_string().unwrap_or_default();