mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 12:53:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

First of two fixes for bug #5726: hide nominate for deletion when logged out (#5773)

Browse source
This commit is contained in:
djbloop 2024-08-25 21:24:15 -07:00 • committed by GitHub
parent 096c075548
commit 31bb1a73c0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -73,18 +73,20 @@ import fr.free.nrw.commons.description.DescriptionEditHelper;
import fr.free.nrw.commons.di.CommonsDaggerSupportFragment; import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
import fr.free.nrw.commons.explore.depictions.WikidataItemDetailsActivity; import fr.free.nrw.commons.explore.depictions.WikidataItemDetailsActivity;
import fr.free.nrw.commons.kvstore.JsonKvStore; import fr.free.nrw.commons.kvstore.JsonKvStore;
import fr.free.nrw.commons.language.AppLanguageLookUpTable;
import fr.free.nrw.commons.location.LocationServiceManager; import fr.free.nrw.commons.location.LocationServiceManager;
import fr.free.nrw.commons.profile.ProfileActivity; import fr.free.nrw.commons.profile.ProfileActivity;
import fr.free.nrw.commons.review.ReviewHelper; import fr.free.nrw.commons.review.ReviewHelper;
import fr.free.nrw.commons.settings.Prefs; import fr.free.nrw.commons.settings.Prefs;
import fr.free.nrw.commons.ui.widget.HtmlTextView; import fr.free.nrw.commons.upload.UploadMediaDetail;
import fr.free.nrw.commons.upload.categories.UploadCategoriesFragment; import fr.free.nrw.commons.upload.categories.UploadCategoriesFragment;
import fr.free.nrw.commons.upload.depicts.DepictsFragment; import fr.free.nrw.commons.upload.depicts.DepictsFragment;
import fr.free.nrw.commons.upload.UploadMediaDetail; import fr.free.nrw.commons.utils.DateUtil;
import fr.free.nrw.commons.utils.DialogUtil; import fr.free.nrw.commons.utils.DialogUtil;
import fr.free.nrw.commons.utils.PermissionUtils; import fr.free.nrw.commons.utils.PermissionUtils;
import fr.free.nrw.commons.utils.ViewUtil; import fr.free.nrw.commons.utils.ViewUtil;
import fr.free.nrw.commons.utils.ViewUtilWrapper; import fr.free.nrw.commons.utils.ViewUtilWrapper;
import fr.free.nrw.commons.wikidata.mwapi.MwQueryPage;
import io.reactivex.Observable; import io.reactivex.Observable;
import io.reactivex.ObservableSource; import io.reactivex.ObservableSource;
import io.reactivex.Single; import io.reactivex.Single;
@ -105,9 +107,6 @@ import java.util.regex.Pattern;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import fr.free.nrw.commons.wikidata.mwapi.MwQueryPage;
import fr.free.nrw.commons.language.AppLanguageLookUpTable;
import fr.free.nrw.commons.utils.DateUtil;
import timber.log.Timber; import timber.log.Timber;
public class MediaDetailFragment extends CommonsDaggerSupportFragment implements public class MediaDetailFragment extends CommonsDaggerSupportFragment implements
@ -487,12 +486,18 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment implements
} }
private void onDeletionPageExists(Boolean deletionPageExists) { private void onDeletionPageExists(Boolean deletionPageExists) {
if (deletionPageExists){ if (AccountUtil.getUserName(getContext()) == null && !AccountUtil.getUserName(getContext()).equals(media.getAuthor())) {
if(applicationKvStore.getBoolean(String.format(NOMINATING_FOR_DELETION_MEDIA, media.getImageUrl()), false)) { binding.nominateDeletion.setVisibility(GONE);
applicationKvStore.remove(String.format(NOMINATING_FOR_DELETION_MEDIA, media.getImageUrl())); binding.nominatedDeletionBanner.setVisibility(GONE);
} else if (deletionPageExists) {
if (applicationKvStore.getBoolean(
String.format(NOMINATING_FOR_DELETION_MEDIA, media.getImageUrl()), false)) {
applicationKvStore.remove(
String.format(NOMINATING_FOR_DELETION_MEDIA, media.getImageUrl()));
binding.progressBarDeletion.setVisibility(GONE); binding.progressBarDeletion.setVisibility(GONE);
} }
binding.nominateDeletion.setVisibility(GONE); binding.nominateDeletion.setVisibility(GONE);
binding.nominatedDeletionBanner.setVisibility(VISIBLE); binding.nominatedDeletionBanner.setVisibility(VISIBLE);
} else if (!isCategoryImage) { } else if (!isCategoryImage) {
binding.nominateDeletion.setVisibility(VISIBLE); binding.nominateDeletion.setVisibility(VISIBLE);
@ -1174,7 +1179,7 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment implements
//Reviewer correct me if i have misunderstood something over here //Reviewer correct me if i have misunderstood something over here
//But how does this if (delete.getVisibility() == View.VISIBLE) { //But how does this if (delete.getVisibility() == View.VISIBLE) {
// enableDeleteButton(true); makes sense ? // enableDeleteButton(true); makes sense ?
else { else if (AccountUtil.getUserName(getContext()) != null) {
final EditText input = new EditText(getActivity()); final EditText input = new EditText(getActivity());
input.requestFocus(); input.requestFocus();
AlertDialog d = DialogUtil.showAlertDialog(getActivity(), AlertDialog d = DialogUtil.showAlertDialog(getActivity(),