Update project template in order to execute Runtime.run() method at the end of Application.onCreate() method

Mihail Slavchev · Mihail Slavchev · commit 85ffb0847d1c · 2016-06-27T15:48:12.000+03:00
diff --git a/build-artifacts/project-template-gradle/build-tools/android-static-binding-generator/staticbindinggenerator.jar b/build-artifacts/project-template-gradle/build-tools/android-static-binding-generator/staticbindinggenerator.jar
diff --git a/build-artifacts/project-template-gradle/src/main/java/com/tns/NativeScriptApplication.java b/build-artifacts/project-template-gradle/src/main/java/com/tns/NativeScriptApplication.java
@@ -12,7 +12,10 @@ public NativeScriptApplication() {
 
     public void onCreate() {
 		super.onCreate();
-		new RuntimeHelper(this).initRuntime();
+		com.tns.Runtime runtime = new RuntimeHelper(this).initRuntime();
+        if (runtime !=null) {
+            runtime.run();
+        }
     }
 
     public static Application getInstance() {
diff --git a/build-artifacts/project-template-gradle/src/main/java/com/tns/RuntimeHelper.java b/build-artifacts/project-template-gradle/src/main/java/com/tns/RuntimeHelper.java
@@ -38,14 +38,15 @@ public boolean hasErrorIntent() {
 		return hasErrorIntent;
 	}
 	
-	public void initRuntime()
+	public Runtime initRuntime()
 	{
 		if (Runtime.isInitialized()) {
-			return;
+			return Runtime.getCurrentRuntime();
 		}
 		
 		System.loadLibrary("NativeScript");
 
+		Runtime runtime = null;
 		Logger logger = new LogcatLogger(app);
 		Debugger debugger = AndroidJsDebugger.isDebuggableApp(this.app) ? new AndroidJsDebugger(app, logger) : null;
 
@@ -110,7 +111,7 @@ public void initRuntime()
 			ThreadScheduler workThreadScheduler = new WorkThreadScheduler(new Handler(Looper.getMainLooper()));
 			Configuration config = new Configuration(workThreadScheduler, logger, debugger, appName, null, rootDir,
 					appDir, classLoader, dexDir, dexThumb, v8Config);
-			Runtime runtime = new Runtime(config);
+			runtime = new Runtime(config);
 
 			exHandler.setRuntime(runtime);
 
@@ -146,8 +147,8 @@ public void initRuntime()
 			catch (Exception e) {
 				
 			}
-			runtime.run();
 		}
+		return runtime;
 	}
 
 	private final String logTag = "MyApp";
diff --git a/runtime/src/main/java/com/tns/Runtime.java b/runtime/src/main/java/com/tns/Runtime.java
@@ -122,7 +122,7 @@ public int getRuntimeId()
 		return this.runtimeId;
 	}
 	
