feat: support code push (#1079)

Jira ID: MOB-13384

Author: abdelhamid-f-nasser

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

@@ -18,7 +18,7 @@
 public class RNInstabug {
 
     private static RNInstabug instance;
-    
+
     private RNInstabug() {}
 
 
@@ -133,4 +133,117 @@ public void setBaseUrlForDeprecationLogs() {
             e.printStackTrace();
         }
     }
+
+    public static class Builder {
+
+        /**
+         * Application instance to initialize Instabug.
+         */
+        private Application application;
+
+        /**
+         * The application token obtained from the Instabug dashboard.
+         */
+        private String applicationToken;
+
+        /**
+         * The level of detail in logs that you want to print.
+         */
+        private int logLevel = LogLevel.ERROR;
+
+        /**
+         * The Code Push version to be used for all reports.
+         */
+        private String codePushVersion;
+
+        /**
+         * The events that trigger the SDK's user interface.
+         */
+        private InstabugInvocationEvent[] invocationEvents;
+
+
+        /**
+         * Initialize Instabug SDK with application token
+         *
+         * @param application      Application object for initialization of library
+         * @param applicationToken The app's identifying token, available on your dashboard.
+         */
+        public Builder(Application application, String applicationToken) {
+            this.application = application;
+            this.applicationToken = applicationToken;
+        }
+
+        /**
+         * Initialize Instabug SDK with application token and invocation trigger events
+         *
+         * @param application      Application object for initialization of library
+         * @param applicationToken The app's identifying token, available on your dashboard.
+         * @param invocationEvents The events that trigger the SDK's user interface.
+         *                         <p>Choose from the available events listed in {@link InstabugInvocationEvent}.</p>
+         */
+        public Builder(Application application, String applicationToken, InstabugInvocationEvent... invocationEvents) {
+            this.application = application;
+            this.applicationToken = applicationToken;
+            this.invocationEvents = invocationEvents;
+        }
+
+        /**
+         * Sets the filtering level for printed SDK logs.
+         *
+         * @param logLevel The log filtering level to be set.
+         *                 Choose from {@link LogLevel} constants:
+         *                 {@link LogLevel#NONE}, {@link LogLevel#ERROR}, {@link LogLevel#DEBUG}, or {@link LogLevel#VERBOSE}.
+         *                 <p>Default level is {@link LogLevel#ERROR}.</p>
+         */
+        public Builder setLogLevel(int logLevel) {
+            this.logLevel = logLevel;
+            return this;
+        }
+
+        /**
+         * Sets Code Push version to be used for all reports.
+         *
+         * @param codePushVersion the Code Push version to work with.
+         */
+        public Builder setCodePushVersion(String codePushVersion) {
+            this.codePushVersion = codePushVersion;
+            return this;
+        }
+
+        /**
+         * Sets the invocation triggering events for the SDK's user interface
+         *
+         * @param invocationEvents The events that trigger the SDK's user interface.
+         *                         Choose from the available events listed in {@link InstabugInvocationEvent}.
+         */
+        public Builder setInvocationEvents(InstabugInvocationEvent... invocationEvents) {
+            this.invocationEvents = invocationEvents;
+            return this;
+        }
+
+        /**
+         * Builds the Instabug instance with the provided configurations.
+         */
+        public void build() {
+            try {
+                RNInstabug.getInstance().setBaseUrlForDeprecationLogs();
+                RNInstabug.getInstance().setCurrentPlatform();
+
+                Instabug.Builder instabugBuilder = new Instabug.Builder(application, applicationToken)
+                        .setInvocationEvents(invocationEvents)
+                        .setSdkDebugLogsLevel(logLevel);
+
+                if (codePushVersion != null) {
+                    instabugBuilder.setCodePushVersion(codePushVersion);
+                }
+
+                instabugBuilder.build();
+
+                // Temporarily disabling APM hot launches
+                APM.setHotAppLaunchEnabled(false);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
 }

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

@@ -50,6 +50,8 @@
 import java.util.Locale;
 import java.util.Map;
 
+import javax.annotation.Nullable;
+
 
 /**
  * The type Rn instabug reactnative module.
@@ -117,9 +119,16 @@ public void run() {
      * Initializes the SDK.
      * @param token The token that identifies the app. You can find it on your dashboard.
      * @param invocationEventValues The events that invoke the SDK's UI.
+     * @param logLevel The level of detail in logs that you want to print.
+     * @param codePushVersion The Code Push version to be used for all reports.
      */
     @ReactMethod
-    public void init(final String token, final ReadableArray invocationEventValues, final String logLevel) {
+    public void init(
+            final String token,
+            final ReadableArray invocationEventValues,
+            final String logLevel,
+            @Nullable final String codePushVersion
+    ) {
         MainThreadHandler.runOnMainThread(new Runnable() {
             @Override
             public void run() {
@@ -130,7 +139,14 @@ public void run() {
 
                 final Application application = (Application) reactContext.getApplicationContext();
 
-                RNInstabug.getInstance().init(application, token, parsedLogLevel, invocationEvents);
+                RNInstabug.Builder builder = new RNInstabug.Builder(application, token)
+                        .setInvocationEvents(invocationEvents)
+                        .setLogLevel(parsedLogLevel);
+
+                if(codePushVersion != null) {
+                    builder.setCodePushVersion(codePushVersion);
+                }
+                builder.build();
             }
         });
     }

examples/default/ios/InstabugTests/InstabugSampleTests.m

@@ -65,12 +65,17 @@ - (void)testSetEnabled {
 }
 
 - (void)testInit {
+  id mock = OCMClassMock([Instabug class]);
   IBGInvocationEvent floatingButtonInvocationEvent = IBGInvocationEventFloatingButton;
   NSString *appToken = @"app_token";
+  NSString *codePushVersion = @"1.0.0(1)";
   NSArray *invocationEvents = [NSArray arrayWithObjects:[NSNumber numberWithInteger:floatingButtonInvocationEvent], nil];
   IBGSDKDebugLogsLevel sdkDebugLogsLevel = IBGSDKDebugLogsLevelDebug;
+  
+  OCMStub([mock setCodePushVersion:codePushVersion]);
 
-  [self.instabugBridge init:appToken invocationEvents:invocationEvents debugLogsLevel:sdkDebugLogsLevel];
+  [self.instabugBridge init:appToken invocationEvents:invocationEvents debugLogsLevel:sdkDebugLogsLevel codePushVersion:codePushVersion];
+  OCMVerify([mock setCodePushVersion:codePushVersion]);
 
   OCMVerify([self.mRNInstabug initWithToken:appToken invocationEvents:floatingButtonInvocationEvent debugLogsLevel:sdkDebugLogsLevel]);
 }

examples/default/ios/InstabugTests/RNInstabugTests.m

@@ -41,20 +41,6 @@ - (void)testInitWithoutLogsLevel {
   OCMVerify([self.mIBGNetworkLogger setEnabled:YES]);
 }
 
-- (void)testInitStartsOnce {
-  NSString *token = @"app-token";
-  IBGInvocationEvent invocationEvents = IBGInvocationEventFloatingButton | IBGInvocationEventShake;
-
-  // Call init twice to check that only 1 call to native methods happens.
-  [RNInstabug initWithToken:token invocationEvents:invocationEvents];
-  [RNInstabug initWithToken:token invocationEvents:invocationEvents];
-
-  OCMVerify(times(1), [self.mInstabug startWithToken:token invocationEvents:invocationEvents]);
-  OCMVerify(times(1), [self.mInstabug setCurrentPlatform:IBGPlatformReactNative]);
-  OCMVerify(times(1), [self.mIBGNetworkLogger disableAutomaticCapturingOfNetworkLogs]);
-  OCMVerify(times(1), [self.mIBGNetworkLogger setEnabled:YES]);
-}
-
 - (void)testInitWithLogsLevel {
   NSString *token = @"app-token";
   IBGInvocationEvent invocationEvents = IBGInvocationEventFloatingButton | IBGInvocationEventShake;
@@ -68,4 +54,11 @@ - (void)testInitWithLogsLevel {
   OCMVerify([self.mIBGNetworkLogger setEnabled:YES]);
 }
 
+- (void) testSetCodePushVersion {
+  NSString *codePushVersion = @"1.0.0(1)";
+  [RNInstabug setCodePushVersion:codePushVersion];
+  
+  OCMVerify([self.mInstabug setCodePushVersion:codePushVersion]);
+}
+
 @end

ios/RNInstabug/InstabugReactBridge.h

@@ -27,7 +27,7 @@
 
 - (void)setEnabled:(BOOL)isEnabled;
 
-- (void)init:(NSString *)token invocationEvents:(NSArray *)invocationEventsArray debugLogsLevel:(IBGSDKDebugLogsLevel)sdkDebugLogsLevel;
+- (void)init:(NSString *)token invocationEvents:(NSArray *)invocationEventsArray debugLogsLevel:(IBGSDKDebugLogsLevel)sdkDebugLogsLevel codePushVersion:(NSString *)codePushVersion;
 
 - (void)setUserData:(NSString *)userData;
 

ios/RNInstabug/InstabugReactBridge.m

@@ -37,14 +37,21 @@ - (dispatch_queue_t)methodQueue {
     Instabug.enabled = isEnabled;
 }
 
-RCT_EXPORT_METHOD(init:(NSString *)token invocationEvents:(NSArray*)invocationEventsArray debugLogsLevel:(IBGSDKDebugLogsLevel)sdkDebugLogsLevel) {
+RCT_EXPORT_METHOD(init:(NSString *)token
+          invocationEvents:(NSArray *)invocationEventsArray
+          debugLogsLevel:(IBGSDKDebugLogsLevel)sdkDebugLogsLevel
+          codePushVersion:(NSString *)codePushVersion) {
     IBGInvocationEvent invocationEvents = 0;
 
     for (NSNumber *boxedValue in invocationEventsArray) {
         invocationEvents |= [boxedValue intValue];
     }
 
-    [RNInstabug initWithToken:token invocationEvents:invocationEvents debugLogsLevel:sdkDebugLogsLevel];
+    [Instabug setCodePushVersion:codePushVersion];
+
+    [RNInstabug initWithToken:token
+             invocationEvents:invocationEvents
+               debugLogsLevel:sdkDebugLogsLevel];
 }
 
 RCT_EXPORT_METHOD(setReproStepsConfig:(IBGUserStepsMode)bugMode :(IBGUserStepsMode)crashMode:(IBGUserStepsMode)sessionReplayMode) {

ios/RNInstabug/RNInstabug.h

@@ -8,6 +8,17 @@
 + (void)initWithToken:(NSString *)token invocationEvents:(IBGInvocationEvent)invocationEvents debugLogsLevel:(IBGSDKDebugLogsLevel)debugLogsLevel;
 + (void)initWithToken:(NSString *)token invocationEvents:(IBGInvocationEvent)invocationEvents;
 
+/**
+ @brief Set codePush version before starting the SDK.
+ 
+ @discussion Sets Code Push version to be used for all reports.
+ should be called from `-[UIApplicationDelegate application:didFinishLaunchingWithOptions:]`
+ and before `startWithToken`.
+ 
+ @param codePushVersion the Code Push version to be used for all reports.
+ */
++ (void)setCodePushVersion:(NSString *)codePushVersion;
+
 @end
 
 #endif /* RNInstabug_h */

ios/RNInstabug/RNInstabug.m

@@ -14,11 +14,6 @@ + (void)reset {
 }
 
 + (void)initWithToken:(NSString *)token invocationEvents:(IBGInvocationEvent)invocationEvents  {
-    // Initialization is performed only once to avoid unexpected behavior.
-    if (didInit) {
-        NSLog(@"IBG-RN: Skipped iOS SDK re-initialization");
-        return;
-    }
 
     didInit = YES;
 
@@ -49,6 +44,10 @@ + (void)initWithToken:(NSString *)token
     [self initWithToken:token invocationEvents:invocationEvents];
 }
 
++ (void)setCodePushVersion:(NSString *)codePushVersion {
+    [Instabug setCodePushVersion:codePushVersion];
+}
+
 // Note: This function is used to bridge IBGNSLog with RCTLogFunction.
 // This log function should not be used externally and is only an implementation detail.
 void RNIBGLog(IBGLogLevel logLevel, NSString *format,  ...) {

src/models/InstabugConfig.ts

@@ -13,4 +13,9 @@ export interface InstabugConfig {
    * An optional LogLevel to indicate the verbosity of SDK logs. Default is Error.
    */
   debugLogsLevel?: LogLevel;
+
+  /**
+   * An optional code push version to be used for all reports.
+   */
+  codePushVersion?: string;
 }

src/modules/Instabug.ts

@@ -67,6 +67,7 @@ export const init = (config: InstabugConfig) => {
     config.token,
     config.invocationEvents,
     config.debugLogsLevel ?? LogLevel.error,
+    config.codePushVersion,
   );
 
   _isFirstScreen = true;