Issue 4231 - Fix unstable FilterEngineTest.testSetRemoveFilterChangeCallback

libadblockplus-android/jni/JniCallbacks.h

 /*
  * 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 14 matching lines @@
 void JniCallbacks_OnLoad(JavaVM* vm, JNIEnv* env, void* reserved);
 
 void JniCallbacks_OnUnload(JavaVM* vm, JNIEnv* env, void* reserved);
 
 class JniCallbackBase
 {
 public:
   JniCallbackBase(JNIEnv* env, jobject callbackObject);
   virtual ~JniCallbackBase();
   void LogException(JNIEnv* env, jthrowable throwable) const;
-  void CheckAndLogJavaException(JNIEnv* env) const;
+  bool CheckAndLogJavaException(JNIEnv* env) const;
 
   JavaVM* GetJavaVM() const
   {
     return javaVM;
   }
 
   jobject GetCallbackObject() const
   {
     return callbackObject->Get();
   }
@@ skipping 31 matching lines @@
   void Callback(const std::string& arg, const AdblockPlus::JsValuePtr jsValue);
 };
 
 class JniLogSystemCallback : public JniCallbackBase, public AdblockPlus::LogSystem
 {
 public:
   JniLogSystemCallback(JNIEnv* env, jobject callbackObject);
   void operator()(AdblockPlus::LogSystem::LogLevel logLevel, const std::string& message, const std::string& source);
 };
 
 class JniFileSystemCallback : public JniCallbackBase, public AdblockPlus::FileSystem

[sergei, 2017/08/07 12:49:59]

FileSystem interface is removed in the recent libadblockplus, one should use
IFileSystem instead, though I'm not sure whether it makes sense to do it as a
part of this codereview, can be done later.

 {
 public:
   JniFileSystemCallback(JNIEnv* env, jobject callbackObject);
   std::shared_ptr<std::istream> Read(const std::string& path) const;
   void Write(const std::string& path, std::shared_ptr<std::istream> data);
   void Move(const std::string& fromPath, const std::string& toPath);
   void Remove(const std::string& path);
   AdblockPlus::FileSystem::StatResult Stat(const std::string& path) const;
   std::string Resolve(const std::string& path) const;
 };
@@ skipping 16 matching lines @@
 };
 
 class JniIsAllowedConnectionTypeCallback : public JniCallbackBase
 {
 public:
   JniIsAllowedConnectionTypeCallback(JNIEnv* env, jobject callbackObject);
   bool Callback(const std::string* allowedConnectionType);
 };
 
 #endif /* JNICALLBACKS_H */