From c3d91477059d076e1488b3782c269a375625df2b Mon Sep 17 00:00:00 2001 From: sk Date: Sun, 27 Aug 2023 14:46:33 +0200 Subject: [PATCH] fix wrong time/username reference when replying --- .../joinmastodon/android/fragments/ComposeFragment.java | 9 +++++---- .../android/ui/displayitems/HeaderStatusDisplayItem.java | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java index bd88e6203..73e7e08ab 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java @@ -673,10 +673,11 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr ? UiUtils.formatRelativeTimestamp(getContext(), status.createdAt) : getString(R.string.edited_timestamp, UiUtils.formatRelativeTimestamp(getContext(), status.editedAt)); - String sepp = getString(R.string.sk_separator); - String username = status.account.getDisplayUsername(); - ((TextView) view.findViewById(R.id.time_and_username)).setText(time == null ? username : - username + " " + sepp + " " + time); + ((TextView) view.findViewById(R.id.username)).setText(status.account.getDisplayUsername()); + view.findViewById(R.id.separator).setVisibility(time==null ? View.GONE : View.VISIBLE); + view.findViewById(R.id.time).setVisibility(time==null ? View.GONE : View.VISIBLE); + if(time!=null) ((TextView) view.findViewById(R.id.time)).setText(time); + if (status.spoilerText != null && !status.spoilerText.isBlank()) { TextView replyToSpoiler = view.findViewById(R.id.reply_to_spoiler); replyToSpoiler.setVisibility(View.VISIBLE); diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java index d47b756ee..41a6c1d81 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java @@ -317,7 +317,7 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{ else if (item.status != null && item.status.editedAt != null) time=item.parentFragment.getString(R.string.edited_timestamp, UiUtils.formatRelativeTimestamp(itemView.getContext(), item.status.editedAt)); - this.username.setText("@" + item.user.acct); + this.username.setText(item.user.getDisplayUsername()); this.timeUsernameSeparator.setVisibility(time==null ? View.GONE : View.VISIBLE); this.time.setVisibility(time==null ? View.GONE : View.VISIBLE); if(time!=null) this.time.setText(time);