Skip to content

MS-593 Camera permission revokation fix #836

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 2 commits into from
Jul 30, 2024
Merged

MS-593 Camera permission revokation fix #836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
547a013
MS-593 Match age group selection json type name with class name
luhmirin-s Jul 29, 2024
143473e
MS-593 Cache steps after any change
luhmirin-s Jul 29, 2024
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: 2 additions & 0 deletions ...re/orchestrator/src/main/java/com/simprints/feature/orchestrator/OrchestratorViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,11 +152,13 @@ internal class OrchestratorViewModel @Inject constructor(
val nextStep = steps.firstOrNull { it.status == StepStatus.NOT_STARTED }
if (nextStep != null) {
nextStep.status = StepStatus.IN_PROGRESS
cache.steps = steps
_currentStep.send(nextStep)
} else {
// Acquiring location info could take long time, so we should stop location tracker
// before returning to the caller app to avoid creating empty sessions.
locationStore.cancelLocationCollection()
cache.steps = steps
buildAppResponse()
}
}
Expand Down
2 changes: 1 addition & 1 deletion feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/steps/Step.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ import java.io.Serializable
JsonSubTypes.Type(value = AlertResult::class, name = "AlertResult"),
JsonSubTypes.Type(value = ExitFormResult::class, name = "ExitFormResult"),
JsonSubTypes.Type(value = ValidateSubjectPoolResult::class, name = "ValidateSubjectPoolResult"),
JsonSubTypes.Type(value = SelectSubjectAgeGroupResult::class, name = "SelectSubjectAgeResult"),
JsonSubTypes.Type(value = SelectSubjectAgeGroupResult::class, name = "SelectSubjectAgeGroupResult"),
)
abstract class SerializableMixin : Serializable

Expand Down