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

Side by Side Diff: jni/JniUpdateAvailableCallback.cpp

Issue 4761138508070912: Issue 1848 - Clean up local reference handling (Closed)
Patch Set: Formatting, explicit, unrelated change Created Feb. 3, 2015, 1:51 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
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 23 matching lines...) Expand all
34 JniUpdateAvailableCallback::JniUpdateAvailableCallback( 34 JniUpdateAvailableCallback::JniUpdateAvailableCallback(
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 JniUpdateAvailableCallback::Callback(const std::string& arg) 40 void JniUpdateAvailableCallback::Callback(const std::string& arg)
41 { 41 {
42 JNIEnvAcquire env(GetJavaVM()); 42 JNIEnvAcquire env(GetJavaVM());
43 43
44 jclass clazz = env->GetObjectClass(GetCallbackObject()); 44 jmethodID method = env->GetMethodID(
45 jmethodID method = env->GetMethodID(clazz, "updateAvailableCallback", 45 *JniLocalReference<jclass>(*env,
46 "(Ljava/lang/String;)V"); 46 env->GetObjectClass(GetCallbackObject())),
47 "updateAvailableCallback",
48 "(Ljava/lang/String;)V");
47 49
48 if (method) 50 if (method)
49 { 51 {
50 jstring jArg = env->NewStringUTF(arg.c_str()); 52 JniLocalReference<jstring> jArg(*env, env->NewStringUTF(arg.c_str()));
51 env->CallVoidMethod(GetCallbackObject(), method, jArg); 53 env->CallVoidMethod(GetCallbackObject(), method, *jArg);
52 } 54 }
53 55
54 CheckAndLogJavaException(*env); 56 CheckAndLogJavaException(*env);
55 } 57 }
56 58
57 static JNINativeMethod methods[] = 59 static JNINativeMethod methods[] =
58 { 60 {
59 { (char*)"ctor", (char*)"(Ljava/lang/Object;)J", (void*)JniCtor }, 61 { (char*)"ctor", (char*)"(Ljava/lang/Object;)J", (void*)JniCtor },
60 { (char*)"dtor", (char*)"(J)V", (void*)JniDtor } 62 { (char*)"dtor", (char*)"(J)V", (void*)JniDtor }
61 }; 63 };
62 64
63 extern "C" JNIEXPORT void JNICALL 65 extern "C" JNIEXPORT void JNICALL
64 Java_org_adblockplus_libadblockplus_UpdateAvailableCallback_registerNatives( 66 Java_org_adblockplus_libadblockplus_UpdateAvailableCallback_registerNatives(
65 JNIEnv *env, jclass clazz) 67 JNIEnv *env, jclass clazz)
66 { 68 {
67 env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0])); 69 env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0]));
68 } 70 }
OLDNEW

Powered by Google App Engine
This is Rietveld