yetangitu/deltachat
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-android.git synced 2025-10-03 17:59:39 +02:00
Code Issues Releases Wiki Activity

Merge branch 'main' into adb/issue-3893

Browse source
This commit is contained in:
adb 2025-09-02 17:35:57 +02:00 • committed by GitHub
commit 180c2bc8de
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -8,6 +8,7 @@
* fix Direct Share shortcuts * fix Direct Share shortcuts
* fix: don't show error message when cancelling profile creation * fix: don't show error message when cancelling profile creation
* enable permanent notification by default if push notifications are not available * enable permanent notification by default if push notifications are not available
* hide "clone chat" and member list for incoming channels
## v2.11.0 ## v2.11.0
2025-08 2025-08

2
src/main/java/org/thoughtcrime/securesms/ProfileActivity.java
View file

@ -109,7 +109,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity
if (chatId != 0) { if (chatId != 0) {
DcChat dcChat = dcContext.getChat(chatId); DcChat dcChat = dcContext.getChat(chatId);
menu.findItem(R.id.menu_clone).setVisible(chatIsMultiUser && !chatIsMailingList); menu.findItem(R.id.menu_clone).setVisible(chatIsMultiUser && !chatIsInBroadcast && !chatIsMailingList);
if (chatIsDeviceTalk) { if (chatIsDeviceTalk) {
menu.findItem(R.id.edit_name).setVisible(false); menu.findItem(R.id.edit_name).setVisible(false);
menu.findItem(R.id.show_encr_info).setVisible(false); menu.findItem(R.id.show_encr_info).setVisible(false);

3
src/main/java/org/thoughtcrime/securesms/ProfileAdapter.java
View file

@ -278,6 +278,7 @@ public class ProfileAdapter extends RecyclerView.Adapter
itemDataStatusText = ""; itemDataStatusText = "";
isOutBroadcast = dcChat != null && dcChat.isOutBroadcast(); isOutBroadcast = dcChat != null && dcChat.isOutBroadcast();
boolean isMailingList = dcChat != null && dcChat.isMailingList(); boolean isMailingList = dcChat != null && dcChat.isMailingList();
boolean isInBroadcast = dcChat != null && dcChat.isInBroadcast();
boolean isSelfTalk = dcChat != null && dcChat.isSelfTalk(); boolean isSelfTalk = dcChat != null && dcChat.isSelfTalk();
boolean isDeviceTalk = dcChat != null && dcChat.isDeviceTalk(); boolean isDeviceTalk = dcChat != null && dcChat.isDeviceTalk();
memberCount = memberList!=null ? memberList.length : 0; memberCount = memberList!=null ? memberList.length : 0;
@ -309,7 +310,7 @@ public class ProfileAdapter extends RecyclerView.Adapter
itemData.add(new ItemData(ITEM_LAST_SEEN, lastSeenTxt, 0)); itemData.add(new ItemData(ITEM_LAST_SEEN, lastSeenTxt, 0));
} }
if (memberList!=null && !isMailingList) { if (memberList!=null && !isInBroadcast && !isMailingList) {
itemData.add(new ItemData(ITEM_DIVIDER, null, 0)); itemData.add(new ItemData(ITEM_DIVIDER, null, 0));
if (dcChat != null) { if (dcChat != null) {
if (dcChat.canSend() && dcChat.isEncrypted()) { if (dcChat.canSend() && dcChat.isEncrypted()) {