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

Fix desktop sync with body-less messages.

Browse source
This commit is contained in:
Alan Evans 2020-09-28 11:48:09 -03:00
parent 222ba6ee53
commit caf8bb39d8
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceDataMessage.java
View file

@ -159,7 +159,21 @@ public class SignalServiceDataMessage {
public boolean isGroupV2Update() {
return isGroupV2Message() &&
!body.isPresent();
group.get().getGroupV2().get().hasSignedGroupChange() &&
!hasRenderableContent();
}
/** Contains some user data that affects the conversation */
public boolean hasRenderableContent() {
return attachments.isPresent() ||
body.isPresent() ||
quote.isPresent() ||
contacts.isPresent() ||
previews.isPresent() ||
mentions.isPresent() ||
sticker.isPresent() ||
reaction.isPresent() ||
remoteDelete.isPresent();
}
public int getExpiresInSeconds() {

4
libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceGroupV2.java
View file

@ -55,6 +55,10 @@ public final class SignalServiceGroupV2 {
return signedGroupChange;
}
public boolean hasSignedGroupChange() {
return signedGroupChange != null && signedGroupChange.length > 0;
}
public static Builder newBuilder(GroupMasterKey masterKey) {
return new Builder(masterKey);
}