Merge pull request #1999 from NativeScript/debug-started-flag

support debug started flag

Author: enchev

lib/services/android-debug-service.ts

@@ -134,12 +134,8 @@ class AndroidDebugService implements IDebugService {
 				this.attachDebugger(device.deviceInfo.identifier, packageName).wait();
 			} else if (this.$options.stop) {
 				this.detachDebugger(packageName).wait();
-			} else if (this.$options.debugBrk) {
-				this.startAppWithDebugger(packageFile, packageName).wait();
 			} else {
 				this.startAppWithDebugger(packageFile, packageName).wait();
-				//TODO: Find different way to make sure that the app is started.
-				sleep(500);
 				this.attachDebugger(device.deviceInfo.identifier, packageName).wait();
 			}
 		}).future<void>()();
@@ -202,39 +198,38 @@ class AndroidDebugService implements IDebugService {
 			// As we need to redirect output of a command on the device, keep using only one argument.
 			// We could rewrite this with two calls - touch and rm -f , but -f flag is not available on old Android, so rm call will fail when file does not exist.
 
+			this.device.applicationManager.stopApplication(packageName).wait();
+
 			if(this.$options.debugBrk) {
 				this.device.adb.executeShellCommand([`cat /dev/null > /data/local/tmp/${packageName}-debugbreak`]).wait();
 			}
+			this.device.adb.executeShellCommand([`cat /dev/null > /data/local/tmp/${packageName}-debugger-started`]).wait();
 
-			this.device.applicationManager.stopApplication(packageName).wait();
 			this.device.applicationManager.startApplication(packageName).wait();
 
-			if(this.$options.debugBrk) {
-				let waitText: string = `0 /data/local/tmp/${packageName}-debugbreak`;
-				let maxWait = 12;
-				let debugerStarted: boolean = false;
-				while (maxWait > 0 && !debugerStarted) {
-					let forwardsResult = this.device.adb.executeShellCommand(["ls", "-s", `/data/local/tmp/${packageName}-debugbreak`]).wait();
-					maxWait--;
-					debugerStarted = forwardsResult.indexOf(waitText) === -1;
-					if (!debugerStarted) {
-						sleep(500);
-					}
-				}
+			this.waitForDebugger(packageName);
 
-				if (debugerStarted) {
-					this.$logger.info("# NativeScript Debugger started #");
-				} else {
-					this.$logger.warn("# NativeScript Debugger did not start in time #");
-				}
+		}).future<void>()();
+	}
 
-				if (this.$options.client) {
-					let localDebugPort = this.getForwardedLocalDebugPortForPackageName(this.device.deviceInfo.identifier, packageName).wait();
-					this.startDebuggerClient(localDebugPort).wait();
-					this.openDebuggerClient(AndroidDebugService.DEFAULT_NODE_INSPECTOR_URL + "?port=" + localDebugPort);
-				}
+	private waitForDebugger(packageName: String) {
+		let waitText: string = `0 /data/local/tmp/${packageName}-debugger-started`;
+		let maxWait = 12;
+		let debugerStarted: boolean = false;
+		while (maxWait > 0 && !debugerStarted) {
+			let forwardsResult = this.device.adb.executeShellCommand(["ls", "-s", `/data/local/tmp/${packageName}-debugger-started`]).wait();
+			maxWait--;
+			debugerStarted = forwardsResult.indexOf(waitText) === -1;
+			if (!debugerStarted) {
+				sleep(500);
 			}
-		}).future<void>()();
+		}
+
+		if (debugerStarted) {
+			this.$logger.info("# NativeScript Debugger started #");
+		} else {
+			this.$logger.warn("# NativeScript Debugger did not start in time #");
+		}
 	}
 
 	private startDebuggerClient(port: Number): IFuture<void> {