diff --git a/test-app/app/src/main/assets/app/package.json b/test-app/app/src/main/assets/app/package.json index 1073dc6cc..584bd374c 100644 --- a/test-app/app/src/main/assets/app/package.json +++ b/test-app/app/src/main/assets/app/package.json @@ -9,6 +9,6 @@ "markingMode": "full", "maxLogcatObjectSize": 1024, "forceLog": false, - "autoCatchJSMethodNativeCalls": false + "discardUncaughtJsExceptions": false } } \ No newline at end of file diff --git a/test-app/runtime/src/main/java/com/tns/AppConfig.java b/test-app/runtime/src/main/java/com/tns/AppConfig.java index d88a41163..ff0b73d11 100644 --- a/test-app/runtime/src/main/java/com/tns/AppConfig.java +++ b/test-app/runtime/src/main/java/com/tns/AppConfig.java @@ -20,7 +20,7 @@ protected enum KnownKeys { HandleTimeZoneChanges("handleTimeZoneChanges", false), MaxLogcatObjectSize("maxLogcatObjectSize", 1024), ForceLog("forceLog", false), - AutoCatchJSMethodNativeCalls("autoCatchJSMethodNativeCalls", false); + DiscardUncaughtJsExceptions("discardUncaughtJsExceptions", false); private final String name; private final Object defaultValue; @@ -113,8 +113,8 @@ public AppConfig(File appDir) { if (androidObject.has(KnownKeys.ForceLog.getName())) { values[KnownKeys.ForceLog.ordinal()] = androidObject.getBoolean(KnownKeys.ForceLog.getName()); } - if (androidObject.has(KnownKeys.AutoCatchJSMethodNativeCalls.getName())) { - values[KnownKeys.AutoCatchJSMethodNativeCalls.ordinal()] = androidObject.getBoolean(KnownKeys.AutoCatchJSMethodNativeCalls.getName()); + if (androidObject.has(KnownKeys.DiscardUncaughtJsExceptions.getName())) { + values[KnownKeys.DiscardUncaughtJsExceptions.ordinal()] = androidObject.getBoolean(KnownKeys.DiscardUncaughtJsExceptions.getName()); } } } @@ -167,7 +167,7 @@ public boolean getForceLog() { return (boolean)values[KnownKeys.ForceLog.ordinal()]; } - public boolean getAutoCatchJSMethodNativeCalls() { - return (boolean)values[KnownKeys.AutoCatchJSMethodNativeCalls.ordinal()]; + public boolean getDiscardUncaughtJsExceptions() { + return (boolean)values[KnownKeys.DiscardUncaughtJsExceptions.ordinal()]; } } diff --git a/test-app/runtime/src/main/java/com/tns/Runtime.java b/test-app/runtime/src/main/java/com/tns/Runtime.java index 58f593ee0..8aa004798 100644 --- a/test-app/runtime/src/main/java/com/tns/Runtime.java +++ b/test-app/runtime/src/main/java/com/tns/Runtime.java @@ -1096,14 +1096,14 @@ private Object dispatchCallJSMethodNative(final int javaObjectID, final String m boolean isWorkThread = threadScheduler.getThread().equals(Thread.currentThread()); final Object[] tmpArgs = extendConstructorArgs(methodName, isConstructor, args); - final boolean autoCatchJSMethodNativeCalls = this.config.appConfig.getAutoCatchJSMethodNativeCalls(); + final boolean discardUncaughtJsExceptions = this.config.appConfig.getDiscardUncaughtJsExceptions(); if (isWorkThread) { Object[] packagedArgs = packageArgs(tmpArgs); try { ret = callJSMethodNative(getRuntimeId(), javaObjectID, methodName, returnType, isConstructor, packagedArgs); } catch (NativeScriptException e) { - if(autoCatchJSMethodNativeCalls) { + if(discardUncaughtJsExceptions) { logger.write("Error on currentThread for callJSMethodNative:", e.getMessage()); e.printStackTrace(); } else { @@ -1123,7 +1123,7 @@ public void run() { final Object[] packagedArgs = packageArgs(tmpArgs); arr[0] = callJSMethodNative(getRuntimeId(), javaObjectID, methodName, returnType, isCtor, packagedArgs); } catch (NativeScriptException e) { - if(autoCatchJSMethodNativeCalls) { + if(discardUncaughtJsExceptions) { logger.write("Error off currentThread for callJSMethodNative:", e.getMessage()); e.printStackTrace(); } else {