From 09f389b04bc3ef9f23d16c5add17c65cbb1215db Mon Sep 17 00:00:00 2001
From: DaCool <8727384-DaCool@users.noreply.gitlab.com>
Date: Mon, 29 Aug 2022 16:36:12 +0000
Subject: [PATCH] Drop javax.xml.bind:jaxb-api

---
 build.gradle                                |  1 -
 src/main/java/com/sheepit/client/Utils.java | 14 ++++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 6cf5749..9fc6435 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,7 +30,6 @@ dependencies {
 	implementation 'net.java.dev.jna:jna-platform:5.12.1'
 	implementation 'com.github.oshi:oshi-core:6.2.2'
 	implementation 'org.simpleframework:simple-xml:2.7.1'
-	implementation 'javax.xml.bind:jaxb-api:2.3.1'
 	implementation 'com.formdev:flatlaf:2.2' // 2.3+ causes illegal reflective access warning on win + adoptium java 11.0.16
 	implementation 'com.squareup.okhttp3:okhttp:4.10.0'
 	implementation 'com.squareup.okhttp3:okhttp-urlconnection:4.10.0'
diff --git a/src/main/java/com/sheepit/client/Utils.java b/src/main/java/com/sheepit/client/Utils.java
index 1f6b545..507cde4 100644
--- a/src/main/java/com/sheepit/client/Utils.java
+++ b/src/main/java/com/sheepit/client/Utils.java
@@ -26,7 +26,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
-import javax.xml.bind.DatatypeConverter;
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -76,7 +75,7 @@ public class Utils {
 			byte[] buffer = new byte[8192];
 			while (dis.read(buffer) > 0)
 				; // process the entire file
-			String data = DatatypeConverter.printHexBinary(md.digest()).toLowerCase();
+			String data = convertBinaryToHex(md.digest());
 			dis.close();
 			is.close();
 			return data;
@@ -86,6 +85,17 @@ public class Utils {
 		}
 	}
 	
+	public static String convertBinaryToHex(byte[] bytes) {
+		StringBuilder hexStringBuilder = new StringBuilder();
+		for (byte aByte : bytes) {
+			char[] hex = new char[2];
+			hex[0] = Character.forDigit((aByte >> 4) & 0xF, 16);
+			hex[1] = Character.forDigit((aByte & 0xF), 16);
+			hexStringBuilder.append(new String(hex));
+		}
+		return hexStringBuilder.toString();
+	}
+	
 	public static double lastModificationTime(File directory_) {
 		double max = 0.0;
 		if (directory_.isDirectory()) {