Merge pull request #281 from NativeScript/plamen5kov/refactor

removed unnecessary includes and moved the uncaught exception handler

Author: Plamen5kov

src/jni/ArrayElementAccessor.cpp

@@ -7,7 +7,6 @@
 #include "NativeScriptAssert.h"
 #include "NativeScriptException.h"
 #include "JType.h"
-#include <assert.h>
 
 using namespace v8;
 using namespace std;

src/jni/JsArgConverter.cpp

@@ -1,6 +1,5 @@
 #include "JsArgConverter.h"
 #include <sstream>
-#include <assert.h>
 #include "ObjectManager.h"
 #include "NativeScriptAssert.h"
 #include "ArgConverter.h"

src/jni/JsArgToArrayConverter.cpp

@@ -1,7 +1,6 @@
 #include "JsArgToArrayConverter.h"
 #include <limits>
 #include <sstream>
-#include <assert.h>
 #include "ObjectManager.h"
 #include "NativeScriptAssert.h"
 #include "ArgConverter.h"

src/jni/MetadataNode.cpp

@@ -498,6 +498,7 @@ Local<Function> MetadataNode::SetMembersFromRuntimeMetadata(Isolate *isolate, Lo
 
 		char chKind = kind[0];
 
+		// method or field
 		assert((chKind == 'M') || (chKind == 'F'));
 
 		MetadataEntry entry;

src/jni/MetadataReader.cpp

@@ -526,6 +526,7 @@ MetadataTreeNode* MetadataReader::GetOrCreateTreeNodeByName(const string& classN
 				typeLine >> kind >> name;
 				auto cKind = kind[0];
 
+				// package, class, interface
 				assert((cKind == 'P') || (cKind == 'C') || (cKind == 'I'));
 
 				if ((cKind == 'C') || (cKind == 'I'))

src/jni/NativePlatform.cpp

@@ -25,7 +25,6 @@
 #include "NativePlatform.h"
 #include <sstream>
 #include <android/log.h>
-#include <assert.h>
 #include <string>
 
 using namespace v8;

src/jni/Profiler.cpp

@@ -3,7 +3,6 @@
 #include "prof.h"
 #include "NativeScriptException.h"
 #include "NativeScriptAssert.h"
-#include <assert.h>
 #include <stack>
 
 using namespace v8;

src/jni/com_tns_NativeScriptActity.cpp

@@ -13,7 +13,6 @@
 #include "NativeScriptException.h"
 #include <sstream>
 #include <android/log.h>
-#include <assert.h>
 #include <string>
 
 using namespace v8;

src/src/com/tns/NativeScriptApplication.java

@@ -1,6 +1,7 @@
 package com.tns;
 
 import java.io.File;
+import java.lang.Thread.UncaughtExceptionHandler;
 
 import android.app.Application;
 import android.content.pm.PackageManager.NameNotFoundException;
@@ -710,14 +711,18 @@ public void onCreate() {
 
 		System.loadLibrary("NativeScript");
 
-		Logger logger = new LogcatLogger(BuildConfig.DEBUG, this);
+		Logger logger = new LogcatLogger(BuildConfig.DEBUG, this);		
 
 		boolean showErrorIntent = hasErrorIntent();
 		if (!showErrorIntent)
 		{
 			appInstance = this;
 
-			prepareAppBuilderCallbackImpl(logger);
+			Thread.UncaughtExceptionHandler exHandler = new NativeScriptUncaughtExceptionHandler(logger, this);
+			
+			prepareAppBuilderCallbackImpl(logger, exHandler);
+			
+			Thread.setDefaultUncaughtExceptionHandler(exHandler);
 
 			// TODO: refactor
 			ExtractPolicy extractPolicy = (appBuilderCallbackImpl != null)
@@ -782,7 +787,7 @@ public void onCreate() {
 		}
 	}
 
-	private void prepareAppBuilderCallbackImpl(Logger logger)
+	private void prepareAppBuilderCallbackImpl(Logger logger, UncaughtExceptionHandler exHandler)
 	{
 		Class<?> appBuilderCallbackClass = null;
 
@@ -824,11 +829,9 @@ private void prepareAppBuilderCallbackImpl(Logger logger)
 			}
 		}
 
-		Thread.UncaughtExceptionHandler exHandler = (appBuilderCallbackImpl != null)
-				? appBuilderCallbackImpl.getDefaultUncaughtExceptionHandler()
-				: new NativeScriptUncaughtExceptionHandler(logger, this);
-
-		Thread.setDefaultUncaughtExceptionHandler(exHandler);
+		if(appBuilderCallbackImpl != null) {
+			exHandler = appBuilderCallbackImpl.getDefaultUncaughtExceptionHandler();	
+		}
 
 		boolean shouldEnableDebugging = (appBuilderCallbackImpl != null)
 				? appBuilderCallbackImpl.shouldEnableDebugging(this)