issue-commons-app#3195: ordered contribution list

isnirp · isnirp · commit 9f941a4e1d0e · 2020-04-03T07:13:25.000+02:00
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionComparator.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionComparator.java
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
@@ -21,7 +21,6 @@
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 import javax.inject.Inject;
@@ -186,8 +185,6 @@ public void showNoContributionsUI(boolean shouldShow) {
     }
 
     public void setContributions(List<Contribution> contributionList) {
-        Collections.sort(contributionList, new ContributionComparator());
-        Collections.reverse(contributionList);
         this.contributions.clear();
         this.contributions.addAll(contributionList);
         adapter.setContributions(contributions);
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadService.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadService.java
@@ -285,7 +285,7 @@ private void uploadContribution(Contribution contribution) {
                         contribution.setFilename(canonicalFilename);
                         contribution.setImageUrl(uploadResult.getImageinfo().getOriginalUrl());
                         contribution.setState(Contribution.STATE_COMPLETED);
-                        contribution.setDateUploaded(CommonsDateUtil.getIso8601DateFormatShort()
+                        contribution.setDateUploaded(CommonsDateUtil.getIso8601DateFormatTimestamp()
                                 .parse(uploadResult.getImageinfo().getTimestamp()));
                         compositeDisposable.add(contributionDao
                                 .save(contribution)
diff --git a/app/src/main/java/fr/free/nrw/commons/utils/CommonsDateUtil.java b/app/src/main/java/fr/free/nrw/commons/utils/CommonsDateUtil.java
@@ -13,11 +13,21 @@ public class CommonsDateUtil {
 
     /**
      * Gets SimpleDateFormat for short date pattern
-     * @return
+     * @return simpledateformat
      */
     public static SimpleDateFormat getIso8601DateFormatShort() {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.ROOT);
         simpleDateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
         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;
+    }
 }
