import org.asamk.signal.storage.protocol.JsonSignalProtocolStore;
import org.asamk.signal.storage.threads.JsonThreadStore;
import org.asamk.signal.storage.threads.ThreadInfo;
-import org.asamk.signal.util.Base64;
import org.asamk.signal.util.Util;
import org.whispersystems.libsignal.*;
import org.whispersystems.libsignal.ecc.Curve;
import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
import org.whispersystems.signalservice.internal.push.SignalServiceUrl;
+import org.whispersystems.signalservice.internal.util.Base64;
import java.io.*;
import java.net.URI;
private final static int PREKEY_MINIMUM_COUNT = 20;
private static final int PREKEY_BATCH_SIZE = 100;
- private static final int MAX_ATTACHMENT_SIZE = 150 * 1024 * 1024;
+ private static final int MAX_ATTACHMENT_SIZE = 150 * 1024 * 1024;
private final String settingsPath;
private final String dataPath;
if (mime == null) {
mime = "application/octet-stream";
}
- return new SignalServiceAttachmentStream(attachmentStream, mime, attachmentSize, Optional.of(attachmentFile.getName()), null);
+ // TODO mabybe add a parameter to set the voiceNote and preview option
+ return new SignalServiceAttachmentStream(attachmentStream, mime, attachmentSize, Optional.of(attachmentFile.getName()), false, Optional.<byte[]>absent(), null);
}
private Optional<SignalServiceAttachmentStream> createGroupAvatarAttachment(byte[] groupId) throws IOException {
if (contact == null) {
contact = new ContactInfo();
contact.number = number;
- System.out.println("Add contact " + number + " named " + name);
+ System.err.println("Add contact " + number + " named " + name);
} else {
- System.out.println("Updating contact " + number + " name " + contact.name + " -> " + name);
+ System.err.println("Updating contact " + number + " name " + contact.name + " -> " + name);
}
contact.name = name;
contactStore.updateContact(contact);
}
@Override
- public void updateGroup(byte[] groupId, String name, List<String> members, String avatar) throws IOException, EncapsulatedExceptions, GroupNotFoundException, AttachmentInvalidException {
+ public byte[] updateGroup(byte[] groupId, String name, List<String> members, String avatar) throws IOException, EncapsulatedExceptions, GroupNotFoundException, AttachmentInvalidException {
+ if (groupId.length == 0) {
+ groupId = null;
+ }
if (name.isEmpty()) {
name = null;
}
if (avatar.isEmpty()) {
avatar = null;
}
- sendUpdateGroupMessage(groupId, name, members, avatar);
+ return sendUpdateGroupMessage(groupId, name, members, avatar);
}
private void requestSyncGroups() throws IOException {
try {
Files.delete(fileEntry.toPath());
} 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());
}
}
+ // Try to delete directory if empty
+ dir.delete();
}
}
try {
cacheFile = getMessageCacheFile(envelope.getSource(), now, envelope.getTimestamp());
Files.delete(cacheFile.toPath());
+ // Try to delete directory if empty
+ new File(getMessageCachePath()).delete();
} 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());
}
}
}
if (rm.isContactsRequest()) {
try {
sendContacts();
+ sendVerifiedMessage();
} catch (UntrustedIdentityException | IOException e) {
e.printStackTrace();
}
File tmpFile = null;
try {
tmpFile = Util.createTempFile();
- DeviceGroupsInputStream s = new DeviceGroupsInputStream(retrieveAttachmentAsStream(syncMessage.getGroups().get().asPointer(), tmpFile));
- DeviceGroup g;
- while ((g = s.read()) != null) {
- GroupInfo syncGroup = groupStore.getGroup(g.getId());
- if (syncGroup == null) {
- syncGroup = new GroupInfo(g.getId());
- }
- if (g.getName().isPresent()) {
- syncGroup.name = g.getName().get();
- }
- syncGroup.members.addAll(g.getMembers());
- syncGroup.active = g.isActive();
-
- if (g.getAvatar().isPresent()) {
- retrieveGroupAvatarAttachment(g.getAvatar().get(), syncGroup.groupId);
+ try (InputStream attachmentAsStream = retrieveAttachmentAsStream(syncMessage.getGroups().get().asPointer(), tmpFile)) {
+ DeviceGroupsInputStream s = new DeviceGroupsInputStream(attachmentAsStream);
+ DeviceGroup g;
+ while ((g = s.read()) != null) {
+ GroupInfo syncGroup = groupStore.getGroup(g.getId());
+ if (syncGroup == null) {
+ syncGroup = new GroupInfo(g.getId());
+ }
+ if (g.getName().isPresent()) {
+ syncGroup.name = g.getName().get();
+ }
+ syncGroup.members.addAll(g.getMembers());
+ syncGroup.active = g.isActive();
+
+ if (g.getAvatar().isPresent()) {
+ retrieveGroupAvatarAttachment(g.getAvatar().get(), syncGroup.groupId);
+ }
+ groupStore.updateGroup(syncGroup);
}
- groupStore.updateGroup(syncGroup);
}
} catch (Exception e) {
e.printStackTrace();
try {
Files.delete(tmpFile.toPath());
} 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());
}
}
}
File tmpFile = null;
try {
tmpFile = Util.createTempFile();
- DeviceContactsInputStream s = new DeviceContactsInputStream(retrieveAttachmentAsStream(syncMessage.getContacts().get().asPointer(), tmpFile));
- DeviceContact c;
- while ((c = s.read()) != null) {
- ContactInfo contact = contactStore.getContact(c.getNumber());
- if (contact == null) {
- contact = new ContactInfo();
- contact.number = c.getNumber();
+ final ContactsMessage contactsMessage = syncMessage.getContacts().get();
+ try (InputStream attachmentAsStream = retrieveAttachmentAsStream(contactsMessage.getContactsStream().asPointer(), tmpFile)) {
+ DeviceContactsInputStream s = new DeviceContactsInputStream(attachmentAsStream);
+ if (contactsMessage.isComplete()) {
+ contactStore.clear();
}
- 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()) {
- retrieveContactAvatarAttachment(c.getAvatar().get(), contact.number);
+ 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()) {
+ contact.name = c.getName().get();
+ }
+ if (c.getColor().isPresent()) {
+ contact.color = c.getColor().get();
+ }
+ contactStore.updateContact(contact);
+
+ if (c.getAvatar().isPresent()) {
+ retrieveContactAvatarAttachment(c.getAvatar().get(), contact.number);
+ }
}
}
} catch (Exception e) {
try {
Files.delete(tmpFile.toPath());
} 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());
}
}
}
}
+ if (syncMessage.getVerified().isPresent()) {
+ final List<VerifiedMessage> verifiedList = syncMessage.getVerified().get();
+ for (VerifiedMessage v : verifiedList) {
+ signalProtocolStore.saveIdentity(v.getDestination(), v.getIdentityKey(), TrustLevel.fromVerifiedState(v.getVerified()));
+ }
+ }
}
}
}
try {
Files.delete(tmpFile.toPath());
} 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;
try {
Files.delete(groupsFile.toPath());
} 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());
}
}
}
.withLength(contactsFile.length())
.build();
- sendSyncMessage(SignalServiceSyncMessage.forContacts(attachmentStream));
+ sendSyncMessage(SignalServiceSyncMessage.forContacts(new ContactsMessage(attachmentStream, true)));
}
}
} finally {
try {
Files.delete(contactsFile.toPath());
} 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());
+ }
+ }
+ }
+
+ private void sendVerifiedMessage() throws IOException, UntrustedIdentityException {
+ List<VerifiedMessage> verifiedMessages = new LinkedList<>();
+ for (Map.Entry<String, List<JsonIdentityKeyStore.Identity>> x : getIdentities().entrySet()) {
+ final String name = x.getKey();
+ for (JsonIdentityKeyStore.Identity id : x.getValue()) {
+ if (id.getTrustLevel() == TrustLevel.TRUSTED_UNVERIFIED) {
+ continue;
+ }
+ VerifiedMessage verifiedMessage = new VerifiedMessage(name, id.getIdentityKey(), id.getTrustLevel().toVerifiedState());
+ verifiedMessages.add(verifiedMessage);
}
}
+ sendSyncMessage(SignalServiceSyncMessage.forVerified(verifiedMessages));
+ }
+
+ private void sendVerifiedMessage(String destination, IdentityKey identityKey, TrustLevel trustLevel) throws IOException, UntrustedIdentityException {
+ VerifiedMessage verifiedMessage = new VerifiedMessage(destination, identityKey, trustLevel.toVerifiedState());
+ sendSyncMessage(SignalServiceSyncMessage.forVerified(verifiedMessage));
}
public ContactInfo getContact(String number) {
}
signalProtocolStore.saveIdentity(name, id.getIdentityKey(), TrustLevel.TRUSTED_VERIFIED);
+ try {
+ sendVerifiedMessage(name, id.getIdentityKey(), TrustLevel.TRUSTED_VERIFIED);
+ } catch (IOException | UntrustedIdentityException e) {
+ e.printStackTrace();
+ }
save();
return true;
}
}
signalProtocolStore.saveIdentity(name, id.getIdentityKey(), TrustLevel.TRUSTED_VERIFIED);
+ try {
+ sendVerifiedMessage(name, id.getIdentityKey(), TrustLevel.TRUSTED_VERIFIED);
+ } catch (IOException | UntrustedIdentityException e) {
+ e.printStackTrace();
+ }
save();
return true;
}
for (JsonIdentityKeyStore.Identity id : ids) {
if (id.getTrustLevel() == TrustLevel.UNTRUSTED) {
signalProtocolStore.saveIdentity(name, id.getIdentityKey(), TrustLevel.TRUSTED_UNVERIFIED);
+ try {
+ sendVerifiedMessage(name, id.getIdentityKey(), TrustLevel.TRUSTED_UNVERIFIED);
+ } catch (IOException | UntrustedIdentityException e) {
+ e.printStackTrace();
+ }
}
}
save();
git.nmode.ca / signal-cli / blobdiff
