Skip to content

[MS-1379] Don't crash on huge metadata #1608

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

Open
BurningAXE wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[MS-1379] Don't crash on huge metadata #1608

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
17 changes: 0 additions & 17 deletions ...ure/orchestrator/src/main/java/com/simprints/feature/orchestrator/OrchestratorActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,9 @@ package com.simprints.feature.orchestrator
import android.content.Intent
import android.os.Bundle
import android.os.PersistableBundle
import androidx.core.os.bundleOf
import androidx.navigation.findNavController
import com.simprints.core.tools.activity.BaseActivity
import com.simprints.feature.clientapi.models.ClientApiConstants
import com.simprints.feature.orchestrator.databinding.ActivityOrchestratorBinding
import com.simprints.infra.config.store.LastCallingPackageStore
import com.simprints.infra.logging.LoggingConstants.CrashReportTag.ORCHESTRATION
import com.simprints.infra.logging.Simber
import com.simprints.infra.orchestration.data.results.AppResult
Expand All @@ -24,9 +21,6 @@ internal class OrchestratorActivity : BaseActivity() {
@Inject
lateinit var activityTracker: ExecutionTracker

@Inject
lateinit var lastCallingPackageStore: LastCallingPackageStore

/**
* Flag for the navigation graph initialization state. The graph should only be initialized once
* during the existence of this activity, and the flag tracks graph's state.
Expand Down Expand Up @@ -59,19 +53,8 @@ internal class OrchestratorActivity : BaseActivity() {

if (activityTracker.isMain(activity = this)) {
if (!isGraphInitialized) {
val action = intent.action.orEmpty()
val extras = intent.extras ?: bundleOf()
Simber.setUserProperty("Intent_received", action)
Simber.setUserProperty("Caller", callingPackage.orEmpty())

// Some co-sync functionality depends on the exact package name of the caller app,
// e.g. to switch content providers of debug and release variants of the caller app
extras.putString(ClientApiConstants.CALLER_PACKAGE_NAME, callingPackage)
lastCallingPackageStore.lastCallingPackageName = callingPackage

findNavController(R.id.orchestrationHost).setGraph(
R.navigation.graph_orchestration,
OrchestratorFragmentArgs(action, extras).toBundle(),
)
isGraphInitialized = true
}
Expand Down
27 changes: 21 additions & 6 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 @@ -2,11 +2,11 @@ package com.simprints.feature.orchestrator

import android.os.Bundle
import android.view.View
import androidx.core.os.bundleOf
import androidx.fragment.app.Fragment
import androidx.fragment.app.viewModels
import androidx.lifecycle.lifecycleScope
import androidx.navigation.fragment.findNavController
import androidx.navigation.fragment.navArgs
import com.simprints.core.domain.response.AppErrorReason
import com.simprints.core.livedata.LiveDataEventObserver
import com.simprints.core.livedata.LiveDataEventWithContentObserver
Expand All @@ -16,6 +16,7 @@ import com.simprints.feature.alert.AlertResult
import com.simprints.feature.alert.toArgs
import com.simprints.feature.clientapi.ClientApiViewModel
import com.simprints.feature.clientapi.extensions.getResultCodeFromExtras
import com.simprints.feature.clientapi.models.ClientApiConstants
import com.simprints.feature.consent.ConsentContract
import com.simprints.feature.enrollast.EnrolLastBiometricContract
import com.simprints.feature.exitform.ExitFormContract
Expand All @@ -30,6 +31,7 @@ import com.simprints.feature.selectsubject.SelectSubjectContract
import com.simprints.feature.setup.SetupContract
import com.simprints.feature.validatepool.ValidateSubjectPoolContract
import com.simprints.fingerprint.capture.FingerprintCaptureContract
import com.simprints.infra.config.store.LastCallingPackageStore
import com.simprints.infra.logging.LoggingConstants.CrashReportTag.ORCHESTRATION
import com.simprints.infra.logging.Simber
import com.simprints.infra.orchestration.data.responses.AppConfirmationResponse
Expand Down Expand Up @@ -72,7 +74,10 @@ internal class OrchestratorFragment : Fragment(R.layout.fragment_orchestrator) {
@Inject
lateinit var orchestratorCache: OrchestratorCache

private val args by navArgs<OrchestratorFragmentArgs>()
@Inject
lateinit var lastCallingPackageStore: LastCallingPackageStore

private val intentAction get() = requireActivity().intent.action.orEmpty()

private val loginCheckVm by viewModels<LoginCheckViewModel>()
private val clientApiVm by viewModels<ClientApiViewModel>()
Expand Down Expand Up @@ -231,7 +236,7 @@ internal class OrchestratorFragment : Fragment(R.layout.fragment_orchestrator) {

if (response.request == null) {
clientApiVm.handleErrorResponse(
args.requestAction,
intentAction,
AppErrorResponse(AppErrorReason.UNEXPECTED_ERROR),
)
} else {
Expand All @@ -257,7 +262,7 @@ internal class OrchestratorFragment : Fragment(R.layout.fragment_orchestrator) {
}

is AppErrorResponse -> {
clientApiVm.handleErrorResponse(args.requestAction, response.response)
clientApiVm.handleErrorResponse(intentAction, response.response)
}
}
}
Expand All @@ -282,8 +287,18 @@ internal class OrchestratorFragment : Fragment(R.layout.fragment_orchestrator) {
Simber.i("Start processing action request", tag = ORCHESTRATION)
if (loginCheckVm.isDeviceSafe()) {
lifecycleScope.launch {
val actionRequest =
clientApiVm.handleIntent(args.requestAction, args.requestParams)
val extras = requireActivity().intent.extras ?: bundleOf()
val callingPackage = requireActivity().callingPackage

Simber.setUserProperty("Intent_received", intentAction)
Simber.setUserProperty("Caller", callingPackage.orEmpty())

// Some co-sync functionality depends on the exact package name of the caller app,
// e.g. to switch content providers of debug and release variants of the caller app
lastCallingPackageStore.lastCallingPackageName = callingPackage
extras.putString(ClientApiConstants.CALLER_PACKAGE_NAME, callingPackage)

val actionRequest = clientApiVm.handleIntent(intentAction, extras)
if (actionRequest != null) {
Simber.i("Action request parsed successfully", tag = ORCHESTRATION)
loginCheckVm.validateSignInAndProceed(actionRequest)
Expand Down
7 changes: 0 additions & 7 deletions feature/orchestrator/src/main/res/navigation/graph_orchestration.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,6 @@
android:name="com.simprints.feature.orchestrator.OrchestratorFragment"
android:label="ClientApiFragment"
tools:layout="@layout/fragment_orchestrator">

<argument
android:name="requestAction"
app:argType="string" />
<argument
android:name="requestParams"
app:argType="android.os.Bundle" />
</fragment>

<include app:graph="@navigation/graph_alert" />
Expand Down
Loading