fix(firestore): catch InterruptedException in FirestorePagingSource by demolaf · Pull Request #2404 · firebase/FirebaseUI-Android

demolaf · 2026-07-20T13:20:53Z

Fixes#2008.

FirestorePagingSource.loadSingle() blocks on Tasks.await(task) inside a Single.fromCallable. When Paging cancels an in-flight load, RxJava disposes the subscription, which interrupts the IO-scheduler thread mid-await, throwing InterruptedException. The source only caught ExecutionException, so the InterruptedException escaped the callable after the subscription was already disposed — RxJava couldn't deliver it downstream, so it surfaced as an UndeliverableException on the global handler and crashed the app.

DatabasePagingSource (RTDB paging) already catches InterruptedException and returns a LoadResult.Error instead of throwing; this applies the same fix to FirestorePagingSource.

Preview

Currently working on a compilable sample for FUI-Android/firestore demos sample(app): add Firestore, Database & Storage demos to sample app #2406

untitled.webm

gemini-code-assist

Code Review

This pull request adds handling for InterruptedException in FirestorePagingSource.loadSingle to prevent undeliverable RxJava exceptions when interrupted while disposed, and includes a corresponding integration test. The review feedback suggests avoiding logging expected errors at the ERROR level in the library to prevent cluttering Logcat, and recommends saving and restoring the original RxJavaPlugins error handler in the test to avoid side effects on other tests.

…2383) * fix(auth): validate display name only when required in sign-up form * fix(auth): use locale-safe matcher for sign-up button in test

russellwheatley

One suggestion on error visibility, otherwise this looks solid. Ran the paging test locally and confirmed the fix works, including the new disposal-interrupt regression test.

…t script (#2417) Fixes#1613

Fixes#2041

…2406)

