Merge pull request #471 from NativeScript/atanasovg/build-template-polish

Make the default template work without the assumption that com.tns.NativeScriptApplication is extended through JS.

Author: atanasovg

build/project-template-gradle/src/main/java/com/tns/NativeScriptApplication.java

@@ -2,8 +2,7 @@
 
 import android.app.Application;
 
-@JavaScriptImplementation(javaScriptFile = "./tns_modules/application/application.js")
-public class NativeScriptApplication extends android.app.Application implements com.tns.NativeScriptHashCodeProvider {
+public class NativeScriptApplication extends android.app.Application {
 
     private static NativeScriptApplication thiz;
 
@@ -12,40 +11,8 @@ public NativeScriptApplication() {
     }
 
     public void onCreate() {
+		super.onCreate();
 		new RuntimeHelper(this).initRuntime();
-		if (Runtime.isInitialized()) {
-	        java.lang.Object[] params = null;
-	        com.tns.Runtime.callJSMethod(this, "onCreate", void.class, params);
-		} else {
-			super.onCreate();
-		}
-    }
-
-    public void onLowMemory() {
-    	if (Runtime.isInitialized()) {
-	        java.lang.Object[] params = null;
-	        com.tns.Runtime.callJSMethod(this, "onLowMemory", void.class, params);
-    	} else {
-    		super.onLowMemory();
-    	}
-    }
-
-    public void onTrimMemory(int level) {
-    	if (Runtime.isInitialized()) {
-	        java.lang.Object[] params = new Object[1];
-	        params[0] = level;
-	        com.tns.Runtime.callJSMethod(this, "onTrimMemory", void.class, params);
-    	} else {
-    		super.onTrimMemory(level);
-    	}
-    }
-
-    public boolean equals__super(java.lang.Object other) {
-        return super.equals(other);
-    }
-
-    public int hashCode__super() {
-        return super.hashCode();
     }
 
     public static Application getInstance() {

build/project-template-gradle/src/main/java/com/tns/RuntimeHelper.java

@@ -44,6 +44,10 @@ public boolean hasErrorIntent()
 
 	public void initRuntime()
 	{
+		if (Runtime.isInitialized()) {
+			return;
+		}
+		
 		System.loadLibrary("NativeScript");
 
 		Logger logger = new LogcatLogger(app);
@@ -117,7 +121,13 @@ public void initRuntime()
 
 			runtime.init();
 			runtime.runScript(new File(appDir, "internal/ts_helpers.js"));
-			Runtime.initInstance(this.app);
+			try {
+				// put this call in a try/catch block because with the latest changes in the modules it is not granted that NativeScriptApplication is extended through JavaScript.
+				Runtime.initInstance(this.app);
+			}
+			catch (Exception e) {
+				
+			}
 			runtime.run();
 		}
 	}