libadblockplus-android/jni/JniSubscription.cpp - Issue 29405564: Issue 5121 - Use Acceptable Ads API in libadblockplus

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/JniSubscription.cpp

Issue 29405564: Issue 5121 - Use Acceptable Ads API in libadblockplus (Closed)

Patch Set: changed tests after AA in getListedSubscriptions discussion Created April 7, 2017, 10 a.m.

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

Jump to:

Index: libadblockplus-android/jni/JniSubscription.cpp

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

index bab56d37b2860e4e11ae58a047fcb2a4395ec14b..a77b4030ce17efcab9a125ce609bf78bd6108228 100644

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

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

@@ -81,6 +81,15 @@ static jboolean JNICALL JniOperatorEquals(JNIEnv* env, jclass clazz, jlong ptr,

CATCH_THROW_AND_RETURN(env, JNI_FALSE)

}

+static jboolean JNICALL JniIsAcceptableAds(JNIEnv* env, jclass clazz, jlong ptr)

+ try

+ {

+ return (GetSubscriptionPtr(ptr)->IsAA() ? JNI_TRUE : JNI_FALSE);

+ }

+ CATCH_THROW_AND_RETURN(env, JNI_FALSE)

static JNINativeMethod methods[] =

{

{ (char*)"isListed", (char*)"(J)Z", (void*)JniIsListed },

@@ -88,7 +97,8 @@ static JNINativeMethod methods[] =

{ (char*)"removeFromList", (char*)"(J)V", (void*)JniRemoveFromList },

{ (char*)"updateFilters", (char*)"(J)V", (void*)JniUpdateFilters },

{ (char*)"isUpdating", (char*)"(J)Z", (void*)JniIsUpdating },

- { (char*)"operatorEquals", (char*)"(JJ)Z", (void*)JniOperatorEquals }

+ { (char*)"operatorEquals", (char*)"(JJ)Z", (void*)JniOperatorEquals },

+ { (char*)"isAcceptableAds", (char*)"(J)Z", (void*)JniIsAcceptableAds },

};

extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_libadblockplus_Subscription_registerNatives(JNIEnv *env, jclass clazz)