diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2012-06-25 22:45:01 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2012-06-25 22:45:01 +0200 |
| commit | 311a6d674206fe3f7fb0f18bd19d2aa7bd0d8504 (patch) | |
| tree | 131ec48c5cfc4dc767f8f1810a17f29cb277e95c /main/src/cgeo/geocaching | |
| parent | 77b476b57c60e0ce77a984bf792dde903790f87c (diff) | |
| parent | 169398924a0792ce57d5a4f116ae488f5befac8f (diff) | |
| download | cgeo-311a6d674206fe3f7fb0f18bd19d2aa7bd0d8504.zip cgeo-311a6d674206fe3f7fb0f18bd19d2aa7bd0d8504.tar.gz cgeo-311a6d674206fe3f7fb0f18bd19d2aa7bd0d8504.tar.bz2 | |
Merge branch 'release' into upstream
Conflicts:
main/src/cgeo/geocaching/CacheDetailActivity.java
main/src/cgeo/geocaching/connector/gc/GCParser.java
Diffstat (limited to 'main/src/cgeo/geocaching')
| -rw-r--r-- | main/src/cgeo/geocaching/CacheDetailActivity.java | 4 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/connector/gc/GCParser.java | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java index a3b78e2..6ee351c 100644 --- a/main/src/cgeo/geocaching/CacheDetailActivity.java +++ b/main/src/cgeo/geocaching/CacheDetailActivity.java @@ -1364,9 +1364,9 @@ public class CacheDetailActivity extends AbstractActivity { if (StringUtils.isNotBlank(cache.getOwnerDisplayName()) || StringUtils.isNotBlank(cache.getOwnerUserId())) { TextView ownerView = details.add(R.string.cache_owner, ""); if (StringUtils.isNotBlank(cache.getOwnerDisplayName())) { - ownerView.setText(Html.fromHtml(cache.getOwnerDisplayName()), TextView.BufferType.SPANNABLE); + ownerView.setText(cache.getOwnerDisplayName(), TextView.BufferType.SPANNABLE); } else { // OwnerReal guaranteed to be not blank based on above - ownerView.setText(Html.fromHtml(cache.getOwnerUserId()), TextView.BufferType.SPANNABLE); + ownerView.setText(cache.getOwnerUserId(), TextView.BufferType.SPANNABLE); } ownerView.setOnClickListener(new OwnerActionsClickListener()); } diff --git a/main/src/cgeo/geocaching/connector/gc/GCParser.java b/main/src/cgeo/geocaching/connector/gc/GCParser.java index f7dc684..004a50f 100644 --- a/main/src/cgeo/geocaching/connector/gc/GCParser.java +++ b/main/src/cgeo/geocaching/connector/gc/GCParser.java @@ -34,6 +34,7 @@ import ch.boye.httpclientandroidlib.HttpResponse; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; import org.json.JSONArray; import org.json.JSONException; @@ -409,7 +410,7 @@ public abstract class GCParser { } // owner - cache.setOwnerDisplayName(Html.fromHtml(BaseUtils.getMatch(tableInside, GCConstants.PATTERN_OWNER_DISPLAYNAME, true, cache.getOwnerDisplayName())).toString()); + cache.setOwnerDisplayName(StringEscapeUtils.unescapeHtml4(BaseUtils.getMatch(tableInside, GCConstants.PATTERN_OWNER_DISPLAYNAME, true, cache.getOwnerDisplayName())).toString()); // hidden try { |