fix android activity life cycle

Author: Mihail Slavchev

src/jni/Android.mk

@@ -62,7 +62,7 @@ include $(PREBUILT_STATIC_LIBRARY)
 include $(CLEAR_VARS)
 LOCAL_CPPFLAGS += -std=c++11
 LOCAL_MODULE    := NativeScript
-LOCAL_SRC_FILES := com_tns_Platform.cpp com_tns_JsDebugger.cpp com_tns_AssetExtractor.cpp \
+LOCAL_SRC_FILES := com_tns_Platform.cpp com_tns_JsDebugger.cpp com_tns_AssetExtractor.cpp com_tns_NativeScriptActity.cpp \
 					JEnv.cpp DirectBuffer.cpp \
 					JsDebugger.cpp \
 					NativeScriptRuntime.cpp MetadataNode.cpp MetadataTreeNode.cpp MetadataReader.cpp \

src/jni/MetadataNode.cpp

@@ -1261,6 +1261,15 @@ void MetadataNode::CreateTopLevelNamespaces(const Handle<Object>& global)
 	}
 }
 
+void MetadataNode::InjectPrototype(Handle<Object>& target, Handle<Object>& implementationObject)
+{
+	auto isolate = Isolate::GetCurrent();
+
+	implementationObject->SetAccessor(ConvertToV8String("super"), SuperAccessorGetterCallback, nullptr, implementationObject);
+	implementationObject->SetPrototype(target->GetPrototype());
+	target->SetPrototype(implementationObject);
+}
+
 
 string MetadataNode::TNS_PREFIX = "com/tns/gen/";
 std::map<std::string, MetadataNode*> MetadataNode::s_name2NodeCache;

src/jni/MetadataNode.h

@@ -86,6 +86,8 @@ namespace tns
 
 		static void BuildMetadata(uint32_t nodesLength, uint8_t *nodeData, uint32_t nameLength, uint8_t *nameData, uint32_t valueLength, uint8_t *valueData);
 
+		static void InjectPrototype(v8::Handle<v8::Object>& target, v8::Handle<v8::Object>& implementationObject);
+
 
 	private:
 		struct MethodCallbackData

src/jni/NativeScriptRuntime.cpp

@@ -41,9 +41,6 @@ void NativeScriptRuntime::Init(JavaVM *jvm, ObjectManager *objectManager)
 	RequireClass = env.FindClass("com/tns/Require");
 	assert(RequireClass != nullptr);
 
-	MAKE_CLASS_INSTANCE_OF_TYPE_STRONG = env.GetStaticMethodID(PlatformClass, "makeClassInstanceOfTypeStrong", "(Ljava/lang/String;)I");
-	assert(MAKE_CLASS_INSTANCE_OF_TYPE_STRONG != nullptr);
-
 	CREATE_INSTANCE_METHOD_ID = env.GetStaticMethodID(PlatformClass, "createInstance", "([Ljava/lang/Object;II)Ljava/lang/Object;");
 	assert(CREATE_INSTANCE_METHOD_ID != nullptr);
 
@@ -126,17 +123,6 @@ bool NativeScriptRuntime::RegisterInstance(const Handle<Object>& jsObject, const
 	return success;
 }
 
-void NativeScriptRuntime::MakeClassInstanceOfTypeStrong(const string& className, const Handle<Object>& classObj)
-{
-	JEnv env;
-
-	JniLocalRef param(env.NewStringUTF(className.c_str()));
-	jint javaObjectID = env.CallStaticIntMethod(PlatformClass, MAKE_CLASS_INSTANCE_OF_TYPE_STRONG, (jstring)param);
-
-	jclass clazz = env.FindClass(className);
-	objectManager->Link(classObj, javaObjectID, clazz);
-}
-
 Handle<Value> NativeScriptRuntime::GetArrayElement(const Handle<Object>& array, uint32_t index, const string& arraySignature)
 {
 	return arrayElementAccessor.GetArrayElement(array, index, arraySignature);
@@ -925,7 +911,7 @@ void NativeScriptRuntime::CreateTopLevelNamespaces(const Handle<Object>& global)
 	MetadataNode::CreateTopLevelNamespaces(global);
 }
 
