Skip to content

fix(sample): Apply Nav3 sample options when a child Activity is restored #6485

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
0xadam-brown wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(sample): Apply Nav3 sample options when a child Activity is restored #6485

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
7 changes: 7 additions & 0 deletions ...ples-android/src/main/java/io/sentry/samples/android/navigation/nav3/Nav3MultiActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ import io.sentry.compose.navigation3.SentryNavEffect
import io.sentry.compose.navigation3.SentryNavOptions
import io.sentry.samples.android.navigation.common.NavigationSampleConfig
import io.sentry.samples.android.navigation.common.RouteWorkOption
import io.sentry.samples.android.navigation.common.applyToCurrentOptions
import io.sentry.samples.android.navigation.common.hasOnlyActivityUiLoadTransactions
import io.sentry.samples.android.navigation.common.showRouteWorkDialog
import kotlinx.coroutines.delay
Expand Down Expand Up @@ -88,6 +89,9 @@ class Nav3ProductsActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
val configuration = (intent.extras ?: Bundle()).nav3SampleConfiguration()
// Nav3Activity applies these options when the sample launches, but the system can restore
// this Activity in a new process without Nav3Activity, so apply them here as well.
configuration.applyToCurrentOptions()
NavigationTransactionHistory.install()
applyActivityUiLoadTransactionSetting(this, configuration.enableActivityUiLoadTransaction)
setContent {
Expand Down Expand Up @@ -166,6 +170,9 @@ open class Nav3CheckoutActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
val configuration = (intent.extras ?: Bundle()).nav3SampleConfiguration()
// Nav3Activity applies these options when the sample launches, but the system can restore
// this Activity in a new process without Nav3Activity, so apply them here as well.
configuration.applyToCurrentOptions()
val productId = intent.getStringExtra(EXTRA_PRODUCT_ID) ?: "42"
val returnsResult = intent.getBooleanExtra(EXTRA_RETURN_RESULT, false)
// Only crash on the first launch, not when the system restores this Activity.
Expand Down
4 changes: 4 additions & 0 deletions ...ples-android/src/main/java/io/sentry/samples/android/navigation/nav3/Nav3MultiFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ import androidx.viewpager2.adapter.FragmentStateAdapter
import androidx.viewpager2.widget.ViewPager2
import io.sentry.samples.android.R
import io.sentry.samples.android.navigation.common.NavigationSampleConfig
import io.sentry.samples.android.navigation.common.applyToCurrentOptions

/**
* Hosts Fragments that each own a Nav3 root (back stack, `SentryNavEffect`, and `NavDisplay`), to
Expand Down Expand Up @@ -75,6 +76,9 @@ class Nav3FragmentsActivity : FragmentActivity() {

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
// Nav3Activity applies these options when the sample launches, but the system can restore
// this Activity in a new process without Nav3Activity, so apply them here as well.
configuration.applyToCurrentOptions()
NavigationTransactionHistory.install()
applyActivityUiLoadTransactionSetting(this, configuration.enableActivityUiLoadTransaction)

Expand Down
Loading