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-3841

Browse source
This commit is contained in:
adb 2025-07-31 14:56:54 +00:00 • committed by GitHub
commit c526c42d19
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -3,6 +3,8 @@
## Unreleased ## Unreleased
* hide contact email addresses in search results * hide contact email addresses in search results
* disable non-functional message editing and ephemeral messages timer settings in classic email thread chat
* don't enlage email chats avatar placeholder
## v2.8.0 ## v2.8.0

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

@ -442,7 +442,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
menu.findItem(R.id.menu_show_map).setVisible(false); menu.findItem(R.id.menu_show_map).setVisible(false);
} }
if (!dcChat.canSend() || dcChat.isMailingList() ) { if (!dcChat.isEncrypted() || !dcChat.canSend() || dcChat.isMailingList() ) {
menu.findItem(R.id.menu_ephemeral_messages).setVisible(false); menu.findItem(R.id.menu_ephemeral_messages).setVisible(false);
} }

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

@ -331,8 +331,7 @@ public class ConversationFragment extends MessageSelectorFragment
menu.findItem(R.id.menu_context_share).setVisible(messageRecord.hasFile()); menu.findItem(R.id.menu_context_share).setVisible(messageRecord.hasFile());
boolean canReply = canReplyToMsg(messageRecord); boolean canReply = canReplyToMsg(messageRecord);
menu.findItem(R.id.menu_context_reply).setVisible(chat.canSend() && canReply); menu.findItem(R.id.menu_context_reply).setVisible(chat.canSend() && canReply);
boolean canEdit = canEditMsg(messageRecord); menu.findItem(R.id.menu_context_edit).setVisible(chat.isEncrypted() && chat.canSend() && canEditMsg(messageRecord));
menu.findItem(R.id.menu_context_edit).setVisible(chat.canSend() && canEdit);
boolean showReplyPrivately = chat.isMultiUser() && !messageRecord.isOutgoing() && canReply; boolean showReplyPrivately = chat.isMultiUser() && !messageRecord.isOutgoing() && canReply;
menu.findItem(R.id.menu_context_reply_privately).setVisible(showReplyPrivately); menu.findItem(R.id.menu_context_reply_privately).setVisible(showReplyPrivately);
menu.findItem(R.id.menu_add_to_home_screen).setVisible(messageRecord.getType() == DcMsg.DC_MSG_WEBXDC); menu.findItem(R.id.menu_add_to_home_screen).setVisible(messageRecord.getType() == DcMsg.DC_MSG_WEBXDC);

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

@ -329,7 +329,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity
File file = new File(profileImagePath); File file = new File(profileImagePath);
if (file.exists()) { if (chatIsEncrypted && file.exists()) {
profileImageUri = Uri.fromFile(file); profileImageUri = Uri.fromFile(file);
String type = "image/" + profileImagePath.substring(profileImagePath.lastIndexOf(".") + 1); String type = "image/" + profileImagePath.substring(profileImagePath.lastIndexOf(".") + 1);
@ -338,7 +338,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity
intent.putExtra(MediaPreviewActivity.ACTIVITY_TITLE_EXTRA, title); intent.putExtra(MediaPreviewActivity.ACTIVITY_TITLE_EXTRA, title);
intent.putExtra( // show edit-button, if the user is allowed to edit the name/avatar intent.putExtra( // show edit-button, if the user is allowed to edit the name/avatar
MediaPreviewActivity.EDIT_AVATAR_CHAT_ID, MediaPreviewActivity.EDIT_AVATAR_CHAT_ID,
(chatIsMultiUser && chatIsEncrypted && !chatIsInBroadcast && !chatIsMailingList) ? chatId : 0 (chatIsMultiUser && !chatIsInBroadcast && !chatIsMailingList) ? chatId : 0
); );
startActivity(intent); startActivity(intent);
} else if (chatIsMultiUser){ } else if (chatIsMultiUser){