From d708a845415ed77883546f778cd97309fe319843 Mon Sep 17 00:00:00 2001 From: Sean Bright Date: Tue, 27 Aug 2024 17:56:10 -0400 Subject: [PATCH] Base64.java: Deprecate our Base64 implementation in favor of Java's. The only code in the library that uses it is Skype-for-Asterisk which I am pretty sure has been dead a long time anyway. --- .../asteriskjava/manager/event/SkypeChatMessageEvent.java | 5 ++--- src/main/java/org/asteriskjava/util/Base64.java | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/asteriskjava/manager/event/SkypeChatMessageEvent.java b/src/main/java/org/asteriskjava/manager/event/SkypeChatMessageEvent.java index a4c597577..913241a1c 100644 --- a/src/main/java/org/asteriskjava/manager/event/SkypeChatMessageEvent.java +++ b/src/main/java/org/asteriskjava/manager/event/SkypeChatMessageEvent.java @@ -16,9 +16,8 @@ */ package org.asteriskjava.manager.event; -import org.asteriskjava.util.Base64; - import java.nio.charset.StandardCharsets; +import java.util.Base64; /** * A SkypeChatMessageEvent is triggered when a Skype Chat message is sent or @@ -107,6 +106,6 @@ public String getDecodedMessage() { if (message == null) { return null; } - return new String(Base64.base64ToByteArray(message), StandardCharsets.UTF_8); + return new String(Base64.getDecoder().decode(message), StandardCharsets.UTF_8); } } diff --git a/src/main/java/org/asteriskjava/util/Base64.java b/src/main/java/org/asteriskjava/util/Base64.java index e819c08d9..c327d7665 100644 --- a/src/main/java/org/asteriskjava/util/Base64.java +++ b/src/main/java/org/asteriskjava/util/Base64.java @@ -12,8 +12,11 @@ * and vice-versa.

* From java.util.prefs. * + * @deprecated Use {@link java.util.Base64} instead. + * * @author Josh Bloch */ +@Deprecated public class Base64 { private Base64() {