import org.whispersystems.signalservice.api.util.InvalidNumberException;
import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
+import org.whispersystems.signalservice.internal.push.SignalServiceUrl;
import java.io.*;
import java.net.URI;
class Manager implements Signal {
private final static String URL = "https://textsecure-service.whispersystems.org";
private final static TrustStore TRUST_STORE = new WhisperTrustStore();
+ private final static SignalServiceUrl[] serviceUrls = new SignalServiceUrl[]{new SignalServiceUrl(URL, TRUST_STORE)};
public final static String PROJECT_NAME = Manager.class.getPackage().getImplementationTitle();
public final static String PROJECT_VERSION = Manager.class.getPackage().getImplementationVersion();
private FileChannel fileChannel;
private FileLock lock;
- private final ObjectMapper jsonProcessot = new ObjectMapper();
+ private final ObjectMapper jsonProcessor = new ObjectMapper();
private String username;
private int deviceId = SignalServiceAddress.DEFAULT_DEVICE_ID;
private String password;
private SignalServiceAccountManager accountManager;
private JsonGroupStore groupStore;
private JsonContactsStore contactStore;
+ private JsonThreadStore threadStore;
public Manager(String username, String settingsPath) {
this.username = username;
this.attachmentsPath = this.settingsPath + "/attachments";
this.avatarsPath = this.settingsPath + "/avatars";
- jsonProcessot.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.NONE); // disable autodetect
- jsonProcessot.enable(SerializationFeature.INDENT_OUTPUT); // for pretty print, you can disable it.
- jsonProcessot.enable(SerializationFeature.WRITE_NULL_MAP_VALUES);
- jsonProcessot.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
- jsonProcessot.disable(JsonParser.Feature.AUTO_CLOSE_SOURCE);
- jsonProcessot.disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET);
+ jsonProcessor.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.NONE); // disable autodetect
+ jsonProcessor.enable(SerializationFeature.INDENT_OUTPUT); // for pretty print, you can disable it.
+ jsonProcessor.enable(SerializationFeature.WRITE_NULL_MAP_VALUES);
+ jsonProcessor.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+ jsonProcessor.disable(JsonParser.Feature.AUTO_CLOSE_SOURCE);
+ jsonProcessor.disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET);
}
public String getUsername() {
}
}
- public void load() throws IOException, InvalidKeyException {
+ public void init() throws IOException {
+ load();
+
+ migrateLegacyConfigs();
+
+ accountManager = new SignalServiceAccountManager(serviceUrls, username, password, deviceId, USER_AGENT);
+ try {
+ if (registered && accountManager.getPreKeysCount() < PREKEY_MINIMUM_COUNT) {
+ refreshPreKeys();
+ save();
+ }
+ } catch (AuthorizationFailedException e) {
+ System.err.println("Authorization failed, was the number registered elsewhere?");
+ }
+ }
+
+ private void load() throws IOException {
openFileChannel();
- JsonNode rootNode = jsonProcessot.readTree(Channels.newInputStream(fileChannel));
+ JsonNode rootNode = jsonProcessor.readTree(Channels.newInputStream(fileChannel));
JsonNode node = rootNode.get("deviceId");
if (node != null) {
} else {
nextSignedPreKeyId = 0;
}
- signalProtocolStore = jsonProcessot.convertValue(getNotNullNode(rootNode, "axolotlStore"), JsonSignalProtocolStore.class);
+ signalProtocolStore = jsonProcessor.convertValue(getNotNullNode(rootNode, "axolotlStore"), JsonSignalProtocolStore.class);
registered = getNotNullNode(rootNode, "registered").asBoolean();
JsonNode groupStoreNode = rootNode.get("groupStore");
if (groupStoreNode != null) {
- groupStore = jsonProcessot.convertValue(groupStoreNode, JsonGroupStore.class);
+ groupStore = jsonProcessor.convertValue(groupStoreNode, JsonGroupStore.class);
}
if (groupStore == null) {
groupStore = new JsonGroupStore();
}
+
+ JsonNode contactStoreNode = rootNode.get("contactStore");
+ if (contactStoreNode != null) {
+ contactStore = jsonProcessor.convertValue(contactStoreNode, JsonContactsStore.class);
+ }
+ if (contactStore == null) {
+ contactStore = new JsonContactsStore();
+ }
+ JsonNode threadStoreNode = rootNode.get("threadStore");
+ if (threadStoreNode != null) {
+ threadStore = jsonProcessor.convertValue(threadStoreNode, JsonThreadStore.class);
+ }
+ if (threadStore == null) {
+ threadStore = new JsonThreadStore();
+ }
+ }
+
+ private void migrateLegacyConfigs() {
// Copy group avatars that were previously stored in the attachments folder
// to the new avatar folder
- if (groupStore.groupsWithLegacyAvatarId.size() > 0) {
- for (GroupInfo g : groupStore.groupsWithLegacyAvatarId) {
+ if (JsonGroupStore.groupsWithLegacyAvatarId.size() > 0) {
+ for (GroupInfo g : JsonGroupStore.groupsWithLegacyAvatarId) {
File avatarFile = getGroupAvatarFile(g.groupId);
File attachmentFile = getAttachmentFile(g.getAvatarId());
if (!avatarFile.exists() && attachmentFile.exists()) {
}
}
}
- groupStore.groupsWithLegacyAvatarId.clear();
+ JsonGroupStore.groupsWithLegacyAvatarId.clear();
save();
}
-
- JsonNode contactStoreNode = rootNode.get("contactStore");
- if (contactStoreNode != null) {
- contactStore = jsonProcessot.convertValue(contactStoreNode, JsonContactsStore.class);
- }
- if (contactStore == null) {
- contactStore = new JsonContactsStore();
- }
-
- accountManager = new SignalServiceAccountManager(URL, TRUST_STORE, username, password, deviceId, USER_AGENT);
- try {
- if (registered && accountManager.getPreKeysCount() < PREKEY_MINIMUM_COUNT) {
- refreshPreKeys();
- save();
- }
- } catch (AuthorizationFailedException e) {
- System.err.println("Authorization failed, was the number registered elsewhere?");
- }
}
private void save() {
if (username == null) {
return;
}
- ObjectNode rootNode = jsonProcessot.createObjectNode();
+ ObjectNode rootNode = jsonProcessor.createObjectNode();
rootNode.put("username", username)
.put("deviceId", deviceId)
.put("password", password)
.putPOJO("axolotlStore", signalProtocolStore)
.putPOJO("groupStore", groupStore)
.putPOJO("contactStore", contactStore)
+ .putPOJO("threadStore", threadStore)
;
try {
openFileChannel();
fileChannel.position(0);
- jsonProcessot.writeValue(Channels.newOutputStream(fileChannel), rootNode);
+ jsonProcessor.writeValue(Channels.newOutputStream(fileChannel), rootNode);
fileChannel.truncate(fileChannel.position());
fileChannel.force(false);
} catch (Exception e) {
public void register(boolean voiceVerification) throws IOException {
password = Util.getSecret(18);
- accountManager = new SignalServiceAccountManager(URL, TRUST_STORE, username, password, USER_AGENT);
+ accountManager = new SignalServiceAccountManager(serviceUrls, username, password, USER_AGENT);
if (voiceVerification)
accountManager.requestVoiceVerificationCode();
public URI getDeviceLinkUri() throws TimeoutException, IOException {
password = Util.getSecret(18);
- accountManager = new SignalServiceAccountManager(URL, TRUST_STORE, username, password, USER_AGENT);
+ accountManager = new SignalServiceAccountManager(serviceUrls, username, password, USER_AGENT);
String uuid = accountManager.getNewDeviceUuid();
registered = false;
.build();
messageBuilder.asGroupMessage(group);
}
- SignalServiceDataMessage message = messageBuilder.build();
+ ThreadInfo thread = threadStore.getThread(Base64.encodeBytes(groupId));
+ if (thread != null) {
+ messageBuilder.withExpiration(thread.messageExpirationTime);
+ }
final GroupInfo g = getGroupForSending(groupId);
// Don't send group message to ourself
final List<String> membersSend = new ArrayList<>(g.members);
membersSend.remove(this.username);
- sendMessage(message, membersSend);
+ sendMessage(messageBuilder, membersSend);
}
public void sendQuitGroupMessage(byte[] groupId) throws GroupNotFoundException, IOException, EncapsulatedExceptions {
.withId(groupId)
.build();
- SignalServiceDataMessage message = SignalServiceDataMessage.newBuilder()
- .asGroupMessage(group)
- .build();
+ SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder()
+ .asGroupMessage(group);
final GroupInfo g = getGroupForSending(groupId);
g.members.remove(this.username);
groupStore.updateGroup(g);
- sendMessage(message, g.members);
+ sendMessage(messageBuilder, g.members);
}
private static String join(CharSequence separator, Iterable<? extends CharSequence> list) {
}
}
+ if (avatarFile != null) {
+ createPrivateDirectories(avatarsPath);
+ File aFile = getGroupAvatarFile(g.groupId);
+ Files.copy(Paths.get(avatarFile), aFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
+ }
+
+ groupStore.updateGroup(g);
+
+ SignalServiceDataMessage.Builder messageBuilder = getGroupUpdateMessageBuilder(g);
+
+ // Don't send group message to ourself
+ final List<String> membersSend = new ArrayList<>(g.members);
+ membersSend.remove(this.username);
+ sendMessage(messageBuilder, membersSend);
+ return g.groupId;
+ }
+
+ private void sendUpdateGroupMessage(byte[] groupId, String recipient) throws IOException, EncapsulatedExceptions {
+ if (groupId == null) {
+ return;
+ }
+ GroupInfo g = getGroupForSending(groupId);
+
+ if (!g.members.contains(recipient)) {
+ return;
+ }
+
+ SignalServiceDataMessage.Builder messageBuilder = getGroupUpdateMessageBuilder(g);
+
+ // Send group message only to the recipient who requested it
+ final List<String> membersSend = new ArrayList<>();
+ membersSend.add(recipient);
+ sendMessage(messageBuilder, membersSend);
+ }
+
+ private SignalServiceDataMessage.Builder getGroupUpdateMessageBuilder(GroupInfo g) {
SignalServiceGroup.Builder group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.UPDATE)
.withId(g.groupId)
.withName(g.name)
.withMembers(new ArrayList<>(g.members));
File aFile = getGroupAvatarFile(g.groupId);
- if (avatarFile != null) {
- createPrivateDirectories(avatarsPath);
- Files.copy(Paths.get(avatarFile), aFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
- }
if (aFile.exists()) {
try {
group.withAvatar(createAttachment(aFile));
} catch (IOException e) {
- throw new AttachmentInvalidException(avatarFile, e);
+ throw new AttachmentInvalidException(aFile.toString(), e);
}
}
- groupStore.updateGroup(g);
+ return SignalServiceDataMessage.newBuilder()
+ .asGroupMessage(group.build());
+ }
- SignalServiceDataMessage message = SignalServiceDataMessage.newBuilder()
- .asGroupMessage(group.build())
- .build();
+ private void sendGroupInfoRequest(byte[] groupId, String recipient) throws IOException, EncapsulatedExceptions {
+ if (groupId == null) {
+ return;
+ }
- // Don't send group message to ourself
- final List<String> membersSend = new ArrayList<>(g.members);
- membersSend.remove(this.username);
- sendMessage(message, membersSend);
- return g.groupId;
+ SignalServiceGroup.Builder group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.REQUEST_INFO)
+ .withId(groupId);
+
+ SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder()
+ .asGroupMessage(group.build());
+
+ // Send group info request message to the recipient who sent us a message with this groupId
+ final List<String> membersSend = new ArrayList<>();
+ membersSend.add(recipient);
+ sendMessage(messageBuilder, membersSend);
}
@Override
if (attachments != null) {
messageBuilder.withAttachments(getSignalServiceAttachments(attachments));
}
- SignalServiceDataMessage message = messageBuilder.build();
-
- sendMessage(message, recipients);
+ sendMessage(messageBuilder, recipients);
}
@Override
public void sendEndSessionMessage(List<String> recipients) throws IOException, EncapsulatedExceptions {
- SignalServiceDataMessage message = SignalServiceDataMessage.newBuilder()
- .asEndSessionMessage()
- .build();
+ SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder()
+ .asEndSessionMessage();
- sendMessage(message, recipients);
+ sendMessage(messageBuilder, recipients);
}
private void requestSyncGroups() throws IOException {
SignalServiceProtos.SyncMessage.Request r = SignalServiceProtos.SyncMessage.Request.newBuilder().setType(SignalServiceProtos.SyncMessage.Request.Type.GROUPS).build();
SignalServiceSyncMessage message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
try {
- sendMessage(message);
+ sendSyncMessage(message);
} catch (UntrustedIdentityException e) {
e.printStackTrace();
}
SignalServiceProtos.SyncMessage.Request r = SignalServiceProtos.SyncMessage.Request.newBuilder().setType(SignalServiceProtos.SyncMessage.Request.Type.CONTACTS).build();
SignalServiceSyncMessage message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
try {
- sendMessage(message);
+ sendSyncMessage(message);
} catch (UntrustedIdentityException e) {
e.printStackTrace();
}
}
- private void sendMessage(SignalServiceSyncMessage message)
+ private void sendSyncMessage(SignalServiceSyncMessage message)
throws IOException, UntrustedIdentityException {
- SignalServiceMessageSender messageSender = new SignalServiceMessageSender(URL, TRUST_STORE, username, password,
+ SignalServiceMessageSender messageSender = new SignalServiceMessageSender(serviceUrls, username, password,
deviceId, signalProtocolStore, USER_AGENT, Optional.<SignalServiceMessageSender.EventListener>absent());
try {
messageSender.sendMessage(message);
}
}
- private void sendMessage(SignalServiceDataMessage message, Collection<String> recipients)
+ private void sendMessage(SignalServiceDataMessage.Builder messageBuilder, Collection<String> recipients)
throws EncapsulatedExceptions, IOException {
- Set<SignalServiceAddress> recipientsTS = new HashSet<>(recipients.size());
- for (String recipient : recipients) {
- try {
- recipientsTS.add(getPushAddress(recipient));
- } catch (InvalidNumberException e) {
- System.err.println("Failed to add recipient \"" + recipient + "\": " + e.getMessage());
- System.err.println("Aborting sending.");
- save();
- return;
- }
- }
+ Set<SignalServiceAddress> recipientsTS = getSignalServiceAddresses(recipients);
+ if (recipientsTS == null) return;
+ SignalServiceDataMessage message = null;
try {
- SignalServiceMessageSender messageSender = new SignalServiceMessageSender(URL, TRUST_STORE, username, password,
+ SignalServiceMessageSender messageSender = new SignalServiceMessageSender(serviceUrls, username, password,
deviceId, signalProtocolStore, USER_AGENT, Optional.<SignalServiceMessageSender.EventListener>absent());
+ message = messageBuilder.build();
if (message.getGroupInfo().isPresent()) {
try {
messageSender.sendMessage(new ArrayList<>(recipientsTS), message);
List<UnregisteredUserException> unregisteredUsers = new LinkedList<>();
List<NetworkFailureException> networkExceptions = new LinkedList<>();
for (SignalServiceAddress address : recipientsTS) {
+ ThreadInfo thread = threadStore.getThread(address.getNumber());
+ if (thread != null) {
+ messageBuilder.withExpiration(thread.messageExpirationTime);
+ } else {
+ messageBuilder.withExpiration(0);
+ }
+ message = messageBuilder.build();
try {
messageSender.sendMessage(address, message);
} catch (UntrustedIdentityException e) {
}
}
} finally {
- if (message.isEndSession()) {
+ if (message != null && message.isEndSession()) {
for (SignalServiceAddress recipient : recipientsTS) {
handleEndSession(recipient.getNumber());
}
}
}
+ private Set<SignalServiceAddress> getSignalServiceAddresses(Collection<String> recipients) {
+ Set<SignalServiceAddress> recipientsTS = new HashSet<>(recipients.size());
+ for (String recipient : recipients) {
+ try {
+ recipientsTS.add(getPushAddress(recipient));
+ } catch (InvalidNumberException e) {
+ System.err.println("Failed to add recipient \"" + recipient + "\": " + e.getMessage());
+ System.err.println("Aborting sending.");
+ save();
+ return null;
+ }
+ }
+ return recipientsTS;
+ }
+
private SignalServiceContent decryptMessage(SignalServiceEnvelope envelope) throws NoSessionException, LegacyMessageException, InvalidVersionException, InvalidMessageException, DuplicateMessageException, InvalidKeyException, InvalidKeyIdException, org.whispersystems.libsignal.UntrustedIdentityException {
SignalServiceCipher cipher = new SignalServiceCipher(new SignalServiceAddress(username), signalProtocolStore);
try {
void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent decryptedContent, Throwable e);
}
- private void handleSignalServiceDataMessage(SignalServiceDataMessage message, boolean isSync, String source, String destination) {
+ private void handleSignalServiceDataMessage(SignalServiceDataMessage message, boolean isSync, String source, String destination, boolean ignoreAttachments) {
+ String threadId;
if (message.getGroupInfo().isPresent()) {
SignalServiceGroup groupInfo = message.getGroupInfo().get();
+ threadId = Base64.encodeBytes(groupInfo.getGroupId());
+ GroupInfo group = groupStore.getGroup(groupInfo.getGroupId());
switch (groupInfo.getType()) {
case UPDATE:
- GroupInfo group;
- group = groupStore.getGroup(groupInfo.getGroupId());
if (group == null) {
group = new GroupInfo(groupInfo.getGroupId());
}
groupStore.updateGroup(group);
break;
case DELIVER:
+ if (group == null) {
+ try {
+ sendGroupInfoRequest(groupInfo.getGroupId(), source);
+ } catch (IOException | EncapsulatedExceptions e) {
+ e.printStackTrace();
+ }
+ }
break;
case QUIT:
- group = groupStore.getGroup(groupInfo.getGroupId());
- if (group != null) {
+ if (group == null) {
+ try {
+ sendGroupInfoRequest(groupInfo.getGroupId(), source);
+ } catch (IOException | EncapsulatedExceptions e) {
+ e.printStackTrace();
+ }
+ } else {
group.members.remove(source);
groupStore.updateGroup(group);
}
break;
+ case REQUEST_INFO:
+ if (group != null) {
+ try {
+ sendUpdateGroupMessage(groupInfo.getGroupId(), source);
+ } catch (IOException | EncapsulatedExceptions e) {
+ e.printStackTrace();
+ } catch (NotAGroupMemberException e) {
+ // We have left this group, so don't send a group update message
+ }
+ }
+ break;
+ }
+ } else {
+ if (isSync) {
+ threadId = destination;
+ } else {
+ threadId = source;
}
}
if (message.isEndSession()) {
handleEndSession(isSync ? destination : source);
}
- if (message.getAttachments().isPresent()) {
+ if (message.isExpirationUpdate() || message.getBody().isPresent()) {
+ ThreadInfo thread = threadStore.getThread(threadId);
+ if (thread == null) {
+ thread = new ThreadInfo();
+ thread.id = threadId;
+ }
+ if (thread.messageExpirationTime != message.getExpiresInSeconds()) {
+ thread.messageExpirationTime = message.getExpiresInSeconds();
+ threadStore.updateThread(thread);
+ }
+ }
+ if (message.getAttachments().isPresent() && !ignoreAttachments) {
for (SignalServiceAttachment attachment : message.getAttachments().get()) {
if (attachment.isPointer()) {
try {
}
}
- public void retryFailedReceivedMessages(ReceiveMessageHandler handler) {
+ public void retryFailedReceivedMessages(ReceiveMessageHandler handler, boolean ignoreAttachments) {
final File cachePath = new File(getMessageCachePath());
if (!cachePath.exists()) {
return;
continue;
}
- String sender = dir.getName();
for (final File fileEntry : dir.listFiles()) {
if (!fileEntry.isFile()) {
continue;
} catch (Exception e) {
continue;
}
- handleMessage(envelope, content);
+ handleMessage(envelope, content, ignoreAttachments);
}
save();
handler.handleMessage(envelope, content, null);
- fileEntry.delete();
+ try {
+ Files.delete(fileEntry.toPath());
+ } catch (IOException e) {
+ System.out.println("Failed to delete cached message file “" + fileEntry + "”: " + e.getMessage());
+ }
}
}
}
- public void receiveMessages(int timeoutSeconds, boolean returnOnTimeout, ReceiveMessageHandler handler) throws IOException {
- retryFailedReceivedMessages(handler);
- final SignalServiceMessageReceiver messageReceiver = new SignalServiceMessageReceiver(URL, TRUST_STORE, username, password, deviceId, signalingKey, USER_AGENT);
+ public void receiveMessages(long timeout, TimeUnit unit, boolean returnOnTimeout, boolean ignoreAttachments, ReceiveMessageHandler handler) throws IOException {
+ retryFailedReceivedMessages(handler, ignoreAttachments);
+ final SignalServiceMessageReceiver messageReceiver = new SignalServiceMessageReceiver(serviceUrls, username, password, deviceId, signalingKey, USER_AGENT);
SignalServiceMessagePipe messagePipe = null;
try {
Exception exception = null;
final long now = new Date().getTime();
try {
- envelope = messagePipe.read(timeoutSeconds, TimeUnit.SECONDS, new SignalServiceMessagePipe.MessagePipeCallback() {
+ envelope = messagePipe.read(timeout, unit, new SignalServiceMessagePipe.MessagePipeCallback() {
@Override
public void onMessage(SignalServiceEnvelope envelope) {
// store message on disk, before acknowledging receipt to the server
} catch (Exception e) {
exception = e;
}
- handleMessage(envelope, content);
+ handleMessage(envelope, content, ignoreAttachments);
}
save();
handler.handleMessage(envelope, content, exception);
if (exception == null || !(exception instanceof org.whispersystems.libsignal.UntrustedIdentityException)) {
+ File cacheFile = null;
try {
- File cacheFile = getMessageCacheFile(envelope.getSource(), now, envelope.getTimestamp());
- cacheFile.delete();
+ cacheFile = getMessageCacheFile(envelope.getSource(), now, envelope.getTimestamp());
+ Files.delete(cacheFile.toPath());
} catch (IOException e) {
- // Ignoring
- return;
+ System.out.println("Failed to delete cached message file “" + cacheFile + "”: " + e.getMessage());
}
}
}
}
}
- private void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content) {
+ private void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, boolean ignoreAttachments) {
if (content != null) {
if (content.getDataMessage().isPresent()) {
SignalServiceDataMessage message = content.getDataMessage().get();
- handleSignalServiceDataMessage(message, false, envelope.getSource(), username);
+ handleSignalServiceDataMessage(message, false, envelope.getSource(), username, ignoreAttachments);
}
if (content.getSyncMessage().isPresent()) {
SignalServiceSyncMessage syncMessage = content.getSyncMessage().get();
if (syncMessage.getSent().isPresent()) {
SignalServiceDataMessage message = syncMessage.getSent().get().getMessage();
- handleSignalServiceDataMessage(message, true, envelope.getSource(), syncMessage.getSent().get().getDestination().get());
+ handleSignalServiceDataMessage(message, true, envelope.getSource(), syncMessage.getSent().get().getDestination().get(), ignoreAttachments);
}
if (syncMessage.getRequest().isPresent()) {
RequestMessage rm = syncMessage.getRequest().get();
}
}
if (syncMessage.getGroups().isPresent()) {
+ File tmpFile = null;
try {
- DeviceGroupsInputStream s = new DeviceGroupsInputStream(retrieveAttachmentAsStream(syncMessage.getGroups().get().asPointer()));
+ 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());
}
} catch (Exception e) {
e.printStackTrace();
+ } finally {
+ if (tmpFile != null) {
+ try {
+ Files.delete(tmpFile.toPath());
+ } catch (IOException e) {
+ System.out.println("Failed to delete temp file “" + tmpFile + "”: " + e.getMessage());
+ }
+ }
}
if (syncMessage.getBlockedList().isPresent()) {
// TODO store list of blocked numbers
}
}
if (syncMessage.getContacts().isPresent()) {
+ File tmpFile = null;
try {
- DeviceContactsInputStream s = new DeviceContactsInputStream(retrieveAttachmentAsStream(syncMessage.getContacts().get().asPointer()));
+ tmpFile = Util.createTempFile();
+ DeviceContactsInputStream s = new DeviceContactsInputStream(retrieveAttachmentAsStream(syncMessage.getContacts().get().asPointer(), tmpFile));
DeviceContact c;
while ((c = s.read()) != null) {
- ContactInfo contact = new ContactInfo();
- contact.number = c.getNumber();
+ 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();
}
}
} catch (Exception e) {
e.printStackTrace();
+ } finally {
+ if (tmpFile != null) {
+ try {
+ Files.delete(tmpFile.toPath());
+ } catch (IOException e) {
+ System.out.println("Failed to delete temp file “" + tmpFile + "”: " + e.getMessage());
+ }
+ }
}
}
}
private void storeEnvelope(SignalServiceEnvelope envelope, File file) throws IOException {
try (FileOutputStream f = new FileOutputStream(file)) {
- DataOutputStream out = new DataOutputStream(f);
- out.writeInt(1); // version
- out.writeInt(envelope.getType());
- out.writeUTF(envelope.getSource());
- out.writeInt(envelope.getSourceDevice());
- out.writeUTF(envelope.getRelay());
- out.writeLong(envelope.getTimestamp());
- if (envelope.hasContent()) {
- out.writeInt(envelope.getContent().length);
- out.write(envelope.getContent());
- } else {
- out.writeInt(0);
- }
- if (envelope.hasLegacyMessage()) {
- out.writeInt(envelope.getLegacyMessage().length);
- out.write(envelope.getLegacyMessage());
- } else {
- out.writeInt(0);
+ try (DataOutputStream out = new DataOutputStream(f)) {
+ out.writeInt(1); // version
+ out.writeInt(envelope.getType());
+ out.writeUTF(envelope.getSource());
+ out.writeInt(envelope.getSourceDevice());
+ out.writeUTF(envelope.getRelay());
+ out.writeLong(envelope.getTimestamp());
+ if (envelope.hasContent()) {
+ out.writeInt(envelope.getContent().length);
+ out.write(envelope.getContent());
+ } else {
+ out.writeInt(0);
+ }
+ if (envelope.hasLegacyMessage()) {
+ out.writeInt(envelope.getLegacyMessage().length);
+ out.write(envelope.getLegacyMessage());
+ } else {
+ out.writeInt(0);
+ }
}
- out.close();
}
}
private File retrieveAttachment(SignalServiceAttachmentStream stream, File outputFile) throws IOException, InvalidMessageException {
InputStream input = stream.getInputStream();
- OutputStream output = null;
- try {
- output = new FileOutputStream(outputFile);
+ try (OutputStream output = new FileOutputStream(outputFile)) {
byte[] buffer = new byte[4096];
int read;
} catch (FileNotFoundException e) {
e.printStackTrace();
return null;
- } finally {
- if (output != null) {
- output.close();
- }
}
return outputFile;
}
private File retrieveAttachment(SignalServiceAttachmentPointer pointer, File outputFile, boolean storePreview) throws IOException, InvalidMessageException {
if (storePreview && pointer.getPreview().isPresent()) {
File previewFile = new File(outputFile + ".preview");
- OutputStream output = null;
- try {
- output = new FileOutputStream(previewFile);
+ try (OutputStream output = new FileOutputStream(previewFile)) {
byte[] preview = pointer.getPreview().get();
output.write(preview, 0, preview.length);
} catch (FileNotFoundException e) {
e.printStackTrace();
return null;
- } finally {
- if (output != null) {
- output.close();
- }
}
}
- final SignalServiceMessageReceiver messageReceiver = new SignalServiceMessageReceiver(URL, TRUST_STORE, username, password, deviceId, signalingKey, USER_AGENT);
+ final SignalServiceMessageReceiver messageReceiver = new SignalServiceMessageReceiver(serviceUrls, username, password, deviceId, signalingKey, USER_AGENT);
- File tmpFile = File.createTempFile("ts_attach_" + pointer.getId(), ".tmp");
- InputStream input = messageReceiver.retrieveAttachment(pointer, tmpFile);
+ File tmpFile = Util.createTempFile();
+ try (InputStream input = messageReceiver.retrieveAttachment(pointer, tmpFile)) {
+ try (OutputStream output = new FileOutputStream(outputFile)) {
+ byte[] buffer = new byte[4096];
+ int read;
- OutputStream output = null;
- try {
- output = new FileOutputStream(outputFile);
- byte[] buffer = new byte[4096];
- int read;
-
- while ((read = input.read(buffer)) != -1) {
- output.write(buffer, 0, read);
+ while ((read = input.read(buffer)) != -1) {
+ output.write(buffer, 0, read);
+ }
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ return null;
}
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- return null;
} finally {
- if (output != null) {
- output.close();
- }
- if (!tmpFile.delete()) {
- System.err.println("Failed to delete temp file: " + tmpFile);
+ try {
+ Files.delete(tmpFile.toPath());
+ } catch (IOException e) {
+ System.out.println("Failed to delete temp file “" + tmpFile + "”: " + e.getMessage());
}
}
return outputFile;
}
- private InputStream retrieveAttachmentAsStream(SignalServiceAttachmentPointer pointer) throws IOException, InvalidMessageException {
- final SignalServiceMessageReceiver messageReceiver = new SignalServiceMessageReceiver(URL, TRUST_STORE, username, password, deviceId, signalingKey, USER_AGENT);
- File file = File.createTempFile("ts_tmp", "tmp");
- file.deleteOnExit();
-
- return messageReceiver.retrieveAttachment(pointer, file);
+ private InputStream retrieveAttachmentAsStream(SignalServiceAttachmentPointer pointer, File tmpFile) throws IOException, InvalidMessageException {
+ final SignalServiceMessageReceiver messageReceiver = new SignalServiceMessageReceiver(serviceUrls, username, password, deviceId, signalingKey, USER_AGENT);
+ return messageReceiver.retrieveAttachment(pointer, tmpFile);
}
private String canonicalizeNumber(String number) throws InvalidNumberException {
}
private void sendGroups() throws IOException, UntrustedIdentityException {
- File groupsFile = File.createTempFile("multidevice-group-update", ".tmp");
+ File groupsFile = Util.createTempFile();
try {
- DeviceGroupsOutputStream out = new DeviceGroupsOutputStream(new FileOutputStream(groupsFile));
- try {
+ try (OutputStream fos = new FileOutputStream(groupsFile)) {
+ DeviceGroupsOutputStream out = new DeviceGroupsOutputStream(fos);
for (GroupInfo record : groupStore.getGroups()) {
out.write(new DeviceGroup(record.groupId, Optional.fromNullable(record.name),
new ArrayList<>(record.members), createGroupAvatarAttachment(record.groupId),
record.active));
}
- } finally {
- out.close();
}
if (groupsFile.exists() && groupsFile.length() > 0) {
- FileInputStream contactsFileStream = new FileInputStream(groupsFile);
- SignalServiceAttachmentStream attachmentStream = SignalServiceAttachment.newStreamBuilder()
- .withStream(contactsFileStream)
- .withContentType("application/octet-stream")
- .withLength(groupsFile.length())
- .build();
-
- sendMessage(SignalServiceSyncMessage.forGroups(attachmentStream));
+ try (FileInputStream groupsFileStream = new FileInputStream(groupsFile)) {
+ SignalServiceAttachmentStream attachmentStream = SignalServiceAttachment.newStreamBuilder()
+ .withStream(groupsFileStream)
+ .withContentType("application/octet-stream")
+ .withLength(groupsFile.length())
+ .build();
+
+ sendSyncMessage(SignalServiceSyncMessage.forGroups(attachmentStream));
+ }
}
} finally {
- groupsFile.delete();
+ try {
+ Files.delete(groupsFile.toPath());
+ } catch (IOException e) {
+ System.out.println("Failed to delete temp file “" + groupsFile + "”: " + e.getMessage());
+ }
}
}
private void sendContacts() throws IOException, UntrustedIdentityException {
- File contactsFile = File.createTempFile("multidevice-contact-update", ".tmp");
+ File contactsFile = Util.createTempFile();
try {
- DeviceContactsOutputStream out = new DeviceContactsOutputStream(new FileOutputStream(contactsFile));
- try {
+ try (OutputStream fos = new FileOutputStream(contactsFile)) {
+ DeviceContactsOutputStream out = new DeviceContactsOutputStream(fos);
for (ContactInfo record : contactStore.getContacts()) {
out.write(new DeviceContact(record.number, Optional.fromNullable(record.name),
createContactAvatarAttachment(record.number), Optional.fromNullable(record.color)));
}
- } finally {
- out.close();
}
if (contactsFile.exists() && contactsFile.length() > 0) {
- FileInputStream contactsFileStream = new FileInputStream(contactsFile);
- SignalServiceAttachmentStream attachmentStream = SignalServiceAttachment.newStreamBuilder()
- .withStream(contactsFileStream)
- .withContentType("application/octet-stream")
- .withLength(contactsFile.length())
- .build();
-
- sendMessage(SignalServiceSyncMessage.forContacts(attachmentStream));
+ try (FileInputStream contactsFileStream = new FileInputStream(contactsFile)) {
+ SignalServiceAttachmentStream attachmentStream = SignalServiceAttachment.newStreamBuilder()
+ .withStream(contactsFileStream)
+ .withContentType("application/octet-stream")
+ .withLength(contactsFile.length())
+ .build();
+
+ sendSyncMessage(SignalServiceSyncMessage.forContacts(attachmentStream));
+ }
}
} finally {
- contactsFile.delete();
+ try {
+ Files.delete(contactsFile.toPath());
+ } catch (IOException e) {
+ System.out.println("Failed to delete temp file “" + contactsFile + "”: " + e.getMessage());
+ }
}
}
git.nmode.ca / signal-cli / blobdiff
