android: Fix resolving android URIs in native code

2023-10-24 22:51:09 -04:00
parent a9e29a3972
commit 585b6e9d46
7 changed files with 117 additions and 11 deletions
--- a/src/common/fs/path_util.cpp
+++ b/src/common/fs/path_util.cpp
@ -401,6 +401,16 @@ std::string SanitizePath(std::string_view path_, DirectorySeparator directory_se
 }

 std::string_view GetParentPath(std::string_view path) {
+    if (path.empty()) {
+        return path;
+    }
+
+#ifdef ANDROID
+    if (path[0] != '/') {
+        std::string path_string{path};
+        return FS::Android::GetParentDirectory(path_string);
+    }
+#endif
    const auto name_bck_index = path.rfind('\\');
    const auto name_fwd_index = path.rfind('/');
    std::size_t name_index;