avoid NPE when accessing cache type, #737

1 files changed, 10 insertions, 2 deletions

diff --git a/main/src/cgeo/geocaching/enumerations/CacheType.java b/main/src/cgeo/geocaching/enumerations/CacheType.java
index 1e58b70..e8f19cc 100644
--- a/main/src/cgeo/geocaching/enumerations/CacheType.java
+++ b/main/src/cgeo/geocaching/enumerations/CacheType.java
@@ -55,11 +55,19 @@ public enum CacheType {
     }
 
     public final static CacheType getById(final String id) {
-        return CacheType.FIND_BY_ID.get(id.toLowerCase().trim());
+        final CacheType result = CacheType.FIND_BY_ID.get(id.toLowerCase().trim());
+        if (result == null) {
+            return UNKNOWN;
+        }
+        return result;
     }
 
     public final static CacheType getByPattern(final String pattern) {
-        return CacheType.FIND_BY_PATTERN.get(pattern.toLowerCase().trim());
+        final CacheType result = CacheType.FIND_BY_PATTERN.get(pattern.toLowerCase().trim());
+        if (result == null) {
+            return UNKNOWN;
+        }
+        return result;
     }
 
 }