From 456a7bc2541c8e4c35ba0b8b27af27789c003275 Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Mon, 6 Jun 2016 14:48:27 +0200 Subject: [PATCH] [TASK] Implemented `-no_validation` --- src/main/java/org/parabot/core/Core.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/parabot/core/Core.java b/src/main/java/org/parabot/core/Core.java index a6a19cd..bf3903b 100644 --- a/src/main/java/org/parabot/core/Core.java +++ b/src/main/java/org/parabot/core/Core.java @@ -35,7 +35,7 @@ public class Core { private static Version currentVersion = Configuration.BOT_VERSION; private static Version latestVersion; - + public static void disableValidation() { Core.validate = false; } @@ -159,6 +159,7 @@ public class Core { String result; if ((result = WebUtil.getContents(String.format(Configuration.COMPARE_CHECKSUM_URL, "client", currentVersion.get()), "checksum=" + URLEncoder.encode(sb.toString(), "UTF-8"))) != null) { JSONObject object = (JSONObject) WebUtil.getJsonParser().parse(result); + System.out.println(object.get("result")); return Boolean.parseBoolean((String) object.get("result")); } } @@ -179,7 +180,6 @@ public class Core { BufferedReader br = WebUtil.getReader(url); try { - latestVersion = null; if (br != null) { JSONObject object = (JSONObject) WebUtil.getJsonParser().parse(br); boolean latest = Boolean.parseBoolean((String) object.get("result")); @@ -240,12 +240,17 @@ public class Core { Core.verbose("Checking for updates..."); validateCache(); - if (validVersion() && checksumValid()) { - Core.verbose("No updates available."); + if (validate) { + if (validVersion() && checksumValid()) { + Core.verbose("No updates available."); + return true; + } else { + Core.verbose("Updates available..."); + return false; + } + }else{ + Core.verbose("Validation disabled"); return true; - } else { - Core.verbose("Updates available..."); - return false; } } } \ No newline at end of file