From 4ae2268c70392dad3be415b398d08fdddc2580a8 Mon Sep 17 00:00:00 2001 From: andreia Date: Fri, 2 Jan 2026 15:18:47 +0100 Subject: [PATCH 1/3] Fix unable to reopen camera after cancelling picture --- .../android/ui/datacollection/tasks/photo/PhotoTaskViewModel.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/org/groundplatform/android/ui/datacollection/tasks/photo/PhotoTaskViewModel.kt b/app/src/main/java/org/groundplatform/android/ui/datacollection/tasks/photo/PhotoTaskViewModel.kt index d6b4e1f9a4..7b121c3457 100644 --- a/app/src/main/java/org/groundplatform/android/ui/datacollection/tasks/photo/PhotoTaskViewModel.kt +++ b/app/src/main/java/org/groundplatform/android/ui/datacollection/tasks/photo/PhotoTaskViewModel.kt @@ -69,9 +69,9 @@ class PhotoTaskViewModel @Inject constructor(private val userMediaRepository: Us if (result && capturedUri != null) { viewModelScope.launch { savePhotoTaskData(capturedUri!!) - hasLaunchedCamera = false } } + hasLaunchedCamera = false } /** From 579c149a4caf5140187e226182994ec19930bffc Mon Sep 17 00:00:00 2001 From: andreia Date: Fri, 2 Jan 2026 15:54:41 +0100 Subject: [PATCH 2/3] Update unit tests --- .../ui/datacollection/tasks/photo/PhotoTaskViewModelTest.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/test/java/org/groundplatform/android/ui/datacollection/tasks/photo/PhotoTaskViewModelTest.kt b/app/src/test/java/org/groundplatform/android/ui/datacollection/tasks/photo/PhotoTaskViewModelTest.kt index 291497a37b..c6723c348a 100644 --- a/app/src/test/java/org/groundplatform/android/ui/datacollection/tasks/photo/PhotoTaskViewModelTest.kt +++ b/app/src/test/java/org/groundplatform/android/ui/datacollection/tasks/photo/PhotoTaskViewModelTest.kt @@ -96,6 +96,7 @@ class PhotoTaskViewModelTest : BaseHiltTest() { viewModel.onCaptureResult(false) verify(userMediaRepository, org.mockito.kotlin.never()).savePhotoFromUri(any(), any()) + assertThat(viewModel.hasLaunchedCamera).isFalse() } @Test @@ -105,6 +106,7 @@ class PhotoTaskViewModelTest : BaseHiltTest() { viewModel.onCaptureResult(true) verify(userMediaRepository, org.mockito.kotlin.never()).savePhotoFromUri(any(), any()) + assertThat(viewModel.hasLaunchedCamera).isFalse() } companion object { From 0fab9695eb8827f5be345f7730d708589ce35380 Mon Sep 17 00:00:00 2001 From: andreia Date: Fri, 2 Jan 2026 16:09:46 +0100 Subject: [PATCH 3/3] Fix formatting --- .../ui/datacollection/tasks/photo/PhotoTaskViewModel.kt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/src/main/java/org/groundplatform/android/ui/datacollection/tasks/photo/PhotoTaskViewModel.kt b/app/src/main/java/org/groundplatform/android/ui/datacollection/tasks/photo/PhotoTaskViewModel.kt index 7b121c3457..e6a8968950 100644 --- a/app/src/main/java/org/groundplatform/android/ui/datacollection/tasks/photo/PhotoTaskViewModel.kt +++ b/app/src/main/java/org/groundplatform/android/ui/datacollection/tasks/photo/PhotoTaskViewModel.kt @@ -67,9 +67,7 @@ class PhotoTaskViewModel @Inject constructor(private val userMediaRepository: Us fun onCaptureResult(result: Boolean) { if (result && capturedUri != null) { - viewModelScope.launch { - savePhotoTaskData(capturedUri!!) - } + viewModelScope.launch { savePhotoTaskData(capturedUri!!) } } hasLaunchedCamera = false }