From 7aa2d034262e3196f7819fae7571b0f8e53c5830 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Mon, 12 Oct 2020 17:54:38 +0200 Subject: [PATCH] Update tdlib, tdlight, and 2 more files... --- implementations/tdlib | 2 +- implementations/tdlight | 2 +- src/main/jni-cpp-src/tdlib/td_jni.cpp | 6 ++++++ src/main/jni-cpp-src/tdlight/td_jni.cpp | 1 - 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/implementations/tdlib b/implementations/tdlib index 6b1f6b8..a8355f1 160000 --- a/implementations/tdlib +++ b/implementations/tdlib @@ -1 +1 @@ -Subproject commit 6b1f6b829d0d71f5d50662b1ff58b7869c1e1d7f +Subproject commit a8355f1749a045e64d1a9c4cf3a777fa5f014747 diff --git a/implementations/tdlight b/implementations/tdlight index 54938a0..f5ecc4b 160000 --- a/implementations/tdlight +++ b/implementations/tdlight @@ -1 +1 @@ -Subproject commit 54938a07d6f68fd83498a1ca87e758d94e15a2f9 +Subproject commit f5ecc4b89655ddfaa1e05b77d6740e8d9cdfcaea diff --git a/src/main/jni-cpp-src/tdlib/td_jni.cpp b/src/main/jni-cpp-src/tdlib/td_jni.cpp index 301d34f..6ff0f50 100644 --- a/src/main/jni-cpp-src/tdlib/td_jni.cpp +++ b/src/main/jni-cpp-src/tdlib/td_jni.cpp @@ -72,6 +72,11 @@ static jint Client_nativeClientReceive(JNIEnv *env, jclass clazz, jintArray clie return result_size; } +static jint Client_nativeClientReceiveAdvanced(JNIEnv *env, jclass clazz, jintArray client_ids, jlongArray ids, + jobjectArray events, jdouble timeout, jboolean include_responses, jboolean include_updates) { + return Client_nativeClientReceive(env, clazz, client_ids, ids, events, timeout); +} + static jobject Client_nativeClientExecute(JNIEnv *env, jclass clazz, jobject function) { jobject result; td::ClientManager::execute(fetch_function(env, function))->store(env, result); @@ -137,6 +142,7 @@ static jint register_native(JavaVM *vm) { register_method(client_class, "createNativeClient", "()I", Client_createNativeClient); register_method(client_class, "nativeClientSend", "(IJ" TD_FUNCTION ")V", Client_nativeClientSend); register_method(client_class, "nativeClientReceive", "([I[J[" TD_OBJECT "D)I", Client_nativeClientReceive); + register_method(client_class, "nativeClientReceive", "([I[J[" TD_OBJECT "DZZ)I", Client_nativeClientReceiveAdvanced); register_method(client_class, "nativeClientExecute", "(" TD_FUNCTION ")" TD_OBJECT, Client_nativeClientExecute); register_method(log_class, "setVerbosityLevel", "(I)V", Log_setVerbosityLevel); diff --git a/src/main/jni-cpp-src/tdlight/td_jni.cpp b/src/main/jni-cpp-src/tdlight/td_jni.cpp index 86ff020..e95781d 100644 --- a/src/main/jni-cpp-src/tdlight/td_jni.cpp +++ b/src/main/jni-cpp-src/tdlight/td_jni.cpp @@ -171,7 +171,6 @@ static jint register_native(JavaVM *vm) { register_method(client_class, "nativeClientReceive", "([I[J[" TD_OBJECT "D)I", Client_nativeClientReceive); register_method(client_class, "nativeClientReceive", "([I[J[" TD_OBJECT "DZZ)I", Client_nativeClientReceiveAdvanced); register_method(client_class, "nativeClientExecute", "(" TD_FUNCTION ")" TD_OBJECT, Client_nativeClientExecute); - register_method(client_class, "destroyNativeClient", "(J)V", Client_destroyNativeClient); register_method(log_class, "setVerbosityLevel", "(I)V", Log_setVerbosityLevel); register_method(log_class, "setFilePath", "(Ljava/lang/String;)Z", Log_setFilePath);