refactor: Update status storage, fragments

.github/workflows/ci.yml

@@ -148,3 +148,57 @@ jobs:
 
       - name: assemble ${{ matrix.color }}${{ matrix.store }}${{ matrix.type }}
         run: ./gradlew assemble${{ matrix.color }}${{ matrix.store }}${{ matrix.type }}
+
+  # Connected tests are per-store-variant, debug builds only.
+  connected:
+    strategy:
+      matrix:
+        color: ["Orange"]
+        store: ["Fdroid", "Github", "Google"]
+        type: ["Debug"]
+        api-level: [31]
+        target: [default]
+    name: Android Emulator Tests
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+
+      - name: Enable KVM
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
+      - uses: ./.github/actions/setup-build-env
+        with:
+          gradle-cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
+
+      - name: AVD cache
+        uses: actions/cache@v4
+        id: avd-cache
+        with:
+          path: |
+            ~/.android/avd/*
+            ~/.android/adb*
+          key: avd-${{ matrix.api-level }}
+
+      - name: Create AVD and generate snapshot for caching
+        if: steps.avd-cache.outputs.cache-hit != 'true'
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          arch: x86_64
+          api-level: ${{ matrix.api-level }}
+          force-avd-creation: false
+          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          disable-animations: false
+          script: echo "Generated AVD snapshot for caching."
+
+      - name: Run tests
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: ${{ matrix.api-level }}
+          target: ${{ matrix.target }}
+          arch: x86_64
+          script: ./gradlew connected${{ matrix.color }}${{ matrix.store }}${{ matrix.type }}AndroidTest

app/src/main/java/app/pachli/components/notifications/NotificationsFragment.kt

@@ -88,7 +88,6 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.conflate
 import kotlinx.coroutines.flow.distinctUntilChangedBy
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.filterNotNull
@@ -313,12 +312,13 @@ class NotificationsFragment :
                     // remove it.
                     is NotificationActionSuccess.AcceptFollowRequest,
                     is NotificationActionSuccess.RejectFollowRequest,
-                    -> refreshAdapterAndScrollToVisibleId()
+                    -> adapter.refresh()
                 }
             }
 
             when (uiSuccess) {
-                is UiSuccess.Block, is UiSuccess.Mute, is UiSuccess.MuteConversation -> refreshAdapterAndScrollToVisibleId()
+                is UiSuccess.Block, is UiSuccess.Mute, is UiSuccess.MuteConversation,
+                -> adapter.refresh()
 
                 is UiSuccess.LoadNewest -> {
                     // Scroll to the top when prepending completes.
@@ -379,25 +379,6 @@ class NotificationsFragment :
         }
     }
 
-    /**
-     * Refreshes the adapter, waits for the first page to be updated, and scrolls the
-     * recyclerview to the first notification that was visible before the refresh.
-     *
-     * This ensures the user's position is not lost during adapter refreshes.
-     */
-    private fun refreshAdapterAndScrollToVisibleId() {
-        getFirstVisibleNotification()?.id?.let { id ->
-            viewLifecycleOwner.lifecycleScope.launch {
-                adapter.onPagesUpdatedFlow.conflate().take(1).collect {
-                    binding.recyclerView.scrollToPosition(
-                        adapter.snapshot().items.indexOfFirst { it.id == id },
-                    )
-                }
-            }
-        }
-        adapter.refresh()
-    }
-
     override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
         menuInflater.inflate(R.menu.fragment_notifications, menu)
         menu.findItem(R.id.action_refresh)?.apply {
@@ -446,7 +427,7 @@ class NotificationsFragment :
         }
 
         binding.swipeRefreshLayout.isRefreshing = false
-        refreshAdapterAndScrollToVisibleId()
+        adapter.refresh()
         clearNotificationsForAccount(requireContext(), pachliAccountId)
     }
 
