Skip to content

Commit a80d21b

Browse files
committed
fix(samples): Harden Nav3 state restoration
Fall back to the single-stack route when saved route arguments are missing and remove unused extractor-count bookkeeping from performance measurements.\n\nCo-Authored-By: Codex <noreply@openai.com>
1 parent 886fc79 commit a80d21b

3 files changed

Lines changed: 14 additions & 15 deletions

File tree

‎sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/navigation/nav3/Nav3Activity.kt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -296,8 +296,6 @@ private fun Nav3SampleApp(
296296
controller = customTransactionController,
297297
)
298298

299-
val nameExtractorCallsBefore = performanceState.nameExtractorCalls
300-
val argumentsExtractorCallsBefore = performanceState.argumentsExtractorCalls
301299
val extractorNanosBefore =
302300
performanceState.nameExtractorNanos + performanceState.argumentsExtractorNanos
303301
val startedAtNanos = System.nanoTime()
@@ -311,8 +309,6 @@ private fun Nav3SampleApp(
311309
if (isPerformanceScenario) {
312310
performanceState.recordSentryNavEffect(
313311
durationNanos = System.nanoTime() - startedAtNanos,
314-
nameExtractorCallsBefore = nameExtractorCallsBefore,
315-
argumentsExtractorCallsBefore = argumentsExtractorCallsBefore,
316312
extractorNanosBefore = extractorNanosBefore,
317313
processedCall = true,
318314
resolvedEntryCount =

‎sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/navigation/nav3/Nav3PerformanceControls.kt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,6 @@ internal class Nav3PerformanceState(
240240

241241
fun recordSentryNavEffect(
242242
durationNanos: Long,
243-
nameExtractorCallsBefore: Int,
244-
argumentsExtractorCallsBefore: Int,
245243
extractorNanosBefore: Long,
246244
processedCall: Boolean,
247245
resolvedEntryCount: Int,
@@ -254,8 +252,6 @@ internal class Nav3PerformanceState(
254252
return
255253
}
256254

257-
val nameExtractorCallCount = nameExtractorCalls - nameExtractorCallsBefore
258-
val argumentsExtractorCallCount = argumentsExtractorCalls - argumentsExtractorCallsBefore
259255
sentryNavEffectAttempts++
260256
val shouldCountAsProcessed = processedCall && pendingProcessedNavigationWork
261257
if (shouldCountAsProcessed) {

‎sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/navigation/nav3/Nav3Routes.kt‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -110,16 +110,23 @@ private fun Bundle.toNav3Route(): Nav3Route {
110110
"custom" -> Nav3Route.Custom
111111
"deep_link" -> Nav3Route.DeepLink
112112
"product_list" -> Nav3Route.ProductList
113-
"product_detail" ->
113+
"product_detail" -> {
114+
val productId = getString("product_id") ?: return Nav3Route.SingleStack
115+
val source = getString("source") ?: return Nav3Route.SingleStack
114116
Nav3Route.ProductDetail(
115-
productId = requireNotNull(getString("product_id")),
116-
source = requireNotNull(getString("source")),
117+
productId = productId,
118+
source = source,
117119
campaign = getString("campaign"),
118120
)
119-
"checkout" -> Nav3Route.Checkout(productId = requireNotNull(getString("product_id")))
120-
"confirmation" -> Nav3Route.Confirmation(orderId = requireNotNull(getString("order_id")))
121-
"promo_dialog" -> Nav3Route.PromoDialog(promoId = requireNotNull(getString("promo_id")))
122-
"share_sheet" -> Nav3Route.ShareSheet(productId = requireNotNull(getString("product_id")))
121+
}
122+
"checkout" ->
123+
Nav3Route.Checkout(productId = getString("product_id") ?: return Nav3Route.SingleStack)
124+
"confirmation" ->
125+
Nav3Route.Confirmation(orderId = getString("order_id") ?: return Nav3Route.SingleStack)
126+
"promo_dialog" ->
127+
Nav3Route.PromoDialog(promoId = getString("promo_id") ?: return Nav3Route.SingleStack)
128+
"share_sheet" ->
129+
Nav3Route.ShareSheet(productId = getString("product_id") ?: return Nav3Route.SingleStack)
123130
"multipane" -> Nav3Route.Multipane
124131
"multistack" -> Nav3Route.Multistack
125132
"performance" ->

0 commit comments

Comments
 (0)