Merge pull request #446 from NativeScript/pete/move-debugger-implementation

Move debugger implementation

Author: petekanev

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

@@ -114,14 +114,14 @@ static Intent getIntent(Context context)
 	{
 		Class<?> errorActivityClass = ErrorReportActivity.class;
 
-		if (JsDebugger.isDebuggableApp(context))		
+		if (AndroidJsDebugger.isDebuggableApp(context))		
 		{		
 			errorActivityClass = ErrorReportActivity.class;
 		}
 		else {
 			return null;
 		}
-
+		
 		Intent intent = new Intent(context, errorActivityClass);
 
 		intent.putExtra(EXTRA_NATIVESCRIPT_ERROR_REPORT, EXTRA_ERROR_REPORT_VALUE);

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

@@ -6,7 +6,7 @@
 public final class LogcatLogger implements Logger
 {
 	private final static String DEFAULT_LOG_TAG = "TNS.Java";
-	
+
 	private boolean enabled;
 
 	public LogcatLogger(boolean isEnabled, Context context)
@@ -41,8 +41,7 @@ public final void write(String tag, String msg)
 
 	private void initLogging(Context context)
 	{
-		boolean isDebuggableApp = JsDebugger.isDebuggableApp(context);
-
+		boolean isDebuggableApp = AndroidJsDebugger.isDebuggableApp(context);
 		if (isDebuggableApp)
 		{
 			String verboseLoggingProp = Util.readSystemProperty("nativescript.verbose.logging");

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

@@ -46,7 +46,8 @@ public void initRuntime()
 	{
 		System.loadLibrary("NativeScript");
 
-		Logger logger = new LogcatLogger(false, app);
+		Logger logger = new LogcatLogger(true, app);
+		Debugger debugger = new AndroidJsDebugger(app, logger);
 
 		boolean showErrorIntent = hasErrorIntent();
 		if (!showErrorIntent)
@@ -89,7 +90,7 @@ public void initRuntime()
 				e.printStackTrace();
 			}
 			ThreadScheduler workThreadScheduler = new WorkThreadScheduler(new Handler(Looper.getMainLooper()));
-			Configuration config = new Configuration(this.app, workThreadScheduler, logger, appName, null, rootDir, appDir, classLoader, dexDir, dexThumb);
+			Configuration config = new Configuration(workThreadScheduler, logger, debugger, appName, null, rootDir, appDir, classLoader, dexDir, dexThumb);
 			Runtime runtime = new Runtime(config);
 
 			exHandler.setRuntime(runtime);
@@ -114,21 +115,29 @@ public void initRuntime()
 				}
 			}
 
-			
-
-			
 			runtime.init();
 			runtime.runScript(new File(appDir, "internal/ts_helpers.js"));
-
-			File javaClassesModule = new File(appDir, "app/tns-java-classes.js");
-			if (javaClassesModule.exists()) {
-				runtime.runModule(javaClassesModule);
-			}
-
 			Runtime.initInstance(this.app);
 			runtime.run();
 		}
 	}
 
+/*	public static boolean isDebuggableApp(Context context)
+	{
+		int flags;
+		try
+		{
+			flags = context.getPackageManager().getPackageInfo(context.getPackageName(), 0).applicationInfo.flags;
+		}
+		catch (NameNotFoundException e)
+		{
+			flags = 0;
+			e.printStackTrace();
+		}
+
+		boolean isDebuggableApp = ((flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0);
+		return isDebuggableApp;
+	}*/
+	
 	private final String logTag = "MyApp";
 }

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

@@ -12,4 +12,4 @@ APP_CFLAGS += -Wno-error=format-security
 APP_CFLAGS += -g
 
 #Turn on C++ exceptions
-APP_CPPFLAGS += -fexceptions
+APP_CPPFLAGS += -fexceptions

src/jni/Application.mk

@@ -6,9 +6,9 @@
 
 public class Configuration
 {
-	public final Application application;
 	public final ThreadScheduler threadScheduler;
 	public final Logger logger;
+	public final Debugger debugger;
 	public final String appName;
 	public final File runtimeLibPath;
 	public final File rootDir;
@@ -17,13 +17,13 @@ public class Configuration
 	public final File dexDir;
 	public final String dexThumb;
 
-	public Configuration(Application application, ThreadScheduler threadScheduler, Logger logger, 
+	public Configuration(ThreadScheduler threadScheduler, Logger logger,  Debugger debugger,
 			String appName, File runtimeLibPath, File rootDir, File appDir, ClassLoader classLoader,
 			File dexDir, String dexThumb)
 	{
-		this.application = application;
 		this.threadScheduler = threadScheduler;
 		this.logger = logger;
+		this.debugger = debugger;
 		this.appName = appName;
 		this.runtimeLibPath = runtimeLibPath;
 		this.rootDir = rootDir;

src/src/com/tns/Configuration.java

@@ -0,0 +1,12 @@
+package com.tns;
+
+public interface Debugger
+{
+	void start();
+	
+	void disableAgent();
+	
+	void enableAgent();
+	
+	void onConnect(JsDebugger context);
+}