@@ -613,11 +594,11 @@ class NotificationsFragment :
     }
 
     override fun onMute(mute: Boolean, id: String, position: Int, notifications: Boolean) {
-        refreshAdapterAndScrollToVisibleId()
+        adapter.refresh()
     }
 
     override fun onBlock(block: Boolean, id: String, position: Int) {
-        refreshAdapterAndScrollToVisibleId()
+        adapter.refresh()
     }
 
     override fun onRespondToFollowRequest(accept: Boolean, accountId: String, position: Int) {

app/src/main/java/app/pachli/components/timeline/CachedTimelineRepository.kt

@@ -83,12 +83,12 @@ class CachedTimelineRepository @Inject constructor(
         factory = InvalidatingPagingSourceFactory { timelineDao.getStatuses(account.id) }
 
         val initialKey = remoteKeyDao.remoteKeyForKind(account.id, RKE_TIMELINE_ID, RemoteKeyKind.REFRESH)?.key
-        val row = initialKey?.let { timelineDao.getStatusRowNumber(account.id, it) } ?: 0
+        val row = initialKey?.let { timelineDao.getStatusRowNumber(account.id, it) }
 
         Timber.d("initialKey: %s is row: %d", initialKey, row)
 
         return Pager(
-            initialKey = (row - ((PAGE_SIZE * 3) / 2)).coerceAtLeast(0),
+            initialKey = row?.let { (row - ((PAGE_SIZE * 3) / 2)).coerceAtLeast(0) },
             config = PagingConfig(
                 pageSize = PAGE_SIZE,
                 enablePlaceholders = true,

app/src/main/java/app/pachli/components/timeline/TimelineFragment.kt

@@ -97,7 +97,6 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.conflate
 import kotlinx.coroutines.flow.distinctUntilChangedBy
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.flow
@@ -352,17 +351,12 @@ class TimelineFragment :
                     is StatusActionSuccess.Translate -> statusViewData.status
                 }
                 (indexedViewData.value as StatusViewData).status = status
-
-                adapter.notifyItemChanged(indexedViewData.index)
             }
 
             // Refresh adapter on mutes and blocks
             when (it) {
-                is UiSuccess.Block,
-                is UiSuccess.Mute,
-                is UiSuccess.MuteConversation,
-                ->
-                    refreshAdapterAndScrollToVisibleId()
+                is UiSuccess.Block, is UiSuccess.Mute, is UiSuccess.MuteConversation,
+                -> adapter.refresh()
 
                 is UiSuccess.StatusSent -> handleStatusSentOrEdit(it.status)
                 is UiSuccess.StatusEdited -> handleStatusSentOrEdit(it.status)
@@ -430,25 +424,6 @@ class TimelineFragment :
         }
     }
 
-    /**
-     * Refreshes the adapter, waits for the first page to be updated, and scrolls the
-     * recyclerview to the first status that was visible before the refresh.
-     *
-     * This ensures the user's position is not lost during adapter refreshes.
-     */
-    private fun refreshAdapterAndScrollToVisibleId() {
-        getFirstVisibleStatus()?.id?.let { id ->
-            viewLifecycleOwner.lifecycleScope.launch {
-                adapter.onPagesUpdatedFlow.conflate().take(1).collect {
-                    binding.recyclerView.scrollToPosition(
-                        adapter.snapshot().items.indexOfFirst { it.id == id },
-                    )
-                }
-            }
-        }
-        adapter.refresh()
-    }
-
     override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
         menuInflater.inflate(R.menu.fragment_timeline, menu)
 
@@ -477,7 +452,6 @@ class TimelineFragment :
             R.id.action_load_newest -> {
                 Timber.d("Reload because user chose load newest menu item")
                 viewModel.accept(InfallibleUiAction.LoadNewest)
-                refreshContent()
                 true
             }
             else -> false
@@ -582,7 +556,7 @@ class TimelineFragment :
         }
 
         binding.swipeRefreshLayout.isRefreshing = false
