danvics/ytdlnis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated logic to consider external media also

Browse source
This commit is contained in:
yugal1107 2025-09-26 09:18:26 +00:00
parent d8e1e46ae2
commit acd5a4cd00
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/src/main/java/com/deniscerri/ytdl/util/FileUtil.kt
View file

@ -77,15 +77,21 @@ object FileUtil {
val selectionArgs: Array<String>
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
val parentPath = file.parentFile?.absolutePath ?: ""
val externalStoragePath = Environment.getExternalStorageDirectory().absolutePath
val relativePath = if (parentPath.length > externalStoragePath.length && parentPath.startsWith(externalStoragePath)) {
parentPath.substring(externalStoragePath.length).removePrefix("/") + "/"
val parentPath = file.parentFile?.absolutePath.orEmpty()
val primaryRoot = Environment.getExternalStorageDirectory().absolutePath
if (parentPath.startsWith(primaryRoot)) {
val trimmed = parentPath
.removePrefix(primaryRoot)
.removePrefix(File.separator)
val relativePath = if (trimmed.isEmpty()) "" else "$trimmed${File.separator}"
selection = MediaStore.MediaColumns.RELATIVE_PATH + " =? AND " +
MediaStore.MediaColumns.DISPLAY_NAME + " =?"
selectionArgs = arrayOf(relativePath, file.name)
} else {
""
// Non-primary storage: fall back to DATA query
selection = MediaStore.MediaColumns.DATA + " =?"
selectionArgs = arrayOf(file.absolutePath)
}
selection = MediaStore.MediaColumns.RELATIVE_PATH + " =? AND " + MediaStore.MediaColumns.DISPLAY_NAME + " =?"
selectionArgs = arrayOf(relativePath, file.name)
} else {
selection = MediaStore.MediaColumns.DATA + " =?"
selectionArgs = arrayOf(file.absolutePath)