Skip to content

Commit 1c96a27

Browse files
committed
Revert "Allow passing sdk init function"
This reverts commit d236c82.
1 parent ced915d commit 1c96a27

File tree

2 files changed

+10
-27
lines changed

2 files changed

+10
-27
lines changed

packages/core/android/src/main/java/io/sentry/react/RNSentrySDK.java

+6-13
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import io.sentry.android.core.AndroidLogger;
99
import io.sentry.android.core.SentryAndroidOptions;
1010
import org.jetbrains.annotations.NotNull;
11-
import org.jetbrains.annotations.Nullable;
1211
import org.json.JSONObject;
1312

1413
public final class RNSentrySDK {
@@ -21,30 +20,24 @@ private RNSentrySDK() {
2120
throw new AssertionError("Utility class should not be instantiated");
2221
}
2322

24-
/** Passing a custom SDK initializer is intended for internal testing use only. */
25-
interface SdkInit {
26-
void init(Context context, Sentry.OptionsConfiguration<SentryAndroidOptions> config);
27-
}
28-
2923
static void init(
3024
@NotNull final Context context,
3125
@NotNull Sentry.OptionsConfiguration<SentryAndroidOptions> configuration,
3226
@NotNull String configurationFile,
33-
@NotNull ILogger logger,
34-
@Nullable SdkInit sdkInit) {
27+
@NotNull ILogger logger) {
3528
try {
3629
JSONObject jsonObject =
3730
RNSentryJsonUtils.getOptionsFromConfigurationFile(context, configurationFile, logger);
3831
if (jsonObject == null) {
39-
RNSentryStart.startWithConfiguration(context, configuration, sdkInit);
32+
RNSentryStart.startWithConfiguration(context, configuration);
4033
return;
4134
}
4235
ReadableMap rnOptions = RNSentryJsonConverter.convertToWritable(jsonObject);
4336
if (rnOptions == null) {
44-
RNSentryStart.startWithConfiguration(context, configuration, sdkInit);
37+
RNSentryStart.startWithConfiguration(context, configuration);
4538
return;
4639
}
47-
RNSentryStart.startWithOptions(context, rnOptions, configuration, logger, sdkInit);
40+
RNSentryStart.startWithOptions(context, rnOptions, configuration, logger);
4841
} catch (Exception e) {
4942
logger.log(
5043
SentryLevel.ERROR, "Failed to start Sentry with options from configuration file.", e);
@@ -61,7 +54,7 @@ static void init(
6154
public static void init(
6255
@NotNull final Context context,
6356
@NotNull Sentry.OptionsConfiguration<SentryAndroidOptions> configuration) {
64-
init(context, configuration, CONFIGURATION_FILE, logger, null);
57+
init(context, configuration, CONFIGURATION_FILE, logger);
6558
}
6659

6760
/**
@@ -70,6 +63,6 @@ public static void init(
7063
* @param context Android Context
7164
*/
7265
public static void init(@NotNull final Context context) {
73-
init(context, options -> {}, CONFIGURATION_FILE, logger, null);
66+
init(context, options -> {}, CONFIGURATION_FILE, logger);
7467
}
7568
}

packages/core/android/src/main/java/io/sentry/react/RNSentryStart.java

+4-14
Original file line numberDiff line numberDiff line change
@@ -37,38 +37,28 @@ private RNSentryStart() {
3737

3838
static void startWithConfiguration(
3939
@NotNull final Context context,
40-
@NotNull Sentry.OptionsConfiguration<SentryAndroidOptions> configuration,
41-
@Nullable RNSentrySDK.SdkInit sdkInit) {
40+
@NotNull Sentry.OptionsConfiguration<SentryAndroidOptions> configuration) {
4241
Sentry.OptionsConfiguration<SentryAndroidOptions> defaults =
4342
options -> updateWithReactDefaults(options, null);
4443
RNSentryCompositeOptionsConfiguration compositeConfiguration =
4544
new RNSentryCompositeOptionsConfiguration(
4645
defaults, configuration, RNSentryStart::updateWithReactFinals);
47-
if (sdkInit != null) {
48-
sdkInit.init(context, compositeConfiguration);
49-
} else {
50-
SentryAndroid.init(context, compositeConfiguration);
51-
}
46+
SentryAndroid.init(context, compositeConfiguration);
5247
}
5348

5449
static void startWithOptions(
5550
@NotNull final Context context,
5651
@NotNull final ReadableMap rnOptions,
5752
@NotNull Sentry.OptionsConfiguration<SentryAndroidOptions> configuration,
58-
@NotNull ILogger logger,
59-
@Nullable RNSentrySDK.SdkInit sdkInit) {
53+
@NotNull ILogger logger) {
6054
Sentry.OptionsConfiguration<SentryAndroidOptions> defaults =
6155
options -> updateWithReactDefaults(options, null);
6256
Sentry.OptionsConfiguration<SentryAndroidOptions> rnConfigurationOptions =
6357
options -> getSentryAndroidOptions(options, rnOptions, logger);
6458
RNSentryCompositeOptionsConfiguration compositeConfiguration =
6559
new RNSentryCompositeOptionsConfiguration(
6660
rnConfigurationOptions, defaults, configuration, RNSentryStart::updateWithReactFinals);
67-
if (sdkInit != null) {
68-
sdkInit.init(context, compositeConfiguration);
69-
} else {
70-
SentryAndroid.init(context, compositeConfiguration);
71-
}
61+
SentryAndroid.init(context, compositeConfiguration);
7262
}
7363

7464
static void startWithOptions(

0 commit comments

Comments
 (0)