From 90cf75421b2a6bbe7d36efa1527dd097472b9c8e Mon Sep 17 00:00:00 2001 From: Hocuri Date: Thu, 10 Jul 2025 19:30:52 +0200 Subject: [PATCH] fix: Small channel fixes (#3807) * fix: Small channel fixes - In the profile view of an InBroadcast, the subtitle said "Contact". I just removed the subtitle, because it already says "Channel" at the top. - When tapping on the avatar of an InBroadcast, an "Edit" button was shown * fix: Also disable edit button for mailinglists --- .../java/org/thoughtcrime/securesms/ProfileActivity.java | 5 ++++- .../java/org/thoughtcrime/securesms/ProfileAvatarItem.java | 2 -- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/thoughtcrime/securesms/ProfileActivity.java b/src/main/java/org/thoughtcrime/securesms/ProfileActivity.java index 1d853a1aa..1c3e3f43b 100644 --- a/src/main/java/org/thoughtcrime/securesms/ProfileActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/ProfileActivity.java @@ -334,7 +334,10 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity Intent intent = new Intent(this, MediaPreviewActivity.class); intent.setDataAndType(profileImageUri, type); intent.putExtra(MediaPreviewActivity.ACTIVITY_TITLE_EXTRA, title); - intent.putExtra(MediaPreviewActivity.EDIT_AVATAR_CHAT_ID, chatIsMultiUser ? chatId : 0); // shows edit-button, might be 0 for a contact-profile + intent.putExtra( // show edit-button, if the user is allowed to edit the name/avatar + MediaPreviewActivity.EDIT_AVATAR_CHAT_ID, + (chatIsMultiUser && !chatIsInBroadcast && !chatIsMailingList) ? chatId : 0 + ); startActivity(intent); } else if (chatIsMultiUser){ onEditName(); diff --git a/src/main/java/org/thoughtcrime/securesms/ProfileAvatarItem.java b/src/main/java/org/thoughtcrime/securesms/ProfileAvatarItem.java index b33798abe..b9522a98e 100644 --- a/src/main/java/org/thoughtcrime/securesms/ProfileAvatarItem.java +++ b/src/main/java/org/thoughtcrime/securesms/ProfileAvatarItem.java @@ -61,8 +61,6 @@ public class ProfileAvatarItem extends LinearLayout implements RecipientModified subtitle = dcChat.getMailinglistAddr(); } else if (dcChat.isOutBroadcast()) { subtitle = getContext().getResources().getQuantityString(R.plurals.n_recipients, memberCount, memberCount); - } else if (dcChat.isInBroadcast()) { - subtitle = getContext().getString(R.string.contact); } else if (dcChat.getType() == DcChat.DC_CHAT_TYPE_GROUP) { subtitle = getContext().getResources().getQuantityString(R.plurals.n_members, memberCount, memberCount); }