mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-04-23 02:56:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

no longer using jdk.incubator.httpclient, because windows app doesn't start with --add-modules arg in cfg file

Browse Source
This commit is contained in:
Sebastian Stenzel
2018-07-12 11:03:35 +02:00
parent d8c8c2380a
commit ffe8887114
3 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/ant-kit/src/main/resources/build.xml
View File

@@ -38,8 +38,6 @@
<fx:property name="cryptomator.keychainPath" value="\${antbuild.cryptomator.keychainPath}"/>
<fx:jvmarg value="-Xss2m"/>
<fx:jvmarg value="-Xmx512m"/>
<fx:jvmarg value="--add-modules"/>
<fx:jvmarg value="jdk.incubator.httpclient"/>
</fx:platform>
<fx:resources>
<fx:fileset dir="antbuild" type="jar" includes="Cryptomator-${project.version}.jar" />

2
main/launcher/src/main/java/org/cryptomator/launcher/Cryptomator.java
View File

@@ -37,6 +37,8 @@ public class Cryptomator {
}
} catch (IOException e) {
LOG.error("Failed to initiate inter-process communication.", e);
} catch (Throwable e) {
LOG.error("Error during startup", e);
}
System.exit(0); // end remaining non-daemon threads.
}

39
main/ui/src/main/java/org/cryptomator/ui/controllers/WelcomeController.java
View File

@@ -11,10 +11,12 @@ package org.cryptomator.ui.controllers;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.net.HttpURLConnection;
import java.net.URI;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.time.Duration;
import java.util.Comparator;
import java.util.Map;
import java.util.Optional;
@@ -36,9 +38,6 @@ import javafx.scene.control.Hyperlink;
import javafx.scene.control.Label;
import javafx.scene.control.ProgressIndicator;
import javafx.scene.layout.VBox;
import jdk.incubator.http.HttpClient;
import jdk.incubator.http.HttpRequest;
import jdk.incubator.http.HttpResponse;
import org.apache.commons.lang3.SystemUtils;
import org.cryptomator.common.settings.Settings;
import org.cryptomator.ui.l10n.Localization;
@@ -132,25 +131,33 @@ public class WelcomeController implements ViewController {
checkForUpdatesIndicator.setVisible(true);
Tasks.create(() -> {
String userAgent = String.format("Cryptomator VersionChecker/%s %s %s (%s)", applicationVersion.orElse("SNAPSHOT"), SystemUtils.OS_NAME, SystemUtils.OS_VERSION, SystemUtils.OS_ARCH);
HttpClient client = HttpClient.newHttpClient();
HttpRequest request = HttpRequest.newBuilder()
.GET()
.uri(new URI("https://api.cryptomator.org/updates/latestVersion.json"))
.header("User-Agent", userAgent)
.timeout(Duration.ofSeconds(5))
.build();
return client.send(request, HttpResponse.BodyHandler.asString(StandardCharsets.UTF_8));
URL url = URI.create("https://api.cryptomator.org/updates/latestVersion.json").toURL();
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.addRequestProperty("User-Agent", userAgent);
conn.connect();
try {
if (conn.getResponseCode() != HttpURLConnection.HTTP_OK) {
return Optional.<byte[]>empty();
}
try (InputStream in = conn.getInputStream(); ByteArrayOutputStream out = new ByteArrayOutputStream()) {
in.transferTo(out);
return Optional.of(out.toByteArray());
}
} finally {
conn.disconnect();
}
}).onSuccess(response -> {
if (response.statusCode() == 200) {
response.ifPresent(bytes -> {
Gson gson = new GsonBuilder().setLenient().create();
Map<String, String> map = gson.fromJson(response.body(), new TypeToken<Map<String, String>>() {
String json = new String(bytes, StandardCharsets.UTF_8);
Map<String, String> map = gson.fromJson(json, new TypeToken<Map<String, String>>() {
}.getType());
if (map != null) {
this.compareVersions(map);
}
}
});
}).onError(Exception.class, e -> {
LOG.error("Error checking for updates", e);
LOG.warn("Error checking for updates", e);
}).andFinally(() -> {
checkForUpdatesStatus.setText("");
checkForUpdatesIndicator.setVisible(false);