fix(android): clean exception message

Author: garymathews

Diff for: android/runtime/v8/src/native/V8Util.cpp

@@ -144,9 +144,12 @@ void V8Util::openJSErrorDialog(Isolate* isolate, TryCatch &tryCatch)
 	HandleScope scope(isolate);
 
 	Local<Context> context = isolate->GetCurrentContext();
-	Local<Message> message = tryCatch.Message();
 	Local<Value> exception = tryCatch.Exception();
 
+	// Re-create message from exception to obtain a clean stack.
+	// tryCatch.Message() can include internal methods where an exception was re-thrown.
+	Local<Message> message = Exception::CreateMessage(isolate, exception);
+
 	Local<Value> jsStack;
 	Local<Value> javaStack;
 
@@ -158,9 +161,6 @@ void V8Util::openJSErrorDialog(Isolate* isolate, TryCatch &tryCatch)
 	}
 
 	// Javascript stack trace not provided? Attempt to obtain current stack trace.
-	if (jsStack.IsEmpty() || jsStack->IsNullOrUndefined()) {
-		jsStack = tryCatch.StackTrace();
-	}
 	if (jsStack.IsEmpty() || jsStack->IsNullOrUndefined()) {
 		Local<StackTrace> frames = message->GetStackTrace();
 		if (frames.IsEmpty() || !frames->GetFrameCount()) {
@@ -173,6 +173,9 @@ void V8Util::openJSErrorDialog(Isolate* isolate, TryCatch &tryCatch)
 			}
 		}
 	}
+	if (jsStack.IsEmpty() || jsStack->IsNullOrUndefined()) {
+		jsStack = tryCatch.StackTrace();
+	}
 
 	jstring title = env->NewStringUTF("Runtime Error");
 	jstring errorMessage = TypeConverter::jsValueToJavaString(isolate, env, message->Get());