Skip to content

[MS-451] Splash screen rotation no longer leads to a freeze of the orchestration flow #727

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
alexandr-simprints merged 1 commit into from
May 23, 2024
Merged

[MS-451] Splash screen rotation no longer leads to a freeze of the orchestration flow #727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 4 additions & 5 deletions ...ure/orchestrator/src/main/java/com/simprints/feature/orchestrator/OrchestratorFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ internal class OrchestratorFragment : Fragment(R.layout.fragment_orchestrator) {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
if (savedInstanceState != null) {
orchestratorVm.requestProcessed = savedInstanceState.getBoolean(KEY_REQUEST_PROCESSED)
orchestratorVm.isRequestProcessed = savedInstanceState.getBoolean(KEY_REQUEST_PROCESSED)
savedInstanceState.getString(KEY_ACTION_REQUEST)
?.run(orchestratorVm::setActionRequestFromJson)
orchestratorVm.restoreStepsIfNeeded()
Expand All @@ -87,7 +87,6 @@ internal class OrchestratorFragment : Fragment(R.layout.fragment_orchestrator) {

override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
orchestratorVm.isActivityRestored = savedInstanceState != null

observeLoginCheckVm()
observeClientApiVm()
Expand Down Expand Up @@ -230,7 +229,7 @@ internal class OrchestratorFragment : Fragment(R.layout.fragment_orchestrator) {

override fun onSaveInstanceState(outState: Bundle) {
super.onSaveInstanceState(outState)
outState.putBoolean(KEY_REQUEST_PROCESSED, orchestratorVm.requestProcessed)
outState.putBoolean(KEY_REQUEST_PROCESSED, orchestratorVm.isRequestProcessed)
// [MS-405] Saving the action request in the bundle, since ViewModels don't survive the
// process death. ActionRequest is important in mapping the correct SID response, hence it
// is important for it to be able to survive both configuration changes and process death.
Expand All @@ -240,15 +239,15 @@ internal class OrchestratorFragment : Fragment(R.layout.fragment_orchestrator) {
override fun onResume() {
super.onResume()

if (!orchestratorVm.isActivityRestored && !orchestratorVm.requestProcessed) {
if (!orchestratorVm.isRequestProcessed) {
if (loginCheckVm.isDeviceSafe()) {
orchestratorVm.requestProcessed = true
lifecycleScope.launch {
val actionRequest =
clientApiVm.handleIntent(args.requestAction, args.requestParams)
if (actionRequest != null) {
loginCheckVm.validateSignInAndProceed(actionRequest)
}
orchestratorVm.isRequestProcessed = true
}
}
}
Expand Down
3 changes: 1 addition & 2 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 @@ -52,8 +52,7 @@ internal class OrchestratorViewModel @Inject constructor(
private val updateDailyActivity: UpdateDailyActivityUseCase,
) : ViewModel() {

var isActivityRestored = false
var requestProcessed = false
var isRequestProcessed = false
private var modalities = emptySet<GeneralConfiguration.Modality>()
private var steps = emptyList<Step>()
private var actionRequest: ActionRequest? = null
Expand Down