7 files changed, 31 insertions, 22 deletions
diff --git a/main/src/cgeo/geocaching/enumerations/CacheAttribute.java b/main/src/cgeo/geocaching/enumerations/CacheAttribute.java
index 243f63d..1ddfeaf 100644
--- a/main/src/cgeo/geocaching/enumerations/CacheAttribute.java
+++ b/main/src/cgeo/geocaching/enumerations/CacheAttribute.java
@@ -1,7 +1,7 @@
 package cgeo.geocaching.enumerations;
 
 import cgeo.geocaching.R;
-import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.CgeoApplication;
 
 import org.apache.commons.lang3.StringUtils;
 
@@ -143,7 +143,7 @@ public enum CacheAttribute {
      * @return the localized text
      */
     public String getL10n(final boolean enabled) {
-        return cgeoapplication.getInstance().getResources().getString(
+        return CgeoApplication.getInstance().getResources().getString(
                 enabled ? stringIdYes : stringIdNo);
     }
 
diff --git a/main/src/cgeo/geocaching/enumerations/CacheListType.java b/main/src/cgeo/geocaching/enumerations/CacheListType.java
index 641947d..b75c118 100644
--- a/main/src/cgeo/geocaching/enumerations/CacheListType.java
+++ b/main/src/cgeo/geocaching/enumerations/CacheListType.java
@@ -1,13 +1,22 @@
 package cgeo.geocaching.enumerations;
 
 public enum CacheListType {
-    OFFLINE,
-    HISTORY,
-    NEAREST,
-    COORDINATE,
-    KEYWORD,
-    ADDRESS,
-    USERNAME,
-    OWNER,
-    MAP;
+    OFFLINE(true),
+    HISTORY(true),
+    NEAREST(false),
+    COORDINATE(false),
+    KEYWORD(false),
+    ADDRESS(false),
+    USERNAME(false),
+    OWNER(false),
+    MAP(false);
+
+    /**
+     * whether or not this list allows switching to another list
+     */
+    public final boolean canSwitch;
+
+    private CacheListType(final boolean canSwitch) {
+        this.canSwitch = canSwitch;
+    }
 }
diff --git a/main/src/cgeo/geocaching/enumerations/CacheSize.java b/main/src/cgeo/geocaching/enumerations/CacheSize.java
index 726ebe2..a6f8df3 100644
--- a/main/src/cgeo/geocaching/enumerations/CacheSize.java
+++ b/main/src/cgeo/geocaching/enumerations/CacheSize.java
@@ -1,7 +1,7 @@
 package cgeo.geocaching.enumerations;
 
 import cgeo.geocaching.R;
-import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.CgeoApplication;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -60,7 +60,7 @@ public enum CacheSize {
     }
 
     public final String getL10n() {
-        return cgeoapplication.getInstance().getBaseContext().getResources().getString(stringId);
+        return CgeoApplication.getInstance().getBaseContext().getResources().getString(stringId);
     }
 }
 
diff --git a/main/src/cgeo/geocaching/enumerations/CacheType.java b/main/src/cgeo/geocaching/enumerations/CacheType.java
index c7a9130..c952ba0 100644
--- a/main/src/cgeo/geocaching/enumerations/CacheType.java
+++ b/main/src/cgeo/geocaching/enumerations/CacheType.java
@@ -2,7 +2,7 @@ package cgeo.geocaching.enumerations;
 
 import cgeo.geocaching.ICache;
 import cgeo.geocaching.R;
-import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.CgeoApplication;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -85,7 +85,7 @@ public enum CacheType {
     }
 
     public final String getL10n() {
-        return cgeoapplication.getInstance().getBaseContext().getResources().getString(stringId);
+        return CgeoApplication.getInstance().getBaseContext().getResources().getString(stringId);
     }
 
     public boolean isEvent() {
@@ -114,7 +114,7 @@ public enum CacheType {
     }
 
     public boolean applyDistanceRule() {
-        return !isVirtual() && !isEvent();
+        return TRADITIONAL == this || PROJECT_APE == this || GCHQ == this;
     }
 
     public boolean isVirtual() {
diff --git a/main/src/cgeo/geocaching/enumerations/LiveMapStrategy.java b/main/src/cgeo/geocaching/enumerations/LiveMapStrategy.java
index 5f5b2c9..710c3ba 100644
--- a/main/src/cgeo/geocaching/enumerations/LiveMapStrategy.java
+++ b/main/src/cgeo/geocaching/enumerations/LiveMapStrategy.java
@@ -1,7 +1,7 @@
 package cgeo.geocaching.enumerations;
 
 import cgeo.geocaching.R;
-import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.CgeoApplication;
 
 import java.util.EnumSet;
 
@@ -42,7 +42,7 @@ public interface LiveMapStrategy {
         }
 
         public final String getL10n() {
-            return cgeoapplication.getInstance().getBaseContext().getResources().getString(stringId);
+            return CgeoApplication.getInstance().getBaseContext().getResources().getString(stringId);
         }
     }
 }
diff --git a/main/src/cgeo/geocaching/enumerations/LogType.java b/main/src/cgeo/geocaching/enumerations/LogType.java
index 9902d3f..543f83d 100644
--- a/main/src/cgeo/geocaching/enumerations/LogType.java
+++ b/main/src/cgeo/geocaching/enumerations/LogType.java
@@ -1,7 +1,7 @@
 package cgeo.geocaching.enumerations;
 
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.R;
-import cgeo.geocaching.cgeoapplication;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -102,6 +102,6 @@ public enum LogType {
     }
 
     public final String getL10n() {
-        return cgeoapplication.getInstance().getBaseContext().getResources().getString(stringId);
+        return CgeoApplication.getInstance().getBaseContext().getResources().getString(stringId);
     }
 }
diff --git a/main/src/cgeo/geocaching/enumerations/WaypointType.java b/main/src/cgeo/geocaching/enumerations/WaypointType.java
index 79c8106..272b2f2 100644
--- a/main/src/cgeo/geocaching/enumerations/WaypointType.java
+++ b/main/src/cgeo/geocaching/enumerations/WaypointType.java
@@ -1,7 +1,7 @@
 package cgeo.geocaching.enumerations;
 
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.R;
-import cgeo.geocaching.cgeoapplication;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -65,7 +65,7 @@ public enum WaypointType {
     }
 
     public final String getL10n() {
-        return cgeoapplication.getInstance().getBaseContext().getResources().getString(stringId);
+        return CgeoApplication.getInstance().getBaseContext().getResources().getString(stringId);
     }
 
     @Override