Page MenuHomePhabricator
Files F3366144

D11702.diff
No OneTemporary
Actions

D11702.diff
View Options

diff --git a/native/android/app/src/cpp/jsiInstaller.cpp b/native/android/app/src/cpp/jsiInstaller.cpp
--- a/native/android/app/src/cpp/jsiInstaller.cpp
+++ b/native/android/app/src/cpp/jsiInstaller.cpp
@@ -1,9 +1,7 @@
-#include "jniHelpers.h"
#include <CallInvokerHolder.h>
#include <fbjni/fbjni.h>
#include <jsi/jsi.h>
-#include <DatabaseManagers/SQLiteQueryExecutor.h>
#include <InternalModules/DatabaseInitializerJNIHelper.h>
#include <InternalModules/GlobalDBSingletonJNIHelper.h>
#include <NativeModules/CommConstants.h>
@@ -26,8 +24,8 @@
static void initHybrid(
jni::alias_ref<jhybridobject> jThis,
jlong jsContext,
- jni::alias_ref<react::CallInvokerHolder::javaobject> jsCallInvokerHolder,
- comm::HashMap additionalParameters) {
+ jni::alias_ref<react::CallInvokerHolder::javaobject>
+ jsCallInvokerHolder) {
jsi::Runtime *rt = (jsi::Runtime *)jsContext;
auto jsCallInvoker = jsCallInvokerHolder->cthis()->getCallInvoker();
std::shared_ptr<comm::CommCoreModule> coreNativeModule =
@@ -57,12 +55,6 @@
jsi::PropNameID::forAscii(*rt, "CommConstants"),
jsi::Object::createFromHostObject(*rt, nativeConstants));
}
-
- jni::local_ref<jni::JObject> sqliteFilePathObj =
- additionalParameters.get("sqliteFilePath");
- std::string sqliteFilePath = sqliteFilePathObj->toString();
-
- comm::SQLiteQueryExecutor::initialize(sqliteFilePath);
}
static void 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
--- 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
@@ -15,18 +15,10 @@
(CallInvokerHolderImpl)context.getCatalystInstance()
.getJSCallInvokerHolder();
long contextPointer = context.getJavaScriptContextHolder().get();
-
- // additional parameters
- String sqliteFilePath = context.getDatabasePath("comm.sqlite").toString();
- HashMap<String, Object> additionalParameters =
- new HashMap<String, Object>();
- additionalParameters.put("sqliteFilePath", sqliteFilePath);
-
- new CommHybrid().initHybrid(contextPointer, holder, additionalParameters);
+ new CommHybrid().initHybrid(contextPointer, holder);
}
public native void initHybrid(
long jsContextNativePointer,
- CallInvokerHolderImpl jsCallInvokerHolder,
- HashMap<String, Object> additionalParameters);
+ CallInvokerHolderImpl jsCallInvokerHolder);
}

File Metadata

Mime Type
text/plain
Expires
Tue, Nov 26, 9:46 AM (21 h, 6 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2584193
Default Alt Text
D11702.diff (2 KB)

Event Timeline