Merge branch 'release' into trifonov/v8-lock

vtrifonov · vtrifonov · commit 3991c31fc207 · 2018-07-31T10:38:43.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 ==
 
 ## What's New
+- [Upgrade v8 to 6.7.288.46(#1130)](https://github.com/NativeScript/android-runtime/issues/1130)
 - [Static binding generator now uses bundled npm packages(#1096)](https://github.com/NativeScript/android-runtime/issues/1096)
 - [Add gradle dependencies versions in package.json(#1102)](https://github.com/NativeScript/android-runtime/issues/1102)
 - [Introduce a setting for auto catching exceptions when calling JS method native(#1119)](https://github.com/NativeScript/android-runtime/issues/1119)
diff --git 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
 	}
 }
diff --git a/test-app/app/src/main/java/com/tns/RuntimeHelper.java b/test-app/app/src/main/java/com/tns/RuntimeHelper.java
@@ -192,7 +192,7 @@ public static Runtime initRuntime(Application app) {
 
                     // if app is in debuggable mode run livesync service
                     // runtime needs to be initialized before the NativeScriptSyncService is enabled because it uses runtime.runScript(...)
-                    initLiveSync(runtime, logger, app);
+                    // initLiveSync(runtime, logger, app);
                 }
 
                 runtime.runScript(new File(appDir, "internal/ts_helpers.js"));
@@ -262,6 +262,15 @@ public void onReceive(Context context, Intent intent) {
         context.registerReceiver(timezoneReceiver, timezoneFilter);
     }
 
+    public static void initLiveSync(Application app) {
+        Runtime currentRuntime = Runtime.getCurrentRuntime();
+        if (!currentRuntime.getIsLiveSyncStarted()) {
+            initLiveSync(currentRuntime, currentRuntime.getLogger(), app);
+            currentRuntime.setIsLiveSyncStarted(true);
+        }
+
+    }
+
     public static void initLiveSync(Runtime runtime, Logger logger, Application app){
         boolean isDebuggable = Util.isDebuggableApp(app);
 
diff --git a/test-app/build-tools/static-binding-generator/src/main/java/org/nativescript/staticbindinggenerator/Generator.java b/test-app/build-tools/static-binding-generator/src/main/java/org/nativescript/staticbindinggenerator/Generator.java
@@ -342,6 +342,8 @@ private void writeBinding(Writer w, DataRow dataRow, JavaClass clazz, String pac
         w.writeln();
 
         boolean isApplicationClass = isApplicationClass(clazz, classes);
+        boolean isActivityClass = isActivityClass(clazz, classes);
+
         if (isApplicationClass && !packageName.equals("com.tns")) {
             w.writeln("import com.tns.RuntimeHelper;");
             w.writeln("import com.tns.Runtime;");
@@ -435,7 +437,7 @@ private void writeBinding(Writer w, DataRow dataRow, JavaClass clazz, String pac
             }
             for (Method m : ifaceMethods) {
                 if (!notImplementedObjectMethods.contains(m)) {
-                    writeMethodBody(m, w, isApplicationClass, true);
+                    writeMethodBody(m, w, isApplicationClass, isActivityClass, true);
                 }
             }
         } else {
@@ -449,7 +451,7 @@ private void writeBinding(Writer w, DataRow dataRow, JavaClass clazz, String pac
                         if (interfaceMethods.contains(m)) {
                             isInterfaceMethod = true;
                         }
-                        writeMethodBody(m, w, isApplicationClass, isInterfaceMethod);
+                        writeMethodBody(m, w, isApplicationClass, isActivityClass, isInterfaceMethod);
                     }
                 }
             }
@@ -479,7 +481,7 @@ private boolean isClassApplication(JavaClass clazz) {
                className.equals("android.test.mock.MockApplication");
     }
 
-    private void writeMethodBody(Method m, Writer w, boolean isApplicationClass, boolean isInterfaceMethod) {
+    private void writeMethodBody(Method m, Writer w, boolean isApplicationClass, boolean isActivityClass, boolean isInterfaceMethod) {
         String visibility = m.isPublic() ? "public" : "protected";
         w.write("\t");
         w.write(visibility);
@@ -491,7 +493,7 @@ private void writeMethodBody(Method m, Writer w, boolean isApplicationClass, boo
         w.write(" ");
         writeThrowsClause(m, w);
         w.writeln(" {");
-        writeMethodBody(m, false, isApplicationClass, w, isInterfaceMethod);
+        writeMethodBody(m, false, isApplicationClass, isActivityClass, w, isInterfaceMethod);
         w.writeln("\t}");
         w.writeln();
     }
@@ -570,7 +572,7 @@ private void writeConstructors(JavaClass clazz, String classname, boolean hasIni
                         w.writeln("\t\tcom.tns.Runtime.initInstance(this);");
                     }
                     if (hasInitMethod) {
-                        writeMethodBody(c, true, false, w, false);
+                        writeMethodBody(c, true, false, false, w, false);
                     }
                     if (isClassApplication(clazz)) {
                         //get instance method
@@ -584,7 +586,7 @@ private void writeConstructors(JavaClass clazz, String classname, boolean hasIni
         }
     }
 
-    private void writeMethodBody(Method m, boolean isConstructor, boolean isApplicationClass, Writer w, boolean isInterfaceMethod) {
+    private void writeMethodBody(Method m, boolean isConstructor, boolean isApplicationClass, boolean isActivityClass, Writer w, boolean isInterfaceMethod) {
         if (m.getName().equals("onCreate") && isApplicationClass) {
             w.writeln("\t\tcom.tns.Runtime runtime = RuntimeHelper.initRuntime(this);");
         }
@@ -651,6 +653,11 @@ private void writeMethodBody(Method m, boolean isConstructor, boolean isApplicat
             w.writeln("\t\t\truntime.run();");
             w.writeln("\t\t}");
         }
+
+        // call liveSync initialization
+        if (m.getName().equals("onCreate") && isActivityClass) {
+            w.writeln("\t\tcom.tns.RuntimeHelper.initLiveSync(this.getApplication());");
+        }
     }
 
     private void writeType(Type t, Writer w) {
@@ -715,6 +722,31 @@ private boolean isApplicationClass(JavaClass clazz, Map<String, JavaClass> class
         return isApplicationClass;
     }
 
+    private boolean isActivityClass(JavaClass clazz, Map<String, JavaClass> classes) throws ClassNotFoundException {
+        boolean isActivityClass = false;
+
+        String activityClassname = "android.app.Activity";
+
+        JavaClass currentClass = clazz;
+        while (true) {
+            String currentClassname = currentClass.getClassName();
+
+            isActivityClass = currentClassname.equals(activityClassname);
+            if (isActivityClass) {
+                break;
+            }
+
+            if (currentClassname.endsWith("java.lang.Object")) {
+                break;
+            }
+
+            String superClassName = currentClass.getSuperclassName();
+            currentClass = getClass(superClassName);
+        }
+
+        return isActivityClass;
+    }
+
     private JavaClass getClass(String className) throws ClassNotFoundException {
         JavaClass clazz = classes.get(className.replace('$', '.'));
 
diff --git 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
@@ -106,6 +106,14 @@ void passUncaughtExceptionToJs(Throwable ex, String stackTrace) {
 
     private Logger logger;
 
+    private boolean isLiveSyncStarted;
+    public boolean getIsLiveSyncStarted() { return this.isLiveSyncStarted; }
+    public void setIsLiveSyncStarted(boolean value) { this.isLiveSyncStarted = value; }
+
+    public Logger getLogger() {
+        return this.logger;
+    }
+
     private ThreadScheduler threadScheduler;
 
     private DexFactory dexFactory;
@@ -1098,14 +1106,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 {
@@ -1125,7 +1133,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 {

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,6 @@`
`9`	`9`	`"markingMode": "full",`
`10`	`10`	`"maxLogcatObjectSize": 1024,`
`11`	`11`	`"forceLog": false,`
`12`		`- "autoCatchJSMethodNativeCalls": false`
	`12`	`+ "discardUncaughtJsExceptions": false`
`13`	`13`	`}`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ protected enum KnownKeys {`
`20`	`20`	`HandleTimeZoneChanges("handleTimeZoneChanges", false),`
`21`	`21`	`MaxLogcatObjectSize("maxLogcatObjectSize", 1024),`
`22`	`22`	`ForceLog("forceLog", false),`
`23`		`- AutoCatchJSMethodNativeCalls("autoCatchJSMethodNativeCalls", false);`
	`23`	`+ DiscardUncaughtJsExceptions("discardUncaughtJsExceptions", false);`
`24`	`24`
`25`	`25`	`private final String name;`
`26`	`26`	`private final Object defaultValue;`
`@@ -113,8 +113,8 @@ public AppConfig(File appDir) {`
`113`	`113`	`if (androidObject.has(KnownKeys.ForceLog.getName())) {`
`114`	`114`	`values[KnownKeys.ForceLog.ordinal()] = androidObject.getBoolean(KnownKeys.ForceLog.getName());`
`115`	`115`	`}`
`116`		`- if (androidObject.has(KnownKeys.AutoCatchJSMethodNativeCalls.getName())) {`
`117`		`- values[KnownKeys.AutoCatchJSMethodNativeCalls.ordinal()] = androidObject.getBoolean(KnownKeys.AutoCatchJSMethodNativeCalls.getName());`
	`116`	`+ if (androidObject.has(KnownKeys.DiscardUncaughtJsExceptions.getName())) {`
	`117`	`+ values[KnownKeys.DiscardUncaughtJsExceptions.ordinal()] = androidObject.getBoolean(KnownKeys.DiscardUncaughtJsExceptions.getName());`
`118`	`118`	`}`
`119`	`119`	`}`
`120`	`120`	`}`
`@@ -167,7 +167,7 @@ public boolean getForceLog() {`
`167`	`167`	`return (boolean)values[KnownKeys.ForceLog.ordinal()];`
`168`	`168`	`}`
`169`	`169`
`170`		`- public boolean getAutoCatchJSMethodNativeCalls() {`
`171`		`- return (boolean)values[KnownKeys.AutoCatchJSMethodNativeCalls.ordinal()];`
	`170`	`+ public boolean getDiscardUncaughtJsExceptions() {`
	`171`	`+ return (boolean)values[KnownKeys.DiscardUncaughtJsExceptions.ordinal()];`
`172`	`172`	`}`
`173`	`173`	`}`