TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-25 02:55:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wrap config_base.cpp also

Browse Source
This commit is contained in:
fanchao 2024-05-28 14:37:06 +10:00
parent f16735d4ee
commit a78c11f258
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libsession-util/src/main/cpp/config_base.cpp
View File

@ -1,5 +1,6 @@
#include "config_base.h" #include "config_base.h"
#include "util.h" #include "util.h"
#include "jni_utils.h"
extern "C" { extern "C" {
JNIEXPORT jboolean JNICALL JNIEXPORT jboolean JNICALL
@ -85,10 +86,11 @@ Java_network_loki_messenger_libsession_1util_ConfigBase_confirmPushed(JNIEnv *en
JNIEXPORT jobject JNICALL JNIEXPORT jobject JNICALL
Java_network_loki_messenger_libsession_1util_ConfigBase_merge___3Lkotlin_Pair_2(JNIEnv *env, jobject thiz, Java_network_loki_messenger_libsession_1util_ConfigBase_merge___3Lkotlin_Pair_2(JNIEnv *env, jobject thiz,
jobjectArray to_merge) { jobjectArray to_merge) {
return jni_utils::run_catching_cxx_exception_or_throws<jobject>(env, [=] {
std::lock_guard lock{util::util_mutex_}; std::lock_guard lock{util::util_mutex_};
auto conf = ptrToConfigBase(env, thiz); auto conf = ptrToConfigBase(env, thiz);
size_t number = env->GetArrayLength(to_merge); size_t number = env->GetArrayLength(to_merge);
std::vector<std::pair<std::string,session::ustring>> configs = {}; std::vector<std::pair<std::string, session::ustring>> configs = {};
for (int i = 0; i < number; i++) { for (int i = 0; i < number; i++) {
auto jElement = (jobject) env->GetObjectArrayElement(to_merge, i); auto jElement = (jobject) env->GetObjectArrayElement(to_merge, i);
auto pair = extractHashAndData(env, jElement); auto pair = extractHashAndData(env, jElement);
@ -97,6 +99,7 @@ Java_network_loki_messenger_libsession_1util_ConfigBase_merge___3Lkotlin_Pair_2(
auto returned = conf->merge(configs); auto returned = conf->merge(configs);
auto string_stack = util::build_string_stack(env, returned); auto string_stack = util::build_string_stack(env, returned);
return string_stack; return string_stack;
});
} }
JNIEXPORT jobject JNICALL JNIEXPORT jobject JNICALL