From 7f4e96d6196a0de861423abb30377ed54c8c586c Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Tue, 18 Feb 2025 12:13:12 -0500
Subject: [PATCH] Fix GIF attachment flags.

---
 .../api/util/AttachmentPointerUtil.java       | 13 ++++++------
 .../org/whispersystems/util/FlagUtil.java     | 19 -----------------
 .../org/whispersystems/util/FlagUtilTest.kt   | 21 -------------------
 3 files changed, 6 insertions(+), 47 deletions(-)
 delete mode 100644 libsignal-service/src/main/java/org/whispersystems/util/FlagUtil.java
 delete mode 100644 libsignal-service/src/test/java/org/whispersystems/util/FlagUtilTest.kt

diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/AttachmentPointerUtil.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/AttachmentPointerUtil.java
index ae3b1ac194..4ba7d0d3d7 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/AttachmentPointerUtil.java
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/AttachmentPointerUtil.java
@@ -4,7 +4,6 @@ import org.whispersystems.signalservice.api.InvalidMessageStructureException;
 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 final class AttachmentPointerUtil {
                                               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 final class AttachmentPointerUtil {
     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);
diff --git a/libsignal-service/src/main/java/org/whispersystems/util/FlagUtil.java b/libsignal-service/src/main/java/org/whispersystems/util/FlagUtil.java
deleted file mode 100644
index 75af3104f6..0000000000
--- a/libsignal-service/src/main/java/org/whispersystems/util/FlagUtil.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.whispersystems.util;
-
-public final class FlagUtil {
-
-  private FlagUtil() {}
-
-  /**
-   * Left shift 1 by 'flag' - 1 spaces.
-   *
-   * Examples:
-   * 1 -> 0001
-   * 2 -> 0010
-   * 3 -> 0100
-   * 4 -> 1000
-   */
-  public static int toBinaryFlag(int flag) {
-    return 1 << (flag - 1);
-  }
-}
diff --git a/libsignal-service/src/test/java/org/whispersystems/util/FlagUtilTest.kt b/libsignal-service/src/test/java/org/whispersystems/util/FlagUtilTest.kt
deleted file mode 100644
index fb8efb70d4..0000000000
--- a/libsignal-service/src/test/java/org/whispersystems/util/FlagUtilTest.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.whispersystems.util
-
-import org.junit.Assert.assertEquals
-import org.junit.Test
-
-class FlagUtilTest {
-  @Test
-  fun given1_whenIConvertToBinaryFlag_thenIExpect1() {
-    assertEquals(1, FlagUtil.toBinaryFlag(1))
-  }
-
-  @Test
-  fun given2_whenIConvertToBinaryFlag_thenIExpect2() {
-    assertEquals(2, FlagUtil.toBinaryFlag(2))
-  }
-
-  @Test
-  fun given3_whenIConvertToBinaryFlag_thenIExpect4() {
-    assertEquals(4, FlagUtil.toBinaryFlag(3))
-  }
-}