Add optional filename support to attachment pointers

// FREEBIE

Author: moxie0

java/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java

@@ -451,6 +451,10 @@ private AttachmentPointer createAttachmentPointer(SignalServiceAttachmentStream
                                                          .setDigest(ByteString.copyFrom(attachmentIdAndDigest.second()))
                                                          .setSize((int)attachment.getLength());
 
+    if (attachment.getFileName().isPresent()) {
+      builder.setFileName(attachment.getFileName().get());
+    }
+
     if (attachment.getPreview().isPresent()) {
       builder.setThumbnail(ByteString.copyFrom(attachment.getPreview().get()));
     }

java/src/main/java/org/whispersystems/signalservice/api/crypto/SignalServiceCipher.java

@@ -170,7 +170,8 @@ private SignalServiceDataMessage createSignalServiceMessage(SignalServiceEnvelop
                                                          envelope.getRelay(),
                                                          pointer.hasSize() ? Optional.of(pointer.getSize()) : Optional.<Integer>absent(),
                                                          pointer.hasThumbnail() ? Optional.of(pointer.getThumbnail().toByteArray()): Optional.<byte[]>absent(),
-                                                         pointer.hasDigest() ? Optional.of(pointer.getDigest().toByteArray()) : Optional.<byte[]>absent()));
+                                                         pointer.hasDigest() ? Optional.of(pointer.getDigest().toByteArray()) : Optional.<byte[]>absent(),
+                                                         pointer.hasFileName() ? Optional.of(pointer.getFileName()) : Optional.<String>absent()));
     }
 
     return new SignalServiceDataMessage(envelope.getTimestamp(), groupInfo, attachments,
@@ -263,7 +264,8 @@ private SignalServiceGroup createGroupInfo(SignalServiceEnvelope envelope, DataM
                                                     pointer.getContentType(),
                                                     pointer.getKey().toByteArray(),
                                                     envelope.getRelay(),
-                                                    pointer.hasDigest() ? Optional.of(pointer.getDigest().toByteArray()) : Optional.<byte[]>absent());
+                                                    pointer.hasDigest() ? Optional.of(pointer.getDigest().toByteArray()) : Optional.<byte[]>absent(),
+                                                    Optional.<String>absent());
       }
 
       return new SignalServiceGroup(type, content.getGroup().getId().toByteArray(), name, members, avatar);

java/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachment.java

@@ -6,6 +6,8 @@
 
 package org.whispersystems.signalservice.api.messages;
 
