From 8c6ccf426103b4ceac93b14d981f1f009f980225 Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Fri, 13 May 2022 22:00:30 +0200
Subject: [PATCH] fix notification message formatting when username is not at
 the beginning of the message (#2522)

* fix notification message formatting when username is not at the beginning of the message

* search for placeholder in format string
---
 .../tusky/adapter/NotificationsAdapter.java              | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java b/app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java
index f681e64fd..327e4aa75 100644
--- a/app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java
+++ b/app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java
@@ -531,8 +531,13 @@ public class NotificationsAdapter extends RecyclerView.Adapter {
             message.setCompoundDrawablesWithIntrinsicBounds(icon, null, null, null);
             String wholeMessage = String.format(format, displayName);
             final SpannableStringBuilder str = new SpannableStringBuilder(wholeMessage);
-            str.setSpan(new StyleSpan(Typeface.BOLD), 0, displayName.length(),
-                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+            int displayNameIndex = format.indexOf("%s");
+            str.setSpan(
+                    new StyleSpan(Typeface.BOLD),
+                    displayNameIndex,
+                    displayNameIndex + displayName.length(),
+                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+            );
             CharSequence emojifiedText = CustomEmojiHelper.emojify(
                     str, notificationViewData.getAccount().getEmojis(), message, statusDisplayOptions.animateEmojis()
             );