2006-Scape/Parabot
1
0
Fork 0
mirror of https://github.com/2006-Scape/Parabot.git synced 2026-07-07 16:49:10 +00:00
Code Issues 2 Packages Projects Releases 3 Wiki Activity

[TASK] Implemented -no_validation

Browse Source
This commit is contained in:
JKetelaar
2016-06-06 14:48:27 +02:00
parent 0e59f63cf2
commit 456a7bc254
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/org/parabot/core/Core.java
+11 -6
View File
@@ -159,6 +159,7 @@ public class Core {
String result; String result;
if ((result = WebUtil.getContents(String.format(Configuration.COMPARE_CHECKSUM_URL, "client", currentVersion.get()), "checksum=" + URLEncoder.encode(sb.toString(), "UTF-8"))) != null) { 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); JSONObject object = (JSONObject) WebUtil.getJsonParser().parse(result);
System.out.println(object.get("result"));
return Boolean.parseBoolean((String) object.get("result")); return Boolean.parseBoolean((String) object.get("result"));
} }
} }
@@ -179,7 +180,6 @@ public class Core {
BufferedReader br = WebUtil.getReader(url); BufferedReader br = WebUtil.getReader(url);
try { try {
latestVersion = null;
if (br != null) { if (br != null) {
JSONObject object = (JSONObject) WebUtil.getJsonParser().parse(br); JSONObject object = (JSONObject) WebUtil.getJsonParser().parse(br);
boolean latest = Boolean.parseBoolean((String) object.get("result")); boolean latest = Boolean.parseBoolean((String) object.get("result"));
@@ -240,12 +240,17 @@ public class Core {
Core.verbose("Checking for updates..."); Core.verbose("Checking for updates...");
validateCache(); validateCache();
if (validVersion() && checksumValid()) { if (validate) {
Core.verbose("No updates available."); if (validVersion() && checksumValid()) {
Core.verbose("No updates available.");
return true;
} else {
Core.verbose("Updates available...");
return false;
}
}else{
Core.verbose("Validation disabled");
return true; return true;
} else {
Core.verbose("Updates available...");
return false;
} }
} }
} }