🤝 Merge pull request #4 from Instabug/feature/1.10_release

Feature/1.10 release

Author: salmatarzi

build.gradle

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "instabug-cordova",
-  "version": "1.9.0",
+  "version": "1.9.1",
   "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": {

plugin.xml

@@ -2,8 +2,8 @@
 
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
         xmlns:android="http://schemas.android.com/apk/res/android"
-        id="com.instabug.cordova.plugin"
-        version="1.0.0">
+        id="instabug-cordova"
+        version="1.10.0">
 
     <name>instabug-cordova</name>
 

src/android/IBGPlugin.java

@@ -177,6 +177,9 @@ public boolean execute(final String action, JSONArray args, final CallbackContex
         } else if ("setReproStepsMode".equals(action)) {
             setReproStepsMode(callbackContext, args.optString(0));
 
+        } else if ("setThresholdForReshowingSurveyAfterDismiss".equals(action)) {
+            setThresholdForReshowingSurveyAfterDismiss(callbackContext, args.optInt(0), args.optInt(1));
+
         } else {
             // Method not found.
             return false;
@@ -763,6 +766,28 @@ private void setReproStepsMode(final CallbackContext callbackContext, String rep
         }
     }
 
+
+    /**
+     * Set after how many sessions should the dismissed survey would show again.
+     *
+     * @param callbackContext
+     *        Used when calling back into JavaScript
+     * @param sessionsCount
+     *        number of sessions that the dismissed survey will be shown after.
+     * @param daysCount
+     *        number of days that the dismissed survey will show after.
+     */
+    private void setThresholdForReshowingSurveyAfterDismiss(final CallbackContext callbackContext, int sessionsCount, int daysCount) {
+        if (Math.signum(sessionsCount) != - 1 && Math.signum(daysCount) != - 1) {
+            try {
+                Instabug.setThresholdForReshowingSurveyAfterDismiss(sessionsCount, daysCount);
+                callbackContext.success();
+            } catch (IllegalStateException e) {
+                callbackContext.error(errorMsg);
+            }
+        } else callbackContext.error("Session count and days count must be provided.");
+    }
+
     /**
      * Adds intent extras for all options passed to activate().
      */

src/ios/IBGPlugin.m

@@ -498,7 +498,7 @@ - (void) setViewHierarchyEnabled:(CDVInvokedUrlCommand*)command
      BOOL isEnabled = [command argumentAtIndex:0];
 
      if (isEnabled) {
-         [Instabug setViewHierarchyEnabled:isEnabled];
+         [Instabug setViewHierarchyEnabled:[[command argumentAtIndex:0] boolValue]];
          result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
      } else {
          result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR
@@ -521,7 +521,7 @@ - (void) setAutoScreenRecordingEnabled:(CDVInvokedUrlCommand*)command
       BOOL isEnabled = [command argumentAtIndex:0];
 
       if (isEnabled) {
-          [Instabug setAutoScreenRecordingEnabled:isEnabled];
+          [Instabug setAutoScreenRecordingEnabled:[[command argumentAtIndex:0] boolValue]];
           result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
       } else {
           result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR
@@ -656,6 +656,55 @@ - (void) setColorTheme:(NSString*)theme
     }
 }
 
+/**
+ * Sets a threshold for numbers of sessions and another for number of days
+ * required before a survey, that has been dismissed once, would show again.
+ *
+ * @param {CDVInvokedUrlCommand*} command
+ *        The command sent from JavaScript
+ */
+ - (void) setThresholdForReshowingSurveyAfterDismiss:(CDVInvokedUrlCommand*)command
+ {
+     CDVPluginResult* result;
+
+     NSInteger sessionsCount = [[command argumentAtIndex:0] integerValue];
+     NSInteger daysCount = [[command argumentAtIndex:1] integerValue];
+
+     if (sessionsCount && daysCount) {
+         [Instabug setThresholdForReshowingSurveyAfterDismiss:sessionsCount daysCount:daysCount];
+         result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
+     } else {
+         result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR
+                                    messageAsString:@"A sessions count and days count must be provided."];
+     }
+
+     [self.commandDelegate sendPluginResult:result callbackId:[command callbackId]];
+ }
+
+ /**
+  * Sets a threshold for numbers of sessions and another for number of days
+  * required before a survey, that has been dismissed once, would show again.
+  *
+  * @param {CDVInvokedUrlCommand*} command
+  *        The command sent from JavaScript
+  */
+  - (void) setAutoShowingSurveysEnabled:(CDVInvokedUrlCommand*)command
+  {
+      CDVPluginResult* result;
+
+      BOOL autoShowingSurveysEnabled = [command argumentAtIndex:0];
+
+      if (autoShowingSurveysEnabled) {
+          [Instabug setAutoShowingSurveysEnabled:[[command argumentAtIndex:0] boolValue]];
+          result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
+      } else {
+          result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR
+                                     messageAsString:@"A boolean value must be provided."];
+      }
+
+      [self.commandDelegate sendPluginResult:result callbackId:[command callbackId]];
+  }
+
 /**
  * Wrapper method for applying all provided options.
  *

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

@@ -5,7 +5,7 @@
 
  Copyright:  (c) 2013-2018 by Instabug, Inc., all rights reserved.
 
- Version:    7.10.1
+ Version:    7.11.2
  */
 
 #import <Foundation/Foundation.h>
