Merge pull request #30 from Qup42/master

Code cleanup and additional checks

Author: itsfolf

src/main/java/me/checkium/vhackapi/Utils.java

@@ -40,13 +40,22 @@ public static String readJson(Reader rd) throws IOException {
     public static JSONObject JSONRequest(String format, String data, String php){
     	JSONObject json = null;
     	String jsonText = StringRequest(format, data, php);
-		if (jsonText.length() == 1) {
+		if("".equals(jsonText))
+		{
+			throw new RuntimeException("Old API URL");
+		}
+		else if("8".equals(jsonText))
+		{
+			throw new RuntimeException("Wrong Password/User");
+		}
+		else if (jsonText.length() == 1) {
 			return null;
 		}
 		json = new JSONObject(jsonText);
 		return json;
 	}
 
+    //it'll just do the request without any checks
     public static String StringRequest(String format, String data, String php)
     {
     	System.setProperty("http.agent", "Chrome");

src/main/java/me/checkium/vhackapi/vHackAPI.java

@@ -1,11 +1,5 @@
 package me.checkium.vhackapi;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.nio.charset.Charset;
 import java.util.concurrent.TimeUnit;
 
 import org.json.JSONObject;
@@ -43,19 +37,8 @@ public String getStats(Stats stat) {
 		} catch (InterruptedException e1) {
 			e1.printStackTrace();
 		}
-		JSONObject json = null;
-        InputStream is;
-			try {
-				is = new URL(Utils.generateURL("user::::pass::::uhash", username + "::::" + password + "::::" + userHash, "vh_update.php")).openStream();
-				BufferedReader rd = new BufferedReader(new InputStreamReader(is, Charset.forName("UTF-8")));
-				String jsonText = Utils.readJson(rd);
-				json = new JSONObject(jsonText);
-				if (json.getString(stat.toString()) == null) {
-					return null;
-				}
-			}  catch (IOException e) {
-				e.printStackTrace();
-			}
+		JSONObject json = Utils.JSONRequest("user::::pass::::uhash", username + "::::" + password + "::::" + userHash, "vh_update.php");
+		
 		return json.getString(stat.toString());
 	}