merge Release/2025.3.0

face/capture/src/main/java/com/simprints/face/capture/screens/livefeedback/LiveFeedbackFragment.kt

@@ -117,11 +117,7 @@ internal class LiveFeedbackFragment : Fragment(R.layout.fragment_live_feedback)
                 vm.initCapture(mainVm.bioSDK, mainVm.samplesToCapture, mainVm.attemptNumber)
             }
         }
-        if (vm.isAutoCapture) {
-            // Await until capture button is pressed
-            vm.holdOffAutoCapture()
-            binding.captureFeedbackBtn.isClickable = true
-        }
+        enableCaptureButtonIfAutoCapture()
 
         binding.captureInstructionsBtn.setOnClickListener {
             findNavController().navigateSafely(
@@ -185,9 +181,12 @@ internal class LiveFeedbackFragment : Fragment(R.layout.fragment_live_feedback)
 
     override fun onResume() {
         super.onResume()
-
         when {
-            requireActivity().hasPermission(Manifest.permission.CAMERA) -> setUpCamera()
+            requireActivity().hasPermission(Manifest.permission.CAMERA) -> {
+                setUpCamera()
+                enableCaptureButtonIfAutoCapture()
+            }
+
             mainVm.shouldCheckCameraPermissions.getAndSet(false) -> {
                 // Check permission in onResume() so that if user left the app to go to Settings
                 // and give the permission, it's reflected when they come back to SID
@@ -202,6 +201,14 @@ internal class LiveFeedbackFragment : Fragment(R.layout.fragment_live_feedback)
         }
     }
 
+    private fun enableCaptureButtonIfAutoCapture() {
+        if (vm.isAutoCapture) {
+            // Await until capture button is pressed
+            vm.holdOffAutoCapture()
+            binding.captureFeedbackBtn.isClickable = true
+        }
+    }
+
     override fun onStop() {
         toggleTorche(false)
         // Shut down our background executor

feature/dashboard/src/main/java/com/simprints/feature/dashboard/base/BaseFragment.kt

@@ -18,7 +18,7 @@ internal class BaseFragment : Fragment(R.layout.fragment_base) {
         if (authStore.signedInProjectId.isNotEmpty()) {
             findNavController().navigateSafely(this, BaseFragmentDirections.actionBaseFragmentToMainFragment())
         } else {
-            findNavController().navigateSafely(this, BaseFragmentDirections.actionBaseFragmentToRequestLoginFragment())
+            findNavController().navigateSafely(this, BaseFragmentDirections.actionToRequestLoginFragment())
         }
     }
 }

feature/dashboard/src/main/java/com/simprints/feature/dashboard/debug/DebugFragment.kt

@@ -79,15 +79,19 @@ internal class DebugFragment : Fragment(R.layout.fragment_debug) {
         }
 
         binding.syncStart.setOnClickListener {
-            syncOrchestrator.startEventSync()
+            lifecycleScope.launch(dispatcher) {
+                syncOrchestrator.startEventSync()
+            }
         }
 
         binding.syncStop.setOnClickListener {
             syncOrchestrator.stopEventSync()
         }
 
         binding.syncSchedule.setOnClickListener {
-            syncOrchestrator.rescheduleEventSync()
+            lifecycleScope.launch(dispatcher) {
+                syncOrchestrator.rescheduleEventSync()
+            }
         }
 
         binding.clearFirebaseToken.setOnClickListener {

feature/dashboard/src/main/java/com/simprints/feature/dashboard/logout/LogoutSyncViewModel.kt

@@ -19,7 +19,6 @@ import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
@@ -52,9 +51,7 @@ internal class LogoutSyncViewModel @Inject constructor(
         }
 
     fun logout() {
-        viewModelScope.launch {
-            logoutUseCase()
-        }
+        logoutUseCase()
     }
 
     private companion object {

feature/dashboard/src/main/java/com/simprints/feature/dashboard/logout/sync/LogoutSyncFragment.kt

@@ -51,11 +51,5 @@ class LogoutSyncFragment : Fragment(R.layout.fragment_logout_sync) {
                 }
             }
         }
-        viewModel.logoutEventLiveData.observe(viewLifecycleOwner) {
-            findNavController().navigateSafely(
-                this@LogoutSyncFragment,
-                R.id.action_logoutSyncFragment_to_requestLoginFragment,
-            )
-        }
     }
 }

feature/dashboard/src/main/java/com/simprints/feature/dashboard/logout/syncdecline/LogoutSyncDeclineFragment.kt

@@ -74,7 +74,7 @@ class LogoutSyncDeclineFragment : Fragment(R.layout.fragment_logout_sync_decline
         viewModel.logoutEventLiveData.observe(viewLifecycleOwner) {
             findNavController().navigateSafely(
                 this@LogoutSyncDeclineFragment,
-                LogoutSyncDeclineFragmentDirections.actionLogoutSyncDeclineFragmentToRequestLoginFragment(),
+                LogoutSyncDeclineFragmentDirections.actionToRequestLoginFragment(null),
             )
         }
     }

feature/dashboard/src/main/java/com/simprints/feature/dashboard/logout/usecase/LogoutUseCase.kt

@@ -6,7 +6,7 @@ import com.simprints.infra.enrolment.records.repository.EnrolmentRecordRepositor
 import com.simprints.infra.enrolment.records.repository.local.migration.RealmToRoomMigrationFlagsStore
 import com.simprints.infra.sync.SyncOrchestrator
 import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.withContext
+import kotlinx.coroutines.runBlocking
 import javax.inject.Inject
 
 internal class LogoutUseCase @Inject constructor(
@@ -16,7 +16,8 @@ internal class LogoutUseCase @Inject constructor(
     private val enrolmentRecordRepository: EnrolmentRecordRepository,
     @DispatcherIO private val ioDispatcher: CoroutineDispatcher,
 ) {
-    suspend operator fun invoke() = withContext(ioDispatcher) {
+    // To prevent a race between wiping data and navigation, this use case must block the executing thread
+    operator fun invoke() = runBlocking(ioDispatcher) {
         // Cancel all background sync
         syncOrchestrator.cancelBackgroundWork()
         syncOrchestrator.deleteEventSyncInfo()

feature/dashboard/src/main/java/com/simprints/feature/dashboard/settings/about/AboutFragment.kt

@@ -19,9 +19,9 @@ import com.simprints.feature.dashboard.R
 import com.simprints.feature.dashboard.databinding.FragmentSettingsAboutBinding
 import com.simprints.feature.dashboard.settings.password.SettingsPasswordDialogFragment
 import com.simprints.infra.config.store.models.GeneralConfiguration.Modality.FINGERPRINT
-import com.simprints.infra.uibase.view.applySystemBarInsets
 import com.simprints.infra.uibase.navigation.navigateSafely
 import com.simprints.infra.uibase.system.Clipboard
+import com.simprints.infra.uibase.view.applySystemBarInsets
 import com.simprints.infra.uibase.viewbinding.viewBinding
 import dagger.hilt.android.AndroidEntryPoint
 import java.util.Locale
@@ -96,7 +96,7 @@ internal class AboutFragment : PreferenceFragmentCompat() {
             LiveDataEventWithContentObserver {
                 val destination = when (it) {
                     LogoutDestination.LogoutDataSyncScreen -> AboutFragmentDirections.actionAboutFragmentToLogoutNavigation()
-                    LogoutDestination.LoginScreen -> AboutFragmentDirections.actionAboutFragmentToRequestLoginFragment()
+                    LogoutDestination.LoginScreen -> AboutFragmentDirections.actionToRequestLoginFragment()
                 }
                 findNavController().navigateSafely(this, destination)
             },

feature/dashboard/src/main/java/com/simprints/feature/dashboard/settings/syncinfo/SyncInfo.kt

@@ -4,6 +4,7 @@ data class SyncInfo(
     val isLoggedIn: Boolean = true,
     val isConfigurationLoadingProgressBarVisible: Boolean = false,
     val isLoginPromptSectionVisible: Boolean = false,
+    val isImageSyncSectionVisible: Boolean = false,
     val syncInfoSectionRecords: SyncInfoSectionRecords = SyncInfoSectionRecords(),
     val syncInfoSectionImages: SyncInfoSectionImages = SyncInfoSectionImages(),
     val syncInfoSectionModules: SyncInfoSectionModules = SyncInfoSectionModules(),
@@ -84,3 +85,8 @@ data class SyncInfoModuleCount(
     val name: String,
     val count: String = "",
 )
+
+enum class LogoutActionReason {
+    USER_ACTION,
+    PROJECT_ENDING_OR_DEVICE_COMPROMISED,
+}

feature/dashboard/src/main/java/com/simprints/feature/dashboard/settings/syncinfo/SyncInfoFragment.kt

@@ -12,6 +12,7 @@ import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import androidx.core.view.isGone
 import androidx.core.view.isInvisible
+import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.Lifecycle
@@ -22,11 +23,14 @@ import com.google.android.material.progressindicator.LinearProgressIndicator
 import com.simprints.core.tools.utils.TimeUtils
 import com.simprints.feature.dashboard.R
 import com.simprints.feature.dashboard.databinding.FragmentSyncInfoBinding
+import com.simprints.feature.dashboard.requestlogin.LogoutReason
+import com.simprints.feature.dashboard.requestlogin.RequestLoginFragmentArgs
 import com.simprints.feature.dashboard.settings.syncinfo.modulecount.ModuleCount
 import com.simprints.feature.dashboard.settings.syncinfo.modulecount.ModuleCountAdapter
 import com.simprints.feature.dashboard.view.ConfigurableSyncInfoFragmentContainer
 import com.simprints.feature.login.LoginContract
 import com.simprints.infra.uibase.navigation.handleResult
+import com.simprints.infra.uibase.navigation.navigateSafely
 import com.simprints.infra.uibase.navigation.toBundle
 import com.simprints.infra.uibase.view.applySystemBarInsets
 import com.simprints.infra.uibase.view.setPulseAnimation
@@ -138,8 +142,20 @@ internal class SyncInfoFragment : Fragment(R.layout.fragment_sync_info) {
 
         lifecycleScope.launch {
             repeatOnLifecycle(Lifecycle.State.RESUMED) {
-                viewModel.logoutEventFlow.collect {
+                viewModel.logoutEventFlow.collect { reason ->
                     viewModel.performLogout()
+
+                    val logoutReason = reason?.takeIf { it == LogoutActionReason.PROJECT_ENDING_OR_DEVICE_COMPROMISED }?.let {
+                        LogoutReason(
+                            title = getString(IDR.string.dashboard_sync_project_ending_alert_title),
+                            body = getString(IDR.string.dashboard_sync_project_ending_message),
+                        )
+                    }
+                    findNavController().navigateSafely(
+                        parentFragment,
+                        R.id.action_to_requestLoginFragment,
+                        RequestLoginFragmentArgs(logoutReason = logoutReason).toBundle(),
+                    )
                 }
             }
         }
@@ -180,7 +196,7 @@ internal class SyncInfoFragment : Fragment(R.layout.fragment_sync_info) {
         renderRecordsSection(syncInfo.syncInfoSectionRecords, config)
 
         // Images section
-        binding.layoutImagesSync.isGone = !config.isSyncInfoImageSyncVisible
+        binding.layoutImagesSync.isVisible = config.isSyncInfoImageSyncVisible && syncInfo.isImageSyncSectionVisible
         renderImagesSection(syncInfo.syncInfoSectionImages)
 
         // Modules section