From 0fc70a9413d019506923762db4dae08a4d447fb6 Mon Sep 17 00:00:00 2001
From: stom79 <tschneider.ac@gmail.com>
Date: Fri, 14 Sep 2018 19:12:39 +0200
Subject: [PATCH] Fix emoji in names

---
 .../mastodon/client/Entities/Account.java     |  3 ++-
 .../mastodon/client/Entities/Status.java      |  3 +--
 .../drawers/NotificationsListAdapter.java     |  5 +++++
 .../mastodon/drawers/StatusListAdapter.java   |  7 +------
 .../main/res/layout/drawer_status_focused.xml | 21 +++++++------------
 5 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Account.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Account.java
index 3143562a8..4ec995a4d 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Account.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Account.java
@@ -537,7 +537,8 @@ public class Account implements Parcelable {
                                     if( noteSpan != null)
                                         account.setNoteSpan(noteSpan);
                                     account.setFieldsSpan(fieldsSpan);
-                                    listener.onRetrieveEmojiAccount(account);
+                                    if( listener != null)
+                                        listener.onRetrieveEmojiAccount(account);
                                 }
                             }
                         });
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Status.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Status.java
index 2b308b65a..d9df60379 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Status.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Status.java
@@ -528,7 +528,7 @@ public class Status implements Parcelable{
         final List<Emojis> emojis = status.getReblog() != null ? status.getReblog().getEmojis() : status.getEmojis();
         final List<Emojis> emojisAccounts = status.getReblog() != null ?status.getReblog().getAccount().getEmojis():status.getAccount().getEmojis();
 
-
+        status.getAccount().makeEmojisAccount(context, null);
         String displayName;
         if( status.getReblog() != null){
             displayName = Helper.shortnameToUnicode(status.getReblog().getAccount().getDisplay_name(), true);
@@ -536,7 +536,6 @@ public class Status implements Parcelable{
         }else {
             displayName = String.format("@%s",status.getAccount().getAcct());
         }
-        Log.v(Helper.TAG,"displayName: " + displayName);
         displayNameSpan = new SpannableString(displayName);
 
         if( emojisAccounts != null)
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java
index 030ec2934..d389a0482 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java
@@ -1056,6 +1056,11 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On
 
     @Override
     public void onRetrieveEmojiAccount(Account account) {
+        for( Notification notification: notifications){
+            if( notification.getAccount().equals(account)){
+                notifyNotificationChanged(notification);
+            }
+        }
     }
 
     class ViewHolder extends RecyclerView.ViewHolder {
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
index 2a4865709..e490be3cf 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
@@ -123,7 +123,7 @@ import static fr.gouv.etalab.mastodon.helper.Helper.getLiveInstance;
  * Created by Thomas on 24/04/2017.
  * Adapter for Status
  */
-public class StatusListAdapter extends RecyclerView.Adapter implements OnPostActionInterface, OnRetrieveFeedsInterface, OnRetrieveEmojiInterface, OnRetrieveRepliesInterface, OnRetrieveCardInterface, OnRetrieveEmojiAccountInterface {
+public class StatusListAdapter extends RecyclerView.Adapter implements OnPostActionInterface, OnRetrieveFeedsInterface, OnRetrieveEmojiInterface, OnRetrieveRepliesInterface, OnRetrieveCardInterface {
 
     private Context context;
     private List<Status> statuses;
@@ -215,10 +215,6 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
         notifyStatusChanged(modifiedStatus.get(0));
     }
 
-    @Override
-    public void onRetrieveEmojiAccount(Account account) {
-
-    }
 
     private class ViewHolderEmpty extends RecyclerView.ViewHolder{
         ViewHolderEmpty(View itemView) {
@@ -658,7 +654,6 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
             //-------- END -> Manages translations
 
 
-            status.getAccount().makeEmojisAccount(context, StatusListAdapter.this);
             //Displays name & emoji in toot header
             final String ppurl;
             if( status.getReblog() != null){
diff --git a/app/src/main/res/layout/drawer_status_focused.xml b/app/src/main/res/layout/drawer_status_focused.xml
index f18b480a9..9e0b2bd76 100644
--- a/app/src/main/res/layout/drawer_status_focused.xml
+++ b/app/src/main/res/layout/drawer_status_focused.xml
@@ -91,24 +91,17 @@
             android:orientation="vertical">
             <TextView
                 android:id="@+id/status_account_displayname"
-                android:visibility="gone"
                 android:maxLines="1"
                 android:drawablePadding="2dp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content" />
-            <LinearLayout
-                android:orientation="horizontal"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-                <TextView
-                    android:textSize="12sp"
-                    android:maxLines="1"
-                    android:ellipsize="end"
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:id="@+id/status_account_username"
-                    android:layout_height="wrap_content" />
-            </LinearLayout>
+            <TextView
+                android:textSize="12sp"
+                android:maxLines="1"
+                android:ellipsize="end"
+                android:layout_width="wrap_content"
+                android:id="@+id/status_account_username"
+                android:layout_height="wrap_content" />
         </LinearLayout>
     </LinearLayout>
     <LinearLayout