yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-03 17:59:33 +02:00
Code Issues Releases Wiki Activity

fixed native code issue (missing change in previous commit)

Browse source
This commit is contained in:
Nikolay Pultsin 2015-05-23 20:03:52 +01:00
parent 9135ae7f8c
commit d4410cdec5
3 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
jni/NativeFormats/fbreader/src/library/Book.cpp
View file

@ -86,10 +86,7 @@ shared_ptr<Book> Book::loadFromFile(const ZLFile &file) {
*/ */
shared_ptr<Book> Book::loadFromJavaBook(JNIEnv *env, jobject javaBook) { shared_ptr<Book> Book::loadFromJavaBook(JNIEnv *env, jobject javaBook) {
jobject javaFile = AndroidUtil::Field_Book_File->value(javaBook); const std::string path = AndroidUtil::Method_Book_getPath->callForCppString(javaBook);
const std::string path = AndroidUtil::Method_ZLFile_getPath->callForCppString(javaFile);
env->DeleteLocalRef(javaFile);
const std::string title = AndroidUtil::Method_Book_getTitle->callForCppString(javaBook); const std::string title = AndroidUtil::Method_Book_getTitle->callForCppString(javaBook);
const std::string language = AndroidUtil::Method_Book_getLanguage->callForCppString(javaBook); const std::string language = AndroidUtil::Method_Book_getLanguage->callForCppString(javaBook);
const std::string encoding = AndroidUtil::Method_Book_getEncodingNoDetection->callForCppString(javaBook); const std::string encoding = AndroidUtil::Method_Book_getEncodingNoDetection->callForCppString(javaBook);

4
jni/NativeFormats/util/AndroidUtil.cpp
View file

@ -104,7 +104,7 @@ shared_ptr<Constructor> AndroidUtil::Constructor_ZLFileImage;
shared_ptr<StaticObjectMethod> AndroidUtil::StaticMethod_Paths_tempDirectory; shared_ptr<StaticObjectMethod> AndroidUtil::StaticMethod_Paths_tempDirectory;
shared_ptr<ObjectField> AndroidUtil::Field_Book_File; shared_ptr<StringMethod> AndroidUtil::Method_Book_getPath;
shared_ptr<StringMethod> AndroidUtil::Method_Book_getTitle; shared_ptr<StringMethod> AndroidUtil::Method_Book_getTitle;
shared_ptr<StringMethod> AndroidUtil::Method_Book_getLanguage; shared_ptr<StringMethod> AndroidUtil::Method_Book_getLanguage;
shared_ptr<StringMethod> AndroidUtil::Method_Book_getEncodingNoDetection; shared_ptr<StringMethod> AndroidUtil::Method_Book_getEncodingNoDetection;
@ -187,7 +187,7 @@ bool AndroidUtil::init(JavaVM* jvm) {
StaticMethod_Paths_tempDirectory = new StaticObjectMethod(Class_Paths, "tempDirectory", Class_java_lang_String, "()"); StaticMethod_Paths_tempDirectory = new StaticObjectMethod(Class_Paths, "tempDirectory", Class_java_lang_String, "()");
Field_Book_File = new ObjectField(Class_AbstractBook, "File", Class_ZLFile); Method_Book_getPath = new StringMethod(Class_AbstractBook, "getPath", "()");
Method_Book_getTitle = new StringMethod(Class_AbstractBook, "getTitle", "()"); Method_Book_getTitle = new StringMethod(Class_AbstractBook, "getTitle", "()");
Method_Book_getLanguage = new StringMethod(Class_AbstractBook, "getLanguage", "()"); Method_Book_getLanguage = new StringMethod(Class_AbstractBook, "getLanguage", "()");
Method_Book_getEncodingNoDetection = new StringMethod(Class_AbstractBook, "getEncodingNoDetection", "()"); Method_Book_getEncodingNoDetection = new StringMethod(Class_AbstractBook, "getEncodingNoDetection", "()");

2
jni/NativeFormats/util/AndroidUtil.h
View file

@ -142,7 +142,7 @@ public:
static shared_ptr<StaticObjectMethod> StaticMethod_Paths_tempDirectory; static shared_ptr<StaticObjectMethod> StaticMethod_Paths_tempDirectory;
static shared_ptr<ObjectField> Field_Book_File; static shared_ptr<StringMethod> Method_Book_getPath;
static shared_ptr<StringMethod> Method_Book_getTitle; static shared_ptr<StringMethod> Method_Book_getTitle;
static shared_ptr<StringMethod> Method_Book_getLanguage; static shared_ptr<StringMethod> Method_Book_getLanguage;
static shared_ptr<StringMethod> Method_Book_getEncodingNoDetection; static shared_ptr<StringMethod> Method_Book_getEncodingNoDetection;