empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix issue where message sender was impacting bubble color in groups.

Browse source
This commit is contained in:
Alex Hart 2021-05-26 09:28:55 -03:00
parent fb1b46b67e
commit 23e5da4d95
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java
View file

@ -203,7 +203,7 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
} }
private void setQuoteAuthor(@NonNull Recipient author) { private void setQuoteAuthor(@NonNull Recipient author) {
boolean outgoing = messageType == MESSAGE_TYPE_OUTGOING; boolean outgoing = messageType != MESSAGE_TYPE_INCOMING;
authorView.setText(author.isSelf() ? getContext().getString(R.string.QuoteView_you) authorView.setText(author.isSelf() ? getContext().getString(R.string.QuoteView_you)
: author.getDisplayName(getContext())); : author.getDisplayName(getContext()));

3
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
View file

@ -398,7 +398,10 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
@Override @Override
public void onRecipientChanged(@NonNull Recipient modified) { public void onRecipientChanged(@NonNull Recipient modified) {
if (conversationRecipient.getId().equals(modified.getId())) {
setBubbleState(messageRecord, modified, modified.hasWallpaper(), colorizer); setBubbleState(messageRecord, modified, modified.hasWallpaper(), colorizer);
}
if (recipient.getId().equals(modified.getId())) { if (recipient.getId().equals(modified.getId())) {
setContactPhoto(modified); setContactPhoto(modified);
setGroupMessageStatus(messageRecord, modified); setGroupMessageStatus(messageRecord, modified);