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 2263f57eef..247d97fb66 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java @@ -232,9 +232,8 @@ public final class PushGroupSendJob extends PushSendJob { if (message.isViewOnce()) { DatabaseFactory.getAttachmentDatabase(context).deleteAttachmentFilesForViewOnceMessage(messageId); } - } else if (!networkFailures.isEmpty()) { - throw new RetryLaterException(); } else if (!identityMismatches.isEmpty()) { + Log.w(TAG, "Failing because there were " + identityMismatches.size() + " identity mismatches."); database.markAsSentFailed(messageId); notifyMediaMessageDeliveryFailed(context, messageId); @@ -243,6 +242,9 @@ public final class PushGroupSendJob extends PushSendJob { .collect(Collectors.toSet()); RetrieveProfileJob.enqueue(mismatchRecipientIds); + } else if (!networkFailures.isEmpty()) { + Log.w(TAG, "Retrying because there were " + networkFailures.size() + " network failures."); + throw new RetryLaterException(); } } catch (UntrustedIdentityException | UndeliverableMessageException e) { warn(TAG, String.valueOf(message.getSentTimeMillis()), e);