From 4f0d6d36e361f2ddb9ece914fe18ce4b24fba989 Mon Sep 17 00:00:00 2001
From: Martin Yankov <m.i.yankov@gmail.com>
Date: Tue, 26 Mar 2019 12:35:43 +0200
Subject: [PATCH] refactor: guard ng and vue entry points (#7071)

---
 tns-core-modules/ui/frame/frame.android.ts | 64 ++++++++++++----------
 1 file changed, 34 insertions(+), 30 deletions(-)

diff --git a/tns-core-modules/ui/frame/frame.android.ts b/tns-core-modules/ui/frame/frame.android.ts
index f2a9ef38e..f3f2decbe 100644
--- a/tns-core-modules/ui/frame/frame.android.ts
+++ b/tns-core-modules/ui/frame/frame.android.ts
@@ -1171,46 +1171,50 @@ class ActivityCallbacksImplementation implements AndroidActivityCallbacks {
 
         if (!rootView) {
             const mainEntry = application.getMainEntry();
-            if (!mainEntry) {
-                throw new Error("Main entry is missing. App cannot be started. Verify app bootstrap.");
-            }
-
             const intent = activity.getIntent();
 
             if (fireLaunchEvent) {
+                // entry point for Angular and Vue frameworks
                 rootView = notifyLaunch(intent, savedInstanceState);
             }
 
-            if (shouldCreateRootFrame) {
-                const extras = intent.getExtras();
-                let frameId = -1;
-
-                // We have extras when we call - new Frame().navigate();
-                // savedInstanceState is used when activity is recreated.
-                // NOTE: On API 23+ we get extras on first run.
-                // Check changed - first try to get frameId from Extras if not from saveInstanceState.
-                if (extras) {
-                    frameId = extras.getInt(INTENT_EXTRA, -1);
+            if (!rootView) {
+                // entry point for NS Core
+                if (!mainEntry) {
+                    // Also handles scenarios with Angular and Vue where the notifyLaunch didn't return a root view.
+                    throw new Error("Main entry is missing. App cannot be started. Verify app bootstrap.");
                 }
 
-                if (savedInstanceState && frameId < 0) {
-                    frameId = savedInstanceState.getInt(INTENT_EXTRA, -1);
-                }
-
-                if (!rootView) {
-                    // If we have frameId from extras - we are starting a new activity from navigation (e.g. new Frame().navigate()))
-                    // Then we check if we have frameId from savedInstanceState - this happens when Activity is destroyed but app was not (e.g. suspend)
-                    rootView = getFrameByNumberId(frameId) || new Frame();
-                }
-
-                if (rootView instanceof Frame) {
-                    rootView.navigate(mainEntry);
+                if (shouldCreateRootFrame) {
+                    const extras = intent.getExtras();
+                    let frameId = -1;
+    
+                    // We have extras when we call - new Frame().navigate();
+                    // savedInstanceState is used when activity is recreated.
+                    // NOTE: On API 23+ we get extras on first run.
+                    // Check changed - first try to get frameId from Extras if not from saveInstanceState.
+                    if (extras) {
+                        frameId = extras.getInt(INTENT_EXTRA, -1);
+                    }
+    
+                    if (savedInstanceState && frameId < 0) {
+                        frameId = savedInstanceState.getInt(INTENT_EXTRA, -1);
+                    }
+    
+                    if (!rootView) {
+                        // If we have frameId from extras - we are starting a new activity from navigation (e.g. new Frame().navigate()))
+                        // Then we check if we have frameId from savedInstanceState - this happens when Activity is destroyed but app was not (e.g. suspend)
+                        rootView = getFrameByNumberId(frameId) || new Frame();
+                    }
+    
+                    if (rootView instanceof Frame) {
+                        rootView.navigate(mainEntry);
+                    } else {
+                        throw new Error("A Frame must be used to navigate to a Page.");
+                    }
                 } else {
-                    throw new Error("A Frame must be used to navigate to a Page.");
+                    rootView = createViewFromEntry(mainEntry);
                 }
-            } else {
-                // Create the root view if the notifyLaunch didn't return it
-                rootView = rootView || createViewFromEntry(mainEntry);
             }
 
             this._rootView = rootView;