Skip to content

[FEAT]: Check if arrays have nulls or not in jni #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Doominika wants to merge 8 commits into
base: android-stream-api-testing
Choose a base branch
from
Open

[FEAT]: Check if arrays have nulls or not in jni #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
56299dd
feat: update jArrayToVector function with new acceptNullValues element
Doominika Mar 12, 2026
2562b07
feat: update vectorTojArray function with new acceptNullValues element
Doominika Mar 12, 2026
1723bbd
feat: update array parsing functions with new null-check
Doominika Mar 12, 2026
9c58ab1
feat: use array parsing functions in streamApiLow jni
Doominika Mar 12, 2026
cb472b0
feat: disallow null values in the java array in streamApiLow
Doominika Mar 12, 2026
4a011ea
feat: change acceptNullValues into requireNonNulls to improve readabi…
Doominika Mar 17, 2026
ebecf54
feat: add optional exception check helper macro
Doominika Mar 18, 2026
cd32e16
Merge remote-tracking branch 'origin/android-stream-api-testing' into…
Doominika Mar 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 23 additions & 5 deletions jni-wrappers/privmx-endpoint/includes/privmx/endpoint/wrapper/parsers/parser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

#ifndef PRIVMX_POCKET_LIB_PARSER_H
#define PRIVMX_POCKET_LIB_PARSER_H
#define RETURN_IF_EXCEPTION(ctx, val) if ((ctx)->ExceptionCheck()) return val;

#include "../utils/utils.hpp"
#include <jni.h>
Expand Down Expand Up @@ -54,6 +55,10 @@ privmx::endpoint::core::PagingQuery parsePagingQuery(JniContextUtils &ctx, jobje


// java -> c++
template<typename T>
std::vector<T> jArrayToVector(JniContextUtils &ctx, jobjectArray jArray,
std::function<T(JniContextUtils &, jobject)> fun, bool requireNonNulls);

template<typename T>
std::vector<T> jArrayToVector(JniContextUtils &ctx, jobjectArray jArray,
std::function<T(JniContextUtils &, jobject)> fun);
Expand All @@ -64,7 +69,12 @@ std::string jobject2string(JniContextUtils &ctx, jobject jString);

// c++ -> java
template<typename T, typename F>
jobject vectorTojArray(JniContextUtils &ctx, const std::vector<T> &vector,F fun){
jobject vectorTojArray(
JniContextUtils &ctx,
const std::vector<T> &vector,
F fun,
bool requireNonNulls
) {
jclass arrayListCls = ctx->FindClass("java/util/ArrayList");
jmethodID initMID = ctx->GetMethodID(arrayListCls, "<init>", "()V");
jmethodID addToListMID = ctx->GetMethodID(arrayListCls, "add", "(Ljava/lang/Object;)Z");
Expand All @@ -73,16 +83,24 @@ jobject vectorTojArray(JniContextUtils &ctx, const std::vector<T> &vector,F fun)

for (const auto &item: vector) {
jobject jItem = fun(ctx, item);
if (requireNonNulls) {
if (ctx.nullCheck(jItem, "Array element")) {return nullptr;}
}

ctx->CallBooleanMethod(listObj, addToListMID, jItem);
}

return listObj;
}

template<typename T, typename F>
jobject pagingList2Java(JniContextUtils &ctx, privmx::endpoint::core::PagingList<T> pagingList,F fun);
jobject vectorTojArray(JniContextUtils &ctx, const std::vector<T> &vector, F fun) {
return vectorTojArray(ctx, vector, fun, false);
}

template<typename T, typename F>
jobject pagingList2Java(JniContextUtils &ctx, privmx::endpoint::core::PagingList<T> pagingList, F fun);

jobject string2jobject(JniContextUtils &ctx,const std::string &cstring);
jobject long2jobject(JniContextUtils &ctx,const int64_t &clong);
jobject string2jobject(JniContextUtils &ctx, const std::string &cstring);
jobject long2jobject(JniContextUtils &ctx, const int64_t &clong);

#endif //PRIVMX_POCKET_LIB_PARSER_H
Loading