| Left: | ||
| Right: |
| OLD | NEW |
|---|---|
| (Empty) | |
| 1 /* | |
| 2 * This file is part of Adblock Plus <http://adblockplus.org/>, | |
| 3 * Copyright (C) 2006-2014 Eyeo GmbH | |
| 4 * | |
| 5 * Adblock Plus is free software: you can redistribute it and/or modify | |
| 6 * it under the terms of the GNU General Public License version 3 as | |
| 7 * published by the Free Software Foundation. | |
| 8 * | |
| 9 * Adblock Plus is distributed in the hope that it will be useful, | |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 12 * GNU General Public License for more details. | |
| 13 * | |
| 14 * You should have received a copy of the GNU General Public License | |
| 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. | |
| 16 */ | |
| 17 | |
| 18 #include "JniCallbacks.h" | |
| 19 | |
| 20 JniWebRequest::JniWebRequest(JNIEnv* env, jobject callbackObject) | |
| 21 : JniCallbackBase(env, callbackObject), AdblockPlus::WebRequest() | |
| 22 { | |
| 23 tupleClass.reset(new JniGlobalReference<jclass>(env, env->FindClass("com/githu b/rjeschke/neetutils/collections/Tuple"))); | |
| 24 serverResponseClass.reset(new JniGlobalReference<jclass>(env, env->FindClass(P KG("ServerResponse")))); | |
| 25 } | |
| 26 | |
| 27 JniWebRequest::~JniWebRequest() | |
| 28 { | |
| 29 } | |
| 30 | |
| 31 AdblockPlus::ServerResponse JniWebRequest::GET(const std::string& url, const Adb lockPlus::HeaderList& requestHeaders) const | |
| 32 { | |
| 33 JNIEnvAcquire env(GetJavaVM()); | |
| 34 | |
| 35 jclass clazz = env->GetObjectClass(GetCallbackObject()); | |
| 36 jmethodID method = env->GetMethodID(clazz, "httpGET", "(Ljava/lang/String;Ljav a/util/List;)" TYP("ServerResponse")); | |
| 37 | |
| 38 AdblockPlus::ServerResponse sResponse; | |
| 39 sResponse.status = AdblockPlus::WebRequest::NS_ERROR_FAILURE; | |
| 40 | |
| 41 if (method) | |
| 42 { | |
| 43 jobject arrayList = NewJniArrayList(*env); | |
| 44 | |
| 45 for (AdblockPlus::HeaderList::const_iterator it = requestHeaders.begin(), en d = requestHeaders.end(); it != end; it++) | |
| 46 { | |
| 47 JniAddObjectToList(*env, arrayList, NewTuple(*env, it->first, it->second)) ; | |
| 48 } | |
| 49 | |
| 50 jobject response = env->CallObjectMethod(GetCallbackObject(), method, env->N ewStringUTF(url.c_str()), arrayList); | |
| 51 | |
| 52 if (!env->ExceptionCheck()) | |
| 53 { | |
| 54 sResponse.status = JniGetLongField(*env, serverResponseClass->get(), respo nse, "status"); | |
| 55 sResponse.responseStatus = JniGetIntField(*env, serverResponseClass->get() , response, "responseStatus"); | |
| 56 sResponse.responseText = JniGetStringField(*env, serverResponseClass->get( ), response, "response"); | |
| 57 // TODO: transform Headers | |
| 58 } | |
| 59 } | |
| 60 | |
| 61 CheckAndLogJavaException(*env); | |
| 62 | |
| 63 return sResponse; | |
| 64 } | |
| 65 | |
| 66 jobject JniWebRequest::NewTuple(JNIEnv* env, const std::string& a, const std::st ring& b) const | |
| 67 { | |
| 68 jmethodID factory = env->GetMethodID(tupleClass->get(), "<init>", "(Ljava/lang /Object;Ljava/lang/Object;)V"); | |
| 69 return env->NewObject(tupleClass->get(), factory, env->NewStringUTF(a.c_str()) , env->NewStringUTF(b.c_str())); | |
| 70 } | |
| 71 | |
| 72 static jlong JNICALL JniCtor(JNIEnv* env, jclass clazz, jobject callbackObject) | |
|
Felix Dahlke
2014/03/28 17:28:41
Static stuff to the top here as well please.
René Jeschke
2014/04/11 12:25:53
Done.
| |
| 73 { | |
| 74 TRY | |
| 75 { | |
| 76 return JniPtrToLong(new AdblockPlus::WebRequestPtr(new JniWebRequest(env, ca llbackObject))); | |
| 77 } | |
| 78 CATCH_THROW_AND_RETURN(env, 0) | |
| 79 } | |
| 80 | |
| 81 static void JNICALL JniDtor(JNIEnv* env, jclass clazz, jlong ptr) | |
| 82 { | |
| 83 delete JniLongToTypePtr<AdblockPlus::WebRequestPtr>(ptr); | |
| 84 } | |
| 85 | |
| 86 static JNINativeMethod methods[] = | |
| 87 { | |
| 88 { (char*)"ctor", (char*)"(Ljava/lang/Object;)J", (void*)JniCtor }, | |
| 89 { (char*)"dtor", (char*)"(J)V", (void*)JniDtor } | |
| 90 }; | |
| 91 | |
| 92 extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_android_api_WebRequest_re gisterNatives(JNIEnv *env, jclass clazz) | |
| 93 { | |
| 94 env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0])); | |
| 95 } | |
| OLD | NEW |