Commit 59c05e35 authored by Thomas's avatar Thomas
Browse files

Fix issue #1164 - Custom emojis in bio do not render

parent 6a238d97

app/src/main/java/app/fedilab/android/mastodon/activities/ProfileActivity.java

+10 −17
Original line number Diff line number Diff line
@@ -82,9 +82,6 @@ import java.util.Date; 
import java.util.List;

import java.util.Locale;

import java.util.Set;

import java.util.concurrent.Executors;

import java.util.concurrent.ScheduledExecutorService;

import java.util.concurrent.TimeUnit;



import androidmads.library.qrgenearator.QRGContents;

import androidmads.library.qrgenearator.QRGEncoder;
@@ -103,6 +100,7 @@ import app.fedilab.android.mastodon.client.entities.api.Field; 
import app.fedilab.android.mastodon.client.entities.api.IdentityProof;

import app.fedilab.android.mastodon.client.entities.api.MastodonList;

import app.fedilab.android.mastodon.client.entities.api.RelationShip;

import app.fedilab.android.mastodon.client.entities.api.Status;

import app.fedilab.android.mastodon.client.entities.app.CachedBundle;

import app.fedilab.android.mastodon.client.entities.app.Languages;

import app.fedilab.android.mastodon.client.entities.app.Pinned;
@@ -132,7 +130,6 @@ public class ProfileActivity extends BaseActivity { 
    private RelationShip relationship;

    private FamiliarFollowers familiarFollowers;

    private Account account;

    private ScheduledExecutorService scheduledExecutorService;

    private action doAction;

    private AccountsVM accountsVM;

    private RecyclerView identityProofsRecycler;
@@ -357,14 +354,7 @@ public class ProfileActivity extends BaseActivity { 
            this.identityProofList = identityProofs;

            updateAccount();

        });

        //Animate emojis

        if (account.emojis != null && !account.emojis.isEmpty()) {

            boolean disableAnimatedEmoji = sharedpreferences.getBoolean(getString(R.string.SET_DISABLE_ANIMATED_EMOJI), false);

            if (!disableAnimatedEmoji) {

                scheduledExecutorService = Executors.newSingleThreadScheduledExecutor();

                scheduledExecutorService.scheduleAtFixedRate(() -> binding.accountDn.invalidate(), 0, 130, TimeUnit.MILLISECONDS);

            }

        }



        binding.accountTabLayout.clearOnTabSelectedListeners();

        binding.accountTabLayout.removeAllTabs();

        //Tablayout for timelines/following/followers
@@ -550,8 +540,15 @@ public class ProfileActivity extends BaseActivity { 
        });

        binding.accountNote.setText(

                account.getSpanNote(ProfileActivity.this,

                        new WeakReference<>(binding.accountNote)),

                        new WeakReference<>(binding.accountNote), () -> {

                            //TODO: replace this hack

                            binding.accountNote.setText(

                                    account.getSpanNote(ProfileActivity.this,

                                            new WeakReference<>(binding.accountNote)), TextView.BufferType.SPANNABLE);



                        }),

                TextView.BufferType.SPANNABLE);



        binding.accountNote.setMovementMethod(LinkMovementMethod.getInstance());
@@ -1370,10 +1367,6 @@ public class ProfileActivity extends BaseActivity { 


    @Override

    public void onDestroy() {

        if (scheduledExecutorService != null) {

            scheduledExecutorService.shutdownNow();

            scheduledExecutorService = null;

        }

        try {

            unregisterReceiver(broadcast_data);

        } catch (IllegalArgumentException e) {

app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Account.java

+3 −0
Original line number Diff line number Diff line
@@ -112,6 +112,9 @@ public class Account implements Serializable { 
    public synchronized Spannable getSpanNote(Context context, WeakReference<View> viewWeakReference) {

        return SpannableHelper.convert(context, note, null, this, null, viewWeakReference, null, true, false);

    }

    public synchronized Spannable getSpanNote(Context context, WeakReference<View> viewWeakReference, Status.Callback callback) {

        return SpannableHelper.convert(context, note, null, this, null, viewWeakReference, callback, true, false);

    }



    @Override

    public boolean equals(@Nullable Object obj) {

app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java

+0 −1
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ import android.os.Looper; 
import android.text.Html;

import android.text.SpannableString;

import android.text.TextUtils;

import android.util.Log;

import android.util.TypedValue;

import android.view.LayoutInflater;

import android.view.MotionEvent;