Remove passing in text to GlideImageSpan

Author: samfundev

app/src/main/java/com/perflyst/twire/adapters/ChatAdapter.java

@@ -90,7 +90,7 @@ public void onBindViewHolder(@NonNull final ContactViewHolder holder, int positi
 
             final SpannableStringBuilder builder = new SpannableStringBuilder();
             for (Badge badge : message.getBadges()) {
-                final GlideImageSpan badgeSpan = new GlideImageSpan(context, badge.getUrl(2), holder.message, builder, 36, 1, badge.color);
+                final GlideImageSpan badgeSpan = new GlideImageSpan(context, badge.getUrl(2), holder.message, 36, 1, badge.color);
                 appendSpan(builder, "  ", badgeSpan).append(" ");
             }
 
@@ -113,7 +113,7 @@ public void onBindViewHolder(@NonNull final ContactViewHolder holder, int positi
                     int emoteSize = settings.getEmoteSize();
                     int emotePixels = emoteSize == 1 ? 28 : emoteSize == 2 ? 56 : 112;
 
-                    final GlideImageSpan emoteSpan = new GlideImageSpan(context, emote.getEmoteUrl(emoteSize, isNightTheme), holder.message, builder, emotePixels, (float) emote.getBestAvailableSize(emoteSize) / emoteSize);
+                    final GlideImageSpan emoteSpan = new GlideImageSpan(context, emote.getEmoteUrl(emoteSize, isNightTheme), holder.message, emotePixels, (float) emote.getBestAvailableSize(emoteSize) / emoteSize);
 
                     builder.setSpan(emoteSpan, fromPosition + beforeMessage.length(), toPosition + 1 + beforeMessage.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
                 }

app/src/main/java/com/perflyst/twire/misc/GlideImageSpan.java

@@ -6,7 +6,6 @@
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
-import android.text.SpannableStringBuilder;
 import android.util.Log;
 import android.view.View;
 import android.widget.TextView;
@@ -26,8 +25,8 @@ public class GlideImageSpan extends VerticalImageSpan implements Drawable.Callba
     private Drawable mDrawable;
     private Animatable animatable;
 
-    public GlideImageSpan(Context context, String url, TextView textView, SpannableStringBuilder builder, int assumedSize, float scale, String backgroundColor) {
-        this(context, url, textView, builder, assumedSize, scale);
+    public GlideImageSpan(Context context, String url, TextView textView, int assumedSize, float scale, String backgroundColor) {
+        this(context, url, textView, assumedSize, scale);
 
         if (backgroundColor == null)
             return;
@@ -39,7 +38,7 @@ public GlideImageSpan(Context context, String url, TextView textView, SpannableS
         layerDrawable.setId(1, 1);
     }
 
-    public GlideImageSpan(Context context, String url, TextView textView, SpannableStringBuilder builder, int assumedSize, float scale) {
+    public GlideImageSpan(Context context, String url, TextView textView, int assumedSize, float scale) {
         super(new BlankDrawable());
 
         this.textView = textView;
@@ -80,7 +79,7 @@ public void onResourceReady(@NonNull Drawable resource, @Nullable Transition<? s
                         mDrawable = resource;
 
                         if (resource.getIntrinsicWidth() != assumedSize) {
-                            textView.setText(builder);
+                            textView.setText(textView.getText());
                             Log.d("EmoteShift", "Got " + resource.getIntrinsicWidth() + " but assumed " + assumedSize + " (" + url + ")");
                         } else {
                             textView.invalidate();