Issue 1108 - Support notifications

jni/Utils.h

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 129 matching lines @@
 // TODO: It's feeling a bit dirty casting to shared_ptr<T: JsValue> directly, so maybe
 // implement a special cast functions that first reinterpret_casts to shared_ptr<JsValue> and then
 // dynamic_casts to shared_ptr<T: JsValue> ... also as the same inheritance is mirrored on the Java
 // side (and Java will throw a class cast exception on error) this shouldn't be an issue (TM)
 template<typename T>
 inline T* JniLongToTypePtr(jlong value)
 {
   return reinterpret_cast<T*>((size_t)value);
 }
 
-jobject NewJniArrayList(JNIEnv* env);
-
 std::string JniJavaToStdString(JNIEnv* env, jstring str);
 
 void JniAddObjectToList(JNIEnv* env, jobject list, jobject value);
 
 inline std::string JniGetStringField(JNIEnv* env, jclass clazz, jobject jObj, const char* name)
 {
   return JniJavaToStdString(env, reinterpret_cast<jstring>(env->GetObjectField(jObj, env->GetFieldID(clazz, name, "Ljava/lang/String;"))));
 }
 
 inline bool JniGetBooleanField(JNIEnv* env, jclass clazz, jobject jObj, const char* name)
 {
   return env->GetBooleanField(jObj, env->GetFieldID(clazz, name, "Z")) == JNI_TRUE;
 }
 
 inline int32_t JniGetIntField(JNIEnv* env, jclass clazz, jobject jObj, const char* name)
 {
   return (int32_t)env->GetIntField(jObj, env->GetFieldID(clazz, name, "I"));
 }
 
 inline int64_t JniGetLongField(JNIEnv* env, jclass clazz, jobject jObj, const char* name)
 {
   return (int64_t)env->GetLongField(jObj, env->GetFieldID(clazz, name, "J"));
 }
 
-inline jobject NewJniFilter(JNIEnv* env, const AdblockPlus::FilterPtr& filter)
-{
-  if (!filter.get())
-  {
-    return 0;
-  }
+jobject NewJniArrayList(JNIEnv* env);
 
-  JniLocalReference<jclass> clazz(env, env->FindClass(PKG("Filter")));
-  jmethodID method = env->GetMethodID(*clazz, "<init>", "(J)V");
-  return env->NewObject(*clazz, method,
-      JniPtrToLong(new AdblockPlus::FilterPtr(filter)));
-}
+jobject NewJniFilter(JNIEnv* env, const AdblockPlus::FilterPtr& filter);
 
-inline jobject NewJniSubscription(JNIEnv* env,
-    const AdblockPlus::SubscriptionPtr& subscription)
-{
-  if (!subscription.get())
-  {
-    return 0;
-  }
+jobject NewJniSubscription(JNIEnv* env,
+    const AdblockPlus::SubscriptionPtr& subscription);
 
-  JniLocalReference<jclass> clazz(env, env->FindClass(PKG("Subscription")));
-  jmethodID method = env->GetMethodID(*clazz, "<init>", "(J)V");
-  return env->NewObject(*clazz, method,
-      JniPtrToLong(new AdblockPlus::SubscriptionPtr(subscription)));
-}
+jobject NewJniNotification(JNIEnv* env,
+    const AdblockPlus::NotificationPtr& notification);
 
 #define CATCH_AND_THROW(jEnv) \
   catch (const std::exception& except) \
   { \
     JniThrowException(jEnv, except); \
   } \
   catch (...) \
   { \
     JniThrowException(jEnv); \
   }
 
 #define CATCH_THROW_AND_RETURN(jEnv, retVal) \
   catch (const std::exception& except) \
   { \
     JniThrowException(jEnv, except); \
     return retVal; \
   } \
   catch (...) \
   { \
     JniThrowException(jEnv); \
     return retVal; \
   }
 
 #endif