fix #1071: FC with unknown container size

3 files changed, 11 insertions, 3 deletions

diff --git a/main/src/cgeo/geocaching/cgCache.java b/main/src/cgeo/geocaching/cgCache.java
index 432bd93..9fdaaaf 100644
--- a/main/src/cgeo/geocaching/cgCache.java
+++ b/main/src/cgeo/geocaching/cgCache.java
@@ -507,6 +507,9 @@ public class cgCache implements ICache {
 
     @Override
     public CacheSize getSize() {
+        if (size == null) {
+            return CacheSize.UNKNOWN;
+        }
         return size;
     }
 
@@ -986,7 +989,12 @@ public class cgCache implements ICache {
     }
 
     public void setSize(CacheSize size) {
-        this.size = size;
+        if (size == null) {
+            this.size = CacheSize.UNKNOWN;
+        }
+        else {
+            this.size = size;
+        }
     }
 
     public void setDifficulty(float difficulty) {
diff --git a/main/src/cgeo/geocaching/cgCoord.java b/main/src/cgeo/geocaching/cgCoord.java
index 010fc22..0c5b5b5 100644
--- a/main/src/cgeo/geocaching/cgCoord.java
+++ b/main/src/cgeo/geocaching/cgCoord.java
@@ -20,7 +20,7 @@ public class cgCoord implements IBasicCache, IWaypoint {
     private Geopoint coords = new Geopoint(0, 0);
     private float difficulty = 0;
     private float terrain = 0;
-    private CacheSize size = null;
+    private CacheSize size = CacheSize.UNKNOWN;
 
     public cgCoord() {
     }
diff --git a/main/src/cgeo/geocaching/files/LocParser.java b/main/src/cgeo/geocaching/files/LocParser.java
index 38ddb80..7a8a674 100644
--- a/main/src/cgeo/geocaching/files/LocParser.java
+++ b/main/src/cgeo/geocaching/files/LocParser.java
@@ -125,7 +125,7 @@ public final class LocParser extends FileParser {
                 } else if (size == 8) {
                     pointCoord.setSize(CacheSize.SMALL);
                 } else {
-                    pointCoord.setSize(null);
+                    pointCoord.setSize(CacheSize.UNKNOWN);
                 }
             }