From ca3d9bdc13b86df2bbecb34e07141cea8fc9af7c Mon Sep 17 00:00:00 2001 From: Douglas Machado Date: Fri, 19 Aug 2022 22:59:47 -0300 Subject: [PATCH] fix(android): potential navigation crash (#9996) --- packages/core/ui/frame/fragment.transitions.android.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/core/ui/frame/fragment.transitions.android.ts b/packages/core/ui/frame/fragment.transitions.android.ts index 4679cecf5..40dcf5fcf 100644 --- a/packages/core/ui/frame/fragment.transitions.android.ts +++ b/packages/core/ui/frame/fragment.transitions.android.ts @@ -672,14 +672,19 @@ function transitionOrAnimationCompleted(entry: ExpandedEntry, backEntry: Backsta entries.delete(entry); if (entries.size === 0) { - const frame = entry.resolvedPage.frame; - // We have 0 or 1 entry per frameId in completedEntries // So there is no need to make it to Set like waitingQueue const previousCompletedAnimationEntry = completedEntries.get(frameId); completedEntries.delete(frameId); waitingQueue.delete(frameId); + if (!entry.resolvedPage) { + if (Trace.isEnabled()) { + Trace.write(`Transition completed - Entry ${entry} with unexpected null value for the resolvedPage property.`, Trace.categories.Transition, Trace.messageType.error); + } + return; + } + const frame = entry.resolvedPage.frame; const navigationContext = frame._executingContext || { navigationType: NavigationType.back, };