Remove INTERNAL_STORAGE const from utils

ARK-Builders · Dec 27, 2024 · 5f98d2d · 5f98d2d
1 parent c17719b
commit 5f98d2d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/filepicker/src/main/java/dev/arkbuilders/components/filepicker/ArkRootPickerFragment.kt b/filepicker/src/main/java/dev/arkbuilders/components/filepicker/ArkRootPickerFragment.kt
@@ -4,8 +4,8 @@ import androidx.core.os.bundleOf
 import androidx.fragment.app.setFragmentResult
 import androidx.lifecycle.lifecycleScope
 import dev.arkbuilders.arklib.data.folders.FoldersRepo
+import dev.arkbuilders.arklib.utils.INTERNAL_STORAGE
 import dev.arkbuilders.components.utils.hasNestedRoot
-import dev.arkbuilders.components.utils.isInternalStorage
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import java.nio.file.Path
@@ -18,7 +18,7 @@ class ArkRootPickerFragment : ArkFilePickerFragment() {
             val folders = FoldersRepo.instance.provideFolders()
             val roots = folders.keys
 
-            if (currentFolder.isInternalStorage() || currentFolder.hasNestedRoot(roots)) {
+            if (currentFolder == INTERNAL_STORAGE || currentFolder.hasNestedRoot(roots)) {
                 rootNotFavorite = true
                 binding.btnPick.text = getString(R.string.ark_file_picker_root)
                 binding.btnPick.isEnabled = false

diff --git a/utils/src/main/java/dev/arkbuilders/components/utils/PathExt.kt b/utils/src/main/java/dev/arkbuilders/components/utils/PathExt.kt
@@ -1,9 +1,6 @@
 package dev.arkbuilders.components.utils
 
 import java.nio.file.Path
-import kotlin.io.path.Path
-
-val INTERNAL_STORAGE = Path("/storage/emulated/0")
 
 fun Path.hasNestedOrParentalRoot(roots: Iterable<Path>): Boolean {
     val hasNestedRoot = roots.any { path ->
@@ -12,6 +9,4 @@ fun Path.hasNestedOrParentalRoot(roots: Iterable<Path>): Boolean {
     return hasNestedRoot
 }
 
-fun Path.hasNestedRoot(roots: Iterable<Path>) = roots.any {  it.startsWith(this) }
-
-fun Path.isInternalStorage() = this == INTERNAL_STORAGE
+fun Path.hasNestedRoot(roots: Iterable<Path>) = roots.any {  it.startsWith(this) }