Skip to content

Fix nominate for deletion #6194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
+46 −25
Closed

Fix nominate for deletion #6194

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
955b2fc
do not fetch achievements in beta variant
parneet-guraya Feb 18, 2025
52e6d41
trigger refresh when operation finishes
parneet-guraya Feb 18, 2025
93b3e23
fix-tests
parneet-guraya Feb 18, 2025
cca0a11
Merge branch 'main' into fix-deletion
nicolas-raoul Mar 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
do not fetch achievements in beta variant 
Signed-off-by: parneet-guraya <gurayaparneet@gmail.com>
  • Loading branch information
@parneet-guraya
parneet-guraya committed Mar 28, 2025
commit 955b2fce9b0db4f83b4f058f3cd19e4938863a83
9 changes: 7 additions & 2 deletions app/src/main/java/fr/free/nrw/commons/delete/ReasonBuilder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import fr.free.nrw.commons.R
import fr.free.nrw.commons.profile.achievements.FeedbackResponse
import fr.free.nrw.commons.auth.SessionManager
import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient
import fr.free.nrw.commons.utils.ConfigUtils
import fr.free.nrw.commons.utils.ViewUtilWrapper
import io.reactivex.Single
import timber.log.Timber
Expand Down Expand Up @@ -55,6 +56,10 @@ class ReasonBuilder @Inject constructor(
}

private fun fetchArticleNumber(media: Media, reason: String): Single<String> {
if (ConfigUtils.isBetaFlavour) {
return Single.just(appendArticlesUsed(null, media, reason))
}

return if (checkAccount()) {
okHttpJsonApiClient
.getAchievements(sessionManager.userName)
Expand All @@ -72,9 +77,9 @@ class ReasonBuilder @Inject constructor(
* @param reason
*/
@SuppressLint("StringFormatInvalid")
private fun appendArticlesUsed(feedBack: FeedbackResponse, media: Media, reason: String): String {
private fun appendArticlesUsed(feedBack: FeedbackResponse?, media: Media, reason: String): String {
val reason1Template = context.getString(R.string.uploaded_by_myself)
return reason + String.format(Locale.getDefault(), reason1Template, prettyUploadedDate(media), feedBack.articlesUsingImages)
return reason + String.format(Locale.getDefault(), reason1Template, prettyUploadedDate(media), feedBack?.articlesUsingImages ?: 0)
.also { Timber.i("New Reason %s", it) }
}

Expand Down