diff --git a/lib/src/main/cpp/libkiwix/bookmark.cpp b/lib/src/main/cpp/libkiwix/bookmark.cpp index fe61d18..146f90d 100644 --- a/lib/src/main/cpp/libkiwix/bookmark.cpp +++ b/lib/src/main/cpp/libkiwix/bookmark.cpp @@ -39,6 +39,10 @@ GETTER(jstring, getBookId) GETTER(jstring, getBookTitle) +GETTER(jstring, getBookName) + +GETTER(jstring, getBookFlavour) + GETTER(jstring, getUrl) GETTER(jstring, getTitle) @@ -55,6 +59,14 @@ METHOD(void, setBookTitle, jstring bookTitle) { THIS->setBookTitle(TO_C(bookTitle)); } CATCH_EXCEPTION() +METHOD(void, setBookName, jstring bookName) { + THIS->setBookName(TO_C(bookName)); +} CATCH_EXCEPTION() + +METHOD(void, setBookFlavour, jstring bookFlavour) { + THIS->setBookFlavour(TO_C(bookFlavour)); +} CATCH_EXCEPTION() + METHOD(void, setUrl, jstring url) { THIS->setUrl(TO_C(url)); } CATCH_EXCEPTION() diff --git a/lib/src/main/java/org/kiwix/libkiwix/Bookmark.java b/lib/src/main/java/org/kiwix/libkiwix/Bookmark.java index 936ab57..e6db70d 100644 --- a/lib/src/main/java/org/kiwix/libkiwix/Bookmark.java +++ b/lib/src/main/java/org/kiwix/libkiwix/Bookmark.java @@ -31,6 +31,8 @@ public class Bookmark public native void setBookId(String bookId); public native void setBookTitle(String bookTitle); + public native void setBookName(String bookName); + public native void setBookFlavour(String bookFlavour); public native void setUrl(String url); public native void setTitle(String title); public native void setLanguage(String language); @@ -38,6 +40,8 @@ public class Bookmark public native String getBookId(); public native String getBookTitle(); + public native String getBookName(); + public native String getBookFlavour(); public native String getUrl(); public native String getTitle(); public native String getLanguage(); diff --git a/lib/src/test/org/kiwix/test/libkiwix/TestBookmark.java b/lib/src/test/org/kiwix/test/libkiwix/TestBookmark.java index ed71704..5b911d5 100644 --- a/lib/src/test/org/kiwix/test/libkiwix/TestBookmark.java +++ b/lib/src/test/org/kiwix/test/libkiwix/TestBookmark.java @@ -30,6 +30,8 @@ public class TestBookmark public void setBookId(String bookId) { inner.setBookId(bookId); } public void setBookTitle(String bookTitle) { inner.setBookTitle(bookTitle); } + public void setBookName(String bookName) { inner.setBookName(bookName); } + public void setBookFlavour(String bookFlavour) { inner.setBookFlavour(bookFlavour); } public void setUrl(String url) { inner.setUrl(url); } public void setTitle(String title) { inner.setTitle(title); } public void setLanguage(String language) { inner.setLanguage(language); } @@ -37,6 +39,8 @@ public class TestBookmark public String getBookId() { return inner.getBookId(); } public String getBookTitle() { return inner.getBookTitle(); } + public String getBookName() { return inner.getBookName(); } + public String getBookFlavour() { return inner.getBookFlavour(); } public String getUrl() { return inner.getUrl(); } public String getTitle() { return inner.getTitle(); } public String getLanguage() { return inner.getLanguage(); } diff --git a/lib/src/test/test.java b/lib/src/test/test.java index c5c8705..7567971 100644 --- a/lib/src/test/test.java +++ b/lib/src/test/test.java @@ -463,11 +463,13 @@ public class test { lib.addBook(book); TestBookmark bookmark = new TestBookmark(); bookmark.setBookId(book.getId()); - bookmark.setTitle(book.getTitle()); - bookmark.setUrl(book.getUrl()); + bookmark.setTitle("A title for an article"); + bookmark.setUrl("foo/bar.html"); bookmark.setLanguage(book.getLanguage()); bookmark.setDate(book.getDate()); - bookmark.setBookTitle(book.getName()); + bookmark.setBookTitle(book.getTitle()); + bookmark.setBookName(book.getName()); + bookmark.setBookFlavour(book.getFlavour()); // add bookmark to library lib.addBookmark(bookmark); TestBookmark[] bookmarkArray = lib.getBookmarks(true); @@ -475,11 +477,13 @@ public class test { bookmark = bookmarkArray[0]; // test saved bookmark assertEquals(bookmark.getBookId(), book.getId()); - assertEquals(bookmark.getTitle(), book.getTitle()); - assertEquals(bookmark.getUrl(), book.getUrl()); + assertEquals(bookmark.getTitle(), "A title for an article"); + assertEquals(bookmark.getUrl(), "foo/bar.html"); assertEquals(bookmark.getLanguage(), book.getLanguage()); assertEquals(bookmark.getDate(), book.getDate()); - assertEquals(bookmark.getBookTitle(), book.getName()); + assertEquals(bookmark.getBookTitle(), book.getTitle()); + assertEquals(bookmark.getBookName(), book.getName()); + assertEquals(bookmark.getBookFlavour(), book.getFlavour()); // remove bookmark from library lib.removeBookmark(bookmark.getBookId(), bookmark.getUrl()); bookmarkArray = lib.getBookmarks(true);