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

Fixed issue #3195 ordering contribution list (#3589)

Browse source 
* issue-#3195: order contribution list refactored

* issue-#3195: ordered contribution list
This commit is contained in:
Prince Amankwah 2020-04-06 13:54:51 +02:00 • committed by GitHub
parent eb88e58ec0
commit 80530663a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/fr/free/nrw/commons/upload/UploadService.java
View file

@ -286,7 +286,7 @@ public class UploadService extends HandlerService<Contribution> {
contribution.setFilename(canonicalFilename); contribution.setFilename(canonicalFilename);
contribution.setImageUrl(uploadResult.getImageinfo().getOriginalUrl()); contribution.setImageUrl(uploadResult.getImageinfo().getOriginalUrl());
contribution.setState(Contribution.STATE_COMPLETED); contribution.setState(Contribution.STATE_COMPLETED);
contribution.setDateUploaded(CommonsDateUtil.getIso8601DateFormatShort() contribution.setDateUploaded(CommonsDateUtil.getIso8601DateFormatTimestamp()
.parse(uploadResult.getImageinfo().getTimestamp())); .parse(uploadResult.getImageinfo().getTimestamp()));
compositeDisposable.add(contributionDao compositeDisposable.add(contributionDao
.save(contribution) .save(contribution)

12
app/src/main/java/fr/free/nrw/commons/utils/CommonsDateUtil.java
View file

@ -13,11 +13,21 @@ public class CommonsDateUtil {
/** /**
* Gets SimpleDateFormat for short date pattern * Gets SimpleDateFormat for short date pattern
* @return * @return simpledateformat
*/ */
public static SimpleDateFormat getIso8601DateFormatShort() { public static SimpleDateFormat getIso8601DateFormatShort() {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.ROOT); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.ROOT);
simpleDateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); simpleDateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
return simpleDateFormat; return simpleDateFormat;
} }
/**
* Gets the timestamp pattern for a date
* @return timestamp
*/
public static SimpleDateFormat getIso8601DateFormatTimestamp() {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.ROOT);
simpleDateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
return simpleDateFormat;
}
} }