|
73 | 73 | import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
|
74 | 74 | import fr.free.nrw.commons.explore.depictions.WikidataItemDetailsActivity;
|
75 | 75 | import fr.free.nrw.commons.kvstore.JsonKvStore;
|
| 76 | +import fr.free.nrw.commons.language.AppLanguageLookUpTable; |
76 | 77 | import fr.free.nrw.commons.___location.LocationServiceManager;
|
77 | 78 | import fr.free.nrw.commons.profile.ProfileActivity;
|
78 | 79 | import fr.free.nrw.commons.review.ReviewHelper;
|
79 | 80 | import fr.free.nrw.commons.settings.Prefs;
|
80 |
| -import fr.free.nrw.commons.ui.widget.HtmlTextView; |
| 81 | +import fr.free.nrw.commons.upload.UploadMediaDetail; |
81 | 82 | import fr.free.nrw.commons.upload.categories.UploadCategoriesFragment;
|
82 | 83 | import fr.free.nrw.commons.upload.depicts.DepictsFragment;
|
83 |
| -import fr.free.nrw.commons.upload.UploadMediaDetail; |
| 84 | +import fr.free.nrw.commons.utils.DateUtil; |
84 | 85 | import fr.free.nrw.commons.utils.DialogUtil;
|
85 | 86 | import fr.free.nrw.commons.utils.PermissionUtils;
|
86 | 87 | import fr.free.nrw.commons.utils.ViewUtil;
|
87 | 88 | import fr.free.nrw.commons.utils.ViewUtilWrapper;
|
| 89 | +import fr.free.nrw.commons.wikidata.mwapi.MwQueryPage; |
88 | 90 | import io.reactivex.Observable;
|
89 | 91 | import io.reactivex.ObservableSource;
|
90 | 92 | import io.reactivex.Single;
|
|
105 | 107 | import javax.inject.Inject;
|
106 | 108 | import javax.inject.Named;
|
107 | 109 | 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; |
111 | 110 | import timber.log.Timber;
|
112 | 111 |
|
113 | 112 | public class MediaDetailFragment extends CommonsDaggerSupportFragment implements
|
@@ -487,12 +486,18 @@ private void onDiscussionLoaded(String discussion) {
|
487 | 486 | }
|
488 | 487 |
|
489 | 488 | 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())); |
493 | 497 | binding.progressBarDeletion.setVisibility(GONE);
|
494 | 498 | }
|
495 | 499 | binding.nominateDeletion.setVisibility(GONE);
|
| 500 | + |
496 | 501 | binding.nominatedDeletionBanner.setVisibility(VISIBLE);
|
497 | 502 | } else if (!isCategoryImage) {
|
498 | 503 | binding.nominateDeletion.setVisibility(VISIBLE);
|
@@ -1174,7 +1179,7 @@ public void onDeleteButtonClicked(){
|
1174 | 1179 | //Reviewer correct me if i have misunderstood something over here
|
1175 | 1180 | //But how does this if (delete.getVisibility() == View.VISIBLE) {
|
1176 | 1181 | // enableDeleteButton(true); makes sense ?
|
1177 |
| - else { |
| 1182 | + else if (AccountUtil.getUserName(getContext()) != null) { |
1178 | 1183 | final EditText input = new EditText(getActivity());
|
1179 | 1184 | input.requestFocus();
|
1180 | 1185 | AlertDialog d = DialogUtil.showAlertDialog(getActivity(),
|
|
0 commit comments