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

deltachat-jsonrpc/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-jsonrpc"
-version = "2.12.0"
+version = "2.13.0"
 description = "DeltaChat JSON-RPC API"
 edition = "2021"
 license = "MPL-2.0"

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

@@ -430,8 +430,6 @@ pub enum EventType {
     IncomingCallAccepted {
         /// ID of the info message referring to the call.
         msg_id: u32,
-        /// User-defined info passed to dc_accept_incoming_call()
-        accept_call_info: String,
     },
 
     /// Outgoing call accepted.
@@ -604,12 +602,8 @@ impl From<CoreEventType> for EventType {
                 msg_id: msg_id.to_u32(),
                 place_call_info,
             },
-            CoreEventType::IncomingCallAccepted {
-                msg_id,
-                accept_call_info,
-            } => IncomingCallAccepted {
+            CoreEventType::IncomingCallAccepted { msg_id } => IncomingCallAccepted {
                 msg_id: msg_id.to_u32(),
-                accept_call_info,
             },
             CoreEventType::OutgoingCallAccepted {
                 msg_id,

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

@@ -324,6 +324,9 @@ pub enum MessageViewtype {
     /// Message is an invitation to a videochat.
     VideochatInvitation,
 
+    /// Message is a call.
+    Call,
+
     /// Message is an webxdc instance.
     Webxdc,
 
@@ -346,6 +349,7 @@ impl From<Viewtype> for MessageViewtype {
             Viewtype::Video => MessageViewtype::Video,
             Viewtype::File => MessageViewtype::File,
             Viewtype::VideochatInvitation => MessageViewtype::VideochatInvitation,
+            Viewtype::Call => MessageViewtype::Call,
             Viewtype::Webxdc => MessageViewtype::Webxdc,
             Viewtype::Vcard => MessageViewtype::Vcard,
         }
@@ -365,6 +369,7 @@ impl From<MessageViewtype> for Viewtype {
             MessageViewtype::Video => Viewtype::Video,
             MessageViewtype::File => Viewtype::File,
             MessageViewtype::VideochatInvitation => Viewtype::VideochatInvitation,
+            MessageViewtype::Call => Viewtype::Call,
             MessageViewtype::Webxdc => Viewtype::Webxdc,
             MessageViewtype::Vcard => Viewtype::Vcard,
         }
@@ -438,8 +443,6 @@ pub enum SystemMessageType {
     /// This message contains a users iroh node address.
     IrohNodeAddr,
 
-    OutgoingCall,
-    IncomingCall,
     CallAccepted,
     CallEnded,
 }
@@ -468,8 +471,6 @@ impl From<deltachat::mimeparser::SystemMessage> for SystemMessageType {
             SystemMessage::IrohNodeAddr => SystemMessageType::IrohNodeAddr,
             SystemMessage::SecurejoinWait => SystemMessageType::SecurejoinWait,
             SystemMessage::SecurejoinWaitTimeout => SystemMessageType::SecurejoinWaitTimeout,
-            SystemMessage::OutgoingCall => SystemMessageType::OutgoingCall,
-            SystemMessage::IncomingCall => SystemMessageType::IncomingCall,
             SystemMessage::CallAccepted => SystemMessageType::CallAccepted,
             SystemMessage::CallEnded => SystemMessageType::CallEnded,
         }

deltachat-jsonrpc/typescript/package.json

@@ -54,5 +54,5 @@
   },
   "type": "module",
   "types": "dist/deltachat.d.ts",
-  "version": "2.12.0"
+  "version": "2.13.0"
 }