fixing version search priority

Idrinth · Apr 24, 2021 · 20d0802 · 20d0802
1 parent 55362bb
commit 20d0802
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>de.idrinth</groupId>
     <artifactId>WARAddonClient</artifactId>
-    <version>1.4.0</version>
+    <version>1.4.1</version>
     <packaging>jar</packaging>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/src/main/java/de/idrinth/waraddonclient/implementation/model/Addon.java b/src/main/java/de/idrinth/waraddonclient/implementation/model/Addon.java
@@ -329,17 +329,18 @@ private boolean processDirectory() {
         /**
          * tries to find and set the default version
          */
-        private void getDownloadVersion() {
+        private boolean getDownloadVersion() {
             java.io.File file = new java.io.File(folder.getPath() + versionFile);
             if (file.exists()) {
                 try {
                     org.w3c.dom.NodeList list = javax.xml.parsers.DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(file).getElementsByTagName("version");
                     installed = list.item(0).getTextContent();
+                    return true;
                 } catch (javax.xml.parsers.ParserConfigurationException | javax.xml.parsers.FactoryConfigurationError | org.xml.sax.SAXException | java.io.IOException exception) {
                     de.idrinth.factory.Logger.build().log(exception, de.idrinth.Logger.levelError);
                 }
             }
-
+            return false;
         }
 
         /**
@@ -349,11 +350,9 @@ public void run() {
             if (folder == null || !folder.exists()) {
                 return;
             }
-            installed = "unknown";
-            if (processDirectory()) {
-                return;
+            if (!getDownloadVersion() && !processDirectory()) {
+                installed = "unknown";
             }
-            getDownloadVersion();
         }
     }
 }
diff --git a/src/main/java/de/idrinth/waraddonclient/implementation/service/Request.java b/src/main/java/de/idrinth/waraddonclient/implementation/service/Request.java
@@ -25,7 +25,7 @@ public class Request {
 
     private org.apache.http.impl.client.CloseableHttpClient client;
 
-    private javax.net.ssl.SSLContext sslContext;
+    private final javax.net.ssl.SSLContext sslContext;
 
     /**
      * Throws an exception if there's issues with the ssl-certificates