-        refreshAdapterAndScrollToVisibleId()
+        adapter.refresh()
     }
 
     override fun onReply(viewData: StatusViewData) {

app/src/main/java/app/pachli/components/timeline/viewmodel/CachedTimelineRemoteMediator.kt

@@ -29,6 +29,7 @@ import app.pachli.core.database.model.RemoteKeyEntity
 import app.pachli.core.database.model.RemoteKeyEntity.RemoteKeyKind
 import app.pachli.core.database.model.StatusEntity
 import app.pachli.core.database.model.TimelineAccountEntity
+import app.pachli.core.database.model.TimelineStatusEntity
 import app.pachli.core.database.model.TimelineStatusWithAccount
 import app.pachli.core.network.model.Links
 import app.pachli.core.network.model.Status
@@ -68,7 +69,7 @@ class CachedTimelineRemoteMediator(
                             RKE_TIMELINE_ID,
                             RemoteKeyKind.REFRESH,
                         )?.key
-                        Timber.d("Loading from item: %s", statusId)
+                        Timber.d("Refresh from item: %s", statusId)
                         getInitialPage(statusId, state.config.pageSize)
                     }
 
@@ -78,7 +79,7 @@ class CachedTimelineRemoteMediator(
                             RKE_TIMELINE_ID,
                             RemoteKeyKind.PREV,
                         ) ?: return@transactionProvider MediatorResult.Success(endOfPaginationReached = true)
-                        Timber.d("Loading from remoteKey: %s", rke)
+                        Timber.d("Prepend from remoteKey: %s", rke)
                         mastodonApi.homeTimeline(minId = rke.key, limit = state.config.pageSize)
                     }
 
@@ -88,7 +89,7 @@ class CachedTimelineRemoteMediator(
                             RKE_TIMELINE_ID,
                             RemoteKeyKind.NEXT,
                         ) ?: return@transactionProvider MediatorResult.Success(endOfPaginationReached = true)
-                        Timber.d("Loading from remoteKey: %s", rke)
+                        Timber.d("Append from remoteKey: %s", rke)
                         mastodonApi.homeTimeline(maxId = rke.key, limit = state.config.pageSize)
                     }
                 }
