libadblockplus-android/jni/JniWebRequest.cpp - Issue 29453616: Issue 5286 - Update to use libadblockplus rev. b88d098aeab5

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: libadblockplus-android/jni/JniWebRequest.cpp

Issue 29453616: Issue 5286 - Update to use libadblockplus rev. b88d098aeab5 (Closed) Base URL: github.com:abby-sergz/libadblockplus-android.git

Patch Set: add missed dependencies Created June 2, 2017, 1:45 p.m.

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

Jump to:

Index: libadblockplus-android/jni/JniWebRequest.cpp

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

index 4d34b4c55e3dcbe25a46d5edebf2aa1637b81160..57b66e9d78a761893f0aa6edb7dbe8296d94be80 100644

--- a/libadblockplus-android/jni/JniWebRequest.cpp

+++ b/libadblockplus-android/jni/JniWebRequest.cpp

@@ -48,14 +48,14 @@ static jlong JNICALL JniCtor(JNIEnv* env, jclass clazz, jobject callbackObject)

{

try

{

- return JniPtrToLong(new AdblockPlus::WebRequestPtr(new JniWebRequest(env, callbackObject)));

+ return JniPtrToLong(new AdblockPlus::WebRequestSharedPtr(std::make_shared<JniWebRequest>(env, callbackObject)));

}

CATCH_THROW_AND_RETURN(env, 0)

}

static void JNICALL JniDtor(JNIEnv* env, jclass clazz, jlong ptr)

{

- delete JniLongToTypePtr<AdblockPlus::WebRequestPtr>(ptr);

+ delete JniLongToTypePtr<AdblockPlus::WebRequestSharedPtr>(ptr);

}

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

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

"(Ljava/lang/String;Ljava/util/List;)" TYP("ServerResponse"));

AdblockPlus::ServerResponse sResponse;

- sResponse.status = AdblockPlus::WebRequest::NS_ERROR_FAILURE;

+ sResponse.status = AdblockPlus::IWebRequest::NS_ERROR_FAILURE;

if (method)

{