Skip to content

fix(download): remove deleted/cancelled items from the Downloads list in real time (#1227) #2598

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

Merged
fire-light42 merged 5 commits into from
Jul 14, 2026
Merged

fix(download): remove deleted/cancelled items from the Downloads list in real time (#1227) #2598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
508b567
fix(download): hook downloadDeleteEvent in BaseFetchButton to reset U…
LeC-D Apr 2, 2026
15730b3
fix(download): refresh Downloads list when a download is cancelled (#…
LeC-D Jun 27, 2026
b051363
fix(download): rebuild Downloads lists from disk on delete so series …
LeC-D Jun 30, 2026
60cfebd
refactor(download): apply review suggestions — global app context, si…
LeC-D Jul 3, 2026
e75fbc2
remove unnecessary comment
fire-light42 Jul 14, 2026
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
27 changes: 26 additions & 1 deletion app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import androidx.lifecycle.LiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.lagradost.api.Log
import com.lagradost.cloudstream3.CloudStreamApp
import com.lagradost.cloudstream3.R
import com.lagradost.cloudstream3.isEpisodeBased
import com.lagradost.cloudstream3.mvvm.Resource
Expand All @@ -36,6 +37,7 @@ import com.lagradost.cloudstream3.utils.ResourceLiveData
import com.lagradost.cloudstream3.utils.downloader.DownloadObjects
import com.lagradost.cloudstream3.utils.downloader.DownloadQueueManager
import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.deleteFilesAndUpdateSettings
import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.downloadDeleteEvent
import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.getDownloadFileInfo
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
Expand Down Expand Up @@ -67,6 +69,17 @@ class DownloadViewModel : ViewModel() {
private val _selectedItemIds = ConsistentLiveData<Set<Int>?>(null)
val selectedItemIds: LiveData<Set<Int>?> = _selectedItemIds

init {
// Keep the Downloads list in sync when a download is deleted/cancelled from
// anywhere in the app (result page button, queue, notification, etc.). See
// onDownloadDeleted for the rationale (issue #1227).
downloadDeleteEvent += ::onDownloadDeleted
}

override fun onCleared() {
downloadDeleteEvent -= ::onDownloadDeleted
super.onCleared()
}

fun cancelSelection() {
updateSelectedItems { null }
Expand Down Expand Up @@ -389,6 +402,18 @@ class DownloadViewModel : ViewModel() {
postChildren(_childCards.success?.filter { it.data.id !in idsToRemove })
}

/**
* Refreshes the Downloads screen in real time when a download is deleted/cancelled.
*/
private fun onDownloadDeleted(id: Int) {
// Keep multi-select state consistent: forget the removed id if it was selected.
updateSelectedItems { it?.minus(id) }

val context = CloudStreamApp.context ?: return
updateHeaderList(context)
postChildren(_childCards.success?.filterNot { it.data.id == id })
}

private fun updateStorageStats(visual: List<VisualDownloadCached.Header>) {
try {
val stat = StatFs(Environment.getExternalStorageDirectory().path)
Expand Down Expand Up @@ -584,4 +609,4 @@ class DownloadViewModel : ViewModel() {
val names: List<String>,
val parentName: String?
)
}
}
12 changes: 7 additions & 5 deletions app/src/main/java/com/lagradost/cloudstream3/ui/download/button/BaseFetchButton.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,11 @@ abstract class BaseFetchButton(context: Context, attributeSet: AttributeSet) :
}
}

/*fun downloadDeleteEvent(data: Int) {

}*/
fun downloadDeleteEvent(data: Int) {
if (data == persistentId) {
resetView()
}
}

/*fun downloadEvent(data: Pair<Int, VideoDownloadManager.DownloadActionType>) {
val (id, action) = data
Expand All @@ -185,7 +187,7 @@ abstract class BaseFetchButton(context: Context, attributeSet: AttributeSet) :

override fun onAttachedToWindow() {
VideoDownloadManager.downloadStatusEvent += ::downloadStatusEvent
// VideoDownloadManager.downloadDeleteEvent += ::downloadDeleteEvent
VideoDownloadManager.downloadDeleteEvent += ::downloadDeleteEvent
// VideoDownloadManager.downloadEvent += ::downloadEvent
VideoDownloadManager.downloadProgressEvent += ::downloadProgressEvent

Expand All @@ -200,7 +202,7 @@ abstract class BaseFetchButton(context: Context, attributeSet: AttributeSet) :

override fun onDetachedFromWindow() {
VideoDownloadManager.downloadStatusEvent -= ::downloadStatusEvent
// VideoDownloadManager.downloadDeleteEvent -= ::downloadDeleteEvent
VideoDownloadManager.downloadDeleteEvent -= ::downloadDeleteEvent
// VideoDownloadManager.downloadEvent -= ::downloadEvent
VideoDownloadManager.downloadProgressEvent -= ::downloadProgressEvent

Expand Down