From b6b3fe12b6b14c0edd6ebaa6848da044108e5a11 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Sun, 21 Dec 2025 14:19:08 +0100 Subject: [PATCH] fix: add members, not subscribers to emails --- .../org/thoughtcrime/securesms/GroupCreateActivity.java | 2 +- .../java/org/thoughtcrime/securesms/ProfileAdapter.java | 6 +----- .../securesms/util/SelectedContactsAdapter.java | 6 ++---- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/thoughtcrime/securesms/GroupCreateActivity.java b/src/main/java/org/thoughtcrime/securesms/GroupCreateActivity.java index f5b19bc4c..526b2cc8f 100644 --- a/src/main/java/org/thoughtcrime/securesms/GroupCreateActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/GroupCreateActivity.java @@ -149,7 +149,7 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity initializeAvatarView(); - SelectedContactsAdapter adapter = new SelectedContactsAdapter(this, GlideApp.with(this), broadcast, unencrypted); + SelectedContactsAdapter adapter = new SelectedContactsAdapter(this, GlideApp.with(this), broadcast); adapter.setItemClickListener(this); lv.setAdapter(adapter); diff --git a/src/main/java/org/thoughtcrime/securesms/ProfileAdapter.java b/src/main/java/org/thoughtcrime/securesms/ProfileAdapter.java index e247950c7..41eb6eec8 100644 --- a/src/main/java/org/thoughtcrime/securesms/ProfileAdapter.java +++ b/src/main/java/org/thoughtcrime/securesms/ProfileAdapter.java @@ -163,11 +163,7 @@ public class ProfileAdapter extends RecyclerView.Adapter String addr = null; if (contactId == DcContact.DC_CONTACT_ID_ADD_MEMBER) { - if (isOutBroadcast) { - name = context.getString(R.string.add_recipients); - } else { - name = context.getString(R.string.group_add_members); - } + name = context.getString(R.string.group_add_members); } else if (contactId == DcContact.DC_CONTACT_ID_QR_INVITE) { name = context.getString(R.string.qrshow_title); diff --git a/src/main/java/org/thoughtcrime/securesms/util/SelectedContactsAdapter.java b/src/main/java/org/thoughtcrime/securesms/util/SelectedContactsAdapter.java index 70ec1fd5f..e45e53f1a 100644 --- a/src/main/java/org/thoughtcrime/securesms/util/SelectedContactsAdapter.java +++ b/src/main/java/org/thoughtcrime/securesms/util/SelectedContactsAdapter.java @@ -37,18 +37,16 @@ public class SelectedContactsAdapter extends BaseAdapter { @Nullable private ItemClickListener itemClickListener; @NonNull private final List contacts = new LinkedList<>(); private final boolean isBroadcast; - private final boolean isUnencrypted; @NonNull private final DcContext dcContext; @NonNull private final GlideRequests glideRequests; public SelectedContactsAdapter(@NonNull Context context, @NonNull GlideRequests glideRequests, - boolean isBroadcast, boolean isUnencrypted) + boolean isBroadcast) { this.context = context; this.glideRequests = glideRequests; this.isBroadcast = isBroadcast; - this.isUnencrypted = isUnencrypted; this.dcContext = DcHelper.getContext(context); } @@ -115,7 +113,7 @@ public class SelectedContactsAdapter extends BaseAdapter { Recipient recipient = null; if(contactId == DcContact.DC_CONTACT_ID_ADD_MEMBER) { - name.setText(context.getString(isBroadcast || isUnencrypted? R.string.add_recipients : R.string.group_add_members)); + name.setText(context.getString(R.string.group_add_members)); name.setTypeface(null, Typeface.BOLD); phone.setVisibility(View.GONE); } else {