diff options
Diffstat (limited to 'photopicker')
3 files changed, 25 insertions, 7 deletions
diff --git a/photopicker/src/com/android/photopicker/data/MediaProviderClient.kt b/photopicker/src/com/android/photopicker/data/MediaProviderClient.kt index ac3d4913e..360e90f57 100644 --- a/photopicker/src/com/android/photopicker/data/MediaProviderClient.kt +++ b/photopicker/src/com/android/photopicker/data/MediaProviderClient.kt @@ -248,7 +248,7 @@ open class MediaProviderClient { } /** Fetch a list of [Media] from MediaProvider for the given page key. */ - suspend fun fetchMedia( + open suspend fun fetchMedia( pageKey: MediaPageKey, pageSize: Int, contentResolver: ContentResolver, @@ -401,7 +401,7 @@ open class MediaProviderClient { } /** Fetch a list of [Group.Album] from MediaProvider for the given page key. */ - suspend fun fetchAlbums( + open suspend fun fetchAlbums( pageKey: MediaPageKey, pageSize: Int, contentResolver: ContentResolver, @@ -447,7 +447,7 @@ open class MediaProviderClient { } /** Fetch a list of [Media] from MediaProvider for the given page key. */ - suspend fun fetchAlbumMedia( + open suspend fun fetchAlbumMedia( albumId: String, albumAuthority: String, pageKey: MediaPageKey, diff --git a/photopicker/tests/src/com/android/photopicker/data/paging/AlbumPagingSourceTest.kt b/photopicker/tests/src/com/android/photopicker/data/paging/AlbumPagingSourceTest.kt index 888555d20..8ee41953d 100644 --- a/photopicker/tests/src/com/android/photopicker/data/paging/AlbumPagingSourceTest.kt +++ b/photopicker/tests/src/com/android/photopicker/data/paging/AlbumPagingSourceTest.kt @@ -32,6 +32,7 @@ import com.android.photopicker.data.MediaProviderClient import com.android.photopicker.data.TestMediaProvider import com.android.photopicker.data.TestPrefetchDataService import com.android.photopicker.data.model.MediaPageKey +import com.android.photopicker.data.model.MediaSource import com.android.photopicker.data.model.Provider import com.android.photopicker.data.paging.AlbumPagingSource import kotlinx.coroutines.ExperimentalCoroutinesApi @@ -54,7 +55,15 @@ class AlbumPagingSourceTest { private val testSessionId = generatePickerSessionId() private val testContentProvider: TestMediaProvider = TestMediaProvider() private val contentResolver: ContentResolver = ContentResolver.wrap(testContentProvider) - private val availableProviders: List<Provider> = emptyList() + private val availableProviders: List<Provider> = + listOf( + Provider( + authority = "local_authority", + mediaSource = MediaSource.LOCAL, + uid = 1, + displayName = "Local Provider", + ) + ) private val testPhotopickerConfiguration: PhotopickerConfiguration = PhotopickerConfiguration( action = MediaStore.ACTION_PICK_IMAGES, @@ -112,7 +121,7 @@ class AlbumPagingSourceTest { pageKey, pageSize, contentResolver, - emptyList(), + availableProviders, testPhotopickerConfiguration, ) } diff --git a/photopicker/tests/src/com/android/photopicker/data/paging/MediaPagingSourceTest.kt b/photopicker/tests/src/com/android/photopicker/data/paging/MediaPagingSourceTest.kt index ba42eb58a..f188c3347 100644 --- a/photopicker/tests/src/com/android/photopicker/data/paging/MediaPagingSourceTest.kt +++ b/photopicker/tests/src/com/android/photopicker/data/paging/MediaPagingSourceTest.kt @@ -32,6 +32,7 @@ import com.android.photopicker.data.MediaProviderClient import com.android.photopicker.data.TestMediaProvider import com.android.photopicker.data.TestPrefetchDataService import com.android.photopicker.data.model.MediaPageKey +import com.android.photopicker.data.model.MediaSource import com.android.photopicker.data.model.Provider import com.android.photopicker.data.paging.MediaPagingSource import kotlinx.coroutines.ExperimentalCoroutinesApi @@ -54,7 +55,15 @@ class MediaPagingSourceTest { private val testSessionId = generatePickerSessionId() private val testContentProvider: TestMediaProvider = TestMediaProvider() private val contentResolver: ContentResolver = ContentResolver.wrap(testContentProvider) - private val availableProviders: List<Provider> = emptyList() + private val availableProviders: List<Provider> = + listOf( + Provider( + authority = "local_authority", + mediaSource = MediaSource.LOCAL, + uid = 1, + displayName = "Local Provider", + ) + ) private val testPhotopickerConfiguration: PhotopickerConfiguration = PhotopickerConfiguration( action = MediaStore.ACTION_PICK_IMAGES, @@ -112,7 +121,7 @@ class MediaPagingSourceTest { pageKey, pageSize, contentResolver, - emptyList(), + availableProviders, testPhotopickerConfiguration, ) } |