-Handle<Value> NativeScriptRuntime::CallJSMethod(JNIEnv *_env, const Handle<Object>& jsObject, jstring methodName, jobjectArray args, TryCatch& tc)
+Handle<Value> NativeScriptRuntime::CallJSMethod(JNIEnv *_env, const Handle<Object>& jsObject, const string& methodName, jobjectArray args, TryCatch& tc)
 {
 	SET_PROFILER_FRAME();
 
@@ -936,29 +922,22 @@ Handle<Value> NativeScriptRuntime::CallJSMethod(JNIEnv *_env, const Handle<Objec
 
 	auto exceptionUtil = ExceptionUtil::GetInstance();
 
-	auto jsMethodName = ArgConverter::jstringToV8String(methodName);
-
 	//auto method = MetadataNode::GetPropertyFromImplementationObject(jsObject, jsMethodName);
-	string name2 = ConvertToString(jsMethodName);
-	auto method = jsObject->Get(ConvertToV8String(name2));
+	auto method = jsObject->Get(ConvertToV8String(methodName));
 
 	if (method.IsEmpty() || method->IsUndefined())
 	{
-		string name = ConvertToString(jsMethodName);
-
 		stringstream ss;
-		ss << "Cannot find method '" << name << "' implementation";
+		ss << "Cannot find method '" << methodName << "' implementation";
 
 		ExceptionUtil::GetInstance()->ThrowExceptionToJs(ss.str());
 
 		result = Undefined(isolate);
 	}
 	else if (!method->IsFunction())
 	{
-		string name = ConvertToString(jsMethodName);
-
 		stringstream ss;
-		ss << "Property '" << name << "' is not a function";
+		ss << "Property '" << methodName << "' is not a function";
 
 		ExceptionUtil::GetInstance()->ThrowExceptionToJs(ss.str());
 
@@ -1039,7 +1018,6 @@ JavaVM* NativeScriptRuntime::jvm = nullptr;
 jclass NativeScriptRuntime::PlatformClass = nullptr;
 jclass NativeScriptRuntime::RequireClass = nullptr;
 jclass NativeScriptRuntime::JAVA_LANG_STRING = nullptr;
-jmethodID NativeScriptRuntime::MAKE_CLASS_INSTANCE_OF_TYPE_STRONG = nullptr;
 jmethodID NativeScriptRuntime::CREATE_INSTANCE_METHOD_ID = nullptr;
 jmethodID NativeScriptRuntime::CACHE_CONSTRUCTOR_METHOD_ID = nullptr;
 jmethodID NativeScriptRuntime::APP_FAIL_METHOD_ID = nullptr;

src/jni/NativeScriptRuntime.h

@@ -33,8 +33,6 @@ namespace tns
 
 		static bool RegisterInstance(const v8::Handle<v8::Object>& jsObject, const std::string& name, const std::string& className, const ArgsWrapper& argWrapper, const v8::Handle<v8::Object>& implementationObject, bool isInterface);
 
-		static void MakeClassInstanceOfTypeStrong(const std::string& className, const v8::Handle<v8::Object>& classObj);
-
 		//
 
 		static v8::Handle<v8::Value> GetArrayElement(const v8::Handle<v8::Object>& array, uint32_t index, const std::string& arraySignature);
@@ -45,7 +43,7 @@ namespace tns
 
 		static void CallJavaMethod(const v8::Handle<v8::Object>& caller, const std::string& className, const std::string& methodName, MetadataEntry *entry, bool isStatic, bool isSuper, const v8::FunctionCallbackInfo<v8::Value>& args);
 
-		static v8::Handle<v8::Value> CallJSMethod(JNIEnv *_env, const v8::Handle<v8::Object>& jsObject, jstring methodName, jobjectArray args, v8::TryCatch& tc);
+		static v8::Handle<v8::Value> CallJSMethod(JNIEnv *_env, const v8::Handle<v8::Object>& jsObject, const std::string& methodName, jobjectArray args, v8::TryCatch& tc);
 
 		//
 
@@ -118,8 +116,6 @@ namespace tns
 
 		static JavaVM *jvm;
 
-		static jmethodID MAKE_CLASS_INSTANCE_OF_TYPE_STRONG;
-
 		static jmethodID CREATE_INSTANCE_METHOD_ID;
 
 		static jmethodID CACHE_CONSTRUCTOR_METHOD_ID;

src/jni/com_tns_NativeScriptActity.cpp

@@ -0,0 +1,73 @@
+#include "NativeScriptRuntime.h"
+#include "MetadataNode.h"
+#include "JniLocalRef.h"
+#include "JsArgConverter.h"
+#include "JsArgToArrayConverter.h"
+#include "ArgConverter.h"
+#include "Util.h"
+#include "V8GlobalHelpers.h"
+#include "V8StringConstants.h"
+#include "ExceptionUtil.h"
+#include "v8.h"
+#include "JEnv.h"
+#include "NativeScriptAssert.h"
+#include <sstream>
+#include <android/log.h>
+#include <assert.h>
+#include <string>
+
+using namespace v8;
+using namespace std;
+using namespace tns;
+
+extern Isolate *g_isolate;
+extern ObjectManager *g_objectManager;
+extern int AppJavaObjectID;
+
+
+jobject ConvertJsValueToJavaObject(JEnv& env, const Handle<Value>& value);
+
+extern "C" jobjectArray Java_com_tns_NativeScriptActivity_getMethodOverrides(JNIEnv *_env, jobject obj, jint objectId, jobjectArray packagedArgs)
+{
+	DEBUG_WRITE("getMethodOverrides called");
+
+	auto isolate = g_isolate;
+	Isolate::Scope isolate_scope(isolate);
+
+	JEnv env(_env);
+
+	HandleScope handleScope(isolate);
+
+	TryCatch tc;
+
+	auto appInstance = g_objectManager->GetJsObjectByJavaObject(AppJavaObjectID);
+	if (appInstance.IsEmpty())
+	{
+		ExceptionUtil::GetInstance()->ThrowExceptionToJava(tc, "NativeScript application not initialized correctly. Missing the global app object initialization.");
+		return nullptr;
+	}
+
+	string createActivityMethodName = "getActivity";
+	auto createActivityFunction = appInstance->Get(ConvertToV8String(createActivityMethodName.c_str()));
+
+	if (createActivityFunction.IsEmpty() || !createActivityFunction->IsFunction())
+	{
+		ExceptionUtil::GetInstance()->ThrowExceptionToJava(tc, "NativeScript application not initialized correctly. No function 'createActivity' found on the application object.");
+		return nullptr;
+	}
+
+	auto jsResult = NativeScriptRuntime::CallJSMethod(env, appInstance, createActivityMethodName, packagedArgs, tc);
+	auto jsInstance = jsResult.As<Object>();
+	if (jsInstance.IsEmpty() || jsInstance->IsNull() || jsInstance->IsUndefined())
+	{
+		ExceptionUtil::GetInstance()->ThrowExceptionToJava(tc, "NativeScript application not initialized correctly. getActivity method returned invalid value.");
+		return nullptr;
+	}
+
+	auto jsActivity = g_objectManager->GetJsObjectByJavaObject(objectId);
+
+	MetadataNode::InjectPrototype(jsActivity, jsInstance);
+
+	jobjectArray methodOverrides = NativeScriptRuntime::GetMethodOverrides(env, jsInstance);
+	return methodOverrides;
+}

src/jni/com_tns_Platform.cpp

@@ -341,7 +341,7 @@ extern "C" jobject Java_com_tns_Platform_callJSMethodNative(JNIEnv *_env, jobjec
 
 	string method_name = ArgConverter::jstringToString(methodName);
 
-	auto jsResult = NativeScriptRuntime::CallJSMethod(env, jsObject, methodName, packagedArgs, tc);
+	auto jsResult = NativeScriptRuntime::CallJSMethod(env, jsObject, method_name, packagedArgs, tc);
 
 	stringstream ss;
 	ss << "Calling js method " << method_name << " failed";
@@ -355,7 +355,7 @@ extern "C" jobject Java_com_tns_Platform_callJSMethodNative(JNIEnv *_env, jobjec
 	return javaObject;
 }
 
-extern "C" jobjectArray Java_com_tns_Platform_createJSInstanceNative(JNIEnv *_env, jobject obj, jobject javaObject, jint javaObjectID, jstring className, jboolean createActivity, jobjectArray packagedCreationArgs)
+extern "C" void Java_com_tns_Platform_createJSInstanceNative(JNIEnv *_env, jobject obj, jobject javaObject, jint javaObjectID, jstring className)
 {
 	SET_PROFILER_FRAME();
 
@@ -375,139 +375,31 @@ extern "C" jobjectArray Java_com_tns_Platform_createJSInstanceNative(JNIEnv *_en
 	Handle<Object> jsInstance;
 	Handle<Object> implementationObject;
 
-	bool isActivity = createActivity == JNI_TRUE;
-
-	if (isActivity)
+	auto proxyClassName = g_objectManager->GetClassName(javaObject);
+	//
+	if (proxyClassName == "com/tns/NativeScriptActivity")
 	{
-		auto appInstance = g_objectManager->GetJsObjectByJavaObject(AppJavaObjectID);
-		if (appInstance.IsEmpty())
-		{
-			ExceptionUtil::GetInstance()->ThrowExceptionToJava(tc, "NativeScript application not initialized correctly. Missing the global app object initialization.");
-			return nullptr;
-		}
-
-		string createActivityMethodName = "getActivity";
-		auto createActivityFunction = appInstance->Get(ConvertToV8String(createActivityMethodName.c_str()));
-
-		if (createActivityFunction.IsEmpty() || !createActivityFunction->IsFunction())
-		{
-			ExceptionUtil::GetInstance()->ThrowExceptionToJava(tc, "NativeScript application not initialized correctly. No function 'createActivity' found on the application object.");
-			return nullptr;
-		}
-
-		JniLocalRef jMethodName(env.NewStringUTF(createActivityMethodName.c_str()));
-		TryCatch tc;
-		auto jsResult = NativeScriptRuntime::CallJSMethod(env, appInstance, jMethodName, packagedCreationArgs, tc);
-		jsInstance = jsResult.As<Object>();
-		if (jsInstance.IsEmpty() || jsInstance->IsNull() || jsInstance->IsUndefined())
-		{
-			ExceptionUtil::GetInstance()->ThrowExceptionToJava(tc, "NativeScript application not initialized correctly. getActivity method returned invalid value.");
-			return nullptr;
-		}
-
-//@@@
-//		auto node = MetadataNode::GetNodeFromHandle(jsInstance);
-//		string nodeName = node->GetName();
-//
-//		if (nodeName != jniName)
-//		{
-//			ExceptionUtil::GetInstance()->ThrowExceptionToJava(tc, "NativeScript application not initialized correctly. createActivity returned wrong type.");
-//			return nullptr;
-//		}
+		return;
 	}
-	else
+	//
+	DEBUG_WRITE("createJSInstanceNative class %s", proxyClassName.c_str());
+	jsInstance = MetadataNode::CreateExtendedJSWrapper(isolate, proxyClassName);
+	if (jsInstance.IsEmpty())
 	{
-		auto proxyClassName = g_objectManager->GetClassName(javaObject);
-		DEBUG_WRITE("createJSInstanceNative class %s", proxyClassName.c_str());
-		jsInstance = MetadataNode::CreateExtendedJSWrapper(isolate, proxyClassName);
-		if (jsInstance.IsEmpty())
-		{
-			ExceptionUtil::GetInstance()->ThrowExceptionToJava(tc, "NativeScript application not initialized correctly. Cannot create extended JS wrapper.");
-			return nullptr;
-		}
+		ExceptionUtil::GetInstance()->ThrowExceptionToJava(tc, "NativeScript application not initialized correctly. Cannot create extended JS wrapper.");
+		return;
 	}
 
 	implementationObject = MetadataNode::GetImplementationObject(jsInstance);
 	if (implementationObject.IsEmpty())
 	{
 		NativeScriptRuntime::APP_FAIL("createJSInstanceNative: implementationObject is empty");
-		return nullptr;
+		return;
 	}
 	DEBUG_WRITE("createJSInstanceNative: implementationObject :%d", implementationObject->GetIdentityHash());
 
-	bool createTypeScriptActivity = isActivity && jsInstance->HasOwnProperty(V8StringConstants::GetIsPrototypeImplementationObject());
-
-	if (isActivity && !createTypeScriptActivity)
-	{
-		DEBUG_WRITE("createJSInstanceNative: creating js activity with classProxy: %d", jsInstance->GetIdentityHash());
-	}
-
-	if (createTypeScriptActivity)
-	{
-		DEBUG_WRITE("createJSInstanceNative: creating typescript activity with classProxy: %d", jsInstance->GetIdentityHash());
-
-		auto node = MetadataNode::GetNodeFromHandle(jsInstance);
-
-		//call extends function on the prototype which must the be Parent function
-		auto parent = jsInstance->GetPrototype().As<Function>();
-		auto extendsFunc = parent->Get(String::NewFromUtf8(isolate, "__activityExtend")).As<Function>();
-		ASSERT_MESSAGE(!extendsFunc.IsEmpty(), "__activityExtend support function not found on activity parent");
-
-
-		Handle<Value> arguments[3];
-		arguments[0] = parent;
-		arguments[1] = jsInstance.As<Function>()->GetName();
-		arguments[2] = implementationObject;
-		auto extended =  extendsFunc->Call(parent, 3, arguments).As<Function>();
-		ASSERT_MESSAGE(!extended.IsEmpty(), "extend result is not an function");
-
-		extended->SetHiddenValue(ConvertToV8String("t::TypescriptActivity::DonNotRegisterInstance"), Boolean::New(isolate, true));
-		auto extendedObject = extended->CallAsConstructor(0, nullptr).As<Object>();
-		DEBUG_WRITE("createJSInstanceNative: typescript activity extendedObject's prototype : %d", extendedObject->GetPrototype().As<Object>()->GetIdentityHash());
-
-
-		extendedObject->SetPrototype(implementationObject);
-		//@@@
-		//extendedObject->SetHiddenValue(ConvertToV8String(MetadataNode::METADATA_NODE_KEY_NAME), External::New(isolate, node));
-
-		bool success = extendedObject->SetHiddenValue(ConvertToV8String("t::ActivityImplementationObject"), implementationObject);
-		ASSERT_MESSAGE(success == true, "Setting up the typescript activity implementation object failed");
-
-		//This will cause the Link to link the extendedObject not the empty object instance. This is on par with all typescript objects created through JS
-		jsInstance = extendedObject;
-		g_objectManager->Unlink(jsInstance);
-	}
-
-//@@@
 	jclass clazz = env.FindClass(jniName);
 	g_objectManager->Link(jsInstance, javaObjectID, clazz);
-
-	vector<jstring> methods;
-
-	auto propNames = implementationObject->GetOwnPropertyNames();
-	auto propsLen = propNames->Length();
-	for (auto i = 0; i < propsLen; i++)
-	{
-		auto name = propNames->Get(i).As<String>();
-		auto method = implementationObject->Get(name);
-
-		if (method->IsFunction())
-		{
-			String::Utf8Value stringValue(name);
-			jstring value = env.NewStringUTF(*stringValue);
-
-			methods.push_back(value);
-		}
-	}
-
-	jclass stringClass = env.FindClass("java/lang/String");
-	jobjectArray methodOverrides = env.NewObjectArray(methods.size(), stringClass, nullptr);
-	for (int i = 0; i < methods.size(); i++)
-	{
-		env.SetObjectArrayElement(methodOverrides, i, methods[i]);
-	}
-
-	return methodOverrides;
 }
 
 extern "C" jint Java_com_tns_Platform_generateNewObjectId(JNIEnv *env, jobject obj)