jni/JniWebRequest.cpp - Issue 5697499218051072: Usage of new API, cleanups (reduced)

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Unified Diff: jni/JniWebRequest.cpp

Issue 5697499218051072: Usage of new API, cleanups (reduced) (Closed)

Patch Set: Removed even more unrelated changes Created April 28, 2014, 9:42 a.m.

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Index: jni/JniWebRequest.cpp

diff --git a/jni/JniWebRequest.cpp b/jni/JniWebRequest.cpp

index 172a6a0ddc829902b6000abca58dfc31de4f1662..54cad5fd386817bef36cf74c67de5efeafa58450 100644

--- a/jni/JniWebRequest.cpp

+++ b/jni/JniWebRequest.cpp

@@ -32,10 +32,10 @@ static void JNICALL JniDtor(JNIEnv* env, jclass clazz, jlong ptr)

}

JniWebRequest::JniWebRequest(JNIEnv* env, jobject callbackObject)

- : JniCallbackBase(env, callbackObject), AdblockPlus::WebRequest()

+ : JniCallbackBase(env, callbackObject), AdblockPlus::WebRequest(),

+ tupleClass(new JniGlobalReference<jclass>(env, env->FindClass(PKG("HeaderEntry")))),

+ serverResponseClass(new JniGlobalReference<jclass>(env, env->FindClass(PKG("ServerResponse"))))

{

- tupleClass.reset(new JniGlobalReference<jclass>(env, env->FindClass("com/github/rjeschke/neetutils/collections/Tuple")));

- serverResponseClass.reset(new JniGlobalReference<jclass>(env, env->FindClass(PKG("ServerResponse"))));

}

AdblockPlus::ServerResponse JniWebRequest::GET(const std::string& url, const AdblockPlus::HeaderList& requestHeaders) const

@@ -75,7 +75,7 @@ AdblockPlus::ServerResponse JniWebRequest::GET(const std::string& url, const Adb

jobject JniWebRequest::NewTuple(JNIEnv* env, const std::string& a, const std::string& b) const

{

- jmethodID factory = env->GetMethodID(tupleClass->Get(), "<init>", "(Ljava/lang/Object;Ljava/lang/Object;)V");

+ jmethodID factory = env->GetMethodID(tupleClass->Get(), "<init>", "(Ljava/lang/String;Ljava/lang/String;)V");

return env->NewObject(tupleClass->Get(), factory, env->NewStringUTF(a.c_str()), env->NewStringUTF(b.c_str()));

}