🤝 Merge pull request #2 from Instabug/feature/1.9release

Feature/1.9release

Author: salmatarzi

build.gradle

@@ -21,6 +21,6 @@ android {
 }
 
 dependencies {
-	compile 'com.instabug.library:instabug:4.10.2'
+	compile 'com.instabug.library:instabug:4.11.1'
 	compile 'com.android.support:multidex:1.0.0'
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "instabug-cordova",
-  "version": "1.8.2",
+  "version": "1.8.3",
   "description": "The purpose of this plugin is to simplify the process of integrating the Instabug SDK in a hybrid application, as well as to provide an interface to interfacing with the SDK through JavaScript.",
   "main": "index.js",
   "repository": {

src/android/IBGPlugin.java

@@ -7,6 +7,7 @@
 
 import com.instabug.library.Feature;
 import com.instabug.library.Instabug;
+import com.instabug.library.extendedbugreport.ExtendedBugReport;
 import com.instabug.library.invocation.InstabugInvocationEvent;
 import com.instabug.library.invocation.InstabugInvocationMode;
 import com.instabug.library.invocation.util.InstabugVideoRecordingButtonCorner;
@@ -169,7 +170,10 @@ public boolean execute(final String action, JSONArray args, final CallbackContex
         } else if ("setAutoScreenRecordingMaxDuration".equals(action)) {
             setAutoScreenRecordingMaxDuration(callbackContext, args.optInt(0));
 
-        } else {
+        } else if ("setExtendedBugReportMode".equals(action)) {
+            setExtendedBugReportMode(callbackContext, args.optString(0));
+
+        }else {
             // Method not found.
             return false;
         }
@@ -244,7 +248,7 @@ private void showIntroDialog(final CallbackContext callbackContext) {
      *
      * @param callbackContext
      *        Used when calling back into JavaScript
-     * @param colorInt
+     * @param colorString
      *        The value of the primary color
      */
     private void setPrimaryColor(final CallbackContext callbackContext, String colorString) {
@@ -706,6 +710,30 @@ private void setVideoRecordingFloatingButtonPosition(final CallbackContext callb
         }
     }
 
+    /**
+     * Sets whether the extended bug report mode should be disabled, enabled with
+     * required fields or enabled with optional fields.
+     *
+     * @param callbackContext
+     *        Used when calling back into JavaScript
+     * @param mode
+     *        A string to disable the extended bug report mode, enable it with
+     *        required or with optional fields
+     */
+    private void setExtendedBugReportMode(final CallbackContext callbackContext, String mode) {
+        try {
+          if(mode.equals("enabledWithRequiredFields")) {
+            Instabug.setExtendedBugReportState(ExtendedBugReport.State.ENABLED_WITH_REQUIRED_FIELDS);
+          } else if(mode.equals("enabledWithOptionalFields")) {
+            Instabug.setExtendedBugReportState(ExtendedBugReport.State.ENABLED_WITH_OPTIONAL_FIELDS);
+          } else if(mode.equals("disabled")) {
+            Instabug.setExtendedBugReportState(ExtendedBugReport.State.DISABLED);
+          }
+        } catch (IllegalStateException e) {
+            callbackContext.error(errorMsg);
+        }
+    }
+
     /**
      * Adds intent extras for all options passed to activate().
      */

src/ios/IBGPlugin.m

@@ -417,6 +417,31 @@ - (void) setReproStepsMode:(CDVInvokedUrlCommand*)command
     [self.commandDelegate sendPluginResult:result callbackId:[command callbackId]];
 }
 
+
+/**
+ * Sets whether the extended bug report mode should be disabled, enabled with
+ * required fields or enabled with optional fields.
+ *
+ * @param {CDVInvokedUrlCommand*} command
+ *        The command sent from JavaScript
+ */
+- (void) setExtendedBugReportMode:(CDVInvokedUrlCommand*)command
+{
+    CDVPluginResult* result;
+
+    IBGExtendedBugReportMode extendedBugReportMode = [self parseExtendedBugReportMode:[command argumentAtIndex:0]];
+
+    if (extendedBugReportMode != -1) {
+        [Instabug setExtendedBugReportMode:extendedBugReportMode];
+        result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
+    } else {
+        result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR
+                                   messageAsString:@"A valid extended bug report mode must be provided."];
+    }
+
+    [self.commandDelegate sendPluginResult:result callbackId:[command callbackId]];
+}
+
 /**
  * Convenience method for setting whether the email
  * field is validated or not.
@@ -737,6 +762,24 @@ - (IBGUserStepsMode) parseReproStepsMode:(NSString*)mode
     } else return 0;
 }
 
+/**
+ * Convenience method for converting NSString to
+ * IBGExtendedBugReportMode.
+ *
+ * @param  {NSString*} mode
+ *         NSString shortcode for IBGExtendedBugReportMode
+ */
+- (IBGExtendedBugReportMode) parseExtendedBugReportMode:(NSString*)mode
+{
+    if ([mode isEqualToString:@"enabledWithRequiredFields"]) {
+        return IBGExtendedBugReportModeEnabledWithRequiredFields;
+    } else if ([mode isEqualToString:@"enabledWithOptionalFields"]) {
+        return IBGExtendedBugReportModeEnabledWithOptionalFields;
+    } else if ([mode isEqualToString:@"disabled"]) {
+        return IBGExtendedBugReportModeDisabled;
+    } else return -1;
+}
+
 /**
  * Convenience method for converting NSString to
  * IBGLocale.

src/ios/Instabug.framework/Headers/Instabug.h

@@ -5,7 +5,7 @@
 
  Copyright:  (c) 2013-2018 by Instabug, Inc., all rights reserved.
 
- Version:    7.9.2
+ Version:    7.10
  */
 
 #import <Foundation/Foundation.h>
@@ -697,7 +697,7 @@ typedef void (^NetworkObfuscationCompletionBlock)(NSData *data, NSURLResponse *r
  @param names Array of names of icons to be shown along with titles. Use the same names you would use
  with `+ [UIImage imageNamed:]`.
  */
-+ (void)setReportCategoriesWithTitles:(NSArray<NSString *> *)titles iconNames:(nullable NSArray<NSString *> *)names;
++ (void)setReportCategoriesWithTitles:(NSArray<NSString *> *)titles iconNames:(nullable NSArray<NSString *> *)names DEPRECATED_MSG_ATTRIBUTE("Starting from v7.9, you can add categories from dashboard.");
 
 /**
  @brief Sets an array of report categories to be shown for users to select from before reporting a bug or sending
@@ -708,14 +708,26 @@ typedef void (^NetworkObfuscationCompletionBlock)(NSData *data, NSURLResponse *r
  @param title extra field key.
  @param required determine whether this field is required or not.
  */
-+ (void)addExtraReportFieldWithTitle:(NSString *)title required:(BOOL)required;
++ (void)addExtraReportFieldWithTitle:(NSString *)title required:(BOOL)required DEPRECATED_MSG_ATTRIBUTE("Starting from v7.9, use setExtendedBugReportMode: instead");;
 
 /**
  @brief Remove all extra fields.
  
  @discussion Use this method to remove all added extra fields.
  */
-+ (void)removeExtraReportFields;
++ (void)removeExtraReportFields DEPRECATED_MSG_ATTRIBUTE("Starting from v7.9, use setExtendedBugReportMode: instead");;
+
+/**
+ @brief Sets whether the extended bug report mode should be disabled, enabled with required fields or enabled with optional fields.
+ 
+ @discussion This feature is disabled by default. When enabled, it adds more fields for your reporters to fill in. You can set whether the extra fields are required or optional.
+ 1. Expected Results.
+ 2. Actual Results.
+ 3. Steps to Reproduce.
+ 
+ @param extendedBugReportMode An enum to disable the extended bug report mode, enable it with required or with optional fields.
+ */
++ (void)setExtendedBugReportMode:(IBGExtendedBugReportMode)extendedBugReportMode;
 
 /**
  @brief Set custom user attributes that are going to be sent with each feedback, bug or crash.

src/ios/Instabug.framework/Info.plist

@@ -6,11 +6,11 @@
 	<dict>
 		<key>Headers/Instabug.h</key>
 		<data>
-		4kxZEeE00REbmUfGg94C3NULVvw=
+		EW0LawU2ocbTJXyXab6eGuYBqIg=
 		</data>
 		<key>Info.plist</key>
 		<data>
-		VKe9NgIDfUhBqsBVFqPK7wnZNKg=
+		uPr3dFdFtDxfIr/Z4Ak4dMZUtXU=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
@@ -23,11 +23,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			4kxZEeE00REbmUfGg94C3NULVvw=
+			EW0LawU2ocbTJXyXab6eGuYBqIg=
 			</data>
 			<key>hash2</key>
 			<data>
-			jm2cECRm9S/pqpKmkItxvSLqsykctBM5sYtNF2GHj0o=
+			1QgezJN+NvpRWcOOsFWXKUZJT723WvQT5vRR6J+lA/Y=
 			</data>
 		</dict>
 		<key>Modules/module.modulemap</key>

src/ios/Instabug.framework/Instabug

@@ -5,7 +5,7 @@
  
  Copyright:  (c) 2013-2018 by Instabug, Inc., all rights reserved.
  
- Version:    7.9.2
+ Version:    7.10
  */
 
 #import <UIKit/UIKit.h>
@@ -78,6 +78,10 @@ extern NSString * const kIBGSurveyThankYouTitleText;
 extern NSString * const kIBGSurveyThankYouDescriptionText;
 extern NSString * const kIBGSurveysNPSLeastLikelyStringName;
 extern NSString * const kIBGSurveysNPSMostLikelyStringName;
+extern NSString * const kIBGExpectedResultsStringName;
+extern NSString * const kIBGActualResultsStringName;
+extern NSString * const kIBGStepsToReproduceStringName;
+extern NSString * const kIBGReplyButtonTitleStringName;
 
 /// -----------
 /// @name Enums
@@ -262,7 +266,11 @@ typedef NS_ENUM(NSInteger, IBGString) {
     IBGStringSurveyIntroTakeSurveyButtonText,
     IBGStringSurveyIntroDismissButtonText,
     IBGStringSurveyThankYouTitleText,
-    IBGStringSurveyThankYouDescriptionText
+    IBGStringSurveyThankYouDescriptionText,
+    IBGExpectedResultsStringName,
+    IBGActualResultsStringName,
+    IBGStepsToReproduceStringName,
+    IBGReplyButtonTitleStringName
 };
 
 /**
@@ -315,6 +323,15 @@ typedef NS_OPTIONS(NSInteger, IBGAttachmentType) {
     IBGAttachmentTypeScreenRecording = 1 << 6,
 };
 
+/**
+ The extended bug report mode.
+ */
+typedef NS_ENUM(NSInteger, IBGExtendedBugReportMode) {
+    IBGExtendedBugReportModeEnabledWithRequiredFields,
+    IBGExtendedBugReportModeEnabledWithOptionalFields,
+    IBGExtendedBugReportModeDisabled
+};
+
 @interface UIView (Instabug)
 
 /**

src/ios/Instabug.framework/_CodeSignature/CodeResources

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