aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2015-03-03 10:06:03 +0100
committerSamuel Tardieu <sam@rfc1149.net>2015-03-03 10:06:18 +0100
commit89377a696bde2a0671729a813c078bf7a69c8961 (patch)
tree762f9744b4e0db17ca11bda4a7109ffd7ddbddf0
parent7778c986e6acf47e2f119d0392db0acdfb88162c (diff)
downloadcgeo-89377a696bde2a0671729a813c078bf7a69c8961.zip
cgeo-89377a696bde2a0671729a813c078bf7a69c8961.tar.gz
cgeo-89377a696bde2a0671729a813c078bf7a69c8961.tar.bz2
fix #4713: smilies in waypoint description shown incorrect
-rw-r--r--main/src/cgeo/geocaching/CacheDetailActivity.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 2be802f..22bd500 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -26,6 +26,7 @@ import cgeo.geocaching.list.StoredList;
import cgeo.geocaching.location.Units;
import cgeo.geocaching.network.HtmlImage;
import cgeo.geocaching.network.Network;
+import cgeo.geocaching.network.SmileyImage;
import cgeo.geocaching.sensors.GeoData;
import cgeo.geocaching.sensors.GeoDirHandler;
import cgeo.geocaching.settings.Settings;
@@ -1664,7 +1665,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
noteView.setOnClickListener(new DecryptTextClickListener(noteView));
noteView.setVisibility(View.VISIBLE);
if (TextUtils.containsHtml(wpt.getNote())) {
- noteView.setText(Html.fromHtml(wpt.getNote()), TextView.BufferType.SPANNABLE);
+ noteView.setText(Html.fromHtml(wpt.getNote(), new SmileyImage(cache.getGeocode(), noteView), new UnknownTagsHandler()), TextView.BufferType.SPANNABLE);
}
else {
noteView.setText(wpt.getNote());