snapshot dream 11

.circleci/config.yml

@@ -367,7 +367,6 @@ workflows:
       - e2e_android
       - hold_generate_snapshot:
           type: approval
-          requires: *release_dependencies
       - generate_snapshot:
           requires:
             - hold_generate_snapshot

CHANGELOG.md

@@ -1,6 +1,17 @@
 # Changelog
 
-## [12.4.0](https://github.com/Instabug/Instabug-React-Native/compare/v12.2.0...v12.4.0) (December 6, 2023)
+## [Unreleased](https://github.com/Instabug/Instabug-React-Native/compare/v12.4.0...dev)
+
+### Changed
+
+- Bump Instabug iOS SDK to v12.5.0 ([#1085](https://github.com/Instabug/Instabug-React-Native/pull/1085)). [See release notes](https://github.com/instabug/instabug-ios/releases/tag/12.5.0).
+- Bump Instabug Android SDK to v12.5.1 ([#1088](https://github.com/Instabug/Instabug-React-Native/pull/1085)). See release notes for [v12.5.0](https://github.com/Instabug/android/releases/tag/v12.5.0) and [v12.5.1](https://github.com/Instabug/android/releases/tag/v12.5.1).
+
+### Fixed
+
+- Fix a delay issue in reporting the 'Current View' that resulted in displaying outdated values ([#1080](https://github.com/Instabug/Instabug-React-Native/pull/1080)).
+
+## [12.4.0](https://github.com/Instabug/Instabug-React-Native/compare/v12.2.0...v12.4.0) (December 7, 2023)
 
 ### Changed
 
@@ -12,7 +23,7 @@
 - Fix an issue with `Instabug.init` on Android causing the app to crash while trying to get the current `Application` instance through the current activity which can be `null` in some cases by utilizing the React context instead ([#1069](https://github.com/Instabug/Instabug-React-Native/pull/1069)).
 - Fix an issue with unhandled JavaScript crashes not getting linked with the current session causing inaccurate session metrics ([#1071](https://github.com/Instabug/Instabug-React-Native/pull/1071)).
 
-## [12.2.0](https://github.com/Instabug/Instabug-React-Native/compare/v12.2.0...v12.1.0)
+## [12.2.0](https://github.com/Instabug/Instabug-React-Native/compare/v12.1.0...v12.2.0) (November 14, 2023)
 
 ### Added
 
@@ -29,7 +40,7 @@
 - Fix an issue with unhandled JavaScript crashes being reported as native iOS crashes ([#1054](https://github.com/Instabug/Instabug-React-Native/pull/1054))
 - Re-enable screenshot capturing for Crash Reporting and Session Replay by removing redundant mapping ([#1055](https://github.com/Instabug/Instabug-React-Native/pull/1055)).
 
-## [12.1.0](https://github.com/Instabug/Instabug-React-Native/compare/v12.1.0...v11.14.0)
+## [12.1.0](https://github.com/Instabug/Instabug-React-Native/compare/v11.14.0...v12.1.0) (October 3, 2023)
 
 ### Added
 

RNInstabug.podspec

@@ -16,5 +16,5 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,m,mm}"
 
   s.dependency 'React-Core'
-  use_instabug!(s)
+  s.dependency 'Instabug'
 end

android/build.gradle

@@ -4,6 +4,17 @@ apply from: './jacoco.gradle'
 apply from: './native.gradle'
 apply from: './sourcemaps.gradle'
 
+
+rootProject.allprojects {
+    repositories {
+        google()
+        jcenter()
+        maven {
+            url 'https://oss.sonatype.org/content/repositories/snapshots'
+        }
+    }
+}
+
 String getExtOrDefault(String name) {
     def defaultPropertyKey = 'InstabugReactNative_' + name
     if (rootProject.ext.has(name)) {
@@ -13,12 +24,12 @@ String getExtOrDefault(String name) {
 }
 
 static boolean supportsNamespace() {
-    def parsed = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')
-    def major = parsed[0].toInteger()
-    def minor = parsed[1].toInteger()
+//    def parsed = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')
+//    def major = parsed[0].toInteger()
+//    def minor = parsed[1].toInteger()
 
-    // Namespace support was added in 7.3.0
-    return (major == 7 && minor >= 3) || major >= 8
+    // Namespace support was added in 7.3.0 (disabled for now)
+    return false
 }
 
 void updateManifestPackage() {

android/native.gradle

@@ -1,5 +1,5 @@
 project.ext.instabug = [
-    version: '12.4.1'
+    version: '12.4.0.5503778-SNAPSHOT'
 ]
 
 dependencies {

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();
             }
         });
     }
@@ -916,6 +932,29 @@ public void execute(NativeViewHierarchyManager nativeViewHierarchyManager) {
         });
     }
 
+    /**
+     * Reports that the screen name been changed (Current View).
+     *
+     * @param screenName string containing the screen name
+     *
+     */
+    @ReactMethod
+    public void reportCurrentViewChange(final String screenName) {
+        MainThreadHandler.runOnMainThread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    Method method = getMethod(Class.forName("com.instabug.library.Instabug"), "reportCurrentViewChange", String.class);
+                    if (method != null) {
+                        method.invoke(null, screenName);
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+    }
+
     /**
      * Reports that the screen has been changed (Repro Steps) the screen sent to this method will be the 'current view' on the dashboard
      *

android/src/main/java/com/instabug/reactlibrary/utils/ReportUtil.java

@@ -70,7 +70,7 @@ public static WritableArray parseConsoleLogs(ArrayList<a> consoleLogs) {
         for(int i = 0; i < consoleLogs.size(); i++) {
             try {
                 writableArray.pushString(consoleLogs.get(i).toJson());
-            } catch (JSONException e) {
+            } catch (Exception e) {
                 e.printStackTrace();
             }
 

android/src/test/java/com/instabug/reactlibrary/RNInstabugReactnativeModuleTest.java

@@ -482,6 +482,18 @@ public void tearDown() {
         }
     }
 
+    @Test
+    public void givenString$reportCurrentViewChange_whenQuery_thenShouldCallNativeApiWithString() throws Exception {
+        // when
+        rnModule.reportCurrentViewChange("screen");
+        Method privateStringMethod = getMethod(Class.forName("com.instabug.library.Instabug"), "reportCurrentViewChange", String.class);
+        privateStringMethod.setAccessible(true);
+
+        // then
+        verify(Instabug.class, VerificationModeFactory.times(1));
+        privateStringMethod.invoke("reportCurrentViewChange","screen");
+    }
+
     @Test
     public void givenString$reportScreenChange_whenQuery_thenShouldCallNativeApiWithString() throws Exception {
         // when