🤝 Merge pull request #36 from Instabug/release/8.0.24

Release/8.0.24

Author: salmamali

.github/issue_template.md

@@ -13,12 +13,15 @@ your issue will help us a lot.
 ### Actual Behavior
 
 ### Instabug integration code
-*Make sure to remove your app token.*
+<!--Make sure to remove your app token.-->
 
 ### SDK Version
+<!--Which version of Instabug React Native are you on?.-->
 
 ### React Native, iOS and Android Versions
 
 ### Device Model
+<!--If this issue is happening on specific devices, please mention them.-->
 
 ### [Optional] Project That Reproduces the Issue
+<!--While not required, providing a sample project that reproduces the issue you're having will help us solve it much faster.-->

README.md

@@ -17,46 +17,61 @@ For more info, visit [Instabug.com](https://www.instabug.com).
 
 ## Installation
 
-1. Open the terminal and navigate to your React Native Directory. Then run the following command.
+### Using react-native CLI
+
+1. In Terminal, navigate to your React Native directory and install the `instabug-reactnative` package:
 
 ```bash
 npm install instabug-reactnative
 ```
-or
+
+Or if you prefer to use Yarn instead of npm:
 
 ```bash
 yarn add instabug-reactnative
 ```
 
-2. Install [**Ruby**](https://www.ruby-lang.org/en/documentation/installation/). (You can skip this step if you're building for Android only)
+2. For projects that build for iOS, install `xcodeproj` gem:
 
-3. Install `xcodeproj` gem by running the following command. (You can also skip this step if you're building for Android only)
 ```bash
 gem install xcodeproj
 ```
 
-4. Link the bridging files in the npm package to the ios project use the following command.
+3. Finally, link the bridging files in the `instabug-reactnative` package:
+
+
 ```bash
 react-native link instabug-reactnative
 ```
-### Installing using Cocoapods
-Alternatively, for iOS you can use [CocoaPods](https://cocoapods.org/) for managing dependencies. After following the first step from the installation steps above, add the following to your `Podfile`:
+
+### Using CocoaPods (iOS only)
+
+Alternatively, for iOS you can use [CocoaPods](https://cocoapods.org/) for managing dependencies. 
+
+1. In Terminal, navigate to your React Native directory and install the `instabug-reactnative` package:
+
+```bash
+npm install instabug-reactnative
+```
+
+2. Add the following to your `Podfile`:
 
 ```ruby
 pod 'instabug-reactnative', :path => '../node_modules/instabug-reactnative'
 pod 'React', :path => '../node_modules/react-native', :subspecs => [
-'Core',
-'CxxBridge',
-'DevSupport'
+  'Core',
+  'CxxBridge',
+  'DevSupport'
 ]
+
+# Required React native dependencies
 pod 'yoga', :path => '../node_modules/react-native/ReactCommon/yoga'
 pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'
 pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/GLog.podspec'
 pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'
-```
-And add the following post install script at the end of your `Podfile`:
 
-```ruby
+# To make sure that archiving works correctly in Xcode, React has to be 
+# removed from the Pods project as it's already included in the main project.
 post_install do |installer|
    installer.pods_project.targets.each do |target|
       if target.name == "React"
@@ -66,6 +81,12 @@ post_install do |installer|
 end
 ```
 
+3. Install `instabug-reactnative`:
+
+```bash
+pod install
+```
+
 ## Using Instabug
 1. To start using Instabug, import it into your `index.ios.js` and `index.android.js` file.
 

android/build.gradle

@@ -24,7 +24,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.facebook.react:react-native:0.20.+'
+    implementation 'com.facebook.react:react-native:0.58.+'
     implementation ('com.instabug.library:instabug:8.0.16'){
         exclude group: 'com.android.support:appcompat-v7'
     }

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

@@ -806,12 +806,17 @@ public void getUnreadMessagesCount(Callback messageCountCallback) {
      * @see InstabugInvocationEvent
      */
     @ReactMethod
-    public void setInvocationEvent(String invocationEventValue) {
-        try {
-            BugReporting.setInvocationEvents(getInvocationEventById(invocationEventValue));
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+    public void setInvocationEvent(final String invocationEventValue) {
+        new Handler(Looper.getMainLooper()).post(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    BugReporting.setInvocationEvents(getInvocationEventById(invocationEventValue));
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        });
     }
 
     /**

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

@@ -25,7 +25,7 @@
 public class RNInstabugReactnativePackage implements ReactPackage {
 
     private static final String TAG = RNInstabugReactnativePackage.class.getSimpleName();
-
+    
     private Application androidApplication;
     private String mAndroidApplicationToken;
     private Instabug mInstabug;
@@ -35,7 +35,7 @@ public class RNInstabugReactnativePackage implements ReactPackage {
 
     public RNInstabugReactnativePackage(String androidApplicationToken, Application androidApplication,
                                         String[] invocationEventValues, String primaryColor,
-                                        InstabugFloatingButtonEdge floatingButtonEdge, Integer offset) {
+                                        InstabugFloatingButtonEdge floatingButtonEdge, Integer offset, boolean crashReportingEnabled) {
         this.androidApplication = androidApplication;
         this.mAndroidApplicationToken = androidApplicationToken;
 
@@ -44,7 +44,7 @@ public RNInstabugReactnativePackage(String androidApplicationToken, Application
 
         mInstabug = new Instabug.Builder(this.androidApplication, this.mAndroidApplicationToken)
                 .setInvocationEvents(this.invocationEvents.toArray(new InstabugInvocationEvent[0]))
-                .setCrashReportingState(Feature.State.ENABLED)
+                .setCrashReportingState(crashReportingEnabled ? Feature.State.ENABLED: Feature.State.DISABLED)
                 .setReproStepsState(State.DISABLED)
                 .build();
 
@@ -60,7 +60,7 @@ public RNInstabugReactnativePackage(String androidApplicationToken, Application
     public RNInstabugReactnativePackage(String androidApplicationToken, Application androidApplication,
                                         String[] invocationEventValues, String primaryColor) {
         new RNInstabugReactnativePackage(androidApplicationToken,androidApplication,invocationEventValues,primaryColor,
-                InstabugFloatingButtonEdge.LEFT,250);
+                InstabugFloatingButtonEdge.LEFT,250, true);
     }
 
     private void parseInvocationEvent(String[] invocationEventValues) {
@@ -115,6 +115,7 @@ public static class Builder {
         String primaryColor;
         InstabugFloatingButtonEdge floatingButtonEdge;
         int offset;
+        boolean isCrashReportingEnabled = true;
 
         public Builder(String androidApplicationToken, Application application) {
             this.androidApplicationToken = androidApplicationToken;
@@ -126,6 +127,11 @@ public Builder setInvocationEvent(String... invocationEvents) {
             return this;
         }
 
+        public Builder setCrashReportingEnabled(boolean enabled) {
+            this.isCrashReportingEnabled = enabled;
+            return this;
+        }
+
         public Builder setPrimaryColor(String primaryColor) {
             this.primaryColor = primaryColor;
             return this;
@@ -142,7 +148,7 @@ public Builder setFloatingButtonOffsetFromTop(int offset) {
         }
 
         public RNInstabugReactnativePackage build() {
-            return new RNInstabugReactnativePackage(androidApplicationToken,application,invocationEvents,primaryColor,floatingButtonEdge,offset);
+            return new RNInstabugReactnativePackage(androidApplicationToken,application,invocationEvents,primaryColor,floatingButtonEdge,offset, isCrashReportingEnabled);
         }
 
         private InstabugFloatingButtonEdge getFloatingButtonEdge(String floatingButtonEdgeValue) {

ios/Instabug.framework/InstabugResources.bundle/Instabug_dsym_upload.sh

@@ -136,7 +136,7 @@ echo "Instabug: Compressing dSYM file..."
 # Upload dSYM
 echo "Instabug: Uploading dSYM file..."
 ENDPOINT="https://api.instabug.com/api/sdk/v3/symbols_files"
-STATUS=$(curl "${ENDPOINT}" --write-out %{http_code} --silent --output /dev/null -F symbols_file=@"${DSYM_PATH_ZIP}" -F application_token="${APP_TOKEN}")
+STATUS=$(curl "${ENDPOINT}" --write-out %{http_code} --silent --output /dev/null -F os=ios -F symbols_file=@"${DSYM_PATH_ZIP}" -F application_token="${APP_TOKEN}")
 if [ $STATUS -ne 200 ]; then
   echo "Instabug: err: dSYM archive not succesfully uploaded."
   echo "Instabug: deleting temporary dSYM archive..."

package.json

@@ -1,6 +1,6 @@
 {
   "name": "instabug-reactnative",
-  "version": "8.0.18",
+  "version": "8.0.23",
   "description": "React Native plugin for integrating the Instabug SDK",
   "main": "index.js",
   "repository": {
@@ -30,4 +30,4 @@
       "packageInstance": "\t\tnew RNInstabugReactnativePackage.Builder(\"YOUR_ANDROID_APPLICATION_TOKEN\",MainApplication.this)\n\t\t\t\t\t\t\t.setInvocationEvent(\"shake\")\n\t\t\t\t\t\t\t.setPrimaryColor(\"#1D82DC\")\n\t\t\t\t\t\t\t.setFloatingEdge(\"left\")\n\t\t\t\t\t\t\t.setFloatingButtonOffsetFromTop(250)\n\t\t\t\t\t\t\t.build()"
     }
   }
-}
+}