Skip to content

Commit 9fb294d

Browse files
adalpariclaude
andauthored
Fix NPE in DeviceMediaLoader when device media title is null (#23131)
MediaColumns.TITLE can be null for some device media entries, which crashed the media loader when constructing DeviceMediaItem. Make the title nullable and show "Unknown" when representing an item without a name. Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
1 parent 63ecadd commit 9fb294d

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ class MediaPickerViewModel @Inject constructor(
253253
clickAction = clickAction
254254
)
255255
AUDIO, DOCUMENT -> MediaPickerUiItem.FileItem(
256-
fileName = it.name ?: "",
256+
fileName = it.name ?: resourceProvider.getString(R.string.unknown),
257257
fileExtension = fileExtension,
258258
identifier = it.identifier,
259259
isSelected = isSelected,

WordPress/src/main/java/org/wordpress/android/ui/mediapicker/loader/DeviceMediaLoader.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ class DeviceMediaLoader
153153

154154
data class DeviceMediaList(val items: List<DeviceMediaItem>, val next: Long? = null)
155155

156-
data class DeviceMediaItem(val uri: UriWrapper, val title: String, val dateModified: Long)
156+
data class DeviceMediaItem(val uri: UriWrapper, val title: String?, val dateModified: Long)
157157

158158
companion object {
159159
private const val ID_COL = Media._ID

0 commit comments

Comments
 (0)