godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-21 14:57:09 +00:00
Code Releases Wiki Activity

Make use of activity-alias as the launcher mechanism for the Godot editor and the Godot app template

Browse Source
This commit is contained in:
Fredia Huya-Kouadio
2025-11-06 11:30:07 -08:00
parent e47fb8b898
commit 2ed51e00a1
14 changed files with 391 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
platform/android/java/lib/src/main/java/org/godotengine/godot/GodotActivity.kt
View File

@@ -72,18 +72,48 @@ abstract class GodotActivity : FragmentActivity(), GodotHost {
protected var godotFragment: GodotFragment? = null
private set
/**
* Strip out the command line parameters from intent targeting exported activities.
*/
protected fun sanitizeLaunchIntent(launchIntent: Intent = intent): Intent {
val targetComponent = launchIntent.component ?: componentName
val activityInfo = packageManager.getActivityInfo(targetComponent, 0)
if (activityInfo.exported) {
launchIntent.removeExtra(EXTRA_COMMAND_LINE_PARAMS)
}
return launchIntent
}
/**
* Only retrieve the command line parameters from the intent from non-exported activities.
* This ensures only internal components can configure how the engine is run.
*/
protected fun retrieveCommandLineParamsFromLaunchIntent(launchIntent: Intent = intent): Array<String> {
val targetComponent = launchIntent.component ?: componentName
val activityInfo = packageManager.getActivityInfo(targetComponent, 0)
if (!activityInfo.exported) {
val params = launchIntent.getStringArrayExtra(EXTRA_COMMAND_LINE_PARAMS)
return params ?: emptyArray()
}
return emptyArray()
}
@CallSuper
override fun onCreate(savedInstanceState: Bundle?) {
intent = sanitizeLaunchIntent(intent)
val assetsCommandLine = try {
CommandLineFileParser.parseCommandLine(assets.open("_cl_"))
} catch (ignored: Exception) {
} catch (_: Exception) {
mutableListOf()
}
Log.d(TAG, "Project command line parameters: $assetsCommandLine")
commandLineParams.addAll(assetsCommandLine)
val params = intent.getStringArrayExtra(EXTRA_COMMAND_LINE_PARAMS)
Log.d(TAG, "Starting intent $intent with parameters ${params.contentToString()}")
commandLineParams.addAll(params ?: emptyArray())
val intentCommandLine = retrieveCommandLineParamsFromLaunchIntent()
Log.d(TAG, "Launch intent $intent with parameters ${intentCommandLine.contentToString()}")
commandLineParams.addAll(intentCommandLine)
super.onCreate(savedInstanceState)
@@ -167,10 +197,9 @@ abstract class GodotActivity : FragmentActivity(), GodotHost {
}
override fun onNewIntent(newIntent: Intent) {
super.onNewIntent(newIntent)
intent = newIntent
handleStartIntent(newIntent, false)
intent = sanitizeLaunchIntent(newIntent)
super.onNewIntent(intent)
handleStartIntent(intent, false)
}
private fun handleStartIntent(intent: Intent, newLaunch: Boolean) {