From 54c7187bbaf130bde1ad3f84790f3373280deae1 Mon Sep 17 00:00:00 2001 From: shashankiitbhu <126143257+shashankiitbhu@users.noreply.github.com> Date: Mon, 15 Jan 2024 18:10:33 +0530 Subject: [PATCH] Peer Review Fix (#5435) * Peer Review Fix * Peer Review Fix #2 --------- Co-authored-by: shashankkumar --- .../java/fr/free/nrw/commons/review/ReviewActivity.java | 7 +++++++ .../fr/free/nrw/commons/review/ReviewImageFragment.java | 2 ++ 2 files changed, 9 insertions(+) diff --git a/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java b/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java index d18060fd3..a5ea2dbf4 100644 --- a/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java @@ -27,6 +27,7 @@ import com.facebook.drawee.view.SimpleDraweeView; import com.viewpagerindicator.CirclePageIndicator; import fr.free.nrw.commons.Media; import fr.free.nrw.commons.R; +import fr.free.nrw.commons.auth.AccountUtil; import fr.free.nrw.commons.delete.DeleteHelper; import fr.free.nrw.commons.media.MediaDetailFragment; import fr.free.nrw.commons.theme.BaseActivity; @@ -217,6 +218,12 @@ public class ReviewActivity extends BaseActivity { return; } + //If The Media User and Current Session Username is same then Skip the Image + if (media.getUser() != null && media.getUser().equals(AccountUtil.getUserName(getApplicationContext()))) { + runRandomizer(); + return; + } + simpleDraweeView.setImageURI(media.getImageUrl()); reviewController.onImageRefreshed(media); //file name is updated diff --git a/app/src/main/java/fr/free/nrw/commons/review/ReviewImageFragment.java b/app/src/main/java/fr/free/nrw/commons/review/ReviewImageFragment.java index e7f4a814b..35c5aeace 100644 --- a/app/src/main/java/fr/free/nrw/commons/review/ReviewImageFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/review/ReviewImageFragment.java @@ -21,6 +21,7 @@ import fr.free.nrw.commons.R; import fr.free.nrw.commons.di.CommonsDaggerSupportFragment; import java.util.ArrayList; import java.util.List; +import java.util.Objects; public class ReviewImageFragment extends CommonsDaggerSupportFragment { @@ -91,6 +92,7 @@ public class ReviewImageFragment extends CommonsDaggerSupportFragment { ButterKnife.bind(this, layoutView); String question, explanation=null, yesButtonText, noButtonText; + switch (position) { case SPAM: question = getString(R.string.review_spam);