Skip to content

Commit eb8b9cd

Browse files
Merge main into no/java-829-replay-anchored-clock [pr-shepherd]
Resolve CHANGELOG.md conflict by keeping both Unreleased Fixes entries (#6542 and #6634).
2 parents 5259890 + c58f4a4 commit eb8b9cd

3 files changed

Lines changed: 25 additions & 1 deletion

File tree

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
- Session Replay no longer drops or freezes video when the device clock changes mid-recording ([#6542](https://github.com/getsentry/sentry-java/pull/6542))
3030
- The replay shows the change once, as a gap or an overlap, and breadcrumbs and errors stay aligned with the video.
3131
- A forward change longer than the session duration (1h) ends a full-session recording, as reaching that duration does. When recording only for errors, what was recorded before such a change is dropped, so the replay of a later error starts after it.
32+
- Android: Register network callbacks on API 24–25 when `AndroidConnectionStatusProvider` is created with a custom `Handler`, instead of failing because the `Handler` overload needs API 26 ([#6634](https://github.com/getsentry/sentry-java/pull/6634))
3233

3334
### Dependencies
3435

‎sentry-android-core/src/main/java/io/sentry/android/core/internal/util/AndroidConnectionStatusProvider.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -931,7 +931,8 @@ static boolean registerNetworkCallback(
931931
return false;
932932
}
933933
try {
934-
if (handler != null) {
934+
// The Handler overload is API 26+. Below that, fall back to the default callback thread.
935+
if (handler != null && buildInfoProvider.getSdkInfoVersion() >= Build.VERSION_CODES.O) {
935936
connectivityManager.registerDefaultNetworkCallback(networkCallback, handler);
936937
} else {
937938
connectivityManager.registerDefaultNetworkCallback(networkCallback);

‎sentry-android-core/src/test/java/io/sentry/android/core/internal/util/AndroidConnectionStatusProviderTest.kt‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -987,6 +987,7 @@ class AndroidConnectionStatusProviderTest {
987987
@Test
988988
fun `registerNetworkCallback with a custom handlers calls connectivityManager with it`() {
989989
val customHandler = object : Handler(Looper.getMainLooper()) {}
990+
whenever(buildInfo.sdkInfoVersion).thenReturn(Build.VERSION_CODES.O)
990991
whenever(contextMock.getSystemService(any())).thenReturn(connectivityManager)
991992
AndroidConnectionStatusProvider.registerNetworkCallback(
992993
contextMock,
@@ -999,4 +1000,25 @@ class AndroidConnectionStatusProviderTest {
9991000
verify(connectivityManager)
10001001
.registerDefaultNetworkCallback(any<NetworkCallback>(), argThat { this == customHandler })
10011002
}
1003+
1004+
@Test
1005+
fun `registerNetworkCallback with a custom handler below API 26 registers without it`() {
1006+
val customHandler = object : Handler(Looper.getMainLooper()) {}
1007+
val callback = mock<NetworkCallback>()
1008+
whenever(buildInfo.sdkInfoVersion).thenReturn(Build.VERSION_CODES.N_MR1)
1009+
whenever(contextMock.getSystemService(any())).thenReturn(connectivityManager)
1010+
val registered =
1011+
AndroidConnectionStatusProvider.registerNetworkCallback(
1012+
contextMock,
1013+
logger,
1014+
buildInfo,
1015+
customHandler,
1016+
callback,
1017+
)
1018+
1019+
assertThat(registered).isTrue()
1020+
verify(connectivityManager).registerDefaultNetworkCallback(callback)
1021+
verify(connectivityManager, never())
1022+
.registerDefaultNetworkCallback(eq(callback), any<Handler>())
1023+
}
10021024
}

0 commit comments

Comments
 (0)