Prohibit creating nested roots: #68

ARK-Builders · Mar 24, 2024 · b63d055 · b63d055
1 parent f967e06
commit b63d055
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/filepicker/src/main/java/dev/arkbuilders/components/filepicker/ArkFilePickerFragment.kt b/filepicker/src/main/java/dev/arkbuilders/components/filepicker/ArkFilePickerFragment.kt
@@ -306,6 +306,10 @@ open class ArkFilePickerFragment :
         FilePickerSideEffect.CannotPinFile -> {
             activity?.toast(R.string.ark_file_picker_pin_folder_only)
         }
+
+        FilePickerSideEffect.NestedRootProhibited -> {
+            activity?.toast(R.string.ark_file_nested_root_inside)
+        }
     }
 
 

diff --git a/filepicker/src/main/java/dev/arkbuilders/components/filepicker/ArkFilePickerViewModel.kt b/filepicker/src/main/java/dev/arkbuilders/components/filepicker/ArkFilePickerViewModel.kt
@@ -44,6 +44,7 @@ internal sealed class FilePickerSideEffect {
     data object AlreadyFavorite : FilePickerSideEffect()
     data object PinAsFirstRoot : FilePickerSideEffect()
     data object CannotPinFile : FilePickerSideEffect()
+    data object NestedRootProhibited : FilePickerSideEffect()
 
 }
 
@@ -190,6 +191,17 @@ internal class ArkFilePickerViewModel(
         val roots = rootsWithFavorites.keys
         val root = roots.find { root -> file.startsWith(root) }
         val favorites = rootsWithFavorites[root]?.flatten()
+
+        val hasNestedRoot = roots.contains(file)
+                || (roots.indexOfFirst { path ->
+                    val index = path.toString().indexOf(file.toString())
+                    (index >= 0) && (path.toString()[index] == '/') } >= 0)
+
+        if (hasNestedRoot) {
+            postSideEffect(FilePickerSideEffect.NestedRootProhibited)
+            return@intent
+        }
+
         val haveRoot = haveRoot()
 
         root?.let {

diff --git a/filepicker/src/main/res/values/strings.xml b/filepicker/src/main/res/values/strings.xml
@@ -16,6 +16,7 @@
     <string name="ark_file_picker_already_a_favorite">Already be a Favorite folder!</string>
     <string name="ark_file_picker_already_be_a_root">Already be a Root folder!</string>
     <string name="ark_file_picker_pin_folder_only">Only folder can be pinned.</string>
+    <string name="ark_file_nested_root_inside">There\'s already nested root(s) inside.</string>
     <string name="ark_file_picker_pin">Pin</string>
     <plurals name="ark_file_picker_items">
         <item quantity="one">%d item</item>