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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Fix nominate for deletion #6194

Show file tree
Hide file tree
Changes from all commits
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
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
6 changes: 4 additions & 2 deletions app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ class MediaDetailFragment : CommonsDaggerSupportFragment(), CategoryEditHelper.C
private var index: Int = 0
private var isDeleted: Boolean = false
private var isWikipediaButtonDisplayed: Boolean = false
private val callback: Callback? = null
private var callback: Callback? = null

@Inject
lateinit var mediaDetailViewModelFactory: MediaDetailViewModel.MediaDetailViewModelProviderFactory
Expand Down Expand Up @@ -2078,7 +2078,8 @@ class MediaDetailFragment : CommonsDaggerSupportFragment(), CategoryEditHelper.C
index: Int,
editable: Boolean,
isCategoryImage: Boolean,
isWikipediaButtonDisplayed: Boolean
isWikipediaButtonDisplayed: Boolean,
callback: Callback
): MediaDetailFragment {
val mf = MediaDetailFragment()
val state = Bundle()
Expand All @@ -2089,6 +2090,7 @@ class MediaDetailFragment : CommonsDaggerSupportFragment(), CategoryEditHelper.C
state.putInt("listTop", 0)
state.putBoolean("isWikipediaButtonDisplayed", isWikipediaButtonDisplayed)
mf.arguments = state
mf.callback = callback

return mf
}
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,9 +623,9 @@ public Fragment getItem(int i) {
binding.mediaDetailsPager.postDelayed(() -> getActivity().invalidateOptionsMenu(), 5);
}
if (isFromFeaturedRootFragment) {
return MediaDetailFragment.forMedia(position+i, editable, isFeaturedImage, isWikipediaButtonDisplayed);
return MediaDetailFragment.forMedia(position+i, editable, isFeaturedImage, isWikipediaButtonDisplayed, MediaDetailPagerFragment.this);
} else {
return MediaDetailFragment.forMedia(i, editable, isFeaturedImage, isWikipediaButtonDisplayed);
return MediaDetailFragment.forMedia(i, editable, isFeaturedImage, isWikipediaButtonDisplayed, MediaDetailPagerFragment.this);
}
}

Expand Down
47 changes: 29 additions & 18 deletions app/src/test/kotlin/fr/free/nrw/commons/delete/ReasonBuilderTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient
import fr.free.nrw.commons.profile.achievements.FeedbackResponse
import fr.free.nrw.commons.profile.leaderboard.LeaderboardResponse
import fr.free.nrw.commons.profile.leaderboard.UpdateAvatarResponse
import fr.free.nrw.commons.utils.ConfigUtils
import fr.free.nrw.commons.utils.ViewUtilWrapper
import io.reactivex.Observable
import io.reactivex.Single
Expand Down Expand Up @@ -55,28 +56,38 @@ class ReasonBuilderTest {

@Test
fun forceLoginWhenAccountIsNull() {
PowerMockito.`when`(context?.getString(R.string.user_not_logged_in))
.thenReturn("Log-in expired. Please log in again.")

reasonBuilder!!.getReason(mock(Media::class.java), "test")
verify(sessionManager, times(1))!!.forceLogin(any(Context::class.java))
if (!ConfigUtils.isBetaFlavour) {
PowerMockito.`when`(context?.getString(R.string.user_not_logged_in))
.thenReturn("Log-in expired. Please log in again.")
reasonBuilder!!.getReason(mock(Media::class.java), "test")
verify(sessionManager, times(1))!!.forceLogin(any(Context::class.java))
}
}

@Test
fun getReason() {
`when`(sessionManager?.userName).thenReturn("Testuser")
`when`(sessionManager?.doesAccountExist()).thenReturn(true)
`when`(okHttpJsonApiClient!!.getAchievements(anyString()))
.thenReturn(Single.just(mock(FeedbackResponse::class.java)))
`when`(okHttpJsonApiClient!!.getLeaderboard(anyString(), anyString(), anyString(), anyString(), anyString()))
.thenReturn(Observable.just(mock(LeaderboardResponse::class.java)))
`when`(okHttpJsonApiClient!!.setAvatar(anyString(), anyString()))
.thenReturn(Single.just(mock(UpdateAvatarResponse::class.java)))

val media = media(filename = "test_file", dateUploaded = Date())
if (!ConfigUtils.isBetaFlavour) {
`when`(sessionManager?.userName).thenReturn("Testuser")
`when`(sessionManager?.doesAccountExist()).thenReturn(true)
`when`(okHttpJsonApiClient!!.getAchievements(anyString()))
.thenReturn(Single.just(mock(FeedbackResponse::class.java)))
`when`(
okHttpJsonApiClient!!.getLeaderboard(
anyString(),
anyString(),
anyString(),
anyString(),
anyString()
)
)
.thenReturn(Observable.just(mock(LeaderboardResponse::class.java)))
`when`(okHttpJsonApiClient!!.setAvatar(anyString(), anyString()))
.thenReturn(Single.just(mock(UpdateAvatarResponse::class.java)))

reasonBuilder!!.getReason(media, "test")
verify(sessionManager, times(0))!!.forceLogin(any(Context::class.java))
verify(okHttpJsonApiClient, times(1))!!.getAchievements(anyString())
val media = media(filename = "test_file", dateUploaded = Date())
reasonBuilder!!.getReason(media, "test")
verify(sessionManager, times(0))!!.forceLogin(any(Context::class.java))
verify(okHttpJsonApiClient, times(1))!!.getAchievements(anyString())
}
}
}
5 changes: 4 additions & 1 deletion app/src/test/kotlin/fr/free/nrw/commons/media/MediaDetailFragmentUnitTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,9 @@ class MediaDetailFragmentUnitTests {

private lateinit var _binding: FragmentMediaDetailBinding

@Mock
private lateinit var callback: MediaDetailFragment.Callback

@Before
fun setUp() {
MockitoAnnotations.openMocks(this)
Expand Down Expand Up @@ -789,7 +792,7 @@ class MediaDetailFragmentUnitTests {
@Test
@Throws(Exception::class)
fun testForMedia() {
MediaDetailFragment.forMedia(0, true, true, true)
MediaDetailFragment.forMedia(0, true, true, true, callback)
}

@Test
Expand Down