awesome-bookmarks/arcanechat-android
3
0
Fork 0
mirror of https://github.com/ArcaneChat/android.git synced 2026-07-03 14:05:24 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

Merge remote-tracking branch 'origin/main' into adb/pgp-contacts2

Browse Source
This commit is contained in:
adbenitez
2025-07-09 17:36:10 +02:00
parent 7f982e6302 0d50af1aa5
commit 90ced3efb0
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/org/thoughtcrime/securesms/ProfileAdapter.java
+2 -5
View File
@@ -277,7 +277,6 @@ public class ProfileAdapter extends RecyclerView.Adapter
itemDataStatusText = "";
isBroadcast = dcChat != null && dcChat.isBroadcast();
boolean isMailingList = dcChat != null && dcChat.isMailingList();
boolean isGroup = dcChat != null && dcChat.getType() == DcChat.DC_CHAT_TYPE_GROUP;
boolean isSelfTalk = dcChat != null && dcChat.isSelfTalk();
boolean isDeviceTalk = dcChat != null && dcChat.isDeviceTalk();
memberCount = memberList!=null ? memberList.length : 0;
@@ -309,10 +308,10 @@ public class ProfileAdapter extends RecyclerView.Adapter
itemData.add(new ItemData(ITEM_LAST_SEEN, lastSeenTxt, 0));
}
if (memberList!=null) {
if (memberList!=null && !isMailingList) {
itemData.add(new ItemData(ITEM_DIVIDER, null, 0));
if (dcChat != null) {
if (!isMailingList && dcChat.canSend() && dcChat.isEncrypted()) {
if (dcChat.canSend() && dcChat.isEncrypted()) {
itemData.add(new ItemData(ITEM_MEMBERS, DcContact.DC_CONTACT_ID_ADD_MEMBER, 0));
if (!isBroadcast) {
itemData.add(new ItemData(ITEM_MEMBERS, DcContact.DC_CONTACT_ID_QR_INVITE, 0));
@@ -345,8 +344,6 @@ public class ProfileAdapter extends RecyclerView.Adapter
if (dcContact != null) {
itemData.add(new ItemData(ITEM_ADDRESS, dcContact.getAddr(), 0));
} else if (isMailingList) {
itemData.add(new ItemData(ITEM_ADDRESS, dcChat.getMailinglistAddr(), 0));
}
}
src/main/java/org/thoughtcrime/securesms/ProfileAvatarItem.java
+1 -1
View File
@@ -58,7 +58,7 @@ public class ProfileAvatarItem extends LinearLayout implements RecipientModified
greenCheckmark = dcChat.isProtected();
if (dcChat.isMailingList()) {
subtitle = getContext().getString(R.string.contacts_headline);
subtitle = dcChat.getMailinglistAddr();
} else if (dcChat.isBroadcast()) {
subtitle = getContext().getResources().getQuantityString(R.plurals.n_recipients, memberCount, memberCount);
} else if (dcChat.getType() == DcChat.DC_CHAT_TYPE_GROUP) {