Skip to content

Commit 282e7b1

Browse files
committed
Format code
1 parent 592d21b commit 282e7b1

File tree

5 files changed

+26
-21
lines changed

5 files changed

+26
-21
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ private void startTracing(final @NotNull Activity activity) {
189189
}
190190

191191
final TransactionOptions transactionOptions = new TransactionOptions();
192-
192+
193193
// Set deadline timeout based on configured option
194194
final long deadlineTimeoutMillis = options.getAutoTransactionDeadlineTimeoutMillis();
195195
if (deadlineTimeoutMillis <= 0) {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,10 +174,10 @@ public final class SentryAndroidOptions extends SentryOptions {
174174
private boolean enableAutoTraceIdGeneration = true;
175175

176176
/**
177-
* Controls the deadline timeout in milliseconds for automatic transactions. When set to a
178-
* positive value, that value is used as the deadline timeout. When set to a value less than
179-
* or equal to 0, no deadline is applied and transactions will only finish when explicitly
180-
* finished or when the activity lifecycle ends.
177+
* Controls the deadline timeout in milliseconds for automatic transactions. When set to a
178+
* positive value, that value is used as the deadline timeout. When set to a value less than or
179+
* equal to 0, no deadline is applied and transactions will only finish when explicitly finished
180+
* or when the activity lifecycle ends.
181181
*
182182
* <p>Default is 30000 (30 seconds).
183183
*/

sentry-android-core/src/main/java/io/sentry/android/core/internal/gestures/SentryGestureListener.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ private void startTracing(final @NotNull UiElement target, final @NotNull Gestur
249249

250250
final TransactionOptions transactionOptions = new TransactionOptions();
251251
transactionOptions.setWaitForChildren(true);
252-
252+
253253
// Set deadline timeout based on configured option
254254
final long deadlineTimeoutMillis = options.getAutoTransactionDeadlineTimeoutMillis();
255255
if (deadlineTimeoutMillis <= 0) {
@@ -259,7 +259,7 @@ private void startTracing(final @NotNull UiElement target, final @NotNull Gestur
259259
// Use configured timeout when positive value is set
260260
transactionOptions.setDeadlineTimeout(deadlineTimeoutMillis);
261261
}
262-
262+
263263
transactionOptions.setIdleTimeout(options.getIdleTimeout());
264264
transactionOptions.setTrimEnd(true);
265265
transactionOptions.setOrigin(TRACE_ORIGIN + "." + target.getOrigin());

sentry-android-core/src/test/java/io/sentry/android/core/ManifestMetadataReaderTest.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1095,7 +1095,8 @@ class ManifestMetadataReaderTest {
10951095
fun `applyMetadata reads autoTransactionDeadlineTimeoutMillis from metadata`() {
10961096
// Arrange
10971097
val expectedTimeout = 60000
1098-
val bundle = bundleOf(ManifestMetadataReader.AUTO_TRANSACTION_DEADLINE_TIMEOUT_MILLIS to expectedTimeout)
1098+
val bundle =
1099+
bundleOf(ManifestMetadataReader.AUTO_TRANSACTION_DEADLINE_TIMEOUT_MILLIS to expectedTimeout)
10991100
val context = fixture.getContext(metaData = bundle)
11001101

11011102
// Act

sentry-android-navigation/src/main/java/io/sentry/android/navigation/SentryNavigationListener.kt

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -131,20 +131,24 @@ constructor(
131131
TransactionOptions().also {
132132
it.isWaitForChildren = true
133133
it.idleTimeout = scopes.options.idleTimeout
134-
134+
135135
// Set deadline timeout based on configured option
136-
val androidOptions = if (scopes.options is io.sentry.android.core.SentryAndroidOptions) {
137-
scopes.options as io.sentry.android.core.SentryAndroidOptions
138-
} else {
139-
null
140-
}
141-
val deadlineTimeoutMillis = androidOptions?.autoTransactionDeadlineTimeoutMillis ?: TransactionOptions.DEFAULT_DEADLINE_TIMEOUT_AUTO_TRANSACTION
142-
143-
it.deadlineTimeout = when {
144-
deadlineTimeoutMillis <= 0 -> null // No deadline when zero or negative value is set
145-
else -> deadlineTimeoutMillis // Use configured timeout when positive value is set
146-
}
147-
136+
val androidOptions =
137+
if (scopes.options is io.sentry.android.core.SentryAndroidOptions) {
138+
scopes.options as io.sentry.android.core.SentryAndroidOptions
139+
} else {
140+
null
141+
}
142+
val deadlineTimeoutMillis =
143+
androidOptions?.autoTransactionDeadlineTimeoutMillis
144+
?: TransactionOptions.DEFAULT_DEADLINE_TIMEOUT_AUTO_TRANSACTION
145+
146+
it.deadlineTimeout =
147+
when {
148+
deadlineTimeoutMillis <= 0 -> null // No deadline when zero or negative value is set
149+
else -> deadlineTimeoutMillis // Use configured timeout when positive value is set
150+
}
151+
148152
it.isTrimEnd = true
149153
}
150154

0 commit comments

Comments
 (0)