Skip to content

MS-1186 Sync "Try again" fix #1382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
luhmirin-s merged 1 commit into from
Oct 1, 2025
Merged

MS-1186 Sync "Try again" fix #1382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .../java/com/simprints/feature/dashboard/settings/syncinfo/usecase/ObserveSyncInfoUseCase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ internal class ObserveSyncInfoUseCase @Inject constructor(
)
)
val isSyncButtonEnabled =
(eventSyncVisibleState == OnStandby) &&
(eventSyncVisibleState == OnStandby || eventSyncVisibleState == Error) &&
((!isPreLogoutUpSync && isDownSyncPossible) || isEventUpSyncPossible)

val projectId = authStore.signedInProjectId
Expand Down
14 changes: 14 additions & 0 deletions ...a/com/simprints/feature/dashboard/settings/syncinfo/usecase/ObserveSyncInfoUseCaseTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1168,6 +1168,20 @@ class ObserveSyncInfoUseCaseTest {
assertThat(result.syncInfoSectionRecords.isSyncButtonEnabled).isFalse()
}

@Test
fun `sync button should be enabled when sync has failed for non-CommCare and non-network reasons`() = runTest {
val mockCommCarePermissionErrorEventSyncState = mockk<EventSyncState>(relaxed = true) {
every { isSyncFailed() } returns true
every { isSyncFailedBecauseCommCarePermissionIsMissing() } returns false
}
every { eventSyncManager.getLastSyncState(any()) } returns MutableLiveData(mockCommCarePermissionErrorEventSyncState)

createUseCase()
val result = useCase().first()

assertThat(result.syncInfoSectionRecords.isSyncButtonEnabled).isTrue()
}

@Test
fun `should calculate correct record last sync time when sync time available`() = runTest {
val timestamp = Timestamp(0L)
Expand Down