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

Merge pull request #933 from yugal1107/fix-mediastore-delete

Browse source 
Fix mediastore delete
This commit is contained in:
deniscerri 2025-09-26 19:26:07 +02:00 committed by GitHub
commit 5a895387f7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 33 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10,6 +10,7 @@ import android.net.Uri
import android.os.Build
import android.os.Environment
import android.provider.DocumentsContract
import android.provider.MediaStore
import android.util.DisplayMetrics
import android.util.Log
import android.view.ViewGroup
@ -63,9 +64,41 @@ object FileUtil {
if (!File(path).delete()){
DocumentFile.fromSingleUri(App.instance, Uri.parse(path))?.delete()
}
deleteFileFromMediaStore(path)
}
}
private fun deleteFileFromMediaStore(path: String) {
val contentResolver = App.instance.contentResolver
val file = File(path)
val uri = MediaStore.Files.getContentUri("external")
val selection: String
val selectionArgs: Array<String>
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
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)
}
} else {
selection = MediaStore.MediaColumns.DATA + " =?"
selectionArgs = arrayOf(file.absolutePath)
}
contentResolver.delete(uri, selection, selectionArgs)
}
fun exists(path: String) : Boolean {
val file = File(path)
if (path.isEmpty()) return false