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

Fix bug with receiving GV2 message for previously unknown group.

Browse source
This commit is contained in:
Cody Henthorne 2022-04-22 16:07:06 -04:00
parent 1446af97a2
commit 33346d8033
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.java
View file

@ -532,7 +532,8 @@ public final class MessageContentProcessor {
throws IOException, GroupChangeBusyException throws IOException, GroupChangeBusyException
{ {
try { try {
GroupManager.updateGroupFromServer(context, groupV2.getMasterKey(), groupV2.getRevision(), content.getTimestamp(), groupV2.getSignedGroupChange()); long timestamp = groupV2.getSignedGroupChange() != null ? content.getTimestamp() : content.getTimestamp() - 1;
GroupManager.updateGroupFromServer(context, groupV2.getMasterKey(), groupV2.getRevision(), timestamp, groupV2.getSignedGroupChange());
return true; return true;
} catch (GroupNotAMemberException e) { } catch (GroupNotAMemberException e) {
warn(String.valueOf(content.getTimestamp()), "Ignoring message for a group we're not in"); warn(String.valueOf(content.getTimestamp()), "Ignoring message for a group we're not in");

2
app/src/spinner/java/org/thoughtcrime/securesms/database/GV2UpdateTransformer.kt
View file

@ -25,7 +25,7 @@ object GV2UpdateTransformer : ColumnTransformer {
return if (MmsSmsColumns.Types.isGroupV2(type) && MmsSmsColumns.Types.isGroupUpdate(type) && body != null) { return if (MmsSmsColumns.Types.isGroupV2(type) && MmsSmsColumns.Types.isGroupUpdate(type) && body != null) {
val gv2ChangeDescription: UpdateDescription = MessageRecord.getGv2ChangeDescription(ApplicationDependencies.getApplication(), body, null) val gv2ChangeDescription: UpdateDescription = MessageRecord.getGv2ChangeDescription(ApplicationDependencies.getApplication(), body, null)
gv2ChangeDescription.staticSpannable.toString() gv2ChangeDescription.spannable.toString()
} else { } else {
body ?: "" body ?: ""
} }