fix: crash when trying to dearrow feed items

libre-tube · May 7, 2024 · 278ba4e · 278ba4e
1 parent 800d670
commit 278ba4e
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/app/src/main/java/com/github/libretube/ui/fragments/SubscriptionsFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/SubscriptionsFragment.kt
@@ -212,17 +212,19 @@ class SubscriptionsFragment : DynamicLayoutManagerFragment() {
         if (viewModel.videoFeed.value != null && !isCurrentTabSubChannels && !binding.subRefresh.isRefreshing && hasMore) {
             binding.subRefresh.isRefreshing = true
 
-            lifecycleScope.launch(Dispatchers.IO) {
+            lifecycleScope.launch {
                 val toIndex = minOf(feedAdapter.itemCount + 10, sortedFeed.size)
 
-                val streamItemsToInsert = sortedFeed
+                var streamItemsToInsert = sortedFeed
                     .subList(feedAdapter.itemCount, toIndex)
-                    .deArrow()
+                    .toList()
 
-                withContext(Dispatchers.Main) {
-                    feedAdapter.insertItems(streamItemsToInsert)
-                    binding.subRefresh.isRefreshing = false
+                withContext(Dispatchers.IO) {
+                    runCatching { streamItemsToInsert = streamItemsToInsert.deArrow() }
                 }
+
+                feedAdapter.insertItems(streamItemsToInsert)
+                binding.subRefresh.isRefreshing = false
             }
         }
     }