fix #879: sort event only list by date by default

1 files changed, 27 insertions, 0 deletions

diff --git a/main/src/cgeo/geocaching/cgeocaches.java b/main/src/cgeo/geocaching/cgeocaches.java
index a380731..e0abcfb 100644
--- a/main/src/cgeo/geocaching/cgeocaches.java
+++ b/main/src/cgeo/geocaching/cgeocaches.java
@@ -28,6 +28,7 @@ import cgeo.geocaching.sorting.RatingComparator;
 import cgeo.geocaching.sorting.SizeComparator;
 import cgeo.geocaching.sorting.StateComparator;
 import cgeo.geocaching.sorting.TerrainComparator;
+import cgeo.geocaching.sorting.VisitComparator;
 import cgeo.geocaching.sorting.VoteComparator;
 import cgeo.geocaching.utils.RunnableWithArgument;
 
@@ -177,6 +178,8 @@ public class cgeocaches extends AbstractListActivity {
 
                 setAdapter();
 
+                setDateComparatorForEventList();
+
                 if (cacheList == null) {
                     showToast(res.getString(R.string.err_list_load_fail));
                     setMoreCaches(false);
@@ -2609,6 +2612,30 @@ public class cgeocaches extends AbstractListActivity {
         }
     }
 
+    /**
+     * set date comparator for pure event lists
+     */
+    private void setDateComparatorForEventList() {
+        if (CollectionUtils.isNotEmpty(cacheList)) {
+            boolean eventsOnly = true;
+            for (cgCache cache : cacheList) {
+                if (!cache.isEventCache()) {
+                    eventsOnly = false;
+                    break;
+                }
+            }
+            if (eventsOnly) {
+                adapter.setComparator(new DateComparator());
+            }
+            else if (type == CacheListType.HISTORY) {
+                adapter.setComparator(new VisitComparator());
+            }
+            else {
+                adapter.setComparator(null);
+            }
+        }
+    }
+
     public static void startActivityNearest(final Context context, final Geopoint coordsNow) {
         final Intent cachesIntent = new Intent(context, cgeocaches.class);
         cachesIntent.putExtra(EXTRAS_LIST_TYPE, CacheListType.NEAREST);