Left: | ||
Right: |
LEFT | RIGHT |
---|---|
1 /* | 1 /* |
2 * This file is part of Adblock Plus <https://adblockplus.org/>, | 2 * This file is part of Adblock Plus <https://adblockplus.org/>, |
3 * Copyright (C) 2006-2015 Eyeo GmbH | 3 * Copyright (C) 2006-2015 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 25 matching lines...) Expand all Loading... | |
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 jmethodID method = env->GetMethodID( | 44 jmethodID method = env->GetMethodID( |
45 *JniLocalReference<jclass>(*env, | 45 *JniLocalReference<jclass>(*env, |
46 env->GetObjectClass(GetCallbackObject())), "updateCheckDoneCallback", | 46 env->GetObjectClass(GetCallbackObject())), |
Felix Dahlke
2015/02/04 04:11:51
Since you changed this in JniUpdateAvailableCallba
René Jeschke
2015/02/04 12:02:47
Done.
| |
47 "updateCheckDoneCallback", | |
47 "(Ljava/lang/String;)V"); | 48 "(Ljava/lang/String;)V"); |
48 | 49 |
49 if (method) | 50 if (method) |
50 { | 51 { |
51 JniLocalReference<jstring> jArg(*env, env->NewStringUTF(arg.c_str())); | 52 JniLocalReference<jstring> jArg(*env, env->NewStringUTF(arg.c_str())); |
52 env->CallVoidMethod(GetCallbackObject(), method, *jArg); | 53 env->CallVoidMethod(GetCallbackObject(), method, *jArg); |
53 } | 54 } |
54 | 55 |
55 CheckAndLogJavaException(*env); | 56 CheckAndLogJavaException(*env); |
56 } | 57 } |
57 | 58 |
58 static JNINativeMethod methods[] = | 59 static JNINativeMethod methods[] = |
59 { | 60 { |
60 { (char*)"ctor", (char*)"(Ljava/lang/Object;)J", (void*)JniCtor }, | 61 { (char*)"ctor", (char*)"(Ljava/lang/Object;)J", (void*)JniCtor }, |
61 { (char*)"dtor", (char*)"(J)V", (void*)JniDtor } | 62 { (char*)"dtor", (char*)"(J)V", (void*)JniDtor } |
62 }; | 63 }; |
63 | 64 |
64 extern "C" JNIEXPORT void JNICALL | 65 extern "C" JNIEXPORT void JNICALL |
65 Java_org_adblockplus_libadblockplus_UpdateCheckDoneCallback_registerNatives( | 66 Java_org_adblockplus_libadblockplus_UpdateCheckDoneCallback_registerNatives( |
66 JNIEnv *env, jclass clazz) | 67 JNIEnv *env, jclass clazz) |
67 { | 68 { |
68 env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0])); | 69 env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0])); |
69 } | 70 } |
LEFT | RIGHT |