Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-19 06:46:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix CFFI for JSON-RPC changes

Browse Source
This commit is contained in:
Franz Heinzmann (Frando)
2022-06-29 18:45:23 +02:00
committed by Simon Laux
parent 329f498651
commit 978e4aec82
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
deltachat-ffi/src/lib.rs
View File

@@ -4443,11 +4443,11 @@ pub unsafe extern "C" fn dc_accounts_get_next_event(
mod jsonrpc { mod jsonrpc {
use super::*; use super::*;
use deltachat_jsonrpc::api::CommandApi; use deltachat_jsonrpc::api::CommandApi;
use deltachat_jsonrpc::yerpc::{MessageHandle, RpcHandle}; use deltachat_jsonrpc::yerpc::{OutReceiver, RpcClient, RpcSession};
pub struct dc_jsonrpc_instance_t { pub struct dc_jsonrpc_instance_t {
receiver: async_std::channel::Receiver<deltachat_jsonrpc::yerpc::Message>, receiver: OutReceiver,
handle: MessageHandle<CommandApi>, handle: RpcSession<CommandApi>,
} }
#[no_mangle] #[no_mangle]
@@ -4462,8 +4462,8 @@ mod jsonrpc {
let cmd_api = let cmd_api =
deltachat_jsonrpc::api::CommandApi::new_from_arc((*account_manager).inner.clone()); deltachat_jsonrpc::api::CommandApi::new_from_arc((*account_manager).inner.clone());
let (request_handle, receiver) = RpcHandle::new(); let (request_handle, receiver) = RpcClient::new();
let handle = MessageHandle::new(request_handle, cmd_api); let handle = RpcSession::new(request_handle, cmd_api);
let instance = dc_jsonrpc_instance_t { receiver, handle }; let instance = dc_jsonrpc_instance_t { receiver, handle };
@@ -4493,8 +4493,8 @@ mod jsonrpc {
let api = &*jsonrpc_instance; let api = &*jsonrpc_instance;
let handle = &api.handle; let handle = &api.handle;
let request = to_string_lossy(request); let request = to_string_lossy(request);
async_std::task::spawn(async move { spawn(async move {
handle.handle_message(&request).await; handle.handle_incoming(&request).await;
}); });
} }
@@ -4507,7 +4507,7 @@ mod jsonrpc {
return ptr::null_mut(); return ptr::null_mut();
} }
let api = &*jsonrpc_instance; let api = &*jsonrpc_instance;
async_std::task::block_on(api.receiver.recv()) block_on(api.receiver.recv())
.map(|result| serde_json::to_string(&result).unwrap_or_default().strdup()) .map(|result| serde_json::to_string(&result).unwrap_or_default().strdup())
.unwrap_or(ptr::null_mut()) .unwrap_or(ptr::null_mut())
} }