diff --git a/native/android/app/src/cpp/jsiInstaller.cpp b/native/android/app/src/cpp/jsiInstaller.cpp index bfb0832dc..14f38dee7 100644 --- a/native/android/app/src/cpp/jsiInstaller.cpp +++ b/native/android/app/src/cpp/jsiInstaller.cpp @@ -1,88 +1,80 @@ -#include "jniHelpers.h" #include #include #include -#include #include #include #include #include #include #include #include #include #include #include namespace jni = facebook::jni; namespace jsi = facebook::jsi; namespace react = facebook::react; class CommHybrid : public jni::HybridClass { public: static auto constexpr kJavaDescriptor = "Lapp/comm/android/fbjni/CommHybrid;"; static void initHybrid( jni::alias_ref jThis, jlong jsContext, - jni::alias_ref jsCallInvokerHolder, - comm::HashMap additionalParameters) { + jni::alias_ref + jsCallInvokerHolder) { jsi::Runtime *rt = (jsi::Runtime *)jsContext; auto jsCallInvoker = jsCallInvokerHolder->cthis()->getCallInvoker(); std::shared_ptr coreNativeModule = std::make_shared(jsCallInvoker); std::shared_ptr utilsNativeModule = std::make_shared(jsCallInvoker); std::shared_ptr rustNativeModule = std::make_shared(jsCallInvoker); std::shared_ptr nativeConstants = std::make_shared(); if (rt != nullptr) { rt->global().setProperty( *rt, jsi::PropNameID::forAscii(*rt, "CommCoreModule"), jsi::Object::createFromHostObject(*rt, coreNativeModule)); rt->global().setProperty( *rt, jsi::PropNameID::forAscii(*rt, "CommUtilsModule"), jsi::Object::createFromHostObject(*rt, utilsNativeModule)); rt->global().setProperty( *rt, jsi::PropNameID::forAscii(*rt, "CommRustModule"), jsi::Object::createFromHostObject(*rt, rustNativeModule)); rt->global().setProperty( *rt, jsi::PropNameID::forAscii(*rt, "CommConstants"), jsi::Object::createFromHostObject(*rt, nativeConstants)); } - - jni::local_ref sqliteFilePathObj = - additionalParameters.get("sqliteFilePath"); - std::string sqliteFilePath = sqliteFilePathObj->toString(); - - comm::SQLiteQueryExecutor::initialize(sqliteFilePath); } static void registerNatives() { javaClassStatic()->registerNatives({ makeNativeMethod("initHybrid", CommHybrid::initHybrid), }); } private: friend HybridBase; }; JNIEXPORT jint JNI_OnLoad(JavaVM *vm, void *) { return jni::initialize(vm, [] { CommHybrid::registerNatives(); comm::ThreadOperationsJNIHelper::registerNatives(); comm::MessageOperationsUtilitiesJNIHelper::registerNatives(); comm::GlobalDBSingletonJNIHelper::registerNatives(); comm::DatabaseInitializerJNIHelper::registerNatives(); comm::NotificationsCryptoModuleJNIHelper::registerNatives(); comm::StaffUtilsJNIHelper::registerNatives(); }); } diff --git a/native/android/app/src/main/java/app/comm/android/fbjni/CommHybrid.java b/native/android/app/src/main/java/app/comm/android/fbjni/CommHybrid.java index 428c5c6bf..7e029938c 100644 --- a/native/android/app/src/main/java/app/comm/android/fbjni/CommHybrid.java +++ b/native/android/app/src/main/java/app/comm/android/fbjni/CommHybrid.java @@ -1,32 +1,24 @@ package app.comm.android.fbjni; import android.content.Context; import com.facebook.react.bridge.ReactContext; import com.facebook.react.turbomodule.core.CallInvokerHolderImpl; import java.util.HashMap; public class CommHybrid { private CommHybrid() { } public static void initHybrid(ReactContext context) { CallInvokerHolderImpl holder = (CallInvokerHolderImpl)context.getCatalystInstance() .getJSCallInvokerHolder(); long contextPointer = context.getJavaScriptContextHolder().get(); - - // additional parameters - String sqliteFilePath = context.getDatabasePath("comm.sqlite").toString(); - HashMap additionalParameters = - new HashMap(); - additionalParameters.put("sqliteFilePath", sqliteFilePath); - - new CommHybrid().initHybrid(contextPointer, holder, additionalParameters); + new CommHybrid().initHybrid(contextPointer, holder); } public native void initHybrid( long jsContextNativePointer, - CallInvokerHolderImpl jsCallInvokerHolder, - HashMap additionalParameters); + CallInvokerHolderImpl jsCallInvokerHolder); }