Skip to content

Commit 19d21a3

Browse files
committed
Fix exception propagation
1 parent 745e707 commit 19d21a3

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

sentry-android-replay/src/main/java/io/sentry/android/replay/viewhierarchy/ComposeViewHierarchyNode.kt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,14 @@ internal object ComposeViewHierarchyNode {
5555
internal fun retrieveSemanticsConfiguration(node: LayoutNode): SemanticsConfiguration? {
5656
try {
5757
return node.semanticsConfiguration
58-
} catch (_: Throwable) {
58+
} catch (t: Throwable) {
5959
// for backwards compatibility
6060
// Jetpack Compose 1.8 or older
61-
return getCollapsedSemanticsMethod?.let {
62-
return it.invoke(node) as SemanticsConfiguration?
61+
return if (getCollapsedSemanticsMethod != null) {
62+
getCollapsedSemanticsMethod!!.invoke(node) as SemanticsConfiguration
63+
} else {
64+
// re-throw t if there's no way to retrieve semantics
65+
throw t
6366
}
6467
}
6568
}

sentry-android-replay/src/test/java/io/sentry/android/replay/viewhierarchy/ComposeMaskingOptionsTest.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ import io.sentry.android.replay.viewhierarchy.ViewHierarchyNode.GenericViewHiera
4444
import io.sentry.android.replay.viewhierarchy.ViewHierarchyNode.ImageViewHierarchyNode
4545
import io.sentry.android.replay.viewhierarchy.ViewHierarchyNode.TextViewHierarchyNode
4646
import java.io.File
47-
import java.lang.reflect.InvocationTargetException
4847
import kotlin.test.Test
4948
import kotlin.test.assertEquals
5049
import kotlin.test.assertFalse
@@ -183,7 +182,7 @@ class ComposeMaskingOptionsTest {
183182
val node = mock<LayoutNode>()
184183
whenever(node.semanticsConfiguration).thenThrow(RuntimeException("Compose Runtime Error"))
185184

186-
assertThrows(InvocationTargetException::class.java) {
185+
assertThrows(RuntimeException::class.java) {
187186
ComposeViewHierarchyNode.retrieveSemanticsConfiguration(node)
188187
}
189188
}

0 commit comments

Comments
 (0)