Fix GIF attachment flags.

Author: greyson-signal

libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/AttachmentPointerUtil.java

@@ -4,7 +4,6 @@
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentRemoteId;
 import org.whispersystems.signalservice.internal.push.AttachmentPointer;
-import org.whispersystems.util.FlagUtil;
 
 import java.io.IOException;
 import java.util.Objects;
@@ -30,9 +29,9 @@ public static SignalServiceAttachmentPointer createSignalAttachmentPointer(Attac
                                               pointer.incrementalMac != null ? Optional.of(pointer.incrementalMac.toByteArray()) : Optional.empty(),
                                               pointer.chunkSize != null ? pointer.chunkSize : 0,
                                               pointer.fileName != null ? Optional.of(pointer.fileName) : Optional.empty(),
-                                              ((pointer.flags != null ? pointer.flags : 0) & FlagUtil.toBinaryFlag(AttachmentPointer.Flags.VOICE_MESSAGE.getValue())) != 0,
-                                              ((pointer.flags != null ? pointer.flags : 0) & FlagUtil.toBinaryFlag(AttachmentPointer.Flags.BORDERLESS.getValue())) != 0,
-                                              ((pointer.flags != null ? pointer.flags : 0) & FlagUtil.toBinaryFlag(AttachmentPointer.Flags.GIF.getValue())) != 0,
+                                              ((pointer.flags != null ? pointer.flags : 0) & AttachmentPointer.Flags.VOICE_MESSAGE.getValue()) != 0,
+                                              ((pointer.flags != null ? pointer.flags : 0) & AttachmentPointer.Flags.BORDERLESS.getValue()) != 0,
+                                              ((pointer.flags != null ? pointer.flags : 0) & AttachmentPointer.Flags.GIF.getValue()) != 0,
                                               pointer.caption != null ? Optional.of(pointer.caption) : Optional.empty(),
                                               pointer.blurHash != null ? Optional.of(pointer.blurHash) : Optional.empty(),
                                               pointer.uploadTimestamp != null ? pointer.uploadTimestamp : 0,
@@ -83,15 +82,15 @@ public static AttachmentPointer createAttachmentPointer(SignalServiceAttachmentP
     int flags = 0;
 
     if (attachment.getVoiceNote()) {
-      flags |= FlagUtil.toBinaryFlag(AttachmentPointer.Flags.VOICE_MESSAGE.getValue());
+      flags |= AttachmentPointer.Flags.VOICE_MESSAGE.getValue();
     }
 
     if (attachment.isBorderless()) {
-      flags |= FlagUtil.toBinaryFlag(AttachmentPointer.Flags.BORDERLESS.getValue());
+      flags |= AttachmentPointer.Flags.BORDERLESS.getValue();
     }
 
     if (attachment.isGif()) {
-      flags |= FlagUtil.toBinaryFlag(AttachmentPointer.Flags.GIF.getValue());
+      flags |= AttachmentPointer.Flags.GIF.getValue();
     }
 
     builder.flags(flags);