Fix navigatedFrom event raised when Activity is destroyed without actual navigation. (NativeScript#2100)

Hristo Hristov · Hristo Hristov · commit d62f018a5541 · 2016-05-13T13:11:10.000+03:00
diff --git a/ui/frame/frame-common.ts b/ui/frame/frame-common.ts
@@ -205,6 +205,7 @@ export class Frame extends CustomLayoutView implements definition.Frame {
         var backstackEntry: definition.BackstackEntry = {
             entry: entry,
             resolvedPage: page,
+            isNavigation: true
         };
 
         var navigationContext: NavigationContext = {
diff --git a/ui/frame/frame.android.ts b/ui/frame/frame.android.ts
@@ -137,6 +137,11 @@ export class Frame extends frameCommon.Frame {
         let manager = activity.getFragmentManager();
         let isFirstNavigation = types.isNullOrUndefined(this._currentEntry);
 
+        backstackEntry.isNavigation = true;
+        if (this._currentEntry) {
+            this._currentEntry.isNavigation = true;
+        }
+
         // Clear history
         if (backstackEntry.entry.clearHistory) {
             let backStackEntryCount = manager.getBackStackEntryCount();
@@ -260,9 +265,11 @@ export class Frame extends frameCommon.Frame {
     public _goBackCore(backstackEntry: definition.BackstackEntry) {
         navDepth = backstackEntry[NAV_DEPTH];
 
+        backstackEntry.isNavigation = true;
         if (this._currentEntry) {
             // We need this information inside onFragmentHidden
             this._currentEntry[IS_BACK] = true;
+            this._currentEntry.isNavigation = true;
         }
 
         trace.write(`${this}._goBackCore(pageId: ${backstackEntry.resolvedPage.id}, backstackVisible: ${this._isEntryBackstackVisible(backstackEntry)}, clearHistory: ${backstackEntry.entry.clearHistory}), navDepth: ${navDepth}`, trace.categories.Navigation);
diff --git a/ui/frame/frame.d.ts b/ui/frame/frame.d.ts
@@ -209,7 +209,7 @@ declare module "ui/frame" {
          * - slideBottom
          */
         name?: string;
-        
+
         /**
          * An user-defined instance of the "ui/transition".Transition class.
          */
@@ -233,6 +233,10 @@ declare module "ui/frame" {
     export interface BackstackEntry {
         entry: NavigationEntry;
         resolvedPage: pages.Page;
+
+        //@private
+        isNavigation: boolean;
+        //@endprivate
     }
 
     /**
diff --git a/ui/transition/transition.android.ts b/ui/transition/transition.android.ts
@@ -289,6 +289,7 @@ function _completePageAddition(fragment: any, isBack: boolean) {
     frame._currentEntry = entry;
     page.onNavigatedTo(isBack);
     frame._processNavigationQueue(page);
+    entry.isNavigation = undefined;
     trace.write(`ADDITION of ${page} completed`, trace.categories.Transition);
 }
 
@@ -300,7 +301,10 @@ function _completePageRemoval(fragment: any, isBack: boolean) {
     var page: pageModule.Page = entry.resolvedPage;
     if (page.frame) {
         frame._removeView(page);
-        page.onNavigatedFrom(isBack);
+        // This could be undefined if activity is destroyed (e.g. without actual navigation).
+        if (entry.isNavigation) {
+            page.onNavigatedFrom(isBack);
+        }
         trace.write(`REMOVAL of ${page} completed`, trace.categories.Transition);
     }
     else {
@@ -317,6 +321,8 @@ function _completePageRemoval(fragment: any, isBack: boolean) {
             trace.write(`DETACHMENT of ${page} has already been done`, trace.categories.Transition);
         }
     }
+
+    entry.isNavigation = undefined;
 }
 
 function _addNativeTransitionListener(fragment: any, nativeTransition: any/*android.transition.Transition*/) {

Original file line number	Diff line number	Diff line change
`@@ -289,6 +289,7 @@ function _completePageAddition(fragment: any, isBack: boolean) {`
`289`	`289`	`frame._currentEntry = entry;`
`290`	`290`	`page.onNavigatedTo(isBack);`
`291`	`291`	`frame._processNavigationQueue(page);`
	`292`	`+ entry.isNavigation = undefined;`
`292`	`293`	trace.write(`ADDITION of ${page} completed`, trace.categories.Transition);
`293`	`294`	`}`
`294`	`295`
`@@ -300,7 +301,10 @@ function _completePageRemoval(fragment: any, isBack: boolean) {`
`300`	`301`	`var page: pageModule.Page = entry.resolvedPage;`
`301`	`302`	`if (page.frame) {`
`302`	`303`	`frame._removeView(page);`
`303`		`- page.onNavigatedFrom(isBack);`
	`304`	`+ // This could be undefined if activity is destroyed (e.g. without actual navigation).`
	`305`	`+ if (entry.isNavigation) {`
	`306`	`+ page.onNavigatedFrom(isBack);`
	`307`	`+ }`
`304`	`308`	trace.write(`REMOVAL of ${page} completed`, trace.categories.Transition);
`305`	`309`	`}`
`306`	`310`	`else {`
`@@ -317,6 +321,8 @@ function _completePageRemoval(fragment: any, isBack: boolean) {`
`317`	`321`	trace.write(`DETACHMENT of ${page} has already been done`, trace.categories.Transition);
`318`	`322`	`}`
`319`	`323`	`}`
	`324`	`+`
	`325`	`+ entry.isNavigation = undefined;`
`320`	`326`	`}`
`321`	`327`
`322`	`328`	`function _addNativeTransitionListener(fragment: any, nativeTransition: any/android.transition.Transition/) {`