Inventory refactor

.travis.yml

@@ -3,10 +3,14 @@ language: java
 jdk:
   - oraclejdk8
 
+branches:
+  only:
+  - master
+
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
   - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
 cache:
   directories:
     - $HOME/.gradle/caches/
-    - $HOME/.gradle/wrapper/
+    - $HOME/.gradle/wrapper/

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

@@ -15,36 +15,13 @@
 
 package com.pokegoapi.api;
 
-import POGOProtos.Data.Player.CurrencyOuterClass;
-import POGOProtos.Data.Player.PlayerStatsOuterClass;
-import POGOProtos.Data.PlayerDataOuterClass;
-import POGOProtos.Enums.PokemonFamilyIdOuterClass.PokemonFamilyId;
-import POGOProtos.Enums.PokemonIdOuterClass;
-import POGOProtos.Inventory.InventoryItemOuterClass;
-import POGOProtos.Inventory.ItemIdOuterClass;
 import POGOProtos.Networking.Envelopes.RequestEnvelopeOuterClass;
-import POGOProtos.Networking.Requests.Messages.GetInventoryMessageOuterClass.GetInventoryMessage;
-import POGOProtos.Networking.Requests.Messages.GetPlayerMessageOuterClass.GetPlayerMessage;
-import POGOProtos.Networking.Requests.RequestTypeOuterClass.RequestType;
-import POGOProtos.Networking.Responses.GetInventoryResponseOuterClass.GetInventoryResponse;
-import POGOProtos.Networking.Responses.GetPlayerResponseOuterClass.GetPlayerResponse;
-import com.google.protobuf.InvalidProtocolBufferException;
-import com.pokegoapi.api.inventory.Bag;
-import com.pokegoapi.api.inventory.CandyJar;
-import com.pokegoapi.api.inventory.Item;
-import com.pokegoapi.api.inventory.PokeBank;
+import com.pokegoapi.api.inventory.Inventories;
 import com.pokegoapi.api.map.Map;
-import com.pokegoapi.api.player.ContactSettings;
-import com.pokegoapi.api.player.DailyBonus;
-import com.pokegoapi.api.player.PlayerAvatar;
 import com.pokegoapi.api.player.PlayerProfile;
-import com.pokegoapi.api.player.Team;
-import com.pokegoapi.api.pokemon.Pokemon;
-import com.pokegoapi.exceptions.InvalidCurrencyException;
 import com.pokegoapi.exceptions.LoginFailedException;
 import com.pokegoapi.exceptions.RemoteServerException;
 import com.pokegoapi.main.RequestHandler;
-import com.pokegoapi.main.ServerRequest;
 import com.pokegoapi.util.Log;
 import lombok.Getter;
 import lombok.Setter;
