Hash improvements, and other fixes (#838)

* Add getMaxStorage method to ItemBag and Pokebank

* Use SSL for hash

* Fix Evolutions containing unreleased pokemon evolutions, update hash API endpoint & change captcha user agent

Author: gegy1000

library/src/main/java/com/pokegoapi/api/gym/Gym.java

@@ -286,4 +286,14 @@ public void updateState(GymState state) {
 		proto = state.getFortData();
 		clearDetails();
 	}
+
+	@Override
+	public int hashCode() {
+		return getId().hashCode();
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		return obj instanceof Gym && ((Gym) obj).getId().equals(getId());
+	}
 }

library/src/main/java/com/pokegoapi/api/inventory/ItemBag.java

@@ -317,4 +317,11 @@ public void addAwardedItems(LevelUpRewardsResponse levelUpResponse) {
 			item.setCount(item.getCount() + itemAward.getItemCount());
 		}
 	}
+
+	/**
+	 * @return the maximum amount of items this item bag can store
+	 */
+	public int getMaxStorage() {
+		return api.getPlayerProfile().getPlayerData().getMaxItemStorage();
+	}
 }

library/src/main/java/com/pokegoapi/api/inventory/PokeBank.java

@@ -160,8 +160,8 @@ public Map<PokemonFamilyId, Integer> releasePokemon(Pokemon... releasePokemon)
 				.build();
 		ServerRequest inventoryRequest = new ServerRequest(RequestType.GET_INVENTORY, inventoryMessage);
 		ServerRequest releaseRequest = new ServerRequest(RequestType.RELEASE_POKEMON, releaseBuilder.build());
-		api.getRequestHandler().sendServerRequests(releaseRequest, inventoryRequest);
 		Map<PokemonFamilyId, Integer> lastCandies = new HashMap<>(api.getInventories().getCandyjar().getCandies());
+		api.getRequestHandler().sendServerRequests(releaseRequest, inventoryRequest);
 		try {
 			GetInventoryResponse inventoryResponse = GetInventoryResponse.parseFrom(inventoryRequest.getData());
 			ReleasePokemonResponse releaseResponse = ReleasePokemonResponse.parseFrom(releaseRequest.getData());
@@ -195,4 +195,11 @@ public Map<PokemonFamilyId, Integer> releasePokemon(Pokemon... releasePokemon)
 			throw new RemoteServerException(e);
 		}
 	}
+
+	/**
+	 * @return the maximum amount of pokemon this pokebank can store
+	 */
+	public int getMaxStorage() {
+		return api.getPlayerProfile().getPlayerData().getMaxPokemonStorage();
+	}
 }

library/src/main/java/com/pokegoapi/api/map/fort/Pokestop.java

@@ -311,4 +311,14 @@ public boolean hasLure(boolean updateFortDetails)
 		return fortData.getActiveFortModifierList()
 				.contains(ItemIdOuterClass.ItemId.ITEM_TROY_DISK);
 	}
+
+	@Override
+	public int hashCode() {
+		return getId().hashCode();
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		return obj instanceof Pokestop && ((Pokestop) obj).getId().equals(getId());
+	}
 }

library/src/main/java/com/pokegoapi/api/pokemon/Evolutions.java

@@ -18,6 +18,7 @@
 import POGOProtos.Enums.PokemonIdOuterClass.PokemonId;
 import POGOProtos.Networking.Responses.DownloadItemTemplatesResponseOuterClass.DownloadItemTemplatesResponse.ItemTemplate;
 import POGOProtos.Settings.Master.PokemonSettingsOuterClass.PokemonSettings;
+import com.pokegoapi.main.PokemonMeta;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -29,6 +30,7 @@ public class Evolutions {
 
 	/**
 	 * Initializes these evolutions from PokemonSettings
+	 *
 	 * @param templates the templates to initialize from
 	 */
 	public static void initialize(List<ItemTemplate> templates) {
@@ -37,15 +39,21 @@ public static void initialize(List<ItemTemplate> templates) {
 			if (template.hasPokemonSettings()) {
 				PokemonSettings settings = template.getPokemonSettings();
 				PokemonId[] parents = {};
+				PokemonId pokemon = settings.getPokemonId();
 				if (settings.getParentPokemonId() != null) {
-					parents = new PokemonId[]{settings.getParentPokemonId()};
+					PokemonSettings parentSettings = PokemonMeta.getPokemonSettings(settings.getParentPokemonId());
+					List<PokemonId> parentEvolutions = parentSettings != null ? parentSettings.getEvolutionIdsList()
+							: null;
+					if (parentEvolutions != null && parentEvolutions.contains(pokemon)) {
+						parents = new PokemonId[]{settings.getParentPokemonId()};
+					}
 				}
-				Evolution evolution = new Evolution(parents, settings.getPokemonId());
-				EVOLUTIONS.put(settings.getPokemonId(), evolution);
+				Evolution evolution = new Evolution(parents, pokemon);
+				EVOLUTIONS.put(pokemon, evolution);
 				for (PokemonId parent : parents) {
 					Evolution parentEvolution = EVOLUTIONS.get(parent);
 					if (parentEvolution != null) {
-						parentEvolution.addEvolution(settings.getPokemonId());
+						parentEvolution.addEvolution(pokemon);
 					}
 				}
 			}

library/src/main/java/com/pokegoapi/util/CaptchaSolveHelper.java

@@ -27,10 +27,7 @@
 import java.util.regex.Pattern;
 
 public class CaptchaSolveHelper {
-	public static final String USER_AGENT =
-			"Mozilla/5.0 (Windows NT 10.0; WOW64) "
-					+ "AppleWebKit/537.36 (KHTML, like Gecko) "
-					+ "Chrome/54.0.2840.99 Safari/537.36";
+	public static final String USER_AGENT = "Niantic App";
 
 	private static final List<Listener> LISTENERS = new ArrayList<>();
 	private static final Queue<Listener> QUEUED_ADDITION = new LinkedBlockingDeque<>();

library/src/main/java/com/pokegoapi/util/hash/pokehash/PokeHashProvider.java

@@ -26,6 +26,7 @@
 import lombok.Getter;
 import net.iharder.Base64;
 
+import javax.net.ssl.HttpsURLConnection;
 import java.io.BufferedReader;
 import java.io.DataOutputStream;
 import java.io.IOException;
@@ -39,7 +40,7 @@
  * This requires a key and is not free like the legacy provider.
  */
 public class PokeHashProvider implements HashProvider {
-	private static final String HASH_ENDPOINT = "http://pokehash.buddyauth.com/api/v122/hash";
+	private static final String HASH_ENDPOINT = "https://pokehash.buddyauth.com/api/v121_2/hash";
 
 	private static final int VERSION = 5100;
 	private static final long UNK25 = -8832040574896607694L;
@@ -64,7 +65,7 @@ public Hash provide(long timestamp, double latitude, double longitude, double al
 						byte[] sessionData, byte[][] requests) throws HashException {
 		Request request = new Request(latitude, longitude, altitude, timestamp, authTicket, sessionData, requests);
 		try {
-			HttpURLConnection connection = (HttpURLConnection) new URL(HASH_ENDPOINT).openConnection();
+			HttpsURLConnection connection = (HttpsURLConnection) new URL(HASH_ENDPOINT).openConnection();
 			connection.setRequestMethod("POST");
 			connection.setRequestProperty("X-AuthToken", key);
 			connection.setRequestProperty("content-type", "application/json");