Removed Adware and updated url requests

Removed the last remains of adware and updated the methods with uhash.
The register method isn't updated yet.

Author: Qup42

src/examples/ConsoleExample.java

@@ -19,14 +19,7 @@ public static void main(String[] args) {
 			   if(transfer.get(0).getSuccess()){
 				   System.out.println("Got $" + transfer.get(0).getMoneyAmount());
 				   System.out.println("Gained " + transfer.get(0).getRepGained() + " rep.");
-			   }
-			   if(api.getAdwareManager().uploadAdware(ip.get(0))){
-				   System.out.println("Adware uploaded successfully.");
-			   }
-			   else{
-				   System.out.println("Failed to upload Adware.");
-			   }
-			   
+			   }			   
 		   }
 
 	}

src/me/checkium/vhackapi/Utils.java

@@ -214,9 +214,9 @@ public  static String generateURL(String str, String str2, String str3) {
         byte[] bytes3 = str5.getBytes();
         byte[] bytes4 = str6.getBytes();
         String a3 = hashString(secret + hashString(hashString(generateUser(bytes2, 0, bytes2.length, byt, false))));
-        String str6 = generateUser(bytes3, 0, bytes3.length, byt, false);
+        String str9 = generateUser(bytes3, 0, bytes3.length, byt, false);
         String str7 = generateUser(bytes4, 0, bytes4.length, byt, false);
-        String str8 = hashString(hashString(a3 + hashString(hashString(str6) + str7)));
+        String str8 = hashString(hashString(a3 + hashString(hashString(str9) + str7)));
         return url + str3 + "?user=" + a + "&pass=" + str8;
     }
 

src/me/checkium/vhackapi/upgrades/UpgradeManager.java

@@ -20,18 +20,20 @@ public class UpgradeManager {
 
 	protected String username;
 	protected String password;
+	protected String userHash;
 
-	public UpgradeManager(String user, String pass) {
+	public UpgradeManager(String user, String pass, String uhash) {
 		username = user;
 		password = pass;
+		userHash = uhash;
 	}
 
 	public UpgradeResult addUpdate(UpgradeType type) {
 
 		JSONObject json = new JSONObject();
 		try {
 	    TimeUnit.MILLISECONDS.sleep(100);
-		InputStream is = new URL(Utils.generateURL("user::::pass::::utype", username + "::::" + password + "::::" + type.toString(), "vh_addUpdate.php")).openStream();
+		InputStream is = new URL(Utils.generateURL("user::::pass::::uhash::::utype", username + "::::" + password + "::::" + userHash + "::::" + type.toString(), "vh_addUpdate.php")).openStream();
 		BufferedReader rd = new BufferedReader(new InputStreamReader(is, Charset.forName("UTF-8")));
 		String jsonText;
 
@@ -62,7 +64,7 @@ public ArrayList<Task> getTasks() {
 		JSONObject json = new JSONObject();
 		try {
 	    TimeUnit.MILLISECONDS.sleep(100);
-		InputStream is = new URL(Utils.generateURL("user::::pass", username + "::::" + password, "vh_tasks.php")).openStream();
+		InputStream is = new URL(Utils.generateURL("user::::pass::::uhash", username + "::::" + password + "::::" + userHash, "vh_tasks.php")).openStream();
 		BufferedReader rd = new BufferedReader(new InputStreamReader(is, Charset.forName("UTF-8")));
 		String jsonText;
 
@@ -95,7 +97,7 @@ public boolean finishTask(Task task) {
 		URLConnection in;
 		try {
 			TimeUnit.MILLISECONDS.sleep(100);
-			in = new URL(Utils.generateURL("user::::pass::::taskid", username + "::::" + password + "::::" + task.getTaskID(), "vh_finishTask.php")).openConnection();
+			in = new URL(Utils.generateURL("user::::pass::::uhash::::taskid", username + "::::" + password + "::::" + userHash + "::::" + task.getTaskID(), "vh_finishTask.php")).openConnection();
 
 		BufferedReader br = new BufferedReader(new InputStreamReader((in.getInputStream())));
 		String line = br.readLine();
@@ -125,7 +127,7 @@ public boolean abortTask(Task task) {
 		URLConnection in;
 		try {
 			TimeUnit.MILLISECONDS.sleep(100);
-			in = new URL(Utils.generateURL("user::::pass::::taskid", username + "::::" + password + "::::" + task.getTaskID(), "vh_abortTask.php")).openConnection();
+			in = new URL(Utils.generateURL("user::::pass::::uhash::::taskid", username + "::::" + password + "::::" + userHash + "::::" + task.getTaskID(), "vh_abortTask.php")).openConnection();
 
 		BufferedReader br = new BufferedReader(new InputStreamReader((in.getInputStream())));
 		String line = br.readLine();

src/me/checkium/vhackapi/vHackAPI.java

@@ -11,7 +11,6 @@
 import org.json.JSONObject;
 
 import me.checkium.vhackapi.chat.Chat;
-import me.checkium.vhackapi.console.AdwareManager;
 import me.checkium.vhackapi.console.Console;
 import me.checkium.vhackapi.others.Others;
 import me.checkium.vhackapi.upgrades.UpgradeManager;
@@ -20,23 +19,18 @@ public class vHackAPI {
 
 	protected String password;
 	protected String username;
+	protected String userHash;
 
 
 	 public Console getConsole() {
-		 Console console = new Console(username, password);
+		 Console console = new Console(username, password, userHash);
 		 return console;
 	 }
 
 	 public UpgradeManager getUpgradeManager() {
-		 UpgradeManager manager = new UpgradeManager(username, password);
+		 UpgradeManager manager = new UpgradeManager(username, password, userHash);
 		 return manager;
-	 }
-	 
-		public AdwareManager getAdwareManager() {
-			AdwareManager manager = new AdwareManager(password, username);
-			return manager;
-		}
-		
+	 }		
 
 	public String getStats(Stats stat) {
 		try {
@@ -47,7 +41,7 @@ public String getStats(Stats stat) {
 		JSONObject json = null;
         InputStream is;
 			try {
-				is = new URL(Utils.generateURL("user::::pass", username + "::::" + password, "vh_update.php")).openStream();
+				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);
@@ -61,7 +55,7 @@ public String getStats(Stats stat) {
 	}
 
 	public Others getOthers() {
-		Others others = new Others(username, password);
+		Others others = new Others(username, password, userHash);
 		return others;
 	}
 
@@ -76,11 +70,13 @@ public Chat getChat() {
 		Chat chat = new Chat();
 				return chat;
 	}
-	public vHackAPI(String user, String pass) {
+	public vHackAPI(String user, String pass, String uhash) {
 		username = user;
 		password = pass;
+		userHash = uhash;
 		//return this;
 	}
+	
 	@Deprecated
 	public vHackAPI getAPI() {
 		return this;