Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-22 20:18:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix failing AttachmentCipherTest for incremental mac.

Browse Source
This commit is contained in:
Clark
2023-07-11 17:48:14 -04:00
committed by Clark Chen
parent 648506fe04
commit 8fc03a67b9
3 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageReceiver.java
View File

@@ -179,11 +179,8 @@ public class SignalServiceMessageReceiver {
byte[] manifestBytes = socket.retrieveStickerManifest(packId); byte[] manifestBytes = socket.retrieveStickerManifest(packId);
InputStream cipherStream = AttachmentCipherInputStream.createForStickerData(manifestBytes, packKey); InputStream cipherStream = AttachmentCipherInputStream.createForStickerData(manifestBytes, packKey);
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
Util.copy(cipherStream, outputStream); StickerProtos.Pack pack = StickerProtos.Pack.parseFrom(Util.readFullyAsBytes(cipherStream));
StickerProtos.Pack pack = StickerProtos.Pack.parseFrom(outputStream.toByteArray());
List<SignalServiceStickerManifest.StickerInfo> stickers = new ArrayList<>(pack.getStickersCount()); List<SignalServiceStickerManifest.StickerInfo> stickers = new ArrayList<>(pack.getStickersCount());
SignalServiceStickerManifest.StickerInfo cover = pack.hasCover() ? new SignalServiceStickerManifest.StickerInfo(pack.getCover().getId(), pack.getCover().getEmoji(), pack.getCover().getContentType()) SignalServiceStickerManifest.StickerInfo cover = pack.hasCover() ? new SignalServiceStickerManifest.StickerInfo(pack.getCover().getId(), pack.getCover().getEmoji(), pack.getCover().getContentType())
: null; : null;

1
libsignal/service/src/main/java/org/whispersystems/signalservice/internal/util/Util.java
View File

@@ -120,7 +120,6 @@ public class Util {
} }
in.close(); in.close();
out.close();
} }
public static void sleep(long millis) { public static void sleep(long millis) {

4
libsignal/service/src/test/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherTest.java
View File

@@ -333,9 +333,7 @@ public final class AttachmentCipherTest {
} }
private static byte[] readInputStreamFully(InputStream inputStream) throws IOException { private static byte[] readInputStreamFully(InputStream inputStream) throws IOException {
ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); return Util.readFullyAsBytes(inputStream);
Util.copy(inputStream, outputStream);
return outputStream.toByteArray();
} }
private static byte[] expandPackKey(byte[] shortKey) { private static byte[] expandPackKey(byte[] shortKey) {