Skip to content

Commit 1381d4a

Browse files
committed
added @nullable annotation to ManifestMetadataReader json decoding
1 parent 6b168b6 commit 1381d4a

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

sentry-android-core/src/main/java/io/sentry/android/core/ManifestMetadataReader.java

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ static void applyMetadata(
139139
options.setDebug(readBool(metadata, logger, DEBUG, options.isDebug()));
140140

141141
if (options.isDebug()) {
142-
final String level =
142+
final @Nullable String level =
143143
readString(
144144
metadata,
145145
logger,
@@ -161,7 +161,7 @@ static void applyMetadata(
161161
options.isEnableAutoSessionTracking()));
162162

163163
if (options.getSampleRate() == null) {
164-
final Double sampleRate = readDouble(metadata, logger, SAMPLE_RATE);
164+
final double sampleRate = readDouble(metadata, logger, SAMPLE_RATE);
165165
if (sampleRate != -1) {
166166
options.setSampleRate(sampleRate);
167167
}
@@ -180,7 +180,7 @@ static void applyMetadata(
180180
options.setAttachAnrThreadDump(
181181
readBool(metadata, logger, ANR_ATTACH_THREAD_DUMPS, options.isAttachAnrThreadDump()));
182182

183-
final String dsn = readString(metadata, logger, DSN, options.getDsn());
183+
final @Nullable String dsn = readString(metadata, logger, DSN, options.getDsn());
184184
final boolean enabled = readBool(metadata, logger, ENABLE_SENTRY, options.isEnabled());
185185

186186
if (!enabled || (dsn != null && dsn.isEmpty())) {
@@ -293,7 +293,7 @@ static void applyMetadata(
293293
options.isCollectAdditionalContext()));
294294

295295
if (options.getTracesSampleRate() == null) {
296-
final Double tracesSampleRate = readDouble(metadata, logger, TRACES_SAMPLE_RATE);
296+
final double tracesSampleRate = readDouble(metadata, logger, TRACES_SAMPLE_RATE);
297297
if (tracesSampleRate != -1) {
298298
options.setTracesSampleRate(tracesSampleRate);
299299
}
@@ -317,7 +317,7 @@ static void applyMetadata(
317317
options.isEnableActivityLifecycleTracingAutoFinish()));
318318

319319
if (options.getProfilesSampleRate() == null) {
320-
final Double profilesSampleRate = readDouble(metadata, logger, PROFILES_SAMPLE_RATE);
320+
final double profilesSampleRate = readDouble(metadata, logger, PROFILES_SAMPLE_RATE);
321321
if (profilesSampleRate != -1) {
322322
options.setProfilesSampleRate(profilesSampleRate);
323323
}
@@ -331,7 +331,7 @@ static void applyMetadata(
331331
}
332332
}
333333

334-
final String profileLifecycle =
334+
final @Nullable String profileLifecycle =
335335
readString(
336336
metadata,
337337
logger,
@@ -393,6 +393,7 @@ static void applyMetadata(
393393

394394
// sdkInfo.addIntegration();
395395

396+
@Nullable
396397
List<String> integrationsFromGradlePlugin =
397398
readList(metadata, logger, SENTRY_GRADLE_PLUGIN_INTEGRATIONS);
398399
if (integrationsFromGradlePlugin != null) {
@@ -418,15 +419,15 @@ static void applyMetadata(
418419
metadata, logger, ENABLE_SCOPE_PERSISTENCE, options.isEnableScopePersistence()));
419420

420421
if (options.getExperimental().getSessionReplay().getSessionSampleRate() == null) {
421-
final Double sessionSampleRate =
422+
final double sessionSampleRate =
422423
readDouble(metadata, logger, REPLAYS_SESSION_SAMPLE_RATE);
423424
if (sessionSampleRate != -1) {
424425
options.getExperimental().getSessionReplay().setSessionSampleRate(sessionSampleRate);
425426
}
426427
}
427428

428429
if (options.getExperimental().getSessionReplay().getOnErrorSampleRate() == null) {
429-
final Double onErrorSampleRate = readDouble(metadata, logger, REPLAYS_ERROR_SAMPLE_RATE);
430+
final double onErrorSampleRate = readDouble(metadata, logger, REPLAYS_ERROR_SAMPLE_RATE);
430431
if (onErrorSampleRate != -1) {
431432
options.getExperimental().getSessionReplay().setOnErrorSampleRate(onErrorSampleRate);
432433
}
@@ -512,10 +513,10 @@ private static boolean readBool(
512513
}
513514
}
514515

515-
private static @NotNull Double readDouble(
516+
private static double readDouble(
516517
final @NotNull Bundle metadata, final @NotNull ILogger logger, final @NotNull String key) {
517518
// manifest meta-data only reads float
518-
final Double value = ((Number) metadata.getFloat(key, metadata.getInt(key, -1))).doubleValue();
519+
final double value = ((Number) metadata.getFloat(key, metadata.getInt(key, -1))).doubleValue();
519520
logger.log(SentryLevel.DEBUG, key + " read: " + value);
520521
return value;
521522
}

0 commit comments

Comments
 (0)