From 49012b93e3121db687f3fef122a8ba16a0db708e Mon Sep 17 00:00:00 2001 From: LoomeL Date: Sun, 1 Mar 2020 17:48:42 +0600 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Launcher/runtime/dialog/overlay/debug/debug.js | 7 ++++++- .../pro/gravit/launcher/client/FunctionalBridge.java | 10 ++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Launcher/runtime/dialog/overlay/debug/debug.js b/Launcher/runtime/dialog/overlay/debug/debug.js index 9a3a1497..edaa0716 100644 --- a/Launcher/runtime/dialog/overlay/debug/debug.js +++ b/Launcher/runtime/dialog/overlay/debug/debug.js @@ -28,7 +28,12 @@ var debug = { return; } - openURL(new java.net.URL(haste)); + try { + openURL(new java.net.URL(haste)); + } catch (e) { + LogHelper.error("Error Open Link"); + LogHelper.error(e); + } var content = new javafx.scene.input.ClipboardContent(); content.putString(haste); diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/FunctionalBridge.java b/Launcher/src/main/java/pro/gravit/launcher/client/FunctionalBridge.java index 8baebbb9..d89654f8 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/FunctionalBridge.java +++ b/Launcher/src/main/java/pro/gravit/launcher/client/FunctionalBridge.java @@ -8,7 +8,6 @@ import java.io.IOException; import java.io.InputStreamReader; -import java.io.OutputStream; import java.io.OutputStreamWriter; import java.net.HttpURLConnection; import java.net.URL; @@ -18,7 +17,9 @@ import com.google.gson.JsonElement; import com.google.gson.JsonParser; +import pro.gravit.launcher.Launcher; import pro.gravit.launcher.LauncherAPI; +import pro.gravit.launcher.LauncherNetworkAPI; import pro.gravit.launcher.api.AuthService; import pro.gravit.launcher.events.request.AuthRequestEvent; import pro.gravit.launcher.guard.LauncherGuardManager; @@ -27,6 +28,7 @@ import pro.gravit.launcher.hwid.HWID; import pro.gravit.launcher.hwid.OshiHWIDProvider; import pro.gravit.launcher.managers.ConsoleManager; +import pro.gravit.launcher.managers.GsonManager; import pro.gravit.launcher.managers.HasherManager; import pro.gravit.launcher.managers.HasherStore; import pro.gravit.launcher.request.Request; @@ -35,9 +37,9 @@ import pro.gravit.utils.HTTPRequest; public class FunctionalBridge { - @LauncherAPI public class HasteResponse { - String key; + @LauncherNetworkAPI + public String key; } @LauncherAPI public static ScheduledExecutorService threadPool = Executors.newScheduledThreadPool(0); @@ -154,7 +156,7 @@ public static String getLauncherVersion() { @LauncherAPI public static String hastebin(String hasteserver, String log) throws IOException { JsonParser parser = new JsonParser(); - Gson gson = new Gson(); + Gson gson = Launcher.gsonManager.gson; URL url = new URL(hasteserver + "documents");