Skip to content

fix(chat): guard MediaStore.getPickImagesMaxLimit on older pickers #1741

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bmc08gt merged 2 commits into from
Oct 9, 2026
Merged

fix(chat): guard MediaStore.getPickImagesMaxLimit on older pickers #1741

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cac9aa7
fix(chat): guard MediaStore.getPickImagesMaxLimit on older pickers
bmc08gt Oct 9, 2026
7f23f4f
fix(chat): cap the fallback photo picker at the open slots
bmc08gt Oct 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion ...pcash/shared/chat-ui/src/main/kotlin/com/flipcash/shared/chat/ui/media/ChatPhotoPicker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package com.flipcash.shared.chat.ui.media

import android.net.Uri
import android.os.Build
import android.os.ext.SdkExtensions
import android.provider.MediaStore
import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.PickVisualMediaRequest
Expand Down Expand Up @@ -30,7 +32,19 @@ fun rememberChatPhotoPicker(
val single = rememberLauncherForActivityResult(ActivityResultContracts.PickVisualMedia()) { uri ->
if (uri != null) currentOnPicked(listOf(uri))
}
val max = remaining.coerceIn(2, maxOf(2, MediaStore.getPickImagesMaxLimit()))
// getPickImagesMaxLimit() only exists where the system picker does (API 33+, or SDK
// extension R 2+). Without it, the open slots are the only cap.
val systemMax = remember {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU ||
(Build.VERSION.SDK_INT >= Build.VERSION_CODES.R &&
SdkExtensions.getExtensionVersion(Build.VERSION_CODES.R) >= 2)
) {
MediaStore.getPickImagesMaxLimit()
} else {
null
}
}
val max = maxOf(2, systemMax?.let { minOf(remaining, it) } ?: remaining)
val multiple = rememberLauncherForActivityResult(
ActivityResultContracts.PickMultipleVisualMedia(max),
) { uris ->
Expand Down
Loading