Fix next filter bug on folder overscroll

jocmp · Dec 15, 2024 · 8603f3b · 8603f3b
1 parent 379f11a
commit 8603f3b
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/capy/src/main/java/com/jocmp/capy/articles/NextFilter.kt b/capy/src/main/java/com/jocmp/capy/articles/NextFilter.kt
@@ -56,12 +56,20 @@ sealed class NextFilter {
                 }
 
                 is ArticleFilter.Folders -> {
-                    val firstFeed = folders
+                    val firstFolderFeed = folders
                         .find { it.title == filter.folderTitle }
                         ?.feeds
-                        ?.firstOrNull() ?: return null
+                        ?.firstOrNull()
 
-                    FeedFilter(feedID = firstFeed.id, folderTitle = filter.folderTitle)
+                    val nextFeed = feeds.firstOrNull()
+
+                    if (firstFolderFeed != null) {
+                        FeedFilter(feedID = firstFolderFeed.id, folderTitle = filter.folderTitle)
+                    } else if (nextFeed != null) {
+                        FeedFilter(feedID = nextFeed.id, folderTitle = null)
+                    } else {
+                        null
+                    }
                 }
 
                 is ArticleFilter.Feeds -> findNextFeed(filter, folders, feeds)