@logrocket/react-native 1.25.1 → 1.26.1

package/android/build.gradle

@@ -13,7 +13,7 @@
 def DEFAULT_COMPILE_SDK_VERSION = 31
 def DEFAULT_MIN_SDK_VERSION = 21
 def DEFAULT_TARGET_SDK_VERSION = 31
-def SDK_VERSION = "1.25.1"
+def SDK_VERSION = "1.26.1"
 
 def PACKAGE_ROOT_DIR = rootProject.name == 'LogRocket SDK' ? "$rootDir/../packages/@logrocket/react-native" : "$rootDir/..";
 

package/android/src/main/java/com/logrocket/plugins/react/LogRocketNativeModule.java

@@ -25,6 +25,7 @@ import com.logrocket.core.CustomEventBuilder;
 import com.logrocket.core.IdentifyHelper;
 import com.logrocket.core.LogRocketCore;
 import com.logrocket.core.SDK;
+import com.logrocket.core.SDK.OptionsConfiguration;
 import com.logrocket.core.SDK.SanitizerType;
 import com.logrocket.core.TelemetryReporter;
 import com.logrocket.core.network.IRequestBuilder;
@@ -91,86 +92,7 @@ public class LogRocketNativeModule extends ReactContextBaseJavaModule {
       promise.resolve(
           SDK.init(
               this.reactContext,
-              options -> {
-                options.setAppID(appID);
-
-                if (config == null) {
-                  return;
-                }
-
-                if (config.hasKey("serverURL")) {
-                  options.setServerURL(config.getString("serverURL"));
-                }
-
-                if (config.hasKey("enableIPCapture")) {
-                  options.setEnableIPCapture(config.getBoolean("enableIPCapture"));
-                }
-
-                if (config.hasKey("enableJetpackCompose")) {
-                  options.setEnableJetpackCompose(config.getBoolean("enableJetpackCompose"));
-                }
-
-                if (config.hasKey("uploadIntervalMs")) {
-                  options.setUploadIntervalMs(config.getInt("uploadIntervalMs"));
-                }
-
-                if (config.hasKey("viewScanIntervalSeconds")) {
-                  options.setViewScanIntervalSeconds(config.getInt("viewScanIntervalSeconds"));
-                }
-
-                if (config.hasKey("logLevel") && !config.isNull("logLevel")) {
-                  //noinspection ConstantConditions
-                  options.setLogLevel(SDK.LogLevel.fromString(config.getString("logLevel")));
-                }
-
-                if (config.hasKey("connectionType") && !config.isNull("connectionType")) {
-                  //noinspection ConstantConditions
-                  options.setConnectionType(
-                      SDK.ConnectionType.fromString(config.getString("connectionType")));
-                }
-
-                if (config.hasKey("allowTags")) {
-                  ReadableArray allowTags = config.getArray("allowTags");
-                  if (allowTags != null) {
-                    ArrayList<Object> tags = allowTags.toArrayList();
-                    for (Object tag : tags) {
-                      options.addAllowTag(tag);
-                    }
-                  }
-                }
-
-                if (config.hasKey("redactionTags")) {
-                  ReadableArray redactionTags = config.getArray("redactionTags");
-                  if (redactionTags != null) {
-                    ArrayList<Object> tags = redactionTags.toArrayList();
-                    for (Object tag : tags) {
-                      options.addRedactionTag(tag);
-                    }
-                  }
-                }
-
-                if (config.hasKey("enablePersistence")) {
-                  options.setEnablePersistence(config.getBoolean("enablePersistence"));
-                }
-
-                if (config.hasKey("shouldDetectExceptions")) {
-                  options.setShouldDetectExceptions(config.getBoolean("shouldDetectExceptions"));
-                }
-
-                if (config.hasKey("textSanitizer") && !config.isNull("textSanitizer")) {
-                  //noinspection ConstantConditions
-                  options.setTextSanitizer(
-                      SanitizerType.fromString(config.getString("textSanitizer")));
-                }
-
-                ReadableMap androidProxy = config.getMap("androidProxy");
-                if (androidProxy != null) {
-                  options.setProxyHost(androidProxy.getString("host"));
-                  options.setProxyPort(androidProxy.getInt("port"));
-                  options.setProxyAuthHeaderName(androidProxy.getString("authHeaderName"));
-                  options.setProxyAuthHeaderValue(androidProxy.getString("authHeaderValue"));
-                }
-              }));
+              createOptionsConfiguration(appID, config)));
     } catch (Throwable th) {
       this.logger.error("Error during init", th);
       TelemetryReporter.sendErrorTelemetry(th);
@@ -542,4 +464,91 @@ public class LogRocketNativeModule extends ReactContextBaseJavaModule {
       }
     }
   }
