Implemented filter in FeedLoadManager.kt

TeamNewPipe · Oct 27, 2024 · 9809630 · 9809630
1 parent eb9f300
commit 9809630
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt b/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt
@@ -244,13 +244,15 @@ class FeedFragment : BaseStateFragment<FeedState>() {
         val dialogItems = arrayOf(
             getString(R.string.feed_show_watched),
             getString(R.string.feed_show_partially_watched),
-            getString(R.string.feed_show_upcoming)
+            getString(R.string.feed_show_upcoming),
+            getString(R.string.feed_show_shorts)
         )
 
         val checkedDialogItems = booleanArrayOf(
             viewModel.getShowPlayedItemsFromPreferences(),
             viewModel.getShowPartiallyPlayedItemsFromPreferences(),
-            viewModel.getShowFutureItemsFromPreferences()
+            viewModel.getShowFutureItemsFromPreferences(),
+            viewModel.getShowShortsFromPreferences()
         )
 
         AlertDialog.Builder(context!!)
@@ -262,6 +264,7 @@ class FeedFragment : BaseStateFragment<FeedState>() {
                 viewModel.setSaveShowPlayedItems(checkedDialogItems[0])
                 viewModel.setSaveShowPartiallyPlayedItems(checkedDialogItems[1])
                 viewModel.setSaveShowFutureItems(checkedDialogItems[2])
+                viewModel.setSaveShowShorts(checkedDialogItems[3])
             }
             .setNegativeButton(R.string.cancel, null)
             .show()

diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadManager.kt b/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadManager.kt
@@ -220,7 +220,11 @@ class FeedLoadManager(private val context: Context) {
                 FeedUpdateInfo(
                     subscriptionEntity,
                     originalInfo!!,
-                    streams!!,
+                    streams!!.filter {
+                        defaultSharedPreferences
+                                .getBoolean(context.getString(R.string.feed_show_shorts_items_key), true)
+                                ||!it.isShortFormContent
+                    },
                     errors,
                 )
             )
@@ -260,7 +264,6 @@ class FeedLoadManager(private val context: Context) {
         override fun accept(item: Notification<FeedUpdateInfo>) {
             currentProgress.incrementAndGet()
             notificationUpdater.onNext(item.value?.name.orEmpty())
-
             broadcastProgress()
         }
     }

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -857,4 +857,6 @@
     <string name="show_more">Show more</string>
     <string name="show_less">Show less</string>
     <string name="import_settings_vulnerable_format">The settings in the export being imported use a vulnerable format that was deprecated since NewPipe 0.27.0. Make sure the export being imported is from a trusted source, and prefer using only exports obtained from NewPipe 0.27.0 or newer in the future. Support for importing settings in this vulnerable format will soon be removed completely, and then old versions of NewPipe will not be able to import settings of exports from new versions anymore.</string>
+    <string name="feed_show_shorts_items_key">feed_show_shorts_items</string>
+    <string name="feed_show_shorts">Shorts (streams under 60 seconds)</string>
 </resources>