Bring in upstream updates

KotlinGeekDev · Feb 24, 2025 · 80bb361 · 80bb361
2 parents 4d974ec + 178ccf5
commit 80bb361
Show file tree

Hide file tree

Showing 66 changed files with 883 additions and 393 deletions.
diff --git a/.github/workflows/android_prod_release.yml b/.github/workflows/android_prod_release.yml
@@ -18,7 +18,7 @@ jobs:
     steps:
       - name: Configure Tramline
         id: tramline
-        uses: tramlinehq/[email protected].6
+        uses: tramlinehq/[email protected].7
         with:
           input: ${{ github.event.inputs.tramline-input }}
 

diff --git a/.github/workflows/ios_prod_release.yml b/.github/workflows/ios_prod_release.yml
@@ -16,7 +16,7 @@ jobs:
     steps:
       - name: Configure Tramline
         id: tramline
-        uses: tramlinehq/[email protected].6
+        uses: tramlinehq/[email protected].7
         with:
           input: ${{ github.event.inputs.tramline-input }}
 

diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
diff --git a/.idea/studiobot.xml b/.idea/studiobot.xml
diff --git a/androidApp/src/androidMain/AndroidManifest.xml b/androidApp/src/androidMain/AndroidManifest.xml
@@ -22,6 +22,8 @@
         android:fullBackupContent="false"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:enableOnBackInvokedCallback="true"
+        android:usesCleartextTraffic="true"
+        android:networkSecurityConfig="@xml/network_security_config"
         tools:targetApi="tiramisu"
         android:largeHeap="true">
 

diff --git a/androidApp/src/androidMain/kotlin/dev/sasikanth/rss/reader/FeedsRefreshWorker.kt b/androidApp/src/androidMain/kotlin/dev/sasikanth/rss/reader/FeedsRefreshWorker.kt
@@ -25,16 +25,19 @@ import androidx.work.WorkerParameters
 import co.touchlab.crashkios.bugsnag.BugsnagKotlin
 import com.bugsnag.android.Bugsnag
 import dev.sasikanth.rss.reader.data.repository.RssRepository
