Merge branch 'cleanup' into Development-origin

Author: Furtif

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

@@ -62,7 +62,6 @@
 import lombok.Getter;
 import lombok.Setter;
 import okhttp3.OkHttpClient;
-
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -71,34 +70,32 @@
 import java.util.Random;
 import java.util.UUID;
 
-
 public class PokemonGo {
-
 	private static final java.lang.String TAG = PokemonGo.class.getSimpleName();
 	private final Time time;
 	@Getter
-	private long startTime;
+	public long startTime;
 	@Getter
 	private final byte[] sessionHash = new byte[32];
 	@Getter
-	RequestHandler requestHandler;
+	public RequestHandler requestHandler;
 	@Getter
-	private PlayerProfile playerProfile;
+	public PlayerProfile playerProfile;
 	@Getter
-	private Inventories inventories;
+	public Inventories inventories;
 	@Getter
-	private double latitude;
+	public double latitude;
 	@Getter
-	private double longitude;
+	public double longitude;
 	@Getter
 	@Setter
-	private double altitude;
+	public double altitude;
 	@Getter
 	@Setter
-	private double accuracy = 5;
+	public double accuracy = 5;
 	private CredentialProvider credentialProvider;
 	@Getter
-	private Settings settings;
+	public Settings settings;
 	private Map map;
 	@Setter
 	private DeviceInfo deviceInfo;
@@ -110,33 +107,26 @@ public class PokemonGo {
 	public ActivityStatus activityStatus;
 	@Setter
 	@Getter
-	private long seed;
+	public long seed;
 	@Getter
 	@Setter
 	public LocationFixes locationFixes;
-
 	@Setter
 	private boolean hasChallenge;
 	@Getter
 	private String challengeURL;
 	private final Object challengeLock = new Object();
-
 	@Getter
 	private List<Listener> listeners = Collections.synchronizedList(new ArrayList<Listener>());
-
 	private final Object lock = new Object();
-
 	@Getter
-	private boolean loggingIn;
+	public boolean loggingIn;
 	@Getter
 	private boolean active;
-
 	@Getter
 	private Heartbeat heartbeat = new Heartbeat(this);
-
 	@Getter
-	private HashProvider hashProvider;
-
+	public HashProvider hashProvider;
 	private OkHttpClient client;
 
 	/**
@@ -146,19 +136,19 @@ public class PokemonGo {
 	 */
 	@Getter
 	@Setter
-	private boolean firstGMO = true;
+	public boolean firstGMO = true;
 	/**
 	 * Ptr8 is only sent with the first Get Player request,
 	 * we need a flag to tell us if it has already been sent.
 	 * after that, GET_PLAYER  is sent with common requests.
 	 */
 	@Getter
 	@Setter
-	private boolean firstGP = true;
+	public boolean firstGP = true;
 
 	@Getter
 	@Setter
-	private ItemTemplates itemTemplates;
+	public ItemTemplates itemTemplates;
 
 	/**
 	 * Instantiates a new Pokemon go.
@@ -250,19 +240,19 @@ private void reset() {
 	}
 
 	private void initialize() throws RequestFailedException {
-		if (getRequestHandler() != null) {
-			getRequestHandler().exit();
+		if (requestHandler != null) {
+			requestHandler.exit();
 		}
 
 		requestHandler = new RequestHandler(this, client);
 
-		getRequestHandler().sendServerRequests(ServerRequestEnvelope.create());
+		requestHandler.sendServerRequests(ServerRequestEnvelope.create());
 
 		playerProfile.updateProfile();
 
 		ServerRequest downloadConfigRequest = new ServerRequest(RequestType.DOWNLOAD_REMOTE_CONFIG_VERSION,
 				CommonRequests.getDownloadRemoteConfigVersionMessageRequest(this));
-		getRequestHandler().sendServerRequests(downloadConfigRequest, true);
+		requestHandler.sendServerRequests(downloadConfigRequest, true);
 		getAssetDigest();
 
 		try {
@@ -278,14 +268,14 @@ private void initialize() throws RequestFailedException {
 
 		try {
 			LevelUpRewardsMessage rewardsMessage = LevelUpRewardsMessage.newBuilder()
-					.setLevel(playerProfile.getLevel())
+					.setLevel(playerProfile.getStats().getLevel())
 					.build();
 			ServerRequest request = new ServerRequest(RequestType.LEVEL_UP_REWARDS, rewardsMessage);
 			ServerRequestEnvelope envelope = ServerRequestEnvelope.createCommons(request, this);
-			getRequestHandler().sendServerRequests(envelope);
+			requestHandler.sendServerRequests(envelope);
 			LevelUpRewardsResponse levelUpRewardsResponse = LevelUpRewardsResponse.parseFrom(request.getData());
 			if (levelUpRewardsResponse.getResult() == Result.SUCCESS) {
-				inventories.getItemBag().addAwardedItems(levelUpRewardsResponse);
+				inventories.itemBag.addAwardedItems(levelUpRewardsResponse);
 			}
 		} catch (InvalidProtocolBufferException e) {
 			throw new RequestFailedException(e);
@@ -295,7 +285,7 @@ private void initialize() throws RequestFailedException {
 		ServerRequestEnvelope envelope = ServerRequestEnvelope.create();
 		envelope.addPlatform(new ServerPlatformRequest(PlatformRequestType.GET_STORE_ITEMS, getStoreItems));
 
-		getRequestHandler().sendServerRequests(envelope);
+		requestHandler.sendServerRequests(envelope);
 
 		List<LoginListener> loginListeners = getListeners(LoginListener.class);
 
@@ -322,7 +312,7 @@ private void initialize() throws RequestFailedException {
 			playerProfile.encounterTutorialComplete();
 		}
 
-		int remainingCodenameClaims = getPlayerProfile().getPlayerData().getRemainingCodenameClaims();
+		int remainingCodenameClaims = playerProfile.getPlayerData().getRemainingCodenameClaims();
 		if (!tutorialStates.contains(TutorialState.NAME_SELECTION) && remainingCodenameClaims > 0) {
 			playerProfile.claimCodeName();
 		}
@@ -340,7 +330,7 @@ private void initialize() throws RequestFailedException {
 	public void getAssetDigest() throws RequestFailedException {
 		GetAssetDigestMessage message = CommonRequests.getGetAssetDigestMessageRequest(this);
 		ServerRequest request = new ServerRequest(RequestType.GET_ASSET_DIGEST, message);
-		getRequestHandler().sendServerRequests(request, true);
+		requestHandler.sendServerRequests(request, true);
 	}
 
 	/**
@@ -395,8 +385,8 @@ public void setLocation(double latitude, double longitude, double altitude) {
 	public void setLocation(double latitude, double longitude, double altitude, double accuracy) {
 		setLatitude(latitude);
 		setLongitude(longitude);
-		setAltitude(altitude);
-		setAccuracy(accuracy);
+		//setAltitude(altitude);
+		//setAccuracy(accuracy);
 	}
 
 	public long currentTimeMillis() {
@@ -486,7 +476,7 @@ public SignatureOuterClass.Signature.DeviceInfo getDeviceInfo() {
 	 * @return the sensor info
 	 */
 	public SignatureOuterClass.Signature.SensorInfo getSensorSignature(long currentTime, Random random) {
-		if (this.sensorInfo == null || sensorInfo.getTimestampCreate() != 0L) {
+		if (this.sensorInfo == null || sensorInfo.timestampCreate != 0L) {
 			return SensorInfo.getDefault(this, currentTime, random);
 		}
 		return sensorInfo.getSensorInfo();
@@ -620,7 +610,7 @@ public boolean verifyChallenge(String token) throws RequestFailedException {
 		hasChallenge = false;
 		VerifyChallengeMessage message = VerifyChallengeMessage.newBuilder().setToken(token).build();
 		ServerRequest request = new ServerRequest(RequestType.VERIFY_CHALLENGE, message);
-		ByteString responseData = getRequestHandler().sendServerRequests(request, true);
+		ByteString responseData = requestHandler.sendServerRequests(request, true);
 		try {
 			VerifyChallengeResponse response = VerifyChallengeResponse.parseFrom(responseData);
 			hasChallenge = !response.getSuccess();
@@ -648,7 +638,7 @@ public String checkChallenge() throws RequestFailedException {
 		CheckChallengeMessage message = CheckChallengeMessage.newBuilder().build();
 		try {
 			ServerRequest request = new ServerRequest(RequestType.CHECK_CHALLENGE, message);
-			ByteString responseData = getRequestHandler().sendServerRequests(request, false);
+			ByteString responseData = requestHandler.sendServerRequests(request, false);
 			CheckChallengeResponse response = CheckChallengeResponse.parseFrom(responseData);
 			String newChallenge = response.getChallengeUrl();
 			if (response.getShowChallenge() && newChallenge != null && newChallenge.length() > 0) {
@@ -665,7 +655,7 @@ public String checkChallenge() throws RequestFailedException {
 	 * @return the current player position in Point form
 	 */
 	public Point getPoint() {
-		return new Point(this.getLatitude(), this.getLongitude());
+		return new Point(this.latitude, this.longitude);
 	}
 
 	/**

library/src/main/java/com/pokegoapi/api/device/ActivityStatus.java

@@ -43,10 +43,10 @@ public ActivityStatus() {
 	 */
 	public static SignatureOuterClass.Signature.ActivityStatus getDefault(PokemonGo api, Random random) {
 		boolean tilting = random.nextInt() % 2 == 0;
-		ActivityStatus activityStatus = api.getActivityStatus();
+		ActivityStatus activityStatus = api.activityStatus;
 		if (activityStatus == null) {
 			activityStatus = new ActivityStatus();
-			api.setActivityStatus(activityStatus);
+			api.activityStatus = activityStatus;
 		}
 		activityStatus.setStationary(true);
 		if (tilting) {

library/src/main/java/com/pokegoapi/api/device/DeviceInfo.java

@@ -92,7 +92,7 @@ private static String bytesToHex(byte[] bytes) {
 	 */
 	public static DeviceInfo getDefault(PokemonGo api) {
 		DeviceInfo deviceInfo = new DeviceInfo();
-		Random random = new Random(api.getSeed());
+		Random random = new Random(api.seed);
 		byte[] bytes = new byte[16];
 		random.nextBytes(bytes);
 		String[] device = DEVICES[random.nextInt(DEVICES.length)];

library/src/main/java/com/pokegoapi/api/device/LocationFixes.java

@@ -40,7 +40,7 @@ public LocationFixes() {
 	 */
 	public static LocationFixes getDefault(PokemonGo api, RequestEnvelopeOuterClass.RequestEnvelope.Builder builder,
 			long currentTime, Random random) {
-		if (Double.isNaN(api.getLatitude()) || Double.isNaN(api.getLongitude())) {
+		if (Double.isNaN(api.latitude) || Double.isNaN(api.longitude)) {
 			return new LocationFixes();
 		}
 
@@ -60,9 +60,9 @@ public static LocationFixes getDefault(PokemonGo api, RequestEnvelopeOuterClass.
 
 		int chance = random.nextInt(100);
 		LocationFixes locationFixes;
-		if (api.getLocationFixes() == null) {
+		if (api.locationFixes == null) {
 			locationFixes = new LocationFixes();
-			api.setLocationFixes(locationFixes);
+			api.locationFixes = locationFixes;
 			providerCount = pn < 75 ? 6 : pn < 95 ? 5 : 8;
 			if (providerCount != 8) {
 				// a 5% chance that the second provider got a negative value else it should be the first only
@@ -77,12 +77,12 @@ public static LocationFixes getDefault(PokemonGo api, RequestEnvelopeOuterClass.
 				}
 			}
 		} else {
-			locationFixes = api.getLocationFixes();
+			locationFixes = api.locationFixes;
 			locationFixes.clear();
 
-			boolean expired = currentTime - locationFixes.getTimestampCreate() < (random.nextInt(10000) + 5000);
+			boolean expired = currentTime - locationFixes.timestampCreate < (random.nextInt(10000) + 5000);
 			if (empty || (!hasMapUpdate && expired)) {
-				locationFixes.setTimestampCreate(currentTime);
+				locationFixes.timestampCreate = currentTime;
 				return locationFixes;
 			} else if (hasMapUpdate) {
 				providerCount = chance >= 90 ? 2 : 1;
@@ -91,17 +91,17 @@ public static LocationFixes getDefault(PokemonGo api, RequestEnvelopeOuterClass.
 			}
 		}
 
-		locationFixes.setTimestampCreate(currentTime);
+		locationFixes.timestampCreate = currentTime;
 
 		for (int i = 0; i < providerCount; i++) {
-			float latitude = (float) api.getLatitude();
-			float longitude = (float) api.getLongitude();
+			float latitude = (float) api.latitude;
+			float longitude = (float) api.longitude;
 			if (i < providerCount - 1) {
-				latitude = offsetOnLatLong(api.getLatitude(), random.nextInt(100) + 10);
-				longitude = offsetOnLatLong(api.getLongitude(), random.nextInt(100) + 10);
+				latitude = offsetOnLatLong(api.latitude, random.nextInt(100) + 10);
+				longitude = offsetOnLatLong(api.longitude, random.nextInt(100) + 10);
 			}
 
-			float altitude = (float) api.getAltitude();
+			float altitude = (float) api.altitude;
 			float verticalAccuracy = (float) (15 + (23 - 15) * random.nextDouble());
 
 			// Fake errors
@@ -121,11 +121,11 @@ public static LocationFixes getDefault(PokemonGo api, RequestEnvelopeOuterClass.
 					.setTimestampSnapshot(
 							contains(negativeSnapshotProviders, i)
 									? random.nextInt(1000) - 3000
-									: currentTime - api.getStartTime()
+									: currentTime - api.startTime
 											+ (150 * (i + 1) + random.nextInt(250 * (i + 1) - (150 * (i + 1)))))
 					.setLatitude(latitude)
 					.setLongitude(longitude)
-					.setHorizontalAccuracy((float) api.getAccuracy())
+					.setHorizontalAccuracy((float) api.accuracy)
 					.setAltitude(altitude)
 					.setVerticalAccuracy(verticalAccuracy)
 					.setProviderStatus(3L)

library/src/main/java/com/pokegoapi/api/device/SensorInfo.java

@@ -32,7 +32,7 @@ public class SensorInfo {
 
 	@Setter
 	@Getter
-	private long timestampCreate;
+	public long timestampCreate;
 
 	public SensorInfo() {
 		sensorInfoBuilder = SignatureOuterClass.Signature.SensorInfo.newBuilder();
@@ -73,10 +73,10 @@ public SensorInfo(SensorInfos sensorInfos) {
 	 */
 	public static SignatureOuterClass.Signature.SensorInfo getDefault(PokemonGo api, long currentTime, Random random) {
 		SensorInfo sensorInfo;
-		if (api.getSensorInfo() == null) {
+		if (api.sensorInfo == null) {
 			sensorInfo = new SensorInfo();
 			sensorInfo.getBuilder()
-				.setTimestampSnapshot(currentTime - api.getStartTime() + random.nextInt(500))
+				.setTimestampSnapshot(currentTime - api.startTime + random.nextInt(500))
 				.setRotationRateX(0.1 + 0.6 * random.nextDouble())
 				.setRotationRateY(0.1 + 0.7000000000000001 * random.nextDouble())
 				.setRotationRateZ(0.1 + 0.7000000000000001 * random.nextDouble())
@@ -88,11 +88,11 @@ public static SignatureOuterClass.Signature.SensorInfo getDefault(PokemonGo api,
 				.setGravityZ(-1.0 + random.nextDouble() * 2.0)
 				.setMagneticFieldAccuracy(-1)
 				.setStatus(3);
-			api.setSensorInfo(sensorInfo);
+			api.sensorInfo = sensorInfo;
 		} else {
-			sensorInfo = api.getSensorInfo();
+			sensorInfo = api.sensorInfo;
 			sensorInfo.getBuilder()
-				.setTimestampSnapshot(currentTime - api.getStartTime() + random.nextInt(500))
+				.setTimestampSnapshot(currentTime - api.startTime + random.nextInt(500))
 				.setLinearAccelerationX(-0.7 + random.nextDouble() * 1.4)
 				.setLinearAccelerationY(-0.7 + random.nextDouble() * 1.4)
 				.setLinearAccelerationZ(-0.7 + random.nextDouble() * 1.4)
@@ -108,8 +108,8 @@ public static SignatureOuterClass.Signature.SensorInfo getDefault(PokemonGo api,
 				.setMagneticFieldAccuracy(-1)
 				.setStatus(3);
 		}
-		if (currentTime - sensorInfo.getTimestampCreate() > (random.nextInt(10000) + 5000)) {
-			sensorInfo.setTimestampCreate(currentTime);
+		if (currentTime - sensorInfo.timestampCreate > (random.nextInt(10000) + 5000)) {
+			sensorInfo.timestampCreate = currentTime;
 			return sensorInfo.getSensorInfo();
 		}
 		return null;