1 files changed, 34 insertions, 2 deletions

diff --git a/app/src/main/java/app/fedilab/android/helper/CustomEmoji.java b/app/src/main/java/app/fedilab/android/helper/CustomEmoji.java
index 108351115..f121afc18 100644
--- a/app/src/main/java/app/fedilab/android/helper/CustomEmoji.java
+++ b/app/src/main/java/app/fedilab/android/helper/CustomEmoji.java
@@ -6,6 +6,7 @@ import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
+import android.text.SpannableStringBuilder;
 import android.text.style.ReplacementSpan;
 import android.view.View;
 
@@ -13,26 +14,53 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.preference.PreferenceManager;
 
+import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.target.CustomTarget;
 import com.bumptech.glide.request.target.Target;
 import com.bumptech.glide.request.transition.Transition;
 
 import java.lang.ref.WeakReference;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import app.fedilab.android.R;
+import app.fedilab.android.client.entities.api.Emoji;
+import app.fedilab.android.client.entities.api.Status;
 
 
 public class CustomEmoji extends ReplacementSpan {
     private final float scale;
     private final WeakReference<View> viewWeakReference;
     private Drawable imageDrawable;
-
+    private boolean callbackCalled;
 
     CustomEmoji(WeakReference<View> viewWeakReference) {
         Context mContext = viewWeakReference.get().getContext();
         this.viewWeakReference = viewWeakReference;
         SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(mContext);
         scale = sharedpreferences.getFloat(mContext.getString(R.string.SET_FONT_SCALE), 1.1f);
+        callbackCalled = false;
+    }
+
+    public SpannableStringBuilder makeEmoji(SpannableStringBuilder content, List<Emoji> emojiList, boolean animate, Status.Callback callback) {
+        if (emojiList != null && emojiList.size() > 0) {
+            int count = 1;
+            for (Emoji emoji : emojiList) {
+                Matcher matcher = Pattern.compile(":" + emoji.shortcode + ":", Pattern.LITERAL)
+                        .matcher(content);
+                while (matcher.find()) {
+                    CustomEmoji customEmoji = new CustomEmoji(new WeakReference<>(viewWeakReference.get()));
+                    content.setSpan(customEmoji, matcher.start(), matcher.end(), 0);
+                    Glide.with(viewWeakReference.get())
+                            .asDrawable()
+                            .load(animate ? emoji.url : emoji.static_url)
+                            .into(customEmoji.getTarget(animate, count == emojiList.size() && !callbackCalled ? callback : null));
+                }
+                count++;
+            }
+        }
+        return content;
     }
 
     @Override
@@ -61,7 +89,7 @@ public class CustomEmoji extends ReplacementSpan {
         }
     }
 
-    public Target<Drawable> getTarget(boolean animate) {
+    public Target<Drawable> getTarget(boolean animate, Status.Callback callback) {
         return new CustomTarget<Drawable>() {
             @Override
             public void onResourceReady(@NonNull Drawable resource, @Nullable Transition<? super Drawable> transition) {
@@ -97,6 +125,10 @@ public class CustomEmoji extends ReplacementSpan {
                 if (view != null) {
                     view.invalidate();
                 }
+                if (callback != null && !callbackCalled) {
+                    callbackCalled = true;
+                    callback.emojiFetched();
+                }
             }
 
             @Override