Commit dbc11806 authored by Thomas's avatar Thomas
Browse files

Merge branch 'direct_messages_chat' into develop

parents 63e444ff 392efd2c

app/src/main/java/app/fedilab/android/BaseMainActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -1219,7 +1219,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
                }

                if (!isFinishing()) {

                    headerMainBinding.accountName.setText(

                            currentAccount.mastodon_account.getSpanDisplayName(BaseMainActivity.this,

                            currentAccount.mastodon_account.getSpanDisplayNameEmoji(BaseMainActivity.this,

                                    new WeakReference<>(headerMainBinding.accountName)),

                            TextView.BufferType.SPANNABLE);

                }

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

+0 −2
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ public class DirectMessageActivity extends BaseActivity implements FragmentMasto 
    public static boolean displayCW;



    FragmentMastodonDirectMessage currentFragment;

    private Status firstMessage;

    private String remote_instance;



    @Override
@@ -149,7 +148,6 @@ public class DirectMessageActivity extends BaseActivity implements FragmentMasto 


    @Override

    public void get(Status status) {

        firstMessage = status;

        invalidateOptionsMenu();

    }

}
 
 No newline at end of file

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

+1 −1
Original line number Diff line number Diff line
@@ -456,7 +456,7 @@ public class ProfileActivity extends BaseActivity { 
        }



        binding.accountDn.setText(

                account.getSpanDisplayName(ProfileActivity.this,

                account.getSpanDisplayNameEmoji(ProfileActivity.this,

                        new WeakReference<>(binding.accountDn)),

                TextView.BufferType.SPANNABLE);

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

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




        binding.accountDn.setText(

                adminAccount.account.getSpanDisplayName(AdminAccountActivity.this,

                adminAccount.account.getSpanDisplayNameEmoji(AdminAccountActivity.this,

                        new WeakReference<>(binding.accountDn)),

                TextView.BufferType.SPANNABLE);

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

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

+1 −1
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ public class AdminReportActivity extends BaseBarActivity { 
        }



        binding.accountDn.setText(

                account.getSpanDisplayName(AdminReportActivity.this,

                account.getSpanDisplayNameEmoji(AdminReportActivity.this,

                        new WeakReference<>(binding.accountDn)),

                TextView.BufferType.SPANNABLE);

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