Merge branch 'master' into fix/network-logger-defensive-coding

Author: alyezz

.circleci/config.yml

@@ -14,24 +14,8 @@ jobs:
       - checkout:
           path: ~/project
 
-      - restore_cache:
-          key: yarn-v1-{{ checksum "yarn.lock" }}-{{ arch }}
-
-      - restore_cache:
-          key: node-v1-{{ checksum "package.json" }}-{{ arch }}
-
       - run: yarn
 
-      - save_cache:
-          key: yarn-v1-{{ checksum "yarn.lock" }}-{{ arch }}
-          paths:
-            - ~/.cache/yarn
-
-      - save_cache:
-          key: node-v1-{{ checksum "package.json" }}-{{ arch }}
-          paths:
-            - node_modules
-
       - run:
           name: jest tests
           command: |

CHANGELOG.md

@@ -1,6 +1,7 @@
 ## master
 
 * Fixes a crash caused by the network logger when the object passed is too large
+* Adds source map upload script support for environment variables use inside Info.plist
 
 ## v9.1.9 (2020-10-01)
 

README.md

@@ -113,46 +113,6 @@ import Instabug from 'instabug-reactnative';
     	}
     }
     ```
-## Update Guide
-### Updating to versions 8.0-8.4.x
-
-When updating to version 8.0 through 8.4.x, you'll need to perform the steps below.
-
-1. Unlink Instabug
-    ```bash
-    react-native unlink instabug-reactnative
-    ```
-
-2. Install the new version of Instabug
-    ```bash
-    npm install instabug-reactnative
-    ```
-
-3. Link Instabug
-    ```bash
-    react-native link instabug-reactnative
-    ```
-
-### Updating to version 8.5
-
-_Only for apps using React Native >= 0.60. If you're using a lower version, you don't need to perform any extra steps when updating._
-
-Version 8.5 adds support for React Native 0.60. To use Instabug 8.5 with React Native 0.60, you'll need to perform the following steps.
-
-1. Unlink Instabug
-    ```bash
-    react-native unlink instabug-reactnative
-    ```
-
-2. Install the new version of Instabug
-    ```bash
-    npm install instabug-reactnative
-    ```
-
-3. Add Instabug to your project
-    ```bash
-    react-native add-instabug
-    ```
 
 ## Microphone and Photo Library Usage Description (iOS Only)
 
@@ -201,9 +161,9 @@ NetworkLogger.setEnabled(false);
 
 Instabug Repro Steps are enabled by default. It captures a screenshot of each screen the user navigates to. These screens are attached to the BugReport when sent.
 
-We support the 2 most popular React Native navigation libraries:
+We support the two most popular React Native navigation libraries:
 
-  *  **react-navigation**
+  *  **[react-navigation](https://github.com/react-navigation/react-navigation)**
 
 	  *  **v5**
 		set the `onStateChange` to `Instabug.onStateChange` in your NavigationContainer as follows:
@@ -222,9 +182,10 @@ We support the 2 most popular React Native navigation libraries:
 		onNavigationStateChange={  Instabug.onNavigationStateChange  }  />
 		);
 		```
-	*  **react-native-navigation**
 
