🤝 Merge pull request #46 from Instabug/feature/new_release_apis

Feature/new release apis

Author: salmatarzi

build.gradle

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

src/android/IBGPlugin.java

@@ -14,6 +14,8 @@
 import org.apache.cordova.CordovaInterface;
 import org.apache.cordova.CordovaPlugin;
 import org.apache.cordova.CordovaWebView;
+import org.apache.cordova.PluginResult.Status;
+import org.apache.cordova.PluginResult;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -148,6 +150,12 @@ public boolean execute(final String action, JSONArray args, final CallbackContex
         } else if ("getUserAttribute".equals(action)) {
             getUserAttribute(callbackContext, args.optString(0));
 
+        } else if ("showSurveyWithToken".equals(action)) {
+            showSurveyWithToken(callbackContext, args.optString(0));
+
+        } else if ("hasRespondedToSurveyWithToken".equals(action)) {
+            hasRespondedToSurveyWithToken(callbackContext, args.optString(0));
+
         } else if ("setVideoRecordingFloatingButtonPosition".equals(action)) {
             setVideoRecordingFloatingButtonPosition(callbackContext, args.optString(0));
 
@@ -342,6 +350,24 @@ private void setUserData(final CallbackContext callbackContext, String data) {
         } else callbackContext.error("User data must be provided.");
     }
 
+     /**
+      * Shows survey with a specific token.
+      * Does nothing if there are no available surveys with that specific token.
+      * Answered and cancelled surveys won't show up again.
+      * @param surveyToken - A String with a survey token.
+      *
+      */
+    private void showSurveyWithToken(final CallbackContext callbackContext, String surveyToken) {
+        if (surveyToken != null && surveyToken.length() > 0) {
+            try {
+                Instabug.showSurvey(surveyToken);
+                callbackContext.success();
+            } catch (IllegalStateException e) {
+                callbackContext.error(errorMsg);
+            }
+        } else callbackContext.error("Survey token must be provided.");
+    }
+
     /**
      * Uploads the specified file along with upcoming reports.
      *
@@ -576,6 +602,23 @@ private void getUserAttribute(final CallbackContext callbackContext, String key)
         }
     }
 
+    /**
+     * Returns true if the survey with a specific token was answered before.
+     * Will return false if the token does not exist or if the survey was not answered before.
+     * @param surveyToken - A String with a survey token.
+     * @param callbackContext callback with argument as the desired value of the whether
+     * the survey has been responded to or not.
+     *
+     */
+    private void hasRespondedToSurveyWithToken(final CallbackContext callbackContext, String surveyToken) {
+        try {
+            boolean hasResponded = Instabug.hasRespondToSurvey(surveyToken);
+            callbackContext.sendPluginResult(new PluginResult(Status.OK, hasResponded));
+        } catch (IllegalStateException e) {
+            callbackContext.error(errorMsg);
+        }
+    }
+
     /**
      * Sets the default position at which the Instabug screen recording button will be shown.
      * Different orientations are already handled.

src/ios/IBGPlugin.m

@@ -182,6 +182,54 @@ - (void) setUserName:(CDVInvokedUrlCommand*)command
     [self.commandDelegate sendPluginResult:result callbackId:[command callbackId]];
 }
 
+/**
+ * Shows survey with a specific token.
+ * Does nothing if there are no available surveys with that specific token.
+ * Answered and cancelled surveys won't show up again.
+ *
+ * @param {CDVInvokedUrlCommand*} command
+ *        The command sent from JavaScript
+ */
+- (void) showSurveyWithToken:(CDVInvokedUrlCommand*)command
+{
+    CDVPluginResult* result;
+
+    NSString* surveyToken = [command argumentAtIndex:0];
+
+    if ([surveyToken length] > 0) {
+        [Instabug showSurveyWithToken:surveyToken];
+        result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
+    } else {
+        result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR
+                                   messageAsString:@"A survey token must be provided."];
+    }
+
+    [self.commandDelegate sendPluginResult:result callbackId:[command callbackId]];
+}
+
+/**
+ * Returns true if the survey with a specific token was answered before.
+ * Will return false if the token does not exist or if the survey was not answered before.
+ *
+ * @param {CDVInvokedUrlCommand*} command
+ *        The command sent from JavaScript
+ */
+- (void) hasRespondedToSurveyWithToken:(CDVInvokedUrlCommand*)command
+ {
+     CDVPluginResult* result;
+     NSString *surveyToken = [command argumentAtIndex:0];
+
+     if (surveyToken.length > 0) {
+         result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK
+                                    messageAsBool:[Instabug hasRespondedToSurveyWithToken:surveyToken]];
+     } else {
+         result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR
+                                    messageAsString:@"A non-empty survey token must be provided."];
+     }
+
+     [self.commandDelegate sendPluginResult:result callbackId:[command callbackId]];
+ }
+
 /**
  * Sets the user data that’s attached with each bug report sent.
  * Maximum size of the string is 1000 characters.

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

@@ -5,7 +5,7 @@
 
  Copyright:  (c) 2013-2017 by Instabug, Inc., all rights reserved.
 
- Version:    7.5
+ Version:    7.6.1
  */
 
 #import <Foundation/Foundation.h>
