From f01e9adf002392621e8682c88682599aa525f0f7 Mon Sep 17 00:00:00 2001
From: Dele Olajide <dele@4ng.net>
Date: Wed, 25 Nov 2020 21:25:17 +0000
Subject: [PATCH] update the base64 decoder

---
 plugins/fileupload/pom.xml                               | 9 ++++++++-
 .../spark/plugin/fileupload/ChatRoomDecorator.java       | 7 +++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/plugins/fileupload/pom.xml b/plugins/fileupload/pom.xml
index 6163bcc1e..c77b4fbc4 100644
--- a/plugins/fileupload/pom.xml
+++ b/plugins/fileupload/pom.xml
@@ -10,7 +10,7 @@
     </parent>
 
     <artifactId>fileupload</artifactId>
-    <version>0.1</version>
+    <version>0.0.3</version>
 
     <name>Http File Upload Plugin</name>
     <description>Adds support for Openfire httpfileupload plugin to Spark</description>
@@ -24,4 +24,11 @@
         </contributor>
     </contributors>
 
+    <dependencies>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+    </dependencies>
 </project>
diff --git a/plugins/fileupload/src/main/java/org/jivesoftware/spark/plugin/fileupload/ChatRoomDecorator.java b/plugins/fileupload/src/main/java/org/jivesoftware/spark/plugin/fileupload/ChatRoomDecorator.java
index 6a59e26ac..9652b531c 100644
--- a/plugins/fileupload/src/main/java/org/jivesoftware/spark/plugin/fileupload/ChatRoomDecorator.java
+++ b/plugins/fileupload/src/main/java/org/jivesoftware/spark/plugin/fileupload/ChatRoomDecorator.java
@@ -39,7 +39,7 @@ import org.apache.commons.httpclient.protocol.Protocol;
 import org.jivesoftware.sparkimpl.updater.EasySSLProtocolSocketFactory;
 
 import org.jxmpp.jid.impl.JidCreate;
-import sun.misc.BASE64Decoder;
+import javax.xml.bind.DatatypeConverter;
 
 public class ChatRoomDecorator
 {
@@ -51,9 +51,8 @@ public class ChatRoomDecorator
         this.room = room;
 
         try {
-            BASE64Decoder decoder = new BASE64Decoder();
             String imageString = "iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAAHYYAAB2GAV2iE4EAAAETSURBVDhPtZMxioUwEIbHFdFCEQVB7BSs7EUQvICtp7CRB95DCytP4BW8hIWFF7ARL6CN5ulsYFlffMU+9mvyzwz5k0wSjhzAB3zR8c+8NcjzHHRdhyiKaIbBeQQWTdOQYzLqNE2J7/uor9z2oK5rGMcR4jiGIAjANE2YpolWf7g9AsdxIIoiJEkC27aBIAi08humwePxAFVVUWuaBjzPo2bBNCjLEhRFodF7/u8a933HHkiShPFNr9nXeKb7vieO46A+sSwLxyvMHdi2Deu6QlVVuLLneVAUBa1e+PZ5RZZl4rou7iDLMpp95fYhLcsCbduCYRgQhiHNMkCbC/M8k2EYUB+PiHRdR46mYnzlw+8M8ASnHRlMzJ472gAAAABJRU5ErkJggg==";
-            byte[] imageByte = decoder.decodeBuffer(imageString);
+            byte[] imageByte = DatatypeConverter.parseBase64Binary(imageString);
             ImageIcon fileuploadIcon = new ImageIcon(imageByte);
             fileuploadButton = new RolloverButton(fileuploadIcon);
             fileuploadButton.setToolTipText(GraphicUtils.createToolTip("Http File Upload"));
@@ -137,7 +136,7 @@ public class ChatRoomDecorator
             {
                 Protocol.registerProtocol( "https", new Protocol( "https", new EasySSLProtocolSocketFactory(), port ) );
             }
-            
+
             HttpClient client = new HttpClient();
             RequestEntity entity = new FileRequestEntity(file, "application/binary");
             put.setRequestEntity(entity);