🤝 Merge pull request #8 from Instabug/feature/JS_CR

Feature/js cr

Author: salmatarzi

android/build.gradle

@@ -21,7 +21,7 @@ android {
 
 dependencies {
     compile 'com.facebook.react:react-native:0.20.+'
-    compile ('com.instabug.library:instabug:4.13.2'){
+    compile ('com.instabug.library:instabug:4.13.3'){
         exclude group: 'com.android.support:appcompat-v7'
     }
 

android/src/main/java/com/instabug/reactlibrary/RNInstabugReactnativeModule.java

@@ -39,6 +39,11 @@
 import com.instabug.reactlibrary.utils.ArrayUtil;
 import com.instabug.reactlibrary.utils.MapUtil;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -368,6 +373,82 @@ public void setFileAttachment(String fileUri, String fileNameWithExtension) {
         }
     }
 
+    /**
+     * Send unhandled JS error object
+     *
+     * @param exceptionObject   Exception object to be sent to Instabug's servers
+     */
+    @ReactMethod
+    public void sendJSCrash(String exceptionObject) {
+        try {
+            sendJSCrashByReflection(exceptionObject, false);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * Send handled JS error object
+     *
+     * @param exceptionObject   Exception object to be sent to Instabug's servers
+     */
+    @ReactMethod
+    public void sendHandledJSCrash(String exceptionObject) {
+        try {
+            sendJSCrashByReflection(exceptionObject, true);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * Sets whether crash reporting feature is Enabled or Disabled
+     *
+     * @param isEnabled   Exception object to be sent to Instabug's servers
+     */
+    @ReactMethod
+    public void setCrashReportingEnabled(boolean isEnabled) {
+        try {
+            if(isEnabled) {
+                Instabug.setCrashReportingState(Feature.State.ENABLED);
+            } else {
+                Instabug.setCrashReportingState(Feature.State.DISABLED);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void sendJSCrashByReflection(String exceptionObject, boolean isHandled) {
+        try {
+          JSONObject newJSONObject = new JSONObject(exceptionObject);
+          Method method = getMethod(Class.forName("com.instabug.crash.InstabugCrash"), "reportException");
+          if (method != null) {
+              method.invoke(null, newJSONObject, isHandled);
+          }
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        } catch (InvocationTargetException e) {
+            e.printStackTrace();
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    public static Method getMethod(Class clazz, String methodName) {
+        final Method[] methods = clazz.getDeclaredMethods();
+        for (Method method : methods) {
+            if (method.getName().equals(methodName)) {
+                method.setAccessible(true);
+                return method;
+            }
+        }
+        return null;
+    }
+
     /**
      * If your app already acquires the user's email address and you provide it to this method,
      * Instabug will pre-fill the user email in reports.

android/src/main/java/com/instabug/reactlibrary/RNInstabugReactnativePackage.java

@@ -56,7 +56,7 @@ public RNInstabugReactnativePackage(String androidApplicationToken, Application
 
         mInstabug = new Instabug.Builder(this.androidApplication, this.mAndroidApplicationToken)
                 .setInvocationEvent(this.invocationEvent)
-                .setCrashReportingState(Feature.State.DISABLED)
+                .setCrashReportingState(Feature.State.ENABLED)
                 .setReproStepsState(State.DISABLED)
                 .build();
 

index.js

@@ -1,5 +1,8 @@
 import {NativeModules, NativeAppEventEmitter, DeviceEventEmitter, Platform} from "react-native";
 let {Instabug} = NativeModules;
+import InstabugUtils from './utils/InstabugUtils.js';
+
+InstabugUtils.captureJsErrors();
 
 /**
  * Instabug
@@ -101,6 +104,14 @@ module.exports = {
             Instabug.setUserStepsEnabled(isUserStepsEnabled);
     },
 
+    /**
+	    * Report un-caught exceptions to Instabug dashboard
+	    * We don't send exceptions from __DEV__, since it's way too noisy!
+      */
+	    setCrashReportingEnabled: function(enableCrashReporter){
+	        Instabug.setCrashReportingEnabled(enableCrashReporter);
+	    },
+
     /**
      * Sets a block of code to be executed before sending each report.
      * This block is executed in the background before sending each report. Could
@@ -899,6 +910,26 @@ module.exports = {
         }
     },
 
+    /**
+	    * Send handled JS error object
+      *
+      * @param errorObject   Error object to be sent to Instabug's servers
+	    */
+	    reportJSException: function(errorObject) {
+	      let jsStackTrace = InstabugUtils.parseErrorStack(errorObject);
+	      var jsonObject = {
+	        message: errorObject.name + " - " + errorObject.message,
+	        os: Platform.OS,
+	        platform: 'react_native',
+	        exception: jsStackTrace
+	      }
+	      if(Platform.OS === 'android') {
+	        Instabug.sendHandledJSCrash(JSON.stringify(jsonObject));
+	      } else {
+	        Instabug.sendHandledJSCrash(jsonObject);
+	      }
+	    },	
+
     /**
      * Sets the default position at which the Instabug screen recording button will be shown.
      * Different orientations are already handled.

ios/Instabug.framework/Headers/Instabug.h

@@ -5,7 +5,7 @@
 
  Copyright:  (c) 2013-2018 by Instabug, Inc., all rights reserved.
 
- Version:    7.12.3
+ Version:    7.12.5
  */
 
 #import <Foundation/Foundation.h>
@@ -378,7 +378,7 @@ typedef void (^NetworkObfuscationCompletionBlock)(NSData *data, NSURLResponse *r
 /**
  @brief Shows/Hides email field.
 
- @discussion Defaults to show email field.
+ @discussion Defaults to show email field. If set to NO the email field will not be required regardless of previous or future calls to setEmailFieldRequired:.
 
  @param isShowingEmailField YES to show the email field, NO to hide it.
  */
@@ -463,7 +463,8 @@ typedef void (^NetworkObfuscationCompletionBlock)(NSData *data, NSURLResponse *r
  
  @deprecated Use setEmailFieldRequired:forAction: instead.
 
- @discussion Defaults to YES.
+ @discussion Defaults to YES. If email field is set to be hidden using + [Instabug setShowEmailField:NO], email field
+ will always be optional regardless of the whether this method was called or not.
 
  @param isEmailFieldRequired A boolean to indicate whether email field is required or not.
  */

ios/Instabug.framework/Info.plist

@@ -6,11 +6,11 @@
 	<dict>
 		<key>Headers/Instabug.h</key>
 		<data>
-		x58V5/AZd4q5E7jPVi0tdhKez70=
+		wwOLwWc4iG8u5RCEgnEbViLJru4=
 		</data>
 		<key>Info.plist</key>
 		<data>
-		4Jy8Yn1EuGKXqRymL6Sgk907mK8=
+		HPAveR0c+whbq5mPNp5qMyz1TnU=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
@@ -23,11 +23,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			x58V5/AZd4q5E7jPVi0tdhKez70=
+			wwOLwWc4iG8u5RCEgnEbViLJru4=
 			</data>
 			<key>hash2</key>
 			<data>
-			tI8SWLNyo50BAffKMVwvBPCeHSEZm+G7wutFUvhnBRU=
+			S/NXH4SJqkK91PzzkM9R0MiqjfoJgQeFjfAb7YuTmps=
 			</data>
 		</dict>
 		<key>Modules/module.modulemap</key>

ios/Instabug.framework/Instabug

@@ -5,7 +5,7 @@
  
  Copyright:  (c) 2013-2018 by Instabug, Inc., all rights reserved.
  
- Version:    7.12.3
+ Version:    7.12.5
  */
 
 #import <UIKit/UIKit.h>

ios/Instabug.framework/_CodeSignature/CodeResources

@@ -5,7 +5,7 @@
  
  Copyright:  (c) 2013-2018 by Instabug, Inc., all rights reserved.
  
- Version:    7.12.3
+ Version:    7.12.5
  */
 
 #import <Foundation/Foundation.h>