@sentry/react-native 6.12.0 → 6.13.0

package/RNSentry.podspec

@@ -37,7 +37,7 @@ Pod::Spec.new do |s|
 
   s.compiler_flags = other_cflags
 
-  s.dependency 'Sentry/HybridSDK', '8.49.1'
+  s.dependency 'Sentry/HybridSDK', '8.49.2'
 
   if defined? install_modules_dependencies
     # Default React Native dependencies for 0.71 and above (new and legacy architecture)

package/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java

@@ -90,6 +90,7 @@ import java.util.Properties;
 import java.util.concurrent.CountDownLatch;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.TestOnly;
 
 public class RNSentryModuleImpl {
 
@@ -177,12 +178,22 @@ public class RNSentryModuleImpl {
 
   public void initNativeSdk(final ReadableMap rnOptions, Promise promise) {
     SentryAndroid.init(
-        this.getReactApplicationContext(),
-        options -> getSentryAndroidOptions(options, rnOptions, logger));
+        getApplicationContext(), options -> getSentryAndroidOptions(options, rnOptions, logger));
 
     promise.resolve(true);
   }
 
+  @TestOnly
+  protected Context getApplicationContext() {
+    final Context context = this.getReactApplicationContext().getApplicationContext();
+    if (context == null) {
+      logger.log(
+          SentryLevel.ERROR, "ApplicationContext is null, using ReactApplicationContext fallback.");
+      return this.getReactApplicationContext();
+    }
+    return context;
+  }
+
   protected void getSentryAndroidOptions(
       @NotNull SentryAndroidOptions options, @NotNull ReadableMap rnOptions, ILogger logger) {
     @Nullable SdkVersion sdkVersion = options.getSdkVersion();

package/android/src/main/java/io/sentry/react/RNSentryOnDrawReporterManager.java

@@ -14,6 +14,7 @@ import io.sentry.android.core.AndroidLogger;
 import io.sentry.android.core.BuildInfoProvider;
 import io.sentry.android.core.SentryAndroidDateProvider;
 import io.sentry.android.core.internal.util.FirstDrawDoneListener;
+import io.sentry.react.utils.RNSentryActivityUtils;
 import java.util.Objects;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -151,11 +152,12 @@ public class RNSentryOnDrawReporterManager
         return;
       }
 
-      @Nullable Activity activity = reactContext.getCurrentActivity();
+      final @Nullable Activity activity =
+          RNSentryActivityUtils.getCurrentActivity(reactContext, logger);
       if (activity == null) {
         logger.log(
             SentryLevel.ERROR,
-            "[TimeToDisplay] Won't emit next frame drawn event, reactContext is null.");
+            "[TimeToDisplay] Won't emit next frame drawn event, activity is null.");
         return;
       }
 

package/android/src/main/java/io/sentry/react/RNSentryVersion.java

