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

Improve logging around message sends.

Browse source
This commit is contained in:
Greyson Parrelli 2021-07-16 12:52:54 -04:00
parent f1a87518e1
commit 4a0e6a3eb2
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java
View file

@ -305,6 +305,8 @@ public class SignalServiceMessageSender {
SignalServiceDataMessage message) SignalServiceDataMessage message)
throws UntrustedIdentityException, IOException throws UntrustedIdentityException, IOException
{ {
Log.d(TAG, "[" + message.getTimestamp() + "] Sending a data message.");
Content content = createMessageContent(message); Content content = createMessageContent(message);
EnvelopeContent envelopeContent = EnvelopeContent.encrypted(content, contentHint, message.getGroupId()); EnvelopeContent envelopeContent = EnvelopeContent.encrypted(content, contentHint, message.getGroupId());
long timestamp = message.getTimestamp(); long timestamp = message.getTimestamp();
@ -395,6 +397,8 @@ public class SignalServiceMessageSender {
SignalServiceDataMessage message) SignalServiceDataMessage message)
throws IOException, UntrustedIdentityException, NoSessionException, InvalidKeyException throws IOException, UntrustedIdentityException, NoSessionException, InvalidKeyException
{ {
Log.d(TAG, "[" + message.getTimestamp() + "] Sending a group data message to " + recipients.size() + " recipients.");
Content content = createMessageContent(message); Content content = createMessageContent(message);
Optional<byte[]> groupId = message.getGroupId(); Optional<byte[]> groupId = message.getGroupId();
List<SendMessageResult> results = sendGroupMessage(distributionId, recipients, unidentifiedAccess, message.getTimestamp(), content, contentHint, groupId.orNull(), false); List<SendMessageResult> results = sendGroupMessage(distributionId, recipients, unidentifiedAccess, message.getTimestamp(), content, contentHint, groupId.orNull(), false);
@ -424,6 +428,8 @@ public class SignalServiceMessageSender {
CancelationSignal cancelationSignal) CancelationSignal cancelationSignal)
throws IOException, UntrustedIdentityException throws IOException, UntrustedIdentityException
{ {
Log.d(TAG, "[" + message.getTimestamp() + "] Sending a data message to " + recipients.size() + " recipients.");
Content content = createMessageContent(message); Content content = createMessageContent(message);
EnvelopeContent envelopeContent = EnvelopeContent.encrypted(content, contentHint, message.getGroupId()); EnvelopeContent envelopeContent = EnvelopeContent.encrypted(content, contentHint, message.getGroupId());
long timestamp = message.getTimestamp(); long timestamp = message.getTimestamp();
@ -1591,6 +1597,10 @@ public class SignalServiceMessageSender {
try { try {
OutgoingPushMessageList messages = getEncryptedMessages(socket, recipient, unidentifiedAccess, timestamp, content, online); OutgoingPushMessageList messages = getEncryptedMessages(socket, recipient, unidentifiedAccess, timestamp, content, online);
if (content.getContent().isPresent() && content.getContent().get().getSyncMessage() != null && content.getContent().get().getSyncMessage().hasSent()) {
Log.d(TAG, "[" + timestamp + "] Sending a sent sync message to devices: " + messages.getDevices());
}
if (cancelationSignal != null && cancelationSignal.isCanceled()) { if (cancelationSignal != null && cancelationSignal.isCanceled()) {
throw new CancelationException(); throw new CancelationException();
} }
@ -1838,7 +1848,6 @@ public class SignalServiceMessageSender {
List<AttachmentPointer> pointers = new LinkedList<>(); List<AttachmentPointer> pointers = new LinkedList<>();
if (!attachments.isPresent() || attachments.get().isEmpty()) { if (!attachments.isPresent() || attachments.get().isEmpty()) {
Log.w(TAG, "No attachments present...");
return pointers; return pointers;
} }