+import dev.sasikanth.rss.reader.data.repository.SettingsRepository
 import dev.sasikanth.rss.reader.refresh.LastUpdatedAt
 import java.lang.Exception
 import java.time.Duration
 import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.flow.first
 
 class FeedsRefreshWorker(
   context: Context,
   workerParameters: WorkerParameters,
   private val rssRepository: RssRepository,
-  private val lastUpdatedAt: LastUpdatedAt
+  private val lastUpdatedAt: LastUpdatedAt,
+  private val settingsRepository: SettingsRepository,
 ) : CoroutineWorker(context, workerParameters) {
 
   companion object {
@@ -55,6 +58,8 @@ class FeedsRefreshWorker(
   }
 
   override suspend fun doWork(): Result {
+    if (settingsRepository.enableAutoSync.first().not()) return Result.failure()
+
     return if (lastUpdatedAt.hasExpired()) {
       try {
         rssRepository.updateFeeds()

diff --git a/androidApp/src/androidMain/kotlin/dev/sasikanth/rss/reader/ReaderApplication.kt b/androidApp/src/androidMain/kotlin/dev/sasikanth/rss/reader/ReaderApplication.kt
@@ -59,7 +59,8 @@ class ReaderApplication : Application(), Configuration.Provider {
                     context = appContext,
                     workerParameters = workerParameters,
                     rssRepository = appComponent.rssRepository,
-                    lastUpdatedAt = appComponent.lastUpdatedAt
+                    lastUpdatedAt = appComponent.lastUpdatedAt,
+                    settingsRepository = appComponent.settingsRepository,
                   )
                 }
                 PostsCleanUpWorker::class.qualifiedName -> {

diff --git a/androidApp/src/androidMain/res/xml/network_security_config.xml b/androidApp/src/androidMain/res/xml/network_security_config.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2025 Sasikanth Miriyampalli
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<network-security-config xmlns:tools="http://schemas.android.com/tools">
+    <base-config cleartextTrafficPermitted="true"
+        tools:ignore="InsecureBaseConfiguration">
+        <trust-anchors>
+            <certificates src="system" />
+        </trust-anchors>
+    </base-config>
+</network-security-config>
diff --git a/core/data/src/commonMain/kotlin/dev/sasikanth/rss/reader/data/repository/RssRepository.kt b/core/data/src/commonMain/kotlin/dev/sasikanth/rss/reader/data/repository/RssRepository.kt
@@ -74,10 +74,9 @@ class RssRepository(
     feedLink: String,
     title: String? = null,
     feedLastCleanUpAt: Instant? = null,
-    transformUrl: Boolean = true,
   ): FeedAddResult {
     return withContext(ioDispatcher) {
-      when (val feedFetchResult = feedFetcher.fetch(url = feedLink, transformUrl = transformUrl)) {
+      when (val feedFetchResult = feedFetcher.fetch(url = feedLink)) {
         is FeedFetchResult.Success -> {
           return@withContext try {
             val feedPayload = feedFetchResult.feedPayload
@@ -140,13 +139,7 @@ class RssRepository(
         val feedsChunk = feedQueries.feeds().executeAsList().chunked(UPDATE_CHUNKS)
         feedsChunk.map { feeds ->
           feeds.map { feed ->
-            launch {
-              addFeed(
-                feedLink = feed.link,
-                transformUrl = false,
-                feedLastCleanUpAt = feed.lastCleanUpAt
-              )
-            }
+            launch { addFeed(feedLink = feed.link, feedLastCleanUpAt = feed.lastCleanUpAt) }
           }
         }
       }
@@ -158,7 +151,7 @@ class RssRepository(
     withContext(ioDispatcher) {
       val feed = feedQueries.feed(selectedFeedId).executeAsOneOrNull()
       if (feed != null) {
-        addFeed(feedLink = feed.link, transformUrl = false, feedLastCleanUpAt = feed.lastCleanUpAt)
+        addFeed(feedLink = feed.link, feedLastCleanUpAt = feed.lastCleanUpAt)
       }
     }
   }
@@ -168,11 +161,7 @@ class RssRepository(
       feedIds.forEach { feedId ->
         val feed = feedQueries.feed(feedId).executeAsOneOrNull()
         if (feed != null) {
-          addFeed(
-            feedLink = feed.link,
-            transformUrl = false,
-            feedLastCleanUpAt = feed.lastCleanUpAt
-          )
+          addFeed(feedLink = feed.link, feedLastCleanUpAt = feed.lastCleanUpAt)
         }
       }
     }
@@ -252,7 +241,8 @@ class RssRepository(
             pinnedAt: Instant?,
             lastCleanUpAt: Instant?,
             alwaysFetchSourceArticle: Boolean,
-            pinnedPosition: Double ->
+            pinnedPosition: Double,
+            showFeedFavIcon: Boolean ->
             Feed(
               id = id,
               name = name,
@@ -264,7 +254,8 @@ class RssRepository(
               pinnedAt = pinnedAt,
               lastCleanUpAt = lastCleanUpAt,
               alwaysFetchSourceArticle = alwaysFetchSourceArticle,
-              pinnedPosition = pinnedPosition
+              pinnedPosition = pinnedPosition,
+              showFeedFavIcon = showFeedFavIcon,
             )
           }
         )
@@ -281,6 +272,7 @@ class RssRepository(
             name: String,
             feedIds: List<String>,
             feedHomepageLinks: String,
+            feedIconLinks: String,
             createdAt: Instant,
             updatedAt: Instant,
             pinnedAt: Instant?,
@@ -290,6 +282,7 @@ class RssRepository(
               name = name,
               feedIds = feedIds.filterNot { it.isBlank() },
               feedHomepageLinks = feedHomepageLinks.split(",").filterNot { it.isBlank() },
+              feedIconLinks = feedIconLinks.split(",").filterNot { it.isBlank() },
               createdAt = createdAt,
               updatedAt = updatedAt,
               pinnedAt = pinnedAt,
@@ -345,7 +338,8 @@ class RssRepository(
             pinnedAt: Instant?,
             lastCleanUpAt: Instant?,
             alwaysFetchSourceArticle: Boolean,
-            numberOfUnreadPosts: Long ->
+            numberOfUnreadPosts: Long,
+            showFeedFavIcon: Boolean ->
             Feed(
               id = id,
               name = name,
@@ -357,7 +351,8 @@ class RssRepository(
               pinnedAt = pinnedAt,
               lastCleanUpAt = lastCleanUpAt,
               alwaysFetchSourceArticle = alwaysFetchSourceArticle,
-              numberOfUnreadPosts = numberOfUnreadPosts
+              numberOfUnreadPosts = numberOfUnreadPosts,
+              showFeedFavIcon = showFeedFavIcon,
             )
           }
         )
@@ -383,7 +378,8 @@ class RssRepository(
             pinnedAt: Instant?,
             lastCleanUpAt: Instant?,
             alwaysFetchSourceArticle: Boolean,
-            numberOfUnreadPosts: Long ->
+            numberOfUnreadPosts: Long,
+            showFeedFavIcon: Boolean ->
             Feed(
               id = id,
               name = name,
@@ -395,7 +391,8 @@ class RssRepository(
               pinnedAt = pinnedAt,
               lastCleanUpAt = lastCleanUpAt,
               alwaysFetchSourceArticle = alwaysFetchSourceArticle,
-              numberOfUnreadPosts = numberOfUnreadPosts
+              numberOfUnreadPosts = numberOfUnreadPosts,
+              showFeedFavIcon = showFeedFavIcon,
             )
           }
         )
@@ -627,6 +624,7 @@ class RssRepository(
           numberOfUnreadPosts: Long,
           feedIds: List<String>?,
           feedHomepageLinks: String?,
+          feedIcons: String?,
           updatedAt: Instant?,
           pinnedPosition: Double ->
           if (type == "group") {
@@ -636,6 +634,7 @@ class RssRepository(
               feedIds = feedIds?.filterNot { it.isBlank() }.orEmpty(),
               feedHomepageLinks =
                 feedHomepageLinks?.split(",")?.filterNot { it.isBlank() }.orEmpty(),
+              feedIconLinks = feedIcons?.split(",")?.filterNot { it.isBlank() }.orEmpty(),
               createdAt = createdAt!!,
               updatedAt = updatedAt!!,
               pinnedAt = pinnedAt,
@@ -691,6 +690,7 @@ class RssRepository(
             numberOfUnreadPosts: Long,
             feedIds: List<String>?,
             feedHomepageLinks: String?,
+            feedIcons: String?,
             updatedAt: Instant? ->
             if (type == "group") {
               FeedGroup(
@@ -699,6 +699,7 @@ class RssRepository(
                 feedIds = feedIds?.filterNot { it.isBlank() }.orEmpty(),
                 feedHomepageLinks =
                   feedHomepageLinks?.split(",")?.filterNot { it.isBlank() }.orEmpty(),
+                feedIconLinks = feedIcons?.split(",")?.filterNot { it.isBlank() }.orEmpty(),
                 createdAt = createdAt,
                 updatedAt = updatedAt!!,
                 pinnedAt = pinnedAt,
@@ -738,6 +739,7 @@ class RssRepository(
             name: String,
             feedIds: List<String>,
             feedHomepageLinks: String,
+            feedIcons: String,
             createdAt: Instant,
             updatedAt: Instant,
             pinnedAt: Instant?,
@@ -747,6 +749,7 @@ class RssRepository(
               name = name,
               feedIds = feedIds.filterNot { it.isBlank() },
               feedHomepageLinks = feedHomepageLinks.split(",").filterNot { it.isBlank() },
+              feedIconLinks = feedIcons.split(",").filterNot { it.isBlank() },
               createdAt = createdAt,
               updatedAt = updatedAt,
               pinnedAt = pinnedAt,
@@ -772,6 +775,7 @@ class RssRepository(
             name: String,
             feedIds: List<String>,
             feedHomepageLinks: String,
+            feedIcons: String,
             createdAt: Instant,
             updatedAt: Instant,
             pinnedAt: Instant? ->
@@ -780,6 +784,7 @@ class RssRepository(
               name = name,
               feedIds = feedIds.filterNot { it.isBlank() },
               feedHomepageLinks = feedHomepageLinks.split(",").filterNot { it.isBlank() },
+              feedIconLinks = feedIcons.split(",").filterNot { it.isBlank() },
               createdAt = createdAt,
               updatedAt = updatedAt,
               pinnedAt = pinnedAt,
@@ -799,6 +804,7 @@ class RssRepository(
           name: String,
           feedIds: List<String>,
           feedHomepageLinks: String,
+          feedIcons: String,
           createdAt: Instant,
           updatedAt: Instant,
           pinnedAt: Instant? ->
@@ -807,6 +813,7 @@ class RssRepository(
             name = name,
             feedIds = feedIds.filterNot { it.isBlank() },
             feedHomepageLinks = feedHomepageLinks.split(",").filterNot { it.isBlank() },
+            feedIconLinks = feedIcons.split(",").filterNot { it.isBlank() },
             createdAt = createdAt,
             updatedAt = updatedAt,
             pinnedAt = pinnedAt,
@@ -841,7 +848,8 @@ class RssRepository(
             createdAt: Instant,
             pinnedAt: Instant?,
             lastCleanUpAt: Instant?,
-            numberOfUnreadPosts: Long ->
+            numberOfUnreadPosts: Long,
+            showFeedFavIcon: Boolean ->
             Feed(
               id = id,
               name = name,
@@ -853,6 +861,7 @@ class RssRepository(
               pinnedAt = pinnedAt,
               lastCleanUpAt = lastCleanUpAt,
               numberOfUnreadPosts = numberOfUnreadPosts,
+              showFeedFavIcon = showFeedFavIcon,
             )
           }
         )

diff --git a/...data/src/commonMain/kotlin/dev/sasikanth/rss/reader/data/repository/SettingsRepository.kt b/...data/src/commonMain/kotlin/dev/sasikanth/rss/reader/data/repository/SettingsRepository.kt
@@ -40,6 +40,8 @@ class SettingsRepository(private val dataStore: DataStore<Preferences>) {
   private val feedsViewModeKey = stringPreferencesKey("pref_feeds_view_mode")
   private val feedsSortOrderKey = stringPreferencesKey("pref_feeds_sort_order")
   private val appThemeModeKey = stringPreferencesKey("pref_app_theme_mode_v2")
+  private val enableAutoSyncKey = booleanPreferencesKey("enable_auto_sync")
+  private val showFeedFavIconKey = booleanPreferencesKey("show_feed_fav_icon")
 
   val browserType: Flow<BrowserType> =
     dataStore.data.map { preferences ->
@@ -75,6 +77,16 @@ class SettingsRepository(private val dataStore: DataStore<Preferences>) {
       mapToAppThemeMode(preferences[appThemeModeKey]) ?: AppThemeMode.Dark
     }
 
+  val enableAutoSync: Flow<Boolean> =
+    dataStore.data.map { preferences -> preferences[enableAutoSyncKey] ?: true }
+
+  val showFeedFavIcon: Flow<Boolean> =
+    dataStore.data.map { preferences -> preferences[showFeedFavIconKey] ?: true }
+
+  suspend fun enableAutoSyncImmediate(): Boolean {
+    return enableAutoSync.first()
+  }
+
   suspend fun updateFeedsSortOrder(value: FeedsOrderBy) {
     dataStore.edit { preferences -> preferences[feedsSortOrderKey] = value.name }
   }
@@ -111,6 +123,14 @@ class SettingsRepository(private val dataStore: DataStore<Preferences>) {
     dataStore.edit { preferences -> preferences[appThemeModeKey] = value.name }
   }
 
+  suspend fun toggleAutoSync(value: Boolean) {
+    dataStore.edit { preferences -> preferences[enableAutoSyncKey] = value }
+  }
+
+  suspend fun toggleShowFeedFavIcon(value: Boolean) {
+    dataStore.edit { preferences -> preferences[showFeedFavIconKey] = value }
+  }
+
   private fun mapToAppThemeMode(pref: String?): AppThemeMode? {
     if (pref.isNullOrBlank()) return null
     return AppThemeMode.valueOf(pref)

diff --git a/core/data/src/commonMain/sqldelight/databases/20.db b/core/data/src/commonMain/sqldelight/databases/20.db