Commit 8e0808dc authored by Thomas's avatar Thomas
Browse files

some changes

parent dd924cba

app/src/main/java/app/fedilab/android/activities/AdminAccountActivity.java

+1 −2
Original line number Diff line number Diff line
@@ -308,8 +308,7 @@ public class AdminAccountActivity extends BaseActivity { 


        binding.accountDn.setText(

                account.getSpanDisplayName(AdminAccountActivity.this,

                        new WeakReference<>(binding.accountDn),

                        id -> binding.accountDn.invalidate()),

                        new WeakReference<>(binding.accountDn)),

                TextView.BufferType.SPANNABLE);

        binding.accountUn.setText(String.format("@%s", account.acct));

        binding.accountUn.setOnLongClickListener(v -> {

app/src/main/java/app/fedilab/android/activities/AdminReportActivity.java

+1 −2
Original line number Diff line number Diff line
@@ -325,8 +325,7 @@ public class AdminReportActivity extends BaseActivity { 


        binding.accountDn.setText(

                account.getSpanDisplayName(AdminReportActivity.this,

                        new WeakReference<>(binding.accountDn),

                        id -> binding.accountDn.invalidate()),

                        new WeakReference<>(binding.accountDn)),

                TextView.BufferType.SPANNABLE);

        binding.accountUn.setText(String.format("@%s", account.acct));

        binding.accountUn.setOnLongClickListener(v -> {

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

+2 −4
Original line number Diff line number Diff line
@@ -350,8 +350,7 @@ public class ProfileActivity extends BaseActivity { 


        binding.accountDn.setText(

                account.getSpanDisplayName(ProfileActivity.this,

                        new WeakReference<>(binding.accountDn),

                        id -> binding.accountDn.invalidate()),

                        new WeakReference<>(binding.accountDn)),

                TextView.BufferType.SPANNABLE);



        binding.accountUn.setText(String.format("@%s", account.acct));
@@ -368,8 +367,7 @@ public class ProfileActivity extends BaseActivity { 
        });

        binding.accountNote.setText(

                account.getSpanNote(ProfileActivity.this,

                        new WeakReference<>(binding.accountNote),

                        id -> binding.accountNote.invalidate()),

                        new WeakReference<>(binding.accountNote)),

                TextView.BufferType.SPANNABLE);

        binding.accountNote.setMovementMethod(LinkMovementMethod.getInstance());

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

+4 −20
Original line number Diff line number Diff line
@@ -79,32 +79,16 @@ public class Account implements Serializable { 
    @SerializedName("moved")

    public Account moved;



    public transient boolean emojiDisplayNameFetched = false;

    public transient boolean emojiNoteFetched = false;

    //Some extra spannable element - They will be filled automatically when fetching the account

    private transient Spannable span_display_name;

    private transient Spannable span_note;



    public synchronized Spannable getSpanDisplayName(Context context, WeakReference<View> viewWeakReference, SpannableHelper.EmojiCallback callback) {

        if (span_display_name != null) {

            return span_display_name;

        }

    public synchronized Spannable getSpanDisplayName(Context context, WeakReference<View> viewWeakReference) {

        if (display_name == null) {

            display_name = username;

        }

        span_display_name = SpannableHelper.convert(context, display_name, null, this, true, viewWeakReference, !emojiDisplayNameFetched ? callback : null);

        emojiDisplayNameFetched = true;

        return span_display_name;

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

    }





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

        if (span_note != null) {

            return span_note;

        }

        span_note = SpannableHelper.convert(context, note, null, this, true, viewWeakReference, !emojiNoteFetched ? callback : null);

        emojiNoteFetched = true;

        return span_note;

    public synchronized Spannable getSpanNote(Context context, WeakReference<View> viewWeakReference) {

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

    }



    public transient RelationShip relationShip;

app/src/main/java/app/fedilab/android/client/entities/api/Poll.java

+3 −9
Original line number Diff line number Diff line
@@ -58,16 +58,10 @@ public class Poll implements Serializable { 
        @SerializedName("votes_count")

        public int votes_count;



        //Some extra spannable element - They will be filled automatically when fetching the poll

        public transient Spannable span_title;

        public transient boolean emojiTitleFetched = false;

        public Spannable span_title;



        public Spannable getSpanTitle(Context context, Status status, WeakReference<View> viewWeakReference, SpannableHelper.EmojiCallback callback) {

            if (span_title != null) {

                return span_title;

            }

            span_title = SpannableHelper.convert(context, title, status, null, true, viewWeakReference, !emojiTitleFetched ? callback : null);

            emojiTitleFetched = true;

        public Spannable getSpanTitle(Context context, Status status, WeakReference<View> viewWeakReference) {

            span_title = SpannableHelper.convert(context, title, status, null, true, viewWeakReference);

            return span_title;

        }

    }