Fixes #3698, Archived caches still shown on map

- filter archived as disabled on map
- their waypoints as well
- use disabled icon for archived on static maps
- filter archived alongside disabled in SearchResult

1 files changed, 2 insertions, 1 deletions

diff --git a/main/src/cgeo/geocaching/SearchResult.java b/main/src/cgeo/geocaching/SearchResult.java
index 12a2522..5dfc0b7 100644
--- a/main/src/cgeo/geocaching/SearchResult.java
+++ b/main/src/cgeo/geocaching/SearchResult.java
@@ -12,6 +12,7 @@ import cgeo.geocaching.gcvote.GCVote;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.jdt.annotation.Nullable;
+
 import rx.Observable;
 import rx.functions.Func1;
 import rx.functions.Func2;
@@ -218,7 +219,7 @@ public class SearchResult implements Parcelable {
         int excluded = 0;
         for (Geocache cache : caches) {
             // Is there any reason to exclude the cache from the list?
-            final boolean excludeCache = (excludeDisabled && cache.isDisabled()) ||
+            final boolean excludeCache = (excludeDisabled && (cache.isDisabled() || cache.isArchived())) ||
                     (excludeMine && (cache.isOwner() || cache.isFound())) ||
                     (!cacheType.contains(cache));
             if (excludeCache) {