webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-08-29 18:40:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Send correct expiry value in group and contact syncs

Browse source
This commit is contained in:
Benedikt Constantin Radtke 2018-05-17 22:35:05 +02:00 • committed by AsamK
parent 70c810ff17
commit bebe7bc513
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/org/asamk/signal/Manager.java
View file

@ -1489,9 +1489,10 @@ class Manager implements Signal {
try (OutputStream fos = new FileOutputStream(groupsFile)) { try (OutputStream fos = new FileOutputStream(groupsFile)) {
DeviceGroupsOutputStream out = new DeviceGroupsOutputStream(fos); DeviceGroupsOutputStream out = new DeviceGroupsOutputStream(fos);
for (GroupInfo record : groupStore.getGroups()) { for (GroupInfo record : groupStore.getGroups()) {
ThreadInfo info = threadStore.getThread(Base64.encodeBytes(record.groupId));
out.write(new DeviceGroup(record.groupId, Optional.fromNullable(record.name), out.write(new DeviceGroup(record.groupId, Optional.fromNullable(record.name),
new ArrayList<>(record.members), createGroupAvatarAttachment(record.groupId), new ArrayList<>(record.members), createGroupAvatarAttachment(record.groupId),
record.active, Optional.<Integer>absent())); record.active, Optional.fromNullable(info != null ? info.messageExpirationTime : null)));
} }
} }
@ -1523,6 +1524,7 @@ class Manager implements Signal {
DeviceContactsOutputStream out = new DeviceContactsOutputStream(fos); DeviceContactsOutputStream out = new DeviceContactsOutputStream(fos);
for (ContactInfo record : contactStore.getContacts()) { for (ContactInfo record : contactStore.getContacts()) {
VerifiedMessage verifiedMessage = null; VerifiedMessage verifiedMessage = null;
ThreadInfo info = threadStore.getThread(record.number);
if (getIdentities().containsKey(record.number)) { if (getIdentities().containsKey(record.number)) {
JsonIdentityKeyStore.Identity currentIdentity = null; JsonIdentityKeyStore.Identity currentIdentity = null;
for (JsonIdentityKeyStore.Identity id : getIdentities().get(record.number)) { for (JsonIdentityKeyStore.Identity id : getIdentities().get(record.number)) {
@ -1538,7 +1540,7 @@ class Manager implements Signal {
// TODO include profile key // TODO include profile key
out.write(new DeviceContact(record.number, Optional.fromNullable(record.name), out.write(new DeviceContact(record.number, Optional.fromNullable(record.name),
createContactAvatarAttachment(record.number), Optional.fromNullable(record.color), createContactAvatarAttachment(record.number), Optional.fromNullable(record.color),
Optional.fromNullable(verifiedMessage), Optional.<byte[]>absent(), false, Optional.<Integer>absent())); Optional.fromNullable(verifiedMessage), Optional.<byte[]>absent(), false, Optional.fromNullable(info != null ? info.messageExpirationTime : null)));
} }
} }