Merge branch 'release'

2 files changed, 4 insertions, 2 deletions

diff --git a/main/src/cgeo/geocaching/utils/HtmlUtils.java b/main/src/cgeo/geocaching/utils/HtmlUtils.java
index 5717a37..37e20ec 100644
--- a/main/src/cgeo/geocaching/utils/HtmlUtils.java
+++ b/main/src/cgeo/geocaching/utils/HtmlUtils.java
@@ -3,6 +3,7 @@ package cgeo.geocaching.utils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 
+import android.text.Html;
 import android.text.Spanned;
 import android.text.style.ImageSpan;
 
@@ -56,7 +57,7 @@ public final class HtmlUtils {
             }
         }
 
-        // some line breaks are still in the text, source is unknown
-        return StringUtils.replace(result, "<br />", "\n").trim();
+        // now that images are gone, do a normal html to text conversion
+        return Html.fromHtml(result).toString().trim();
     }
 }
diff --git a/tests/src/cgeo/geocaching/utils/HtmlUtilsTest.java b/tests/src/cgeo/geocaching/utils/HtmlUtilsTest.java
index 3715c80..5f2070d 100644
--- a/tests/src/cgeo/geocaching/utils/HtmlUtilsTest.java
+++ b/tests/src/cgeo/geocaching/utils/HtmlUtilsTest.java
@@ -10,6 +10,7 @@ public class HtmlUtilsTest extends TestCase {
         assertEquals(StringUtils.EMPTY, HtmlUtils.extractText(null));
         assertEquals(StringUtils.EMPTY, HtmlUtils.extractText(StringUtils.EMPTY));
         assertEquals(StringUtils.EMPTY, HtmlUtils.extractText("   "));
+        assertEquals("bold", HtmlUtils.extractText("<b>bold</b>"));
     }
 
 }