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

Close input stream from received sync groups and contacts

Browse source 
Fixes #75
This commit is contained in:
AsamK 2017-06-15 19:43:06 +02:00
parent 4377a2179b
commit ef55196806
1 changed files with 47 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -807,9 +807,9 @@ class Manager implements Signal {
if (contact == null) { if (contact == null) {
contact = new ContactInfo(); contact = new ContactInfo();
contact.number = number; contact.number = number;
System.out.println("Add contact " + number + " named " + name); System.err.println("Add contact " + number + " named " + name);
} else { } else {
System.out.println("Updating contact " + number + " name " + contact.name + " -> " + name); System.err.println("Updating contact " + number + " name " + contact.name + " -> " + name);
} }
contact.name = name; contact.name = name;
contactStore.updateContact(contact); contactStore.updateContact(contact);
@ -1113,7 +1113,7 @@ class Manager implements Signal {
try { try {
Files.delete(fileEntry.toPath()); Files.delete(fileEntry.toPath());
} catch (IOException e) { } catch (IOException e) {
System.out.println("Failed to delete cached message file “" + fileEntry + "”: " + e.getMessage()); System.err.println("Failed to delete cached message file “" + fileEntry + "”: " + e.getMessage());
} }
} }
} }
@ -1170,7 +1170,7 @@ class Manager implements Signal {
cacheFile = getMessageCacheFile(envelope.getSource(), now, envelope.getTimestamp()); cacheFile = getMessageCacheFile(envelope.getSource(), now, envelope.getTimestamp());
Files.delete(cacheFile.toPath()); Files.delete(cacheFile.toPath());
} catch (IOException e) { } catch (IOException e) {
System.out.println("Failed to delete cached message file “" + cacheFile + "”: " + e.getMessage()); System.err.println("Failed to delete cached message file “" + cacheFile + "”: " + e.getMessage());
} }
} }
} }
@ -1216,23 +1216,25 @@ class Manager implements Signal {
File tmpFile = null; File tmpFile = null;
try { try {
tmpFile = Util.createTempFile(); tmpFile = Util.createTempFile();
DeviceGroupsInputStream s = new DeviceGroupsInputStream(retrieveAttachmentAsStream(syncMessage.getGroups().get().asPointer(), tmpFile)); try (InputStream attachmentAsStream = retrieveAttachmentAsStream(syncMessage.getGroups().get().asPointer(), tmpFile)) {
DeviceGroup g; DeviceGroupsInputStream s = new DeviceGroupsInputStream(attachmentAsStream);
while ((g = s.read()) != null) { DeviceGroup g;
GroupInfo syncGroup = groupStore.getGroup(g.getId()); while ((g = s.read()) != null) {
if (syncGroup == null) { GroupInfo syncGroup = groupStore.getGroup(g.getId());
syncGroup = new GroupInfo(g.getId()); if (syncGroup == null) {
} syncGroup = new GroupInfo(g.getId());
if (g.getName().isPresent()) { }
syncGroup.name = g.getName().get(); if (g.getName().isPresent()) {
} syncGroup.name = g.getName().get();
syncGroup.members.addAll(g.getMembers()); }
syncGroup.active = g.isActive(); syncGroup.members.addAll(g.getMembers());
syncGroup.active = g.isActive();
if (g.getAvatar().isPresent()) { if (g.getAvatar().isPresent()) {
retrieveGroupAvatarAttachment(g.getAvatar().get(), syncGroup.groupId); retrieveGroupAvatarAttachment(g.getAvatar().get(), syncGroup.groupId);
}
groupStore.updateGroup(syncGroup);
} }
groupStore.updateGroup(syncGroup);
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
@ -1241,7 +1243,7 @@ class Manager implements Signal {
try { try {
Files.delete(tmpFile.toPath()); Files.delete(tmpFile.toPath());
} catch (IOException e) { } catch (IOException e) {
System.out.println("Failed to delete temp file “" + tmpFile + "”: " + e.getMessage()); System.err.println("Failed to delete received groups temp file “" + tmpFile + "”: " + e.getMessage());
} }
} }
} }
@ -1254,27 +1256,29 @@ class Manager implements Signal {
try { try {
tmpFile = Util.createTempFile(); tmpFile = Util.createTempFile();
final ContactsMessage contactsMessage = syncMessage.getContacts().get(); final ContactsMessage contactsMessage = syncMessage.getContacts().get();
DeviceContactsInputStream s = new DeviceContactsInputStream(retrieveAttachmentAsStream(contactsMessage.getContactsStream().asPointer(), tmpFile)); try (InputStream attachmentAsStream = retrieveAttachmentAsStream(contactsMessage.getContactsStream().asPointer(), tmpFile)) {
if (contactsMessage.isComplete()) { DeviceContactsInputStream s = new DeviceContactsInputStream(attachmentAsStream);
contactStore.clear(); if (contactsMessage.isComplete()) {
} contactStore.clear();
DeviceContact c;
while ((c = s.read()) != null) {
ContactInfo contact = contactStore.getContact(c.getNumber());
if (contact == null) {
contact = new ContactInfo();
contact.number = c.getNumber();
} }
if (c.getName().isPresent()) { DeviceContact c;
contact.name = c.getName().get(); while ((c = s.read()) != null) {
} ContactInfo contact = contactStore.getContact(c.getNumber());
if (c.getColor().isPresent()) { if (contact == null) {
contact.color = c.getColor().get(); contact = new ContactInfo();
} contact.number = c.getNumber();
contactStore.updateContact(contact); }
if (c.getName().isPresent()) {
contact.name = c.getName().get();
}
if (c.getColor().isPresent()) {
contact.color = c.getColor().get();
}
contactStore.updateContact(contact);
if (c.getAvatar().isPresent()) { if (c.getAvatar().isPresent()) {
retrieveContactAvatarAttachment(c.getAvatar().get(), contact.number); retrieveContactAvatarAttachment(c.getAvatar().get(), contact.number);
}
} }
} }
} catch (Exception e) { } catch (Exception e) {
@ -1284,7 +1288,7 @@ class Manager implements Signal {
try { try {
Files.delete(tmpFile.toPath()); Files.delete(tmpFile.toPath());
} catch (IOException e) { } catch (IOException e) {
System.out.println("Failed to delete temp file “" + tmpFile + "”: " + e.getMessage()); System.err.println("Failed to delete received contacts temp file “" + tmpFile + "”: " + e.getMessage());
} }
} }
} }
@ -1439,7 +1443,7 @@ class Manager implements Signal {
try { try {
Files.delete(tmpFile.toPath()); Files.delete(tmpFile.toPath());
} catch (IOException e) { } catch (IOException e) {
System.out.println("Failed to delete temp file “" + tmpFile + "”: " + e.getMessage()); System.err.println("Failed to delete received attachment temp file “" + tmpFile + "”: " + e.getMessage());
} }
} }
return outputFile; return outputFile;
@ -1493,7 +1497,7 @@ class Manager implements Signal {
try { try {
Files.delete(groupsFile.toPath()); Files.delete(groupsFile.toPath());
} catch (IOException e) { } catch (IOException e) {
System.out.println("Failed to delete temp file “" + groupsFile + "”: " + e.getMessage()); System.err.println("Failed to delete groups temp file “" + groupsFile + "”: " + e.getMessage());
} }
} }
} }
@ -1525,7 +1529,7 @@ class Manager implements Signal {
try { try {
Files.delete(contactsFile.toPath()); Files.delete(contactsFile.toPath());
} catch (IOException e) { } catch (IOException e) {
System.out.println("Failed to delete temp file “" + contactsFile + "”: " + e.getMessage()); System.err.println("Failed to delete contacts temp file “" + contactsFile + "”: " + e.getMessage());
} }
} }
} }