Automatically enable acceptable ads and notify the user about it

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 void JNICALL Java_org_adblockplus_android_ABPEngine_setNotifiedAboutAcceptableAds(
+    JNIEnv* env, jobject object, jboolean notified);
+  JNIEXPORT jboolean JNICALL Java_org_adblockplus_android_ABPEngine_isNotifiedAboutAcceptableAds(
+    JNIEnv* env, jobject object);
   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()");
@@ skipping 403 matching lines @@
   }
 }
 
 JNIEXPORT jstring JNICALL Java_org_adblockplus_android_ABPEngine_getDocumentationLink(
     JNIEnv *env, jobject object)
 {
   const std::string documentationLink = filterEngine->GetPref("documentation_link")->AsString();
   return env->NewStringUTF(documentationLink.c_str());
 }
 
+JNIEXPORT void JNICALL Java_org_adblockplus_android_ABPEngine_setNotifiedAboutAcceptableAds(
+  JNIEnv* env, jobject object, jboolean notified)
+{
+  AdblockPlus::JsEnginePtr jsEngine = filterEngine->GetJsEngine();
+  filterEngine->SetPref("notified_about_acceptable_ads", jsEngine->NewValue(notified));

[Wladimir Palant, 2013/11/26 11:01:02]

This won't do anything, prefs that aren't defined won't persist.

[Felix Dahlke, 2013/11/26 13:59:31]

Done. Wasn't aware of that. IMO, it doesn't make sense to have this pref in
libadblockplus, so I used the Android preference API instead.

+}
+
+JNIEXPORT jboolean JNICALL Java_org_adblockplus_android_ABPEngine_isNotifiedAboutAcceptableAds(
+  JNIEnv* env, jobject object)
+{
+  return filterEngine->GetPref("notified_about_acceptable_ads")->AsBool();
+}
+
 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);
   }
 }