Properly throw UnregisteredUserException in SignalServicePipe.

signalapp · Jun 11, 2020 · 8891b6c · 8891b6c
1 parent 400c592
commit 8891b6c
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/.../service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessagePipe.java b/.../service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessagePipe.java
@@ -25,6 +25,7 @@
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException;
 import org.whispersystems.signalservice.api.push.exceptions.NotFoundException;
+import org.whispersystems.signalservice.api.push.exceptions.UnregisteredUserException;
 import org.whispersystems.signalservice.api.util.CredentialsProvider;
 import org.whispersystems.signalservice.internal.push.AttachmentV2UploadAttributes;
 import org.whispersystems.signalservice.internal.push.AttachmentV3UploadAttributes;
@@ -180,7 +181,9 @@ public Future<SendMessageResponse> send(OutgoingPushMessageList list, Optional<U
     ListenableFuture<WebsocketResponse> response = websocket.sendRequest(requestMessage);
 
     return FutureTransformers.map(response, value -> {
-      if (value.getStatus() < 200 || value.getStatus() >= 300) {
+      if (value.getStatus() == 404) {
+        throw new UnregisteredUserException(list.getDestination(), new NotFoundException("not found"));
+      } else if (value.getStatus() < 200 || value.getStatus() >= 300) {
         throw new IOException("Non-successful response: " + value.getStatus());
       }