From f209c10daf907a65c3ada1eef6ed5e2173be61de Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Wed, 22 Nov 2023 19:20:05 +0800
Subject: [PATCH 1/3] Add the feed filters to Android

---
 .../java/app/omnivore/omnivore/ui/library/LibraryViewModel.kt | 4 +++-
 .../java/app/omnivore/omnivore/ui/library/SavedItemFilter.kt  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/LibraryViewModel.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/LibraryViewModel.kt
index 570a1e56a..ae3525d3f 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/LibraryViewModel.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/LibraryViewModel.kt
@@ -211,15 +211,17 @@ class LibraryViewModel @Inject constructor(
 
       var requiredLabels = when(appliedFilterLiveData.value) {
         SavedItemFilter.NEWSLETTERS -> listOf("Newsletter")
+        SavedItemFilter.FEEDS -> listOf("RSS")
         else -> (activeLabelsLiveData.value ?: listOf()).map { it.name }
       }
+
      activeLabelsLiveData.value?.let {
        requiredLabels = requiredLabels + it.map { it.name }
      }
 
 
       val excludeLabels = when(appliedFilterLiveData.value) {
-        SavedItemFilter.READ_LATER -> listOf("Newsletter")
+        SavedItemFilter.READ_LATER -> listOf("Newsletter", "RSS")
         else -> listOf()
       }
 
diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/SavedItemFilter.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/SavedItemFilter.kt
index e9ed148a9..7e651c577 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/SavedItemFilter.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/SavedItemFilter.kt
@@ -7,7 +7,8 @@ import androidx.compose.runtime.Composable
 
 enum class SavedItemFilter(val displayText: String, val rawValue: String, val queryString: String) {
   INBOX("Inbox", rawValue = "inbox", "in:inbox"),
-  READ_LATER("Read Later", "readlater", "in:inbox -label:Newsletter"),
+  READ_LATER("Non-Feed Items", "nonFeed", "no:subscription"),
+  FEEDS("Feeds", "feeds", "in:inbox label:RSS"),
   NEWSLETTERS("Newsletters", "newsletters", "in:inbox label:Newsletter"),
   RECOMMENDED("Recommended", "recommended", "recommendedBy:*"),
   ALL("All", "all", "in:all"),
@@ -32,6 +33,7 @@ fun SavedItemFilterContextMenu(
         SavedItemFilter.INBOX,
         SavedItemFilter.READ_LATER,
         SavedItemFilter.NEWSLETTERS,
+        SavedItemFilter.FEEDS,
         SavedItemFilter.ALL,
         SavedItemFilter.ARCHIVED,
         SavedItemFilter.FILES

From 56e6a55a1b91d6a40ebdea57ba2aa1c3cc432040 Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Thu, 23 Nov 2023 13:25:35 +0800
Subject: [PATCH 2/3] Bump version, add wake lock permission

---
 android/Omnivore/app/build.gradle                 | 4 ++--
 android/Omnivore/app/src/main/AndroidManifest.xml | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/android/Omnivore/app/build.gradle b/android/Omnivore/app/build.gradle
index 561f6c804..5afe98849 100644
--- a/android/Omnivore/app/build.gradle
+++ b/android/Omnivore/app/build.gradle
@@ -17,8 +17,8 @@ android {
         applicationId "app.omnivore.omnivore"
         minSdk 26
         targetSdk 33
-        versionCode 154
-        versionName "0.0.154"
+        versionCode 156
+        versionName "0.0.156"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
diff --git a/android/Omnivore/app/src/main/AndroidManifest.xml b/android/Omnivore/app/src/main/AndroidManifest.xml
index fe83b565c..809ce0f0b 100644
--- a/android/Omnivore/app/src/main/AndroidManifest.xml
+++ b/android/Omnivore/app/src/main/AndroidManifest.xml
@@ -5,6 +5,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="com.google.android.gms.permission.AD_ID"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
 
     <application
         android:name=".OmnivoreApplication"

From 1708fad0725e2bf4b0b9a55bb99279dd70ed3be3 Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Thu, 23 Nov 2023 13:26:30 +0800
Subject: [PATCH 3/3] Bump version for wake lock change

---
 android/Omnivore/app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/Omnivore/app/build.gradle b/android/Omnivore/app/build.gradle
index 5afe98849..b158b6f07 100644
--- a/android/Omnivore/app/build.gradle
+++ b/android/Omnivore/app/build.gradle
@@ -17,8 +17,8 @@ android {
         applicationId "app.omnivore.omnivore"
         minSdk 26
         targetSdk 33
-        versionCode 156
-        versionName "0.0.156"
+        versionCode 158
+        versionName "0.0.158"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {