From e2d3a43593e466e07bc233977f286bc0450ef986 Mon Sep 17 00:00:00 2001
From: Alan Evans <alan@signal.org>
Date: Tue, 7 Apr 2020 16:42:02 -0300
Subject: [PATCH] Use readBodyBytes for correct exceptions.

---
 .../internal/push/PushServiceSocket.java           | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java
index 70dfe1a661..345ebc9527 100644
--- a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java
+++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java
@@ -828,7 +828,7 @@ public class PushServiceSocket {
       throw new IOException("Missing body!");
     }
 
-    return StorageManifest.parseFrom(response.bytes());
+    return StorageManifest.parseFrom(readBodyBytes(response));
   }
 
   public StorageManifest getStorageManifestIfDifferentVersion(String authToken, long version) throws IOException {
@@ -838,7 +838,7 @@ public class PushServiceSocket {
       throw new IOException("Missing body!");
     }
 
-    return StorageManifest.parseFrom(response.bytes());
+    return StorageManifest.parseFrom(readBodyBytes(response));
   }
 
   public StorageItems readStorageItems(String authToken, ReadOperation operation) throws IOException {
@@ -848,7 +848,7 @@ public class PushServiceSocket {
       throw new IOException("Missing body!");
     }
 
-    return StorageItems.parseFrom(response.bytes());
+    return StorageItems.parseFrom(readBodyBytes(response));
   }
 
   public Optional<StorageManifest> writeStorageContacts(String authToken, WriteOperation writeOperation) throws IOException {
@@ -1733,7 +1733,7 @@ public class PushServiceSocket {
                                                  null);
 
     try {
-      return Group.parseFrom(response.bytes());
+      return Group.parseFrom(readBodyBytes(response));
     } catch (InvalidProtocolBufferException e) {
       throw new IOException("Cannot read protobuf", e);
     }
@@ -1748,7 +1748,7 @@ public class PushServiceSocket {
                                                  null);
 
     try {
-      return AvatarUploadAttributes.parseFrom(response.bytes());
+      return AvatarUploadAttributes.parseFrom(readBodyBytes(response));
     } catch (InvalidProtocolBufferException e) {
       throw new IOException("Cannot read protobuf", e);
     }
@@ -1763,7 +1763,7 @@ public class PushServiceSocket {
                                                protobufRequestBody(groupChange));
 
     try {
-      return GroupChange.parseFrom(response.bytes());
+      return GroupChange.parseFrom(readBodyBytes(response));
     } catch (InvalidProtocolBufferException e) {
       throw new IOException("Cannot read protobuf", e);
     }
@@ -1778,7 +1778,7 @@ public class PushServiceSocket {
                                                null);
 
     try {
-      return GroupChanges.parseFrom(response.bytes());
+      return GroupChanges.parseFrom(readBodyBytes(response));
     } catch (InvalidProtocolBufferException e) {
       throw new IOException("Cannot read protobuf", e);
     }