nik/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli.git synced 2026-08-12 03:16:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add special handling for file input stream attachments

Browse Source
This commit is contained in:
AsamK 2026-07-29 19:20:22 +02:00
parent 987832099d
commit 304ffb0e33
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java
View File

@ -9,6 +9,7 @@ import org.whispersystems.signalservice.internal.push.http.ResumableUploadSpec;
import javax.imageio.ImageIO;
import java.io.ByteArrayInputStream;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.Optional;
@ -63,9 +64,25 @@ public class AttachmentUtils {
return new ProbedStream(streamDetails.getStream(), 0, 0);
}
final var bytes = streamDetails.getStream().readAllBytes();
final var stream = streamDetails.getStream();
var width = 0;
var height = 0;
if (stream instanceof FileInputStream fis) {
try {
final var image = ImageIO.read(fis);
if (image != null) {
width = image.getWidth();
height = image.getHeight();
}
fis.getChannel().position(0);
} catch (IOException e) {
logger.debug("Failed to probe image dimensions, sending without width/height: {}", e.getMessage());
fis.getChannel().position(0);
}
return new ProbedStream(fis, width, height);
}
final var bytes = stream.readAllBytes();
try {
final var image = ImageIO.read(new ByteArrayInputStream(bytes));
if (image != null) {

2
lib/src/main/java/org/asamk/signal/manager/util/Utils.java
View File

@ -53,7 +53,7 @@ public class Utils {
}
public static StreamDetails createStreamDetailsFromFile(final File file) throws IOException {
final InputStream stream = new FileInputStream(file);
final var stream = new FileInputStream(file);
final var size = file.length();
final var mime = MimeUtils.getFileMimeType(file).orElse(MimeUtils.OCTET_STREAM);
return new StreamDetails(stream, mime, size);