From 61ddd2a22d31ea368180177b1fc06a33787f76da Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Fri, 15 Jul 2022 17:34:19 +0200
Subject: [PATCH] some fixes

---
 .../app/fedilab/android/activities/ProfileActivity.java   | 4 ++--
 .../fedilab/android/client/entities/api/Announcement.java | 2 +-
 .../fedilab/android/ui/drawer/NotificationAdapter.java    | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/app/fedilab/android/activities/ProfileActivity.java b/app/src/main/java/app/fedilab/android/activities/ProfileActivity.java
index 5bfdabab..a40c50ad 100644
--- a/app/src/main/java/app/fedilab/android/activities/ProfileActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/ProfileActivity.java
@@ -364,7 +364,7 @@ public class ProfileActivity extends BaseActivity {
         } else {
             Spannable textAccount = account.span_display_name != null ? account.span_display_name : new SpannableString(account.display_name);
             CustomEmoji.displayEmoji(ProfileActivity.this, account.emojis, textAccount, binding.accountDn, null, id -> {
-                binding.accountDn.invalidate();
+                binding.accountDn.setText(textAccount, TextView.BufferType.SPANNABLE);
             });
             binding.accountDn.setText(textAccount, TextView.BufferType.SPANNABLE);
         }
@@ -386,7 +386,7 @@ public class ProfileActivity extends BaseActivity {
             textNote = account.span_note != null ? account.span_note : new SpannableString(Html.fromHtml(account.note, Html.FROM_HTML_MODE_COMPACT));
         else
             textNote = account.span_note != null ? account.span_note : new SpannableString(Html.fromHtml(account.note));
-        CustomEmoji.displayEmoji(ProfileActivity.this, account.emojis, textNote, binding.accountNote, null, id -> binding.accountNote.invalidate());
+        CustomEmoji.displayEmoji(ProfileActivity.this, account.emojis, textNote, binding.accountNote, null, id -> binding.accountNote.setText(textNote, TextView.BufferType.SPANNABLE));
         binding.accountNote.setText(textNote, TextView.BufferType.SPANNABLE);
         binding.accountNote.setMovementMethod(LinkMovementMethod.getInstance());
 
diff --git a/app/src/main/java/app/fedilab/android/client/entities/api/Announcement.java b/app/src/main/java/app/fedilab/android/client/entities/api/Announcement.java
index 287e245e..a642040c 100644
--- a/app/src/main/java/app/fedilab/android/client/entities/api/Announcement.java
+++ b/app/src/main/java/app/fedilab/android/client/entities/api/Announcement.java
@@ -51,5 +51,5 @@ public class Announcement {
 
     //Some extra spannable element - They will be filled automatically when fetching the status
     public transient Spannable span_content;
-    public boolean emojiFetched = false;
+    public transient boolean emojiFetched = false;
 }
diff --git a/app/src/main/java/app/fedilab/android/ui/drawer/NotificationAdapter.java b/app/src/main/java/app/fedilab/android/ui/drawer/NotificationAdapter.java
index 86bcf4a2..27150f84 100644
--- a/app/src/main/java/app/fedilab/android/ui/drawer/NotificationAdapter.java
+++ b/app/src/main/java/app/fedilab/android/ui/drawer/NotificationAdapter.java
@@ -197,13 +197,13 @@ public class NotificationAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
             holderStatus.bindingNotification.containerTransparent.setAlpha(.3f);
             if (getItemViewType(position) == TYPE_MENTION || getItemViewType(position) == TYPE_STATUS) {
                 holderStatus.bindingNotification.status.actionButtons.setVisibility(View.VISIBLE);
-                String title = "";
+                Spannable title = new SpannableString("");
                 if (getItemViewType(position) == TYPE_MENTION) {
-                    title = String.format(Locale.getDefault(), "%s %s", notification.account.display_name, context.getString(R.string.notif_mention));
+                    title = new SpannableString(String.format(Locale.getDefault(), "%s %s", notification.account.display_name, context.getString(R.string.notif_mention)));
                 } else if (getItemViewType(position) == TYPE_STATUS) {
-                    title = String.format(Locale.getDefault(), "%s %s", notification.account.display_name, context.getString(R.string.notif_status));
+                    title = new SpannableString(String.format(Locale.getDefault(), "%s %s", notification.account.display_name, context.getString(R.string.notif_status)));
                 }
-                CustomEmoji.displayEmoji(context, notification.account.emojis, notification.account.span_display_name, holderStatus.binding.displayName, notification.id, id -> {
+                CustomEmoji.displayEmoji(context, notification.account.emojis, title, holderStatus.binding.displayName, notification.id, id -> {
                     if (!notification.account.emojiFetched) {
                         notification.account.emojiFetched = true;
                         holderStatus.binding.displayName.post(() -> notifyItemChanged(position));