Skip to content

Commit

Permalink
Don't issue errors when group members unregister
Browse files Browse the repository at this point in the history
Fixes #2408
Fixes #4550
Closes #5318

// FREEBIE
  • Loading branch information
haffenloher committed Mar 9, 2016
1 parent 432e229 commit 1b17989
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions src/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,16 @@ public void onSend(MasterSecret masterSecret)
}

database.addFailures(messageId, failures);
database.markAsSentFailed(messageId);
database.markAsPush(messageId);

notifyMediaMessageDeliveryFailed(context, messageId);
if (e.getNetworkExceptions().isEmpty() && e.getUntrustedIdentityExceptions().isEmpty()) {
database.markAsSecure(messageId);
database.markAsSent(messageId);
markAttachmentsUploaded(messageId, message.getAttachments());
} else {
database.markAsSentFailed(messageId);
notifyMediaMessageDeliveryFailed(context, messageId);
}
}
}

Expand Down

0 comments on commit 1b17989

Please sign in to comment.