| OLD | NEW |
| 1 /* | 1 /* |
| 2 * This file is part of Adblock Plus <http://adblockplus.org/>, | 2 * This file is part of Adblock Plus <http://adblockplus.org/>, |
| 3 * Copyright (C) 2006-2014 Eyeo GmbH | 3 * Copyright (C) 2006-2014 Eyeo GmbH |
| 4 * | 4 * |
| 5 * Adblock Plus is free software: you can redistribute it and/or modify | 5 * Adblock Plus is free software: you can redistribute it and/or modify |
| 6 * it under the terms of the GNU General Public License version 3 as | 6 * it under the terms of the GNU General Public License version 3 as |
| 7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
| 8 * | 8 * |
| 9 * Adblock Plus is distributed in the hope that it will be useful, | 9 * Adblock Plus is distributed in the hope that it will be useful, |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 12 * GNU General Public License for more details. | 12 * GNU General Public License for more details. |
| 13 * | 13 * |
| 14 * You should have received a copy of the GNU General Public License | 14 * You should have received a copy of the GNU General Public License |
| 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. | 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. |
| 16 */ | 16 */ |
| 17 | 17 |
| 18 #include "Utils.h" | 18 #ifndef JNIJSVALUE_H_ |
| 19 #include "Debug.h" | 19 #define JNIJSVALUE_H_ |
| 20 | 20 |
| 21 const std::string GetString(JNIEnv *pEnv, jstring str) | 21 #include <jni.h> |
| 22 #include <AdblockPlus/JsValue.h> |
| 23 |
| 24 namespace AdblockPlus |
| 22 { | 25 { |
| 23 D(D_WARN, "getString()"); | 26 namespace Android |
| 27 { |
| 24 | 28 |
| 25 if (str == NULL) | 29 jobject NewJniJsValue(JNIEnv* env, const AdblockPlus::JsValuePtr& jsValue); |
| 26 return std::string(); | |
| 27 | 30 |
| 28 jboolean iscopy; | 31 jobject JniJsValueList2ArrayList(JNIEnv* env, AdblockPlus::JsValueList& list); |
| 29 | 32 |
| 30 const char *s = pEnv->GetStringUTFChars(str, &iscopy); | 33 AdblockPlus::JsValue* JniGetJsValue(jlong ptr); |
| 31 jsize len = pEnv->GetStringUTFLength(str); | |
| 32 | 34 |
| 33 const std::string value(s, len); | 35 AdblockPlus::JsValuePtr& JniGetJsValuePtr(jlong ptr); |
| 34 | 36 |
| 35 pEnv->ReleaseStringUTFChars(str, s); | 37 } // namespace Android |
| 38 } // namespace AdblockPlus |
| 36 | 39 |
| 37 return value; | 40 #endif /* JNIJSVALUE_H_ */ |
| 38 } | |
| OLD | NEW |