Merge branch '8_3_X' into TIMOB-27604_83X

tidev · Nov 15, 2019 · cbcf107 · cbcf107
2 parents 1fbea40 + f03e3c3
commit cbcf107
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/android/templates/build/App.java b/android/templates/build/App.java
@@ -32,16 +32,14 @@ public final class <%= classname %>Application extends TiApplication
 	@Override
 	public void onCreate()
 	{
+		appInfo = new <%= classname %>AppInfo(this);
 <% if (encryptJS) { %>
 		KrollAssetHelper.setAssetCrypt(new AssetCryptImpl());
 <% } %>
-
 		// Load cache as soon as possible.
 		KrollAssetCache.init(this);
 
 		super.onCreate();
-
-		appInfo = new <%= classname %>AppInfo(this);
 		postAppInfo();
 
 		V8Runtime runtime = new V8Runtime();

diff --git a/android/titanium/src/java/org/appcelerator/titanium/TiApplication.java b/android/titanium/src/java/org/appcelerator/titanium/TiApplication.java
@@ -820,7 +820,15 @@ public void softRestart()
 		runtime.initRuntime();
 
 		// manually re-launch app
-		runtime.doRunModuleBytes(KrollAssetHelper.readAssetBytes(appPath), appPath, rootActivity.getActivityProxy());
+		if (KrollAssetHelper.assetExists(appPath)) {
+			runtime.doRunModuleBytes(KrollAssetHelper.readAssetBytes(appPath), appPath,
+									 rootActivity.getActivityProxy());
+
+			// launch script does not exist, must be using snapshot
+			// execute startup method baked in snapshot
+		} else {
+			runtime.doRunModule("global._startSnapshot(global)", appPath, rootActivity.getActivityProxy());
+		}
 	}
 
 	@Override

diff --git a/android/titanium/src/java/org/appcelerator/titanium/TiLaunchActivity.java b/android/titanium/src/java/org/appcelerator/titanium/TiLaunchActivity.java
@@ -104,7 +104,7 @@ protected void loadScript()
 				// launch script does not exist, must be using snapshot
 				// execute startup method baked in snapshot
 			} else {
-				KrollRuntime.getInstance().runModule("global.startSnapshot(global)", fullUrl, activityProxy);
+				KrollRuntime.getInstance().runModule("global._startSnapshot(global)", fullUrl, activityProxy);
 			}
 		} finally {
 			Log.d(TAG, "Signal JS loaded", Log.DEBUG_MODE);

diff --git a/build/lib/android/startup.ejs b/build/lib/android/startup.ejs
@@ -1,4 +1,3 @@
-this.startSnapshot = function (global) {
-    delete global.startSnapshot;
+this._startSnapshot = function (global) {
 <%- script %>
 }