From 1a8c40c02a5cc7a749d6c364b53a2fe97b5c9d8f Mon Sep 17 00:00:00 2001
From: Ehren Kret <ehren@signal.org>
Date: Wed, 28 Apr 2021 10:09:32 -0500
Subject: [PATCH] Patch code to use new Base64

---
 .../auth/CombinedUnidentifiedSenderAccessKeys.java         | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/auth/CombinedUnidentifiedSenderAccessKeys.java b/service/src/main/java/org/whispersystems/textsecuregcm/auth/CombinedUnidentifiedSenderAccessKeys.java
index 9466692b7..f101692bf 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/auth/CombinedUnidentifiedSenderAccessKeys.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/auth/CombinedUnidentifiedSenderAccessKeys.java
@@ -5,22 +5,21 @@
 
 package org.whispersystems.textsecuregcm.auth;
 
-import java.io.IOException;
+import java.util.Base64;
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
-import org.whispersystems.textsecuregcm.util.Base64;
 
 public class CombinedUnidentifiedSenderAccessKeys {
   private final byte[] combinedUnidentifiedSenderAccessKeys;
 
   public CombinedUnidentifiedSenderAccessKeys(String header) {
     try {
-      this.combinedUnidentifiedSenderAccessKeys = Base64.decode(header);
+      this.combinedUnidentifiedSenderAccessKeys = Base64.getDecoder().decode(header);
       if (this.combinedUnidentifiedSenderAccessKeys == null || this.combinedUnidentifiedSenderAccessKeys.length != 16) {
         throw new WebApplicationException("Invalid combined unidentified sender access keys", Status.UNAUTHORIZED);
       }
-    } catch (IOException e) {
+    } catch (IllegalArgumentException e) {
       throw new WebApplicationException(e, Response.Status.UNAUTHORIZED);
     }
   }