Fix hybrid app support for recent Godot Android library changes

dsnopek · Feb 7, 2025 · c54837b · c54837b
1 parent dabe6c7
commit c54837b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/plugin/src/main/java/org/godotengine/openxr/vendors/GodotOpenXRHybridAppInternal.kt b/plugin/src/main/java/org/godotengine/openxr/vendors/GodotOpenXRHybridAppInternal.kt
@@ -76,10 +76,10 @@ class GodotOpenXRHybridAppInternal(godot: Godot?) : GodotPlugin(godot) {
 	fun hybridAppSwitchTo(mode: Int, data: String = ""): Boolean {
 		if (hybridMode == mode) return false
 
-		if (!isNativeXRDevice()) return false
-
 		val context = getActivity() ?: return false
 
+		if (!isNativeXRDevice(context)) return false
+
 		val activityName = if (mode == IMMERSIVE_MODE) IMMERSIVE_ACTIVITY else PANEL_ACTIVITY
 		val newInstance = Intent()
 			.setComponent(ComponentName(context, activityName))

diff --git a/plugin/src/main/java/org/godotengine/openxr/vendors/GodotPanelApp.kt b/plugin/src/main/java/org/godotengine/openxr/vendors/GodotPanelApp.kt
@@ -57,12 +57,11 @@ class GodotPanelApp : GodotActivity() {
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		installSplashScreen()
-		super.onCreate(savedInstanceState)
-	}
 
-	override fun getCommandLine(): MutableList<String> {
 		// Force XR to be turned off.
-		return mutableListOf("--xr_mode_regular", "--xr-mode", "off")
+		updateCommandLineParams(arrayOf("--xr_mode_regular", "--xr-mode", "off"))
+
+		super.onCreate(savedInstanceState)
 	}
 
 	override fun supportsFeature(featureTag: String): Boolean {