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

proguard.cfg

Browse source
This commit is contained in:
Nikolay Pultsin 2012-03-01 04:19:45 +00:00
parent 36e3c12a01
commit 8dde582bc5
4 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -94,17 +94,17 @@ shared_ptr<Book> Book::loadFromJavaBook(JNIEnv *env, jobject javaBook) {
env->DeleteLocalRef(javaFile); env->DeleteLocalRef(javaFile);
std::string title; std::string title;
javaString = (jstring) env->GetObjectField(javaBook, AndroidUtil::FID_Book_Title); javaString = (jstring) env->CallObjectMethod(javaBook, AndroidUtil::MID_Book_getTitle);
AndroidUtil::extractJavaString(env, javaString, title); AndroidUtil::extractJavaString(env, javaString, title);
env->DeleteLocalRef(javaString); env->DeleteLocalRef(javaString);
std::string language; std::string language;
javaString = (jstring) env->GetObjectField(javaBook, AndroidUtil::FID_Book_Language); javaString = (jstring) env->CallObjectMethod(javaBook, AndroidUtil::MID_Book_getLanguage);
AndroidUtil::extractJavaString(env, javaString, language); AndroidUtil::extractJavaString(env, javaString, language);
env->DeleteLocalRef(javaString); env->DeleteLocalRef(javaString);
std::string encoding; std::string encoding;
javaString = (jstring) env->GetObjectField(javaBook, AndroidUtil::FID_Book_Encoding); javaString = (jstring) env->CallObjectMethod(javaBook, AndroidUtil::MID_Book_getEncoding);
AndroidUtil::extractJavaString(env, javaString, encoding); AndroidUtil::extractJavaString(env, javaString, encoding);
env->DeleteLocalRef(javaString); env->DeleteLocalRef(javaString);

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

@ -54,9 +54,9 @@ jmethodID AndroidUtil::MID_ZLFile_isDirectory;
jmethodID AndroidUtil::MID_ZLFile_size; jmethodID AndroidUtil::MID_ZLFile_size;
jfieldID AndroidUtil::FID_Book_File; jfieldID AndroidUtil::FID_Book_File;
jfieldID AndroidUtil::FID_Book_Title; jmethodID AndroidUtil::MID_Book_getTitle;
jfieldID AndroidUtil::FID_Book_Language; jmethodID AndroidUtil::MID_Book_getLanguage;
jfieldID AndroidUtil::FID_Book_Encoding; jmethodID AndroidUtil::MID_Book_getEncoding;
jmethodID AndroidUtil::SMID_Tag_getTag; jmethodID AndroidUtil::SMID_Tag_getTag;
@ -111,9 +111,9 @@ bool AndroidUtil::init(JavaVM* jvm) {
CHECK_NULL( cls = env->FindClass(Class_Book) ); CHECK_NULL( cls = env->FindClass(Class_Book) );
CHECK_NULL( FID_Book_File = env->GetFieldID(cls, "File", "Lorg/geometerplus/zlibrary/core/filesystem/ZLFile;") ); CHECK_NULL( FID_Book_File = env->GetFieldID(cls, "File", "Lorg/geometerplus/zlibrary/core/filesystem/ZLFile;") );
CHECK_NULL( FID_Book_Title = env->GetFieldID(cls, "myTitle", "Ljava/lang/String;") ); CHECK_NULL( MID_Book_getTitle = env->GetMethodID(cls, "getTitle", "()Ljava/lang/String;") );
CHECK_NULL( FID_Book_Language = env->GetFieldID(cls, "myLanguage", "Ljava/lang/String;") ); CHECK_NULL( MID_Book_getLanguage = env->GetMethodID(cls, "getLanguage", "()Ljava/lang/String;") );
CHECK_NULL( FID_Book_Encoding = env->GetFieldID(cls, "myEncoding", "Ljava/lang/String;") ); CHECK_NULL( MID_Book_getEncoding = env->GetMethodID(cls, "getEncoding", "()Ljava/lang/String;") );
env->DeleteLocalRef(cls); env->DeleteLocalRef(cls);
CHECK_NULL( cls = env->FindClass(Class_Tag) ); CHECK_NULL( cls = env->FindClass(Class_Tag) );

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

@ -63,9 +63,9 @@ public:
static jmethodID SMID_PluginCollection_Instance; static jmethodID SMID_PluginCollection_Instance;
static jfieldID FID_Book_File; static jfieldID FID_Book_File;
static jfieldID FID_Book_Title; static jmethodID MID_Book_getTitle;
static jfieldID FID_Book_Language; static jmethodID MID_Book_getLanguage;
static jfieldID FID_Book_Encoding; static jmethodID MID_Book_getEncoding;
static jmethodID SMID_Tag_getTag; static jmethodID SMID_Tag_getTag;

5
proguard.cfg
View file

@ -33,9 +33,14 @@
} }
-keep class org.geometerplus.fbreader.library.Book -keep class org.geometerplus.fbreader.library.Book
-keepclassmembers class org.geometerplus.fbreader.library.Book { -keepclassmembers class org.geometerplus.fbreader.library.Book {
public ** File;
public ** getTitle();
public ** getLanguage();
public ** getEncoding();
} }
-keep class org.geometerplus.fbreader.library.Tag -keep class org.geometerplus.fbreader.library.Tag
-keepclassmembers class org.geometerplus.fbreader.library.Tag { -keepclassmembers class org.geometerplus.fbreader.library.Tag {
public static ** getTag(**,**);
} }
-keepclasseswithmembernames class * { -keepclasseswithmembernames class * {