chore: pull changes from remove_deprecate_apis branch using rebase

Author: andrewdanieldev

android/native.gradle

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

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

@@ -1,6 +1,8 @@
 
 package com.instabug.reactlibrary;
 
+import static com.instabug.reactlibrary.utils.InstabugUtil.getMethod;
+
 import android.os.SystemClock;
 import android.util.Log;
 
@@ -15,17 +17,13 @@
 import com.instabug.apm.networking.APMNetworkLogger;
 import com.instabug.apm.networkinterception.cp.APMCPNetworkLog;
 import com.instabug.reactlibrary.utils.EventEmitterModule;
-import com.instabug.apm.networkinterception.cp.APMCPNetworkLog;
 import com.instabug.reactlibrary.utils.MainThreadHandler;
 
 import java.lang.reflect.Method;
-
 import java.util.HashMap;
 
 import javax.annotation.Nonnull;
 
-import static com.instabug.reactlibrary.utils.InstabugUtil.getMethod;
-
 public class RNInstabugAPMModule extends EventEmitterModule {
 
     public RNInstabugAPMModule(ReactApplicationContext reactApplicationContext) {
@@ -240,73 +238,73 @@ public void run() {
         });
     }
 
- /**
-  * The `networkLogAndroid` function logs network-related information using APMNetworkLogger in a React
-  * Native module.
-  *
-  * @param requestStartTime The `requestStartTime` parameter in the `networkLogAndroid` method
-  * represents the timestamp when the network request started. It is of type `double` and is passed as
-  * a parameter to log network-related information.
-  * @param requestDuration The `requestDuration` parameter in the `networkLogAndroid` method represents
-  * the duration of the network request in milliseconds. It indicates the time taken for the request to
-  * complete from the moment it was initiated until the response was received. This parameter helps in
-  * measuring the performance of network requests and identifying any potential
-  * @param requestHeaders requestHeaders is a string parameter that contains the headers of the network
-  * request. It typically includes information such as the content type, authorization token, and any
-  * other headers that were sent with the request.
-  * @param requestBody The `requestBody` parameter in the `networkLogAndroid` method represents the
-  * body of the HTTP request being logged. It contains the data that is sent as part of the request to
-  * the server. This could include form data, JSON payload, XML data, or any other content that is
-  * being transmitted
-  * @param requestBodySize The `requestBodySize` parameter in the `networkLogAndroid` method represents
-  * the size of the request body in bytes. It is a double value that indicates the size of the request
-  * body being sent in the network request. This parameter is used to log information related to the
-  * network request, including details
-  * @param requestMethod The `requestMethod` parameter in the `networkLogAndroid` method represents the
-  * HTTP method used in the network request, such as GET, POST, PUT, DELETE, etc. It indicates the type
-  * of operation that the client is requesting from the server.
-  * @param requestUrl The `requestUrl` parameter in the `networkLogAndroid` method represents the URL
-  * of the network request being logged. It typically contains the address of the server to which the
-  * request is being made, along with any additional path or query parameters required for the request.
-  * This URL is essential for identifying the
-  * @param requestContentType The `requestContentType` parameter in the `networkLogAndroid` method
-  * represents the content type of the request being made. This could be values like
-  * "application/json", "application/xml", "text/plain", etc., indicating the format of the data being
-  * sent in the request body. It helps in specifying
-  * @param responseHeaders The `responseHeaders` parameter in the `networkLogAndroid` method represents
-  * the headers of the response received from a network request. These headers typically include
-  * information such as content type, content length, server information, and any other metadata
-  * related to the response. The `responseHeaders` parameter is expected to
-  * @param responseBody The `responseBody` parameter in the `networkLogAndroid` method represents the
-  * body of the response received from a network request. It contains the data or content sent back by
-  * the server in response to the request made by the client. This could be in various formats such as
-  * JSON, XML, HTML
-  * @param responseBodySize The `responseBodySize` parameter in the `networkLogAndroid` method
-  * represents the size of the response body in bytes. It is a double value that indicates the size of
-  * the response body received from the network request. This parameter is used to log information
-  * related to the network request and response, including
-  * @param statusCode The `statusCode` parameter in the `networkLogAndroid` method represents the HTTP
-  * status code of the network request/response. It indicates the status of the HTTP response, such as
-  * success (200), redirection (3xx), client errors (4xx), or server errors (5xx). This parameter is
-  * @param responseContentType The `responseContentType` parameter in the `networkLogAndroid` method
-  * represents the content type of the response received from the network request. It indicates the
-  * format of the data in the response, such as JSON, XML, HTML, etc. This information is useful for
-  * understanding how to parse and handle the
-  * @param errorDomain The `errorDomain` parameter in the `networkLogAndroid` method is used to specify
-  * the domain of an error, if any occurred during the network request. If there was no error, this
-  * parameter will be `null`.
-  * @param w3cAttributes The `w3cAttributes` parameter in the `networkLogAndroid` method is a
-  * ReadableMap object that contains additional attributes related to W3C external trace. It may
-  * include the following key-value pairs:
-  * @param gqlQueryName The `gqlQueryName` parameter in the `networkLogAndroid` method represents the
-  * name of the GraphQL query being executed. It is a nullable parameter, meaning it can be null if no
-  * GraphQL query name is provided. This parameter is used to log information related to GraphQL
-  * queries in the network logging
-  * @param serverErrorMessage The `serverErrorMessage` parameter in the `networkLogAndroid` method is
-  * used to pass any error message received from the server during network communication. This message
-  * can provide additional details about any errors that occurred on the server side, helping in
-  * debugging and troubleshooting network-related issues.
-  */
+    /**
+     * The `networkLogAndroid` function logs network-related information using APMNetworkLogger in a React
+     * Native module.
+     *
+     * @param requestStartTime    The `requestStartTime` parameter in the `networkLogAndroid` method
+     *                            represents the timestamp when the network request started. It is of type `double` and is passed as
+     *                            a parameter to log network-related information.
+     * @param requestDuration     The `requestDuration` parameter in the `networkLogAndroid` method represents
+     *                            the duration of the network request in milliseconds. It indicates the time taken for the request to
+     *                            complete from the moment it was initiated until the response was received. This parameter helps in
+     *                            measuring the performance of network requests and identifying any potential
+     * @param requestHeaders      requestHeaders is a string parameter that contains the headers of the network
+     *                            request. It typically includes information such as the content type, authorization token, and any
+     *                            other headers that were sent with the request.
+     * @param requestBody         The `requestBody` parameter in the `networkLogAndroid` method represents the
+     *                            body of the HTTP request being logged. It contains the data that is sent as part of the request to
+     *                            the server. This could include form data, JSON payload, XML data, or any other content that is
+     *                            being transmitted
+     * @param requestBodySize     The `requestBodySize` parameter in the `networkLogAndroid` method represents
+     *                            the size of the request body in bytes. It is a double value that indicates the size of the request
+     *                            body being sent in the network request. This parameter is used to log information related to the
+     *                            network request, including details
+     * @param requestMethod       The `requestMethod` parameter in the `networkLogAndroid` method represents the
+     *                            HTTP method used in the network request, such as GET, POST, PUT, DELETE, etc. It indicates the type
+     *                            of operation that the client is requesting from the server.
+     * @param requestUrl          The `requestUrl` parameter in the `networkLogAndroid` method represents the URL
+     *                            of the network request being logged. It typically contains the address of the server to which the
+     *                            request is being made, along with any additional path or query parameters required for the request.
+     *                            This URL is essential for identifying the
+     * @param requestContentType  The `requestContentType` parameter in the `networkLogAndroid` method
+     *                            represents the content type of the request being made. This could be values like
+     *                            "application/json", "application/xml", "text/plain", etc., indicating the format of the data being
+     *                            sent in the request body. It helps in specifying
+     * @param responseHeaders     The `responseHeaders` parameter in the `networkLogAndroid` method represents
+     *                            the headers of the response received from a network request. These headers typically include
+     *                            information such as content type, content length, server information, and any other metadata
+     *                            related to the response. The `responseHeaders` parameter is expected to
+     * @param responseBody        The `responseBody` parameter in the `networkLogAndroid` method represents the
+     *                            body of the response received from a network request. It contains the data or content sent back by
+     *                            the server in response to the request made by the client. This could be in various formats such as
+     *                            JSON, XML, HTML
+     * @param responseBodySize    The `responseBodySize` parameter in the `networkLogAndroid` method
+     *                            represents the size of the response body in bytes. It is a double value that indicates the size of
+     *                            the response body received from the network request. This parameter is used to log information
+     *                            related to the network request and response, including
+     * @param statusCode          The `statusCode` parameter in the `networkLogAndroid` method represents the HTTP
+     *                            status code of the network request/response. It indicates the status of the HTTP response, such as
+     *                            success (200), redirection (3xx), client errors (4xx), or server errors (5xx). This parameter is
+     * @param responseContentType The `responseContentType` parameter in the `networkLogAndroid` method
+     *                            represents the content type of the response received from the network request. It indicates the
+     *                            format of the data in the response, such as JSON, XML, HTML, etc. This information is useful for
+     *                            understanding how to parse and handle the
+     * @param errorDomain         The `errorDomain` parameter in the `networkLogAndroid` method is used to specify
+     *                            the domain of an error, if any occurred during the network request. If there was no error, this
+     *                            parameter will be `null`.
+     * @param w3cAttributes       The `w3cAttributes` parameter in the `networkLogAndroid` method is a
+     *                            ReadableMap object that contains additional attributes related to W3C external trace. It may
+     *                            include the following key-value pairs:
+     * @param gqlQueryName        The `gqlQueryName` parameter in the `networkLogAndroid` method represents the
+     *                            name of the GraphQL query being executed. It is a nullable parameter, meaning it can be null if no
+     *                            GraphQL query name is provided. This parameter is used to log information related to GraphQL
+     *                            queries in the network logging
+     * @param serverErrorMessage  The `serverErrorMessage` parameter in the `networkLogAndroid` method is
+     *                            used to pass any error message received from the server during network communication. This message
+     *                            can provide additional details about any errors that occurred on the server side, helping in
+     *                            debugging and troubleshooting network-related issues.
+     */
     @ReactMethod
     private void networkLogAndroid(final double requestStartTime,
                                    final double requestDuration,
@@ -325,15 +323,15 @@ private void networkLogAndroid(final double requestStartTime,
                                    @Nullable final ReadableMap w3cAttributes,
                                    @Nullable final String gqlQueryName,
                                    @Nullable final String serverErrorMessage
-                                   ) {
+    ) {
         try {
             APMNetworkLogger networkLogger = new APMNetworkLogger();
 
             final boolean hasError = errorDomain != null && !errorDomain.isEmpty();
             final String errorMessage = hasError ? errorDomain : null;
-            Boolean isW3cHeaderFound=false;
-            Long partialId=null;
-            Long networkStartTimeInSeconds=null;
+            Boolean isW3cHeaderFound = false;
+            Long partialId = null;
+            Long networkStartTimeInSeconds = null;
 
 
             try {
@@ -342,7 +340,7 @@ private void networkLogAndroid(final double requestStartTime,
                 }
 
                 if (!w3cAttributes.isNull("partialId")) {
-                    partialId =(long) w3cAttributes.getDouble("partialId");
+                    partialId = (long) w3cAttributes.getDouble("partialId");
                     networkStartTimeInSeconds = (long) w3cAttributes.getDouble("networkStartTimeInSeconds");
                 }
 
@@ -360,34 +358,54 @@ private void networkLogAndroid(final double requestStartTime,
             try {
                 Method method = getMethod(Class.forName("com.instabug.apm.networking.APMNetworkLogger"), "log", long.class, long.class, String.class, String.class, long.class, String.class, String.class, String.class, String.class, String.class, long.class, int.class, String.class, String.class, String.class, String.class, APMCPNetworkLog.W3CExternalTraceAttributes.class);
                 if (method != null) {
-                        method.invoke(
-                                networkLogger,
-                                (long) requestStartTime * 1000,
-                                (long) requestDuration,
-                                requestHeaders,
-                                requestBody,
-                                (long)  requestBodySize,
-                                requestMethod,
-                                requestUrl,
-                                requestContentType,
-                                responseHeaders,
-                                responseBody,
-                                (long)responseBodySize,
-                                (int) statusCode,
-                                responseContentType,
-                                errorMessage,
-                                gqlQueryName,
-                                serverErrorMessage,
-                                w3cExternalTraceAttributes
-                        );
+                    method.invoke(
+                            networkLogger,
+                            (long) requestStartTime * 1000,
+                            (long) requestDuration,
+                            requestHeaders,
+                            requestBody,
+                            (long) requestBodySize,
+                            requestMethod,
+                            requestUrl,
+                            requestContentType,
+                            responseHeaders,
+                            responseBody,
+                            (long) responseBodySize,
+                            (int) statusCode,
+                            responseContentType,
+                            errorMessage,
+                            gqlQueryName,
+                            serverErrorMessage,
+                            w3cExternalTraceAttributes
+                    );
                 } else {
                     Log.e("IB-CP-Bridge", "APMNetworkLogger.log was not found by reflection");
                 }
             } catch (Throwable e) {
                 e.printStackTrace();
             }
-        } catch(Throwable e) {
+        } catch (Throwable e) {
             e.printStackTrace();
         }
     }
+
+
+    /**
+     * Enables or disables screen rendering
+     *
+     * @param isEnabled boolean indicating enabled or disabled.
+     */
+    @ReactMethod
+    public void setScreenRenderEnabled(boolean isEnabled) {
+        MainThreadHandler.runOnMainThread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    APM.setScreenRenderingEnabled(isEnabled);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+    }
 }

examples/default/src/App.tsx

@@ -5,7 +5,6 @@ import { GestureHandlerRootView } from 'react-native-gesture-handler';
 import { NavigationContainer, useNavigationContainerRef } from '@react-navigation/native';
 import type { SessionMetadata } from 'instabug-reactnative';
 import Instabug, {
-  APM,
   CrashReporting,
   InvocationEvent,
   LaunchType,
@@ -70,7 +69,7 @@ export const App: React.FC = () => {
         networkData.url = `${networkData.url}/JS/Obfuscated`;
         return networkData;
       });
-      APM.setScreenRenderEnabled(false);
+      // APM.setScreenRenderEnabled(true);
     });
   });