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

Merge branch 'fix/upload-caption-npe' into feat/suggest-categories-from-p18

Browse source
This commit is contained in:
savsch 2025-01-14 23:08:26 +05:30
commit 5012126567
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>) =
uploadMediaDetails
.associate { it.languageCode!! to it.captionText!! }
.associate { it.languageCode!! to it.captionText }
.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,
media,
mediaDetail.languageCode!!,
mediaDetail.captionText!!,
mediaDetail.captionText,
).subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe { s: Boolean? ->
updatedCaptions[mediaDetail.languageCode!!] = mediaDetail.captionText!!
updatedCaptions[mediaDetail.languageCode!!] = mediaDetail.captionText
media.captions = updatedCaptions
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,
updatedCaptions: MutableMap<String, String>
) {
updatedCaptions[mediaDetail.languageCode!!] = mediaDetail.captionText!!
updatedCaptions[mediaDetail.languageCode!!] = mediaDetail.captionText
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.
* @param captionText The caption text.
*/
var captionText: String? = "",
var captionText: String = "",
) : Parcelable {
fun javaCopy() = copy()
constructor(place: Place?) : this(
place?.language,
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> =
repository.getUploads()
.map { it.uploadMediaDetails[0].captionText!! }
.map { it.uploadMediaDetails[0].captionText }
.filterNot { TextUtils.isEmpty(it) }
/**