sync test-app sources with project template sources

Author: blagoev

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

@@ -437,11 +437,12 @@ public void start()
 		Handler handler = new Handler(handlerThread.getLooper());
 
 		this.registerEnableDisableDebuggerReceiver(handler);
-		
+
+		AndroidJsDebugger.this.debugContext.enableAgent();
+
 		boolean shouldDebugBreak = getDebugBreakFlagAndClearIt();
 		if (shouldDebugBreak)
 		{
-			AndroidJsDebugger.this.debugContext.enableAgent();
 			AndroidJsDebugger.this.debugContext.debugBreak();
 		}
 	}

test-app/app/src/main/java/com/tns/AndroidJsDebugger.java

@@ -437,14 +437,12 @@ public void start()
 		Handler handler = new Handler(handlerThread.getLooper());
 
 		this.registerEnableDisableDebuggerReceiver(handler);
-		
-		boolean shouldDebugBreak = getDebugBreakFlagAndClearIt();
 
 		AndroidJsDebugger.this.debugContext.enableAgent();
 
+		boolean shouldDebugBreak = getDebugBreakFlagAndClearIt();
 		if (shouldDebugBreak)
 		{
-
 			AndroidJsDebugger.this.debugContext.debugBreak();
 		}
 	}

test-app/app/src/main/java/com/tns/NativeScriptApplication.java

@@ -2,52 +2,17 @@
 
 import android.app.Application;
 
-@JavaScriptImplementation(javaScriptFile = "./MyApp.js")
-public class NativeScriptApplication extends android.app.Application implements com.tns.NativeScriptHashCodeProvider {
+public class NativeScriptApplication extends android.app.Application {
 
     private static NativeScriptApplication thiz;
 
-    public NativeScriptApplication()
-    {
-    	//android.os.Debug.waitForDebugger();
+    public NativeScriptApplication() {
         thiz = this;
     }
 
     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() {

test-app/app/src/main/java/com/tns/RuntimeHelper.java

@@ -37,8 +37,13 @@ public boolean hasErrorIntent() {
 
 		return hasErrorIntent;
 	}
-
-	public void initRuntime() {
+	
+	public void initRuntime()
+	{
+		if (Runtime.isInitialized()) {
+			return;
+		}
+		
 		System.loadLibrary("NativeScript");
 
 		Logger logger = new LogcatLogger(app);
@@ -128,7 +133,19 @@ public void initRuntime() {
 
 			runtime.init();
 			runtime.runScript(new File(appDir, "internal/ts_helpers.js"));
-			Runtime.initInstance(this.app);
+
+			File javaClassesModule = new File(appDir, "app/tns-java-classes.js");
+			if (javaClassesModule.exists()) {
+				runtime.runModule(javaClassesModule);
+			}
+
+			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();
 		}
 	}