do not show ErrorActivity when debugger is active (debugger client is connected) but send the exception details to the debuger client

Author: blagoev

src/jni/JsDebugger.cpp

@@ -82,7 +82,7 @@ void JsDebugger::DebugBreak()
 
 bool JsDebugger::IsDebuggerActive()
 {
-	return s_jsDebugger == nullptr && enabled;
+	return s_jsDebugger != nullptr && enabled;
 }
 
 void JsDebugger::ProcessDebugMessages()
@@ -210,6 +210,40 @@ void JsDebugger::ConsoleMessage(const v8::FunctionCallbackInfo<v8::Value>& args)
 	}
 }
 
+void JsDebugger::ConsoleMessage(const string& message, const string& level, const string& srcFileName, int lineNumber, int columnNumber)
+{
+	if (s_jsDebugger == nullptr || !enabled)
+	{
+		return;
+	}
+
+	try
+	{
+		JEnv env;
+		JniLocalRef jniText(env.NewStringUTF(message.c_str()));
+		JniLocalRef jniLevel(env.NewStringUTF(level.c_str()));
+		JniLocalRef jniSrcFileName(env.NewStringUTF(srcFileName.c_str()));
+
+		env.CallVoidMethod(s_jsDebugger, s_EnqueueConsoleMessage, (jstring) jniText, (jstring) jniLevel, lineNumber, columnNumber, (jstring) jniSrcFileName);
+	}
+	catch (NativeScriptException& e)
+	{
+		e.ReThrowToV8();
+	}
+	catch (std::exception e)
+	{
+		stringstream ss;
+		ss << "Error: c++ exception: " << e.what() << endl;
+		NativeScriptException nsEx(ss.str());
+		nsEx.ReThrowToV8();
+	}
+	catch (...)
+	{
+		NativeScriptException nsEx(std::string("Error: c++ exception!"));
+		nsEx.ReThrowToV8();
+	}
+}
+
 void JsDebugger::SendCommandToV8(uint16_t *cmd, int length)
 {
 	auto isolate = s_isolate;

src/jni/JsDebugger.h

@@ -31,6 +31,9 @@ namespace tns
 
 			static void ConsoleMessageCallback(const v8::FunctionCallbackInfo<v8::Value>& args);
 
+			static void ConsoleMessage(const std::string& message, const std::string& level = "log", const std::string& srcFileName = "",
+					const int lineNumber = 0, const int columnNumber = 0);
+
 		private:
 			JsDebugger();
 

src/jni/NativePlatform.cpp

@@ -263,12 +263,28 @@ void NativePlatform::PassUncaughtExceptionToJsNative(JNIEnv *env, jobject obj, j
 		}
 	}
 
+	string stackTraceText = ArgConverter::jstringToString(stackTrace);
+	errMsg += "\n" + stackTraceText;
+
 	//create a JS error object
 	errObj->Set(V8StringConstants::GetNativeException(), nativeExceptionObject);
 	errObj->Set(V8StringConstants::GetStackTrace(), ArgConverter::jstringToV8String(stackTrace));
 
-	//pass err to JS
-	NativeScriptException::CallJsFuncWithErr(errObj);
+
+	if (JsDebugger::IsDebuggerActive())
+	{
+		__android_log_print(ANDROID_LOG_DEBUG, "TNS.Native", "debuger active throwing exception with message %s", errMsg.c_str());
+
+		JsDebugger::ConsoleMessage(errMsg, "error");
+		//throwing unhandled error to debugger so catch all and catch unhandled exceptions setting on client can be triggered
+		DEBUG_WRITE_FORCE("throwing unhandled error to debugger");
+		NativeScriptException(errMsg).ReThrowToV8();
+	}
+	else
+	{
+		//pass err to JS
+		NativeScriptException::CallJsFuncWithErr(errObj);
+	}
 }
 
 void NativePlatform::AppInitCallback(const v8::FunctionCallbackInfo<v8::Value>& args)

src/src/com/tns/NativeScriptUncaughtExceptionHandler.java

@@ -22,23 +22,30 @@ public NativeScriptUncaughtExceptionHandler(Logger logger, Context context)
 	@Override
 	public void uncaughtException(Thread thread, Throwable ex)
 	{
+		String errorMessage = ErrorReport.getErrorMessage(ex);
+		
 		if (Platform.isInitialized())
 		{
 			try
 			{
 				ex.printStackTrace();
-				Platform.passUncaughtExceptionToJsNative(ex, ErrorReport.getErrorMessage(ex));
+				Platform.passUncaughtExceptionToJsNative(ex, errorMessage);
+				
+				if (JsDebugger.isJsDebugerActive())
+				{
+					return;
+				}
 			}
 			catch (Throwable t)
 			{
 				t.printStackTrace();
 			}
 		}
 
-		String errorMessage = ErrorReport.getErrorMessage(ex);
-
 		if (logger.isEnabled())
+		{
 			logger.write("Uncaught Exception Message=" + errorMessage);
+		}
 
 		if (!ErrorReport.startActivity(context, errorMessage) && defaultHandler != null)
 		{