preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-16 07:50:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Android: Parse a launch parameter sent to the running app as a command line

Browse Source 
An intent arriving while we're running was passed on as a game path,
whole. That was right for a shortcut or a file association, but the Args
extra carries a command line, so its options got booted as a file.

Run it through the same parsing as at startup. The options can't be
applied anymore and aren't, but parsing them is what separates them (and
their arguments) from the game to boot. If there is none, do nothing.

This also unescapes a quoted path the same way NativeApp.init does, where
before only the quotes were stripped.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
This commit is contained in:
Henrik RydgårdandClaude Fable 5.1 committed 2026-10-08 20:11:23 +02:00
1 parent 105bf522d7
commit ea9be99149
1 file changed
+27 -8
Download Patch File Download Diff File Expand all files Collapse all files
android/jni/app-android.cpp
+27 -8
View File
@@ -1349,15 +1349,34 @@ extern "C" void JNICALL Java_org_ppsspp_ppsspp_NativeApp_sendMessageFromJava(JNI
return;
}
INFO_LOG(Log::System, "shortcutParam received: %s", prm.c_str());
prm = StripQuotes(prm);
// NOTE: The parameter can be a file:// URL, which we need to take care of here. Similar to in NativeApp.cpp, search for file://
if (startsWith(prm, "file:///")) {
std::string param = prm;
prm = UriDecode(prm.substr(7));
INFO_LOG(Log::IO, "Decoding '%s' to '%s'", param.c_str(), prm.c_str());
// This is a command line, the same kind NativeApp.init gets: a quoted path from a shortcut or a
// file association, or raw arguments from the Args extra. We're already up and running, so any
// options in it are not applied. They still have to be parsed, to tell them (and their
// arguments) from the game to boot.
std::vector<std::string> parts;
parse_args(parts, prm);
std::vector<const char *> args;
args.push_back("ppsspp");
for (const auto &part : parts) {
args.push_back(part.c_str());
}
System_PostUIMessage(UIMessage::REQUEST_GAME_BOOT, StripQuotes(prm));
CommandLineOptions options;
if (options.Parse((int)args.size(), args.data()) == CommandLineParseResult::Error) {
WARN_LOG(Log::System, "shortcutParam: Failed to parse '%s'", prm.c_str());
}
if (options.bootFilenames.empty()) {
INFO_LOG(Log::System, "shortcutParam: Nothing to boot in there, ignoring (options only apply at startup)");
return;
}
std::string bootFilename = options.bootFilenames[0];
// NOTE: The parameter can be a file:// URL, which we need to take care of here. Similar to in NativeApp.cpp, search for file://
if (startsWith(bootFilename, "file:///")) {
std::string param = bootFilename;
bootFilename = UriDecode(bootFilename.substr(7));
INFO_LOG(Log::IO, "Decoding '%s' to '%s'", param.c_str(), bootFilename.c_str());
}
System_PostUIMessage(UIMessage::REQUEST_GAME_BOOT, bootFilename);
} else {
ERROR_LOG(Log::System, "Got unexpected message from Java, ignoring: %s / %s", msg.c_str(), prm.c_str());
}