Unified Diff: libadblockplus-android/jni/JniJsEngine.cpp
Issue 29347315:
Issue 4231 - Fix unstable FilterEngineTest.testSetRemoveFilterChangeCallback (Closed)
Patch Set: made helper methods static, fixed 'remove' for fs callback
Created Dec. 13, 2016, 9:32 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« libadblockplus-android-tests/src/org/adblockplus/libadblockplus/tests/FilterEngineGenericTest.java ('K')
|
« libadblockplus-android/jni/JniFileSystem.cpp ('k')
|
libadblockplus-android/jni/Utils.h » ('j')
|
libadblockplus-android/src/org/adblockplus/android/AndroidFileSystem.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: libadblockplus-android/jni/JniJsEngine.cpp |
| diff --git a/libadblockplus-android/jni/JniJsEngine.cpp b/libadblockplus-android/jni/JniJsEngine.cpp |
| index e33673593552996dc7f795ac6402867115cdcf9f..67af7c13073436f52358eee08de55d1c95b0db85 100644 |
| --- a/libadblockplus-android/jni/JniJsEngine.cpp |
| +++ b/libadblockplus-android/jni/JniJsEngine.cpp |
| @@ -136,6 +136,19 @@ static void JNICALL JniSetDefaultFileSystem(JNIEnv* env, jclass clazz, jlong ptr |
| CATCH_AND_THROW(env) |
| } |
| +static void JNICALL JniSetFileSystem(JNIEnv* env, jclass clazz, jlong ptr, jlong fileSystemPtr) |
| +{ |
| + AdblockPlus::JsEnginePtr& engine = *JniLongToTypePtr<AdblockPlus::JsEnginePtr>(ptr); |
| + |
| + try |
| + { |
| + AdblockPlus::FileSystemPtr fileSystem(JniLongToTypePtr<JniFileSystemCallback>(fileSystemPtr)); |
| + |
| + engine->SetFileSystem(fileSystem); |
| + } |
| + CATCH_AND_THROW(env) |
| +} |
| + |
| static void JNICALL JniSetDefaultWebRequest(JNIEnv* env, jclass clazz, jlong ptr) |
| { |
| AdblockPlus::JsEnginePtr& engine = *JniLongToTypePtr<AdblockPlus::JsEnginePtr>(ptr); |
| @@ -242,6 +255,7 @@ static JNINativeMethod methods[] = |
| { (char*)"evaluate", (char*)"(JLjava/lang/String;Ljava/lang/String;)" TYP("JsValue"), (void*)JniEvaluate }, |
| + { (char*)"setFileSystem", (char*)"(JJ)V", (void*)JniSetFileSystem }, |
| { (char*)"setDefaultFileSystem", (char*)"(JLjava/lang/String;)V", (void*)JniSetDefaultFileSystem }, |
| { (char*)"setLogSystem", (char*)"(JJ)V", (void*)JniSetLogSystem }, |
| { (char*)"setDefaultLogSystem", (char*)"(J)V", (void*)JniSetDefaultLogSystem }, |
