Merge pull request TeamAmaze#3971 from seelchen/bugfix/3767

Bug fix: TeamAmaze#3767 `StringIndexOutOfBoundsException` on `HybridFile#getParent`
TranceLove · Oct 30, 2023 · 337b78b · 337b78b
2 parents 253ef47 + 8386743
commit 337b78b
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/app/src/main/java/com/amaze/filemanager/filesystem/HybridFile.java b/app/src/main/java/com/amaze/filemanager/filesystem/HybridFile.java
@@ -559,7 +559,11 @@ public String getParent(Context context) {
         if (thisPath.isEmpty() || pathSegments.isEmpty()) return null;
 
         String currentName = pathSegments.get(pathSegments.size() - 1);
-        String parent = thisPath.substring(0, thisPath.lastIndexOf(currentName));
+        int currentNameStartIndex = thisPath.lastIndexOf(currentName);
+        if (currentNameStartIndex < 0) {
+          return null;
+        }
+        String parent = thisPath.substring(0, currentNameStartIndex);
         if (ArraysKt.any(ANDROID_DATA_DIRS, dir -> parent.endsWith(dir + "/"))) {
           return FileProperties.unmapPathForApi30OrAbove(parent);
         } else {