@@ -112,8 +113,10 @@ class CachedTimelineRemoteMediator(
 
                 when (loadType) {
                     LoadType.REFRESH -> {
-                        remoteKeyDao.deletePrevNext(pachliAccountId, RKE_TIMELINE_ID)
-                        timelineDao.deleteAllStatusesForAccount(pachliAccountId)
+                        timelineDao.deleteAllStatusesForAccountOnTimeline(
+                            pachliAccountId,
+                            TimelineStatusEntity.Kind.Home,
+                        )
 
                         remoteKeyDao.upsert(
                             RemoteKeyEntity(
@@ -247,7 +250,8 @@ class CachedTimelineRemoteMediator(
     }
 
     /**
-     * Inserts `statuses` and the accounts referenced by those statuses in to the cache.
+     * Inserts `statuses` and the accounts referenced by those statuses in to the cache,
+     * then adds references to them in the Home timeline.
      */
     private suspend fun insertStatuses(pachliAccountId: Long, statuses: List<Status>) {
         check(transactionProvider.inTransaction())
@@ -262,6 +266,15 @@ class CachedTimelineRemoteMediator(
 
         timelineDao.upsertAccounts(accounts.map { TimelineAccountEntity.from(it, pachliAccountId) })
         statusDao.upsertStatuses(statuses.map { StatusEntity.from(it, pachliAccountId) })
+        timelineDao.upsertStatuses(
+            statuses.map {
+                TimelineStatusEntity(
+                    kind = TimelineStatusEntity.Kind.Home,
+                    pachliAccountId = pachliAccountId,
+                    statusId = it.id,
+                )
+            },
+        )
     }
 
     companion object {

app/src/main/java/app/pachli/components/timeline/viewmodel/CachedTimelineViewModel.kt

@@ -42,6 +42,7 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.distinctUntilChangedBy
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.map
@@ -74,9 +75,10 @@ class CachedTimelineViewModel @Inject constructor(
         flow { emit(repository.getRefreshKey(it.data!!.id)) }
     }
 
-    override var statuses = accountFlow.flatMapLatest {
-        getStatuses(it.data!!)
-    }.cachedIn(viewModelScope)
+    override var statuses = accountFlow
+        .distinctUntilChangedBy { it.data!!.id }
+        .flatMapLatest { getStatuses(it.data!!) }
+        .cachedIn(viewModelScope)
 
     /** @return Flow of statuses that make up the timeline of [timeline] for [account]. */
     private suspend fun getStatuses(

app/src/main/java/app/pachli/usecase/DeveloperToolsUseCase.kt

@@ -33,7 +33,7 @@ class DeveloperToolsUseCase @Inject constructor(
      * Clear the home timeline cache.
      */
     suspend fun clearHomeTimelineCache(accountId: Long) {
-        timelineDao.deleteAllStatusesForAccount(accountId)
+        timelineDao.deleteAllStatusesForAccountOnTimeline(accountId)
     }
 
     /**

app/src/main/java/app/pachli/worker/PruneCacheWorker.kt

@@ -45,15 +45,14 @@ class PruneCacheWorker @AssistedInject constructor(
     override suspend fun doWork(): Result {
         for (account in accountManager.accounts) {
             Timber.d("Pruning database using account ID: %d", account.id)
-            timelineDao.cleanup(account.id, MAX_STATUSES_IN_CACHE)
+            timelineDao.cleanup(account.id)
         }
         return Result.success()
     }
 
     override suspend fun getForegroundInfo() = ForegroundInfo(NOTIFICATION_ID_PRUNE_CACHE, notification)
 
     companion object {
-        private const val MAX_STATUSES_IN_CACHE = 1000
         const val PERIODIC_WORK_TAG = "PruneCacheWorker_periodic"
     }
 }

app/src/test/java/app/pachli/components/timeline/CachedTimelineRemoteMediatorTest.kt

@@ -18,6 +18,7 @@ import app.pachli.core.database.di.TransactionProvider
 import app.pachli.core.database.model.AccountEntity
 import app.pachli.core.database.model.RemoteKeyEntity
 import app.pachli.core.database.model.RemoteKeyEntity.RemoteKeyKind
+import app.pachli.core.database.model.TimelineStatusEntity
 import app.pachli.core.database.model.TimelineStatusWithAccount
 import app.pachli.core.network.json.BooleanIfNull
 import app.pachli.core.network.json.DefaultIfNull
@@ -343,6 +344,15 @@ class CachedTimelineRemoteMediatorTest {
                 }
                 statusDao().insertStatus(statusWithAccount.status)
             }
+            timelineDao().upsertStatuses(
+                statuses.map {
+                    TimelineStatusEntity(
+                        pachliAccountId = it.status.timelineUserId,
+                        kind = TimelineStatusEntity.Kind.Home,
+                        statusId = it.status.serverId,
+                    )
+                },
+            )
         }
     }
 

core/data/src/main/kotlin/app/pachli/core/data/repository/notifications/NotificationsRepository.kt

@@ -57,6 +57,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.async
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.launch
+import timber.log.Timber
 
 /**
  * Errors that can occur acting on a status.
@@ -113,10 +114,10 @@ class NotificationsRepository @Inject constructor(
         // Room is row-keyed, not item-keyed. Find the user's REFRESH key, then find the
         // row of the notification with that ID, and use that as the Pager's initialKey.
         val initialKey = remoteKeyDao.remoteKeyForKind(pachliAccountId, RKE_TIMELINE_ID, RemoteKeyKind.REFRESH)?.key
-        val row = initialKey?.let { notificationDao.getNotificationRowNumber(pachliAccountId, it) } ?: 0
+        val row = initialKey?.let { notificationDao.getNotificationRowNumber(pachliAccountId, it) }
 
         return Pager(
-            initialKey = (row - ((PAGE_SIZE * 3) / 2)).coerceAtLeast(0),
+            initialKey = row?.let { (row - ((PAGE_SIZE * 3) / 2)).coerceAtLeast(0) },
             config = PagingConfig(
                 pageSize = PAGE_SIZE,
                 enablePlaceholders = true,
@@ -145,6 +146,7 @@ class NotificationsRepository @Inject constructor(
      * refresh the newest notifications.
      */
     suspend fun saveRefreshKey(pachliAccountId: Long, key: String?) = externalScope.async {
+        Timber.d("saveRefreshKey: $key")
         remoteKeyDao.upsert(
             RemoteKeyEntity(pachliAccountId, RKE_TIMELINE_ID, RemoteKeyKind.REFRESH, key),
         )