Clear state of affected feeds when the default clean-up mode is changed

tughi · Mar 19, 2023 · 2138a80 · 2138a80
1 parent f7554c9
commit 2138a80
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/app/src/main/java/com/tughi/aggregator/data/Feeds.kt b/app/src/main/java/com/tughi/aggregator/data/Feeds.kt
@@ -44,6 +44,11 @@ object Feeds : Repository<Feeds.Column, Feeds.TableColumn, Feeds.UpdateCriteria,
         override val selectionArgs = arrayOf<Any>(id)
     }
 
+    class UpdateCleanupModeCriteria(cleanupMode: CleanupMode) : UpdateCriteria {
+        override val selection = "cleanup_mode = ?"
+        override val selectionArgs = arrayOf<Any>(cleanupMode.serialize())
+    }
+
     interface DeleteCriteria : Repository.DeleteCriteria
 
     object DeleteAllCriteria : DeleteCriteria {

diff --git a/app/src/main/java/com/tughi/aggregator/preferences/UpdateSettings.kt b/app/src/main/java/com/tughi/aggregator/preferences/UpdateSettings.kt
@@ -4,6 +4,9 @@ import com.tughi.aggregator.App
 import com.tughi.aggregator.contentScope
 import com.tughi.aggregator.data.AdaptiveUpdateMode
 import com.tughi.aggregator.data.CleanupMode
+import com.tughi.aggregator.data.Database
+import com.tughi.aggregator.data.DefaultCleanupMode
+import com.tughi.aggregator.data.Feeds
 import com.tughi.aggregator.data.UpdateMode
 import com.tughi.aggregator.services.AutoUpdateScheduler
 import kotlinx.coroutines.launch
@@ -31,6 +34,17 @@ object UpdateSettings {
             App.preferences.edit()
                 .putString(PREFERENCE_DEFAULT_CLEANUP_MODE, value.serialize())
                 .apply()
+
+            contentScope.launch {
+                // clear state to refresh affected feeds on next update
+                Database.transaction {
+                    Feeds.update(
+                        Feeds.UpdateCleanupModeCriteria(DefaultCleanupMode),
+                        Feeds.HTTP_ETAG to null,
+                        Feeds.HTTP_LAST_MODIFIED to null,
+                    )
+                }
+            }
         }
 
     var defaultUpdateMode: UpdateMode

diff --git a/metadata/en-US/changelogs/299033.txt b/metadata/en-US/changelogs/299033.txt
@@ -1,17 +1,7 @@
 - Enhanced OPML support
-    * allows selection of already aggregated feeds for import
-    * implemented export feature
-
 - Added option to backup Aggregator's data
-    * data stored as gzipped ION file
-    * backup file contains all feeds, aggregated entries, configured tags and update settings
-
 - Added option to restore Aggregator's data from a backup file
-    * any feeds or tags created before this action are permanently lost
-
 - Removed automatic OPML backup
-    * users can use the export feature instead
-
-* TODO: The app clears state of affected feeds when the default clean-up mode is changed
+- Clear state of affected feeds when the default clean-up mode is changed
 
 * TODO: Fix app-launch updates by using an OnBackPressedCallback to detect when the user leaves the MainActivity