Fix some bugs

danieldieeins · Aug 11, 2024 · ef26de1 · ef26de1
1 parent 98f8913
commit ef26de1
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 23 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-Zyneon Application ```2024.5 (Protonium)``` [Download latest version](https://github.com/danieldieeins/Zyneon-Application/releases/latest)
+Zyneon Application ```2024.8 (Aurora Borealis)``` [Download latest version](https://github.com/danieldieeins/Zyneon-Application/releases/latest)
 <br>`Contributions are welcome!` [Visit the rewrite branch to contribute](https://github.com/danieldieeins/Zyneon-Application/tree/shervann)
 
 Download the Zyneon Application from https://github.com/danieldieeins/Zyneon-Application/releases and https://nexus.zyneonstudios.com/application only! All other sources are not verified and we assume no liability!

diff --git a/application-main/pom.xml b/application-main/pom.xml
@@ -10,7 +10,7 @@
     </parent>
 
     <artifactId>application-main</artifactId>
-    <version>2024.7.1f</version>
+    <version>2024.8</version>
 
     <properties>
         <maven.compiler.source>21</maven.compiler.source>
@@ -51,7 +51,7 @@
         <dependency>
             <groupId>fr.flowarg</groupId>
             <artifactId>flowupdater</artifactId>
-            <version>LATEST</version>
+            <version>1.8.5</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/application-main/src/main/java/com/zyneonstudios/Main.java b/application-main/src/main/java/com/zyneonstudios/Main.java
@@ -32,9 +32,9 @@ public static void main(String[] args) {
         splash = new ZyneonSplash();
         splash.setVisible(true);
         FileUtil.deleteFolder(new File(getDirectoryPath()+"temp/"));
-        version = "2024.7.1f";
+        version = "2024.8";
         ArrayList<String> arguments = new ArrayList<>();
-        String name = "Transitum";
+        String name = "Aurora Borealis";
         architecture = getArchitecture();
         logger = new ZLogger("ZYNEON");
         String fullVersion = version+" ▪ "+name;

diff --git a/application-main/src/main/java/com/zyneonstudios/application/utils/backend/Connector.java b/application-main/src/main/java/com/zyneonstudios/application/utils/backend/Connector.java
@@ -85,6 +85,7 @@ private void syncSettings(String type) {
 
     public void resolveRequest(String request) {
         //frame.sendNotification("Resolving...","(BackendConnector) resolving "+request+"...","",false);
+        frame.executeJavaScript("checkForWeb();");
         if (request.equals("button.copy.uuid")) {
             StringSelection uuid = new StringSelection(StringUtil.addHyphensToUUID(Application.auth.getAuthInfos().getUuid()));
             Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
@@ -268,30 +269,30 @@ public void resolveRequest(String request) {
                 syncSettings("global");
             }
         } else if (request.contains("sync.instances.list")) {
-            SwingUtilities.invokeLater(() -> {
                 Application.getInstancePath();
                 String filePath = Main.getDirectoryPath() + "libs/zyneon/instances.json";
                 Gson gson = new Gson();
                 try (JsonReader reader = new JsonReader(new FileReader(filePath))) {
                     JsonObject jsonObject = gson.fromJson(reader, JsonObject.class);
                     JsonArray instances = jsonObject.getAsJsonArray("instances");
                     for (JsonElement element : instances) {
-                        JsonObject instance = element.getAsJsonObject();
-                        String png = "assets/zyneon/images/instances/" + instance.get("id").toString().replace("\"", "") + ".png";
-                        if (new File(Application.getURLBase() + png).exists()) {
-                            frame.executeJavaScript("addInstanceToList(" + instance.get("id") + "," + instance.get("name") + ",'" + png + "',true);");
-                        } else if (instance.get("icon") != null) {
-                            png = instance.get("icon").toString().replace("\"", "");
-                            frame.executeJavaScript("addInstanceToList(" + instance.get("id") + "," + instance.get("name") + ",'" + png + "',true);");
-                        } else {
-                            frame.executeJavaScript("addInstanceToList(" + instance.get("id") + "," + instance.get("name") + ",true);");
-                        }
+                        CompletableFuture.runAsync(()->{
+                            JsonObject instance = element.getAsJsonObject();
+                            String png = "assets/zyneon/images/instances/" + instance.get("id").toString().replace("\"", "") + ".png";
+                            if (new File(Application.getURLBase() + png).exists()) {
+                                frame.executeJavaScript("addInstanceToList(" + instance.get("id") + "," + instance.get("name") + ",'" + png + "',true);");
+                            } else if (instance.get("icon") != null) {
+                                png = instance.get("icon").toString().replace("\"", "");
+                                frame.executeJavaScript("addInstanceToList(" + instance.get("id") + "," + instance.get("name") + ",'" + png + "',true);");
+                            } else {
+                                frame.executeJavaScript("addInstanceToList(" + instance.get("id") + "," + instance.get("name") + ",true);");
+                            }
+                        });
                     }
                 } catch (IOException e) {
                     Main.getLogger().error(e.getMessage());
                 }
                 frame.executeJavaScript("loadTab('" + Application.lastInstance + "');");
-            });
         } else if (request.contains("sync.web")) {
             frame.getBrowser().loadURL(Application.getOnlineStartURL());
         } else if (request.contains("sync.start")) {
@@ -349,7 +350,7 @@ public void resolveRequest(String request) {
             SwingUtilities.invokeLater(() -> frame.getInstance().dispatchEvent(new WindowEvent(frame.getInstance(), WindowEvent.WINDOW_CLOSING)));
         } else if (request.contains("button.instance.")) {
             String id = request.replace("button.instance.", "").toLowerCase();
-            SwingUtilities.invokeLater(() -> {
+            CompletableFuture.runAsync(() -> {
                 File file = new File(Application.getInstancePath() + "instances/" + id + "/zyneonInstance.json");
                 if (file.exists()) {
                     ReadableInstance instance = new ReadableInstance(file);
@@ -465,7 +466,7 @@ public void resolveRequest(String request) {
                 resolveRequest("button.refresh.instances");
             }
         } else if (request.contains("sync.search.")) {
-            request = request.replace("sync.search.","");
+            request = request.replace("sync.search.","").replace("%DOT�",".de");
             String[] request_ = request.split("\\.", 7);
             String source = request_[0];
             String type = request_[1];

diff --git a/application-main/src/main/resources/content.zip b/application-main/src/main/resources/content.zip
diff --git a/application-ui/content/assets/zyneon/images/zyneon-bg.png b/application-ui/content/assets/zyneon/images/zyneon-bg.png
diff --git a/application-ui/content/start.html b/application-ui/content/start.html
@@ -96,7 +96,7 @@ <h3 id="notification-actions"><a class="button">Restart</a><a class="button">Dyn
                 <div class="flex">
                     <div>
                         <h1>Zyneon Application</h1>
-                        <h3>2024.7.1 - Transitum</h3>
+                        <h3>2024.8 - Aurora Borealis</h3>
                     </div>
                     <div>
                         <div class="card">

diff --git a/application-ui/content/sub/installing.html b/application-ui/content/sub/installing.html
@@ -11,7 +11,7 @@
     <body>
         <div class="content-rows" id="top">
             <div class="menu" id="main"></div>
-            <div class="content">
+            <div class="content" style="border-top-left-radius: 1.5rem;">
                 <div class="center">
                     <div class="card">
                         <h1>Installing... <i class='bx bx-loader-alt bx-spin bx-rotate-90' ></i></h1>

diff --git a/application-ui/content/sub/login.html b/application-ui/content/sub/login.html
@@ -12,7 +12,7 @@
         <div class="content-rows" id="top">
 
             <div class="menu" id="main"></div>
-            <div class="content">
+            <div class="content" style="border-top-left-radius: 1.5rem;">
                 <div class="center">
                     <div class="card">
                         <h1>Logging in... <i class='bx bx-loader-alt bx-spin bx-rotate-90' ></i></h1>

diff --git a/application-ui/content/sub/updating.html b/application-ui/content/sub/updating.html
@@ -11,7 +11,7 @@
     <body>
         <div class="content-rows" id="top">
             <div class="menu" id="main"></div>
-            <div class="content">
+            <div class="content" style="border-top-left-radius: 1.5rem;">
                 <div class="center">
                     <div class="card">
                         <h1>Updating... <i class='bx bx-loader-alt bx-spin bx-rotate-90' ></i></h1>