fix: oldarch build

Author: chrispader

package/android/cpp-adapter.cpp

@@ -13,7 +13,7 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
 
 extern "C"
 JNIEXPORT void JNICALL
-Java_com_margelo_rnnitrosqlite_RNNitroSQLiteOnLoadModule_setDocPathInJNI(JNIEnv *env, jclass clazz,
+Java_com_margelo_rnnitrosqlite_DocPathSetter_setDocPathInJNI(JNIEnv *env, jclass clazz,
                                                                          jstring doc_path) {
   const char *nativeString = env->GetStringUTFChars(doc_path, nullptr);
   HybridNitroSQLite::docPath = std::string(nativeString);

package/android/src/main/java/com/margelo/rnnitrosqlite/DocPathSetter.kt

@@ -0,0 +1,13 @@
+package com.margelo.rnnitrosqlite
+
+import com.facebook.react.bridge.ReactApplicationContext
+
+object DocPathSetter {
+    @JvmStatic
+    fun setDocPath(context: ReactApplicationContext) {
+        val path = context.filesDir.absolutePath
+        setDocPathInJNI(path)
+    }
+
+    private external fun setDocPathInJNI(docPath: String)
+}

package/android/src/main/java/com/margelo/rnnitrosqlite/RNNitroSQLitePackage.java

@@ -0,0 +1,40 @@
+package com.margelo.rnnitrosqlite
+
+import com.facebook.react.TurboReactPackage
+import com.facebook.react.bridge.NativeModule
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.module.model.ReactModuleInfo
+import com.facebook.react.module.model.ReactModuleInfoProvider
+
+class RNNitroSQLitePackage : TurboReactPackage() {
+    override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
+        return if (name == RNNitroSQLiteOnLoadModule.NAME) {
+          RNNitroSQLiteOnLoadModule(reactContext)
+        } else {
+          null
+        }
+    }
+
+    override fun getReactModuleInfoProvider(): ReactModuleInfoProvider {
+        return ReactModuleInfoProvider {
+          val moduleInfos: MutableMap<String, ReactModuleInfo> = HashMap()
+          val isTurboModule: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
+          moduleInfos[RNNitroSQLiteOnLoadModule.NAME] = ReactModuleInfo(
+            RNNitroSQLiteOnLoadModule.NAME,
+            RNNitroSQLiteOnLoadModule.NAME,
+            canOverrideExistingModule=false,
+            needsEagerInit=true,
+            hasConstants=true,
+            isCxxModule=false,
+            isTurboModule=isTurboModule
+          )
+          moduleInfos
+        }
+    }
+
+    companion object {
+        init {
+            System.loadLibrary("RNNitroSQLite")
+        }
+    }
+}

package/android/src/main/java/com/margelo/rnnitrosqlite/RNNitroSQLitePackage.kt

@@ -19,20 +19,16 @@ public class RNNitroSQLiteOnLoadModule extends NativeNitroSQLiteOnLoadSpec {
 
   public RNNitroSQLiteOnLoadModule(ReactApplicationContext reactContext) {
     super(reactContext);
-
     _reactContext = reactContext;
-    setDocPath(reactContext);
+
+    var docPathSetter = new DocPathSetter();
+    docPathSetter.setDocPath(reactContext);
 
     if (reactApplicationContextReadyCallback != null) {
       reactApplicationContextReadyCallback.invoke();
     }
   }
 
-  public static void setDocPath(ReactApplicationContext context) {
-    final String path = context.getFilesDir().getAbsolutePath();
-    setDocPathInJNI(path);
-  }
-
   @Override
   @NonNull
   public String getName() {
@@ -52,6 +48,4 @@ public void onReactApplicationContextReady(Callback callback) {
   public static ReactApplicationContext getReactContext() {
     return _reactContext;
   }
-
-  private native static void setDocPathInJNI(String docPath);
 }

…trosqlite/RNNitroSQLiteOnLoadModule.java …trosqlite/RNNitroSQLiteOnLoadModule.javapackage/android/src/main/java/com/margelo/rnnitrosqlite/RNNitroSQLiteOnLoadModule.java renamed to package/android/src/newarch/com/margelo/rnnitrosqlite/RNNitroSQLiteOnLoadModule.java package/android/src/main/java/com/margelo/rnnitrosqlite/RNNitroSQLiteOnLoadModule.java renamed to package/android/src/newarch/com/margelo/rnnitrosqlite/RNNitroSQLiteOnLoadModule.java

@@ -0,0 +1,43 @@
+package com.margelo.rnnitrosqlite
+
+import com.facebook.react.bridge.Callback
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReactContextBaseJavaModule
+import com.facebook.react.bridge.ReactMethod
+
+class RNNitroSQLiteOnLoadModule(reactContext: ReactApplicationContext) :
+    ReactContextBaseJavaModule(reactContext) {
+
+
+    init {
+        Companion.reactContext = reactContext
+        DocPathSetter.setDocPath(reactContext)
+
+        if (reactApplicationContextReadyCallback != null) {
+            reactApplicationContextReadyCallback!!.invoke()
+        }
+    }
+
+    override fun getName(): String {
+        return NAME
+    }
+
+    @ReactMethod
+    fun onReactApplicationContextReady(callback: Callback) {
+        if (reactContext != null) {
+            callback.invoke()
+            return
+        }
+
+        reactApplicationContextReadyCallback = callback
+    }
+
+    companion object {
+        const val NAME: String = "RNNitroSQLiteOnLoad"
+
+        var reactContext: ReactApplicationContext? = null
+            private set
+        var reactApplicationContextReadyCallback: Callback? = null
+            private set
+    }
+}