yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-04 02:09:35 +02:00
Code Issues Releases Wiki Activity

store encryption info in FontEntry as well as file path

Browse source
This commit is contained in:
Nikolay Pultsin 2014-04-07 20:18:43 +01:00
parent d7af2c58d5
commit 48cdfee8a2
7 changed files with 59 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

12
jni/NativeFormats/JavaNativeFormatPlugin.cpp
View file

@ -276,6 +276,10 @@ static void initTOC(JNIEnv *env, jobject javaModel, const ContentsTree &tree) {
}
}
static jstring createJavaString(JNIEnv *env, shared_ptr<FileInfo> info) {
return info.isNull() ? 0 : AndroidUtil::createJavaString(env, info->Path);
}
extern "C"
JNIEXPORT jint JNICALL Java_org_geometerplus_fbreader_formats_NativeFormatPlugin_readModelNative(JNIEnv* env, jobject thiz, jobject javaModel) {
shared_ptr<FormatPlugin> plugin = findCppPlugin(thiz);
@ -345,10 +349,10 @@ JNIEXPORT jint JNICALL Java_org_geometerplus_fbreader_formats_NativeFormatPlugin
continue;
}
jstring family = AndroidUtil::createJavaString(env, it->first);
jstring normal = AndroidUtil::createJavaString(env, it->second->Normal);
jstring bold = AndroidUtil::createJavaString(env, it->second->Bold);
jstring italic = AndroidUtil::createJavaString(env, it->second->Italic);
jstring boldItalic = AndroidUtil::createJavaString(env, it->second->BoldItalic);
jstring normal = createJavaString(env, it->second->Normal);
jstring bold = createJavaString(env, it->second->Bold);
jstring italic = createJavaString(env, it->second->Italic);
jstring boldItalic = createJavaString(env, it->second->BoldItalic);
AndroidUtil::Method_NativeBookModel_registerFontEntry->call(
javaModel, family, normal, bold, italic, boldItalic