From bd6423856bd86b756e1ca7485ce3355d273b7db4 Mon Sep 17 00:00:00 2001 From: zaaarf Date: Wed, 14 Aug 2024 00:27:26 +0200 Subject: [PATCH] chore(java): try_recv async --- src/ffi/java/buffer.rs | 5 +++-- src/ffi/java/cursor.rs | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/ffi/java/buffer.rs b/src/ffi/java/buffer.rs index 47b3ea1..f85c621 100644 --- a/src/ffi/java/buffer.rs +++ b/src/ffi/java/buffer.rs @@ -41,7 +41,7 @@ pub extern "system" fn Java_mp_code_BufferController_try_1recv( self_ptr: jlong, ) -> jobject { let controller = unsafe { Box::leak(Box::from_raw(self_ptr as *mut crate::buffer::Controller)) }; - let change = controller.try_recv().jexcept(&mut env); + let change = RT.block_on(controller.try_recv()).jexcept(&mut env); recv_jni(&mut env, change) } @@ -101,7 +101,8 @@ pub extern "system" fn Java_mp_code_BufferController_send<'local>( controller.send(crate::api::TextChange { start: start as u32, end: end as u32, - content + content, + hash: None }).jexcept(&mut env); } diff --git a/src/ffi/java/cursor.rs b/src/ffi/java/cursor.rs index 679de98..17baec8 100644 --- a/src/ffi/java/cursor.rs +++ b/src/ffi/java/cursor.rs @@ -11,7 +11,7 @@ pub extern "system" fn Java_mp_code_CursorController_try_1recv( self_ptr: jlong, ) -> jobject { let controller = unsafe { Box::leak(Box::from_raw(self_ptr as *mut crate::cursor::Controller)) }; - let cursor = controller.try_recv().jexcept(&mut env); + let cursor = RT.block_on(controller.try_recv()).jexcept(&mut env); jni_recv(&mut env, cursor) }