Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixes issue #46 - Custom emoji are not displayed in notifications

This commit is contained in:
stom79 2017-11-16 19:14:54 +01:00
parent 4179995f11
commit 30bc6089d9
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java
View File

@ -250,23 +250,28 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On
else
holder.status_document_container.setVisibility(View.VISIBLE);
String content = status.getContent();
if( content != null) {
content = content.replaceAll("</p>", "<br/><br/>");
content = content.replaceAll("<p>", "");
if (content.endsWith("<br/><br/>"))
content = content.substring(0, content.length() - 10);
}
SpannableString spannableString = Helper.clickableElements(context, content,
status.getReblog() != null?status.getReblog().getMentions():status.getMentions(),
status.getReblog() != null?status.getReblog().getEmojis():status.getEmojis(),
position,
true, NotificationsListAdapter.this);
Typeface tf = Typeface.createFromAsset(context.getAssets(), "fonts/DroidSans-Regular.ttf");
holder.notification_status_content.setTypeface(tf);
holder.notification_status_content.setText(spannableString, TextView.BufferType.SPANNABLE);
String content;
if( status.getContents() != null){
holder.notification_status_content.setText(status.getContents(), TextView.BufferType.SPANNABLE);
}else {
content = status.getContent();
if (content != null) {
content = content.replaceAll("</p>", "<br/><br/>");
content = content.replaceAll("<p>", "");
if (content.endsWith("<br/><br/>"))
content = content.substring(0, content.length() - 10);
}
SpannableString spannableString = Helper.clickableElements(context, content,
status.getReblog() != null ? status.getReblog().getMentions() : status.getMentions(),
status.getReblog() != null ? status.getReblog().getEmojis() : status.getEmojis(),
position,
true, NotificationsListAdapter.this);
holder.notification_status_content.setText(spannableString, TextView.BufferType.SPANNABLE);
}
holder.notification_status_content.setMovementMethod(null);
holder.notification_status_content.setMovementMethod(LinkMovementMethod.getInstance());
holder.status_favorite_count.setText(String.valueOf(status.getFavourites_count()));