From 47f4c25a69f2da49ac4c793f5687906a7b4a67eb Mon Sep 17 00:00:00 2001
From: Alexander Djenkov <a.djenkov90@gmail.com>
Date: Fri, 22 Nov 2019 11:18:37 +0200
Subject: [PATCH] fix(frame): push recreated frame back in frameStack when
 Don't Keep Activities enabled (#8096)

---
 nativescript-core/ui/frame/frame-common.ts  | 16 ++++++++--------
 nativescript-core/ui/frame/frame.android.ts |  7 +++++++
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/nativescript-core/ui/frame/frame-common.ts b/nativescript-core/ui/frame/frame-common.ts
index ad5c67b8a..37b8b12c4 100644
--- a/nativescript-core/ui/frame/frame-common.ts
+++ b/nativescript-core/ui/frame/frame-common.ts
@@ -70,12 +70,12 @@ export class FrameBase extends CustomLayoutView implements FrameDefinition {
         const top = FrameBase.topmost();
         if (top && top.canGoBack()) {
             top.goBack();
-    
+
             return true;
         } else if (top) {
             let parentFrameCanGoBack = false;
             let parentFrame = <FrameBase>getAncestor(top, "Frame");
-    
+
             while (parentFrame && !parentFrameCanGoBack) {
                 if (parentFrame && parentFrame.canGoBack()) {
                     parentFrameCanGoBack = true;
@@ -83,18 +83,18 @@ export class FrameBase extends CustomLayoutView implements FrameDefinition {
                     parentFrame = <FrameBase>getAncestor(parentFrame, "Frame");
                 }
             }
-    
+
             if (parentFrame && parentFrameCanGoBack) {
                 parentFrame.goBack();
-    
+
                 return true;
             }
         }
-    
+
         if (frameStack.length > 1) {
             top._popFromFrameStack();
         }
-    
+
         return false;
     }
 
@@ -216,11 +216,11 @@ export class FrameBase extends CustomLayoutView implements FrameDefinition {
             traceWrite(`NAVIGATE`, traceCategories.Navigation);
         }
 
+        this._pushInFrameStack();
+
         const entry = buildEntryFromArgs(param);
         const page = Builder.createViewFromEntry(entry) as Page;
 
-        this._pushInFrameStack();
-
         const backstackEntry: BackstackEntry = {
             entry: entry,
             resolvedPage: page,
diff --git a/nativescript-core/ui/frame/frame.android.ts b/nativescript-core/ui/frame/frame.android.ts
index 778c40597..8bad9a26b 100644
--- a/nativescript-core/ui/frame/frame.android.ts
+++ b/nativescript-core/ui/frame/frame.android.ts
@@ -483,6 +483,13 @@ export class Frame extends FrameBase {
     }
 
     public createNativeView() {
+        // Create native view with available _currentEntry occur in Don't Keep Activities 
+        // scenario when Activity is recreated on app suspend/resume. Push frame back in frame stack 
+        // since it was removed in disposeNativeView() method.
+        if (this._currentEntry) {
+            this._pushInFrameStack();
+        }
+
         return new org.nativescript.widgets.ContentLayout(this._context);
     }