Issue 5286 - Update to use libadblockplus rev. b88d098aeab5

libadblockplus-android/jni/JniWebRequest.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 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 30 matching lines @@
   {
     delete serverResponseClass;
     serverResponseClass = NULL;
   }
 }
 
 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);

[anton, 2017/06/02 06:55:23]

don't we have to cast it to WebRequestSharedPtr? (see Ctor)

[sergei, 2017/06/02 07:32:43]

Good catch.

 }
 
 JniWebRequest::JniWebRequest(JNIEnv* env, jobject callbackObject)
   : JniCallbackBase(env, callbackObject), AdblockPlus::WebRequest()
 {
 }
 
 AdblockPlus::ServerResponse JniWebRequest::GET(const std::string& url,
     const AdblockPlus::HeaderList& requestHeaders) const
 {
   JNIEnvAcquire env(GetJavaVM());
 
   jmethodID method = env->GetMethodID(
       *JniLocalReference<jclass>(*env,
           env->GetObjectClass(GetCallbackObject())),
       "httpGET",
       "(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)
   {
     JniLocalReference<jobject> arrayList(*env, NewJniArrayList(*env));
     jmethodID addMethod = JniGetAddToListMethod(*env, *arrayList);
 
     for (AdblockPlus::HeaderList::const_iterator it = requestHeaders.begin(),
         end = requestHeaders.end(); it != end; it++)
     {
       JniLocalReference<jobject> headerEntry(*env, NewTuple(*env, it->first, it->second));
@@ skipping 62 matching lines @@
 static JNINativeMethod methods[] =
 {
   { (char*)"ctor", (char*)"(Ljava/lang/Object;)J", (void*)JniCtor },
   { (char*)"dtor", (char*)"(J)V", (void*)JniDtor }
 };
 
 extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_libadblockplus_WebRequest_registerNatives(JNIEnv *env, jclass clazz)
 {
   env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0]));
 }