New JNI bindings

jni/JniWebRequest.cpp

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "JniCallbacks.h"
 
-AdblockPlus::Android::JniWebRequest::JniWebRequest(JNIEnv* env, jobject callbackObject) :
-    JniCallbackBase(env, callbackObject), AdblockPlus::WebRequest()
+static jlong JNICALL JniCtor(JNIEnv* env, jclass clazz, jobject callbackObject)
 {
-  m_TupleClass.reset(new JniGlobalReference<jclass>(env, env->FindClass("com/github/rjeschke/neetutils/collections/Tuple")));
-  m_ServerResponseClass.reset(new JniGlobalReference<jclass>(env, env->FindClass(PKG("ServerResponse"))));
+  try
+  {
+    return JniPtrToLong(new AdblockPlus::WebRequestPtr(new JniWebRequest(env, callbackObject)));
+  }
+  CATCH_THROW_AND_RETURN(env, 0)
 }
 
-AdblockPlus::Android::JniWebRequest::~JniWebRequest()
+static void JNICALL JniDtor(JNIEnv* env, jclass clazz, jlong ptr)
 {
+  delete JniLongToTypePtr<AdblockPlus::WebRequestPtr>(ptr);
 }
 
-AdblockPlus::ServerResponse AdblockPlus::Android::JniWebRequest::GET(const std::string& url,
-    const AdblockPlus::HeaderList& requestHeaders) const
+JniWebRequest::JniWebRequest(JNIEnv* env, jobject callbackObject)
+  : JniCallbackBase(env, callbackObject), AdblockPlus::WebRequest()
 {
-  AdblockPlus::Android::JNIEnvAcquire env(GetJavaVM());
+  tupleClass.reset(new JniGlobalReference<jclass>(env, env->FindClass("com/github/rjeschke/neetutils/collections/Tuple")));
+  serverResponseClass.reset(new JniGlobalReference<jclass>(env, env->FindClass(PKG("ServerResponse"))));
+}
+
+AdblockPlus::ServerResponse JniWebRequest::GET(const std::string& url, const AdblockPlus::HeaderList& requestHeaders) const
+{
+  JNIEnvAcquire env(GetJavaVM());
 
   jclass clazz = env->GetObjectClass(GetCallbackObject());
   jmethodID method = env->GetMethodID(clazz, "httpGET", "(Ljava/lang/String;Ljava/util/List;)" TYP("ServerResponse"));
 
   AdblockPlus::ServerResponse sResponse;
   sResponse.status = AdblockPlus::WebRequest::NS_ERROR_FAILURE;
 
   if (method)
   {
     jobject arrayList = NewJniArrayList(*env);
 
     for (AdblockPlus::HeaderList::const_iterator it = requestHeaders.begin(), end = requestHeaders.end(); it != end; it++)
     {
       JniAddObjectToList(*env, arrayList, NewTuple(*env, it->first, it->second));
     }
 
     jobject response = env->CallObjectMethod(GetCallbackObject(), method, env->NewStringUTF(url.c_str()), arrayList);
 
     if (!env->ExceptionCheck())
     {
-      sResponse.status = AdblockPlus::Android::JniGetLongField(*env, m_ServerResponseClass->get(), response, "status");
-      sResponse.responseStatus = AdblockPlus::Android::JniGetIntField(*env, m_ServerResponseClass->get(), response, "responseStatus");
-      sResponse.responseText = AdblockPlus::Android::JniGetStringField(*env, m_ServerResponseClass->get(), response, "response");
+      sResponse.status = JniGetLongField(*env, serverResponseClass->Get(), response, "status");
+      sResponse.responseStatus = JniGetIntField(*env, serverResponseClass->Get(), response, "responseStatus");
+      sResponse.responseText = JniGetStringField(*env, serverResponseClass->Get(), response, "response");
       // TODO: transform Headers
     }
   }
 
   CheckAndLogJavaException(*env);
 
   return sResponse;
 }
 
-jobject AdblockPlus::Android::JniWebRequest::NewTuple(JNIEnv* env, const std::string& a, const std::string& b) const
+jobject JniWebRequest::NewTuple(JNIEnv* env, const std::string& a, const std::string& b) const
 {
-  jmethodID factory = env->GetMethodID(m_TupleClass->get(), "<init>", "(Ljava/lang/Object;Ljava/lang/Object;)V");
-  return env->NewObject(m_TupleClass->get(), factory, env->NewStringUTF(a.c_str()), env->NewStringUTF(b.c_str()));
-}
-
-static jlong JNICALL JniCtor(JNIEnv* env, jclass clazz, jobject callbackObject)
-{
-  TRY
-  {
-    return AdblockPlus::Android::JniPtr2Long(new AdblockPlus::WebRequestPtr(new AdblockPlus::Android::JniWebRequest(env, callbackObject)));
-  }
-  CATCH_THROW_AND_RETURN(env, 0)
-}
-
-static void JNICALL JniDtor(JNIEnv* env, jclass clazz, jlong ptr)
-{
-  delete AdblockPlus::Android::JniLong2TypePtr<AdblockPlus::WebRequestPtr>(ptr);
+  jmethodID factory = env->GetMethodID(tupleClass->Get(), "<init>", "(Ljava/lang/Object;Ljava/lang/Object;)V");
+  return env->NewObject(tupleClass->Get(), factory, env->NewStringUTF(a.c_str()), env->NewStringUTF(b.c_str()));
 }
 
 static JNINativeMethod methods[] =
 {
-{ (char*)"ctor", (char*)"(Ljava/lang/Object;)J", (void*)JniCtor },
-{ (char*)"dtor", (char*)"(J)V", (void*)JniDtor }, };
+  { (char*)"ctor", (char*)"(Ljava/lang/Object;)J", (void*)JniCtor },
+  { (char*)"dtor", (char*)"(J)V", (void*)JniDtor }
+};
 
-extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_android_api_WebRequest_registerNatives(JNIEnv *env, jclass clazz)
+extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_libadblockplus_WebRequest_registerNatives(JNIEnv *env, jclass clazz)
 {
   env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0]));
 }