@@ -2,7 +2,7 @@ package io.sentry.react;
 
 class RNSentryVersion {
   static final String REACT_NATIVE_SDK_PACKAGE_NAME = "npm:@sentry/react-native";
-  static final String REACT_NATIVE_SDK_PACKAGE_VERSION = "6.12.0";
+  static final String REACT_NATIVE_SDK_PACKAGE_VERSION = "6.13.0";
   static final String NATIVE_SDK_NAME = "sentry.native.android.react-native";
   static final String ANDROID_SDK_NAME = "sentry.java.android.react-native";
   static final String REACT_NATIVE_SDK_NAME = "sentry.javascript.react-native";

package/android/src/main/java/io/sentry/react/utils/RNSentryActivityUtils.java

@@ -0,0 +1,31 @@
+package io.sentry.react.utils;
+
+import android.app.Activity;
+import com.facebook.react.bridge.ReactApplicationContext;
+import io.sentry.ILogger;
+import io.sentry.SentryLevel;
+import io.sentry.android.core.CurrentActivityHolder;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/** Utility class for React Native Activity related functionality. */
+public final class RNSentryActivityUtils {
+
+  private RNSentryActivityUtils() {
+    // Prevent instantiation
+  }
+
+  public static @Nullable Activity getCurrentActivity(
+      final @NotNull ReactApplicationContext reactContext, final @NotNull ILogger logger) {
+    final Activity activity = reactContext.getCurrentActivity();
+    if (activity != null) {
+      return activity;
+    }
+
+    logger.log(
+        SentryLevel.DEBUG,
+        "[RNSentryActivityUtils] Given ReactApplicationContext has no activity attached, using"
+            + " CurrentActivityHolder as a fallback.");
+    return CurrentActivityHolder.getInstance().getActivity();
+  }
+}

package/dist/js/version.d.ts

@@ -1,4 +1,4 @@
 export declare const SDK_PACKAGE_NAME = "npm:@sentry/react-native";
 export declare const SDK_NAME = "sentry.javascript.react-native";
-export declare const SDK_VERSION = "6.12.0";
+export declare const SDK_VERSION = "6.13.0";
 //# sourceMappingURL=version.d.ts.map

package/dist/js/version.js

@@ -1,4 +1,4 @@
 export const SDK_PACKAGE_NAME = 'npm:@sentry/react-native';
 export const SDK_NAME = 'sentry.javascript.react-native';
-export const SDK_VERSION = '6.12.0';
+export const SDK_VERSION = '6.13.0';
 //# sourceMappingURL=version.js.map

package/dist/js/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/js/version.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,gBAAgB,GAAG,0BAA0B,CAAC;AAC3D,MAAM,CAAC,MAAM,QAAQ,GAAG,gCAAgC,CAAC;AACzD,MAAM,CAAC,MAAM,WAAW,GAAG,QAAQ,CAAC","sourcesContent":["export const SDK_PACKAGE_NAME = 'npm:@sentry/react-native';\nexport const SDK_NAME = 'sentry.javascript.react-native';\nexport const SDK_VERSION = '6.12.0';\n"]}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/js/version.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,gBAAgB,GAAG,0BAA0B,CAAC;AAC3D,MAAM,CAAC,MAAM,QAAQ,GAAG,gCAAgC,CAAC;AACzD,MAAM,CAAC,MAAM,WAAW,GAAG,QAAQ,CAAC","sourcesContent":["export const SDK_PACKAGE_NAME = 'npm:@sentry/react-native';\nexport const SDK_NAME = 'sentry.javascript.react-native';\nexport const SDK_VERSION = '6.13.0';\n"]}

package/ios/RNSentryVersion.m

@@ -3,4 +3,4 @@
 NSString *const NATIVE_SDK_NAME = @"sentry.cocoa.react-native";
 NSString *const REACT_NATIVE_SDK_NAME = @"sentry.javascript.react-native";
 NSString *const REACT_NATIVE_SDK_PACKAGE_NAME = @"npm:@sentry/react-native";
-NSString *const REACT_NATIVE_SDK_PACKAGE_VERSION = @"6.12.0";
+NSString *const REACT_NATIVE_SDK_PACKAGE_VERSION = @"6.13.0";

package/package.json

@@ -2,7 +2,7 @@
   "name": "@sentry/react-native",
   "homepage": "https://github.com/getsentry/sentry-react-native",
   "repository": "https://github.com/getsentry/sentry-react-native",
-  "version": "6.12.0",
+  "version": "6.13.0",
   "description": "Official Sentry SDK for react-native",
   "typings": "dist/js/index.d.ts",
   "types": "dist/js/index.d.ts",

package/scripts/sentry-xcode-debug-files.sh

@@ -5,7 +5,10 @@
 # print commands before executing them
 set -x
 
-[ -z "$WITH_ENVIRONMENT" ] && WITH_ENVIRONMENT="../node_modules/react-native/scripts/xcode/with-environment.sh"
+# REACT_NATIVE_PATH first used in RN 0.74.0 Template https://github.com/facebook/react-native/commit/289e78388a87408e215a25108cb02511a05f5c80
+LOCAL_REACT_NATIVE_PATH="${REACT_NATIVE_PATH:-"../node_modules/react-native"}"
+
+[ -z "$WITH_ENVIRONMENT" ] && WITH_ENVIRONMENT="${LOCAL_REACT_NATIVE_PATH}/scripts/xcode/with-environment.sh"
 
 if [ -f "$WITH_ENVIRONMENT" ]; then
   # load envs if loader file exists (since rn 0.68)

package/ts3.8/dist/js/version.d.ts

@@ -1,4 +1,4 @@
 export declare const SDK_PACKAGE_NAME = "npm:@sentry/react-native";
 export declare const SDK_NAME = "sentry.javascript.react-native";
-export declare const SDK_VERSION = "6.12.0";
+export declare const SDK_VERSION = "6.13.0";
 //# sourceMappingURL=version.d.ts.map