kiwix/java-libkiwix
1
0
Fork 0
mirror of https://github.com/kiwix/java-libkiwix.git synced 2025-09-09 07:08:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix creation of Bookmark.

Browse Source 
Bookmark wrapper can be created using two ways:
- From a existing (cpp) bookmark (done internally by Library wrapper code)
- As a totally new one (empty) the java code will have to setup (using
  `set*` methods).

If the `Bookmark` constructor always create an empty new cpp bookmark,
when we set the wrapper to point to the existing bookmark, we will have a
leak of the new created bookmark.

As we want to keep the "basic" constructor as the normal java api to
create an empty bookmark, we need another (private) constructor to avoid
the construction of an empty bookmark.

The new constructor take a handle and directly set the `nativeHandle`.

On `Library.getBookmarks` we cannot use the helper `BUILD_WRAPPER` and
we must use "internal" function to use the `(J)V` constructor instead of
the basic `()V`.
This commit is contained in:
Matthieu Gautier 2023-03-20 14:50:46 +01:00
parent 3073712aa9
commit 285817f959
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/src/main/cpp/libkiwix/library.cpp
View File

@ -97,8 +97,14 @@ METHOD(jobjectArray, getBookmarks, jboolean onlyValidBookmarks) {
auto bookmarks = THIS->getBookmarks(TO_C(onlyValidBookmarks));
jobjectArray retArray = createArray(env, bookmarks.size(), "org/kiwix/libkiwix/Bookmark");
size_t index = 0;
jclass wrapperClass = env->FindClass("org/kiwix/libkiwix/Bookmark");
jmethodID initMethod = env->GetMethodID(wrapperClass, "<init>", "(J)V");
for (auto bookmark: bookmarks) {
auto wrapper = BUILD_WRAPPER("org/kiwix/libkiwix/Bookmark", bookmark);
// This double new is necessary as we need to allocate the bookmark itself (as a shared_ptr) on the heap but
// we also want the shared_ptr to be stored in the head as we want to have a ptr (cast as long) to it.
shared_ptr<kiwix::Bookmark>* handle = new shared_ptr<kiwix::Bookmark>(new kiwix::Bookmark(std::move(bookmark)));
jobject wrapper = env->NewObject(wrapperClass, initMethod, reinterpret_cast<jlong>(handle));
env->SetObjectArrayElement(retArray, index++, wrapper);
}
return retArray;

4
lib/src/main/java/org/kiwix/libkiwix/Bookmark.java
View File

@ -25,6 +25,10 @@ public class Bookmark
setNativeBookmark();
}
private Bookmark(long handle) {
nativeHandle = handle;
}
public native void setBookId(String bookId);
public native void setBookTitle(String bookTitle);
public native void setUrl(String url);