MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't consider empty relays present on receipt delivery.

This commit is contained in:
Moxie Marlinspike 2015-03-09 15:41:50 -07:00
parent de2f0914f0
commit 6ef3845a34
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/org/whispersystems/textsecuregcm/controllers/ReceiptController.java
View File

@ -49,8 +49,11 @@ public class ReceiptController {
throws IOException throws IOException
{ {
try { try {
if (relay.isPresent()) sendRelayedReceipt(source, destination, messageId, relay.get()); if (relay.isPresent() && !relay.get().isEmpty()) {
else sendDirectReceipt(source, destination, messageId); sendRelayedReceipt(source, destination, messageId, relay.get());
} else {
sendDirectReceipt(source, destination, messageId);
}
} catch (NoSuchUserException | NotPushRegisteredException e) { } catch (NoSuchUserException | NotPushRegisteredException e) {
throw new WebApplicationException(Response.Status.NOT_FOUND); throw new WebApplicationException(Response.Status.NOT_FOUND);
} catch (TransientPushFailureException e) { } catch (TransientPushFailureException e) {