-		 Register `Instabug.componentDidAppearListener` listener using:
+  *  **[react-native-navigation](https://github.com/wix/react-native-navigation)**
+
+		Register `Instabug.componentDidAppearListener` listener using:
 		```javascript
 		Navigation.events().registerComponentDidAppearListener( Instabug.componentDidAppearListener );
 		```
@@ -241,9 +202,51 @@ You can disable Repro Steps using the following API:
 Instabug.setReproStepsMode(Instabug.reproStepsMode.disabled);
 ```
 
+## Update Guide
+### Updating to versions 8.0-8.4.x
+
+When updating to version 8.0 through 8.4.x, you'll need to perform the steps below.
+
+1. Unlink Instabug
+    ```bash
+    react-native unlink instabug-reactnative
+    ```
+
+2. Install the new version of Instabug
+    ```bash
+    npm install instabug-reactnative
+    ```
+
+3. Link Instabug
+    ```bash
+    react-native link instabug-reactnative
+    ```
+
+### Updating to version 8.5
+
+_Only for apps using React Native >= 0.60. If you're using a lower version, you don't need to perform any extra steps when updating._
+
+Version 8.5 adds support for React Native 0.60. To use Instabug 8.5 with React Native 0.60, you'll need to perform the following steps.
+
+1. Unlink Instabug
+    ```bash
+    react-native unlink instabug-reactnative
+    ```
+
+2. Install the new version of Instabug
+    ```bash
+    npm install instabug-reactnative
+    ```
+
+3. Add Instabug to your project
+    ```bash
+    react-native add-instabug
+    ```
+
 ## Features that are not supported yet
 
 - Push Notification Support for In-App Messaging
+- [User Steps](https://help.instabug.com/en/articles/2515300-instabug-report-logs-user-steps).
 
 ## Documentation
 

__tests__/index.spec.js

@@ -74,6 +74,7 @@ describe('Instabug Module', () => {
     setIBGLogPrintsToConsole.resetHistory();
     setPushNotificationsEnabled.resetHistory();
     log.resetHistory();
+    setSdkDebugLogsLevel.resetHistory();
     setDebugEnabled.resetHistory();
     enable.resetHistory();
     disable.resetHistory();
@@ -367,13 +368,24 @@ describe('Instabug Module', () => {
 
   });
 
-  it('should call the native method setSdkDebugLogsLevel', () => {
+  it('should call the native method setSdkDebugLogsLevel on iOS', () => {
     const debugLevel = Instabug.sdkDebugLogsLevel.sdkDebugLogsLevelVerbose;
+    
+    Platform.OS = 'ios';
     Instabug.setSdkDebugLogsLevel(debugLevel);
 
     expect(setSdkDebugLogsLevel.calledOnceWithExactly(debugLevel)).toBe(true);
   });
 
+  it('should not call the native method setSdkDebugLogsLevel on Android', () => {
+    const debugLevel = Instabug.sdkDebugLogsLevel.sdkDebugLogsLevelVerbose;
+    
+    Platform.OS = 'android';
+    Instabug.setSdkDebugLogsLevel(debugLevel);
+
+    expect(setSdkDebugLogsLevel.notCalled).toBe(true);
+  });
+
   it('should call the native method setUserAttribute', () => {
 
     const key = 'age';

index.js

@@ -165,7 +165,9 @@ const InstabugModule = {
    *
    */
   setSdkDebugLogsLevel(sdkDebugLogsLevel) {
-    Instabug.setSdkDebugLogsLevel(sdkDebugLogsLevel);
+    if (Platform.OS === 'ios') {
+      Instabug.setSdkDebugLogsLevel(sdkDebugLogsLevel);
+    }
   },
 
   /* istanbul ignore next */

ios/RNInstabug/InstabugReactBridge.m

@@ -252,7 +252,11 @@ - (dispatch_queue_t)methodQueue {
 }
 
 RCT_EXPORT_METHOD(getUserAttribute:(NSString *)key callback:(RCTResponseSenderBlock)callback) {
+    @try {
     callback(@[[Instabug userAttributeForKey:key]]);
+    } @catch (NSException *exception) {
+        callback(@[[NSNull null]]);
+    }
 }
 
 RCT_EXPORT_METHOD(removeUserAttribute:(NSString *)key) {

ios/upload_sourcemap.sh

@@ -3,7 +3,7 @@ cd ${PROJECT_DIR}
 cd ..
 if [ -s "$HOME/.nvm/nvm.sh" ]; then
 . "$HOME/.nvm/nvm.sh"
-elif [ -x "$(command -v brew)" && -s "$(brew --prefix nvm)/nvm.sh" ]; then
+elif [ -x "$(command -v brew)" ] && [ -s "$(brew --prefix nvm)/nvm.sh" ]; then
 . "$(brew --prefix nvm)/nvm.sh"
 fi
 export NODE_BINARY=node
@@ -23,13 +23,29 @@ else
             echo "CFBundleVersion could not be found, please upload the sourcemap files manually"
             exit 0
         fi
+        INSTABUG_APP_VERSION_CODE_ENV=$(grep -o '$(.*)' <<< $INSTABUG_APP_VERSION_CODE | cut -d "(" -f2 | cut -d ")" -f1)
+        if !([ ! "${INSTABUG_APP_VERSION_CODE_ENV}" ] || [ -z "${INSTABUG_APP_VERSION_CODE_ENV}" ]); then
+            INSTABUG_APP_VERSION_CODE=${!INSTABUG_APP_VERSION_CODE_ENV}
+            if [ ! "${INSTABUG_APP_VERSION_CODE}" ] || [ -z "${INSTABUG_APP_VERSION_CODE}" ]; then
+                echo "Environment variable $INSTABUG_APP_VERSION_CODE_ENV was specified inside Info.plist but was not found, please upload the sourcemap files manually" 
+                exit 0
+            fi
+        fi
     fi
     if [ ! "${INSTABUG_APP_VERSION_NAME}" ] || [ -z "${INSTABUG_APP_VERSION_NAME}" ]; then
         INSTABUG_APP_VERSION_NAME=$( defaults read ${PRODUCT_SETTINGS_PATH} CFBundleShortVersionString )
         if [ ! "${INSTABUG_APP_VERSION_NAME}" ] || [ -z "${INSTABUG_APP_VERSION_NAME}" ]; then
             echo "CFBundleShortVersionString could not be found, please upload the sourcemap files manually"
             exit 0
         fi
+        INSTABUG_APP_VERSION_NAME_ENV=$(grep -o '$(.*)' <<< $INSTABUG_APP_VERSION_NAME | cut -d "(" -f2 | cut -d ")" -f1)
+        if !([ ! "${INSTABUG_APP_VERSION_NAME_ENV}" ] || [ -z "${INSTABUG_APP_VERSION_NAME_ENV}" ]); then
+            INSTABUG_APP_VERSION_NAME=${!INSTABUG_APP_VERSION_NAME_ENV}
+            if [ ! "${INSTABUG_APP_VERSION_NAME}" ] || [ -z "${INSTABUG_APP_VERSION_NAME}" ]; then
+                echo "Environment variable $INSTABUG_APP_VERSION_NAME_ENV was specified inside Info.plist but was not found, please upload the sourcemap files manually" 
+                exit 0
+            fi
+        fi
     fi
     VERSION='{"code":"'"$INSTABUG_APP_VERSION_CODE"'","name":"'"$INSTABUG_APP_VERSION_NAME"'"}'
     echo "Instabug: Token found" "\""${INSTABUG_APP_TOKEN}"\""