@@ -618,8 +618,14 @@ typedef void (^NetworkObfuscationCompletionBlock)(NSData *data, NSURLResponse *r
                             extraScreenShot:(BOOL)extraScreenShot
                                galleryImage:(BOOL)galleryImage
                                   voiceNote:(BOOL)voiceNote
-                            screenRecording:(BOOL)screenRecording;
+                            screenRecording:(BOOL)screenRecording DEPRECATED_MSG_ATTRIBUTE("Starting from v8.0, use setAttachmentOptions: instead");
 
+/**
+ @brief Sets whether attachments in bug reporting and in-app messaging are enabled.
+ 
+ @param attachmentTypes A NS_OPTIONS to add enabled attachments type.
+ */
++ (void)setEnabledAttachmentTypes:(IBGAttachmentType)attachmentTypes;
 /**
  @brief Enables/disables showing in-app notifications when the user receives a new message.
  
@@ -1153,6 +1159,24 @@ OBJC_EXTERN void IBGNSLogWithLevel(NSString *format, va_list args, IBGLogLevel l
  */
 + (void)setDidDismissSurveyHandler:(void (^)(void))didShowSurveyHandler;
 
+/**
+  @brief Shows Survey with a specific token.
+ 
+ @discussion Does nothing if there are no available surveys with that specific token. Answered and canceled surveys won't show up again.
+ 
+  @param surveyToken A String with a survey token.
+  */
++ (void)showSurveyWithToken:(NSString *)surveyToken;
+
+/**
+ @brief Returns true if the survey with a specific token was answered before .
+ 
+ @discussion Will return false if the token does not exist or if the survey was not answered before.
+ 
+ @param surveyToken A String with a survey token.
+*/
++ (BOOL)hasRespondedToSurveyWithToken:(NSString *)surveyToken;
+
 #pragma mark - SDK Debugging
 
 /**

src/ios/Instabug.framework/Info.plist

@@ -6,11 +6,11 @@
 	<dict>
 		<key>Headers/Instabug.h</key>
 		<data>
-		xcDqpr1ALuKw7dmbnzNWh8B2H0M=
+		wbRGHXdBl0uQRZhJAsvdO+5ARfU=
 		</data>
 		<key>Info.plist</key>
 		<data>
-		uZAnUh7C/NBKYvvbjRZxsn2h8cw=
+		lCGWkFUMspzePxMCyoe61a364pw=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
@@ -23,11 +23,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			xcDqpr1ALuKw7dmbnzNWh8B2H0M=
+			wbRGHXdBl0uQRZhJAsvdO+5ARfU=
 			</data>
 			<key>hash2</key>
 			<data>
-			RH1mGgfTfrjNKsUKU/GyzsXbdlyVqmYPdD2tqPYFFUo=
+			/beRz83/JfRE3ERsVSNwUaAFbEc3w28rX4aVpoNOC9k=
 			</data>
 		</dict>
 		<key>Modules/module.modulemap</key>

src/ios/Instabug.framework/Instabug

@@ -291,6 +291,16 @@ typedef NS_ENUM(NSInteger, IBGLogLevel) {
     IBGLogLevelFatal
 };
 
+/**
+ The attachment types selected in Attachment action sheet.
+ */
+typedef NS_OPTIONS(NSInteger, IBGAttachmentType) {
+    IBGAttachmentTypeScreenShot = 1 << 1,
+    IBGAttachmentTypeExtraScreenShot = 1 << 2,
+    IBGAttachmentTypeGalleryImage = 1 << 4,
+    IBGAttachmentTypeScreenRecording = 1 << 6,
+};
+
 @interface UIView (Instabug)
 
 /**