From 520923ba0867b1406e2a8efb9baf8a52978e430b Mon Sep 17 00:00:00 2001 From: yushijinhun Date: Sun, 17 Jun 2018 13:44:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B7=B3=E8=BF=87=E6=9B=B4=E6=96=B0=E6=97=B6?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jackhuang/hmcl/upgrade/UpdateChecker.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/UpdateChecker.java b/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/UpdateChecker.java index 209cd7ab6..8230d01f1 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/UpdateChecker.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/UpdateChecker.java @@ -27,10 +27,11 @@ import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.task.TaskResult; import org.jackhuang.hmcl.ui.construct.MessageBox; import org.jackhuang.hmcl.util.Constants; -import org.jackhuang.hmcl.util.Logging; import org.jackhuang.hmcl.util.NetworkUtils; import org.jackhuang.hmcl.util.VersionNumber; +import static org.jackhuang.hmcl.util.Logging.LOG; + import java.io.IOException; import java.util.Collection; import java.util.Collections; @@ -78,8 +79,10 @@ public final class UpdateChecker { @Override public void execute() throws Exception { - if (isDevelopmentVersion(Launcher.VERSION)) + if (isDevelopmentVersion(Launcher.VERSION)) { + LOG.info("Current version is a development version, skip updating"); return; + } if (value == null) { versionString = http.getResult(); @@ -87,7 +90,7 @@ public final class UpdateChecker { } if (value == null) { - Logging.LOG.warning("Unable to check update..."); + LOG.warning("Unable to check update..."); if (showMessage) MessageBox.show(Launcher.i18n("update.failed")); } else if (base.compareTo(value) < 0) @@ -129,12 +132,13 @@ public final class UpdateChecker { return new TaskResult>() { @Override public void execute() { - if (download_link == null) + if (download_link == null) { try { download_link = Constants.GSON.>fromJson(NetworkUtils.doGet(NetworkUtils.toURL(Launcher.UPDATE_SERVER + "/hmcl/update_link.php")), Map.class); } catch (JsonSyntaxException | IOException e) { - Logging.LOG.log(Level.SEVERE, "Failed to get update link.", e); + LOG.log(Level.SEVERE, "Failed to get update link.", e); } + } setResult(download_link); }