mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix NPE with UploadMediaDetails.captionText (#6128)

Browse source 
Co-authored-by: Nicolas Raoul <nicolas.raoul@gmail.com>
This commit is contained in:
Tanmay Gupta 2025-01-15 19:22:35 +05:30 • committed by GitHub
parent 76078cf3b5
commit 62136b5b09
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -101,7 +101,7 @@ data class Contribution constructor(
*/ */
fun formatCaptions(uploadMediaDetails: List<UploadMediaDetail>) = fun formatCaptions(uploadMediaDetails: List<UploadMediaDetail>) =
uploadMediaDetails uploadMediaDetails
.associate { it.languageCode!! to it.captionText!! } .associate { it.languageCode!! to it.captionText }
.filter { it.value.isNotBlank() } .filter { it.value.isNotBlank() }
/** /**

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

@ -267,11 +267,11 @@ class DescriptionEditActivity :
applicationContext, applicationContext,
media, media,
mediaDetail.languageCode!!, mediaDetail.languageCode!!,
mediaDetail.captionText!!, mediaDetail.captionText,
).subscribeOn(Schedulers.io()) ).subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe { s: Boolean? -> .subscribe { s: Boolean? ->
updatedCaptions[mediaDetail.languageCode!!] = mediaDetail.captionText!! updatedCaptions[mediaDetail.languageCode!!] = mediaDetail.captionText
media.captions = updatedCaptions media.captions = updatedCaptions
Timber.d("Caption is added.") Timber.d("Caption is added.")
}, },

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

@ -1586,7 +1586,7 @@ class MediaDetailFragment : CommonsDaggerSupportFragment(), CategoryEditHelper.C
mediaDetail: UploadMediaDetail, mediaDetail: UploadMediaDetail,
updatedCaptions: MutableMap<String, String> updatedCaptions: MutableMap<String, String>
) { ) {
updatedCaptions[mediaDetail.languageCode!!] = mediaDetail.captionText!! updatedCaptions[mediaDetail.languageCode!!] = mediaDetail.captionText
media!!.captions = updatedCaptions media!!.captions = updatedCaptions
} }

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

@ -23,14 +23,14 @@ data class UploadMediaDetail(
* The caption text for the item being uploaded. * The caption text for the item being uploaded.
* @param captionText The caption text. * @param captionText The caption text.
*/ */
var captionText: String? = "", var captionText: String = "",
) : Parcelable { ) : Parcelable {
fun javaCopy() = copy() fun javaCopy() = copy()
constructor(place: Place?) : this( constructor(place: Place?) : this(
place?.language, place?.language,
place?.longDescription, place?.longDescription,
place?.name, place?.name ?: "",
) )
/** /**

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

@ -140,7 +140,7 @@ class CategoriesPresenter
*/ */
private fun getImageTitleList(): List<String> = private fun getImageTitleList(): List<String> =
repository.getUploads() repository.getUploads()
.map { it.uploadMediaDetails[0].captionText!! } .map { it.uploadMediaDetails[0].captionText }
.filterNot { TextUtils.isEmpty(it) } .filterNot { TextUtils.isEmpty(it) }
/** /**