From 4634eeb7d98ab85f80b671a4379b6e0426936a81 Mon Sep 17 00:00:00 2001 From: parneet-guraya Date: Mon, 24 Feb 2025 15:56:36 +0530 Subject: [PATCH] Use user prop if author is empty or null Signed-off-by: parneet-guraya --- app/src/main/java/fr/free/nrw/commons/Media.kt | 13 +++++++++++++ .../fr/free/nrw/commons/category/GridViewAdapter.kt | 13 ++++--------- .../commons/contributions/ContributionViewHolder.kt | 2 +- .../java/fr/free/nrw/commons/delete/DeleteHelper.kt | 2 +- .../nrw/commons/explore/media/PagedMediaAdapter.kt | 9 ++------- .../nrw/commons/media/MediaDetailPagerFragment.java | 4 ++-- 6 files changed, 23 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/Media.kt b/app/src/main/java/fr/free/nrw/commons/Media.kt index 293321c27..1222cd8b0 100644 --- a/app/src/main/java/fr/free/nrw/commons/Media.kt +++ b/app/src/main/java/fr/free/nrw/commons/Media.kt @@ -125,6 +125,19 @@ class Media constructor( categoriesHiddenStatus = categoriesHiddenStatus ) + /** + * Returns Author if it's not null or empty, otherwise + * returns user + * @return Author or User + */ + fun getAuthorOrUser(): String? { + return if (!author.isNullOrEmpty()) { + author + } else{ + user + } + } + /** * Gets media display title * @return Media title diff --git a/app/src/main/java/fr/free/nrw/commons/category/GridViewAdapter.kt b/app/src/main/java/fr/free/nrw/commons/category/GridViewAdapter.kt index 5dbcc59fd..0198c61a5 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/GridViewAdapter.kt +++ b/app/src/main/java/fr/free/nrw/commons/category/GridViewAdapter.kt @@ -98,14 +98,9 @@ class GridViewAdapter( */ @SuppressLint("StringFormatInvalid") private fun setUploaderView(item: Media, uploader: TextView) { - if (!item.author.isNullOrEmpty()) { - uploader.visibility = View.VISIBLE - uploader.text = context.getString( - R.string.image_uploaded_by, - item.user - ) - } else { - uploader.visibility = View.GONE - } + uploader.text = context.getString( + R.string.image_uploaded_by, + item.getAuthorOrUser() + ) } } diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.kt b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.kt index d1dbf4509..32028cfd2 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.kt +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.kt @@ -54,7 +54,7 @@ an upload might take a dozen seconds. */ this.contribution = contribution this.position = position binding.contributionTitle.text = contribution.media.mostRelevantCaption - binding.authorView.text = contribution.media.author + binding.authorView.text = contribution.media.getAuthorOrUser() //Removes flicker of loading image. binding.contributionImage.hierarchy.fadeDuration = 0 diff --git a/app/src/main/java/fr/free/nrw/commons/delete/DeleteHelper.kt b/app/src/main/java/fr/free/nrw/commons/delete/DeleteHelper.kt index be0b2bd79..09959d0ef 100644 --- a/app/src/main/java/fr/free/nrw/commons/delete/DeleteHelper.kt +++ b/app/src/main/java/fr/free/nrw/commons/delete/DeleteHelper.kt @@ -111,7 +111,7 @@ class DeleteHelper @Inject constructor( val userPageString = "\n{{subst:idw|${media.filename}}} ~~~~" - val creator = media.author + val creator = media.getAuthorOrUser() ?: throw RuntimeException("Failed to nominate for deletion") return pageEditClient.prependEdit( diff --git a/app/src/main/java/fr/free/nrw/commons/explore/media/PagedMediaAdapter.kt b/app/src/main/java/fr/free/nrw/commons/explore/media/PagedMediaAdapter.kt index 537f44aa0..364b5d363 100644 --- a/app/src/main/java/fr/free/nrw/commons/explore/media/PagedMediaAdapter.kt +++ b/app/src/main/java/fr/free/nrw/commons/explore/media/PagedMediaAdapter.kt @@ -52,12 +52,7 @@ class SearchImagesViewHolder( binding.categoryImageView.setOnClickListener { onImageClicked(item.second) } binding.categoryImageTitle.text = media.mostRelevantCaption binding.categoryImageView.setImageURI(media.thumbUrl) - if (media.author?.isNotEmpty() == true) { - binding.categoryImageAuthor.visibility = View.VISIBLE - binding.categoryImageAuthor.text = - containerView.context.getString(R.string.image_uploaded_by, media.author) - } else { - binding.categoryImageAuthor.visibility = View.GONE - } + binding.categoryImageAuthor.text = + containerView.context.getString(R.string.image_uploaded_by, media.getAuthorOrUser()) } } diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java index b4b4e9c57..cba582a35 100644 --- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java @@ -328,7 +328,7 @@ public class MediaDetailPagerFragment extends CommonsDaggerSupportFragment imple .append("\n\n"); builder.append("User that you want to report: ") - .append(media.getAuthor()) + .append(media.getUser()) .append("\n\n"); if (sessionManager.getUserName() != null) { @@ -423,7 +423,7 @@ public class MediaDetailPagerFragment extends CommonsDaggerSupportFragment imple // Initialize bookmark object bookmark = new Bookmark( m.getFilename(), - m.getAuthor(), + m.getAuthorOrUser(), BookmarkPicturesContentProvider.uriForName(m.getFilename()) ); updateBookmarkState(menu.findItem(R.id.menu_bookmark_current_image));