diff --git a/library/src/main/cpp/user_groups.cpp b/library/src/main/cpp/user_groups.cpp index 936721b..d35cb61 100644 --- a/library/src/main/cpp/user_groups.cpp +++ b/library/src/main/cpp/user_groups.cpp @@ -269,15 +269,17 @@ Java_network_loki_messenger_libsession_1util_UserGroupsConfig_getCommunityInfo(J jobject thiz, jstring base_url, jstring room) { - auto conf = ptrToUserGroups(env, thiz); + return run_catching_cxx_exception_or_throws(env, [=]() -> jobject { + auto conf = ptrToUserGroups(env, thiz); - auto community = conf->get_community(JavaStringRef(env, base_url).view(), JavaStringRef(env, room).view()); + auto community = conf->get_community(JavaStringRef(env, base_url).view(), JavaStringRef(env, room).view()); - if (community) { - return serialize_community_info(env, *community).release(); - } + if (community) { + return serialize_community_info(env, *community).release(); + } - return nullptr; + return nullptr; + }); } extern "C"