Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 13:08:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not drop 1:1 messages with mentions due to iOS and desktop regression.

Browse Source 
iOS and Desktop both regressed in multi-forwarding by including mentions
in 1:1 forwards instead of replacing them with plain text. Android by
default drops these as invalid messages. Since there are clients in the
wild that do this now, we have to stop dropping them and try to resolve
them per normal mechanisms.
This commit is contained in:
Cody Henthorne
2022-03-09 12:09:46 -05:00
committed by GitHub
parent 366780f6cb
commit 66f93e0d32
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationMessage.java
View File

@@ -52,7 +52,7 @@ public class ConversationMessage {
this.body = null;
}
if (!this.mentions.isEmpty() && this.body != null) {
if (!this.mentions.isEmpty() && this.body != null && this.messageRecord.isGroupV2()) {
MentionAnnotation.setMentionAnnotations(this.body, this.mentions);
}

2
libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceContent.java
View File

@@ -1041,7 +1041,7 @@ public final class SignalServiceContent {
}
if (mentions.size() > 0 && !isGroupV2) {
throw new InvalidMessageStructureException("Mentions received in non-GV2 message");
Log.w(TAG, "Mentions received in non-GV2 message");
}
return mentions;