Merge remote-tracking branch 'origin/dev' into feat/support-expo-updates

Author: kholood-ea

CHANGELOG.md

@@ -4,9 +4,20 @@
 
 ### Added
 
-- Add support for xCode 16. ([#1370](https://github.com/Instabug/Instabug-React-Native/pull/1370))
 - Add support for expo updates versioning ([#1391](https://github.com/Instabug/Instabug-React-Native/pull/1391))
 
+- Add support enable/disable screenshot auto masking. ([#1389](https://github.com/Instabug/Instabug-React-Native/pull/1389))
+
+- Add support for BugReporting user consents. ([#1383](https://github.com/Instabug/Instabug-React-Native/pull/1383))
+
+- Add support for xCode 16. ([#1370](https://github.com/Instabug/Instabug-React-Native/pull/1370))
+
+### Fixed
+
+- Not sending the inComplete xhrRequest. ([#1365](https://github.com/Instabug/Instabug-React-Native/pull/1365))
+
+- Added more search capabilities to the find-token.sh script. e.g., searching in .env file for react config. [#1366](https://github.com/Instabug/Instabug-React-Native/pull/1366)
+
 ## [14.3.0](https://github.com/Instabug/Instabug-React-Native/compare/v14.1.0...14.3.0)
 
 ### Added

android/src/main/java/com/instabug/apm/networking/ApmNetworkLoggerHelper.java

@@ -0,0 +1,89 @@
+package com.instabug.apm.networking;
+
+import androidx.annotation.Nullable;
+
+import com.facebook.react.bridge.ReadableMap;
+import com.instabug.apm.networking.mapping.NetworkRequestAttributes;
+import com.instabug.apm.networkinterception.cp.APMCPNetworkLog;
+
+public class ApmNetworkLoggerHelper {
+
+    /// Log network request to the Android SDK using a package private API [APMNetworkLogger.log]
+    static public void log(final double requestStartTime,
+                           final double requestDuration,
+                           final String requestHeaders,
+                           final String requestBody,
+                           final double requestBodySize,
+                           final String requestMethod,
+                           final String requestUrl,
+                           final String requestContentType,
+                           final String responseHeaders,
+                           final String responseBody,
+                           final double responseBodySize,
+                           final double statusCode,
+                           final String responseContentType,
+                           @Nullable final String errorDomain,
+                           @Nullable final ReadableMap w3cAttributes,
+                           @Nullable final String gqlQueryName,
+                           @Nullable final String serverErrorMessage
+    ) {
+        try {
+            final APMNetworkLogger apmNetworkLogger = new APMNetworkLogger();
+            final boolean hasError = errorDomain != null && !errorDomain.isEmpty();
+            final String errorMessage = hasError ? errorDomain : null;
+            boolean isW3cHeaderFound = false;
+            Long partialId = null;
+            Long networkStartTimeInSeconds = null;
+
+
+            try {
+                if (!w3cAttributes.isNull("isW3cHeaderFound")) {
+                    isW3cHeaderFound = w3cAttributes.getBoolean("isW3cHeaderFound");
+                }
+
+                if (!w3cAttributes.isNull("partialId")) {
+                    partialId = (long) w3cAttributes.getDouble("partialId");
+                    networkStartTimeInSeconds = (long) w3cAttributes.getDouble("networkStartTimeInSeconds");
+                }
+
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            APMCPNetworkLog.W3CExternalTraceAttributes w3cExternalTraceAttributes =
+                    new APMCPNetworkLog.W3CExternalTraceAttributes(
+                            isW3cHeaderFound,
+                            partialId,
+                            networkStartTimeInSeconds,
+                            w3cAttributes.getString("w3cGeneratedHeader"),
+                            w3cAttributes.getString("w3cCaughtHeader")
+                    );
+            NetworkRequestAttributes requestAttributes = new NetworkRequestAttributes(
+                    (long) requestStartTime * 1000,
+                    (long) requestDuration,
+                    requestHeaders,
+                    requestBody,
+                    (long) requestBodySize,
+                    requestMethod,
+                    requestUrl,
+                    requestContentType,
+                    responseHeaders,
+                    responseBody,
+                    (long) responseBodySize,
+                    (int) statusCode,
+                    responseContentType,
+                    gqlQueryName,
+                    errorMessage,
+                    serverErrorMessage
+            );
+
+            apmNetworkLogger.log(
+                    requestAttributes,
+                    w3cExternalTraceAttributes
+            );
+        } catch (Throwable e) {
+            e.printStackTrace();
+        }
+
+    }
+
+}

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

@@ -18,6 +18,7 @@
 import com.instabug.library.sessionreplay.model.SessionMetadata;
 import com.instabug.library.ui.onboarding.WelcomeMessage;
 import com.instabug.library.util.overairversion.OverAirVersionType;
+import com.instabug.library.MaskingType;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -62,6 +63,8 @@ static Map<String, Object> getAll() {
             putAll(placeholders);
             putAll(launchType);
             putAll(overAirUpdateService);
+            putAll(autoMaskingTypes);
+            putAll(userConsentActionType);
         }};
     }
 
@@ -144,6 +147,12 @@ static Map<String, Object> getAll() {
         put("reproStepsDisabled", ReproMode.Disable);
     }};
 
+    static final ArgsMap<String> userConsentActionType = new ArgsMap<String>() {{
+        put("dropAutoCapturedMedia",  com.instabug.bug.userConsent.ActionType.DROP_AUTO_CAPTURED_MEDIA);
+        put("dropLogs",  com.instabug.bug.userConsent.ActionType.DROP_LOGS);
+        put("noChat",  com.instabug.bug.userConsent.ActionType.NO_CHAT);
+    }};
+
     static final ArgsMap<Integer> sdkLogLevels = new ArgsMap<Integer>() {{
         put("sdkDebugLogsLevelNone", com.instabug.library.LogLevel.NONE);
         put("sdkDebugLogsLevelError", com.instabug.library.LogLevel.ERROR);
@@ -260,5 +269,10 @@ static Map<String, Object> getAll() {
         put(SessionMetadata.LaunchType.COLD,"cold");
         put(SessionMetadata.LaunchType.WARM,"warm" );
     }};
-
+    public static final ArgsMap<Integer> autoMaskingTypes = new ArgsMap<Integer>() {{
+        put("labels", MaskingType.LABELS);
+        put("textInputs", MaskingType.TEXT_INPUTS);
+        put("media", MaskingType.MEDIA);
+        put("none", MaskingType.MASK_NOTHING);
+    }};
 }