2 files changed, 25 insertions, 17 deletions

diff --git a/main/src/cgeo/geocaching/connector/oc/OC11XMLParser.java b/main/src/cgeo/geocaching/connector/oc/OC11XMLParser.java
index 621032f..d03062f 100644
--- a/main/src/cgeo/geocaching/connector/oc/OC11XMLParser.java
+++ b/main/src/cgeo/geocaching/connector/oc/OC11XMLParser.java
@@ -48,6 +48,8 @@ public class OC11XMLParser {
     private static Pattern LOCAL_URL = Pattern.compile("href=\"(.*)\"");
     private static final int CACHE_PARSE_LIMIT = 250;
     private static final Resources res = cgeoapplication.getInstance().getResources();
+    private static final Pattern WHITESPACE = Pattern.compile("<p>(\\s|&nbsp;)*</p>");
+
 
     private static ImageHolder imageHolder = null;
 
@@ -513,7 +515,7 @@ public class OC11XMLParser {
             @Override
             public void end(String body) {
                 final String content = body.trim();
-                descHolder.shortDesc = linkify(stripMarkup(content));
+                descHolder.shortDesc = linkify(stripEmptyText(content));
             }
         });
 
@@ -523,7 +525,7 @@ public class OC11XMLParser {
             @Override
             public void end(String body) {
                 final String content = body.trim();
-                descHolder.desc = linkify(stripMarkup(content));
+                descHolder.desc = linkify(stripEmptyText(content));
             }
         });
 
@@ -626,7 +628,7 @@ public class OC11XMLParser {
 
             @Override
             public void end(String logText) {
-                logHolder.logEntry.log = stripMarkup(logText);
+                logHolder.logEntry.log = stripEmptyText(logText);
             }
         });
 
@@ -728,14 +730,20 @@ public class OC11XMLParser {
     }
 
     /**
-     * Removes unneeded markup. Log texts are typically encapsulated in paragraph tags which lead to more empty space on
-     * rendering.
+     * Removes some unneeded markup and whitespace. Log texts are typically encapsulated in paragraph tags which lead to
+     * more empty space on rendering.
      */
-    protected static String stripMarkup(String input) {
-        if (!StringUtils.startsWith(input, "<")) {
-            return input;
+    protected static String stripEmptyText(String input) {
+        final Matcher matcher = WHITESPACE.matcher(input);
+        String result = matcher.replaceAll("").trim();
+        if (!StringUtils.startsWith(result, "<")) {
+            return result;
         }
-        String result = input.trim();
+        return stripMarkup(result);
+    }
+
+    private static String stripMarkup(final String input) {
+        String result = input;
         for (String tagName : MARKUP) {
             final String startTag = "<" + tagName + ">";
             if (StringUtils.startsWith(result, startTag)) {
diff --git a/tests/src/cgeo/geocaching/connector/oc/OCXMLTest.java b/tests/src/cgeo/geocaching/connector/oc/OCXMLTest.java
index b12823a..3563991 100644
--- a/tests/src/cgeo/geocaching/connector/oc/OCXMLTest.java
+++ b/tests/src/cgeo/geocaching/connector/oc/OCXMLTest.java
@@ -111,13 +111,13 @@ public class OCXMLTest extends CGeoTestCase {
     }
 
     public static void testRemoveMarkup() {
-        assertEquals("", OC11XMLParser.stripMarkup(""));
-        assertEquals("Test", OC11XMLParser.stripMarkup("Test"));
-        assertEquals("<b>bold and others not removed</b>", OC11XMLParser.stripMarkup("<b>bold and others not removed</b>"));
-        assertEquals("unnecessary paragraph", OC11XMLParser.stripMarkup("<p>unnecessary paragraph</p>"));
-        assertEquals("unnecessary span", OC11XMLParser.stripMarkup("<span>unnecessary span</span>"));
-        assertEquals("nested", OC11XMLParser.stripMarkup("<span><span>nested</span></span>"));
-        assertEquals("mixed", OC11XMLParser.stripMarkup("<span> <p> mixed </p> </span>"));
-        assertEquals("<p>not</p><p>removable</p>", OC11XMLParser.stripMarkup("<p>not</p><p>removable</p>"));
+        assertEquals("", OC11XMLParser.stripEmptyText(""));
+        assertEquals("Test", OC11XMLParser.stripEmptyText("Test"));
+        assertEquals("<b>bold and others not removed</b>", OC11XMLParser.stripEmptyText("<b>bold and others not removed</b>"));
+        assertEquals("unnecessary paragraph", OC11XMLParser.stripEmptyText("<p>unnecessary paragraph</p>"));
+        assertEquals("unnecessary span", OC11XMLParser.stripEmptyText("<span>unnecessary span</span>"));
+        assertEquals("nested", OC11XMLParser.stripEmptyText("<span><span>nested</span></span>"));
+        assertEquals("mixed", OC11XMLParser.stripEmptyText("<span> <p> mixed </p> </span>"));
+        assertEquals("<p>not</p><p>removable</p>", OC11XMLParser.stripEmptyText("<p>not</p><p>removable</p>"));
     }
 }