From 498dcbbfe87b9779abd2b84b2e182db261275acb Mon Sep 17 00:00:00 2001
From: ravi-signal <99042880+ravi-signal@users.noreply.github.com>
Date: Thu, 4 Apr 2024 10:53:45 -0500
Subject: [PATCH] Make media encrypter stream ordered

Co-authored-by: Chris Eager <79161849+eager-signal@users.noreply.github.com>
---
 .../textsecuregcm/backup/BackupMediaEncrypter.java              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/backup/BackupMediaEncrypter.java b/service/src/main/java/org/whispersystems/textsecuregcm/backup/BackupMediaEncrypter.java
index 38e46d671..a40403213 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/backup/BackupMediaEncrypter.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/backup/BackupMediaEncrypter.java
@@ -46,7 +46,7 @@ public class BackupMediaEncrypter {
           return ByteBuffer.wrap(cipher.getIV());
         }),
         Flux.from(FlowAdapters.toPublisher(sourceBody))
-            .flatMap(buffers -> Flux.fromIterable(buffers))
+            .concatMap(Flux::fromIterable)
             .concatMap(byteBuffer -> {
               final byte[] copy = new byte[byteBuffer.remaining()];
               byteBuffer.get(copy);