Merge branch 'master' into release

Author: blagoev

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Android Runtime Changelog
 
+## 1.1.0 (2015, June 10)
+
+### New
+
+* Implemented [#58](https://github.com/NativeScript/android-runtime/issues/60) to remove the 3-seconds initial timeout for Debug builds.
+* Implemented [#118](https://github.com/NativeScript/android-runtime/issues/118) to replace the MultiDex library with DexClassLoader.
+* Started [#103](https://github.com/NativeScript/android-runtime/issues/103) AOT proxy generation to improve startup time and to enable new scenarios like BroadcastReceivers, BackgroundServices and arbitrary Activity types declared in the manifest.
+
+### Fixed
+
+* [#63](https://github.com/NativeScript/android-runtime/issues/63). An issue which prevented users to extend overloaded methods.
+* [#64](https://github.com/NativeScript/android-runtime/issues/64). A JNI Crash when calling JS method with char.
+* [#113](https://github.com/NativeScript/android-runtime/issues/113). Fixes the extend routine for an Activity.
+* [#114](https://github.com/NativeScript/android-runtime/issues/114). Removes the redundant setNativeScriptOverrides method.
+
 ## 1.0.0 (2015, April 29)
 
 ### New

binding-generator/Generator/src/org/ow2/asmdex/instruction/Instruction.java

@@ -31,9 +31,6 @@
 
 package org.ow2.asmdex.instruction;
 
-import java.util.LinkedList;
-import java.util.Queue;
-
 import org.ow2.asmdex.lowLevelUtils.ByteVector;
 import org.ow2.asmdex.structureWriter.ConstantPool;
 

binding-generator/Generator/src/org/ow2/asmdex/lowLevelUtils/InstructionEncoder.java

@@ -31,8 +31,6 @@
 
 package org.ow2.asmdex.lowLevelUtils;
 
-import java.util.Queue;
-
 import org.ow2.asmdex.Opcodes;
 import org.ow2.asmdex.instruction.DebugInstruction;
 import org.ow2.asmdex.instruction.DebugInstructionStartLocal;

build/project-template/libs/widgets.jar

@@ -194,7 +194,7 @@ module.exports = function(grunt) {
                 cmd: "npm install " + localCfg.metadataGenPath
             },
             runMetadataGenerator: {
-                cmd: "./node_modules/.bin/generate-metadata " + localCfg.libsDir + " ./dist/framework/assets/metadata"
+                cmd: pathModule.normalize("./node_modules/.bin/generate-metadata") + " " + localCfg.libsDir + " ./dist/framework/assets/metadata"
             },
 			runTests: {
 				cmd: "npm install && grunt --verbose",

gruntfile.js

@@ -79,6 +79,10 @@ module.exports = function(grunt) {
                         return updatedContent;
                     }
                 }
+            },
+            jarJavaRuntimeToDist: {
+                src: "./bin/NativeScriptRuntime.jar",
+                dest: "./dist/libs/nativescript.jar"
             }
         },
         replace: {
@@ -130,9 +134,6 @@ module.exports = function(grunt) {
                 //cmd: "jar cfm ../../" + "/dist/libs/nativescript.jar ../../manifest.mf com",
                 cmd: "jar umf ./manifest.mf ./bin/NativeScriptRuntime.jar"
                 //,cwd: pathModule.join(localCfg.rootDir, "/bin/classes")
-            },
-            jarJavaRuntimeCopyToDist: {
-                cmd: "cp ./bin/NativeScriptRuntime.jar ./dist/libs/nativescript.jar"
             }
         }
     });
@@ -156,7 +157,7 @@ module.exports = function(grunt) {
                             "exec:ensureOriginalManifestFile",
                             "copy:updateManifestFile",
                             "exec:jarJavaRuntime",
-                            "exec:jarJavaRuntimeCopyToDist",
+                            "copy:jarJavaRuntimeToDist",
                             "exec:ensureOriginalManifestFile"
                         ]);
 

src/gruntfile.js

@@ -72,7 +72,7 @@ LOCAL_SRC_FILES := com_tns_Platform.cpp com_tns_JsDebugger.cpp com_tns_AssetExtr
 					FieldAccessor.cpp ArrayElementAccessor.cpp \
 					ExceptionUtil.cpp Util.cpp Logger.cpp Profiler.cpp \
 					ObjectManager.cpp NumericCasts.cpp WeakRef.cpp \
-					MetadataMethodInfo.cpp SimpleProfiler.cpp
+					MetadataMethodInfo.cpp SimpleProfiler.cpp JType.cpp File.cpp Require.cpp
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
 LOCAL_LDLIBS    := -llog -landroid -lz
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)

src/jni/Android.mk

@@ -5,6 +5,7 @@
 #include "V8GlobalHelpers.h"
 #include "V8StringConstants.h"
 #include "NativeScriptAssert.h"
+#include "JType.h"
 #include <assert.h>
 #include <sstream>
 #include <cstdlib>
@@ -27,58 +28,6 @@ void ArgConverter::Init(JavaVM *jvm)
 
 	auto nanObject = Number::New(isolate, numeric_limits<double>::quiet_NaN()).As<NumberObject>();
 	NAN_NUMBER_OBJECT = new Persistent<NumberObject>(isolate, nanObject);
-
-	JEnv env;
-
-	STRING_CLASS = env.FindClass("java/lang/String");
-	assert(STRING_CLASS != nullptr);
-
-	GET_BYTES_METHOD_ID = env.GetMethodID(STRING_CLASS, "getBytes", "(Ljava/lang/String;)[B");
-	assert(GET_BYTES_METHOD_ID != nullptr);
-
-	JniLocalRef encoding(env.NewStringUTF("UTF-8"));
-	UTF_8_ENCODING = (jstring)env.NewGlobalRef(encoding);
-	assert(UTF_8_ENCODING != nullptr);
-
-	auto charClass = env.FindClass("java/lang/Character");
-	assert(charClass != nullptr);
-	CHAR_VALUE_METHOD_ID = env.GetMethodID(charClass, "charValue", "()C");
-	assert(CHAR_VALUE_METHOD_ID != nullptr);
-
-	auto booleanClass = env.FindClass("java/lang/Boolean");
-	assert(booleanClass != nullptr);
-	BOOLEAN_VALUE_METHOD_ID = env.GetMethodID(booleanClass, "booleanValue", "()Z");
-	assert(BOOLEAN_VALUE_METHOD_ID != nullptr);
-
-	auto byteClass = env.FindClass("java/lang/Byte");
-	assert(byteClass != nullptr);
-	BYTE_VALUE_METHOD_ID = env.GetMethodID(byteClass, "byteValue", "()B");
-	assert(BYTE_VALUE_METHOD_ID != nullptr);
-
-	auto shortClass = env.FindClass("java/lang/Short");
-	assert(shortClass != nullptr);
-	SHORT_VALUE_METHOD_ID = env.GetMethodID(shortClass, "shortValue", "()S");
-	assert(SHORT_VALUE_METHOD_ID != nullptr);
-
-	auto integerClass = env.FindClass("java/lang/Integer");
-	assert(integerClass != nullptr);
-	INT_VALUE_METHOD_ID = env.GetMethodID(integerClass, "intValue", "()I");
-	assert(INT_VALUE_METHOD_ID != nullptr);
-
-	auto longClass = env.FindClass("java/lang/Long");
-	assert(longClass != nullptr);
-	LONG_VALUE_METHOD_ID = env.GetMethodID(longClass, "longValue", "()J");
-	assert(LONG_VALUE_METHOD_ID != nullptr);
-
-	auto floatClass = env.FindClass("java/lang/Float");
-	assert(floatClass != nullptr);
-	FLOAT_VALUE_METHOD_ID = env.GetMethodID(floatClass, "floatValue", "()F");
-	assert(FLOAT_VALUE_METHOD_ID != nullptr);
-
-	auto doubleClass = env.FindClass("java/lang/Double");
-	assert(doubleClass != nullptr);
-	DOUBLE_VALUE_METHOD_ID = env.GetMethodID(doubleClass, "doubleValue", "()D");
-	assert(DOUBLE_VALUE_METHOD_ID != nullptr);
 }
 
 void ArgConverter::NativeScriptLongValueOfFunctionCallback(const v8::FunctionCallbackInfo<Value>& args)
