Skip to content

Commit 31bb1a7

Browse files
authored
First of two fixes for bug commons-app#5726: hide nominate for deletion when logged out (commons-app#5773)
1 parent 096c075 commit 31bb1a7

File tree

1 file changed

+14
-9
lines changed

1 file changed

+14
-9
lines changed

app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -73,18 +73,20 @@
7373
import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
7474
import fr.free.nrw.commons.explore.depictions.WikidataItemDetailsActivity;
7575
import fr.free.nrw.commons.kvstore.JsonKvStore;
76+
import fr.free.nrw.commons.language.AppLanguageLookUpTable;
7677
import fr.free.nrw.commons.___location.LocationServiceManager;
7778
import fr.free.nrw.commons.profile.ProfileActivity;
7879
import fr.free.nrw.commons.review.ReviewHelper;
7980
import fr.free.nrw.commons.settings.Prefs;
80-
import fr.free.nrw.commons.ui.widget.HtmlTextView;
81+
import fr.free.nrw.commons.upload.UploadMediaDetail;
8182
import fr.free.nrw.commons.upload.categories.UploadCategoriesFragment;
8283
import fr.free.nrw.commons.upload.depicts.DepictsFragment;
83-
import fr.free.nrw.commons.upload.UploadMediaDetail;
84+
import fr.free.nrw.commons.utils.DateUtil;
8485
import fr.free.nrw.commons.utils.DialogUtil;
8586
import fr.free.nrw.commons.utils.PermissionUtils;
8687
import fr.free.nrw.commons.utils.ViewUtil;
8788
import fr.free.nrw.commons.utils.ViewUtilWrapper;
89+
import fr.free.nrw.commons.wikidata.mwapi.MwQueryPage;
8890
import io.reactivex.Observable;
8991
import io.reactivex.ObservableSource;
9092
import io.reactivex.Single;
@@ -105,9 +107,6 @@
105107
import javax.inject.Inject;
106108
import javax.inject.Named;
107109
import org.apache.commons.lang3.StringUtils;
108-
import fr.free.nrw.commons.wikidata.mwapi.MwQueryPage;
109-
import fr.free.nrw.commons.language.AppLanguageLookUpTable;
110-
import fr.free.nrw.commons.utils.DateUtil;
111110
import timber.log.Timber;
112111

113112
public class MediaDetailFragment extends CommonsDaggerSupportFragment implements
@@ -487,12 +486,18 @@ private void onDiscussionLoaded(String discussion) {
487486
}
488487

489488
private void onDeletionPageExists(Boolean deletionPageExists) {
490-
if (deletionPageExists){
491-
if(applicationKvStore.getBoolean(String.format(NOMINATING_FOR_DELETION_MEDIA, media.getImageUrl()), false)) {
492-
applicationKvStore.remove(String.format(NOMINATING_FOR_DELETION_MEDIA, media.getImageUrl()));
489+
if (AccountUtil.getUserName(getContext()) == null && !AccountUtil.getUserName(getContext()).equals(media.getAuthor())) {
490+
binding.nominateDeletion.setVisibility(GONE);
491+
binding.nominatedDeletionBanner.setVisibility(GONE);
492+
} else if (deletionPageExists) {
493+
if (applicationKvStore.getBoolean(
494+
String.format(NOMINATING_FOR_DELETION_MEDIA, media.getImageUrl()), false)) {
495+
applicationKvStore.remove(
496+
String.format(NOMINATING_FOR_DELETION_MEDIA, media.getImageUrl()));
493497
binding.progressBarDeletion.setVisibility(GONE);
494498
}
495499
binding.nominateDeletion.setVisibility(GONE);
500+
496501
binding.nominatedDeletionBanner.setVisibility(VISIBLE);
497502
} else if (!isCategoryImage) {
498503
binding.nominateDeletion.setVisibility(VISIBLE);
@@ -1174,7 +1179,7 @@ public void onDeleteButtonClicked(){
11741179
//Reviewer correct me if i have misunderstood something over here
11751180
//But how does this if (delete.getVisibility() == View.VISIBLE) {
11761181
// enableDeleteButton(true); makes sense ?
1177-
else {
1182+
else if (AccountUtil.getUserName(getContext()) != null) {
11781183
final EditText input = new EditText(getActivity());
11791184
input.requestFocus();
11801185
AlertDialog d = DialogUtil.showAlertDialog(getActivity(),

0 commit comments

Comments
 (0)