From f27e6055f8f9a1c16ca613856c8a20d3d98011b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Fri, 8 Sep 2023 16:42:39 +0200
Subject: [PATCH] Fix running homebrew on Android with content URIs (scoped
 storage)

---
 Core/Loaders.cpp    | 7 +++++--
 Core/PSPLoaders.cpp | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Core/Loaders.cpp b/Core/Loaders.cpp
index 61bc98449f..1da31122b5 100644
--- a/Core/Loaders.cpp
+++ b/Core/Loaders.cpp
@@ -18,6 +18,7 @@
 #include <algorithm>
 #include <cstdio>
 
+#include "Common/File/AndroidContentURI.h"
 #include "Common/File/FileUtil.h"
 #include "Common/File/Path.h"
 #include "Common/StringUtils.h"
@@ -263,10 +264,9 @@ bool LoadFile(FileLoader **fileLoaderPtr, std::string *error_string) {
 	switch (type) {
 	case IdentifiedFileType::PSP_PBP_DIRECTORY:
 		{
-			// TODO: Perhaps we should/can never get here now?
 			fileLoader = ResolveFileLoaderTarget(fileLoader);
 			if (fileLoader->Exists()) {
-				INFO_LOG(LOADER, "File is a PBP in a directory!");
+				INFO_LOG(LOADER, "File is a PBP in a directory: %s", fileLoader->GetPath().c_str());
 				IdentifiedFileType ebootType = Identify_File(fileLoader, error_string);
 				if (ebootType == IdentifiedFileType::PSP_ISO_NP) {
 					InitMemoryForGameISO(fileLoader);
@@ -284,6 +284,9 @@ bool LoadFile(FileLoader **fileLoaderPtr, std::string *error_string) {
 				}
 
 				std::string dir = fileLoader->GetPath().GetDirectory();
+				if (fileLoader->GetPath().Type() == PathType::CONTENT_URI) {
+					dir = AndroidContentURI(dir.c_str()).FilePath();
+				}
 				size_t pos = dir.find("PSP/GAME/");
 				if (pos != std::string::npos) {
 					dir = ResolvePBPDirectory(Path(dir)).ToString();
diff --git a/Core/PSPLoaders.cpp b/Core/PSPLoaders.cpp
index 9516ab60bd..0eb346f0ba 100644
--- a/Core/PSPLoaders.cpp
+++ b/Core/PSPLoaders.cpp
@@ -382,7 +382,7 @@ bool Load_PSP_ELF_PBP(FileLoader *fileLoader, std::string *error_string) {
 	std::string file = full_path.GetFilename();
 
 	if (full_path.Type() == PathType::CONTENT_URI) {
-		path = AndroidContentURI(full_path.c_str()).FilePath();
+		path = AndroidContentURI(full_path.GetDirectory().c_str()).FilePath();
 	}
 
 	size_t pos = path.find("PSP/GAME/");