Skip to content
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

Using activeSurveyFlow to make flow async #2890

Merged
merged 11 commits into from
Jan 2, 2025
Merged

Using activeSurveyFlow to make flow async #2890

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cf67dce
using activeSurveyFlow
anandwana001 Dec 1, 2024
222adf4
Merge branch 'master' into anandwana001/2815/use-active-survey-flow
gino-m Dec 3, 2024
8bac153
Merge branch 'master' into anandwana001/2815/use-active-survey-flow
anandwana001 Dec 5, 2024
480564d
Merge branch 'master' into anandwana001/2815/use-active-survey-flow
anandwana001 Dec 11, 2024
392861a
Merge branch 'master' into anandwana001/2815/use-active-survey-flow
anandwana001 Dec 12, 2024
c351daa
suggested fix
anandwana001 Dec 17, 2024
348e049
Merge branch 'master' into anandwana001/2815/use-active-survey-flow
anandwana001 Dec 23, 2024
e170c55
added timeout
anandwana001 Dec 23, 2024
432f80d
moved to const
anandwana001 Jan 2, 2025
60f6f8d
Merge branch 'master' into anandwana001/2815/use-active-survey-flow
anandwana001 Jan 2, 2025
3363a8a
merge with latest
anandwana001 Jan 2, 2025
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
12 changes: 11 additions & 1 deletion ground/src/main/java/com/google/android/ground/ui/datacollection/DataCollectionViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,14 @@ import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.filterNotNull
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.flow.stateIn
import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.withTimeout
import timber.log.Timber

/** View model for the Data Collection fragment. */
Expand Down Expand Up @@ -96,7 +100,12 @@ internal constructor(
private var shouldLoadFromDraft: Boolean = savedStateHandle[TASK_SHOULD_LOAD_FROM_DRAFT] ?: false
private var draftDeltas: List<ValueDelta>? = null

private val activeSurvey: Survey = requireNotNull(surveyRepository.activeSurvey)
private val activeSurvey: Survey = runBlocking {
withTimeout(SURVEY_LOAD_TIMEOUT_MILLIS) {
surveyRepository.activeSurveyFlow.filterNotNull().first()
}
}

private val job: Job = activeSurvey.getJob(jobId) ?: error("couldn't retrieve job for $jobId")
private var customLoiName: String?
get() = savedStateHandle[TASK_LOI_NAME_KEY]
Expand Down Expand Up @@ -428,6 +437,7 @@ internal constructor(
private const val TASK_POSITION_ID = "currentTaskId"
private const val TASK_SHOULD_LOAD_FROM_DRAFT = "shouldLoadFromDraft"
private const val TASK_DRAFT_VALUES = "draftValues"
private const val SURVEY_LOAD_TIMEOUT_MILLIS = 3000L

fun getViewModelClass(taskType: Task.Type): Class<out AbstractTaskViewModel> =
when (taskType) {
Expand Down
Loading