Skip to content

Commit c840fa3

Browse files
ref(android): rename scanEvents to eventStateOf
Both the method and the enum were plural nouns that read as if they returned the envelope's events, when they return a single summary value. That made "events != EnvelopeEvents.NONE" look like an emptiness check rather than "nothing worth recording happened". EnvelopeEventState also lines up with the Session.State vocabulary already used here. Co-authored-by: Cursor <cursoragent@cursor.com>
1 parent 97adc1b commit c840fa3

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ public static SentryId captureEnvelope(
176176

177177
try {
178178
final @NotNull ISerializer serializer = options.getSerializer();
179-
final @NotNull EnvelopeEvents events = scanEvents(envelope, serializer);
179+
final @NotNull EnvelopeEventState eventState = eventStateOf(envelope, serializer);
180180

181181
final @NotNull List<SentryEnvelopeItem> envelopeItems = new ArrayList<>();
182182
for (SentryEnvelopeItem item : envelope.getItems()) {
@@ -185,9 +185,9 @@ public static SentryId captureEnvelope(
185185

186186
// update session and add it to envelope if necessary
187187
final @Nullable Session.State status =
188-
events == EnvelopeEvents.UNHANDLED ? Session.State.Crashed : null;
188+
eventState == EnvelopeEventState.UNHANDLED ? Session.State.Crashed : null;
189189
final @Nullable Session session =
190-
updateSession(scopes, options, status, events != EnvelopeEvents.NONE);
190+
updateSession(scopes, options, status, eventState != EnvelopeEventState.NONE);
191191
if (session != null) {
192192
final SentryEnvelopeItem sessionItem = SentryEnvelopeItem.fromSession(serializer, session);
193193
envelopeItems.add(sessionItem);
@@ -246,16 +246,16 @@ public static SentryId captureEnvelopeNonTerminating(final @NotNull byte[] envel
246246

247247
try {
248248
final @NotNull ISerializer serializer = options.getSerializer();
249-
final @NotNull EnvelopeEvents events = scanEvents(envelope, serializer);
249+
final @NotNull EnvelopeEventState eventState = eventStateOf(envelope, serializer);
250250

251-
if (events != EnvelopeEvents.NONE) {
251+
if (eventState != EnvelopeEventState.NONE) {
252252
scopes.configureScope(
253253
scope -> {
254254
scope.withSession(
255255
session -> {
256256
if (session != null) {
257257
final boolean updated =
258-
events == EnvelopeEvents.UNHANDLED
258+
eventState == EnvelopeEventState.UNHANDLED
259259
? session.recordNonTerminatingUnhandledError()
260260
: session.update(null, null, true, null);
261261
if (updated && options.getEnvelopeDiskCache() instanceof EnvelopeCache) {
@@ -279,7 +279,7 @@ public static SentryId captureEnvelopeNonTerminating(final @NotNull byte[] envel
279279
}
280280

281281
/** What the events inside an envelope amount to, from the session's point of view. */
282-
private enum EnvelopeEvents {
282+
private enum EnvelopeEventState {
283283
/** No event carried an exception. */
284284
NONE,
285285
/** At least one event carried an exception, none of them unhandled. */
@@ -288,7 +288,7 @@ private enum EnvelopeEvents {
288288
UNHANDLED
289289
}
290290

291-
private static @NotNull EnvelopeEvents scanEvents(
291+
private static @NotNull EnvelopeEventState eventStateOf(
292292
final @NotNull SentryEnvelope envelope, final @NotNull ISerializer serializer)
293293
throws Exception {
294294
boolean unhandled = false;
@@ -305,9 +305,9 @@ private enum EnvelopeEvents {
305305
}
306306
}
307307
if (unhandled) {
308-
return EnvelopeEvents.UNHANDLED;
308+
return EnvelopeEventState.UNHANDLED;
309309
}
310-
return errored ? EnvelopeEvents.ERRORED : EnvelopeEvents.NONE;
310+
return errored ? EnvelopeEventState.ERRORED : EnvelopeEventState.NONE;
311311
}
312312

313313
/**

0 commit comments

Comments
 (0)