add JNI_OnLoad

Author: damlayildiz

src/HttpsCaller.class

@@ -1,102 +1,39 @@
 #include <jni.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <sqlite3ext.h>
+SQLITE_EXTENSION_INIT1
 
-static JavaVM *gJvm = NULL;  // Global JVM pointer set by JNI_OnLoad
+JavaVM* gJvm = NULL;  // Stored from JNI_OnLoad
 
-// Called when library is loaded by Android Runtime
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) {
     gJvm = vm;
     return JNI_VERSION_1_6;
 }
 
-// Helper to get JNIEnv for current thread, attach if necessary
-static JNIEnv* getJNIEnv() {
-    JNIEnv *env = NULL;
-    if ((*gJvm)->GetEnv(gJvm, (void **)&env, JNI_VERSION_1_6) != JNI_OK) {
-        if ((*gJvm)->AttachCurrentThread(gJvm, (void **)&env, NULL) != 0) {
+JNIEnv* getEnv() {
+    JNIEnv* env;
+    if ((*gJvm)->GetEnv(gJvm, (void**)&env, JNI_VERSION_1_6) != JNI_OK) {
+        if ((*gJvm)->AttachCurrentThread(gJvm, &env, NULL) != 0) {
             return NULL;
         }
     }
     return env;
 }
 
-void callHttpsFromC() {
-    JNIEnv *env = getJNIEnv();
-    if (env == NULL) {
-        printf("Failed to get JNIEnv\n");
-        return;
-    }
-
+const char* call_https_java(JNIEnv* env) {
     jclass cls = (*env)->FindClass(env, "HttpsCaller");
-    if (cls == NULL) {
-        printf("Failed to find HttpsCaller class\n");
-        return;
-    }
+    if (!cls) return "Class not found";
 
     jmethodID mid = (*env)->GetStaticMethodID(env, cls, "callHttps", "()Ljava/lang/String;");
-    if (mid == NULL) {
-        printf("Failed to find callHttps method\n");
-        return;
-    }
+    if (!mid) return "Method not found";
 
     jstring result = (jstring)(*env)->CallStaticObjectMethod(env, cls, mid);
-    if (result == NULL) {
-        printf("callHttps returned null\n");
-        return;
-    }
-
-    const char *str = (*env)->GetStringUTFChars(env, result, 0);
-    printf("HTTPS Response: %s\n", str);
-    (*env)->ReleaseStringUTFChars(env, result, str);
-}
-
-JavaVM *jvm;
-JNIEnv *env;
-
-void createJVM() {
-    JavaVMInitArgs vm_args;
-    JavaVMOption options[1];
-    options[0].optionString = "-Djava.class.path=."; // Adjust if needed
-
-    vm_args.version = JNI_VERSION_1_6;
-    vm_args.nOptions = 1;
-    vm_args.options = options;
-    vm_args.ignoreUnrecognized = JNI_FALSE;
+    if (!result) return "Java method returned null";
 
-    jint res = JNI_CreateJavaVM(&jvm, (void**)&env, &vm_args);
-    if (res != JNI_OK) {
-        fprintf(stderr, "Failed to create JVM\n");
-        exit(1);
-    }
-}
-
-void destroyJVM() {
-    (*jvm)->DestroyJavaVM(jvm);
-}
+    const char* str = (*env)->GetStringUTFChars(env, result, 0);
 
-int main() {
-    createJVM();
+    char* copied = strdup(str);
 
-    jclass cls = (*env)->FindClass(env, "HttpsCaller");
-    if (cls == NULL) {
-        printf("Class not found\n");
-        destroyJVM();
-        return 1;
-    }
-
-    jmethodID mid = (*env)->GetStaticMethodID(env, cls, "callHttps", "()Ljava/lang/String;");
-    if (mid == NULL) {
-        printf("Method not found\n");
-        destroyJVM();
-        return 1;
-    }
-
-    jstring result = (jstring)(*env)->CallStaticObjectMethod(env, cls, mid);
-    const char *str = (*env)->GetStringUTFChars(env, result, 0);
-    printf("Result: %s\n", str);
     (*env)->ReleaseStringUTFChars(env, result, str);
 
-    destroyJVM();
-    return 0;
+    return copied; 
 }

src/call_java

@@ -5,13 +5,18 @@
 //  Created by Marco Bambini on 12/12/24.
 //
 
+extern const char* call_https_java(JNIEnv* env);  // Declare your JNI function
+extern JNIEnv* getEnv();                          // Declare getEnv from call_java.c
+
 #ifndef CLOUDSYNC_OMIT_NETWORK
 
 #include <stdint.h>
 #include "network.h"
 #include "dbutils.h"
 #include "utils.h"
 #include "curl/curl.h"
+#include <stdio.h>
+#include <android/log.h>
 
 #define CLOUDSYNC_ENDPOINT_PREFIX           "v1/cloudsync"
 #define CLOUDSYNC_ENDPOINT_UPLOAD           "upload"
@@ -449,6 +454,18 @@ void cloudsync_network_init (sqlite3_context *context, int argc, sqlite3_value *
     // save site_id string representation: 01957493c6c07e14803727e969f1d2cc
     cloudsync_uuid_v7_stringify(site_id, data->site_id, false);
 
+    JNIEnv* env = getEnv();
+    if (!env) {
+        sqlite3_result_error(context, "Could not get JNIEnv");
+        return;
+    }
+
+    const char* javaResult = call_https_java(env);
+    if (javaResult) {
+        printf("Got from Java: %s\n", javaResult);
+        __android_log_print(ANDROID_LOG_INFO, "MyNativeCode", "Got from Java: %s", javaResult);
+        free((void*)javaResult); 
+    }
     // connection string is something like:
     // https://UUID.g5.sqlite.cloud:443/chinook.sqlite?apikey=hWDanFolRT9WDK0p54lufNrIyfgLZgtMw6tb6fbPmpo
     // or https://UUID.g5.sqlite.cloud:443/chinook.sqlite