diff --git a/core/analytics/src/main/java/com/google/samples/apps/nowinandroid/core/analytics/AnalyticsEvent.kt b/core/analytics/src/main/java/com/google/samples/apps/nowinandroid/core/analytics/AnalyticsEvent.kt index 97ae76b56..3e0650eed 100644 --- a/core/analytics/src/main/java/com/google/samples/apps/nowinandroid/core/analytics/AnalyticsEvent.kt +++ b/core/analytics/src/main/java/com/google/samples/apps/nowinandroid/core/analytics/AnalyticsEvent.kt @@ -34,6 +34,7 @@ data class AnalyticsEvent( class Types { companion object { const val SCREEN_VIEW = "screen_view" // (extras: SCREEN_NAME) + const val VIEW_SEARCH_RESULTS = "view_search_results" // (extras: SEARCH_TERM) } } @@ -53,6 +54,7 @@ data class AnalyticsEvent( class ParamKeys { companion object { const val SCREEN_NAME = "screen_name" + const val SEARCH_TERM = "search_term" } } } diff --git a/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstNewsRepository.kt b/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstNewsRepository.kt index bd6ed11b4..b18bb9044 100644 --- a/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstNewsRepository.kt +++ b/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstNewsRepository.kt @@ -63,10 +63,12 @@ class OfflineFirstNewsRepository @Inject constructor( ) .map { it.map(PopulatedNewsResource::asExternalModel) } - override suspend fun syncWith(synchronizer: Synchronizer) = - synchronizer.changeListSync( + override suspend fun syncWith(synchronizer: Synchronizer): Boolean { + var isFirstSync = false + return synchronizer.changeListSync( versionReader = ChangeListVersions::newsResourceVersion, changeListFetcher = { currentVersion -> + isFirstSync = currentVersion <= 0 network.getNewsResourceChangeList(after = currentVersion) }, versionUpdater = { latestVersion -> @@ -94,6 +96,12 @@ class OfflineFirstNewsRepository @Inject constructor( else -> emptySet() } + if (isFirstSync) { + // When we first retrieve news, mark everything viewed, so that we aren't + // overwhelmed with all historical news. + niaPreferencesDataSource.setNewsResourcesViewed(changedIds, true) + } + // Obtain the news resources which have changed from the network and upsert them locally changedIds.chunked(SYNC_BATCH_SIZE).forEach { chunkedIds -> val networkNewsResources = network.getNewsResources(ids = chunkedIds) @@ -137,4 +145,5 @@ class OfflineFirstNewsRepository @Inject constructor( } }, ) + } } diff --git a/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/util/ConnectivityManagerNetworkMonitor.kt b/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/util/ConnectivityManagerNetworkMonitor.kt index 982f47c6e..b0bf9d820 100644 --- a/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/util/ConnectivityManagerNetworkMonitor.kt +++ b/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/util/ConnectivityManagerNetworkMonitor.kt @@ -37,6 +37,18 @@ class ConnectivityManagerNetworkMonitor @Inject constructor( ) : NetworkMonitor { override val isOnline: Flow = callbackFlow { val connectivityManager = context.getSystemService() + if (connectivityManager == null) { + channel.trySend(false) + channel.close() + return@callbackFlow + } + + /** + * Sends the latest connectivity status to the underlying channel. + */ + fun update() { + channel.trySend(connectivityManager.isCurrentlyConnected()) + } /** * The callback's methods are invoked on changes to *any* network, not just the active @@ -44,47 +56,37 @@ class ConnectivityManagerNetworkMonitor @Inject constructor( * ConnectivityManager. */ val callback = object : NetworkCallback() { - override fun onAvailable(network: Network) { - channel.trySend(connectivityManager.isCurrentlyConnected()) - } + override fun onAvailable(network: Network) = update() - override fun onLost(network: Network) { - channel.trySend(connectivityManager.isCurrentlyConnected()) - } + override fun onLost(network: Network) = update() override fun onCapabilitiesChanged( network: Network, networkCapabilities: NetworkCapabilities, - ) { - channel.trySend(connectivityManager.isCurrentlyConnected()) - } + ) = update() } - connectivityManager?.registerNetworkCallback( + connectivityManager.registerNetworkCallback( Builder() .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) .build(), callback, ) - channel.trySend(connectivityManager.isCurrentlyConnected()) + update() awaitClose { - connectivityManager?.unregisterNetworkCallback(callback) + connectivityManager.unregisterNetworkCallback(callback) } } .conflate() @Suppress("DEPRECATION") - private fun ConnectivityManager?.isCurrentlyConnected() = when (this) { - null -> false - else -> when { - VERSION.SDK_INT >= VERSION_CODES.M -> - activeNetwork - ?.let(::getNetworkCapabilities) - ?.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) - ?: false - else -> activeNetworkInfo?.isConnected ?: false - } - } + private fun ConnectivityManager.isCurrentlyConnected() = when { + VERSION.SDK_INT >= VERSION_CODES.M -> + activeNetwork + ?.let(::getNetworkCapabilities) + ?.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) + else -> activeNetworkInfo?.isConnected + } ?: false } diff --git a/core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstNewsRepositoryTest.kt b/core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstNewsRepositoryTest.kt index a38d9c621..47c3996c4 100644 --- a/core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstNewsRepositoryTest.kt +++ b/core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstNewsRepositoryTest.kt @@ -288,6 +288,33 @@ class OfflineFirstNewsRepositoryTest { ) } + @Test + fun offlineFirstNewsRepository_sync_marks_as_read_on_first_run() = + testScope.runTest { + subject.syncWith(synchronizer) + + assertEquals( + network.getNewsResources().map { it.id }.toSet(), + niaPreferencesDataSource.userData.first().viewedNewsResources, + ) + } + + @Test + fun offlineFirstNewsRepository_sync_does_not_mark_as_read_on_subsequent_run() = + testScope.runTest { + // Pretend that we already have up to change list 7 + synchronizer.updateChangeListVersions { + copy(newsResourceVersion = 7) + } + + subject.syncWith(synchronizer) + + assertEquals( + emptySet(), + niaPreferencesDataSource.userData.first().viewedNewsResources, + ) + } + @Test fun offlineFirstNewsRepository_sends_notifications_for_newly_synced_news_that_is_followed() = testScope.runTest { diff --git a/core/datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/NiaPreferencesDataSource.kt b/core/datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/NiaPreferencesDataSource.kt index 33c04b70d..6d585ebd4 100644 --- a/core/datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/NiaPreferencesDataSource.kt +++ b/core/datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/NiaPreferencesDataSource.kt @@ -139,12 +139,18 @@ class NiaPreferencesDataSource @Inject constructor( } suspend fun setNewsResourceViewed(newsResourceId: String, viewed: Boolean) { + setNewsResourcesViewed(listOf(newsResourceId), viewed) + } + + suspend fun setNewsResourcesViewed(newsResourceIds: List, viewed: Boolean) { userPreferences.updateData { it.copy { - if (viewed) { - viewedNewsResourceIds.put(newsResourceId, true) - } else { - viewedNewsResourceIds.remove(newsResourceId) + newsResourceIds.forEach { + if (viewed) { + viewedNewsResourceIds.put(it, true) + } else { + viewedNewsResourceIds.remove(it) + } } } } diff --git a/feature/search/src/main/java/com/google/samples/apps/nowinandroid/feature/search/SearchViewModel.kt b/feature/search/src/main/java/com/google/samples/apps/nowinandroid/feature/search/SearchViewModel.kt index f4b4485bc..f5b409edf 100644 --- a/feature/search/src/main/java/com/google/samples/apps/nowinandroid/feature/search/SearchViewModel.kt +++ b/feature/search/src/main/java/com/google/samples/apps/nowinandroid/feature/search/SearchViewModel.kt @@ -19,6 +19,9 @@ package com.google.samples.apps.nowinandroid.feature.search import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope +import com.google.samples.apps.nowinandroid.core.analytics.AnalyticsEvent +import com.google.samples.apps.nowinandroid.core.analytics.AnalyticsEvent.Param +import com.google.samples.apps.nowinandroid.core.analytics.AnalyticsHelper import com.google.samples.apps.nowinandroid.core.data.repository.RecentSearchRepository import com.google.samples.apps.nowinandroid.core.domain.GetRecentSearchQueriesUseCase import com.google.samples.apps.nowinandroid.core.domain.GetSearchContentsCountUseCase @@ -42,6 +45,7 @@ class SearchViewModel @Inject constructor( recentSearchQueriesUseCase: GetRecentSearchQueriesUseCase, private val recentSearchRepository: RecentSearchRepository, private val savedStateHandle: SavedStateHandle, + private val analyticsHelper: AnalyticsHelper, ) : ViewModel() { val searchQuery = savedStateHandle.getStateFlow(SEARCH_QUERY, "") @@ -105,6 +109,14 @@ class SearchViewModel @Inject constructor( viewModelScope.launch { recentSearchRepository.insertOrReplaceRecentSearch(query) } + analyticsHelper.logEvent( + AnalyticsEvent( + type = SEARCH_QUERY, + extras = listOf( + Param(SEARCH_QUERY, query), + ), + ), + ) } fun clearRecentSearches() { diff --git a/feature/search/src/test/java/com/google/samples/apps/nowinandroid/feature/search/SearchViewModelTest.kt b/feature/search/src/test/java/com/google/samples/apps/nowinandroid/feature/search/SearchViewModelTest.kt index 1d50b75fd..fc9c20549 100644 --- a/feature/search/src/test/java/com/google/samples/apps/nowinandroid/feature/search/SearchViewModelTest.kt +++ b/feature/search/src/test/java/com/google/samples/apps/nowinandroid/feature/search/SearchViewModelTest.kt @@ -17,6 +17,7 @@ package com.google.samples.apps.nowinandroid.feature.search import androidx.lifecycle.SavedStateHandle +import com.google.samples.apps.nowinandroid.core.analytics.NoOpAnalyticsHelper import com.google.samples.apps.nowinandroid.core.domain.GetRecentSearchQueriesUseCase import com.google.samples.apps.nowinandroid.core.domain.GetSearchContentsCountUseCase import com.google.samples.apps.nowinandroid.core.domain.GetSearchContentsUseCase @@ -68,6 +69,7 @@ class SearchViewModelTest { recentSearchQueriesUseCase = getRecentQueryUseCase, savedStateHandle = SavedStateHandle(), recentSearchRepository = recentSearchRepository, + analyticsHelper = NoOpAnalyticsHelper(), ) }