Synchronize inventories to prevent CMEs (#819)

* Blocking inventories to prevent CMEs

* Fix checkstyle

Author: Gegy

library/src/main/java/com/pokegoapi/api/PokemonGo.java

@@ -56,6 +56,7 @@
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Random;
 import java.util.UUID;
@@ -110,7 +111,9 @@ public class PokemonGo {
 	private String challengeURL;
 
 	@Getter
-	private List<Listener> listeners = new ArrayList<Listener>();
+	private List<Listener> listeners = Collections.synchronizedList(new ArrayList<Listener>());
+
+	private final Object lock = new Object();
 
 	@Getter
 	private boolean loggingIn;
@@ -452,9 +455,11 @@ public void removeListener(Listener listener) {
 	 */
 	public <T extends Listener> List<T> getListeners(Class<T> listenerType) {
 		List<T> listeners = new ArrayList<T>();
-		for (Listener listener : this.listeners) {
-			if (listenerType.isAssignableFrom(listener.getClass())) {
-				listeners.add((T) listener);
+		synchronized (this.lock) {
+			for (Listener listener : this.listeners) {
+				if (listenerType.isAssignableFrom(listener.getClass())) {
+					listeners.add((T) listener);
+				}
 			}
 		}
 		return listeners;

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

@@ -15,24 +15,32 @@
 
 package com.pokegoapi.api.inventory;
 
+import POGOProtos.Enums.PokemonFamilyIdOuterClass.PokemonFamilyId;
 import com.pokegoapi.api.PokemonGo;
+import lombok.ToString;
 
+import java.util.Collections;
 import java.util.HashMap;
-
-import POGOProtos.Enums.PokemonFamilyIdOuterClass.PokemonFamilyId;
-import lombok.ToString;
+import java.util.Map;
 
 @ToString
 public class CandyJar {
 	private final PokemonGo api;
-	private final HashMap<PokemonFamilyId, Integer> candies = new HashMap<>();
+	private final Map<PokemonFamilyId, Integer> candies =
+			Collections.synchronizedMap(new HashMap<PokemonFamilyId, Integer>());
+	private final Object lock = new Object();
 
 	public CandyJar(PokemonGo api) {
 		this.api = api;
 	}
 
+	/**
+	 * Resets this candy jar and removes all candies
+	 */
 	public void reset() {
-		candies.clear();
+		synchronized (this.lock) {
+			candies.clear();
+		}
 	}
 
 	/**
@@ -42,7 +50,9 @@ public void reset() {
 	 * @param candies Amount to set it to
 	 */
 	public void setCandy(PokemonFamilyId family, int candies) {
-		this.candies.put(family, candies);
+		synchronized (this.lock) {
+			this.candies.put(family, candies);
+		}
 	}
 
 	/**
@@ -52,10 +62,12 @@ public void setCandy(PokemonFamilyId family, int candies) {
 	 * @param amount Amount of candies to add
 	 */
 	public void addCandy(PokemonFamilyId family, int amount) {
-		if (candies.containsKey(family)) {
-			candies.put(family, candies.get(family) + amount);
-		} else {
-			candies.put(family, amount);
+		synchronized (this.lock) {
+			if (candies.containsKey(family)) {
+				candies.put(family, candies.get(family) + amount);
+			} else {
+				candies.put(family, amount);
+			}
 		}
 	}
 
@@ -66,14 +78,16 @@ public void addCandy(PokemonFamilyId family, int amount) {
 	 * @param amount Amount of candies to remove
 	 */
 	public void removeCandy(PokemonFamilyId family, int amount) {
-		if (candies.containsKey(family)) {
-			if (candies.get(family) - amount < 0) {
-				candies.put(family, 0);
+		synchronized (this.lock) {
+			if (candies.containsKey(family)) {
+				if (candies.get(family) - amount < 0) {
+					candies.put(family, 0);
+				} else {
+					candies.put(family, candies.get(family) - amount);
+				}
 			} else {
-				candies.put(family, candies.get(family) - amount);
+				candies.put(family, 0);
 			}
-		} else {
-			candies.put(family, 0);
 		}
 	}
 
@@ -84,10 +98,12 @@ public void removeCandy(PokemonFamilyId family, int amount) {
 	 * @return number of candies in jar
 	 */
 	public int getCandies(PokemonFamilyId family) {
-		if (candies.containsKey(family)) {
-			return this.candies.get(family);
-		} else {
-			return 0;
+		synchronized (this.lock) {
+			if (candies.containsKey(family)) {
+				return this.candies.get(family);
+			} else {
+				return 0;
+			}
 		}
 	}
 }

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

@@ -30,38 +30,47 @@
 import lombok.Getter;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
 public class Hatchery {
 	@Getter
-	private final Set<EggPokemon> eggs = new HashSet<EggPokemon>();
+	private final Set<EggPokemon> eggs = Collections.synchronizedSet(new HashSet<EggPokemon>());
 	@Getter
-	private final Set<HatchedEgg> hatchedEggs = new HashSet<HatchedEgg>();
+	private final Set<HatchedEgg> hatchedEggs = Collections.synchronizedSet(new HashSet<HatchedEgg>());
 	@Getter
 	private PokemonGo api;
 
+	private final Object lock = new Object();
+
 	public Hatchery(PokemonGo api) {
 		this.api = api;
 	}
 
 	public void reset() {
-		eggs.clear();
-		hatchedEggs.clear();
+		synchronized (this.lock) {
+			eggs.clear();
+			hatchedEggs.clear();
+		}
 	}
 
 	public void addEgg(EggPokemon egg) {
 		egg.setApi(api);
-		eggs.add(egg);
+		synchronized (this.lock) {
+			eggs.add(egg);
+		}
 	}
 
 	/**
 	 * Adds the given hatched egg to the hatchedEggs set.
 	 * @param egg the egg to add
 	 */
 	public void addHatchedEgg(HatchedEgg egg) {
-		hatchedEggs.add(egg);
+		synchronized (this.lock) {
+			hatchedEggs.add(egg);
+		}
 		boolean remove = false;
 		List<PokemonListener> listeners = api.getListeners(PokemonListener.class);
 		for (PokemonListener listener : listeners) {
@@ -77,7 +86,9 @@ public void addHatchedEgg(HatchedEgg egg) {
 	 * @param egg the egg to remove
 	 */
 	public void removeHatchedEgg(HatchedEgg egg) {
-		hatchedEggs.remove(egg);
+		synchronized (this.lock) {
+			hatchedEggs.remove(egg);
+		}
 	}
 
 	/**

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

@@ -36,6 +36,7 @@
 import lombok.Getter;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 
@@ -51,12 +52,15 @@ public class Inventories {
 	@Getter
 	private Pokedex pokedex;
 	@Getter
-	private final List<EggIncubator> incubators = new ArrayList<>();
+	private final List<EggIncubator> incubators = Collections.synchronizedList(new ArrayList<EggIncubator>());
 	@Getter
 	private Hatchery hatchery;
 	@Getter
 	private long lastInventoryUpdate = 0;
 
+	@Getter
+	private final Object lock = new Object();
+
 	/**
 	 * Creates Inventories and initializes content.
 	 *
@@ -98,7 +102,9 @@ public void updateInventories(boolean forceUpdate)
 			pokebank.reset();
 			candyjar.reset();
 			pokedex.reset();
-			incubators.clear();
+			synchronized (this.lock) {
+				incubators.clear();
+			}
 			hatchery.reset();
 		}
 		GetInventoryMessage invReqMsg = GetInventoryMessage.newBuilder()
@@ -167,8 +173,10 @@ public void updateInventories(GetInventoryResponse response) {
 			if (itemData.hasEggIncubators()) {
 				for (EggIncubatorOuterClass.EggIncubator incubator : itemData.getEggIncubators().getEggIncubatorList()) {
 					EggIncubator eggIncubator = new EggIncubator(api, incubator);
-					incubators.remove(eggIncubator);
-					incubators.add(eggIncubator);
+					synchronized (this.lock) {
+						incubators.remove(eggIncubator);
+						incubators.add(eggIncubator);
+					}
 				}
 			}
 

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

@@ -35,27 +35,34 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 
 /**
  * The type Bag.
  */
 public class ItemBag {
 	private final PokemonGo api;
-	private final HashMap<ItemId, Item> items = new HashMap<>();
+	private final Map<ItemId, Item> items = Collections.synchronizedMap(new HashMap<ItemId, Item>());
+	private final Object lock = new Object();
 
 	public ItemBag(PokemonGo api) {
 		this.api = api;
 	}
 
 	public void reset() {
-		items.clear();
+		synchronized (this.lock) {
+			items.clear();
+		}
 	}
 
 	public void addItem(Item item) {
-		items.put(item.getItemId(), item);
+		synchronized (this.lock) {
+			items.put(item.getItemId(), item);
+		}
 	}
 
 	/**
@@ -106,7 +113,9 @@ public Result removeItem(ItemId id, int quantity)
 	 * @return The item removed, if any
 	 */
 	public Item removeItem(ItemId id) {
-		return items.remove(id);
+		synchronized (this.lock) {
+			return items.remove(id);
+		}
 	}
 
 	/**
@@ -120,16 +129,20 @@ public Item getItem(ItemId type) {
 			throw new IllegalArgumentException("You cannot get item for UNRECOGNIZED");
 		}
 
-		// prevent returning null
-		if (!items.containsKey(type)) {
-			return new Item(ItemData.newBuilder().setCount(0).setItemId(type).build(), this);
-		}
+		synchronized (this.lock) {
+			// prevent returning null
+			if (!items.containsKey(type)) {
+				return new Item(ItemData.newBuilder().setCount(0).setItemId(type).build(), this);
+			}
 
-		return items.get(type);
+			return items.get(type);
+		}
 	}
 
 	public Collection<Item> getItems() {
-		return items.values();
+		synchronized (this.lock) {
+			return items.values();
+		}
 	}
 
 	/**
@@ -138,11 +151,13 @@ public Collection<Item> getItems() {
 	 * @return used space
 	 */
 	public int getItemsCount() {
-		int ct = 0;
-		for (Item item : items.values()) {
-			ct += item.getCount();
+		synchronized (this.lock) {
+			int ct = 0;
+			for (Item item : items.values()) {
+				ct += item.getCount();
+			}
+			return ct;
 		}
-		return ct;
 	}
 
 	/**