Unified Diff: libadblockplus-android/jni/Utils.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/Utils.h ('k')
|
libadblockplus-android/src/org/adblockplus/android/AndroidFileSystem.java » ('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/Utils.cpp |
| diff --git a/libadblockplus-android/jni/Utils.cpp b/libadblockplus-android/jni/Utils.cpp |
| index 6c1b9274c417a4cfa8f93b37314d858bae94c188..bb0db640fdf125766621345e9e6c46ee5a8656c5 100644 |
| --- a/libadblockplus-android/jni/Utils.cpp |
| +++ b/libadblockplus-android/jni/Utils.cpp |
| @@ -16,6 +16,8 @@ |
| */ |
| #include <string> |
| +#include <sstream> |
| +#include <iostream> |
| #include "Utils.h" |
| @@ -122,3 +124,13 @@ jobject NewJniNotification(JNIEnv* env, |
| { |
| return NewJniObject(env, notification, PKG("Notification")); |
| } |
| + |
| +std::string JniStdStreamToStdString(std::istream *in) |
| +{ |
| + std::string ret; |
| + char buffer[1024]; |
| + while (in->read(buffer, sizeof(buffer))) |
| + ret.append(buffer, sizeof(buffer)); |
| + ret.append(buffer, in->gcount()); |
| + return ret; |
| +} |
« libadblockplus-android-tests/src/org/adblockplus/libadblockplus/tests/FilterEngineGenericTest.java ('K')
|
« libadblockplus-android/jni/Utils.h ('k')
|
libadblockplus-android/src/org/adblockplus/android/AndroidFileSystem.java » ('j')
|
libadblockplus-android/src/org/adblockplus/android/AndroidFileSystem.java » ('J')
