Merge pull request Grover-c13#173 from Hindi/inventoryForceUpdate

Inventory force update
rtaylor205 · Jul 24, 2016 · 4a91a97 · 4a91a97
2 parents f91890a + 995313a
commit 4a91a97
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 20 deletions.
diff --git a/src/main/java/com/pokegoapi/api/inventory/CandyJar.java b/src/main/java/com/pokegoapi/api/inventory/CandyJar.java
@@ -28,6 +28,10 @@ public class CandyJar {
 	private HashMap<PokemonFamilyId, Integer> candies;
 
 	public CandyJar(PokemonGo pgo) {
+		reset(pgo);
+	}
+
+	public void reset(PokemonGo pgo) {
 		this.pgo = pgo;
 		candies = new HashMap<>();
 	}

diff --git a/src/main/java/com/pokegoapi/api/inventory/Hatchery.java b/src/main/java/com/pokegoapi/api/inventory/Hatchery.java
@@ -39,8 +39,12 @@ public class Hatchery {
 	@Getter
 	PokemonGo instance;
 
-	public Hatchery(PokemonGo instance) {
-		this.instance = instance;
+	public Hatchery(PokemonGo pgo) {
+		reset(pgo);
+	}
+
+	public void reset(PokemonGo pgo) {
+		this.instance = pgo;
 	}
 
 	public void addEgg(EggPokemon egg) {

diff --git a/src/main/java/com/pokegoapi/api/inventory/Inventories.java b/src/main/java/com/pokegoapi/api/inventory/Inventories.java
@@ -94,12 +94,12 @@ public void updateInventories() throws LoginFailedException, RemoteServerExcepti
 	public void updateInventories(boolean forceUpdate) throws LoginFailedException, RemoteServerException {
 		if (forceUpdate) {
 			lastInventoryUpdate = 0;
-			itemBag = new ItemBag(api);
-			pokebank = new PokeBank(api);
-			candyjar = new CandyJar(api);
-			pokedex = new Pokedex(api);
+			itemBag.reset(api);
+			pokebank.reset(api);
+			candyjar.reset(api);
+			pokedex.reset(api);
 			incubators = new ArrayList<>();
-			hatchery = new Hatchery(api);
+			hatchery.reset(api);
 		}
 		GetInventoryMessage invReqMsg = GetInventoryMessage.newBuilder()
 				.setLastTimestampMs(lastInventoryUpdate)
@@ -125,7 +125,7 @@ public void updateInventories(boolean forceUpdate) throws LoginFailedException,
 
 			// pokebank
 			if (itemData.getPokemonData().getPokemonId() != PokemonId.MISSINGNO) {
-				pokebank.addPokemon(new Pokemon(inventoryItem.getInventoryItemData().getPokemonData()));
+				pokebank.addPokemon(new Pokemon(api, inventoryItem.getInventoryItemData().getPokemonData()));
 			}
 
 			// items

diff --git a/src/main/java/com/pokegoapi/api/inventory/ItemBag.java b/src/main/java/com/pokegoapi/api/inventory/ItemBag.java
@@ -40,6 +40,10 @@ public class ItemBag {
 	private HashMap<ItemId, Item> items;
 
 	public ItemBag(PokemonGo pgo) {
+		reset(pgo);
+	}
+
+	public void reset(PokemonGo pgo) {
 		this.pgo = pgo;
 		items = new HashMap<>();
 	}

diff --git a/src/main/java/com/pokegoapi/api/inventory/PokeBank.java b/src/main/java/com/pokegoapi/api/inventory/PokeBank.java
@@ -33,16 +33,19 @@ public class PokeBank {
 	@Getter
 	PokemonGo instance;
 
-	public PokeBank(PokemonGo instance) {
-		this.instance = instance;
+	public PokeBank(PokemonGo pgo) {
+		reset(pgo);
+	}
+
+	public void reset(PokemonGo pgo) {
+		this.instance = pgo;
 	}
 
 	/**
 	 * Add a pokemon to the pokebank inventory.  Will not add duplicates (pokemon with same id).
 	 * @param pokemon Pokemon to add to the inventory
 	 */
 	public void addPokemon(final Pokemon pokemon) {
-		pokemon.setPgo(instance);
 		List<Pokemon> alreadyAdded = Stream.of(pokemons).filter(new Predicate<Pokemon>() {
 			@Override
 			public boolean test(Pokemon testPokemon) {

diff --git a/src/main/java/com/pokegoapi/api/inventory/Pokedex.java b/src/main/java/com/pokegoapi/api/inventory/Pokedex.java
@@ -24,11 +24,15 @@
 
 public class Pokedex {
 
-	private final PokemonGo api;
+	private PokemonGo api;
 	private Map<PokemonId, PokedexEntry> pokedexMap = new HashMap();
 
-	public Pokedex(PokemonGo api) {
-		this.api = api;
+	public Pokedex(PokemonGo pgo) {
+		reset(pgo);
+	}
+
+	public void reset(PokemonGo pgo) {
+		this.api = pgo;
 	}
 
 	/**

diff --git a/src/main/java/com/pokegoapi/api/map/pokemon/EvolutionResult.java b/src/main/java/com/pokegoapi/api/map/pokemon/EvolutionResult.java
@@ -16,16 +16,22 @@
 package com.pokegoapi.api.map.pokemon;
 
 import POGOProtos.Networking.Responses.EvolvePokemonResponseOuterClass;
+import com.pokegoapi.api.PokemonGo;
 import com.pokegoapi.api.pokemon.Pokemon;
 
 public class EvolutionResult {
 
 	private EvolvePokemonResponseOuterClass.EvolvePokemonResponse proto;
 	private Pokemon pokemon;
 
-	public EvolutionResult(EvolvePokemonResponseOuterClass.EvolvePokemonResponse proto) {
+	/**
+	 * The evolution result.
+	 * @param api PokemonGo api
+	 * @param proto Pokemon proto
+	 */
+	public EvolutionResult(PokemonGo api, EvolvePokemonResponseOuterClass.EvolvePokemonResponse proto) {
 		this.proto = proto;
-		this.pokemon = new Pokemon(proto.getEvolvedPokemonData());
+		this.pokemon = new Pokemon(api, proto.getEvolvedPokemonData());
 	}
 
 	public EvolvePokemonResponseOuterClass.EvolvePokemonResponse.Result getResult() {

diff --git a/src/main/java/com/pokegoapi/api/pokemon/Pokemon.java b/src/main/java/com/pokegoapi/api/pokemon/Pokemon.java
@@ -43,15 +43,15 @@
 public class Pokemon {
 
 	private static final String TAG = Pokemon.class.getSimpleName();
-	@Setter
-	PokemonGo pgo;
+	private final PokemonGo pgo;
 	private PokemonData proto;
 	private PokemonMeta meta;
 
 	// API METHODS //
 
 	// DELEGATE METHODS BELOW //
-	public Pokemon(PokemonData proto) {
+	public Pokemon(PokemonGo api, PokemonData proto) {
+		this.pgo = api;
 		this.proto = proto;
 	}
 
@@ -137,7 +137,7 @@ public EvolutionResult evolve() throws LoginFailedException, RemoteServerExcepti
 			return null;
 		}
 
-		EvolutionResult result = new EvolutionResult(response);
+		EvolutionResult result = new EvolutionResult(pgo, response);
 
 		pgo.getInventories().getPokebank().removePokemon(this);