Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 Fix no returned ids after successful deletion on Android API 29+ #1204

Merged
merged 1 commit into from
Oct 15, 2024
Merged

🐛 Fix no returned ids after successful deletion on Android API 29+ #1204

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion android/src/main/kotlin/com/fluttercandies/photo_manager/core/PhotoManagerDeleteManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ class PhotoManagerDeleteManager(val context: Context, private var activity: Acti
private var androidQDeleteRequestCode = 40070
private val androidQUriMap = mutableMapOf<String, Uri?>()
private val androidQSuccessIds = mutableListOf<String>()
private val androidQRemovedIds = mutableListOf<String>()

@RequiresApi(Build.VERSION_CODES.Q)
inner class AndroidQDeleteTask(
Expand Down Expand Up @@ -149,13 +150,15 @@ class PhotoManagerDeleteManager(val context: Context, private var activity: Acti
androidQUriMap.clear()
androidQUriMap.putAll(uris)
androidQSuccessIds.clear()
androidQRemovedIds.clear()
waitPermissionQueue.clear()

for (entry in uris) {
val uri = entry.value ?: continue
val id = entry.key
try {
cr.delete(uri, null, null)
androidQRemovedIds.add(id)
} catch (e: Exception) {
// request delete permission
if (e is RecoverableSecurityException) {
Expand All @@ -181,8 +184,9 @@ class PhotoManagerDeleteManager(val context: Context, private var activity: Acti
}
}

androidQHandler?.reply(androidQSuccessIds.toList())
androidQHandler?.reply(androidQSuccessIds.toList() + androidQRemovedIds.toList())
androidQSuccessIds.clear()
androidQRemovedIds.clear()
androidQHandler = null
}

Expand Down
Loading