From 18201ba2cc49e65b425407066e57c99ee08ac3ca Mon Sep 17 00:00:00 2001 From: Alexander Krotov Date: Mon, 29 Jun 2020 23:53:42 +0300 Subject: [PATCH 1/2] Update deltachat-core-rust submodule Ephemeral timer support is added. --- jni/deltachat-core-rust | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jni/deltachat-core-rust b/jni/deltachat-core-rust index 6a4b6fdda..0c47489a3 160000 --- a/jni/deltachat-core-rust +++ b/jni/deltachat-core-rust @@ -1 +1 @@ -Subproject commit 6a4b6fddac15f425e0037ebc5c0358e61a8ba269 +Subproject commit 0c47489a3b46c27d234eb649be5b3d05a96f0f0a From 31e6b94683a5b320d47302518cc8e0b83d2ec51c Mon Sep 17 00:00:00 2001 From: Alexander Krotov Date: Mon, 29 Jun 2020 07:15:44 +0300 Subject: [PATCH 2/2] Add ephemeral message timer API --- jni/dc_wrapper.c | 10 ++++++++++ src/com/b44t/messenger/DcContext.java | 3 +++ 2 files changed, 13 insertions(+) diff --git a/jni/dc_wrapper.c b/jni/dc_wrapper.c index 8d943a390..96dfc747a 100644 --- a/jni/dc_wrapper.c +++ b/jni/dc_wrapper.c @@ -1135,6 +1135,16 @@ JNIEXPORT jintArray Java_com_b44t_messenger_DcContext_getChatContacts(JNIEnv *en return dc_array2jintArray_n_unref(env, ca); } +JNIEXPORT jint Java_com_b44t_messenger_DcContext_getChatEphemeralTimer(JNIEnv *env, jobject obj, jint chat_id) +{ + return dc_get_chat_ephemeral_timer(get_dc_context(env, obj), chat_id); +} + +JNIEXPORT jboolean Java_com_b44t_messenger_DcContext_setChatEphemeralTimer(JNIEnv *env, jobject obj, jint chat_id, jint timer) +{ + return dc_set_chat_ephemeral_timer(get_dc_context(env, obj), chat_id, timer); +} + JNIEXPORT jboolean Java_com_b44t_messenger_DcContext_setChatMuteDuration(JNIEnv *env, jobject obj, jint chat_id, jlong duration) { return dc_set_chat_mute_duration(get_dc_context(env, obj), chat_id, duration); diff --git a/src/com/b44t/messenger/DcContext.java b/src/com/b44t/messenger/DcContext.java index 8d56189f8..21fb62002 100644 --- a/src/com/b44t/messenger/DcContext.java +++ b/src/com/b44t/messenger/DcContext.java @@ -20,6 +20,7 @@ public class DcContext { public final static int DC_EVENT_MSG_FAILED = 2012; public final static int DC_EVENT_MSG_READ = 2015; public final static int DC_EVENT_CHAT_MODIFIED = 2020; + public final static int DC_EVENT_CHAT_EPHEMERAL_TIMER_MODIFIED = 2021; public final static int DC_EVENT_CONTACTS_CHANGED = 2030; public final static int DC_EVENT_LOCATION_CHANGED = 2035; public final static int DC_EVENT_CONFIGURE_PROGRESS = 2041; @@ -150,6 +151,8 @@ public class DcContext { public native int[] getChatMedia (int chat_id, int type1, int type2, int type3); public native int getNextMedia (int msg_id, int dir, int type1, int type2, int type3); public native int[] getChatContacts (int chat_id); + public native int getChatEphemeralTimer (int chat_id); + public native boolean setChatEphemeralTimer (int chat_id, int timer); public native boolean setChatMuteDuration (int chat_id, long duration); public native void deleteChat (int chat_id); public @NonNull DcMsg getMsg (int msg_id) { return new DcMsg(getMsgCPtr(msg_id)); }