From b53f531f2b9b1024b7785953eaa3364c884c69e0 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Mon, 10 Feb 2020 17:25:31 +0100 Subject: [PATCH 1/2] Fix typo getTagStr in the wrapper --- src/wrapper/java/book.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wrapper/java/book.cpp b/src/wrapper/java/book.cpp index 9f7df5b73..9a517f2b6 100644 --- a/src/wrapper/java/book.cpp +++ b/src/wrapper/java/book.cpp @@ -68,7 +68,7 @@ GETTER(jstring, getFaviconUrl) GETTER(jstring, getFaviconMimeType) METHOD(jstring, Book, getTagStr, jstring tagName) try { - auto cRet = Book->getTagStr(jni2c(tagName, env)); + auto cRet = BOOK->getTagStr(jni2c(tagName, env)); return c2jni(cRet, env); } catch(...) { return c2jni("", env); From ea29557a3324cd31ba6374c7a7133e80d8244c70 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Tue, 11 Feb 2020 17:38:15 +0100 Subject: [PATCH 2/2] [Java] Add a wrapper on method to update book from another book or reader. --- src/wrapper/java/book.cpp | 10 ++++++++++ src/wrapper/java/org/kiwix/kiwixlib/Book.java | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/src/wrapper/java/book.cpp b/src/wrapper/java/book.cpp index 9a517f2b6..2d555f3b7 100644 --- a/src/wrapper/java/book.cpp +++ b/src/wrapper/java/book.cpp @@ -39,6 +39,16 @@ Java_org_kiwix_kiwixlib_Book_dispose(JNIEnv* env, jobject thisObj) #define BOOK (getPtr(env, thisObj)) +METHOD(void, Book, update__Lorg_kiwix_kiwixlib_Book_2, jobject otherBook) +{ + BOOK->update(*getPtr(env, otherBook)); +} + +METHOD(void, Book, update__Lorg_kiwix_kiwixlib_JNIKiwixReader_2, jobject reader) +{ + BOOK->update(**Handle::getHandle(env, reader)); +} + #define GETTER(retType, name) JNIEXPORT retType JNICALL \ Java_org_kiwix_kiwixlib_Book_##name (JNIEnv* env, jobject thisObj) \ { \ diff --git a/src/wrapper/java/org/kiwix/kiwixlib/Book.java b/src/wrapper/java/org/kiwix/kiwixlib/Book.java index 3f00956a9..c40cd1670 100644 --- a/src/wrapper/java/org/kiwix/kiwixlib/Book.java +++ b/src/wrapper/java/org/kiwix/kiwixlib/Book.java @@ -5,6 +5,10 @@ public class Book { public Book() { allocate(); } + + public native void update(Book book); + public native void update(JNIKiwixReader reader); + @Override protected void finalize() { dispose(); }