Fix b0rken OTGUtil.getDocumentFile()

Addresses #4038, that under specific root URI the file/folders should be able to be found correctly.
TeamAmaze · Jan 12, 2024 · ff6bfa5 · ff6bfa5
1 parent 02afa4f
commit ff6bfa5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/app/src/main/java/com/amaze/filemanager/filesystem/HybridFile.java b/app/src/main/java/com/amaze/filemanager/filesystem/HybridFile.java
@@ -46,8 +46,8 @@
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Locale;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.Callable;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
 

diff --git a/app/src/main/java/com/amaze/filemanager/ui/dialogs/GeneralDialogCreation.java b/app/src/main/java/com/amaze/filemanager/ui/dialogs/GeneralDialogCreation.java
@@ -441,7 +441,7 @@ public static void restoreFilesDialog(
         new MaterialDialog.Builder(context)
             .title(context.getString(R.string.restore_files))
             .customView(dialogView, true)
-            .theme(appTheme.getMaterialDialogTheme(context))
+            .theme(appTheme.getMaterialDialogTheme())
             .negativeText(context.getString(R.string.cancel).toUpperCase())
             .positiveText(context.getString(R.string.done).toUpperCase())
             .positiveColor(accentColor)

diff --git a/app/src/main/java/com/amaze/filemanager/utils/OTGUtil.kt b/app/src/main/java/com/amaze/filemanager/utils/OTGUtil.kt
@@ -171,7 +171,9 @@ object OTGUtil {
         var retval: DocumentFile? = DocumentFile.fromTreeUri(context, rootUri)
             ?: throw DocumentFileNotFoundException(rootUri, path)
         val parts: Array<String> = if (openMode == OpenMode.DOCUMENT_FILE) {
-            path.substringAfter(URLDecoder.decode(rootUri.toString(), Charsets.UTF_8.name()))
+            URLDecoder.decode(path, Charsets.UTF_8.name()).substringAfter(
+                URLDecoder.decode(rootUri.toString(), Charsets.UTF_8.name())
+            )
                 .split("/", PATH_SEPARATOR_ENCODED).toTypedArray()
         } else {
             path.split("/").toTypedArray()