From 89b3fc1a730a48487d3dc42b00f24ada202e86d5 Mon Sep 17 00:00:00 2001 From: Maxime Biais Date: Thu, 15 May 2014 10:19:27 +0800 Subject: [PATCH] unescape blogName when it's going to be displayed to the user --- src/org/wordpress/android/ui/accounts/ManageBlogsActivity.java | 2 +- src/org/wordpress/android/ui/posts/EditPostActivity.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/wordpress/android/ui/accounts/ManageBlogsActivity.java b/src/org/wordpress/android/ui/accounts/ManageBlogsActivity.java index 392496bb13ba..e0ef5e4b0b5b 100644 --- a/src/org/wordpress/android/ui/accounts/ManageBlogsActivity.java +++ b/src/org/wordpress/android/ui/accounts/ManageBlogsActivity.java @@ -161,7 +161,7 @@ public View getView(int position, View convertView, ViewGroup parent) { LayoutInflater inflater = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE); View rowView = inflater.inflate(mResource, parent, false); CheckedTextView nameView = (CheckedTextView) rowView.findViewById(R.id.blog_name); - String name = MapUtils.getMapStr(getItem(position), "blogName"); + String name = StringUtils.unescapeHTML(MapUtils.getMapStr(getItem(position), "blogName")); if (name.trim().length() == 0) { name = MapUtils.getMapStr(getItem(position), "url"); name = StringUtils.getHost(name); diff --git a/src/org/wordpress/android/ui/posts/EditPostActivity.java b/src/org/wordpress/android/ui/posts/EditPostActivity.java index f2b76d95a90a..5e5050d18837 100644 --- a/src/org/wordpress/android/ui/posts/EditPostActivity.java +++ b/src/org/wordpress/android/ui/posts/EditPostActivity.java @@ -155,7 +155,7 @@ protected void onCreate(Bundle savedInstanceState) { public void onPageSelected(int position) { invalidateOptionsMenu(); if (position == PAGE_CONTENT) { - setTitle(WordPress.getCurrentBlog().getBlogName()); + setTitle(StringUtils.unescapeHTML(WordPress.getCurrentBlog().getBlogName())); } else if (position == PAGE_SETTINGS) { setTitle(mPost.isPage() ? R.string.page_settings : R.string.post_settings); } else if (position == PAGE_PREVIEW) {