@@ -57,15 +34,12 @@ public class PokemonGo {
 	@Getter
 	RequestHandler requestHandler;
 	@Getter
-	PokeBank pokebank;
-	@Getter
-	Bag bag;
-	@Getter
 	Map map;
 	@Getter
-	CandyJar candyjar;
 	private PlayerProfile playerProfile;
 	@Getter
+	private Inventories inventories;
+	@Getter
 	@Setter
 	private double latitude;
 	@Getter
@@ -75,88 +49,29 @@ public class PokemonGo {
 	@Setter
 	private double altitude;
 
-	private long lastInventoryUpdate;
 
 	/**
 	 * Instantiates a new Pokemon go.
 	 *
 	 * @param auth   the auth
 	 * @param client the client
 	 */
-	public PokemonGo(RequestEnvelopeOuterClass.RequestEnvelope.AuthInfo auth, OkHttpClient client) {
+	public PokemonGo(RequestEnvelopeOuterClass.RequestEnvelope.AuthInfo auth, OkHttpClient client)
+			throws LoginFailedException, RemoteServerException {
 		playerProfile = null;
 
 		// send profile request to get the ball rolling
 		requestHandler = new RequestHandler(this, auth, client);
-		getPlayerProfile();
-		// should have proper end point now.
-
-		map = new Map(this);
-		lastInventoryUpdate = 0;
-	}
-
-	private PlayerDataOuterClass.PlayerData getPlayerAndUpdateInventory(PlayerProfile playerProfile)
-			throws LoginFailedException, RemoteServerException {
-
-		GetPlayerMessage getPlayerReqMsg = GetPlayerMessage.newBuilder().build();
-		ServerRequest getPlayerServerRequest = new ServerRequest(RequestType.GET_PLAYER, getPlayerReqMsg);
-		getRequestHandler().request(getPlayerServerRequest);
-
-		GetInventoryMessage invReqMsg = GetInventoryMessage.newBuilder()
-				.setLastTimestampMs(this.lastInventoryUpdate)
-				.build();
-		ServerRequest getInventoryServerRequest = new ServerRequest(RequestType.GET_INVENTORY, invReqMsg);
-		getRequestHandler().request(getInventoryServerRequest);
 
-		getRequestHandler().sendServerRequests();
+		playerProfile = new PlayerProfile(this);
+		inventories = new Inventories(this);
 
-		GetPlayerResponse getPlayerResponse;
-		GetInventoryResponse getInventoryResponse;
-		try {
-			getPlayerResponse = GetPlayerResponse.parseFrom(getPlayerServerRequest.getData());
-			getInventoryResponse = GetInventoryResponse.parseFrom(getInventoryServerRequest.getData());
-		} catch (InvalidProtocolBufferException e) {
-			throw new RemoteServerException(e);
-		}
-
-		pokebank = new PokeBank(this);
-		bag = new Bag(this);
-		candyjar = new CandyJar(this);
-
-		for (InventoryItemOuterClass.InventoryItem item :
-				getInventoryResponse.getInventoryDelta().getInventoryItemsList()) {
-
-			if (item.getInventoryItemData().getPokemonData().getPokemonId() != PokemonIdOuterClass.PokemonId.MISSINGNO) {
-				pokebank.addPokemon(new Pokemon(item.getInventoryItemData().getPokemonData()));
-			}
-
-			if (item.getInventoryItemData().getItem().getItemId() != ItemIdOuterClass.ItemId.ITEM_UNKNOWN) {
-				bag.addItem(new Item(item.getInventoryItemData().getItem()));
-			}
-
-			if (item.getInventoryItemData().getPokemonFamily().getFamilyId() != PokemonFamilyId.UNRECOGNIZED) {
-				candyjar.setCandy(
-						item.getInventoryItemData().getPokemonFamily().getFamilyId(),
-						item.getInventoryItemData().getPokemonFamily().getCandy());
-			}
-
-			if (item.getInventoryItemData().hasPlayerStats()) {
-				PlayerStatsOuterClass.PlayerStats stats = item.getInventoryItemData().getPlayerStats();
-				playerProfile.setStats(stats);
-			}
+		playerProfile.updateProfile();
+		inventories.updateInventories();
 
-		}
-
-		return getPlayerResponse.getPlayerData();
-	}
+		// should have proper end point now.
 
-	/**
-	 * Gets player profile.
-	 *
-	 * @return the player profile
-	 */
-	public PlayerProfile getPlayerProfile() {
-		return getPlayerProfile(false);
+		map = new Map(this);
 	}
 
 	/**
@@ -165,61 +80,15 @@ public PlayerProfile getPlayerProfile() {
 	 * @param forceUpdate the force update
 	 * @return the player profile
 	 */
+	@Deprecated
 	public PlayerProfile getPlayerProfile(boolean forceUpdate) {
 		if (!forceUpdate && playerProfile != null) {
-			return playerProfile;
-		}
-
-		// init here so we can set the experience and level, which is somehow contained in the inventory...
-		PlayerProfile tempProfile = new PlayerProfile();
-		PlayerDataOuterClass.PlayerData localPlayer = null;
-		try {
-			localPlayer = getPlayerAndUpdateInventory(tempProfile);
-		} catch (LoginFailedException | RemoteServerException e) {
-			Log.e(TAG, "Failed to get profile data and update inventory", e);
-		}
-
-		if (localPlayer == null) {
-			return null;
-		}
-		playerProfile = tempProfile;
-
-		playerProfile.setBadge(localPlayer.getEquippedBadge());
-		playerProfile.setCreationTime(localPlayer.getCreationTimestampMs());
-		playerProfile.setItemStorage(localPlayer.getMaxItemStorage());
-		playerProfile.setPokemonStorage(localPlayer.getMaxPokemonStorage());
-		playerProfile.setTeam(Team.values()[localPlayer.getTeam()]);
-		playerProfile.setUsername(localPlayer.getUsername());
-
-		final PlayerAvatar avatarApi = new PlayerAvatar();
-		final DailyBonus bonusApi = new DailyBonus();
-		final ContactSettings contactApi = new ContactSettings();
-
-		// maybe something more graceful?
-		for (CurrencyOuterClass.Currency currency : localPlayer.getCurrenciesList()) {
 			try {
-				playerProfile.addCurrency(currency.getName(), currency.getAmount());
-			} catch (InvalidCurrencyException e) {
-				Log.w(TAG, "Error adding currency. You can probably ignore this.", e);
+				playerProfile.updateProfile();
+			} catch (Exception e) {
+				Log.e(TAG, "Error updating Player Profile", e);
 			}
 		}
-
-		avatarApi.setGender(localPlayer.getAvatar().getGender());
-		avatarApi.setBackpack(localPlayer.getAvatar().getBackpack());
-		avatarApi.setEyes(localPlayer.getAvatar().getEyes());
-		avatarApi.setHair(localPlayer.getAvatar().getHair());
-		avatarApi.setHat(localPlayer.getAvatar().getHat());
-		avatarApi.setPants(localPlayer.getAvatar().getPants());
-		avatarApi.setShirt(localPlayer.getAvatar().getShirt());
-		avatarApi.setShoes(localPlayer.getAvatar().getShoes());
-		avatarApi.setSkin(localPlayer.getAvatar().getSkin());
-
-		bonusApi.setNextCollectionTimestamp(localPlayer.getDailyBonus().getNextCollectedTimestampMs());
-		bonusApi.setNextDefenderBonusCollectTimestamp(localPlayer.getDailyBonus().getNextDefenderBonusCollectTimestampMs());
-
-		playerProfile.setAvatar(avatarApi);
-		playerProfile.setDailyBonus(bonusApi);
-
 		return playerProfile;
 	}
 

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

@@ -17,6 +17,7 @@
 
 import POGOProtos.Enums.PokemonFamilyIdOuterClass.PokemonFamilyId;
 import com.pokegoapi.api.PokemonGo;
+import com.pokegoapi.api.pokemon.Pokemon;
 import lombok.ToString;
 
 import java.util.HashMap;
@@ -31,10 +32,50 @@ public CandyJar(PokemonGo pgo) {
 		candies = new HashMap<>();
 	}
 
+	/**
+	 * Sets the number of candies in the jar.
+	 * @param family Pokemon family id
+	 * @param candies Amount to set it to
+	 */
 	public void setCandy(PokemonFamilyId family, int candies) {
 		this.candies.put(family, candies);
 	}
 
+	/**
+	 * Adds a candy to the candy jar.
+	 * @param family Pokemon family id
+	 * @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);
+		}
+	}
+
+	/**
+	 * Remove a candy from the candy jar.
+	 * @param family Pokemon family id
+	 * @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);
+			} else {
+				candies.put(family, candies.get(family) - amount);
+			}
+		} else {
+			candies.put(family, 0);
+		}
+	}
+
+	/**
+	 * Get number of candies from the candyjar.
+	 * @param family Pokemon family id
+	 * @return number of candies in jar
+	 */
 	public int getCandies(PokemonFamilyId family) {
 		return this.candies.get(family);
 	}