Skip to content

Commit

Permalink
fix black screen when qr is read (dhis2#3524)
Browse files Browse the repository at this point in the history
Signed-off-by: Pablo <[email protected]>
  • Loading branch information
Balcan authored Mar 9, 2024
1 parent 97d064f commit 3c96d86
Showing 1 changed file with 10 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,9 @@ class SearchTEIViewModel(
}

fun onTeiClick(teiUid: String, enrollmentUid: String?, online: Boolean) {
_legacyInteraction.value = LegacyInteraction.OnTeiClick(teiUid, enrollmentUid, online)
_legacyInteraction.postValue(
LegacyInteraction.OnTeiClick(teiUid, enrollmentUid, online),
)
}

fun onDataLoaded(
Expand Down Expand Up @@ -812,12 +814,12 @@ class SearchTEIViewModel(
queryData = queryData,
)
val isOnline = searching && networkUtils.isOnline()
val trackedEntities = withContext(dispatchers.io()) {
val trackedEntities = async(dispatchers.io()) {
searchRepositoryKt.searchTrackedEntitiesImmediate(
searchParametersModel = searchParametersModel,
isOnline = isOnline,
)
}
}.await()

if (trackedEntities.isEmpty() || trackedEntities.size > 1) return@launch

Expand All @@ -835,17 +837,17 @@ class SearchTEIViewModel(
)
}

searching = false

clearQueryData()
clearFocus()

// Open TEI dashboard for the found TEI
onTeiClick(
teiUid = searchTeiModel.uid(),
enrollmentUid = searchTeiModel.selectedEnrollment.uid(),
online = searchTeiModel.isOnline,
)

searching = false

clearQueryData()
clearFocus()
}
}

Expand Down

0 comments on commit 3c96d86

Please sign in to comment.