diff --git a/app/src/main/java/fr/free/nrw/commons/delete/DeleteHelper.java b/app/src/main/java/fr/free/nrw/commons/delete/DeleteHelper.java index 05019cd9e..0b0d8fde4 100644 --- a/app/src/main/java/fr/free/nrw/commons/delete/DeleteHelper.java +++ b/app/src/main/java/fr/free/nrw/commons/delete/DeleteHelper.java @@ -20,6 +20,7 @@ import fr.free.nrw.commons.mwapi.MediaWikiApi; import fr.free.nrw.commons.notification.NotificationHelper; import fr.free.nrw.commons.review.ReviewActivity; import fr.free.nrw.commons.utils.ViewUtil; +import fr.free.nrw.commons.review.ReviewController; import fr.free.nrw.commons.utils.ViewUtilWrapper; import io.reactivex.Single; import timber.log.Timber; @@ -142,7 +143,7 @@ public class DeleteHelper { * @param question * @param problem */ - public void askReasonAndExecute(Media media, Context context, String question, String problem) { + public void askReasonAndExecute(Media media, Context context, String question, ReviewController.DeleteReason problem) { AlertDialog.Builder alert = new AlertDialog.Builder(context); alert.setTitle(question); @@ -152,12 +153,12 @@ public class DeleteHelper { String[] reasonList = {"Reason 1", "Reason 2", "Reason 3", "Reason 4"}; - if (problem.equals("spam")) { + if (problem == ReviewController.DeleteReason.SPAM) { reasonList[0] = "A selfie"; reasonList[1] = "Blurry"; reasonList[2] = "Nonsense"; reasonList[3] = "Other"; - } else if (problem.equals("copyRightViolation")) { + } else if (problem == ReviewController.DeleteReason.COPYRIGHT_VIOLATION) { reasonList[0] = "Press photo"; reasonList[1] = "Random photo from internet"; reasonList[2] = "Logo"; diff --git a/app/src/main/java/fr/free/nrw/commons/review/ReviewController.java b/app/src/main/java/fr/free/nrw/commons/review/ReviewController.java index 08aec8568..b4bf05e2c 100644 --- a/app/src/main/java/fr/free/nrw/commons/review/ReviewController.java +++ b/app/src/main/java/fr/free/nrw/commons/review/ReviewController.java @@ -74,18 +74,23 @@ public class ReviewController { } } + public enum DeleteReason { + SPAM, + COPYRIGHT_VIOLATION + } + public void reportSpam(@NonNull Activity activity) { deleteHelper.askReasonAndExecute(new Media("File:" + fileName), activity, activity.getResources().getString(R.string.review_spam_report_question), - activity.getResources().getString(R.string.review_spam_report_problem)); + DeleteReason.SPAM); } public void reportPossibleCopyRightViolation(@NonNull Activity activity) { deleteHelper.askReasonAndExecute(new Media("File:" + fileName), activity, activity.getResources().getString(R.string.review_c_violation_report_question), - activity.getResources().getString(R.string.review_c_violation_report_problem)); + DeleteReason.COPYRIGHT_VIOLATION); } @SuppressLint("CheckResult") diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 95000138d..28e18c64d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -497,9 +497,7 @@ Upload your first media by tapping on the add button. Oh, this is not even categorized! This image is under %1$s categories. It is out of scope because it is - spam It is copyright violation because it is - copyRightViolation No, mis-categorized Seems fine No, out of scope