From 43193951c2ca477b47e3c1a5d1af2f7283681684 Mon Sep 17 00:00:00 2001 From: 0xd9a <0xd9a@noreply.codeberg.org> Date: Tue, 5 Aug 2025 02:48:52 +0530 Subject: [PATCH] Keep bottom hash tags in profile note (fix #1268) --- .../mastodon/activities/ProfileActivity.java | 2 +- .../mastodon/client/entities/api/Account.java | 4 ++-- .../mastodon/client/entities/api/Status.java | 2 +- .../mastodon/helper/SpannableHelper.java | 18 ++++++++++++++---- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/app/fedilab/android/mastodon/activities/ProfileActivity.java b/app/src/main/java/app/fedilab/android/mastodon/activities/ProfileActivity.java index 9f120045..27aaf7dc 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/activities/ProfileActivity.java +++ b/app/src/main/java/app/fedilab/android/mastodon/activities/ProfileActivity.java @@ -589,7 +589,7 @@ public class ProfileActivity extends BaseActivity { account.getSpanNote(ProfileActivity.this, new WeakReference<>(binding.accountNote)), TextView.BufferType.SPANNABLE); - }), + }, true), TextView.BufferType.SPANNABLE); binding.accountNote.setMovementMethod(LinkMovementMethod.getInstance()); diff --git a/app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Account.java b/app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Account.java index 2408db28..c93d3927 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Account.java +++ b/app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Account.java @@ -112,8 +112,8 @@ public class Account implements Serializable { public synchronized Spannable getSpanNote(Context context, WeakReference viewWeakReference) { return SpannableHelper.convert(context, note, null, this, null, viewWeakReference, null, true, false); } - public synchronized Spannable getSpanNote(Context context, WeakReference viewWeakReference, Status.Callback callback) { - return SpannableHelper.convert(context, note, null, this, null, viewWeakReference, callback, true, false); + public synchronized Spannable getSpanNote(Context context, WeakReference viewWeakReference, Status.Callback callback, boolean keepOriginalBottomHashTags) { + return SpannableHelper.convert(context, note, null, this, null, viewWeakReference, callback, true, false, keepOriginalBottomHashTags); } @Override diff --git a/app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Status.java b/app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Status.java index b5a1621e..251fe42e 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Status.java +++ b/app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Status.java @@ -195,7 +195,7 @@ public class Status implements Serializable, Cloneable { public synchronized Spannable getSpanContent(Context context, boolean checkRemotely, WeakReference viewWeakReference, Callback callback) { if (contentSpan == null) { - contentSpan = SpannableHelper.convert(context, content, this, null, null, checkRemotely, viewWeakReference, callback, true, true); + contentSpan = SpannableHelper.convert(context, content, this, null, null, checkRemotely, viewWeakReference, callback, true, true, false); } return contentSpan; } diff --git a/app/src/main/java/app/fedilab/android/mastodon/helper/SpannableHelper.java b/app/src/main/java/app/fedilab/android/mastodon/helper/SpannableHelper.java index 99812a5d..3ed94ccf 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/helper/SpannableHelper.java +++ b/app/src/main/java/app/fedilab/android/mastodon/helper/SpannableHelper.java @@ -135,12 +135,22 @@ public class SpannableHelper { public static Spannable convert(Context context, String text, Status status, Account account, Announcement announcement, WeakReference viewWeakReference, Status.Callback callback, boolean convertHtml, boolean convertMarkdown) { - return convert(context, text, status, account, announcement, false, viewWeakReference, callback, convertHtml, convertMarkdown); + return convert(context, text, status, account, announcement, false, viewWeakReference, callback, convertHtml, convertMarkdown, false); } public static Spannable convert(Context context, String text, - Status status, Account account, Announcement announcement, boolean checkRemotely, - WeakReference viewWeakReference, Status.Callback callback, boolean convertHtml, boolean convertMarkdown) { + Status status, Account account, Announcement announcement, WeakReference viewWeakReference, + Status.Callback callback, boolean convertHtml, boolean convertMarkdown, boolean keepOriginalBottomHashTags) { + return convert(context, text, status, account, announcement, false, viewWeakReference, callback, convertHtml, convertMarkdown, keepOriginalBottomHashTags); + } + + /** + * @param keepOriginalBottomHashTags set this to {@code true} to preserve original bottom hash tags. For example, in account note + * (profile bio/description) in {@link app.fedilab.android.mastodon.activities.ProfileActivity ProfileActivity} + */ + public static Spannable convert(Context context, String text, Status status, Account account, Announcement announcement, + boolean checkRemotely, WeakReference viewWeakReference, Status.Callback callback, + boolean convertHtml, boolean convertMarkdown, boolean keepOriginalBottomHashTags) { if (text == null) { return null; } @@ -395,7 +405,7 @@ public class SpannableHelper { } boolean underlineBottomHashTags = sharedpreferences.getBoolean(context.getString(R.string.SET_UNDERLINE_BOTTOM_HASHTAGS), true); - if(underlineBottomHashTags) { + if(underlineBottomHashTags && !keepOriginalBottomHashTags) { SpannableStringBuilder spannableStringBuilder = new SpannableStringBuilder(); final Pattern bottomTagsPattern = Pattern.compile(patternBottomTags, Pattern.CASE_INSENSITIVE); Matcher matcherBottomTags = bottomTagsPattern.matcher(content);