Google code style but with 4 spaces instead of 2

2 files changed, 9 insertions, 5 deletions

diff --git a/src/main/java/gq/malwarefight/nosession/tweaks/initial/InitialTweaker.java b/src/main/java/gq/malwarefight/nosession/tweaks/initial/InitialTweaker.java
index 21b2646..aae8bb6 100644
--- a/src/main/java/gq/malwarefight/nosession/tweaks/initial/InitialTweaker.java
+++ b/src/main/java/gq/malwarefight/nosession/tweaks/initial/InitialTweaker.java
@@ -49,14 +49,14 @@ public class InitialTweaker implements ITweaker {
             }
         }
         if (isRelaunch) {
-            String finalUuid = uuid;
-            if (finalUuid == null) {
+            String finalUUID = uuid;
+            if (finalUUID == null) {
                 return; // if we don't have a uuid, quit
             }
             Runtime.getRuntime().addShutdownHook(
                     new Thread(() -> {
                         try {
-                            Socket socket = Utils.getProperSocket(UUID.fromString(finalUuid));
+                            Socket socket = Utils.getProperSocket(UUID.fromString(Utils.normalizeUUID(finalUUID)));
                             socket.getOutputStream().write("fullquit\n".getBytes(StandardCharsets.UTF_8));
                             socket.close();
                         } catch (Exception e) {
diff --git a/src/main/java/gq/malwarefight/nosession/utils/Utils.java b/src/main/java/gq/malwarefight/nosession/utils/Utils.java
index 7d3c4dd..b34c0aa 100644
--- a/src/main/java/gq/malwarefight/nosession/utils/Utils.java
+++ b/src/main/java/gq/malwarefight/nosession/utils/Utils.java
@@ -91,6 +91,12 @@ public class Utils {
         }
     }
 
+    public static String normalizeUUID(String uuid) {
+        return uuid.replaceFirst(
+                "(\\p{XDigit}{8})(\\p{XDigit}{4})(\\p{XDigit}{4})(\\p{XDigit}{4})(\\p{XDigit}+)", "$1-$2-$3-$4-$5"
+        );
+    }
+
     public static void setStaticValue(Class<?> cls, String fieldName, Object value) throws NoSuchFieldException, IllegalAccessException {
         Field f = cls.getDeclaredField(fieldName);
         f.setAccessible(true);
@@ -169,8 +175,6 @@ public class Utils {
 
     public static void setToken(String token) throws IOException, InvocationTargetException, NoSuchMethodException, IllegalAccessException, URISyntaxException {
         Properties p = getJavaProperties();
-        String cp = getClasspath(p);
-        System.out.println(cp);
         ProcessBuilder processBuilder = new ProcessBuilder(
                 getJavaExe(p), "-cp", getClasspath(p), Main.class.getName()
         );