Fix some regressions

Author: dsolimando

android/src/main/java/com/masteratul/exceptionhandler/NativeExceptionHandlerIfc.java

@@ -1,5 +1,5 @@
 package com.masteratul.exceptionhandler;
 
 public interface NativeExceptionHandlerIfc {
-    void handleNativeException(Thread thread, Throwable throwable);
+    void handleNativeException(Thread thread, Throwable throwable, Thread.UncaughtExceptionHandler originalHandler);
 }

android/src/main/java/com/masteratul/exceptionhandler/ReactNativeExceptionHandlerModule.java

@@ -12,72 +12,71 @@
 
 public class ReactNativeExceptionHandlerModule extends ReactContextBaseJavaModule {
 
-    private ReactApplicationContext reactContext;
+  private ReactApplicationContext reactContext;
     private Activity activity;
     private static Class errorIntentTargetClass = DefaultErrorScreen.class;
     private static NativeExceptionHandlerIfc nativeExceptionHandler;
     private Callback callbackHolder;
     private Thread.UncaughtExceptionHandler originalHandler;
 
     public ReactNativeExceptionHandlerModule(ReactApplicationContext reactContext) {
-        super(reactContext);
-        this.reactContext = reactContext;
-    }
+    super(reactContext);
+    this.reactContext = reactContext;
+  }
 
-    @Override
-    public String getName() {
-        return "ReactNativeExceptionHandler";
-    }
+  @Override
+  public String getName() {
+    return "ReactNativeExceptionHandler";
+  }
 
 
-    @ReactMethod
-    public void setHandlerforNativeException(
-            final boolean executeOriginalUncaughtExceptionHandler,
-            final boolean forceToQuit,
-            Callback customHandler) {
+  @ReactMethod
+  public void setHandlerforNativeException(
+          final boolean executeOriginalUncaughtExceptionHandler,
+          final boolean forceToQuit,
+          Callback customHandler) {
 
-        callbackHolder = customHandler;
-        originalHandler = Thread.getDefaultUncaughtExceptionHandler();
+      callbackHolder = customHandler;
+      originalHandler = Thread.getDefaultUncaughtExceptionHandler();
 
-        Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
+      Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
 
-            @Override
-            public void uncaughtException(Thread thread, Throwable throwable) {
+          @Override
+          public void uncaughtException(Thread thread, Throwable throwable) {
 
-                String stackTraceString = Log.getStackTraceString(throwable);
-                callbackHolder.invoke(stackTraceString);
+          String stackTraceString = Log.getStackTraceString(throwable);
+          callbackHolder.invoke(stackTraceString);
 
-                if (executeOriginalUncaughtExceptionHandler && originalHandler != null) {
-                    originalHandler.uncaughtException(thread, throwable);
-                }
+          if (nativeExceptionHandler != null) {
+              nativeExceptionHandler.handleNativeException(thread, throwable, originalHandler);
+          } else {
+              activity = getCurrentActivity();
 
-                if (nativeExceptionHandler != null) {
-                    nativeExceptionHandler.handleNativeException(thread, throwable);
-                } else {
-                    activity = getCurrentActivity();
+              Intent i = new Intent();
+              i.setClass(activity, errorIntentTargetClass);
+              i.putExtra("stack_trace_string",stackTraceString);
+              i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 
-                    Intent i = new Intent();
-                    i.setClass(activity, errorIntentTargetClass);
-                    i.putExtra("stack_trace_string",stackTraceString);
-                    i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+              activity.startActivity(i);
+              activity.finish();
 
-                    activity.startActivity(i);
-                    activity.finish();
+              if (executeOriginalUncaughtExceptionHandler && originalHandler != null) {
+                  originalHandler.uncaughtException(thread, throwable);
+              }
 
-                    if (forceToQuit) {
-                        System.exit(0);
-                    }
+              if (forceToQuit) {
+                  System.exit(0);
+              }
+          }
+          }
+      });
+  }
 
-                }
-            }
-        });
-    }
-
-    public static void replaceErrorScreenActivityClass(Class errorScreenActivityClass){
-        errorIntentTargetClass = errorScreenActivityClass;
-    }
+   public static void replaceErrorScreenActivityClass(Class errorScreenActivityClass){
+       errorIntentTargetClass = errorScreenActivityClass;
+   }
 
     public static void setNativeExceptionHandler(NativeExceptionHandlerIfc nativeExceptionHandler) {
         ReactNativeExceptionHandlerModule.nativeExceptionHandler = nativeExceptionHandler;
     }
-}
+}