Issue 4442 - Cache class and ctors references in JNI_Load/UnLoad

libadblockplus-android/jni/JniCallbacks.h

Index: libadblockplus-android/jni/JniCallbacks.h
diff --git a/libadblockplus-android/jni/JniCallbacks.h b/libadblockplus-android/jni/JniCallbacks.h
index d0261eb3e2cd217cc3712e2885810a11f6f897d4..212f19b5693bdfc8729d61fbc2193e8fcd18c46d 100644
--- a/libadblockplus-android/jni/JniCallbacks.h
+++ b/libadblockplus-android/jni/JniCallbacks.h
@@ -22,6 +22,10 @@
 #include "Utils.h"
 #include "JniJsValue.h"
 
+void JniCallbacks_OnLoad(JavaVM* vm, JNIEnv* env, void* reserved);
+
+void JniCallbacks_OnUnload(JavaVM* vm, JNIEnv* env, void* reserved);
+
 class JniCallbackBase
 {
 public:
@@ -43,7 +47,6 @@ public:
 private:
   JavaVM* javaVM;
   const JniGlobalReference<jobject>::Ptr callbackObject;
-  const JniGlobalReference<jclass>::Ptr exceptionLoggerClass;
 };
 
 class JniEventCallback : public JniCallbackBase
@@ -72,9 +75,6 @@ class JniFilterChangeCallback : public JniCallbackBase
 public:
   JniFilterChangeCallback(JNIEnv* env, jobject callbackObject);
   void Callback(const std::string& arg, const AdblockPlus::JsValuePtr jsValue);
-
-private:
-  const JniGlobalReference<jclass>::Ptr jsValueClass;
 };
 
 class JniLogSystemCallback : public JniCallbackBase, public AdblockPlus::LogSystem
@@ -82,9 +82,6 @@ class JniLogSystemCallback : public JniCallbackBase, public AdblockPlus::LogSyst
 public:
   JniLogSystemCallback(JNIEnv* env, jobject callbackObject);
   void operator()(AdblockPlus::LogSystem::LogLevel logLevel, const std::string& message, const std::string& source);
-
-private:
-  const JniGlobalReference<jclass>::Ptr logLevelClass;
 };
 
 class JniShowNotificationCallback : public JniCallbackBase
@@ -92,9 +89,6 @@ class JniShowNotificationCallback : public JniCallbackBase
 public:
   JniShowNotificationCallback(JNIEnv* env, jobject callbackObject);
   void Callback(const AdblockPlus::NotificationPtr&);
-
-private:
-  const JniGlobalReference<jclass>::Ptr notificationClass;
 };
 
 class JniWebRequest : public JniCallbackBase, public AdblockPlus::WebRequest
@@ -104,10 +98,7 @@ public:
   AdblockPlus::ServerResponse GET(const std::string& url, const AdblockPlus::HeaderList& requestHeaders) const;
 
 private:
-  jobject NewTuple(JNIEnv* env, const std::string& a, const std::string& b) const;

[anton, 2016/09/23 13:05:25]

"NewTuple" is misleading in WebRequest context, "NewHeaderEntry" is more clear
IMHO

[Felix Dahlke, 2016/11/18 10:42:23]

Pretty unrelated change though, hm? Given how many files are being changed here 
I think we should stick to what the issue says.

[anton, 2016/11/21 08:26:38]

Acknowledged. Fixed in patch set #2

-
-  const JniGlobalReference<jclass>::Ptr tupleClass;
-  const JniGlobalReference<jclass>::Ptr serverResponseClass;
+  jobject NewHeaderEntry(JNIEnv* env, const std::string& a, const std::string& b) const;
 };
 
 #endif /* JNICALLBACKS_H */