Merge branch 'release/5.6.5'

GravitLauncher · Jul 21, 2024 · b1a5ecd · b1a5ecd
2 parents f88c030 + 68e9aff
commit b1a5ecd
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/KeyAgreementManager.java b/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/KeyAgreementManager.java
@@ -22,16 +22,19 @@ public class KeyAgreementManager {
     public final RSAPublicKey rsaPublicKey;
     public final RSAPrivateKey rsaPrivateKey;
     public final String legacySalt;
+    public final Path keyDirectory;
 
     public KeyAgreementManager(ECPublicKey ecdsaPublicKey, ECPrivateKey ecdsaPrivateKey, RSAPublicKey rsaPublicKey, RSAPrivateKey rsaPrivateKey, String legacySalt) {
         this.ecdsaPublicKey = ecdsaPublicKey;
         this.ecdsaPrivateKey = ecdsaPrivateKey;
         this.rsaPublicKey = rsaPublicKey;
         this.rsaPrivateKey = rsaPrivateKey;
         this.legacySalt = legacySalt;
+        this.keyDirectory = null;
     }
 
     public KeyAgreementManager(Path keyDirectory) throws IOException, InvalidKeySpecException {
+        this.keyDirectory = keyDirectory;
         Path ecdsaPublicKeyPath = keyDirectory.resolve("ecdsa_id.pub"), ecdsaPrivateKeyPath = keyDirectory.resolve("ecdsa_id");
         Logger logger = LogManager.getLogger();
         if (IOHelper.isFile(ecdsaPublicKeyPath) && IOHelper.isFile(ecdsaPrivateKeyPath)) {

diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/base/Downloader.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/Downloader.java
@@ -256,7 +256,7 @@ protected HttpRequest makeHttpRequest(URI baseUri, String filePath) throws URISy
     }
 
     protected ProgressTrackingBodyHandler<Path> makeBodyHandler(Path file, DownloadCallback callback) {
-        return new ProgressTrackingBodyHandler<>(HttpResponse.BodyHandlers.ofFile(file, StandardOpenOption.CREATE, StandardOpenOption.WRITE), callback);
+        return new ProgressTrackingBodyHandler<>(HttpResponse.BodyHandlers.ofFile(file, StandardOpenOption.CREATE, StandardOpenOption.WRITE, StandardOpenOption.TRUNCATE_EXISTING), callback);
     }
 
     public interface DownloadCallback {

diff --git a/LauncherCore/src/main/java/pro/gravit/utils/Version.java b/LauncherCore/src/main/java/pro/gravit/utils/Version.java
@@ -6,7 +6,7 @@ public final class Version implements Comparable<Version> {
 
     public static final int MAJOR = 5;
     public static final int MINOR = 6;
-    public static final int PATCH = 4;
+    public static final int PATCH = 5;
     public static final int BUILD = 1;
     public static final Version.Type RELEASE = Type.STABLE;
     public final int major;

diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ plugins {
     id 'org.openjfx.javafxplugin' version '0.1.0' apply false
 }
 group = 'pro.gravit.launcher'
-version = '5.6.4'
+version = '5.6.5'
 
 apply from: 'props.gradle'
 

diff --git a/modules b/modules