@cuby-ui/ar 0.0.9 → 0.0.10

package/android/src/main/java/com/cuby/plugins/cubyar/NativeBridge.java

@@ -1,50 +1,71 @@
 package com.cuby.plugins.cubyar;
 
-import static com.cuby.cubyar.NativeLogger.logMessage;
 import static com.cuby.cubyar.GEngineHelper.isGEngineReady;
-
 import android.Manifest;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.os.Handler;
-import android.os.Looper;
 import android.util.Log;
-import android.widget.Toast;
-
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-
 import com.cuby.cubyar.NativeLogger;
+import com.getcapacitor.PermissionState;
 import com.getcapacitor.Plugin;
 import com.getcapacitor.PluginCall;
 import com.getcapacitor.PluginMethod;
 import com.getcapacitor.annotation.CapacitorPlugin;
+import com.getcapacitor.annotation.Permission;
 import com.getcapacitor.JSObject;
+import com.getcapacitor.annotation.PermissionCallback;
 
 @CapacitorPlugin(name = "NativeBridge", permissions = {
         @Permission(strings = { Manifest.permission.CAMERA }, alias = "camera")
 })
 public class NativeBridge extends Plugin {
     private static final String LOG_TAG = "CubyARPlugin";
+    private boolean isPermissionDenied = false;
 
     @PluginMethod
     public void startAR(PluginCall call) {
-        if (getPermissionState("camera") != PermissionState.GRANTED) {
-            requestPermissionForAlias("camera", call, "cameraPermissionCallback");
-        } else {
+        PermissionState state = getPermissionState("camera");
+
+        isPermissionDenied = false;
+
+        if (state == PermissionState.GRANTED) {
             launchUnrealAR();
             call.resolve();
+        } else {
+            requestPermissionForAlias("camera", call, "cameraPermsCallback");
+        }
+
+        // Wait until the Unreal Engine is fully initialized
+        long startTime = System.currentTimeMillis();
+        long timeoutInSeconds = 5_000;
+
+        while (!isGEngineReady() &&
+                (System.currentTimeMillis() - startTime < timeoutInSeconds) &&
+                !isPermissionDenied) {
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException e) {
+                break;
+            }
+        }
+
+        if (isGEngineReady()) {
+            Log.i(LOG_TAG, "Unreal Engine initialized");
+        } else {
+            Log.e(LOG_TAG, "Timeout waiting for Unreal Engine initialization");
         }
     }
 
     @PermissionCallback
-    private void cameraPermissionCallback(PluginCall call) {
+    private void cameraPermsCallback(PluginCall call) {
         if (getPermissionState("camera") == PermissionState.GRANTED) {
-            launchUnrealAR();
-            call.resolve();
+            new Thread(() -> {
+                launchUnrealAR();
+                getActivity().runOnUiThread(call::resolve);
+            }).start();
         } else {
+            isPermissionDenied = true;
             call.reject("Camera permission denied");
         }
     }
@@ -60,12 +81,6 @@ public class NativeBridge extends Plugin {
                 activity.startActivity(intent);
 
                 Log.i(LOG_TAG, "Unreal AR activity launched successfully");
-
-                // Wait until the Unreal Engine is fully initialized.
-                // This loop blocks execution to ensure no engine functions
-                // are called before the engine is ready
-                while (!isGEngineReady())
-                    ;
             } else {
                 Log.e(LOG_TAG, "GameActivity not found in package");
             }
@@ -78,8 +93,7 @@ public class NativeBridge extends Plugin {
     @PluginMethod
     public void logMessage(PluginCall call) {
         String message = call.getString("message");
-        float duration = call.getString("duration", "5.0") != null ? Float.parseFloat(call.getString("duration", "5.0"))
-                : 5.0f;
+        double duration = call.getDouble("duration", 5.0);
 
         if (message == null) {
             call.reject("Missing 'message' parameter");
@@ -87,7 +101,7 @@ public class NativeBridge extends Plugin {
         }
 
         try {
-            NativeLogger.logMessage(message, duration);
+            NativeLogger.logMessage(message, (float) duration);
 
             JSObject ret = new JSObject();
             ret.put("status", "logged");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cuby-ui/ar",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "Ar/Vr plugin",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",