diff options
| author | Bananeweizen <bananeweizen@gmx.de> | 2015-02-15 13:42:35 +0100 |
|---|---|---|
| committer | Bananeweizen <bananeweizen@gmx.de> | 2015-02-15 13:42:35 +0100 |
| commit | ccfb775f4cb0e2c68a36fc275fc28a941206125c (patch) | |
| tree | 0560a336cbb03e88476062fc83a511820c5e4c7f /main/src/cgeo | |
| parent | ecce9bc407f87027dd3c1d7b0e10ac74cf54c3bd (diff) | |
| download | cgeo-ccfb775f4cb0e2c68a36fc275fc28a941206125c.zip cgeo-ccfb775f4cb0e2c68a36fc275fc28a941206125c.tar.gz cgeo-ccfb775f4cb0e2c68a36fc275fc28a941206125c.tar.bz2 | |
remove superfluous paragraphs in opencaching logs
Diffstat (limited to 'main/src/cgeo')
| -rw-r--r-- | main/src/cgeo/geocaching/connector/oc/OkapiClient.java | 5 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/utils/HtmlUtils.java | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/main/src/cgeo/geocaching/connector/oc/OkapiClient.java b/main/src/cgeo/geocaching/connector/oc/OkapiClient.java index 3b8e866..e7d4e6f 100644 --- a/main/src/cgeo/geocaching/connector/oc/OkapiClient.java +++ b/main/src/cgeo/geocaching/connector/oc/OkapiClient.java @@ -30,6 +30,7 @@ import cgeo.geocaching.network.OAuth; import cgeo.geocaching.network.OAuthTokens; import cgeo.geocaching.network.Parameters; import cgeo.geocaching.settings.Settings; +import cgeo.geocaching.utils.HtmlUtils; import cgeo.geocaching.utils.JsonUtils; import cgeo.geocaching.utils.Log; import cgeo.geocaching.utils.SynchronizedDateFormat; @@ -64,7 +65,7 @@ import java.util.regex.Pattern; /** * Client for the OpenCaching API (Okapi). - * + * * @see <a href="http://www.opencaching.de/okapi/introduction.html">Okapi overview</a> * */ @@ -467,7 +468,7 @@ final class OkapiClient { parseUser(logResponse.get(LOG_USER)), parseDate(logResponse.get(LOG_DATE).asText()).getTime(), parseLogType(logResponse.get(LOG_TYPE).asText()), - logResponse.get(LOG_COMMENT).asText().trim()); + HtmlUtils.removeExtraParagraph(logResponse.get(LOG_COMMENT).asText().trim())); result.add(log); } catch (final NullPointerException e) { Log.e("OkapiClient.parseLogs", e); diff --git a/main/src/cgeo/geocaching/utils/HtmlUtils.java b/main/src/cgeo/geocaching/utils/HtmlUtils.java index 739acf7..ab6e8fe 100644 --- a/main/src/cgeo/geocaching/utils/HtmlUtils.java +++ b/main/src/cgeo/geocaching/utils/HtmlUtils.java @@ -59,7 +59,8 @@ public final class HtmlUtils { return Html.fromHtml(result).toString().trim(); } - public static String removeExtraParagraph(final String html) { + public static String removeExtraParagraph(final String htmlIn) { + final String html = StringUtils.trim(htmlIn); if (StringUtils.startsWith(html, "<p>") && StringUtils.endsWith(html, "</p>")) { final String paragraph = StringUtils.substring(html, "<p>".length(), html.length() - "</p>".length()).trim(); if (extractText(paragraph).equals(paragraph)) { |