Skip to content

Commit 62136b5

Browse files
Fix NPE with UploadMediaDetails.captionText (commons-app#6128)
Co-authored-by: Nicolas Raoul <nicolas.raoul@gmail.com>
1 parent 76078cf commit 62136b5

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

app/src/main/java/fr/free/nrw/commons/contributions/Contribution.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ data class Contribution constructor(
101101
*/
102102
fun formatCaptions(uploadMediaDetails: List<UploadMediaDetail>) =
103103
uploadMediaDetails
104-
.associate { it.languageCode!! to it.captionText!! }
104+
.associate { it.languageCode!! to it.captionText }
105105
.filter { it.value.isNotBlank() }
106106

107107
/**

app/src/main/java/fr/free/nrw/commons/description/DescriptionEditActivity.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -267,11 +267,11 @@ class DescriptionEditActivity :
267267
applicationContext,
268268
media,
269269
mediaDetail.languageCode!!,
270-
mediaDetail.captionText!!,
270+
mediaDetail.captionText,
271271
).subscribeOn(Schedulers.io())
272272
.observeOn(AndroidSchedulers.mainThread())
273273
.subscribe { s: Boolean? ->
274-
updatedCaptions[mediaDetail.languageCode!!] = mediaDetail.captionText!!
274+
updatedCaptions[mediaDetail.languageCode!!] = mediaDetail.captionText
275275
media.captions = updatedCaptions
276276
Timber.d("Caption is added.")
277277
},

app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1586,7 +1586,7 @@ class MediaDetailFragment : CommonsDaggerSupportFragment(), CategoryEditHelper.C
15861586
mediaDetail: UploadMediaDetail,
15871587
updatedCaptions: MutableMap<String, String>
15881588
) {
1589-
updatedCaptions[mediaDetail.languageCode!!] = mediaDetail.captionText!!
1589+
updatedCaptions[mediaDetail.languageCode!!] = mediaDetail.captionText
15901590
media!!.captions = updatedCaptions
15911591
}
15921592

app/src/main/java/fr/free/nrw/commons/upload/UploadMediaDetail.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ data class UploadMediaDetail(
2323
* The caption text for the item being uploaded.
2424
* @param captionText The caption text.
2525
*/
26-
var captionText: String? = "",
26+
var captionText: String = "",
2727
) : Parcelable {
2828
fun javaCopy() = copy()
2929

3030
constructor(place: Place?) : this(
3131
place?.language,
3232
place?.longDescription,
33-
place?.name,
33+
place?.name ?: "",
3434
)
3535

3636
/**

app/src/main/java/fr/free/nrw/commons/upload/categories/CategoriesPresenter.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ class CategoriesPresenter
140140
*/
141141
private fun getImageTitleList(): List<String> =
142142
repository.getUploads()
143-
.map { it.uploadMediaDetails[0].captionText!! }
143+
.map { it.uploadMediaDetails[0].captionText }
144144
.filterNot { TextUtils.isEmpty(it) }
145145

146146
/**

0 commit comments

Comments
 (0)