Move setting isMultiDeleteState to view model and don't close if no items

app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadChildFragment.kt

@@ -113,6 +113,15 @@ class DownloadChildFragment : Fragment() {
             setAppBarNoScrollFlagsOnTV()
         }
 
+        observe(downloadsViewModel.isMultiDeleteState) { isMultiDeleteState ->
+            val adapter = binding?.downloadChildList?.adapter as? DownloadAdapter
+            adapter?.setIsMultiDeleteState(isMultiDeleteState)
+            binding?.downloadDeleteAppbar?.isVisible = isMultiDeleteState
+            if (!isMultiDeleteState) {
+                detachBackPressedCallback()
+                downloadsViewModel.clearSelectedItems()
+            }
+        }
         observe(downloadsViewModel.selectedItems) {
             handleSelectedChange(it)
             binding?.btnDelete?.text =
@@ -160,8 +169,7 @@ class DownloadChildFragment : Fragment() {
             }
 
             binding?.btnCancel?.setOnClickListener {
-                adapter?.setIsMultiDeleteState(false)
+                downloadsViewModel.setIsMultiDeleteState(false)
-                downloadsViewModel.clearSelectedItems()
             }
 
             binding?.btnSelectAll?.setOnClickListener {
@@ -169,23 +177,15 @@ class DownloadChildFragment : Fragment() {
                 downloadsViewModel.selectAllItems()
             }
 
-            adapter?.setIsMultiDeleteState(true)
+            downloadsViewModel.setIsMultiDeleteState(true)
-        } else {
-            binding?.downloadDeleteAppbar?.isVisible = false
-
-            detachBackPressedCallback()
-            adapter?.setIsMultiDeleteState(false)
-            downloadsViewModel.clearSelectedItems()
         }
     }
 
     private fun setUpDownloadDeleteListener(folder: String) {
         downloadDeleteEventListener = { id: Int ->
             val list = (binding?.downloadChildList?.adapter as? DownloadAdapter)?.currentList
-            if (list != null) {
+            if (list?.any { it.data.id == id } == true) {
-                if (list.any { it.data.id == id }) {
+                updateList(folder)
-                    updateList(folder)
-                }
             }
         }
         downloadDeleteEventListener?.let { VideoDownloadManager.downloadDeleteEvent += it }
@@ -197,8 +197,7 @@ class DownloadChildFragment : Fragment() {
         if (backPressedCallback == null) {
             backPressedCallback = object : OnBackPressedCallback(true) {
                 override fun handleOnBackPressed() {
-                    (binding?.downloadChildList?.adapter as? DownloadAdapter)?.setIsMultiDeleteState(false)
+                    downloadsViewModel.setIsMultiDeleteState(false)
-                    downloadsViewModel.clearSelectedItems()
                 }
             }
         }

app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadFragment.kt

@@ -112,6 +112,19 @@ class DownloadFragment : Fragment() {
         observe(downloadsViewModel.downloadBytes) {
             updateStorageInfo(view.context, it, R.string.app_storage, binding?.downloadAppTxt, binding?.downloadApp)
         }
+        observe(downloadsViewModel.isMultiDeleteState) { isMultiDeleteState ->
+            val adapter = binding?.downloadList?.adapter as? DownloadAdapter
+            adapter?.setIsMultiDeleteState(isMultiDeleteState)
+            binding?.downloadDeleteAppbar?.isVisible = isMultiDeleteState
+            if (!isMultiDeleteState) {
+                detachBackPressedCallback()
+                downloadsViewModel.clearSelectedItems()
+                // Make sure we don't display it early
+                if (downloadsViewModel.usedBytes.value?.let { it > 0 } == true) {
+                    binding?.downloadStorageAppbar?.isVisible = true
+                }
+            }
+        }
         observe(downloadsViewModel.selectedItems) {
             handleSelectedChange(it)
             binding?.btnDelete?.text =
@@ -195,8 +208,7 @@ class DownloadFragment : Fragment() {
             }
 
             binding?.btnCancel?.setOnClickListener {
-                adapter?.setIsMultiDeleteState(false)
+                downloadsViewModel.setIsMultiDeleteState(false)
-                downloadsViewModel.clearSelectedItems()
             }
 
             binding?.btnSelectAll?.setOnClickListener {
@@ -204,17 +216,7 @@ class DownloadFragment : Fragment() {
                 downloadsViewModel.selectAllItems()
             }
 
-            adapter?.setIsMultiDeleteState(true)
+            downloadsViewModel.setIsMultiDeleteState(true)
-        } else {
-            binding?.downloadDeleteAppbar?.isVisible = false
-            // Make sure we don't display it early
-            if (downloadsViewModel.usedBytes.value?.let { it > 0 } == true) {
-                binding?.downloadStorageAppbar?.isVisible = true
-            }
-
-            detachBackPressedCallback()
-            adapter?.setIsMultiDeleteState(false)
-            downloadsViewModel.clearSelectedItems()
         }
     }
 
@@ -329,8 +331,7 @@ class DownloadFragment : Fragment() {
         if (backPressedCallback == null) {
             backPressedCallback = object : OnBackPressedCallback(true) {
                 override fun handleOnBackPressed() {
-                    (binding?.downloadList?.adapter as? DownloadAdapter)?.setIsMultiDeleteState(false)
+                    downloadsViewModel.setIsMultiDeleteState(false)
-                    downloadsViewModel.clearSelectedItems()
                 }
             }
         }

app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadViewModel.kt

@@ -32,19 +32,26 @@ class DownloadViewModel : ViewModel() {
     val headerCards: LiveData<List<VisualDownloadCached.Header>> = _headerCards
 
     private val _usedBytes = MutableLiveData<Long>()
-    private val _availableBytes = MutableLiveData<Long>()
-    private val _downloadBytes = MutableLiveData<Long>()
-
-    private val _selectedItems = MutableLiveData<MutableList<VisualDownloadCached>>(mutableListOf())
-
     val usedBytes: LiveData<Long> = _usedBytes
+
+    private val _availableBytes = MutableLiveData<Long>()
     val availableBytes: LiveData<Long> = _availableBytes
+
+    private val _downloadBytes = MutableLiveData<Long>()
     val downloadBytes: LiveData<Long> = _downloadBytes
 
+    private val _isMultiDeleteState = MutableLiveData(false)
+    val isMultiDeleteState: LiveData<Boolean> = _isMultiDeleteState
+
+    private val _selectedItems = MutableLiveData<MutableList<VisualDownloadCached>>(mutableListOf())
     val selectedItems: LiveData<MutableList<VisualDownloadCached>> = _selectedItems
 
     private var previousVisual: List<VisualDownloadCached.Header>? = null
 
+    fun setIsMultiDeleteState(value: Boolean) {
+        _isMultiDeleteState.postValue(value)
+    }
+
     fun addSelected(item: VisualDownloadCached) {
         val currentSelected = selectedItems.value ?: mutableListOf()
         if (!currentSelected.contains(item)) {
@@ -215,7 +222,7 @@ class DownloadViewModel : ViewModel() {
                     DialogInterface.BUTTON_POSITIVE -> {
                         viewModelScope.launchSafe {
                             deleteFilesAndUpdateSettings(context, ids, this)
-                            clearSelectedItems()
+                            setIsMultiDeleteState(false)
                             updateList(context)
                         }
                     }