Issue 4231 - Fix unstable FilterEngineTest.testSetRemoveFilterChangeCallback

libadblockplus-android/jni/JniCallbacks.h

Index: libadblockplus-android/jni/JniCallbacks.h
diff --git a/libadblockplus-android/jni/JniCallbacks.h b/libadblockplus-android/jni/JniCallbacks.h
index 27269b7cb59419fcc46188a56605d0d60bdc2924..1d12274b14da1f84747d9d917d553cffe5cca343 100644
--- a/libadblockplus-android/jni/JniCallbacks.h
+++ b/libadblockplus-android/jni/JniCallbacks.h
@@ -32,7 +32,7 @@ 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
   {
@@ -84,6 +84,18 @@ public:
   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;
+};
+
 class JniShowNotificationCallback : public JniCallbackBase
 {
 public: