From ecdbbed8c1cd0a5aae9d7bae891cdc2dae55a88c Mon Sep 17 00:00:00 2001 From: adbenitez Date: Wed, 30 Jul 2025 23:22:51 +0200 Subject: [PATCH 01/14] improve footer layout --- .../res/layout/conversation_item_footer.xml | 31 ++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/src/main/res/layout/conversation_item_footer.xml b/src/main/res/layout/conversation_item_footer.xml index 291493707..4016775f0 100644 --- a/src/main/res/layout/conversation_item_footer.xml +++ b/src/main/res/layout/conversation_item_footer.xml @@ -1,6 +1,7 @@ + tools:visibility="visible" /> + tools:visibility="visible" /> + tools:visibility="visible" /> + tools:text="30 mins" /> + tools:visibility="gone" /> - + From 8c04c199e68fb9140dc280f3b13015493bacc778 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Wed, 30 Jul 2025 23:30:59 +0200 Subject: [PATCH 02/14] disable editing messages on classic email threads --- .../java/org/thoughtcrime/securesms/ConversationFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java b/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java index 60d93ad5f..c79b83848 100644 --- a/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java +++ b/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java @@ -332,7 +332,7 @@ public class ConversationFragment extends MessageSelectorFragment boolean canReply = canReplyToMsg(messageRecord); menu.findItem(R.id.menu_context_reply).setVisible(chat.canSend() && canReply); boolean canEdit = canEditMsg(messageRecord); - menu.findItem(R.id.menu_context_edit).setVisible(chat.canSend() && canEdit); + menu.findItem(R.id.menu_context_edit).setVisible(chat.isEncrypted() && chat.canSend() && canEdit); boolean showReplyPrivately = chat.isMultiUser() && !messageRecord.isOutgoing() && canReply; 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); From 3a3388ed593c66b3e6aefba078d8e64a49ddab01 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Wed, 30 Jul 2025 23:37:16 +0200 Subject: [PATCH 03/14] disable non-functional disappearing timer option for email threads --- .../java/org/thoughtcrime/securesms/ConversationActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java index 0d1030d2c..681f82a95 100644 --- a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java @@ -442,7 +442,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity 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); } From ffa1c69be292e5c0827b88f4e428dce9b9742c94 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Wed, 30 Jul 2025 23:37:54 +0200 Subject: [PATCH 04/14] improve code efficiency --- .../java/org/thoughtcrime/securesms/ConversationFragment.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java b/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java index c79b83848..dcb88abf2 100644 --- a/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java +++ b/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java @@ -331,8 +331,7 @@ public class ConversationFragment extends MessageSelectorFragment menu.findItem(R.id.menu_context_share).setVisible(messageRecord.hasFile()); boolean canReply = canReplyToMsg(messageRecord); 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() && canEdit); + menu.findItem(R.id.menu_context_edit).setVisible(chat.isEncrypted() && chat.canSend() && canEditMsg(messageRecord)); boolean showReplyPrivately = chat.isMultiUser() && !messageRecord.isOutgoing() && canReply; 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); From 86bd38bdad28cfe34a4b335355b5ee4f163fec70 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Wed, 30 Jul 2025 23:49:36 +0200 Subject: [PATCH 05/14] hide address in search results --- .../java/org/thoughtcrime/securesms/ConversationListItem.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationListItem.java b/src/main/java/org/thoughtcrime/securesms/ConversationListItem.java index dc2fca52b..93449ba41 100644 --- a/src/main/java/org/thoughtcrime/securesms/ConversationListItem.java +++ b/src/main/java/org/thoughtcrime/securesms/ConversationListItem.java @@ -134,6 +134,7 @@ public class ConversationListItem extends RelativeLayout this.fromView.setText(recipient, state!=DcMsg.DC_STATE_IN_FRESH); } + subjectView.setVisibility(VISIBLE); this.subjectView.setText(thread.getDisplayBody()); this.subjectView.setTypeface(state==DcMsg.DC_STATE_IN_FRESH ? BOLD_TYPEFACE : LIGHT_TYPEFACE); this.subjectView.setTextColor(state==DcMsg.DC_STATE_IN_FRESH ? ThemeUtil.getThemedColor(getContext(), R.attr.conversation_list_item_unread_color) @@ -177,7 +178,7 @@ public class ConversationListItem extends RelativeLayout fromView.setText(getHighlightedSpan(contact.getDisplayName(), highlightSubstring)); fromView.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0); - subjectView.setText(getHighlightedSpan(contact.getAddr(), highlightSubstring)); + subjectView.setVisibility(GONE); dateView.setText(""); dateView.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0); archivedBadgeView.setVisibility(GONE); @@ -201,6 +202,7 @@ public class ConversationListItem extends RelativeLayout fromView.setText(recipient, true); fromView.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0); + subjectView.setVisibility(VISIBLE); subjectView.setText(getHighlightedSpan(messageResult.getSummarytext(512), highlightSubstring)); long timestamp = messageResult.getTimestamp(); From 3985f2f4681ff5cd731d94157cff20069438ec99 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Thu, 24 Jul 2025 13:47:59 +0200 Subject: [PATCH 06/14] remove stock strings no longer in use --- .../java/org/thoughtcrime/securesms/connect/DcHelper.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java b/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java index 4eacf46d1..a15d6d05c 100644 --- a/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java +++ b/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java @@ -152,7 +152,6 @@ public class DcHelper { dcContext.setStockTranslation(11, context.getString(R.string.audio)); dcContext.setStockTranslation(12, context.getString(R.string.file)); dcContext.setStockTranslation(23, context.getString(R.string.gif)); - dcContext.setStockTranslation(24, context.getString(R.string.encrypted_message)); dcContext.setStockTranslation(29, context.getString(R.string.systemmsg_cannot_decrypt)); dcContext.setStockTranslation(35, context.getString(R.string.contact_verified)); dcContext.setStockTranslation(40, context.getString(R.string.chat_archived_label)); @@ -235,12 +234,7 @@ public class DcHelper { dcContext.setStockTranslation(121, context.getString(R.string.connectivity_not_connected)); dcContext.setStockTranslation(162, context.getString(R.string.multidevice_qr_subtitle)); dcContext.setStockTranslation(163, context.getString(R.string.multidevice_transfer_done_devicemsg)); - - // The next two strings should only be set if the UI actually shows more info when the user clicks on the - // DC_INFO_PROTECTION_{EN|DIS}ABLED info message dcContext.setStockTranslation(170, context.getString(R.string.chat_protection_enabled_tap_to_learn_more)); - dcContext.setStockTranslation(171, context.getString(R.string.chat_protection_broken_tap_to_learn_more)); - dcContext.setStockTranslation(172, context.getString(R.string.chat_new_group_hint)); dcContext.setStockTranslation(173, context.getString(R.string.member_x_added)); dcContext.setStockTranslation(174, context.getString(R.string.invalid_unencrypted_tap_to_learn_more)); From de13a70c66bac2083438e3cf125e3c24cdfe3010 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Thu, 31 Jul 2025 16:17:15 +0200 Subject: [PATCH 07/14] update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c7542325..69b9a6889 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Delta Chat Android Changelog +## Unreleased + +* hide contact email addresses in search results + ## v2.8.0 * Profiles focus on recognizing contacts From a280407370afe49d9c991c96e3e050b17c5ceda9 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Thu, 31 Jul 2025 16:26:44 +0200 Subject: [PATCH 08/14] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 69b9a6889..f9e4d111d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## Unreleased * hide contact email addresses in search results +* disable non-functional message editing and ephemeral messages timer settings in classic email thread chat ## v2.8.0 From cc64142e7ba73c28d19d03133b80e6c6831a91fc Mon Sep 17 00:00:00 2001 From: adbenitez Date: Thu, 31 Jul 2025 16:47:58 +0200 Subject: [PATCH 09/14] don't enlage email chats avatar placeholder --- CHANGELOG.md | 1 + src/main/java/org/thoughtcrime/securesms/ProfileActivity.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f9e4d111d..854a7d80c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ * 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 diff --git a/src/main/java/org/thoughtcrime/securesms/ProfileActivity.java b/src/main/java/org/thoughtcrime/securesms/ProfileActivity.java index db320e999..30136c6f2 100644 --- a/src/main/java/org/thoughtcrime/securesms/ProfileActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/ProfileActivity.java @@ -329,7 +329,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity File file = new File(profileImagePath); - if (file.exists()) { + if (chatIsEncrypted && file.exists()) { profileImageUri = Uri.fromFile(file); 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( // show edit-button, if the user is allowed to edit the name/avatar MediaPreviewActivity.EDIT_AVATAR_CHAT_ID, - (chatIsMultiUser && chatIsEncrypted && !chatIsInBroadcast && !chatIsMailingList) ? chatId : 0 + (chatIsMultiUser && !chatIsInBroadcast && !chatIsMailingList) ? chatId : 0 ); startActivity(intent); } else if (chatIsMultiUser){ From aa5fcb139ec1a398fe0d3625a21e8d00325579c7 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Thu, 31 Jul 2025 17:00:00 +0200 Subject: [PATCH 10/14] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 854a7d80c..c0d33c8c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ * 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 +* improve message date/status footer layout, also in RTL languages ## v2.8.0 From 3e943483daf67d9b8abdb9775fc37a1dd1ab0c95 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Thu, 31 Jul 2025 21:10:26 +0200 Subject: [PATCH 11/14] update deltachat-core-rust to 'chore(release): prepare for 2.9.0' of 'v2.9.0' --- jni/deltachat-core-rust | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jni/deltachat-core-rust b/jni/deltachat-core-rust index d80b749de..3a1370e17 160000 --- a/jni/deltachat-core-rust +++ b/jni/deltachat-core-rust @@ -1 +1 @@ -Subproject commit d80b749decc9634399f1518136e0984fdc002b9d +Subproject commit 3a1370e1740faf44d998d654e78613bfe911e26d From ef0b8efcfaa2854d96b10487db1d41fa4cc83142 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Thu, 31 Jul 2025 21:13:53 +0200 Subject: [PATCH 12/14] update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c0d33c8c2..2a21b359d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ * disable non-functional message editing and ephemeral messages timer settings in classic email thread chat * don't enlage email chats avatar placeholder * improve message date/status footer layout, also in RTL languages +* display correct text when receiving a "Disapearing messages enabled" system message +* Update to core 2.9.0 ## v2.8.0 From 51cb844e63d5b5e06aac3d7d5acaefddfcf47c4f Mon Sep 17 00:00:00 2001 From: adbenitez Date: Thu, 31 Jul 2025 21:17:09 +0200 Subject: [PATCH 13/14] update strings --- src/main/res/values-uk/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml index 86cd40af7..5d331d889 100644 --- a/src/main/res/values-uk/strings.xml +++ b/src/main/res/values-uk/strings.xml @@ -28,8 +28,8 @@ Долучитися Передолучитися Видалити - Видалить у мене - Видалити в усіх + Видалити для мене + Видалити для всіх Відомості Оновити Емодзі From d40652d3947f4640930d36496c8a130ce3671c11 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Thu, 31 Jul 2025 21:44:18 +0200 Subject: [PATCH 14/14] prepare 2.9.0 --- CHANGELOG.md | 2 +- build.gradle | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a21b359d..26117261c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Delta Chat Android Changelog -## Unreleased +## v2.9.0 * hide contact email addresses in search results * disable non-functional message editing and ephemeral messages timer settings in classic email thread chat diff --git a/build.gradle b/build.gradle index f70e74067..f53905988 100644 --- a/build.gradle +++ b/build.gradle @@ -27,8 +27,8 @@ android { useLibrary 'org.apache.http.legacy' defaultConfig { - versionCode 727 - versionName "2.8.0" + versionCode 728 + versionName "2.9.0" applicationId "com.b44t.messenger" multiDexEnabled true