…ns (#2413)

… (#2426)

…in test

…d of throwing

…Code

…lace sleeps with latches

… silent

demolaf · 2026-07-20T13:20:53Z

Fixes#2008.

FirestorePagingSource.loadSingle() blocks on Tasks.await(task) inside a Single.fromCallable. When Paging cancels an in-flight load, RxJava disposes the subscription, which interrupts the IO-scheduler thread mid-await, throwing InterruptedException. The source only caught ExecutionException, so the InterruptedException escaped the callable after the subscription was already disposed — RxJava couldn't deliver it downstream, so it surfaced as an UndeliverableException on the global handler and crashed the app.

DatabasePagingSource (RTDB paging) already catches InterruptedException and returns a LoadResult.Error instead of throwing; this applies the same fix to FirestorePagingSource.

Preview

Currently working on a compilable sample for FUI-Android/firestore demos sample(app): add Firestore, Database & Storage demos to sample app #2406

untitled.webm

gemini-code-assist

Code Review

This pull request adds handling for InterruptedException in FirestorePagingSource.loadSingle to prevent undeliverable RxJava exceptions when interrupted while disposed, and includes a corresponding integration test. The review feedback suggests avoiding logging expected errors at the ERROR level in the library to prevent cluttering Logcat, and recommends saving and restoring the original RxJavaPlugins error handler in the test to avoid side effects on other tests.

…2383) * fix(auth): validate display name only when required in sign-up form * fix(auth): use locale-safe matcher for sign-up button in test

russellwheatley

One suggestion on error visibility, otherwise this looks solid. Ran the paging test locally and confirmed the fix works, including the new disposal-interrupt regression test.

…t script (#2417) Fixes#1613

Fixes#2041

…2406)

…ns (#2413)

… (#2426)

…in test

…d of throwing

…Code

…lace sleeps with latches

… silent

demolaf · 2026-07-20T13:20:53Z

Fixes#2008.

FirestorePagingSource.loadSingle() blocks on Tasks.await(task) inside a Single.fromCallable. When Paging cancels an in-flight load, RxJava disposes the subscription, which interrupts the IO-scheduler thread mid-await, throwing InterruptedException. The source only caught ExecutionException, so the InterruptedException escaped the callable after the subscription was already disposed — RxJava couldn't deliver it downstream, so it surfaced as an UndeliverableException on the global handler and crashed the app.

DatabasePagingSource (RTDB paging) already catches InterruptedException and returns a LoadResult.Error instead of throwing; this applies the same fix to FirestorePagingSource.

Preview

Currently working on a compilable sample for FUI-Android/firestore demos sample(app): add Firestore, Database & Storage demos to sample app #2406

untitled.webm

gemini-code-assist

Code Review

This pull request adds handling for InterruptedException in FirestorePagingSource.loadSingle to prevent undeliverable RxJava exceptions when interrupted while disposed, and includes a corresponding integration test. The review feedback suggests avoiding logging expected errors at the ERROR level in the library to prevent cluttering Logcat, and recommends saving and restoring the original RxJavaPlugins error handler in the test to avoid side effects on other tests.

…2383) * fix(auth): validate display name only when required in sign-up form * fix(auth): use locale-safe matcher for sign-up button in test

russellwheatley

One suggestion on error visibility, otherwise this looks solid. Ran the paging test locally and confirmed the fix works, including the new disposal-interrupt regression test.

…t script (#2417) Fixes#1613

Fixes#2041

…2406)

…ns (#2413)

… (#2426)

…in test

…d of throwing

…Code

…lace sleeps with latches

… silent

demolaf · 2026-07-20T13:20:53Z

Fixes#2008.

FirestorePagingSource.loadSingle() blocks on Tasks.await(task) inside a Single.fromCallable. When Paging cancels an in-flight load, RxJava disposes the subscription, which interrupts the IO-scheduler thread mid-await, throwing InterruptedException. The source only caught ExecutionException, so the InterruptedException escaped the callable after the subscription was already disposed — RxJava couldn't deliver it downstream, so it surfaced as an UndeliverableException on the global handler and crashed the app.

DatabasePagingSource (RTDB paging) already catches InterruptedException and returns a LoadResult.Error instead of throwing; this applies the same fix to FirestorePagingSource.

Preview

Currently working on a compilable sample for FUI-Android/firestore demos sample(app): add Firestore, Database & Storage demos to sample app #2406

untitled.webm

gemini-code-assist

Code Review

This pull request adds handling for InterruptedException in FirestorePagingSource.loadSingle to prevent undeliverable RxJava exceptions when interrupted while disposed, and includes a corresponding integration test. The review feedback suggests avoiding logging expected errors at the ERROR level in the library to prevent cluttering Logcat, and recommends saving and restoring the original RxJavaPlugins error handler in the test to avoid side effects on other tests.

…2383) * fix(auth): validate display name only when required in sign-up form * fix(auth): use locale-safe matcher for sign-up button in test

russellwheatley

One suggestion on error visibility, otherwise this looks solid. Ran the paging test locally and confirmed the fix works, including the new disposal-interrupt regression test.

…t script (#2417) Fixes#1613

Fixes#2041

…2406)

…ns (#2413)

… (#2426)

…in test

…d of throwing

…Code

…lace sleeps with latches

… silent

demolaf · 2026-07-20T13:20:53Z

Fixes#2008.

FirestorePagingSource.loadSingle() blocks on Tasks.await(task) inside a Single.fromCallable. When Paging cancels an in-flight load, RxJava disposes the subscription, which interrupts the IO-scheduler thread mid-await, throwing InterruptedException. The source only caught ExecutionException, so the InterruptedException escaped the callable after the subscription was already disposed — RxJava couldn't deliver it downstream, so it surfaced as an UndeliverableException on the global handler and crashed the app.

DatabasePagingSource (RTDB paging) already catches InterruptedException and returns a LoadResult.Error instead of throwing; this applies the same fix to FirestorePagingSource.

Preview

Currently working on a compilable sample for FUI-Android/firestore demos sample(app): add Firestore, Database & Storage demos to sample app #2406

untitled.webm

gemini-code-assist

Code Review

This pull request adds handling for InterruptedException in FirestorePagingSource.loadSingle to prevent undeliverable RxJava exceptions when interrupted while disposed, and includes a corresponding integration test. The review feedback suggests avoiding logging expected errors at the ERROR level in the library to prevent cluttering Logcat, and recommends saving and restoring the original RxJavaPlugins error handler in the test to avoid side effects on other tests.

…2383) * fix(auth): validate display name only when required in sign-up form * fix(auth): use locale-safe matcher for sign-up button in test

russellwheatley

One suggestion on error visibility, otherwise this looks solid. Ran the paging test locally and confirmed the fix works, including the new disposal-interrupt regression test.

…t script (#2417) Fixes#1613

Fixes#2041

…2406)

…ns (#2413)

… (#2426)

…in test

…d of throwing

…Code

…lace sleeps with latches

… silent

demolaf · 2026-07-20T13:20:53Z

Fixes#2008.

FirestorePagingSource.loadSingle() blocks on Tasks.await(task) inside a Single.fromCallable. When Paging cancels an in-flight load, RxJava disposes the subscription, which interrupts the IO-scheduler thread mid-await, throwing InterruptedException. The source only caught ExecutionException, so the InterruptedException escaped the callable after the subscription was already disposed — RxJava couldn't deliver it downstream, so it surfaced as an UndeliverableException on the global handler and crashed the app.

DatabasePagingSource (RTDB paging) already catches InterruptedException and returns a LoadResult.Error instead of throwing; this applies the same fix to FirestorePagingSource.

Preview

Currently working on a compilable sample for FUI-Android/firestore demos sample(app): add Firestore, Database & Storage demos to sample app #2406

untitled.webm

gemini-code-assist

Code Review

This pull request adds handling for InterruptedException in FirestorePagingSource.loadSingle to prevent undeliverable RxJava exceptions when interrupted while disposed, and includes a corresponding integration test. The review feedback suggests avoiding logging expected errors at the ERROR level in the library to prevent cluttering Logcat, and recommends saving and restoring the original RxJavaPlugins error handler in the test to avoid side effects on other tests.

…2383) * fix(auth): validate display name only when required in sign-up form * fix(auth): use locale-safe matcher for sign-up button in test

russellwheatley

One suggestion on error visibility, otherwise this looks solid. Ran the paging test locally and confirmed the fix works, including the new disposal-interrupt regression test.

…t script (#2417) Fixes#1613

Fixes#2041

…2406)

…ns (#2413)

… (#2426)

…in test

…d of throwing

…Code

…lace sleeps with latches

… silent

demolaf · 2026-07-20T13:20:53Z

Fixes#2008.

FirestorePagingSource.loadSingle() blocks on Tasks.await(task) inside a Single.fromCallable. When Paging cancels an in-flight load, RxJava disposes the subscription, which interrupts the IO-scheduler thread mid-await, throwing InterruptedException. The source only caught ExecutionException, so the InterruptedException escaped the callable after the subscription was already disposed — RxJava couldn't deliver it downstream, so it surfaced as an UndeliverableException on the global handler and crashed the app.

DatabasePagingSource (RTDB paging) already catches InterruptedException and returns a LoadResult.Error instead of throwing; this applies the same fix to FirestorePagingSource.

Preview

Currently working on a compilable sample for FUI-Android/firestore demos sample(app): add Firestore, Database & Storage demos to sample app #2406

untitled.webm

gemini-code-assist

Code Review

This pull request adds handling for InterruptedException in FirestorePagingSource.loadSingle to prevent undeliverable RxJava exceptions when interrupted while disposed, and includes a corresponding integration test. The review feedback suggests avoiding logging expected errors at the ERROR level in the library to prevent cluttering Logcat, and recommends saving and restoring the original RxJavaPlugins error handler in the test to avoid side effects on other tests.

…2383) * fix(auth): validate display name only when required in sign-up form * fix(auth): use locale-safe matcher for sign-up button in test

russellwheatley

One suggestion on error visibility, otherwise this looks solid. Ran the paging test locally and confirmed the fix works, including the new disposal-interrupt regression test.

…t script (#2417) Fixes#1613

Fixes#2041

…2406)

…ns (#2413)

… (#2426)

…in test

…d of throwing

…Code

…lace sleeps with latches

… silent

demolaf · 2026-07-20T13:20:53Z

Fixes#2008.

FirestorePagingSource.loadSingle() blocks on Tasks.await(task) inside a Single.fromCallable. When Paging cancels an in-flight load, RxJava disposes the subscription, which interrupts the IO-scheduler thread mid-await, throwing InterruptedException. The source only caught ExecutionException, so the InterruptedException escaped the callable after the subscription was already disposed — RxJava couldn't deliver it downstream, so it surfaced as an UndeliverableException on the global handler and crashed the app.

DatabasePagingSource (RTDB paging) already catches InterruptedException and returns a LoadResult.Error instead of throwing; this applies the same fix to FirestorePagingSource.

Preview

Currently working on a compilable sample for FUI-Android/firestore demos sample(app): add Firestore, Database & Storage demos to sample app #2406

untitled.webm

gemini-code-assist

Code Review

This pull request adds handling for InterruptedException in FirestorePagingSource.loadSingle to prevent undeliverable RxJava exceptions when interrupted while disposed, and includes a corresponding integration test. The review feedback suggests avoiding logging expected errors at the ERROR level in the library to prevent cluttering Logcat, and recommends saving and restoring the original RxJavaPlugins error handler in the test to avoid side effects on other tests.

…2383) * fix(auth): validate display name only when required in sign-up form * fix(auth): use locale-safe matcher for sign-up button in test

russellwheatley

One suggestion on error visibility, otherwise this looks solid. Ran the paging test locally and confirmed the fix works, including the new disposal-interrupt regression test.

…t script (#2417) Fixes#1613

Fixes#2041

…2406)

…ns (#2413)

… (#2426)

…in test

…d of throwing

…Code

…lace sleeps with latches

… silent

github-project-automationBot added this to studio-2394994192-60a69 Jul 20, 2026

github-project-automationBot moved this to Backlog in studio-2394994192-60a69 Jul 20, 2026

demolaf marked this pull request as draft July 20, 2026 13:21

gemini-code-assistBot reviewed Jul 20, 2026
View reviewed changes

Comment threadfirestore/src/main/java/com/firebase/ui/firestore/paging/FirestorePagingSource.java Outdated
Comment threadfirestore/src/test/java/com/firebase/ui/firestore/paging/FirestorePagingSourceTest.java

demolaf marked this pull request as ready for review July 21, 2026 12:34

fix(auth): validate display name only when required in sign-up form (#…
1ecd498
…2383) * fix(auth): validate display name only when required in sign-up form * fix(auth): use locale-safe matcher for sign-up button in test

russellwheatley requested changes Jul 24, 2026
View reviewed changes

Comment threadfirestore/src/main/java/com/firebase/ui/firestore/paging/FirestorePagingSource.java

demolaf requested a review from russellwheatley July 27, 2026 08:55

just1and0and others added 6 commits July 27, 2026 11:43

fix(internal): append CHAR_LIMIT to translation descriptions in expor…
d7be7ea
…t script (#2417) Fixes#1613

fix(auth): mitigate tapjacking on the auth activity window (#2416)
17b9620
Fixes#2041

sample(app): add Firestore, Database & Storage demos to sample app (#…
8b18a4f
…2406)

fix(auth): allow customizing top app bar colors via AuthUITheme (#2391)
12762f1

fix(auth): handle edge-to-edge insets in MFA challenge and auth scree…
76e5a3f
…ns (#2413)

fix(auth): use fixed padding for method picker provider buttons (#2424)…
cbbd262
… (#2426)

russellwheatley approved these changes Jul 29, 2026
View reviewed changes

demolaf added 6 commits July 29, 2026 12:17

fix(firestore): catch InterruptedException in FirestorePagingSource
9b4ab9a

fix(firestore): drop load error logging and restore rx error handler …
a3f5dc0
…in test

fix(firestore): return LoadResult.Error for every load failure instea…
df4a17e
…d of throwing

fix(firestore): fix PageKey.equals NPE on null snapshots and add hash…
5f54054
…Code

test(firestore): run paging source test in CI via robolectric and rep…
e0c7dd9
…lace sleeps with latches

fix(firestore): log genuine load failures while keeping cancellations…
6da622d
… silent

demolaf force-pushed the fix/firestore-paging-interrupt branch from a43c700 to 6da622dCompare July 29, 2026 11:24

demolaf merged commit 7701b93 into masterJul 29, 2026
18 checks passed

github-project-automationBot moved this from Backlog to Done in studio-2394994192-60a69 Jul 29, 2026

demolaf deleted the fix/firestore-paging-interrupt branch July 29, 2026 11:35