diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2014-03-15 12:36:18 +0100 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2014-03-15 12:36:18 +0100 |
| commit | be024b51d8947d622e82360b884b93806747295e (patch) | |
| tree | 04586620e84c0db557412f7be0b940b060960063 /main | |
| parent | 144de00ccfdb3af7e6eb12c1386125f87288bdb0 (diff) | |
| parent | e3384f8505162ea2c07b207a92f7985599de3508 (diff) | |
| download | cgeo-be024b51d8947d622e82360b884b93806747295e.zip cgeo-be024b51d8947d622e82360b884b93806747295e.tar.gz cgeo-be024b51d8947d622e82360b884b93806747295e.tar.bz2 | |
Merge branch 'release' into upstream
Diffstat (limited to 'main')
| -rw-r--r-- | main/res/values/changelog_release.xml | 2 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/LogEntry.java | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/main/res/values/changelog_release.xml b/main/res/values/changelog_release.xml index 671814d..312a949 100644 --- a/main/res/values/changelog_release.xml +++ b/main/res/values/changelog_release.xml @@ -10,6 +10,8 @@ · Log password field missing for OC if changing log type\n · Send2cgeo import screen not shown on second import start\n · Fixed parsing of waypoints from personal note if no valid coords stored\n + · Special log types for unpublished caches now recognized correct\n + · HTML entities in image titles are properly decoded\n \n <b>2014.02.04:</b>\n · Reinstate parsing of trackable name and owner after gc.com change\n diff --git a/main/src/cgeo/geocaching/LogEntry.java b/main/src/cgeo/geocaching/LogEntry.java index b922398..fde0564 100644 --- a/main/src/cgeo/geocaching/LogEntry.java +++ b/main/src/cgeo/geocaching/LogEntry.java @@ -3,6 +3,7 @@ package cgeo.geocaching; import cgeo.geocaching.enumerations.LogType; import cgeo.geocaching.settings.Settings; import cgeo.geocaching.utils.DateUtils; +import cgeo.geocaching.utils.HtmlUtils; import cgeo.geocaching.utils.MatcherWrapper; import org.apache.commons.collections4.CollectionUtils; @@ -85,7 +86,7 @@ public final class LogEntry { final List<String> titles = new ArrayList<String>(5); for (Image image : getLogImages()) { if (StringUtils.isNotBlank(image.getTitle())) { - titles.add(image.getTitle()); + titles.add(HtmlUtils.extractText(image.getTitle())); } } if (titles.isEmpty()) { |