relay place_call_info and accept_call_info

Author: r10s

deltachat-ffi/deltachat.h

@@ -1237,8 +1237,6 @@ uint32_t        dc_init_webxdc_integration    (dc_context_t* context, uint32_t c
  * - callee ends the call using dc_end_call(), caller receives #DC_EVENT_CALL_ENDED
  * - caller ends the call using dc_end_call(), callee receives #DC_EVENT_CALL_ENDED
  *
- * The call URL is avauilable at dc_msg_get_videochat_url().
- *
  * Note, that the events are for updating the call screen,
  * possible status messages are added and updated as usual, including the known events.
  * In the UI, the sorted chatlist is used as an overview about calls as well as messages.
@@ -1251,9 +1249,11 @@ uint32_t        dc_init_webxdc_integration    (dc_context_t* context, uint32_t c
  * @param context The context object.
  * @param chat_id The chat to place a call for.
  *     This needs to be a one-to-one chat.
+ * @param place_call_info any data that other devices receives
+ *     in #DC_EVENT_INCOMING_CALL.
  * @return ID of the system message announcing the call.
  */
-uint32_t        dc_place_outgoing_call       (dc_context_t* context, uint32_t chat_id);
+uint32_t        dc_place_outgoing_call       (dc_context_t* context, uint32_t chat_id, const char* place_call_info);
 
 
 /**
@@ -1268,9 +1268,11 @@ uint32_t        dc_place_outgoing_call       (dc_context_t* context, uint32_t ch
  * @param msg_id The ID of the call to accept.
  *     This is the ID reported by #DC_EVENT_INCOMING_CALL
  *     and equal to the ID of the corresponding info message.
+ * @param accept_call_info any data that other devices receives
+ *     in #DC_EVENT_OUTGOING_CALL_ACCEPTED or #DC_EVENT_INCOMING_CALL_ACCEPTED.
  * @return 1=success, 0=error
  */
- int            dc_accept_incoming_call      (dc_context_t* context, uint32_t msg_id);
+ int            dc_accept_incoming_call      (dc_context_t* context, uint32_t msg_id, const char* accept_call_info);
 
 
  /**
@@ -6739,7 +6741,7 @@ void dc_event_unref(dc_event_t* event);
  * or #DC_EVENT_INCOMING_CALL_ACCEPTED
  *
  * @param data1 (int) msg_id ID of the info-message referring to the call.
- *    The call URL is avauilable at dc_msg_get_videochat_url().
+ * @param data2 (char*) place_call_info, text passed to dc_place_outgoing_call()
  */
 #define DC_EVENT_INCOMING_CALL                            2550
 
@@ -6751,6 +6753,7 @@ void dc_event_unref(dc_event_t* event);
  * 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()
  */
  #define DC_EVENT_INCOMING_CALL_ACCEPTED                  2560
 
@@ -6761,6 +6764,7 @@ void dc_event_unref(dc_event_t* event);
  * 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_accept_incoming_call()
  */
 #define DC_EVENT_OUTGOING_CALL_ACCEPTED                   2570
 

deltachat-ffi/src/lib.rs

@@ -780,11 +780,22 @@ pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut
         | EventType::AccountsChanged
         | EventType::AccountsItemChanged
         | EventType::WebxdcRealtimeAdvertisementReceived { .. }
-        | EventType::IncomingCall { .. }
-        | EventType::IncomingCallAccepted { .. }
-        | EventType::OutgoingCallAccepted { .. }
-        | EventType::CallEnded { .. }
-        | EventType::EventChannelOverflow { .. } => ptr::null_mut(),
+        | EventType::IncomingCall {
+            place_call_info, ..
+        } => {
+            let data2 = place_call_info.to_c_string().unwrap_or_default();
+            data2.into_raw()
+        }
+        EventType::IncomingCallAccepted {
+            accept_call_info, ..
+        }
+        | EventType::OutgoingCallAccepted {
+            accept_call_info, ..
+        } => {
+            let data2 = accept_call_info.to_c_string().unwrap_or_default();
+            data2.into_raw()
+        }
+        EventType::CallEnded { .. } | EventType::EventChannelOverflow { .. } => ptr::null_mut(),
         EventType::ConfigureProgress { comment, .. } => {
             if let Some(comment) = comment {
                 comment.to_c_string().unwrap_or_default().into_raw()
@@ -1184,15 +1195,20 @@ pub unsafe extern "C" fn dc_init_webxdc_integration(
 }
 
 #[no_mangle]
-pub unsafe extern "C" fn dc_place_outgoing_call(context: *mut dc_context_t, chat_id: u32) -> u32 {
+pub unsafe extern "C" fn dc_place_outgoing_call(
+    context: *mut dc_context_t,
+    chat_id: u32,
+    place_call_info: *const libc::c_char,
+) -> u32 {
     if context.is_null() || chat_id == 0 {
         eprintln!("ignoring careless call to dc_place_outgoing_call()");
         return 0;
     }
     let ctx = &*context;
     let chat_id = ChatId::new(chat_id);
+    let place_call_info = to_string_lossy(place_call_info);
 
-    block_on(ctx.place_outgoing_call(chat_id))
+    block_on(ctx.place_outgoing_call(chat_id, place_call_info))
         .map(|msg_id| msg_id.to_u32())
         .unwrap_or_log_default(ctx, "Failed to place call")
 }
@@ -1201,15 +1217,17 @@ pub unsafe extern "C" fn dc_place_outgoing_call(context: *mut dc_context_t, chat
 pub unsafe extern "C" fn dc_accept_incoming_call(
     context: *mut dc_context_t,
     msg_id: u32,
+    accept_call_info: *const libc::c_char,
 ) -> libc::c_int {
     if context.is_null() || msg_id == 0 {
         eprintln!("ignoring careless call to dc_accept_incoming_call()");
         return 0;
     }
     let ctx = &*context;
     let msg_id = MsgId::new(msg_id);
+    let accept_call_info = to_string_lossy(accept_call_info);
 
-    block_on(ctx.accept_incoming_call(msg_id)).is_ok() as libc::c_int
+    block_on(ctx.accept_incoming_call(msg_id, accept_call_info)).is_ok() as libc::c_int
 }
 
 #[no_mangle]

deltachat-jsonrpc/src/api/types/events.rs

@@ -418,14 +418,23 @@ pub enum EventType {
     },
 
     /// Incoming call.
-    IncomingCall { msg_id: u32 },
+    IncomingCall {
+        msg_id: u32,
+        place_call_info: String,
+    },
 
     /// Incoming call accepted.
     /// This is esp. interesting to stop ringing on other devices.
-    IncomingCallAccepted { msg_id: u32 },
+    IncomingCallAccepted {
+        msg_id: u32,
+        accept_call_info: String,
+    },
 
     /// Outgoing call accepted.
-    OutgoingCallAccepted { msg_id: u32 },
+    OutgoingCallAccepted {
+        msg_id: u32,
+        accept_call_info: String,
+    },
 
     /// Call ended.
     CallEnded { msg_id: u32 },
@@ -579,14 +588,26 @@ impl From<CoreEventType> for EventType {
             CoreEventType::EventChannelOverflow { n } => EventChannelOverflow { n },
             CoreEventType::AccountsChanged => AccountsChanged,
             CoreEventType::AccountsItemChanged => AccountsItemChanged,
-            CoreEventType::IncomingCall { msg_id } => IncomingCall {
+            CoreEventType::IncomingCall {
+                msg_id,
+                place_call_info,
+            } => IncomingCall {
                 msg_id: msg_id.to_u32(),
+                place_call_info,
             },
-            CoreEventType::IncomingCallAccepted { msg_id } => IncomingCallAccepted {
+            CoreEventType::IncomingCallAccepted {
+                msg_id,
+                accept_call_info,
+            } => IncomingCallAccepted {
                 msg_id: msg_id.to_u32(),
+                accept_call_info,
             },
-            CoreEventType::OutgoingCallAccepted { msg_id } => OutgoingCallAccepted {
+            CoreEventType::OutgoingCallAccepted {
+                msg_id,
+                accept_call_info,
+            } => OutgoingCallAccepted {
                 msg_id: msg_id.to_u32(),
+                accept_call_info,
             },
             CoreEventType::CallEnded { msg_id } => CallEnded {
                 msg_id: msg_id.to_u32(),