Add parameter to synchronize at launch

Author: Shinokuni

app/src/main/java/com/readrops/app/more/preferences/PreferencesScreen.kt

@@ -155,6 +155,12 @@ class PreferencesScreen : AndroidScreen() {
 
                             PreferenceHeader(text = stringResource(id = R.string.timeline))
 
+                            SwitchPreferenceWidget(
+                                preference = loadedState.syncAtLaunchPref.second,
+                                isChecked = loadedState.syncAtLaunchPref.first,
+                                title = stringResource(R.string.synchronize_at_launch)
+                            )
+
                             ListPreferenceWidget(
                                 preference = loadedState.mainFilterPref.second,
                                 selectedKey = loadedState.mainFilterPref.first,

app/src/main/java/com/readrops/app/more/preferences/PreferencesScreenModel.kt

@@ -19,30 +19,34 @@ class PreferencesScreenModel(
 
     init {
         screenModelScope.launch(dispatcher) {
-            val flows = listOf(
-                preferences.theme.flow,
-                preferences.backgroundSynchronization.flow,
-                preferences.scrollRead.flow,
-                preferences.hideReadFeeds.flow,
-                preferences.openLinksWith.flow,
-                preferences.timelineItemSize.flow,
-                preferences.mainFilter.flow
-            )
-
-            combine(
-                flows
-            ) { list ->
-                PreferencesScreenState.Loaded(
-                    themePref = (list[0] as String) to preferences.theme,
-                    backgroundSyncPref = (list[1] as String) to preferences.backgroundSynchronization,
-                    scrollReadPref = (list[2] as Boolean) to preferences.scrollRead,
-                    hideReadFeeds = (list[3] as Boolean) to preferences.hideReadFeeds,
-                    openLinksWith = (list[4] as String) to preferences.openLinksWith,
-                    timelineItemSize = (list[5] as String) to preferences.timelineItemSize,
-                    mainFilterPref = (list[6] as String) to preferences.mainFilter
+            with(preferences) {
+                val flows = listOf(
+                    theme.flow,
+                    backgroundSynchronization.flow,
+                    scrollRead.flow,
+                    hideReadFeeds.flow,
+                    openLinksWith.flow,
+                    timelineItemSize.flow,
+                    mainFilter.flow,
+                    synchAtLaunch.flow
                 )
-            }.collect { theme ->
-                mutableState.update { theme }
+
+                combine(
+                    flows
+                ) { list ->
+                    PreferencesScreenState.Loaded(
+                        themePref = (list[0] as String) to theme,
+                        backgroundSyncPref = (list[1] as String) to backgroundSynchronization,
+                        scrollReadPref = (list[2] as Boolean) to scrollRead,
+                        hideReadFeeds = (list[3] as Boolean) to hideReadFeeds,
+                        openLinksWith = (list[4] as String) to openLinksWith,
+                        timelineItemSize = (list[5] as String) to timelineItemSize,
+                        mainFilterPref = (list[6] as String) to mainFilter,
+                        syncAtLaunchPref = (list[7] as Boolean) to synchAtLaunch
+                    )
+                }.collect { theme ->
+                    mutableState.update { theme }
+                }
             }
         }
     }
@@ -61,6 +65,7 @@ sealed class PreferencesScreenState {
         val openLinksWith: PreferenceState<String>,
         val timelineItemSize: PreferenceState<String>,
         val mainFilterPref: PreferenceState<String>,
+        val syncAtLaunchPref: PreferenceState<Boolean>
     ) : PreferencesScreenState()
 
 }

app/src/main/java/com/readrops/app/timelime/TimelineScreenModel.kt

@@ -67,24 +67,33 @@ class TimelineScreenModel(
     init {
         screenModelScope.launch(dispatcher) {
             val mainFilter = MainFilter.valueOf(preferences.mainFilter.flow.first())
-            _timelineState.update {
-                it.copy(
-                    filters = updateFilters {
-                        it.filters.copy(
-                            mainFilter = mainFilter
-                        )
-                    }
-                )
-            }
+            var syncAtLaunch = preferences.synchAtLaunch.flow.first()
 
             combine(
                 accountEvent,
-                filters
-            ) { account, filters ->
-                account to filters.copy(accountId = account.id)
-            }.collectLatest { (account, filters) ->
-                this@TimelineScreenModel.filters.update { filters }
-                buildPager()
+                filters,
+                getTimelinePreferences()
+            ) { account, filters, timelinePreferences ->
+                Triple(account, filters.copy(accountId = account.id), timelinePreferences)
+            }.collectLatest { (account, filters, timelinePreferences) ->
+                _timelineState.update {
+                    it.copy(
+                        preferences = timelinePreferences,
+                        filters = filters.copy(
+                            mainFilter = mainFilter,
+                            showReadItems = timelinePreferences.showReadItems,
+                            orderField = timelinePreferences.orderField,
+                            orderType = timelinePreferences.orderType
+                        )
+                    )
+                }
+
+                if (syncAtLaunch) {
+                    refreshTimeline()
+                    syncAtLaunch = false
+                } else {
+                    buildPager()
+                }
 
                 preferences.hideReadFeeds.flow
                     .flatMapLatest { hideReadFeeds ->
@@ -102,7 +111,6 @@ class TimelineScreenModel(
                             )
                         }
                     }
-
             }
         }
 
@@ -115,24 +123,6 @@ class TimelineScreenModel(
                 }
             }
         }
-
-        screenModelScope.launch(dispatcher) {
-            getTimelinePreferences()
-                .collect { preferences ->
-                    _timelineState.update {
-                        it.copy(
-                            preferences = preferences,
-                            filters = updateFilters {
-                                it.filters.copy(
-                                    showReadItems = preferences.showReadItems,
-                                    orderField = preferences.orderField,
-                                    orderType = preferences.orderType
-                                )
-                            }
-                        )
-                    }
-                }
-        }
     }
 
     private fun getTimelinePreferences(): Flow<TimelinePreferences> = with(preferences) {
@@ -146,6 +136,7 @@ class TimelineScreenModel(
             theme.flow,
             openLinksWith.flow,
             globalOpenInAsk.flow,
+            synchAtLaunch.flow,
             transform = {
                 TimelinePreferences(
                     itemSize = when (it[0]) {
@@ -161,14 +152,15 @@ class TimelineScreenModel(
                     theme = it[6] as String,
                     openInExternalBrowser = it[7] as String == "external_navigator",
                     openInAsk = it[8] as Boolean,
+                    syncAtLaunch = it[9] as Boolean
                 )
             }
         )
     }
 
     private fun buildPager(empty: Boolean = false) {
         val query = ItemsQueryBuilder.buildItemsQuery(
-            queryFilters = filters.value,
+            queryFilters = _timelineState.value.filters,
             separateState = currentAccount!!.config.useSeparateState
         )
 
@@ -205,7 +197,7 @@ class TimelineScreenModel(
         buildPager(empty = true)
 
         screenModelScope.launch(dispatcher) {
-            val filterPair = with(filters.value) {
+            val filterPair = with(_timelineState.value.filters) {
                 when (subFilter) {
                     SubFilter.FEED -> SyncWorker.FEED_ID_KEY to feedId
                     SubFilter.FOLDER -> SyncWorker.FOLDER_ID_KEY to folderId
@@ -511,7 +503,8 @@ data class TimelinePreferences(
     val orderType: OrderType = OrderType.DESC,
     val theme: String = "light",
     val openInExternalBrowser: Boolean = false,
-    val openInAsk: Boolean = true
+    val openInAsk: Boolean = true,
+    val syncAtLaunch: Boolean = false
 )
 
 sealed interface DialogState {

app/src/main/java/com/readrops/app/timelime/TimelineTab.kt

@@ -140,10 +140,15 @@ object TimelineTab : Tab {
         }
 
         // remove splash screen when opening the app
-        LaunchedEffect(items.isLoading()) {
+        LaunchedEffect(items.isLoading(), preferences.syncAtLaunch) {
             val activity = (context as MainActivity)
-            if (!items.isLoading() && !activity.ready) {
+
+            if (preferences.syncAtLaunch) {
                 activity.ready = true
+            } else {
+                if (!items.isLoading() && !activity.ready) {
+                    activity.ready = true
+                }
             }
         }
 

app/src/main/java/com/readrops/app/util/Preferences.kt

@@ -103,6 +103,12 @@ class Preferences(
         key = stringPreferencesKey("main_filter"),
         default = "ALL" // uppercase important, used with Enum.valueOf()
     )
+
+    val synchAtLaunch = Preference(
+        dataStore = dataStore,
+        key = booleanPreferencesKey("sync_at_launch"),
+        default = false
+    )
 }
 
 

app/src/main/res/values-fr/strings.xml

@@ -193,4 +193,5 @@
     <string name="external_view">Vue externe</string>
     <string name="do_not_ask_again_next_feeds">Ne pas me redemander pour les autres flux</string>
     <string name="default_category">Catégorie par défaut</string>
+    <string name="synchronize_at_launch">Synchroniser au démarrage</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -202,4 +202,5 @@
     <string name="external_view">External view</string>
     <string name="do_not_ask_again_next_feeds">Do not ask me again for next feeds</string>
     <string name="default_category">Default category</string>
+    <string name="synchronize_at_launch">Synchronize at launch</string>
 </resources>