railbird/react-native-vision-camera
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Fix duplicate JHashMap definition by moving to custom namespace (#610)

Browse Source 
Technically `JHashMap` is duplicated now, but in separate namespaces. If I were to remove my `JHashMap` (and `JArrayList`) definitions, the user is forced to use fbjni v3.
This commit is contained in:
Marc Rousavy 2021-11-23 15:48:07 +01:00 committed by GitHub
parent 7206a794a9
commit 6025367c72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
android/src/main/cpp/JSIJNIConversion.cpp
View File

@ -156,10 +156,10 @@ jsi::Value JSIJNIConversion::convertJNIObjectToJSIValue(jsi::Runtime &runtime, c
auto array = toArrayListFunc(object.get()); auto array = toArrayListFunc(object.get());
return convertJNIObjectToJSIValue(runtime, array); return convertJNIObjectToJSIValue(runtime, array);
} else if (object->isInstanceOf(jni::JHashMap<jstring, jobject>::javaClassStatic())) { } else if (object->isInstanceOf(JHashMap<jstring, jobject>::javaClassStatic())) {
// HashMap<K, V> // HashMap<K, V>
auto map = static_ref_cast<jni::JHashMap<jstring, jobject>>(object); auto map = static_ref_cast<JHashMap<jstring, jobject>>(object);
auto result = jsi::Object(runtime); auto result = jsi::Object(runtime);
for (const auto& entry : *map) { for (const auto& entry : *map) {
@ -173,7 +173,7 @@ jsi::Value JSIJNIConversion::convertJNIObjectToJSIValue(jsi::Runtime &runtime, c
} else if (object->isInstanceOf(react::ReadableMap::javaClassStatic())) { } else if (object->isInstanceOf(react::ReadableMap::javaClassStatic())) {
// ReadableMap // ReadableMap
static const auto toHashMapFunc = react::ReadableMap::javaClassLocal()->getMethod<jni::JHashMap<jstring, jobject>()>("toHashMap"); static const auto toHashMapFunc = react::ReadableMap::javaClassLocal()->getMethod<JHashMap<jstring, jobject>()>("toHashMap");
// call recursive, this time HashMap<K, V> // call recursive, this time HashMap<K, V>
auto hashMap = toHashMapFunc(object.get()); auto hashMap = toHashMapFunc(object.get());

8
android/src/main/cpp/java-bindings/JHashMap.cpp
View File

@ -7,14 +7,14 @@
#include <jni.h> #include <jni.h>
#include <fbjni/fbjni.h> #include <fbjni/fbjni.h>
namespace vision {
namespace facebook { using namespace facebook;
namespace jni { using namespace jni;
template <typename K, typename V> template <typename K, typename V>
local_ref<JHashMap<K, V>> JHashMap<K, V>::create() { local_ref<JHashMap<K, V>> JHashMap<K, V>::create() {
return JHashMap<K, V>::newInstance(); return JHashMap<K, V>::newInstance();
} }
} // namespace jni } // namespace vision
} // namespace facebook

8
android/src/main/cpp/java-bindings/JHashMap.h
View File

@ -7,9 +7,10 @@
#include <jni.h> #include <jni.h>
#include <fbjni/fbjni.h> #include <fbjni/fbjni.h>
namespace vision {
namespace facebook { using namespace facebook;
namespace jni { using namespace jni;
// TODO: Remove when fbjni 0.2.3 releases. // TODO: Remove when fbjni 0.2.3 releases.
template <typename K = jobject, typename V = jobject> template <typename K = jobject, typename V = jobject>
@ -19,5 +20,4 @@ struct JHashMap : JavaClass<JHashMap<K, V>, JMap<K, V>> {
static local_ref<JHashMap<K, V>> create(); static local_ref<JHashMap<K, V>> create();
}; };
} // namespace jni } // namespace vision
} // namespace facebook