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

Fix caption lost on accepting 'Is this a pic of' (#6030)

Browse source 
Fixes issue 5842 by correcting the implementation of onUserConfirmedUploadIsOfPlace in UploadMediaDetailsContract's UserActionListener

Co-authored-by: Nicolas Raoul <nicolas.raoul@gmail.com>
This commit is contained in:
Tanmay Gupta 2024-12-14 15:42:44 +05:30 • committed by GitHub
parent f2d1f7dbbb
commit a933b92efa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java
View file

@ -398,7 +398,7 @@ public class UploadMediaDetailFragment extends UploadBaseFragment implements
final boolean response = UploadActivity.nearbyPopupAnswers.get(nearbyPlace); final boolean response = UploadActivity.nearbyPopupAnswers.get(nearbyPlace);
if (response) { if (response) {
if (callback != null) { if (callback != null) {
presenter.onUserConfirmedUploadIsOfPlace(nearbyPlace); presenter.onUserConfirmedUploadIsOfPlace(nearbyPlace, indexOfFragment);
} }
} }
} else { } else {
@ -445,7 +445,7 @@ public class UploadMediaDetailFragment extends UploadBaseFragment implements
() -> { () -> {
// Execute when user confirms the upload is of the specified place // Execute when user confirms the upload is of the specified place
UploadActivity.nearbyPopupAnswers.put(place, true); UploadActivity.nearbyPopupAnswers.put(place, true);
presenter.onUserConfirmedUploadIsOfPlace(place); presenter.onUserConfirmedUploadIsOfPlace(place, indexOfFragment);
}, },
() -> { () -> {
// Execute when user cancels the upload of the specified place // Execute when user cancels the upload of the specified place
@ -486,7 +486,7 @@ public class UploadMediaDetailFragment extends UploadBaseFragment implements
if (UploadActivity.nearbyPopupAnswers.containsKey(nearbyPlace)) { if (UploadActivity.nearbyPopupAnswers.containsKey(nearbyPlace)) {
final boolean response = UploadActivity.nearbyPopupAnswers.get(nearbyPlace); final boolean response = UploadActivity.nearbyPopupAnswers.get(nearbyPlace);
if (response) { if (response) {
presenter.onUserConfirmedUploadIsOfPlace(nearbyPlace); presenter.onUserConfirmedUploadIsOfPlace(nearbyPlace, indexOfFragment);
} }
} else { } else {
showNearbyPlaceFound(nearbyPlace); showNearbyPlaceFound(nearbyPlace);

2
app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailsContract.kt
View file

@ -117,6 +117,6 @@ interface UploadMediaDetailsContract {
fun onEditButtonClicked(indexInViewFlipper: Int) fun onEditButtonClicked(indexInViewFlipper: Int)
fun onUserConfirmedUploadIsOfPlace(place: Place?) fun onUserConfirmedUploadIsOfPlace(place: Place?, uploadItemIndex: Int)
} }
} }

23
app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaPresenter.java
View file

@ -322,23 +322,24 @@ public class UploadMediaPresenter implements UserActionListener, SimilarImageInt
} }
/** /**
* Updates the information regarding the specified place for uploads * Updates the information regarding the specified place for the specified upload item
* when the user confirms the suggested nearby place. * when the user confirms the suggested nearby place.
* *
* @param place The place to be associated with the uploads. * @param place The place to be associated with the uploads.
* @param uploadItemIndex Index of the uploadItem whose detected place has been confirmed
*/ */
@Override @Override
public void onUserConfirmedUploadIsOfPlace(final Place place) { public void onUserConfirmedUploadIsOfPlace(final Place place, final int uploadItemIndex) {
final List<UploadItem> uploads = repository.getUploads(); final UploadItem uploadItem = repository.getUploads().get(uploadItemIndex);
for (final UploadItem uploadItem : uploads) {
uploadItem.setPlace(place); uploadItem.setPlace(place);
final List<UploadMediaDetail> uploadMediaDetails = uploadItem.getUploadMediaDetails(); final List<UploadMediaDetail> uploadMediaDetails = uploadItem.getUploadMediaDetails();
// Update UploadMediaDetail object for this UploadItem // Update UploadMediaDetail object for this UploadItem
uploadMediaDetails.set(0, new UploadMediaDetail(place)); uploadMediaDetails.set(0, new UploadMediaDetail(place));
}
// Now that all UploadItems and their associated UploadMediaDetail objects have been updated, // Now that the UploadItem and its associated UploadMediaDetail objects have been updated,
// update the view with the modified media details of the first upload item // update the view with the modified media details of the first upload item
view.updateMediaDetails(uploads.get(0).getUploadMediaDetails()); view.updateMediaDetails(uploadMediaDetails);
UploadActivity.setUploadIsOfAPlace(true); UploadActivity.setUploadIsOfAPlace(true);
} }