diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java index 4e30534c0f..94b4fdef8a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java @@ -24,6 +24,7 @@ import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; import org.thoughtcrime.securesms.groups.GroupId; import org.thoughtcrime.securesms.jobmanager.Data; import org.thoughtcrime.securesms.jobmanager.Job; +import org.thoughtcrime.securesms.jobmanager.JobLogger; import org.thoughtcrime.securesms.jobmanager.JobManager; import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint; import org.thoughtcrime.securesms.logging.Log; @@ -170,7 +171,9 @@ public class PushGroupSendJob extends PushSendJob { else if (!existingNetworkFailures.isEmpty()) target = Stream.of(existingNetworkFailures).map(nf -> nf.getRecipientId(context)).toList(); else target = getGroupMessageRecipients(groupRecipient.requireGroupId(), messageId); - List results = deliver(message, groupRecipient, target); + List results = deliver(message, groupRecipient, target); + Log.i(TAG, JobLogger.format(this, "Finished send.")); + List networkFailures = Stream.of(results).filter(SendMessageResult::isNetworkFailure).map(result -> new NetworkFailure(Recipient.externalPush(context, result.getAddress()).getId())).toList(); List identityMismatches = Stream.of(results).filter(result -> result.getIdentityFailure() != null).map(result -> new IdentityKeyMismatch(Recipient.externalPush(context, result.getAddress()).getId(), result.getIdentityFailure().getIdentityKey())).toList(); Set successIds = Stream.of(results).filter(result -> result.getSuccess() != null).map(SendMessageResult::getAddress).map(a -> Recipient.externalPush(context, a).getId()).collect(Collectors.toSet()); @@ -301,6 +304,7 @@ public class PushGroupSendJob extends PushSendJob { .asGroupMessage(group) .build(); + Log.i(TAG, JobLogger.format(this, "Beginning update send.")); return messageSender.sendMessage(addresses, unidentifiedAccess, isRecipientUpdate, groupDataMessage); } } else { @@ -321,6 +325,7 @@ public class PushGroupSendJob extends PushSendJob { .withPreviews(previews) .build(); + Log.i(TAG, JobLogger.format(this, "Beginning message send.")); return messageSender.sendMessage(addresses, unidentifiedAccess, isRecipientUpdate, groupMessage); } } diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java index 995d78ac43..c805b25e8f 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java @@ -1228,25 +1228,25 @@ public class SignalServiceMessageSender { if (pipe.isPresent() && !unidentifiedAccess.isPresent()) { try { - Log.w(TAG, "Transmitting over pipe..."); + Log.i(TAG, "[sendMessage] Transmitting over pipe..."); SendMessageResponse response = pipe.get().send(messages, Optional.absent()); return SendMessageResult.success(recipient, false, response.getNeedsSync() || isMultiDevice.get()); } catch (IOException e) { Log.w(TAG, e); - Log.w(TAG, "Falling back to new connection..."); + Log.w(TAG, "[sendMessage] Falling back to new connection..."); } } else if (unidentifiedPipe.isPresent() && unidentifiedAccess.isPresent()) { try { - Log.w(TAG, "Transmitting over unidentified pipe..."); + Log.i(TAG, "[sendMessage] Transmitting over unidentified pipe..."); SendMessageResponse response = unidentifiedPipe.get().send(messages, unidentifiedAccess); return SendMessageResult.success(recipient, true, response.getNeedsSync() || isMultiDevice.get()); } catch (IOException e) { Log.w(TAG, e); - Log.w(TAG, "Falling back to new connection..."); + Log.w(TAG, "[sendMessage] Falling back to new connection..."); } } - Log.w(TAG, "Not transmitting over pipe..."); + Log.w(TAG, "[sendMessage] Not transmitting over pipe..."); SendMessageResponse response = socket.sendMessage(messages, unidentifiedAccess); return SendMessageResult.success(recipient, unidentifiedAccess.isPresent(), response.getNeedsSync() || isMultiDevice.get()); @@ -1282,10 +1282,10 @@ public class SignalServiceMessageSender { for (SignalServiceAttachment attachment : attachments.get()) { if (attachment.isStream()) { - Log.w(TAG, "Found attachment, creating pointer..."); + Log.i(TAG, "Found attachment, creating pointer..."); pointers.add(createAttachmentPointer(attachment.asStream())); } else if (attachment.isPointer()) { - Log.w(TAG, "Including existing attachment pointer..."); + Log.i(TAG, "Including existing attachment pointer..."); pointers.add(createAttachmentPointer(attachment.asPointer())); } }