Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: jni/JniUpdaterCallback.cpp

Issue 6245218638626816: Issue 1424 - Update libadblockplus-binaries to 6f79af14ad4e (Closed)
Patch Set: Use GetObjectClass instead of FindClass Created Sept. 22, 2014, 1:16 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « jni/JniUpdateCheckDoneCallback.cpp ('k') | src/org/adblockplus/android/ABPEngine.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: jni/JniUpdaterCallback.cpp
===================================================================
deleted file mode 100644
--- a/jni/JniUpdaterCallback.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * 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"
-
-static jlong JNICALL JniCtor(JNIEnv* env, jclass clazz, jobject callbackObject)
-{
- try
- {
- return JniPtrToLong(new JniUpdaterCallback(env, callbackObject));
- }
- CATCH_THROW_AND_RETURN(env, 0)
-}
-
-static void JNICALL JniDtor(JNIEnv* env, jclass clazz, jlong ptr)
-{
- delete JniLongToTypePtr<JniUpdaterCallback>(ptr);
-}
-
-JniUpdaterCallback::JniUpdaterCallback(JNIEnv* env, jobject callbackObject)
- : JniCallbackBase(env, callbackObject)
-{
-}
-
-void JniUpdaterCallback::Callback(const std::string& arg)
-{
- JNIEnvAcquire env(GetJavaVM());
-
- jclass clazz = env->GetObjectClass(GetCallbackObject());
- jmethodID method = env->GetMethodID(clazz, "updateCallback", "(Ljava/lang/String;)V");
-
- if (method)
- {
- jstring jArg = env->NewStringUTF(arg.c_str());
- env->CallVoidMethod(GetCallbackObject(), method, jArg);
- }
-
- CheckAndLogJavaException(*env);
-}
-
-static JNINativeMethod methods[] =
-{
- { (char*)"ctor", (char*)"(Ljava/lang/Object;)J", (void*)JniCtor },
- { (char*)"dtor", (char*)"(J)V", (void*)JniDtor }
-};
-
-extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_libadblockplus_UpdaterCallback_registerNatives(JNIEnv *env, jclass clazz)
-{
- env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0]));
-}
« no previous file with comments | « jni/JniUpdateCheckDoneCallback.cpp ('k') | src/org/adblockplus/android/ABPEngine.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld