Switch `asFlow()` over to `callbackFlow` for safety [200596935]

Fixed

Bug

Status Update

No update yet.

Description

[Deleted User]

created issue #1

Sep 20, 2021 11:02PM

Component used: androidx.lifecycle:lifecycle-livedata-ktx
Version used: 2.2.0
Devices/Android versions reproduced on: n/a

https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:lifecycle/lifecycle-livedata-ktx/src/main/java/androidx/lifecycle/FlowLiveData.kt;l=93 should be updated to use `callbackFlow` instead of this hand-rolled channel.

Comments

il...@google.com <il...@google.com> #2Oct 28, 2021 10:59PM

Project: platform/frameworks/support
Branch: androidx-main

commit fe2df43a90ef07286b48025029d03b4f5a914af5
Author: Clara Fok <clarafok@google.com>
Date: Fri Jun 23 15:00:32 2023

Convert paging-common project to kmp structure

Splitting main into common, jvm, and native and added build targets in gradle.

Common and native directories are currently empty so project build does not contain output for these two targets yet.

Test: ./gradlew paging:paging-common:jvmTest
Bug: 288623117

Change-Id: I1703692eee416e77e7d4f40d1c1f934783166a86

M development/build_log_simplifier/messages.ignore
M paging/paging-common/build.gradle
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/CachedPageEventFlow.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/CachedPagingData.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/CancelableChannelFlow.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/CombinedLoadStates.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/ConflatedEventBus.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/ContiguousPagedList.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/DataSource.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/ExperimentalPagingApi.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/FlowExt.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/HintHandler.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/HintReceiver.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/InitialDataSource.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/InitialPagedList.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/InvalidateCallbackTracker.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/InvalidatingPagingSourceFactory.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/ItemKeyedDataSource.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/ItemSnapshotList.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/LegacyPageFetcher.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/LegacyPagingSource.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/LoadState.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/LoadStates.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/LoadType.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/Logger.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/MutableCombinedLoadStateCollection.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/MutableLoadStateCollection.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/NullPaddedList.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/PageEvent.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/PageFetcher.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/PageFetcherSnapshot.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/PageFetcherSnapshotState.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/PageKeyedDataSource.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/PagePresenter.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/PagedList.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/PagedListConfig.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/PagedStorage.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/Pager.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/PagingConfig.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/PagingData.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/PagingDataDiffer.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/PagingDataTransforms.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/PagingSource.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/PagingSourceFactory.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/PagingState.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/PositionalDataSource.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/RemoteMediator.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/RemoteMediatorAccessor.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/Separators.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/SimpleChannelFlow.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/SingleRunner.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/SnapshotPagedList.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/SuspendingPagingSourceFactory.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/TransformablePage.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/UiReceiver.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/ViewportHint.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/WrapperDataSource.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/WrapperItemKeyedDataSource.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/WrapperPageKeyedDataSource.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/WrapperPositionalDataSource.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/internal/Constants.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/internal/LogUtil.kt
M paging/paging-common/src/jvmTest/kotlin/androidx/paging/CachedPageEventFlowLeakTest.kt
M paging/paging-common/src/jvmTest/kotlin/androidx/paging/CachedPageEventFlowTest.kt
M paging/paging-common/src/jvmTest/kotlin/androidx/paging/CachingTest.kt
M paging/paging-common/src/jvmTest/kotlin/androidx/paging/ConflatedEventBusTest.kt
M paging/paging-common/src/jvmTest/kotlin/androidx/paging/ContiguousPagedListTest.kt
M paging/paging-common/src/jvmTest/kotlin/androidx/paging/DataSourceTest.kt
M paging/paging-common/src/jvmTest/kotlin/androidx/paging/FailDispatcher.kt
M paging/paging-common/src/jvmTest/kotlin/androidx/paging/FlattenedPageEventStorageTest.kt
M paging/paging-common/src/jvmTest/kotlin/androidx/paging/FlowExtTest.kt
M paging/paging-common/src/jvmTest/kotlin/androidx/paging/GarbageCollectionTestHelper.kt
M paging/paging-common/src/jvmTest/kotlin/androidx/paging/HeaderFooterTest.kt
M paging/paging-common/src/jvmTest/kotlin/androidx/paging/HintHandlerTest.kt
M paging/paging-common/src/jvmTest/kotlin/androidx/paging/InvalidatingPagingSourceFactoryTest.kt
M paging/paging-common/src/jvmTest/kotlin/androidx/paging/ItemKeyedDataSourceTest.kt
M paging/paging-common/src/jvmTest/kotlin/androidx/paging/ItemSnapshotListTest.kt
M paging/paging-common/src/jvmTest/kotlin/androidx/paging/LegacyPageFetcherTest.kt
M paging/paging-common/src/jvmTest/kotlin/androidx/paging/LegacyPagingSourceTest.kt
M paging/paging-common/src/jvmTest/kotlin/androidx/paging/PageEventTest.kt
M paging/paging-common/src/jvmTest/kotlin/androidx/paging/PageFetcherSnapshotStateTest.kt
M paging/paging-common/src/jvmTest/kotlin/androidx/paging/PageFetcherSnapshotTest.kt
M paging/paging-common/src/jvmTest/kotlin/androidx/paging/PageFetcherTest.kt
M paging/paging-common/src/jvmTest/kotlin/androidx/paging/PageKeyedDataSourceTest.kt
M paging/paging-common/src/jvmTest/kotlin/androidx/paging/PagePresenterTest.kt
M paging/paging-common/src/jvmTest/kotlin/androidx/paging/PagedListConfigBuilderTest.kt
M paging/paging-common/src/jvmTest/kotlin/androidx/paging/PagedListConfigTest.kt
M paging/paging-common/src/jvmTest/kotlin/androidx/paging/PagedListTest.kt
M paging/paging-common/src/jvmTest/kotlin/androidx/paging/PagedStorageTest.kt
M paging/paging-common/src/jvmTest/kotlin/androidx/paging/PagingConfigTest.kt
M paging/paging-common/src/jvmTest/kotlin/androidx/paging/PagingDataDifferTest.kt
M paging/paging-common/src/jvmTest/kotlin/androidx/paging/PagingSourceTest.kt
M paging/paging-common/src/jvmTest/kotlin/androidx/paging/PagingStateTest.kt
M paging/paging-common/src/jvmTest/kotlin/androidx/paging/PositionalDataSourceTest.kt
M paging/paging-common/src/jvmTest/kotlin/androidx/paging/ProcessPageEventCallbackCapture.kt
M paging/paging-common/src/jvmTest/kotlin/androidx/paging/RemoteMediatorAccessorTest.kt
M paging/paging-common/src/jvmTest/kotlin/androidx/paging/SeparatorsTest.kt
M paging/paging-common/src/jvmTest/kotlin/androidx/paging/SeparatorsWithRemoteMediatorTest.kt
M paging/paging-common/src/jvmTest/kotlin/androidx/paging/SimpleChannelFlowTest.kt
M paging/paging-common/src/jvmTest/kotlin/androidx/paging/SimpleTransformLatestTest.kt
M paging/paging-common/src/jvmTest/kotlin/androidx/paging/SingleRunnerTest.kt
M paging/paging-common/src/jvmTest/kotlin/androidx/paging/StateChange.kt
M paging/paging-common/src/jvmTest/kotlin/androidx/paging/TestPagingSourceExt.kt
M paging/paging-common/src/jvmTest/kotlin/androidx/paging/TestUtils.kt
M paging/paging-common/src/jvmTest/kotlin/androidx/paging/WrappedItemKeyedDataSourceTest.kt
M paging/paging-common/src/jvmTest/kotlin/androidx/paging/WrappedPageKeyedDataSourceTest.kt
M paging/paging-common/src/jvmTest/kotlin/androidx/paging/WrappedPositionalDataSourceTest.kt

https://android-review.googlesource.com/2636227

[Deleted User] <[Deleted User]> #3Oct 28, 2021 11:01PM

Project: platform/frameworks/support
Branch: androidx-main

commit 45a39b3d17e70ccc588bb984f73618b1985a3cc0
Author: Clara Fok <clarafok@google.com>
Date: Fri Jun 30 12:21:09 2023

Rename jvmMain files to .jvm.kt

Ensure unique path to prevent duplicated class errors.

PagedList and PagedListConfig are NOT renamed because it breaks compatibility and since it contains public functions, should not be renamed per discussion in thread

https://chat.google.com/room/AAAAkD37w58/LOjte8_d9K8

Test: ./gradlew buildOnServer
Bug: 288623117
Change-Id: Iede0d9715ff4bdd17ca4e2fe94c0899489d9b39a

M paging/paging-common/src/commonMain/kotlin/androidx/paging/PagingDataTransforms.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/ContiguousPagedList.jvm.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/DataSource.jvm.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/InitialDataSource.jvm.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/InitialPagedList.jvm.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/ItemKeyedDataSource.jvm.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/LegacyPageFetcher.jvm.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/LegacyPagingSource.jvm.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/PageKeyedDataSource.jvm.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/PagedStorage.jvm.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/PositionalDataSource.jvm.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/SnapshotPagedList.jvm.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/WrapperDataSource.jvm.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/WrapperItemKeyedDataSource.jvm.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/WrapperPageKeyedDataSource.jvm.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/WrapperPositionalDataSource.jvm.kt

https://android-review.googlesource.com/2647603

il...@google.com <il...@google.com> Nov 18, 2021 10:12PM

Status: New

il...@google.com <il...@google.com> #4Aug 18, 2022 11:42PM

Assigned to sa...@google.com.

Project: platform/frameworks/support
Branch: androidx-main

commit 75107d52be492198ec61504c0b347e85127514d2
Author: Clara Fok <clarafok@google.com>
Date: Fri Jun 30 12:18:52 2023

Move PagingDataTransforms java util methods to jvmMain

Test: ./gradlew paging:paging-common:jvmTest
Bug: 288623117
Change-Id: I01935da0c9160ae3e8b0705d69bd086ab08337ba

M paging/paging-common/src/commonMain/kotlin/androidx/paging/PagingDataTransforms.kt
A paging/paging-common/src/jvmMain/kotlin/androidx/paging/PagingDataTransforms.jvm.kt

https://android-review.googlesource.com/2647602

ap...@google.com <ap...@google.com> #5Aug 30, 2022 04:44PM

Project: platform/frameworks/support
Branch: androidx-main

commit a69200acae2cea60ce0b473134445d050be580cb
Author: Clara Fok <clarafok@google.com>
Date: Fri Jun 30 12:04:07 2023

Migrate all Paging3 classes to commonMain

Test: ./gradlew paging:paging-common:jvmTest
Bug: 288623117
Change-Id: I2a37c3c7c9002d0a43b9f9c254f8584e3cc27dba

M paging/paging-common/src/commonMain/kotlin/androidx/paging/CachedPageEventFlow.kt
M paging/paging-common/src/commonMain/kotlin/androidx/paging/CachedPagingData.kt
M paging/paging-common/src/commonMain/kotlin/androidx/paging/ExperimentalPagingApi.kt
M paging/paging-common/src/commonMain/kotlin/androidx/paging/FlowExt.kt
M paging/paging-common/src/commonMain/kotlin/androidx/paging/HintHandler.kt
M paging/paging-common/src/commonMain/kotlin/androidx/paging/HintReceiver.kt
M paging/paging-common/src/commonMain/kotlin/androidx/paging/InvalidateCallbackTracker.kt
M paging/paging-common/src/commonMain/kotlin/androidx/paging/InvalidatingPagingSourceFactory.kt
M paging/paging-common/src/commonMain/kotlin/androidx/paging/Logger.kt
M paging/paging-common/src/commonMain/kotlin/androidx/paging/MutableCombinedLoadStateCollection.kt
M paging/paging-common/src/commonMain/kotlin/androidx/paging/PageEvent.kt
M paging/paging-common/src/commonMain/kotlin/androidx/paging/PageFetcher.kt
M paging/paging-common/src/commonMain/kotlin/androidx/paging/PageFetcherSnapshot.kt
M paging/paging-common/src/commonMain/kotlin/androidx/paging/PageFetcherSnapshotState.kt
M paging/paging-common/src/commonMain/kotlin/androidx/paging/PagePresenter.kt
M paging/paging-common/src/commonMain/kotlin/androidx/paging/Pager.kt
M paging/paging-common/src/commonMain/kotlin/androidx/paging/PagingConfig.kt
M paging/paging-common/src/commonMain/kotlin/androidx/paging/PagingData.kt
M paging/paging-common/src/commonMain/kotlin/androidx/paging/PagingDataDiffer.kt
M paging/paging-common/src/commonMain/kotlin/androidx/paging/PagingDataTransforms.kt
M paging/paging-common/src/commonMain/kotlin/androidx/paging/PagingSource.kt
M paging/paging-common/src/commonMain/kotlin/androidx/paging/PagingSourceFactory.kt
M paging/paging-common/src/commonMain/kotlin/androidx/paging/PagingState.kt
M paging/paging-common/src/commonMain/kotlin/androidx/paging/RemoteMediator.kt
M paging/paging-common/src/commonMain/kotlin/androidx/paging/RemoteMediatorAccessor.kt
M paging/paging-common/src/commonMain/kotlin/androidx/paging/Separators.kt
M paging/paging-common/src/commonMain/kotlin/androidx/paging/SingleRunner.kt
M paging/paging-common/src/commonMain/kotlin/androidx/paging/SuspendingPagingSourceFactory.kt
M paging/paging-common/src/commonMain/kotlin/androidx/paging/TransformablePage.kt
M paging/paging-common/src/commonMain/kotlin/androidx/paging/ViewportHint.kt
M paging/paging-common/src/commonTest/kotlin/androidx/paging/CachedPageEventFlowLeakTest.kt
M paging/paging-common/src/commonTest/kotlin/androidx/paging/CachedPageEventFlowTest.kt
M paging/paging-common/src/commonTest/kotlin/androidx/paging/CachingTest.kt
M paging/paging-common/src/commonTest/kotlin/androidx/paging/FailDispatcher.kt
M paging/paging-common/src/commonTest/kotlin/androidx/paging/FlattenedPageEventStorageTest.kt
M paging/paging-common/src/commonTest/kotlin/androidx/paging/FlowExtTest.kt
M paging/paging-common/src/commonTest/kotlin/androidx/paging/GarbageCollectionTestHelper.kt
M paging/paging-common/src/commonTest/kotlin/androidx/paging/HeaderFooterTest.kt
M paging/paging-common/src/commonTest/kotlin/androidx/paging/HintHandlerTest.kt
M paging/paging-common/src/commonTest/kotlin/androidx/paging/InvalidatingPagingSourceFactoryTest.kt
M paging/paging-common/src/commonTest/kotlin/androidx/paging/PageEventTest.kt
M paging/paging-common/src/commonTest/kotlin/androidx/paging/PageFetcherSnapshotStateTest.kt
M paging/paging-common/src/commonTest/kotlin/androidx/paging/PageFetcherSnapshotTest.kt
M paging/paging-common/src/commonTest/kotlin/androidx/paging/PageFetcherTest.kt
M paging/paging-common/src/commonTest/kotlin/androidx/paging/PagePresenterTest.kt
M paging/paging-common/src/commonTest/kotlin/androidx/paging/PagingConfigTest.kt
M paging/paging-common/src/commonTest/kotlin/androidx/paging/PagingDataDifferTest.kt
M paging/paging-common/src/commonTest/kotlin/androidx/paging/PagingSourceTest.kt
M paging/paging-common/src/commonTest/kotlin/androidx/paging/PagingStateTest.kt
M paging/paging-common/src/commonTest/kotlin/androidx/paging/ProcessPageEventCallbackCapture.kt
M paging/paging-common/src/commonTest/kotlin/androidx/paging/RemoteMediatorAccessorTest.kt
M paging/paging-common/src/commonTest/kotlin/androidx/paging/SeparatorsTest.kt
M paging/paging-common/src/commonTest/kotlin/androidx/paging/SeparatorsWithRemoteMediatorTest.kt
M paging/paging-common/src/commonTest/kotlin/androidx/paging/SimpleChannelFlowTest.kt
M paging/paging-common/src/commonTest/kotlin/androidx/paging/SimpleTransformLatestTest.kt
M paging/paging-common/src/commonTest/kotlin/androidx/paging/SingleRunnerTest.kt
M paging/paging-common/src/commonTest/kotlin/androidx/paging/StateChange.kt
M paging/paging-common/src/commonTest/kotlin/androidx/paging/TestPagingSourceExt.kt
M paging/paging-common/src/commonTest/kotlin/androidx/paging/TestUtils.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/PagedList.kt

