Skip to content

Commit beab400

Browse files
authored
Merge pull request #1139 from NativeScript/trifonov/move-discard-exceptions-setting
move discardUncaughtJsExceptions to the root fo package.json
2 parents 2f65a66 + 68efa08 commit beab400

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

test-app/app/src/main/assets/app/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"freeMemoryRatio": 0.50,
99
"markingMode": "full",
1010
"maxLogcatObjectSize": 1024,
11-
"forceLog": false,
12-
"discardUncaughtJsExceptions": false
13-
}
11+
"forceLog": false
12+
},
13+
"discardUncaughtJsExceptions": false
1414
}

test-app/runtime/src/main/java/com/tns/AppConfig.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ public AppConfig(File appDir) {
5858
String profiling = rootObject.getString(KnownKeys.Profiling.getName());
5959
values[KnownKeys.Profiling.ordinal()] = profiling;
6060
}
61+
if (rootObject.has(KnownKeys.DiscardUncaughtJsExceptions.getName())) {
62+
values[KnownKeys.DiscardUncaughtJsExceptions.ordinal()] = rootObject.getBoolean(KnownKeys.DiscardUncaughtJsExceptions.getName());
63+
}
6164
if (rootObject.has(AndroidKey)) {
6265
JSONObject androidObject = rootObject.getJSONObject(AndroidKey);
6366
if (androidObject.has(KnownKeys.V8FlagsKey.getName())) {
@@ -113,9 +116,6 @@ public AppConfig(File appDir) {
113116
if (androidObject.has(KnownKeys.ForceLog.getName())) {
114117
values[KnownKeys.ForceLog.ordinal()] = androidObject.getBoolean(KnownKeys.ForceLog.getName());
115118
}
116-
if (androidObject.has(KnownKeys.DiscardUncaughtJsExceptions.getName())) {
117-
values[KnownKeys.DiscardUncaughtJsExceptions.ordinal()] = androidObject.getBoolean(KnownKeys.DiscardUncaughtJsExceptions.getName());
118-
}
119119
}
120120
}
121121
} catch (Exception e) {

0 commit comments

Comments
 (0)