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

Fixes #3380 - "Nearby Place found" despite already Nearby upload (#4408)

Browse source 
* fix issue with "nearby place found" pop up on nearby upload

* added javadoc

Co-authored-by: Pratham2305 <Pratham2305@users.noreply.github.com>
This commit is contained in:
Pratham Pahariya 2021-05-13 19:30:55 +05:30 • committed by GitHub
parent 2b62d8487b
commit c7f7b39151
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/fr/free/nrw/commons/upload/UploadItem.java
View file

@ -18,7 +18,7 @@ public class UploadItem {
private final String mimeType; private final String mimeType;
private ImageCoordinates gpsCoords; private ImageCoordinates gpsCoords;
private List<UploadMediaDetail> uploadMediaDetails; private List<UploadMediaDetail> uploadMediaDetails;
private final Place place; private Place place;
private final long createdTimestamp; private final long createdTimestamp;
private final String createdTimestampSource; private final String createdTimestampSource;
private final BehaviorSubject<Integer> imageQuality; private final BehaviorSubject<Integer> imageQuality;
@ -70,6 +70,14 @@ public class UploadItem {
this.imageQuality.onNext(imageQuality); this.imageQuality.onNext(imageQuality);
} }
/**
* Sets the corresponding place to the uploadItem
* @param place geolocated Wikidata item
*/
public void setPlace(Place place) {
this.place = place;
}
public Place getPlace() { public Place getPlace() {
return place; return place;
} }

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

@ -92,7 +92,7 @@ public class UploadMediaPresenter implements UserActionListener, SimilarImageInt
gpsCoords != null && gpsCoords.getImageCoordsExists(); gpsCoords != null && gpsCoords.getImageCoordsExists();
view.showMapWithImageCoordinates(hasImageCoordinates); view.showMapWithImageCoordinates(hasImageCoordinates);
view.showProgress(false); view.showProgress(false);
if (hasImageCoordinates) { if (hasImageCoordinates && place == null) {
checkNearbyPlaces(uploadItem); checkNearbyPlaces(uploadItem);
} }
}, },
@ -194,6 +194,9 @@ public class UploadMediaPresenter implements UserActionListener, SimilarImageInt
final List<UploadMediaDetail> uploadMediaDetails = repository.getUploads() final List<UploadMediaDetail> uploadMediaDetails = repository.getUploads()
.get(uploadItemPosition) .get(uploadItemPosition)
.getUploadMediaDetails(); .getUploadMediaDetails();
UploadItem uploadItem = repository.getUploads()
.get(uploadItemPosition);
uploadItem.setPlace(place);
uploadMediaDetails.set(0, new UploadMediaDetail(place)); uploadMediaDetails.set(0, new UploadMediaDetail(place));
view.updateMediaDetails(uploadMediaDetails); view.updateMediaDetails(uploadMediaDetails);
} }