@@ -96,72 +45,13 @@ void ArgConverter::NativeScriptLongFunctionCallback(const v8::FunctionCallbackIn
 {
 	auto isolate = Isolate::GetCurrent();
 	args.This()->SetHiddenValue(V8StringConstants::GetJavaLong(), Boolean::New(isolate, true));
-	args.This()->SetHiddenValue(ConvertToV8String(V8StringConstants::MARKED_AS_LONG), args[0]);
+	args.This()->SetHiddenValue(V8StringConstants::GetMarkedAsLong(), args[0]);
 	args.This()->Set(V8StringConstants::GetValue(), args[0]);
 
 	args.This()->SetPrototype(Local<NumberObject>::New(Isolate::GetCurrent(), *NAN_NUMBER_OBJECT));
 }
 
 
-jlong ArgConverter::ObjectToLong(jobject object)
-{
-	JEnv env;
-
-	return env.CallLongMethod(object, LONG_VALUE_METHOD_ID);
-}
-
-jboolean ArgConverter::ObjectToBoolean(jobject object)
-{
-	JEnv env;
-
-	return env.CallBooleanMethod(object, BOOLEAN_VALUE_METHOD_ID);
-}
-
-jchar ArgConverter::ObjectToChar(jobject object)
-{
-	JEnv env;
-
-	return env.CallCharMethod(object, CHAR_VALUE_METHOD_ID);
-}
-
-
-jbyte ArgConverter::ObjectToByte(jobject object)
-{
-	JEnv env;
-
-	return env.CallByteMethod(object, BYTE_VALUE_METHOD_ID);
-}
-
-jshort ArgConverter::ObjectToShort(jobject object)
-{
-	JEnv env;
-
-	return env.CallShortMethod(object, SHORT_VALUE_METHOD_ID);
-}
-
-jint ArgConverter::ObjectToInt(jobject object)
-{
-	JEnv env;
-
-	return env.CallIntMethod(object, INT_VALUE_METHOD_ID);
-}
-
-
-jfloat ArgConverter::ObjectToFloat(jobject object)
-{
-	JEnv env;
-
-	return env.CallFloatMethod(object, FLOAT_VALUE_METHOD_ID);
-}
-
-jdouble ArgConverter::ObjectToDouble(jobject object)
-{
-	JEnv env;
-
-	return env.CallDoubleMethod(object, DOUBLE_VALUE_METHOD_ID);
-}
-
-
 jstring ArgConverter::ObjectToString(jobject object)
 {
 	return (jstring)object;
@@ -184,30 +74,44 @@ Handle<Array> ArgConverter::ConvertJavaArgsToJsArgs(jobjectArray args)
 		JniLocalRef argJavaClassPath(env.GetObjectArrayElement(args, jArrayIndex++));
 
 		jint length;
-		jint argTypeID = ObjectToInt(argTypeIDObj);
+		Type argTypeID = (Type)JType::IntValue(env, argTypeIDObj);
 
 		Handle<Value> jsArg;
 		Handle<String> v8String;
 		switch (argTypeID)
 		{
-			case TypeID_Boolean : jsArg = Boolean::New(isolate, ObjectToBoolean(arg)); break;
-			case TypeID_Char:
-				v8String = jcharToV8String(ObjectToChar(arg));
+			case Type::Boolean:
+				jsArg = Boolean::New(isolate, JType::BooleanValue(env, arg));
+				break;
+			case Type::Char:
+				v8String = jcharToV8String(JType::CharValue(env, arg));
 				jsArg = v8String;
 				break;
-			case TypeID_Byte: jsArg = Number::New(isolate, ObjectToByte(arg)); break;
-			case TypeID_Short: jsArg = Number::New(isolate, ObjectToShort(arg)); break;
-			case TypeID_Int: jsArg = Number::New(isolate, ObjectToInt(arg)); break;
-			case TypeID_Long: jsArg = Number::New(isolate, ObjectToLong(arg)); break;
-			case TypeID_Float: jsArg = Number::New(isolate, ObjectToFloat(arg)); break;
-			case TypeID_Double: jsArg = Number::New(isolate, ObjectToDouble(arg)); break;
-			case TypeID_String:
-				v8String = jstringToV8String(ObjectToString(arg));
+			case Type::Byte:
+				jsArg = Number::New(isolate, JType::ByteValue(env, arg));
+				break;
+			case Type::Short:
+				jsArg = Number::New(isolate, JType::ShortValue(env, arg));
+				break;
+			case Type::Int:
+				jsArg = Number::New(isolate, JType::IntValue(env, arg));
+				break;
+			case Type::Long:
+				jsArg = Number::New(isolate, JType::LongValue(env, arg));
+				break;
+			case Type::Float:
+				jsArg = Number::New(isolate, JType::FloatValue(env, arg));
+				break;
+			case Type::Double:
+				jsArg = Number::New(isolate, JType::DoubleValue(env, arg));
+				break;
+			case Type::String:
+				v8String = jstringToV8String((jstring)arg);
 				jsArg = v8String;
 				break;
-			case TypeID_JsObject:
+			case Type::JsObject:
 			{
-				jint javaObjectID = ObjectToInt(arg);
+				jint javaObjectID = JType::IntValue(env, arg);
 				jsArg = ObjectManager::GetJsObjectByJavaObjectStatic(javaObjectID);
 
 				if (jsArg.IsEmpty())
@@ -218,7 +122,9 @@ Handle<Array> ArgConverter::ConvertJavaArgsToJsArgs(jobjectArray args)
 				}
 				break;
 			}
-			case TypeID_Null: jsArg = Null(isolate); break;
+			case Type::Null:
+				jsArg = Null(isolate);
+				break;
 		}
 
 		arr->Set(i, jsArg);
@@ -229,8 +135,16 @@ Handle<Array> ArgConverter::ConvertJavaArgsToJsArgs(jobjectArray args)
 
 std::string ArgConverter::jstringToString(jstring value)
 {
-	if (value == nullptr)
+	if (value == nullptr) {
 		return string();
+	}
+
+	jsize utfLength;
+	bool readInBuffer = ReadJStringInBuffer(value, utfLength);
+	if(readInBuffer) {
+		string s(charBuffer, utfLength);
+		return s;
+	}
 
 	JEnv env;
 
@@ -242,33 +156,43 @@ std::string ArgConverter::jstringToString(jstring value)
 	return s;
 }
 
-Handle<String> ArgConverter::jcharToV8String(jchar value)
+Local<String> ArgConverter::jstringToV8String(jstring value)
 {
+	if	(value == nullptr)
+	{
+		return Handle<String>();
+	}
+
 	JEnv env;
+	auto chars = env.GetStringChars(value, NULL);
+	auto length = env.GetStringLength(value);
+	auto v8String = ConvertToV8String(chars, length);
+	env.ReleaseStringChars(value, chars);
 
-	JniLocalRef str(env.NewString(&value, 1));
-	jboolean bol = true;
-	const char* resP = env.GetStringUTFChars(str, &bol);
-	auto v8String = ConvertToV8String(resP, 1);
-	env.ReleaseStringUTFChars(str, resP);
 	return v8String;
 }
 
-Local<String> ArgConverter::jstringToV8String(jstring value)
-{
-	if	(value == nullptr)
-	{
-		return Handle<String>();
+bool ArgConverter::ReadJStringInBuffer(jstring value, jsize& utfLength) {
+	if (value == nullptr) {
+		return false;
 	}
 
 	JEnv env;
+	utfLength = env.GetStringUTFLength(value);
+	if(utfLength > BUFFER_SIZE) {
+		return false;
+	}
 
-	JniLocalRef arr(env.CallObjectMethod(value, GET_BYTES_METHOD_ID, UTF_8_ENCODING));
-	int length = env.GetArrayLength(arr);
-	jbyte *data = env.GetByteArrayElements(arr, nullptr);
-	auto v8String = ConvertToV8String((const char *)data, length);
-	env.ReleaseByteArrayElements(arr, data, JNI_ABORT);
+	jsize strLength = env.GetStringLength(value);
+	// use existing buffer to prevent extensive memory allocation
+	env.GetStringUTFRegion(value, (jsize)0, strLength, charBuffer);
 
+	return true;
+}
+
+Handle<String> ArgConverter::jcharToV8String(jchar value)
+{
+	auto v8String = ConvertToV8String(&value, 1);
 	return v8String;
 }
 
@@ -345,14 +269,4 @@ bool ArgConverter::TryConvertToJavaLong(const Handle<Value>& value, jlong& javaL
 JavaVM* ArgConverter::jvm = nullptr;
 Persistent<Function>* ArgConverter::NATIVESCRIPT_NUMERA_CTOR_FUNC = nullptr;
 Persistent<NumberObject>* ArgConverter::NAN_NUMBER_OBJECT = nullptr;
-jclass ArgConverter::STRING_CLASS = nullptr;
-jmethodID ArgConverter::GET_BYTES_METHOD_ID = nullptr;
-jmethodID ArgConverter::CHAR_VALUE_METHOD_ID = nullptr;
-jmethodID ArgConverter::BOOLEAN_VALUE_METHOD_ID = nullptr;
-jmethodID ArgConverter::BYTE_VALUE_METHOD_ID = nullptr;
-jmethodID ArgConverter::SHORT_VALUE_METHOD_ID = nullptr;
-jmethodID ArgConverter::INT_VALUE_METHOD_ID = nullptr;
-jmethodID ArgConverter::LONG_VALUE_METHOD_ID = nullptr;
-jmethodID ArgConverter::FLOAT_VALUE_METHOD_ID = nullptr;
-jmethodID ArgConverter::DOUBLE_VALUE_METHOD_ID = nullptr;
-jstring ArgConverter::UTF_8_ENCODING = nullptr;
+char* ArgConverter::charBuffer = new char[ArgConverter::BUFFER_SIZE];