https://android-review.googlesource.com/2647601

il...@google.com <il...@google.com> #6Aug 30, 2022 06:12PM

Marked as fixed.

Project: platform/frameworks/support
Branch: androidx-main

commit b536469eba96d3045cf26ee40bf87a4b1d579dbe
Author: Clara Fok <clarafok@google.com>
Date: Fri Jun 30 11:57:20 2023

Remove @JvmDefaultWithCompatibility from Logger.kt

Annotation was added in

b/251463569

to maintain binary compatibility.

But Logger is only used internally and we want to move this file to commonMain hence removing it.

Test: ./gradlew buildOnServer
Bug: 288623117
Relnote: "Remove @JvmDefaultWithCompatibility annotation"
Change-Id: I9b67c2e081a15e18797b68f5ce2224858e358a1d

M paging/paging-common/api/current.txt
M paging/paging-common/api/restricted_current.txt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/Logger.kt

https://android-review.googlesource.com/2647600

na...@google.com <na...@google.com> #7Sep 12, 2022 05:52PM

Project: platform/frameworks/support
Branch: androidx-main

commit 19c9fbd2252535dcb858faf39c1629a9771f9675
Author: Clara Fok <clarafok@google.com>
Date: Fri Jun 30 10:59:11 2023

Add CompatLegacyPagingSource in commonMain

LegacyPagingSource relies on PageFetcher to set the pageSize on new instance creation because LegacyPagingSource does not have access to PagingConfig. By adding CompatLegacyPagingSource interface, PageFetcher in commonMain can reference LegacyPagingSource in jvmMain.

Test: ./gradlew paging:paging-common:jvmTest
Bug: 288623117
Change-Id: I0ef1e7f0426b237d47beffbb4f1197d1e8d21ee5

A paging/paging-common/src/commonMain/kotlin/androidx/paging/CompatLegacyPagingSource.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/LegacyPagingSource.kt
M paging/paging-common/src/jvmMain/kotlin/androidx/paging/PageFetcher.kt

https://android-review.googlesource.com/2647599