From 5cc46bc49e773d86f7a7c8ce472446f9b3e04b3f Mon Sep 17 00:00:00 2001 From: Mariotaku Lee Date: Tue, 22 Mar 2016 21:13:17 +0800 Subject: [PATCH] fixed status escaping --- .../java/org/mariotaku/twidere/fragment/UserFragment.java | 4 ++-- .../mariotaku/twidere/util/InternalTwitterContentUtils.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/twidere/src/main/java/org/mariotaku/twidere/fragment/UserFragment.java b/twidere/src/main/java/org/mariotaku/twidere/fragment/UserFragment.java index b896047ff..1188c28d2 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/fragment/UserFragment.java +++ b/twidere/src/main/java/org/mariotaku/twidere/fragment/UserFragment.java @@ -914,7 +914,7 @@ public class UserFragment extends BaseSupportFragment implements OnClickListener final ParcelableUser user = getUser(); if (twitter == null || user == null) return; - final boolean isMyself = user.account_key.equals(user.key); + final boolean isMyself = user.account_key.maybeEquals(user.key); final MenuItem mentionItem = menu.findItem(R.id.mention); if (mentionItem != null) { final String displayName = UserColorNameManager.decideDisplayName(user.nickname, @@ -1304,7 +1304,7 @@ public class UserFragment extends BaseSupportFragment implements OnClickListener break; } case R.id.follow: { - if (user.account_key.equals(user.key)) { + if (user.account_key.maybeEquals(user.key)) { IntentUtils.openProfileEditor(getActivity(), user.account_key); break; } diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/InternalTwitterContentUtils.java b/twidere/src/main/java/org/mariotaku/twidere/util/InternalTwitterContentUtils.java index cd9525a2e..36473d833 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/InternalTwitterContentUtils.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/InternalTwitterContentUtils.java @@ -240,7 +240,7 @@ public class InternalTwitterContentUtils { public static Pair> formatStatusTextWithIndices(final Status status) { if (status == null) return null; - final HtmlBuilder builder = new HtmlBuilder(status.getText(), false, true, true); + final HtmlBuilder builder = new HtmlBuilder(status.getText(), false, true, false); parseEntities(builder, status); return builder.buildWithIndices(); }