Skip to content

Remove NowhereBufferedSink #14668

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JesseWeinstein wants to merge 2 commits into
base: main
Choose a base branch
from
+20 −197
Open

Remove NowhereBufferedSink #14668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a04938c
Remove NowhereBufferedSink
JesseWeinstein Mar 16, 2026
67ed716
Use OutputStream.nullOutputStream()
JesseWeinstein Apr 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
190 changes: 0 additions & 190 deletions ...ice/src/main/java/org/whispersystems/signalservice/internal/push/NowhereBufferedSink.java
View file
Open in desktop

This file was deleted.

8 changes: 2 additions & 6 deletions ...rvice/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1031,9 +1031,7 @@ private AttachmentDigest uploadToCdn2(String resumableUrl, InputStream data, Str

if (resumeInfo.contentStart == length) {
Log.w(TAG, "Resume start point == content length");
try (NowhereBufferedSink buffer = new NowhereBufferedSink()) {
file.writeTo(buffer);
}
file.writeToNowhere();
return file.getAttachmentDigest();
}

Expand Down Expand Up @@ -1103,9 +1101,7 @@ private AttachmentDigest uploadToCdn3(String resumableUrl,

if (resumeInfo.contentStart == length) {
Log.w(TAG, "Resume start point == content length");
try (NowhereBufferedSink buffer = new NowhereBufferedSink()) {
file.writeTo(buffer);
}
file.writeToNowhere();
return file.getAttachmentDigest();
} else if (resumeInfo.contentStart != 0) {
Log.w(TAG, "Resuming previous attachment upload");
Expand Down
19 changes: 18 additions & 1 deletion ...src/main/java/org/whispersystems/signalservice/internal/push/http/DigestingRequestBody.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import org.whispersystems.signalservice.internal.crypto.AttachmentDigest
import java.io.ByteArrayOutputStream
import java.io.IOException
import java.io.InputStream
import java.io.OutputStream

/**
* This [RequestBody] encrypts the data written to it before it is sent.
Expand All @@ -40,10 +41,26 @@ class DigestingRequestBody(
return contentType.toMediaTypeOrNull()
}

/**
* nowhereOutputStream allows a programmer to write out data into the void. This has no memory
* implications, as we don't actually store bytes.
*/
private val nowhereOutputStream = OutputStream.nullOutputStream()

@Throws(IOException::class)
fun writeToNowhere() {
writeToImpl(nowhereOutputStream)
}

@Throws(IOException::class)
override fun writeTo(sink: BufferedSink) {
writeToImpl(sink.outputStream())
}

@Throws(IOException::class)
private fun writeToImpl(outputStream: OutputStream) {
val digestStream = ByteArrayOutputStream()
val inner = SkippingOutputStream(contentStart, NonClosingOutputStream(sink.outputStream()))
val inner = SkippingOutputStream(contentStart, NonClosingOutputStream(outputStream))
val isIncremental = incremental && outputStreamFactory is AttachmentCipherOutputStreamFactory
val sizeChoice: ChunkSizeChoice = ChunkSizeChoice.inferChunkSize(contentLength.toInt())
val outputStream: DigestingOutputStream = if (isIncremental) {
Expand Down