From 36e3c12a0173a07affa1e64317b5ed4c74720f0e Mon Sep 17 00:00:00 2001
From: Nikolay Pultsin <geometer@fbreader.org>
Date: Thu, 1 Mar 2012 03:53:49 +0000
Subject: [PATCH] proguard.cfg

---
 jni/NativeFormats/util/AndroidUtil.cpp |  2 +-
 proguard.cfg                           | 24 ++++++++++++++++++++++++
 project.properties                     |  2 +-
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/jni/NativeFormats/util/AndroidUtil.cpp b/jni/NativeFormats/util/AndroidUtil.cpp
index de4eb2aa8..a7c340ee0 100644
--- a/jni/NativeFormats/util/AndroidUtil.cpp
+++ b/jni/NativeFormats/util/AndroidUtil.cpp
@@ -66,7 +66,7 @@ JNIEnv *AndroidUtil::getEnv() {
 	return env;
 }
 
-#define CHECK_NULL(value) if ((value) == 0) { throwRuntimeException(env, #value); }
+#define CHECK_NULL(value) if ((value) == 0) { return false; }
 
 bool AndroidUtil::init(JavaVM* jvm) {
 	ourJavaVM = jvm;
diff --git a/proguard.cfg b/proguard.cfg
index 419715672..39c7d1150 100755
--- a/proguard.cfg
+++ b/proguard.cfg
@@ -12,7 +12,31 @@
 -keep public class * extends android.content.ContentProvider
 -keep class * extends java.lang.Exception
 
+-keep class org.geometerplus.zlibrary.core.library.ZLibrary
+-keepclassmembers class org.geometerplus.zlibrary.core.library.ZLibrary {
+    public static ** Instance();
+    public ** getVersionName();
+}
 -keep class org.geometerplus.zlibrary.core.filesystem.ZLFile
+-keepclassmembers class org.geometerplus.zlibrary.core.filesystem.ZLFile {
+    public static ** createFileByPath(**);
+    public ** children();
+    public boolean exists();
+    public boolean isDirectory();
+    public ** getInputStream();
+    public ** getPath();
+    public long size();
+}
+-keep class org.geometerplus.fbreader.formats.PluginCollection
+-keepclassmembers class org.geometerplus.fbreader.formats.PluginCollection {
+    public static ** Instance();
+}
+-keep class org.geometerplus.fbreader.library.Book
+-keepclassmembers class org.geometerplus.fbreader.library.Book {
+}
+-keep class org.geometerplus.fbreader.library.Tag
+-keepclassmembers class org.geometerplus.fbreader.library.Tag {
+}
 
 -keepclasseswithmembernames class * {
     native <methods>;
diff --git a/project.properties b/project.properties
index c4a39de92..3aa40afdc 100644
--- a/project.properties
+++ b/project.properties
@@ -8,6 +8,6 @@
 # project structure.
 
 java.encoding=utf-8
-#proguard.config=proguard.cfg
+proguard.config=proguard.cfg
 # Project target.
 target=android-8