From 6487443ab878c7d4d0d319eeb64e25fd35683b98 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Wed, 20 Nov 2019 00:10:09 +0100 Subject: [PATCH] adapt to new api --- jni/dc_wrapper.c | 16 ++++++++++++++-- src/com/b44t/messenger/DcContext.java | 3 ++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/jni/dc_wrapper.c b/jni/dc_wrapper.c index 0695a7e6a..4205c1a40 100644 --- a/jni/dc_wrapper.c +++ b/jni/dc_wrapper.c @@ -656,9 +656,21 @@ JNIEXPORT jint Java_com_b44t_messenger_DcContext_sendTextMsg(JNIEnv *env, jobjec } -JNIEXPORT jint Java_com_b44t_messenger_DcContext_addDeviceMsg(JNIEnv *env, jobject obj, jobject msg) +JNIEXPORT jint Java_com_b44t_messenger_DcContext_addDeviceMsg(JNIEnv *env, jobject obj, jstring label, jobject msg) { - return dc_add_device_msg(get_dc_context(env, obj), get_dc_msg(env, msg)); + CHAR_REF(label); + int msg_id = dc_add_device_msg(get_dc_context(env, obj), labelPtr, get_dc_msg(env, msg)); + CHAR_UNREF(label); + return msg_id; +} + + +JNIEXPORT jboolean Java_com_b44t_messenger_DcContext_wasDeviceMsgEverAdded(JNIEnv *env, jobject obj, jstring label) +{ + CHAR_REF(label); + jboolean ret = dc_was_device_msg_ever_added(get_dc_context(env, obj), labelPtr) != 0; + CHAR_UNREF(label); + return ret; } diff --git a/src/com/b44t/messenger/DcContext.java b/src/com/b44t/messenger/DcContext.java index 684a1ab4d..5f4331331 100644 --- a/src/com/b44t/messenger/DcContext.java +++ b/src/com/b44t/messenger/DcContext.java @@ -156,7 +156,8 @@ public class DcContext { public native int prepareMsg (int chat_id, DcMsg msg); public native int sendMsg (int chat_id, DcMsg msg); public native int sendTextMsg (int chat_id, String text); - public native int addDeviceMsg (DcMsg msg); + public native int addDeviceMsg (String label, DcMsg msg); + public native boolean wasDeviceMsgEverAdded(String label); public native int checkQrCPtr (String qr); public @NonNull DcLot checkQr (String qr) { return new DcLot(checkQrCPtr(qr)); } public native String getSecurejoinQr (int chat_id);