yetangitu/deltachat
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-android.git synced 2025-10-03 09:49:21 +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:21:14 +00:00 • committed by GitHub
commit dda5efedc4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -1,5 +1,9 @@
# Delta Chat Android Changelog # Delta Chat Android Changelog
## Unreleased
* hide contact email addresses in search results
## v2.8.0 ## v2.8.0
* Profiles focus on recognizing contacts * Profiles focus on recognizing contacts

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

@ -134,6 +134,7 @@ public class ConversationListItem extends RelativeLayout
this.fromView.setText(recipient, state!=DcMsg.DC_STATE_IN_FRESH); this.fromView.setText(recipient, state!=DcMsg.DC_STATE_IN_FRESH);
} }
subjectView.setVisibility(VISIBLE);
this.subjectView.setText(thread.getDisplayBody()); this.subjectView.setText(thread.getDisplayBody());
this.subjectView.setTypeface(state==DcMsg.DC_STATE_IN_FRESH ? BOLD_TYPEFACE : LIGHT_TYPEFACE); 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) 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.setText(getHighlightedSpan(contact.getDisplayName(), highlightSubstring));
fromView.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0); fromView.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
subjectView.setText(getHighlightedSpan(contact.getAddr(), highlightSubstring)); subjectView.setVisibility(GONE);
dateView.setText(""); dateView.setText("");
dateView.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0); dateView.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
archivedBadgeView.setVisibility(GONE); archivedBadgeView.setVisibility(GONE);
@ -201,6 +202,7 @@ public class ConversationListItem extends RelativeLayout
fromView.setText(recipient, true); fromView.setText(recipient, true);
fromView.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0); fromView.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
subjectView.setVisibility(VISIBLE);
subjectView.setText(getHighlightedSpan(messageResult.getSummarytext(512), highlightSubstring)); subjectView.setText(getHighlightedSpan(messageResult.getSummarytext(512), highlightSubstring));
long timestamp = messageResult.getTimestamp(); long timestamp = messageResult.getTimestamp();