remove ApplicationID parameter

Author: Mihail Slavchev

src/jni/NativePlatform.cpp

@@ -38,7 +38,6 @@ Persistent<Context> *PrimaryContext = nullptr;
 Context::Scope *context_scope = nullptr;
 ObjectManager *g_objectManager = nullptr;
 bool tns::LogEnabled = true;
-int AppJavaObjectID = -1;
 int count = 0;
 SimpleAllocator g_allocator;
 
@@ -59,9 +58,8 @@ void NativePlatform::Init(JavaVM *vm, void *reserved)
 	DEBUG_WRITE("JNI_ONLoad END");
 }
 
-Isolate* NativePlatform::InitNativeScript(JNIEnv *_env, jobject obj, jstring filesPath, jint appJavaObjectId, jboolean verboseLoggingEnabled, jstring packageName, jobjectArray args, jobject jsDebugger)
+Isolate* NativePlatform::InitNativeScript(JNIEnv *_env, jobject obj, jstring filesPath, jboolean verboseLoggingEnabled, jstring packageName, jobjectArray args, jobject jsDebugger)
 {
-	AppJavaObjectID = appJavaObjectId;
 	tns::LogEnabled = verboseLoggingEnabled;
 
 	JEnv env(_env);
@@ -78,7 +76,7 @@ Isolate* NativePlatform::InitNativeScript(JNIEnv *_env, jobject obj, jstring fil
 	JniLocalRef snapshotScript(env.GetObjectArrayElement(args, 3));
 	Constants::V8_HEAP_SNAPSHOT_SCRIPT = ArgConverter::jstringToString(snapshotScript);
 
-	DEBUG_WRITE("Initializing Telerik NativeScript: app instance id:%d", appJavaObjectId);
+	DEBUG_WRITE("Initializing Telerik NativeScript");
 
 	NativeScriptException::Init(g_jvm, g_objectManager);
 	s_isolate = PrepareV8Runtime(env, filesRoot, packageName, jsDebugger);

src/jni/NativePlatform.h

@@ -14,7 +14,7 @@ namespace tns
 	{
 		public:
 			static void Init(JavaVM *vm, void *reserved);
-			static v8::Isolate* InitNativeScript(JNIEnv *_env, jobject obj, jstring filesPath, jint appJavaObjectId, jboolean verboseLoggingEnabled, jstring packageName, jobjectArray args, jobject jsDebugger);
+			static v8::Isolate* InitNativeScript(JNIEnv *_env, jobject obj, jstring filesPath, jboolean verboseLoggingEnabled, jstring packageName, jobjectArray args, jobject jsDebugger);
 			static void RunModule(JNIEnv *_env, jobject obj, jstring scriptFile);
 			static jobject RunScript(JNIEnv *_env, jobject obj, jstring scriptFile);
 			static jobject CallJSMethodNative(JNIEnv *_env, jobject obj, jint javaObjectID, jstring methodName, jint retType, jboolean isConstructor, jobjectArray packagedArgs);

src/jni/com_tns_Platform.cpp

@@ -33,11 +33,11 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved)
 	return JNI_VERSION_1_6;
 }
 
-extern "C" void Java_com_tns_Platform_initNativeScript(JNIEnv *_env, jobject obj, jstring filesPath, jint appJavaObjectId, jboolean verboseLoggingEnabled, jstring packageName, jobjectArray args, jobject jsDebugger)
+extern "C" void Java_com_tns_Platform_initNativeScript(JNIEnv *_env, jobject obj, jstring filesPath, jboolean verboseLoggingEnabled, jstring packageName, jobjectArray args, jobject jsDebugger)
 {
 	try
 	{
-		g_isolate = NativePlatform::InitNativeScript(_env, obj, filesPath, appJavaObjectId, verboseLoggingEnabled, packageName, args, jsDebugger);
+		g_isolate = NativePlatform::InitNativeScript(_env, obj, filesPath, verboseLoggingEnabled, packageName, args, jsDebugger);
 	}
 	catch (NativeScriptException& e)
 	{

src/src/com/tns/Platform.java

@@ -25,7 +25,7 @@
 
 public class Platform
 {
-	private static native void initNativeScript(String filesPath, int appJavaObjectId, boolean verboseLoggingEnabled, String packageName, Object[] v8Options, JsDebugger jsDebugger);
+	private static native void initNativeScript(String filesPath, boolean verboseLoggingEnabled, String packageName, Object[] v8Options, JsDebugger jsDebugger);
 
 	private static native void runModule(String filePath) throws NativeScriptException;
 
@@ -100,7 +100,7 @@ public static void setErrorActivityClass(Class<?> clazz)
 		errorActivityClass = clazz;
 	}
 
-	public static int init(Application application, ThreadScheduler threadScheduler, Logger logger, String appName, File runtimeLibPath, File rootDir, File appDir, ClassLoader classLoader, File dexDir, String dexThumb) throws RuntimeException
+	public static void init(Application application, ThreadScheduler threadScheduler, Logger logger, String appName, File runtimeLibPath, File rootDir, File appDir, ClassLoader classLoader, File dexDir, String dexThumb) throws RuntimeException
 	{
 		if (initialized)
 		{
@@ -113,20 +113,10 @@ public static int init(Application application, ThreadScheduler threadScheduler,
 
 		Platform.dexFactory = new DexFactory(logger, classLoader, dexDir, dexThumb);
 
-		int appJavaObjectId = -1;
-		
 		if (logger.isEnabled())
 		{
 			logger.write("Initializing NativeScript JAVA");
 		}
-			
-		appJavaObjectId = generateNewObjectId();
-		makeInstanceStrong(application, appJavaObjectId);
-		if (logger.isEnabled())
-		{
-			logger.write("Initialized app instance id:" + appJavaObjectId);
-		}
-		
 
 		try
 		{
@@ -143,7 +133,7 @@ public static int init(Application application, ThreadScheduler threadScheduler,
 			jsDebugger = new JsDebugger(application, logger, threadScheduler);
 		}
 
-		Platform.initNativeScript(Module.getApplicationFilesPath(), appJavaObjectId, logger.isEnabled(), appName, v8Config, jsDebugger);
+		Platform.initNativeScript(Module.getApplicationFilesPath(), logger.isEnabled(), appName, v8Config, jsDebugger);
 
 		if (jsDebugger != null)
 		{
@@ -160,7 +150,6 @@ public static int init(Application application, ThreadScheduler threadScheduler,
 		}
 
 		initialized = true;
-		return appJavaObjectId;
 	}
 
 	@RuntimeCallable