TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-02 23:15:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Catch another merge function

Browse Source
This commit is contained in:
fanchao 2024-05-28 14:51:25 +10:00
parent a78c11f258
commit 3743ef42bd
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,12 +105,15 @@ Java_network_loki_messenger_libsession_1util_ConfigBase_merge___3Lkotlin_Pair_2(
JNIEXPORT jobject JNICALL JNIEXPORT jobject JNICALL
Java_network_loki_messenger_libsession_1util_ConfigBase_merge__Lkotlin_Pair_2(JNIEnv *env, jobject thiz, Java_network_loki_messenger_libsession_1util_ConfigBase_merge__Lkotlin_Pair_2(JNIEnv *env, jobject thiz,
jobject to_merge) { jobject to_merge) {
std::lock_guard lock{util::util_mutex_}; return jni_utils::run_catching_cxx_exception_or_throws<jobject>(env, [=] {
auto conf = ptrToConfigBase(env, thiz); std::lock_guard lock{util::util_mutex_};
std::vector<std::pair<std::string, session::ustring>> configs = {extractHashAndData(env, to_merge)}; auto conf = ptrToConfigBase(env, thiz);
auto returned = conf->merge(configs); std::vector<std::pair<std::string, session::ustring>> configs = {
auto string_stack = util::build_string_stack(env, returned); extractHashAndData(env, to_merge)};
return string_stack; auto returned = conf->merge(configs);
auto string_stack = util::build_string_stack(env, returned);
return string_stack;
}
} }
#pragma clang diagnostic pop #pragma clang diagnostic pop