Make the Acceptable Ads link clickable

jni/abpEngine.cpp

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2013 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 23 matching lines @@
     jstring sdkVersion, jstring locale, jboolean developmentBuild);
   JNIEXPORT void JNICALL Java_org_adblockplus_android_ABPEngine_release(JNIEnv *pEnv, jobject);
   JNIEXPORT jboolean JNICALL Java_org_adblockplus_android_ABPEngine_isFirstRun(JNIEnv *pEnv, jobject);
   JNIEXPORT jobjectArray JNICALL Java_org_adblockplus_android_ABPEngine_getListedSubscriptions(JNIEnv *pEnv, jobject);
   JNIEXPORT jobjectArray JNICALL Java_org_adblockplus_android_ABPEngine_getRecommendedSubscriptions(JNIEnv *pEnv, jobject);
   JNIEXPORT void JNICALL Java_org_adblockplus_android_ABPEngine_addSubscription(JNIEnv *pEnv, jobject, jstring url);
   JNIEXPORT void JNICALL Java_org_adblockplus_android_ABPEngine_removeSubscription(JNIEnv *pEnv, jobject, jstring url);
   JNIEXPORT void JNICALL Java_org_adblockplus_android_ABPEngine_refreshSubscription(JNIEnv *pEnv, jobject, jstring url);
   JNIEXPORT void JNICALL Java_org_adblockplus_android_ABPEngine_actualizeSubscriptionStatus(JNIEnv *pEnv, jobject, jstring url);
   JNIEXPORT void JNICALL Java_org_adblockplus_android_ABPEngine_setAcceptableAdsEnabled(JNIEnv *pEnv, jobject, jboolean enabled);
+  JNIEXPORT jstring JNICALL Java_org_adblockplus_android_ABPEngine_getDocumentationLink(
+      JNIEnv *env, jobject object);
   JNIEXPORT jboolean JNICALL Java_org_adblockplus_android_ABPEngine_matches(JNIEnv *pEnv, jobject, jstring url, jstring contentType, jstring documentUrl);
   JNIEXPORT jobjectArray JNICALL Java_org_adblockplus_android_ABPEngine_getSelectorsForDomain(JNIEnv *pEnv, jobject, jstring domain);
   JNIEXPORT void JNICALL Java_org_adblockplus_android_ABPEngine_checkUpdates(JNIEnv *pEnv, jobject);
 };
 
 jobjectArray subscriptionsAsJavaArray(JNIEnv *pEnv, std::vector<AdblockPlus::SubscriptionPtr> subscriptions)
 {
   D(D_WARN, "subscriptionsAsJavaArray()");
   static jclass cls = reinterpret_cast<jclass>(pEnv->NewGlobalRef(pEnv->FindClass("org/adblockplus/android/Subscription")));
   static jmethodID cid = pEnv->GetMethodID(cls, "<init>", "()V");
@@ skipping 394 matching lines @@
   catch (const std::exception& e)
   {
     ThrowJavaException(pEnv, e);
   }
   catch (...)
   {
     ThrowJavaException(pEnv);
   }
 }
 
+JNIEXPORT jstring JNICALL Java_org_adblockplus_android_ABPEngine_getDocumentationLink(
+    JNIEnv *env, jobject object)

[Wladimir Palant, 2013/11/26 10:48:57]

This is a fairly useless API. It would make more sense to either expose
FilterEngine::GetPref() (obviously complicated because multiple return types are
possible) or the equivalent of Utils.getDocLink() JavaScript function (currently
implemented in adblockplus and adblockpluschrome repositories). Implementing the
latter in JavaScript would require a change to libadblockplus (the change itself
is trivial, updating libadblockplus binaries unfortunately isn't). Alternatively
the locale parameter could be cached in the init function and reused in the C++
code here.

[Felix Dahlke, 2013/11/26 13:11:46]

Yeah, I agree that it makes sense to expose something better here, I favour
Utils.getDocLink(). But that does indeed require a libadblockplus change, I'll
create a follow-up for it.

+{
+  const std::string documentationLink = filterEngine->GetPref("documentation_link")->AsString();
+  return env->NewStringUTF(documentationLink.c_str());
+}
+
 JNIEXPORT jboolean JNICALL Java_org_adblockplus_android_ABPEngine_matches(JNIEnv *pEnv, jobject, jstring url, jstring contentType, jstring documentUrl)
 {
   try
   {
     const std::string surl = GetString(pEnv, url);
     const std::string stype = GetString(pEnv, contentType);
     const std::string sdoc = GetString(pEnv, documentUrl);
 
     AdblockPlus::FilterPtr filter = filterEngine->Matches(surl, stype, sdoc);
 
@@ skipping 63 matching lines @@
   }
   catch (const std::exception& e)
   {
     ThrowJavaException(pEnv, e);
   }
   catch (...)
   {
     ThrowJavaException(pEnv);
   }
 }