+
+  private final OptionsConfiguration createOptionsConfiguration(String appID, ReadableMap config) {
+    return options -> {
+      options.setAppID(appID);
+
+      if (config == null) {
+        return;
+      }
+
+      if (config.hasKey("serverURL")) {
+        options.setServerURL(config.getString("serverURL"));
+      }
+
+      if (config.hasKey("enableIPCapture")) {
+        options.setEnableIPCapture(config.getBoolean("enableIPCapture"));
+      }
+
+      if (config.hasKey("enableJetpackCompose")) {
+        options.setEnableJetpackCompose(config.getBoolean("enableJetpackCompose"));
+      }
+
+      if (config.hasKey("forceCleanStart")) {
+        options.setForceCleanStart(config.getBoolean("forceCleanStart"));
+      }
+
+      if (config.hasKey("uploadIntervalMs")) {
+        options.setUploadIntervalMs(config.getInt("uploadIntervalMs"));
+      }
+
+      if (config.hasKey("viewScanIntervalSeconds")) {
+        options.setViewScanIntervalSeconds(config.getInt("viewScanIntervalSeconds"));
+      }
+
+      if (config.hasKey("logLevel") && !config.isNull("logLevel")) {
+        //noinspection ConstantConditions
+        options.setLogLevel(SDK.LogLevel.fromString(config.getString("logLevel")));
+      }
+
+      if (config.hasKey("connectionType") && !config.isNull("connectionType")) {
+        //noinspection ConstantConditions
+        options.setConnectionType(
+                SDK.ConnectionType.fromString(config.getString("connectionType")));
+      }
+
+      if (config.hasKey("allowTags")) {
+        ReadableArray allowTags = config.getArray("allowTags");
+        if (allowTags != null) {
+          ArrayList<Object> tags = allowTags.toArrayList();
+          for (Object tag : tags) {
+            options.addAllowTag(tag);
+          }
+        }
+      }
+
+      if (config.hasKey("redactionTags")) {
+        ReadableArray redactionTags = config.getArray("redactionTags");
+        if (redactionTags != null) {
+          ArrayList<Object> tags = redactionTags.toArrayList();
+          for (Object tag : tags) {
+            options.addRedactionTag(tag);
+          }
+        }
+      }
+
+      if (config.hasKey("enablePersistence")) {
+        options.setEnablePersistence(config.getBoolean("enablePersistence"));
+      }
+
+      if (config.hasKey("shouldDetectExceptions")) {
+        options.setShouldDetectExceptions(config.getBoolean("shouldDetectExceptions"));
+      }
+
+      if (config.hasKey("textSanitizer") && !config.isNull("textSanitizer")) {
+        //noinspection ConstantConditions
+        options.setTextSanitizer(
+                SanitizerType.fromString(config.getString("textSanitizer")));
+      }
+
+      ReadableMap androidProxy = config.getMap("androidProxy");
+      if (androidProxy != null) {
+        options.setProxyHost(androidProxy.getString("host"));
+        options.setProxyPort(androidProxy.getInt("port"));
+        options.setProxyAuthHeaderName(androidProxy.getString("authHeaderName"));
+        options.setProxyAuthHeaderValue(androidProxy.getString("authHeaderValue"));
+      }
+    };
+  }
 }