diff --git a/jni/dc_wrapper.c b/jni/dc_wrapper.c index d279fd175..5bca008d5 100644 --- a/jni/dc_wrapper.c +++ b/jni/dc_wrapper.c @@ -729,12 +729,10 @@ JNIEXPORT jint Java_com_b44t_messenger_DcContext_sendVideochatInvitation(JNIEnv } -JNIEXPORT jboolean Java_com_b44t_messenger_DcContext_sendWebxdcStatusUpdate(JNIEnv *env, jobject obj, jint msg_id, jstring payload, jstring descr) +JNIEXPORT jboolean Java_com_b44t_messenger_DcContext_sendWebxdcStatusUpdate(JNIEnv *env, jobject obj, jint msg_id, jstring payload) { CHAR_REF(payload); - CHAR_REF(descr); - jboolean ret = dc_send_webxdc_status_update(get_dc_context(env, obj), msg_id, payloadPtr, descrPtr) != 0; - CHAR_UNREF(descr); + jboolean ret = dc_send_webxdc_status_update(get_dc_context(env, obj), msg_id, payloadPtr, NULL) != 0; CHAR_UNREF(payload); return ret; } diff --git a/src/main/java/com/b44t/messenger/DcContext.java b/src/main/java/com/b44t/messenger/DcContext.java index a13356ad6..aed4af2c0 100644 --- a/src/main/java/com/b44t/messenger/DcContext.java +++ b/src/main/java/com/b44t/messenger/DcContext.java @@ -204,7 +204,7 @@ public class DcContext { public native int sendMsg (int chat_id, DcMsg msg); public native int sendTextMsg (int chat_id, String text); public native int sendVideochatInvitation(int chat_id); - public native boolean sendWebxdcStatusUpdate(int msg_id, String payload, String descr); + public native boolean sendWebxdcStatusUpdate(int msg_id, String payload); public native String getWebxdcStatusUpdates(int msg_id, int last_known_serial); public native void setWebxdcIntegration (String file); public native int initWebxdcIntegration(int chat_id); diff --git a/src/main/java/org/thoughtcrime/securesms/WebxdcActivity.java b/src/main/java/org/thoughtcrime/securesms/WebxdcActivity.java index 74dd40e6b..d58220a20 100644 --- a/src/main/java/org/thoughtcrime/securesms/WebxdcActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/WebxdcActivity.java @@ -488,9 +488,9 @@ public class WebxdcActivity extends WebViewActivity implements DcEventCenter.DcE /** @noinspection unused*/ @JavascriptInterface - public boolean sendStatusUpdate(String payload, String descr) { + public boolean sendStatusUpdate(String payload) { Log.i(TAG, "sendStatusUpdate"); - if (!WebxdcActivity.this.dcContext.sendWebxdcStatusUpdate(WebxdcActivity.this.dcAppMsg.getId(), payload, descr)) { + if (!WebxdcActivity.this.dcContext.sendWebxdcStatusUpdate(WebxdcActivity.this.dcAppMsg.getId(), payload)) { DcChat dcChat = WebxdcActivity.this.dcContext.getChat(WebxdcActivity.this.dcAppMsg.getChatId()); Toast.makeText(WebxdcActivity.this, dcChat.isContactRequest() ? diff --git a/src/main/res/raw/webxdc.js b/src/main/res/raw/webxdc.js index 9d23bdbf5..921597bd3 100644 --- a/src/main/res/raw/webxdc.js +++ b/src/main/res/raw/webxdc.js @@ -68,8 +68,8 @@ window.webxdc = (() => { return Promise.resolve([]); }, - sendUpdate: (payload, descr) => { - InternalJSApi.sendStatusUpdate(JSON.stringify(payload), descr); + sendUpdate: (payload) => { + InternalJSApi.sendStatusUpdate(JSON.stringify(payload)); }, sendToChat: async (message) => {