-	private static Runtime getCurrentRuntime()
+	public static Runtime getCurrentRuntime()
 	{
 		Runtime runtime = currentRuntime.get();
 				
diff --git a/test-app/app/src/main/java/com/tns/NativeScriptApplication.java b/test-app/app/src/main/java/com/tns/NativeScriptApplication.java
@@ -12,7 +12,10 @@ public NativeScriptApplication() {
 
     public void onCreate() {
 		super.onCreate();
-		new RuntimeHelper(this).initRuntime();
+		com.tns.Runtime runtime = new RuntimeHelper(this).initRuntime();
+        if (runtime !=null) {
+            runtime.run();
+        }
     }
 
     public static Application getInstance() {
diff --git a/test-app/app/src/main/java/com/tns/RuntimeHelper.java b/test-app/app/src/main/java/com/tns/RuntimeHelper.java
@@ -38,17 +38,18 @@ public boolean hasErrorIntent() {
 		return hasErrorIntent;
 	}
 	
-	public void initRuntime()
+	public Runtime initRuntime()
 	{
 		if (Runtime.isInitialized()) {
-			return;
+			return Runtime.getCurrentRuntime();
 		}
 		
 		System.loadLibrary("NativeScript");
 
 		Logger logger = new LogcatLogger(app);
 		Debugger debugger = AndroidJsDebugger.isDebuggableApp(this.app) ? new AndroidJsDebugger(app, logger) : null;
 
+		Runtime runtime = null;
 		boolean showErrorIntent = hasErrorIntent();
 		if (!showErrorIntent) {
 			NativeScriptUncaughtExceptionHandler exHandler = new NativeScriptUncaughtExceptionHandler(logger, app);
@@ -110,7 +111,7 @@ public void initRuntime()
 			ThreadScheduler workThreadScheduler = new WorkThreadScheduler(new Handler(Looper.getMainLooper()));
 			Configuration config = new Configuration(workThreadScheduler, logger, debugger, appName, null, rootDir,
 					appDir, classLoader, dexDir, dexThumb, v8Config);
-			Runtime runtime = new Runtime(config);
+			runtime = new Runtime(config);
 
 			exHandler.setRuntime(runtime);
 
@@ -146,8 +147,8 @@ public void initRuntime()
 			catch (Exception e) {
 				
 			}
-			runtime.run();
 		}
+		return runtime;
 	}
 
 	private final String logTag = "MyApp";

Original file line number	Diff line number	Diff line change
`@@ -38,14 +38,15 @@ public boolean hasErrorIntent() {`
`38`	`38`	`return hasErrorIntent;`
`39`	`39`	`}`
`40`	`40`
`41`		`- public void initRuntime()`
	`41`	`+ public Runtime initRuntime()`
`42`	`42`	`{`
`43`	`43`	`if (Runtime.isInitialized()) {`
`44`		`- return;`
	`44`	`+ return Runtime.getCurrentRuntime();`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`System.loadLibrary("NativeScript");`
`48`	`48`
	`49`	`+ Runtime runtime = null;`
`49`	`50`	`Logger logger = new LogcatLogger(app);`
`50`	`51`	`Debugger debugger = AndroidJsDebugger.isDebuggableApp(this.app) ? new AndroidJsDebugger(app, logger) : null;`
`51`	`52`
`@@ -110,7 +111,7 @@ public void initRuntime()`
`110`	`111`	`ThreadScheduler workThreadScheduler = new WorkThreadScheduler(new Handler(Looper.getMainLooper()));`
`111`	`112`	`Configuration config = new Configuration(workThreadScheduler, logger, debugger, appName, null, rootDir,`
`112`	`113`	`appDir, classLoader, dexDir, dexThumb, v8Config);`
`113`		`- Runtime runtime = new Runtime(config);`
	`114`	`+ runtime = new Runtime(config);`
`114`	`115`
`115`	`116`	`exHandler.setRuntime(runtime);`
`116`	`117`
`@@ -146,8 +147,8 @@ public void initRuntime()`
`146`	`147`	`catch (Exception e) {`
`147`	`148`
`148`	`149`	`}`
`149`		`- runtime.run();`
`150`	`150`	`}`
	`151`	`+ return runtime;`
`151`	`152`	`}`
`152`	`153`
`153`	`154`	`private final String logTag = "MyApp";`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ public int getRuntimeId()`
`122`	`122`	`return this.runtimeId;`
`123`	`123`	`}`
`124`	`124`
`125`		`- private static Runtime getCurrentRuntime()`
	`125`	`+ public static Runtime getCurrentRuntime()`
`126`	`126`	`{`
`127`	`127`	`Runtime runtime = currentRuntime.get();`
`128`	`128`
Original file line number	Diff line number	Diff line change
`@@ -38,17 +38,18 @@ public boolean hasErrorIntent() {`
`38`	`38`	`return hasErrorIntent;`
`39`	`39`	`}`
`40`	`40`
`41`		`- public void initRuntime()`
	`41`	`+ public Runtime initRuntime()`
`42`	`42`	`{`
`43`	`43`	`if (Runtime.isInitialized()) {`
`44`		`- return;`
	`44`	`+ return Runtime.getCurrentRuntime();`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`System.loadLibrary("NativeScript");`
`48`	`48`
`49`	`49`	`Logger logger = new LogcatLogger(app);`
`50`	`50`	`Debugger debugger = AndroidJsDebugger.isDebuggableApp(this.app) ? new AndroidJsDebugger(app, logger) : null;`
`51`	`51`
	`52`	`+ Runtime runtime = null;`
`52`	`53`	`boolean showErrorIntent = hasErrorIntent();`
`53`	`54`	`if (!showErrorIntent) {`
`54`	`55`	`NativeScriptUncaughtExceptionHandler exHandler = new NativeScriptUncaughtExceptionHandler(logger, app);`
`@@ -110,7 +111,7 @@ public void initRuntime()`
`110`	`111`	`ThreadScheduler workThreadScheduler = new WorkThreadScheduler(new Handler(Looper.getMainLooper()));`
`111`	`112`	`Configuration config = new Configuration(workThreadScheduler, logger, debugger, appName, null, rootDir,`
`112`	`113`	`appDir, classLoader, dexDir, dexThumb, v8Config);`
`113`		`- Runtime runtime = new Runtime(config);`
	`114`	`+ runtime = new Runtime(config);`
`114`	`115`
`115`	`116`	`exHandler.setRuntime(runtime);`
`116`	`117`
`@@ -146,8 +147,8 @@ public void initRuntime()`
`146`	`147`	`catch (Exception e) {`
`147`	`148`
`148`	`149`	`}`
`149`		`- runtime.run();`
`150`	`150`	`}`
	`151`	`+ return runtime;`
`151`	`152`	`}`
`152`	`153`
`153`	`154`	`private final String logTag = "MyApp";`