Replace Base64 class from libsignal with java.util.Base64

[signal-cli] / src / main / java / org / asamk / signal / manager / util / ProfileUtils.java

diff --git a/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java b/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java
index 13ce3cb2a0acac5324de5e20d1d8d7d4fa767dd3..b91e864a43471d1e31ae85c7eeb87bcf8f7a7b2d 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java
+++ b/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java
@@ -5,9 +5,8 @@ import org.signal.zkgroup.profiles.ProfileKey;
 import org.whispersystems.signalservice.api.crypto.InvalidCiphertextException;
 import org.whispersystems.signalservice.api.crypto.ProfileCipher;
 import org.whispersystems.signalservice.api.profiles.SignalServiceProfile;
-import org.whispersystems.util.Base64;
 
-import java.io.IOException;
+import java.util.Base64;
 
 public class ProfileUtils {
 
@@ -20,17 +19,18 @@ public class ProfileUtils {
             try {
                 name = encryptedProfile.getName() == null
                         ? null
-                        : new String(profileCipher.decryptName(Base64.decode(encryptedProfile.getName())));
-            } catch (IOException e) {
+                        : new String(profileCipher.decryptName(Base64.getDecoder().decode(encryptedProfile.getName())));
+            } catch (IllegalArgumentException e) {
                 name = null;
             }
             String unidentifiedAccess;
             try {
                 unidentifiedAccess = encryptedProfile.getUnidentifiedAccess() == null
-                        || !profileCipher.verifyUnidentifiedAccess(Base64.decode(encryptedProfile.getUnidentifiedAccess()))
+                        || !profileCipher.verifyUnidentifiedAccess(Base64.getDecoder()
+                        .decode(encryptedProfile.getUnidentifiedAccess()))
                         ? null
                         : encryptedProfile.getUnidentifiedAccess();
-            } catch (IOException e) {
+            } catch (IllegalArgumentException e) {
                 unidentifiedAccess = null;
             }
             return new SignalProfile(encryptedProfile.getIdentityKey(),