+import org.whispersystems.libsignal.util.guava.Optional;
+
 import java.io.InputStream;
 
 public abstract class SignalServiceAttachment {
@@ -39,6 +41,7 @@ public static class Builder {
 
     private InputStream      inputStream;
     private String           contentType;
+    private String           fileName;
     private long             length;
     private ProgressListener listener;
 
@@ -59,6 +62,11 @@ public Builder withLength(long length) {
       return this;
     }
 
+    public Builder withFileName(String fileName) {
+      this.fileName = fileName;
+      return this;
+    }
+
     public Builder withListener(ProgressListener listener) {
       this.listener = listener;
       return this;
@@ -69,7 +77,7 @@ public SignalServiceAttachmentStream build() {
       if (contentType == null) throw new IllegalArgumentException("No content type specified!");
       if (length == 0)         throw new IllegalArgumentException("No length specified!");
 
-      return new SignalServiceAttachmentStream(inputStream, contentType, length, listener);
+      return new SignalServiceAttachmentStream(inputStream, contentType, length, Optional.fromNullable(fileName), listener);
     }
   }
 

java/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachmentPointer.java

@@ -24,22 +24,24 @@ public class SignalServiceAttachmentPointer extends SignalServiceAttachment {
   private final Optional<Integer> size;
   private final Optional<byte[]>  preview;
   private final Optional<byte[]>  digest;
+  private final Optional<String>  fileName;
 
-  public SignalServiceAttachmentPointer(long id, String contentType, byte[] key, String relay, Optional<byte[]> digest) {
-    this(id, contentType, key, relay, Optional.<Integer>absent(), Optional.<byte[]>absent(), digest);
+  public SignalServiceAttachmentPointer(long id, String contentType, byte[] key, String relay, Optional<byte[]> digest, Optional<String> fileName) {
+    this(id, contentType, key, relay, Optional.<Integer>absent(), Optional.<byte[]>absent(), digest, fileName);
   }
 
   public SignalServiceAttachmentPointer(long id, String contentType, byte[] key, String relay,
                                         Optional<Integer> size, Optional<byte[]> preview,
-                                        Optional<byte[]> digest)
+                                        Optional<byte[]> digest, Optional<String> fileName)
   {
     super(contentType);
-    this.id      = id;
-    this.key     = key;
-    this.relay   = Optional.fromNullable(relay);
-    this.size    = size;
-    this.preview = preview;
-    this.digest  = digest;
+    this.id       = id;
+    this.key      = key;
+    this.relay    = Optional.fromNullable(relay);
+    this.size     = size;
+    this.preview  = preview;
+    this.digest   = digest;
+    this.fileName = fileName;
   }
 
   public long getId() {
@@ -68,6 +70,10 @@ public Optional<Integer> getSize() {
     return size;
   }
 
+  public Optional<String> getFileName() {
+    return fileName;
+  }
+
   public Optional<byte[]> getPreview() {
     return preview;
   }

java/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachmentStream.java

@@ -17,17 +17,19 @@ public class SignalServiceAttachmentStream extends SignalServiceAttachment {
 
   private final InputStream      inputStream;
   private final long             length;
+  private final Optional<String> fileName;
   private final ProgressListener listener;
   private final Optional<byte[]> preview;
 
-  public SignalServiceAttachmentStream(InputStream inputStream, String contentType, long length, ProgressListener listener) {
-    this(inputStream, contentType, length, Optional.<byte[]>absent(), listener);
+  public SignalServiceAttachmentStream(InputStream inputStream, String contentType, long length, Optional<String> fileName, ProgressListener listener) {
+    this(inputStream, contentType, length, fileName, Optional.<byte[]>absent(), listener);
   }
 
-  public SignalServiceAttachmentStream(InputStream inputStream, String contentType, long length, Optional<byte[]> preview, ProgressListener listener) {
+  public SignalServiceAttachmentStream(InputStream inputStream, String contentType, long length, Optional<String> fileName, Optional<byte[]> preview, ProgressListener listener) {
     super(contentType);
     this.inputStream = inputStream;
     this.length      = length;
+    this.fileName    = fileName;
     this.listener    = listener;
     this.preview     = preview;
   }
@@ -50,6 +52,10 @@ public long getLength() {
     return length;
   }
 
+  public Optional<String> getFileName() {
+    return fileName;
+  }
+
   public ProgressListener getListener() {
     return listener;
   }

java/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsInputStream.java

@@ -36,7 +36,7 @@ public DeviceContact read() throws IOException {
       InputStream avatarStream      = new LimitedInputStream(in, avatarLength);
       String      avatarContentType = details.getAvatar().getContentType();
 
-      avatar = Optional.of(new SignalServiceAttachmentStream(avatarStream, avatarContentType, avatarLength, null));
+      avatar = Optional.of(new SignalServiceAttachmentStream(avatarStream, avatarContentType, avatarLength, Optional.<String>absent(), null));
     }
 
     return new DeviceContact(number, name, avatar, color);

java/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceGroupsInputStream.java

@@ -43,7 +43,7 @@ public DeviceGroup read() throws IOException {
       InputStream avatarStream      = new ChunkedInputStream.LimitedInputStream(in, avatarLength);
       String      avatarContentType = details.getAvatar().getContentType();
 
-      avatar = Optional.of(new SignalServiceAttachmentStream(avatarStream, avatarContentType, avatarLength, null));
+      avatar = Optional.of(new SignalServiceAttachmentStream(avatarStream, avatarContentType, avatarLength, Optional.<String>absent(), null));
     }
 
     return new DeviceGroup(id, name, members, avatar, active);