Determine the frame structure

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 24 matching lines @@
   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);

[Felix Dahlke, 2013/11/27 12:19:33]

This and the other changes in this file are unrelated, caused by rebasing.

-  JNIEXPORT jboolean JNICALL Java_org_adblockplus_android_ABPEngine_matches(JNIEnv *pEnv, jobject, jstring url, jstring contentType, jstring documentUrl);
+  JNIEXPORT jboolean JNICALL Java_org_adblockplus_android_ABPEngine_matches(
+      JNIEnv *pEnv, jobject, jstring url, jstring contentType, jobjectArray documentUrls);
   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");
   static jfieldID ftitle = pEnv->GetFieldID(cls, "title", "Ljava/lang/String;");
@@ skipping 400 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 jboolean JNICALL Java_org_adblockplus_android_ABPEngine_matches(JNIEnv *pEnv, jobject, jstring url, jstring contentType, jstring documentUrl)
+JNIEXPORT jboolean JNICALL Java_org_adblockplus_android_ABPEngine_matches(
+  JNIEnv *pEnv, jobject, jstring url, jstring contentType, jobjectArray documentUrls)
 {
   try
   {
     const std::string surl = GetString(pEnv, url);
     const std::string stype = GetString(pEnv, contentType);
-    const std::string sdoc = GetString(pEnv, documentUrl);
+    const int documentUrlsLength = pEnv->GetArrayLength(documentUrls);
+    std::vector<std::string> sdocumentUrls;
+    for(int i = 0; i < documentUrlsLength; i++)
+    {
+       jstring documentUrl = static_cast<jstring>(pEnv->GetObjectArrayElement(documentUrls, i));
+       sdocumentUrls.push_back(GetString(pEnv, documentUrl));
+    }
 
-    AdblockPlus::FilterPtr filter = filterEngine->Matches(surl, stype, sdoc);
+    AdblockPlus::FilterPtr filter = filterEngine->Matches(surl, stype, sdocumentUrls);
 
     if (! filter)
       return JNI_FALSE;
 
-    // hack: if there is no referrer block only if filter is domain-specific
+    // hack: if there is no referrer, block only if filter is domain-specific
     // (to re-enable in-app ads blocking, proposed on 12.11.2012 Monday meeting)
-    // documentUrl contains the referrer (Android application special case)
-    if (sdoc.empty() && (filter->GetProperty("text")->AsString()).find("||") != std::string::npos)
+    // (documentUrls contains the referrers on Android)
+    if (!sdocumentUrls.size() &&
+        (filter->GetProperty("text")->AsString()).find("||") != std::string::npos)
       return JNI_FALSE;
 
     return filter->GetType() == AdblockPlus::Filter::TYPE_EXCEPTION ? JNI_FALSE : JNI_TRUE;
   }
   catch (const std::exception& e)
   {
     ThrowJavaException(pEnv, e);
   }
   catch (...)
   {
@@ skipping 46 matching lines @@
   }
   catch (const std::exception& e)
   {
     ThrowJavaException(pEnv, e);
   }
   catch (...)
   {
     ThrowJavaException(pEnv);
   }
 }