OLD | NEW |
1 /* | 1 /* |
2 * This file is part of Adblock Plus <http://adblockplus.org/>, | 2 * This file is part of Adblock Plus <http://adblockplus.org/>, |
3 * Copyright (C) 2006-2014 Eyeo GmbH | 3 * Copyright (C) 2006-2014 Eyeo GmbH |
4 * | 4 * |
5 * Adblock Plus is free software: you can redistribute it and/or modify | 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 | 6 * it under the terms of the GNU General Public License version 3 as |
7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
8 * | 8 * |
9 * Adblock Plus is distributed in the hope that it will be useful, | 9 * Adblock Plus is distributed in the hope that it will be useful, |
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
(...skipping 24 matching lines...) Expand all Loading... |
35 JNIEnv* env, jobject callbackObject) | 35 JNIEnv* env, jobject callbackObject) |
36 : JniCallbackBase(env, callbackObject) | 36 : JniCallbackBase(env, callbackObject) |
37 { | 37 { |
38 } | 38 } |
39 | 39 |
40 void JniUpdateCheckDoneCallback::Callback(const std::string& arg) | 40 void JniUpdateCheckDoneCallback::Callback(const std::string& arg) |
41 { | 41 { |
42 JNIEnvAcquire env(GetJavaVM()); | 42 JNIEnvAcquire env(GetJavaVM()); |
43 | 43 |
44 jclass clazz = env->GetObjectClass(GetCallbackObject()); | 44 jclass clazz = env->GetObjectClass(GetCallbackObject()); |
45 jmethodID method = env->GetMethodID(clazz, "updateCallback", "(Ljava/lang/Stri
ng;)V"); | 45 jmethodID method = env->GetMethodID(clazz, "updateCheckDoneCallback", "(Ljava/
lang/String;)V"); |
46 | 46 |
47 if (method) | 47 if (method) |
48 { | 48 { |
49 jstring jArg = env->NewStringUTF(arg.c_str()); | 49 jstring jArg = env->NewStringUTF(arg.c_str()); |
50 env->CallVoidMethod(GetCallbackObject(), method, jArg); | 50 env->CallVoidMethod(GetCallbackObject(), method, jArg); |
51 } | 51 } |
52 | 52 |
53 CheckAndLogJavaException(*env); | 53 CheckAndLogJavaException(*env); |
54 } | 54 } |
55 | 55 |
56 static JNINativeMethod methods[] = | 56 static JNINativeMethod methods[] = |
57 { | 57 { |
58 { (char*)"ctor", (char*)"(Ljava/lang/Object;)J", (void*)JniCtor }, | 58 { (char*)"ctor", (char*)"(Ljava/lang/Object;)J", (void*)JniCtor }, |
59 { (char*)"dtor", (char*)"(J)V", (void*)JniDtor } | 59 { (char*)"dtor", (char*)"(J)V", (void*)JniDtor } |
60 }; | 60 }; |
61 | 61 |
62 extern "C" JNIEXPORT void JNICALL | 62 extern "C" JNIEXPORT void JNICALL |
63 Java_org_adblockplus_libadblockplus_UpdateCheckDoneCallback_registerNatives( | 63 Java_org_adblockplus_libadblockplus_UpdateCheckDoneCallback_registerNatives( |
64 JNIEnv *env, jclass clazz) | 64 JNIEnv *env, jclass clazz) |
65 { | 65 { |
66 env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0])); | 66 env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0])); |
67 } | 67 } |
OLD | NEW |