@@ -1227,6 +1227,16 @@ OBJC_EXTERN void IBGNSLogWithLevel(NSString *format, va_list args, IBGLogLevel l
 */
 + (BOOL)hasRespondedToSurveyWithToken:(NSString *)surveyToken;
 
+/**
+ @brief Sets a threshold for numbers of sessions and another for number of days required before a survey, that has been dismissed once, would show again.
+ 
+ @discussion When a survey that has been shown to the user gets dismissed once, it will not reappear to the user unless a certain number of sessions have started AND a certain number of days have passed since the user first dismissed the survey. Note that if a survey is dismissed for a second time, it will not show again, in other words, it will be set to `canceled`. This applies to both surveys with and without tokens.
+ 
+ @param sessionCount : Number of sessions required to be initialized before a dismissed survey can be shown again.
+ @param daysCount : Number of days required to pass before a dismissed survey can be shown again.
+ */
++ (void)setThresholdForReshowingSurveyAfterDismiss:(NSInteger)sessionCount daysCount:(NSInteger)daysCount;
+
 /// ------------------------
 /// @name SDK Debugging
 /// ------------------------

src/ios/Instabug.framework/Info.plist

@@ -6,11 +6,11 @@
 	<dict>
 		<key>Headers/Instabug.h</key>
 		<data>
-		FXGwngWRcYOFi0T4tL2KdxlGUjw=
+		cPStZRHftpl8keEtrsFPAjs84QM=
 		</data>
 		<key>Info.plist</key>
 		<data>
-		j7YBrXxPdubzZ6bNCoQpUGSt9Ps=
+		1eXWHXKrrtqRe4qY2lZPamKmzio=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
@@ -23,11 +23,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			FXGwngWRcYOFi0T4tL2KdxlGUjw=
+			cPStZRHftpl8keEtrsFPAjs84QM=
 			</data>
 			<key>hash2</key>
 			<data>
-			q5gMkf8yDUe0ic4LGgKu6eHW6DceEAnkLcLrx6H5/TA=
+			obPoSnbr/IMM9YSKOfz8g6c75Hc6ydOs9ruaSkspFxA=
 			</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.10.1
+ Version:    7.11.2
  */
 
 #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 kIBGSurveyNextButtonTitle;
+extern NSString * const kIBGSurveySubmitButtonTitle;
+extern NSString * const kIBGSurveyAppStoreThankYouTitle;
+extern NSString * const kIBGSurveyAppStoreButtonTitle;
 extern NSString * const kIBGExpectedResultsStringName;
 extern NSString * const kIBGActualResultsStringName;
 extern NSString * const kIBGStepsToReproduceStringName;