From 49e9d36e06c5f9252f4c27b2110e1cb56d42f0b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?--=3DFurtiF=E2=84=A2=3D--?= Date: Thu, 30 Nov 2017 23:03:11 +0100 Subject: [PATCH 01/13] new api support --- Constants.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Constants.cs b/Constants.cs index d633460..825adb1 100644 --- a/Constants.cs +++ b/Constants.cs @@ -36,7 +36,7 @@ public static class Constants public const string ApiEndPoint = "api/v153_2/hash"; public const string API_VERSION = "0.83.2"; - public const uint AppVersion = 8300; + public const uint AppVersion = 8302; public const long Unknown25 = unchecked((long)0x2AC22400401779DE); public const string UnknownPlat8Field = "15c79df0558009a4242518d2ab65de2a59e09499"; From f556f2fcb735375b1301ae71d9d7fd3084acc70b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?--=3DFurtiF=E2=84=A2=3D--?= Date: Fri, 1 Dec 2017 00:02:37 +0100 Subject: [PATCH 02/13] ops fix --- Constants.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Constants.cs b/Constants.cs index 825adb1..d633460 100644 --- a/Constants.cs +++ b/Constants.cs @@ -36,7 +36,7 @@ public static class Constants public const string ApiEndPoint = "api/v153_2/hash"; public const string API_VERSION = "0.83.2"; - public const uint AppVersion = 8302; + public const uint AppVersion = 8300; public const long Unknown25 = unchecked((long)0x2AC22400401779DE); public const string UnknownPlat8Field = "15c79df0558009a4242518d2ab65de2a59e09499"; From b5ec5bbea17966693263e6a5d01c41373872931a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?--=3DFurtiF=E2=84=A2=3D--?= Date: Tue, 5 Dec 2017 16:06:24 +0100 Subject: [PATCH 03/13] Update ptc heads --- Constants.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Constants.cs b/Constants.cs index d633460..a79de6a 100644 --- a/Constants.cs +++ b/Constants.cs @@ -17,7 +17,7 @@ public static class Constants public const string LoginUserAgent = "pokemongo/1 CFNetwork/893.10 Darwin/17.3.0"; //iOS 11.2.0 public const string LoginManufactor = "X-Unity-Version"; - public const string LoginManufactorVersion = "5.5.1f1";//"5.6.1f1"; + public const string LoginManufactorVersion = "2017.1.2f1"; //"5.5.1f1";//"5.6.1f1"; public const string LoginHostValue = "sso.pokemon.com"; public const string LoginOauthUrl = "https://sso.pokemon.com/sso/oauth2.0/accessToken"; public const string Connection = "keep-alive"; From 7ed083bb3fa9ea014783ee2529131edad19a410d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?--=3DFurtiF=E2=84=A2=3D--?= Date: Wed, 6 Dec 2017 15:19:59 +0100 Subject: [PATCH 04/13] update, common requests have changed: - checkChallenge is not more - downloadSettings is always there now --- Helpers/CommonRequest.cs | 27 ----- Rpc/BaseRpc.cs | 18 ---- Rpc/Download.cs | 55 ++++------- Rpc/Encounter.cs | 77 ++++++--------- Rpc/Fort.cs | 209 ++++++++++++++------------------------- Rpc/Inventory.cs | 176 ++++++++++++--------------------- Rpc/Map.cs | 22 ++--- Rpc/Misc.cs | 167 +++++++++++-------------------- Rpc/Player.cs | 180 +++++++++++---------------------- 9 files changed, 314 insertions(+), 617 deletions(-) diff --git a/Helpers/CommonRequest.cs b/Helpers/CommonRequest.cs index e8d44b7..1235a59 100644 --- a/Helpers/CommonRequest.cs +++ b/Helpers/CommonRequest.cs @@ -108,19 +108,6 @@ public static Request GetDefaultGetHoloInventoryMessage(Client client) }; } - public static Request[] AppendCheckChallenge(Request request) - { - return new[] - { - request, - new Request - { - RequestType = RequestType.CheckChallenge, - RequestMessage = new CheckChallengeMessage().ToByteString() - } - }; - } - public static Request GetVerifyChallenge(string token) { return new Request @@ -146,11 +133,6 @@ public static List GetCommonRequests(Client client, params RequestType[ { List commonRequestsList = new List { - new Request - { - RequestType = RequestType.CheckChallenge, - RequestMessage = new CheckChallengeMessage().ToByteString() - }, new Request { RequestType = RequestType.GetHatchedEggs, @@ -215,15 +197,6 @@ public static void ProcessDownloadSettingsResponse(Client client, DownloadSettin } } - public static void ProcessCheckChallengeResponse(Client client, CheckChallengeResponse checkChallengeResponse) - { - if (checkChallengeResponse == null) - return; - - if (checkChallengeResponse.ShowChallenge) - throw new CaptchaException(checkChallengeResponse.ChallengeUrl); - } - public static void ProcessGetPlayerResponse(Client client, GetPlayerResponse getPlayerResponse) { if (getPlayerResponse == null) diff --git a/Rpc/BaseRpc.cs b/Rpc/BaseRpc.cs index a89d2a8..1264b0c 100644 --- a/Rpc/BaseRpc.cs +++ b/Rpc/BaseRpc.cs @@ -106,24 +106,6 @@ protected async Task> PostProtoPayload> PostProtoPayload( - RequestEnvelope requestEnvelope) where TRequest : IMessage - where T1 : class, IMessage, new() - where T2 : class, IMessage, new() - where T3 : class, IMessage, new() - where T4 : class, IMessage, new() - where T5 : class, IMessage, new() - where T6 : class, IMessage, new() - where T7 : class, IMessage, new() - { - var responses = - await - PostProtoPayload(requestEnvelope, typeof(T1), typeof(T2), typeof(T3), typeof(T4), - typeof(T5), typeof(T6), typeof(T7)).ConfigureAwait(false); - return new Tuple(responses[0] as T1, responses[1] as T2, responses[2] as T3, - responses[3] as T4, responses[4] as T5, responses[5] as T6, responses[6] as T7); - } - protected async Task PostProtoPayload(RequestEnvelope requestEnvelope, params Type[] responseTypes) where TRequest : IMessage { diff --git a/Rpc/Download.cs b/Rpc/Download.cs index d15f223..32a7b85 100644 --- a/Rpc/Download.cs +++ b/Rpc/Download.cs @@ -38,23 +38,20 @@ public async Task GetItemTemplates() var requestEnvelope = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(downloadItemTemplatesRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (requestEnvelope).ConfigureAwait(false); DownloadItemTemplatesResponse downloadItemTemplatesResponse = response.Item1; ItemTemplates = downloadItemTemplatesResponse.ItemTemplates; PokemonMeta.Update(downloadItemTemplatesResponse); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -64,19 +61,16 @@ public async Task GetRemoteConfigVersion() { var requestEnvelope = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(CommonRequest.GetDownloadRemoteConfigVersionMessageRequest(Client), Client, RequestType.GetBuddyWalked)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (requestEnvelope).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -86,19 +80,16 @@ public async Task GetAssetDigest() { var requestEnvelope = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(CommonRequest.GetGetAssetDigestMessageRequest(Client), Client, RequestType.GetBuddyWalked)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (requestEnvelope).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -117,19 +108,16 @@ public async Task GetDownloadUrls(IEnumerable a var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(getDownloadUrlsRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -150,22 +138,19 @@ public async Task DownloadGmTemplates(long basisBat var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(DownloadGmTemplatesRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); /* * maybe not needed * - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); */ diff --git a/Rpc/Encounter.cs b/Rpc/Encounter.cs index 358a985..31ba325 100644 --- a/Rpc/Encounter.cs +++ b/Rpc/Encounter.cs @@ -36,19 +36,16 @@ public async Task EncounterPokemon(ulong encounterId, string var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(encounterPokemonRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -69,19 +66,16 @@ public async Task UseCaptureItem(ulong encounterId, Item var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(useCaptureItemRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -103,19 +97,16 @@ public async Task UseItemEncounter(ulong encounterId, var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(useCaptureItemRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -142,19 +133,16 @@ public async Task CatchPokemon(ulong encounterId, string s var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(catchPokemonRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -174,19 +162,16 @@ public async Task EncounterIncensePokemon(ulong encoun var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(encounterIncensePokemonRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -208,19 +193,16 @@ public async Task EncounterLurePokemon(ulong encounterId, var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(encounterLurePokemonRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -239,19 +221,16 @@ public async Task EncounterTutorialComplete(P var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(encounterTutorialCompleteRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; diff --git a/Rpc/Fort.cs b/Rpc/Fort.cs index 6bee436..3d75bf3 100644 --- a/Rpc/Fort.cs +++ b/Rpc/Fort.cs @@ -39,19 +39,16 @@ public async Task GetFort(string fortId, double fortLatitud var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(getFortRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -74,19 +71,16 @@ public async Task SearchFort(string fortId, double fortLat, var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(searchFortRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); // Update LastMapObject to mark fort as being used @@ -118,19 +112,16 @@ public async Task AddFortModifier(string fortId, ItemId var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(addFortModifierRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -160,19 +151,16 @@ public async Task GymBattleAttak(string fortId, string var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(gymBattleAttackGymRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -195,19 +183,16 @@ public async Task FortDeployPokemon(string fortId, ul var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(fortDeployPokemonRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -229,19 +214,16 @@ public async Task FortRecallPokemon(string fortId, ul var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(fortRecallPokemonRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -265,19 +247,16 @@ public async Task GymGetInfo(string gymId, double gymLat, do var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(getGymDetailsRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -301,19 +280,16 @@ public async Task GymStartSession(string gymId, ulong d var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(startGymBattleRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -338,19 +314,16 @@ public async Task GymFeedPokemon(string gymId, ItemId it var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(GymFeedPokemonRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -373,19 +346,16 @@ public async Task UseItemInGym(string gymId, ItemId itemId) var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(useItemInGymRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -407,19 +377,16 @@ public async Task GetGymBadgeDetails(string fortId, var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(GetGymBadgeDetailsRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -442,19 +409,16 @@ public async Task GymDeploy(string fortId, ulong pokemonId) var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(GymDeploynRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -476,19 +440,16 @@ public async Task GetRaidDetails(string gymId, long raid var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(setGetRaidDetailsRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -510,19 +471,16 @@ public async Task StartRaidBattle(string gymId, long ra var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(StartRaidBattleRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -544,19 +502,16 @@ public async Task AttackRaidBattle(string gymId, long var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(AttackRaidBattleRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -579,19 +534,16 @@ public async Task JoinLobby(string gymId, long raidSeed, bool var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(AttackRaidBattleRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -611,19 +563,16 @@ public async Task LeaveLobby(string gymId, long raidSeed) var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(LeaveLobbyRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -643,19 +592,16 @@ public async Task SetLobbyPokemon(string gymId, long ra var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(SetLobbyPokemonRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -675,19 +621,16 @@ public async Task SetLobbyVisibility(string gymId, l var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(SetLobbyVisibilityRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; diff --git a/Rpc/Inventory.cs b/Rpc/Inventory.cs index a529e15..5572add 100644 --- a/Rpc/Inventory.cs +++ b/Rpc/Inventory.cs @@ -190,19 +190,16 @@ public async Task TransferPokemon(ulong pokemonId) var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(transferPokemonRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); ReleasePokemonResponse releaseResponse = response.Item1; @@ -230,19 +227,16 @@ public async Task TransferPokemons(List pokemonId var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(transferPokemonRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); ReleasePokemonResponse releaseResponse = response.Item1; @@ -272,19 +266,16 @@ public async Task EvolvePokemon(ulong pokemonId, ItemId i var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(evolvePokemonRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); EvolvePokemonResponse evolveResponse = response.Item1; @@ -304,19 +295,16 @@ public async Task UpgradePokemon(ulong pokemonId) var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(upgradePokemonRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); UpgradePokemonResponse upgradePokemonResponse = response.Item1; @@ -327,19 +315,16 @@ public async Task GetInventory() { var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.GetCommonRequests(Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item1; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item2; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item4; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return getHoloInventoryResponse; @@ -359,19 +344,16 @@ public async Task RecycleItem(ItemId itemId, int a var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(recycleItemRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -390,19 +372,16 @@ public async Task UseItemXpBoost() var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(useItemXpBoostRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -422,19 +401,16 @@ public async Task UseItemEggIncubator(string itemId var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(useItemEggIncubatorRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -450,19 +426,16 @@ public async Task GetHatchedEgg() var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(getHatchedEggRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -482,19 +455,16 @@ public async Task UseItemPotion(ItemId itemId, ulong poke var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(useItemPotionRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -514,19 +484,16 @@ public async Task UseItemRevive(ItemId itemId, ulong poke var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(useItemReviveRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -545,19 +512,16 @@ public async Task UseIncense(ItemId incenseType) var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(useIncenseRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -577,19 +541,16 @@ public async Task NicknamePokemon(ulong pokemonId, stri var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(nicknamePokemonRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -609,19 +570,16 @@ public async Task SetFavoritePokemon(ulong pokemonId var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(setFavoritePokemonRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -642,19 +600,16 @@ public async Task UseRareCandy(ItemId itemId, PokemonI var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(UseItemRareCandyRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -674,19 +629,16 @@ public async Task UseItemMoveReroll(ItemId itemId, ul var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(UseItemMoveRerollRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; diff --git a/Rpc/Map.cs b/Rpc/Map.cs index e4111cd..1b339c6 100644 --- a/Rpc/Map.cs +++ b/Rpc/Map.cs @@ -109,21 +109,18 @@ public async Task GetMapObjects(bool force = false, bool var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(getMapObjectsRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - LastRpcMapObjectsRequestMs = Util.TimeUtil.GetCurrentTimestampInMilliseconds(); var numCells = response.Item1.MapCells.Count; @@ -166,19 +163,16 @@ public async Task GetIncensePokemons() var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(getIncensePokemonsRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; diff --git a/Rpc/Misc.cs b/Rpc/Misc.cs index c1e897f..20f04dd 100644 --- a/Rpc/Misc.cs +++ b/Rpc/Misc.cs @@ -34,19 +34,16 @@ public async Task ClaimCodename(string codename) var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(claimCodenameRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -62,19 +59,16 @@ public async Task SendEcho() var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(sendEchoRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -96,19 +90,16 @@ public async Task MarkTutorialComplete( var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(markTutorialCompleteRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -127,19 +118,16 @@ public async Task SfidaRegistration(string sfidaId) var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(SfidaRegistrationRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -158,19 +146,16 @@ public async Task SfidaActionLog() var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(SfidaActionLogRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -189,19 +174,16 @@ public async Task SfidaAction() var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(SfidaActionRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -220,19 +202,16 @@ public async Task SfidaCapture() var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(SfidaCaptureRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -251,19 +230,16 @@ public async Task SfidaCertification() var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(SfidaCertificationRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -282,19 +258,16 @@ public async Task SfidaDowser() var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(SfidaDowserRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -313,19 +286,16 @@ public async Task SfidaUpdate() var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(SfidaUpdateRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -346,19 +316,16 @@ public async Task GetInbox(bool isHistory, bool isReverse, lon var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(GetInboxRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -379,19 +346,16 @@ public async Task UpdateNotification(RepeatedField response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -411,19 +375,16 @@ public async Task RegisterPushNotification(Apn var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(RegisterPushNotificationRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -443,19 +404,16 @@ public async Task UnregisterPushNotification(A var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(UnregisterPushNotificationRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -474,18 +432,15 @@ public async Task OptOutPushNotification var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(OptOutPushNotificationCategoryRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); /* * not needed * - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); @@ -509,13 +464,9 @@ public async Task RandomAPICall() break; case 2: - await Client.Player.CheckChallenge().ConfigureAwait(false); - break; - - case 3: await Client.Player.GetNewlyAwardedBadges().ConfigureAwait(false); break; - case 4: + case 3: await Client.Player.GetPlayerProfile().ConfigureAwait(false); break; default: diff --git a/Rpc/Player.cs b/Rpc/Player.cs index 38e40d2..0a5048c 100644 --- a/Rpc/Player.cs +++ b/Rpc/Player.cs @@ -62,19 +62,16 @@ public void UpdatePlayerLocation(double latitude, double longitude, double altit //var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(updatePlayerLocationRequest, Client)).ConfigureAwait(false); - //Tuple response = + //Tuple response = // await // PostProtoPayload - // (request).ConfigureAwait(false); - //CheckChallengeResponse checkChallengeResponse = response.Item2; - //CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - //GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + //GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; //CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - //DownloadSettingsResponse downloadSettingsResponse = response.Item6; + //DownloadSettingsResponse downloadSettingsResponse = response.Item5; //CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); //return response.Item1; @@ -93,19 +90,16 @@ public async Task SelectBuddy(ulong pokemonId) var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(selectBuddyRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -145,39 +139,23 @@ public async Task GetPlayer(bool addCommonRequests = true, bo { var requestEnvelope = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(getPlayerRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (requestEnvelope).ConfigureAwait(false); GetPlayerResponse getPlayerResponse = response.Item1; CommonRequest.ProcessGetPlayerResponse(Client, getPlayerResponse); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; - } - if (addChallengeRequests) - { - var challengeRequest = new Request - { - RequestType = RequestType.CheckChallenge, - RequestMessage = new CheckChallengeMessage().ToByteString() - }; - var requestEnvelope = await GetRequestBuilder().GetRequestEnvelope(new Request[] { getPlayerRequest,challengeRequest }).ConfigureAwait(false); - Tuple response = await PostProtoPayload(requestEnvelope).ConfigureAwait(false); - CommonRequest.ProcessGetPlayerResponse(Client, response.Item1); - - return response.Item1; - } + } else { var requestEnvelope = await GetRequestBuilder().GetRequestEnvelope(new Request[] { getPlayerRequest }).ConfigureAwait(false); @@ -201,19 +179,16 @@ public async Task GetPlayerProfile() var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(getPlayerProfileRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -230,19 +205,16 @@ public async Task GetNewlyAwardedBadges() var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(getNewlyAwardedBadgesRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -259,19 +231,16 @@ public async Task CollectDailyBonus() var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(collectDailyBonusRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -288,19 +257,16 @@ public async Task CollectDailyDefenderBonus() var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(collectDailyDefenderBonusRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -319,19 +285,16 @@ public async Task EquipBadge(BadgeType type) var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(equipBadgeRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -350,19 +313,16 @@ public async Task GetLevelUpRewards(int level) var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(levelUpRewardsRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -381,19 +341,16 @@ public async Task SetAvatar(PlayerAvatar playerAvatar) var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(setAvatarRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -412,19 +369,16 @@ public async Task SetContactSetting(ContactSettings var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(setContactSettingRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -443,24 +397,21 @@ public async Task SetPlayerTeam(TeamColor teamColor) var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(setPlayerTeamRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; } - + public async Task CheckChallenge() { var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.GetCommonRequests(Client)).ConfigureAwait(false); @@ -471,11 +422,6 @@ public async Task CheckChallenge() (request).ConfigureAwait(false); - // This is commented out because the assumption is that you are calling CheckChallenge() directly - // to get a new challenge url. So don't throw the exception below. - // CheckChallengeResponse checkChallengeResponse = response.Item1; - // CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); @@ -484,7 +430,7 @@ public async Task CheckChallenge() return response.Item1; } - + public async Task VerifyChallenge(string token) { var verifyChallengeRequest = new Request @@ -498,21 +444,16 @@ public async Task VerifyChallenge(string token) var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(verifyChallengeRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - // This is commented out because the assumption is that you are trying to verify the captcha, - // so don't throw any exceptions. - // CheckChallengeResponse checkChallengeResponse = response.Item2; - // CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -536,19 +477,16 @@ public async Task ListAvatarCustomizations(Pla var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(setPlayerTeamRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - CheckChallengeResponse checkChallengeResponse = response.Item2; - CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); - - GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item6; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; From 0e63b66506ceba415fdf3f4d1c3cee0dadd5e377 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?--=3DFurtiF=E2=84=A2=3D--?= Date: Thu, 7 Dec 2017 17:10:28 +0100 Subject: [PATCH 05/13] check_challenge is back --- Helpers/CommonRequest.cs | 27 +++++ Rpc/BaseRpc.cs | 18 ++++ Rpc/Download.cs | 55 +++++++---- Rpc/Encounter.cs | 77 +++++++++------ Rpc/Fort.cs | 209 +++++++++++++++++++++++++-------------- Rpc/Inventory.cs | 176 +++++++++++++++++++++------------ Rpc/Map.cs | 22 +++-- Rpc/Misc.cs | 167 ++++++++++++++++++++----------- Rpc/Player.cs | 180 ++++++++++++++++++++++----------- 9 files changed, 617 insertions(+), 314 deletions(-) diff --git a/Helpers/CommonRequest.cs b/Helpers/CommonRequest.cs index 1235a59..e8d44b7 100644 --- a/Helpers/CommonRequest.cs +++ b/Helpers/CommonRequest.cs @@ -108,6 +108,19 @@ public static Request GetDefaultGetHoloInventoryMessage(Client client) }; } + public static Request[] AppendCheckChallenge(Request request) + { + return new[] + { + request, + new Request + { + RequestType = RequestType.CheckChallenge, + RequestMessage = new CheckChallengeMessage().ToByteString() + } + }; + } + public static Request GetVerifyChallenge(string token) { return new Request @@ -133,6 +146,11 @@ public static List GetCommonRequests(Client client, params RequestType[ { List commonRequestsList = new List { + new Request + { + RequestType = RequestType.CheckChallenge, + RequestMessage = new CheckChallengeMessage().ToByteString() + }, new Request { RequestType = RequestType.GetHatchedEggs, @@ -197,6 +215,15 @@ public static void ProcessDownloadSettingsResponse(Client client, DownloadSettin } } + public static void ProcessCheckChallengeResponse(Client client, CheckChallengeResponse checkChallengeResponse) + { + if (checkChallengeResponse == null) + return; + + if (checkChallengeResponse.ShowChallenge) + throw new CaptchaException(checkChallengeResponse.ChallengeUrl); + } + public static void ProcessGetPlayerResponse(Client client, GetPlayerResponse getPlayerResponse) { if (getPlayerResponse == null) diff --git a/Rpc/BaseRpc.cs b/Rpc/BaseRpc.cs index 1264b0c..a89d2a8 100644 --- a/Rpc/BaseRpc.cs +++ b/Rpc/BaseRpc.cs @@ -106,6 +106,24 @@ protected async Task> PostProtoPayload> PostProtoPayload( + RequestEnvelope requestEnvelope) where TRequest : IMessage + where T1 : class, IMessage, new() + where T2 : class, IMessage, new() + where T3 : class, IMessage, new() + where T4 : class, IMessage, new() + where T5 : class, IMessage, new() + where T6 : class, IMessage, new() + where T7 : class, IMessage, new() + { + var responses = + await + PostProtoPayload(requestEnvelope, typeof(T1), typeof(T2), typeof(T3), typeof(T4), + typeof(T5), typeof(T6), typeof(T7)).ConfigureAwait(false); + return new Tuple(responses[0] as T1, responses[1] as T2, responses[2] as T3, + responses[3] as T4, responses[4] as T5, responses[5] as T6, responses[6] as T7); + } + protected async Task PostProtoPayload(RequestEnvelope requestEnvelope, params Type[] responseTypes) where TRequest : IMessage { diff --git a/Rpc/Download.cs b/Rpc/Download.cs index 32a7b85..d15f223 100644 --- a/Rpc/Download.cs +++ b/Rpc/Download.cs @@ -38,20 +38,23 @@ public async Task GetItemTemplates() var requestEnvelope = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(downloadItemTemplatesRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (requestEnvelope).ConfigureAwait(false); DownloadItemTemplatesResponse downloadItemTemplatesResponse = response.Item1; ItemTemplates = downloadItemTemplatesResponse.ItemTemplates; PokemonMeta.Update(downloadItemTemplatesResponse); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -61,16 +64,19 @@ public async Task GetRemoteConfigVersion() { var requestEnvelope = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(CommonRequest.GetDownloadRemoteConfigVersionMessageRequest(Client), Client, RequestType.GetBuddyWalked)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (requestEnvelope).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -80,16 +86,19 @@ public async Task GetAssetDigest() { var requestEnvelope = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(CommonRequest.GetGetAssetDigestMessageRequest(Client), Client, RequestType.GetBuddyWalked)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (requestEnvelope).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -108,16 +117,19 @@ public async Task GetDownloadUrls(IEnumerable a var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(getDownloadUrlsRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -138,19 +150,22 @@ public async Task DownloadGmTemplates(long basisBat var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(DownloadGmTemplatesRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); /* * maybe not needed * - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); */ diff --git a/Rpc/Encounter.cs b/Rpc/Encounter.cs index 31ba325..358a985 100644 --- a/Rpc/Encounter.cs +++ b/Rpc/Encounter.cs @@ -36,16 +36,19 @@ public async Task EncounterPokemon(ulong encounterId, string var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(encounterPokemonRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -66,16 +69,19 @@ public async Task UseCaptureItem(ulong encounterId, Item var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(useCaptureItemRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -97,16 +103,19 @@ public async Task UseItemEncounter(ulong encounterId, var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(useCaptureItemRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -133,16 +142,19 @@ public async Task CatchPokemon(ulong encounterId, string s var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(catchPokemonRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -162,16 +174,19 @@ public async Task EncounterIncensePokemon(ulong encoun var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(encounterIncensePokemonRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -193,16 +208,19 @@ public async Task EncounterLurePokemon(ulong encounterId, var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(encounterLurePokemonRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -221,16 +239,19 @@ public async Task EncounterTutorialComplete(P var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(encounterTutorialCompleteRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; diff --git a/Rpc/Fort.cs b/Rpc/Fort.cs index 3d75bf3..6bee436 100644 --- a/Rpc/Fort.cs +++ b/Rpc/Fort.cs @@ -39,16 +39,19 @@ public async Task GetFort(string fortId, double fortLatitud var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(getFortRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -71,16 +74,19 @@ public async Task SearchFort(string fortId, double fortLat, var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(searchFortRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); // Update LastMapObject to mark fort as being used @@ -112,16 +118,19 @@ public async Task AddFortModifier(string fortId, ItemId var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(addFortModifierRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -151,16 +160,19 @@ public async Task GymBattleAttak(string fortId, string var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(gymBattleAttackGymRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -183,16 +195,19 @@ public async Task FortDeployPokemon(string fortId, ul var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(fortDeployPokemonRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -214,16 +229,19 @@ public async Task FortRecallPokemon(string fortId, ul var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(fortRecallPokemonRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -247,16 +265,19 @@ public async Task GymGetInfo(string gymId, double gymLat, do var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(getGymDetailsRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -280,16 +301,19 @@ public async Task GymStartSession(string gymId, ulong d var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(startGymBattleRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -314,16 +338,19 @@ public async Task GymFeedPokemon(string gymId, ItemId it var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(GymFeedPokemonRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -346,16 +373,19 @@ public async Task UseItemInGym(string gymId, ItemId itemId) var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(useItemInGymRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -377,16 +407,19 @@ public async Task GetGymBadgeDetails(string fortId, var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(GetGymBadgeDetailsRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -409,16 +442,19 @@ public async Task GymDeploy(string fortId, ulong pokemonId) var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(GymDeploynRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -440,16 +476,19 @@ public async Task GetRaidDetails(string gymId, long raid var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(setGetRaidDetailsRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -471,16 +510,19 @@ public async Task StartRaidBattle(string gymId, long ra var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(StartRaidBattleRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -502,16 +544,19 @@ public async Task AttackRaidBattle(string gymId, long var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(AttackRaidBattleRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -534,16 +579,19 @@ public async Task JoinLobby(string gymId, long raidSeed, bool var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(AttackRaidBattleRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -563,16 +611,19 @@ public async Task LeaveLobby(string gymId, long raidSeed) var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(LeaveLobbyRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -592,16 +643,19 @@ public async Task SetLobbyPokemon(string gymId, long ra var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(SetLobbyPokemonRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -621,16 +675,19 @@ public async Task SetLobbyVisibility(string gymId, l var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(SetLobbyVisibilityRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; diff --git a/Rpc/Inventory.cs b/Rpc/Inventory.cs index 5572add..a529e15 100644 --- a/Rpc/Inventory.cs +++ b/Rpc/Inventory.cs @@ -190,16 +190,19 @@ public async Task TransferPokemon(ulong pokemonId) var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(transferPokemonRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); ReleasePokemonResponse releaseResponse = response.Item1; @@ -227,16 +230,19 @@ public async Task TransferPokemons(List pokemonId var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(transferPokemonRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); ReleasePokemonResponse releaseResponse = response.Item1; @@ -266,16 +272,19 @@ public async Task EvolvePokemon(ulong pokemonId, ItemId i var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(evolvePokemonRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); EvolvePokemonResponse evolveResponse = response.Item1; @@ -295,16 +304,19 @@ public async Task UpgradePokemon(ulong pokemonId) var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(upgradePokemonRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); UpgradePokemonResponse upgradePokemonResponse = response.Item1; @@ -315,16 +327,19 @@ public async Task GetInventory() { var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.GetCommonRequests(Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item2; + CheckChallengeResponse checkChallengeResponse = response.Item1; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item4; + DownloadSettingsResponse downloadSettingsResponse = response.Item5; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return getHoloInventoryResponse; @@ -344,16 +359,19 @@ public async Task RecycleItem(ItemId itemId, int a var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(recycleItemRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -372,16 +390,19 @@ public async Task UseItemXpBoost() var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(useItemXpBoostRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -401,16 +422,19 @@ public async Task UseItemEggIncubator(string itemId var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(useItemEggIncubatorRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -426,16 +450,19 @@ public async Task GetHatchedEgg() var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(getHatchedEggRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -455,16 +482,19 @@ public async Task UseItemPotion(ItemId itemId, ulong poke var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(useItemPotionRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -484,16 +514,19 @@ public async Task UseItemRevive(ItemId itemId, ulong poke var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(useItemReviveRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -512,16 +545,19 @@ public async Task UseIncense(ItemId incenseType) var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(useIncenseRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -541,16 +577,19 @@ public async Task NicknamePokemon(ulong pokemonId, stri var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(nicknamePokemonRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -570,16 +609,19 @@ public async Task SetFavoritePokemon(ulong pokemonId var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(setFavoritePokemonRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -600,16 +642,19 @@ public async Task UseRareCandy(ItemId itemId, PokemonI var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(UseItemRareCandyRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -629,16 +674,19 @@ public async Task UseItemMoveReroll(ItemId itemId, ul var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(UseItemMoveRerollRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; diff --git a/Rpc/Map.cs b/Rpc/Map.cs index 1b339c6..e4111cd 100644 --- a/Rpc/Map.cs +++ b/Rpc/Map.cs @@ -109,18 +109,21 @@ public async Task GetMapObjects(bool force = false, bool var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(getMapObjectsRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + LastRpcMapObjectsRequestMs = Util.TimeUtil.GetCurrentTimestampInMilliseconds(); var numCells = response.Item1.MapCells.Count; @@ -163,16 +166,19 @@ public async Task GetIncensePokemons() var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(getIncensePokemonsRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; diff --git a/Rpc/Misc.cs b/Rpc/Misc.cs index 20f04dd..c1e897f 100644 --- a/Rpc/Misc.cs +++ b/Rpc/Misc.cs @@ -34,16 +34,19 @@ public async Task ClaimCodename(string codename) var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(claimCodenameRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -59,16 +62,19 @@ public async Task SendEcho() var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(sendEchoRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -90,16 +96,19 @@ public async Task MarkTutorialComplete( var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(markTutorialCompleteRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -118,16 +127,19 @@ public async Task SfidaRegistration(string sfidaId) var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(SfidaRegistrationRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -146,16 +158,19 @@ public async Task SfidaActionLog() var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(SfidaActionLogRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -174,16 +189,19 @@ public async Task SfidaAction() var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(SfidaActionRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -202,16 +220,19 @@ public async Task SfidaCapture() var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(SfidaCaptureRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -230,16 +251,19 @@ public async Task SfidaCertification() var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(SfidaCertificationRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -258,16 +282,19 @@ public async Task SfidaDowser() var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(SfidaDowserRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -286,16 +313,19 @@ public async Task SfidaUpdate() var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(SfidaUpdateRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -316,16 +346,19 @@ public async Task GetInbox(bool isHistory, bool isReverse, lon var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(GetInboxRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -346,16 +379,19 @@ public async Task UpdateNotification(RepeatedField response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -375,16 +411,19 @@ public async Task RegisterPushNotification(Apn var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(RegisterPushNotificationRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -404,16 +443,19 @@ public async Task UnregisterPushNotification(A var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(UnregisterPushNotificationRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -432,15 +474,18 @@ public async Task OptOutPushNotification var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(OptOutPushNotificationCategoryRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); /* * not needed * + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); @@ -464,9 +509,13 @@ public async Task RandomAPICall() break; case 2: - await Client.Player.GetNewlyAwardedBadges().ConfigureAwait(false); + await Client.Player.CheckChallenge().ConfigureAwait(false); break; + case 3: + await Client.Player.GetNewlyAwardedBadges().ConfigureAwait(false); + break; + case 4: await Client.Player.GetPlayerProfile().ConfigureAwait(false); break; default: diff --git a/Rpc/Player.cs b/Rpc/Player.cs index 0a5048c..38e40d2 100644 --- a/Rpc/Player.cs +++ b/Rpc/Player.cs @@ -62,16 +62,19 @@ public void UpdatePlayerLocation(double latitude, double longitude, double altit //var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(updatePlayerLocationRequest, Client)).ConfigureAwait(false); - //Tuple response = + //Tuple response = // await // PostProtoPayload - // (request).ConfigureAwait(false); - //GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + //CheckChallengeResponse checkChallengeResponse = response.Item2; + //CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + //GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; //CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - //DownloadSettingsResponse downloadSettingsResponse = response.Item5; + //DownloadSettingsResponse downloadSettingsResponse = response.Item6; //CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); //return response.Item1; @@ -90,16 +93,19 @@ public async Task SelectBuddy(ulong pokemonId) var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(selectBuddyRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -139,23 +145,39 @@ public async Task GetPlayer(bool addCommonRequests = true, bo { var requestEnvelope = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(getPlayerRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (requestEnvelope).ConfigureAwait(false); GetPlayerResponse getPlayerResponse = response.Item1; CommonRequest.ProcessGetPlayerResponse(Client, getPlayerResponse); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; - } + } + if (addChallengeRequests) + { + var challengeRequest = new Request + { + RequestType = RequestType.CheckChallenge, + RequestMessage = new CheckChallengeMessage().ToByteString() + }; + var requestEnvelope = await GetRequestBuilder().GetRequestEnvelope(new Request[] { getPlayerRequest,challengeRequest }).ConfigureAwait(false); + Tuple response = await PostProtoPayload(requestEnvelope).ConfigureAwait(false); + CommonRequest.ProcessGetPlayerResponse(Client, response.Item1); + + return response.Item1; + } else { var requestEnvelope = await GetRequestBuilder().GetRequestEnvelope(new Request[] { getPlayerRequest }).ConfigureAwait(false); @@ -179,16 +201,19 @@ public async Task GetPlayerProfile() var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(getPlayerProfileRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -205,16 +230,19 @@ public async Task GetNewlyAwardedBadges() var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(getNewlyAwardedBadgesRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -231,16 +259,19 @@ public async Task CollectDailyBonus() var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(collectDailyBonusRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -257,16 +288,19 @@ public async Task CollectDailyDefenderBonus() var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(collectDailyDefenderBonusRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -285,16 +319,19 @@ public async Task EquipBadge(BadgeType type) var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(equipBadgeRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -313,16 +350,19 @@ public async Task GetLevelUpRewards(int level) var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(levelUpRewardsRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -341,16 +381,19 @@ public async Task SetAvatar(PlayerAvatar playerAvatar) var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(setAvatarRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -369,16 +412,19 @@ public async Task SetContactSetting(ContactSettings var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(setContactSettingRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -397,21 +443,24 @@ public async Task SetPlayerTeam(TeamColor teamColor) var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(setPlayerTeamRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; } - + public async Task CheckChallenge() { var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.GetCommonRequests(Client)).ConfigureAwait(false); @@ -422,6 +471,11 @@ public async Task CheckChallenge() (request).ConfigureAwait(false); + // This is commented out because the assumption is that you are calling CheckChallenge() directly + // to get a new challenge url. So don't throw the exception below. + // CheckChallengeResponse checkChallengeResponse = response.Item1; + // CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); @@ -430,7 +484,7 @@ public async Task CheckChallenge() return response.Item1; } - + public async Task VerifyChallenge(string token) { var verifyChallengeRequest = new Request @@ -444,16 +498,21 @@ public async Task VerifyChallenge(string token) var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(verifyChallengeRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + // This is commented out because the assumption is that you are trying to verify the captcha, + // so don't throw any exceptions. + // CheckChallengeResponse checkChallengeResponse = response.Item2; + // CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; @@ -477,16 +536,19 @@ public async Task ListAvatarCustomizations(Pla var request = await GetRequestBuilder().GetRequestEnvelope(CommonRequest.FillRequest(setPlayerTeamRequest, Client)).ConfigureAwait(false); - Tuple response = + Tuple response = await PostProtoPayload - (request).ConfigureAwait(false); - GetHoloInventoryResponse getHoloInventoryResponse = response.Item3; + CheckChallengeResponse checkChallengeResponse = response.Item2; + CommonRequest.ProcessCheckChallengeResponse(Client, checkChallengeResponse); + + GetHoloInventoryResponse getHoloInventoryResponse = response.Item4; CommonRequest.ProcessGetHoloInventoryResponse(Client, getHoloInventoryResponse); - DownloadSettingsResponse downloadSettingsResponse = response.Item5; + DownloadSettingsResponse downloadSettingsResponse = response.Item6; CommonRequest.ProcessDownloadSettingsResponse(Client, downloadSettingsResponse); return response.Item1; From fe363e56968bf588c674d542534a380b6706315f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?--=3DFurtiF=E2=84=A2=3D--?= Date: Thu, 7 Dec 2017 17:53:05 +0100 Subject: [PATCH 06/13] update deps --- Constants.cs | 4 ++-- PokemonGo.RocketAPI.csproj | 8 ++++---- packages.config | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Constants.cs b/Constants.cs index a79de6a..c50654f 100644 --- a/Constants.cs +++ b/Constants.cs @@ -35,8 +35,8 @@ public static class Constants public const string GoogleAuthClientSig = "321187995bc7cdc2b5fc91b11a96e2baa8602c62"; public const string ApiEndPoint = "api/v153_2/hash"; - public const string API_VERSION = "0.83.2"; - public const uint AppVersion = 8300; + public const string API_VERSION = "0.85.1"; + public const uint AppVersion = 8501; public const long Unknown25 = unchecked((long)0x2AC22400401779DE); public const string UnknownPlat8Field = "15c79df0558009a4242518d2ab65de2a59e09499"; diff --git a/PokemonGo.RocketAPI.csproj b/PokemonGo.RocketAPI.csproj index 0d66310..f3d2359 100644 --- a/PokemonGo.RocketAPI.csproj +++ b/PokemonGo.RocketAPI.csproj @@ -74,8 +74,8 @@ $(SolutionDir)\packages\GeoCoordinate.NetStandard1.1.0.1\lib\netstandard1.1\GeoCoordinate.NetStandard1.dll - - $(SolutionDir)\packages\Google.Protobuf.3.4.1\lib\net45\Google.Protobuf.dll + + $(SolutionDir)\packages\Google.Protobuf.3.5.0\lib\net45\Google.Protobuf.dll $(SolutionDir)\packages\GPSOAuthSharp.NetStandard1.1.0.1\lib\netstandard1.1\GPSOAuthSharp.NetStandard1.dll @@ -86,8 +86,8 @@ $(SolutionDir)\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - - $(SolutionDir)\packages\POGOProtos.Core.2.19.1\lib\net45\POGOProtos.Core.dll + + $(SolutionDir)\packages\POGOProtos.Core.2.20.0\lib\net45\POGOProtos.Core.dll $(SolutionDir)\packages\Thrower.4.3.0\lib\net461\PommaLabs.Thrower.dll diff --git a/packages.config b/packages.config index e0d49ad..70b206e 100644 --- a/packages.config +++ b/packages.config @@ -1,7 +1,7 @@  - + @@ -11,7 +11,7 @@ - + From b4839f7c0adf4dd87a688f8c5cb7cd3ef2d743cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?--=3DFurtiF=E2=84=A2=3D--?= Date: Fri, 8 Dec 2017 19:29:20 +0100 Subject: [PATCH 07/13] set versionint --- Constants.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Constants.cs b/Constants.cs index c50654f..2f618dc 100644 --- a/Constants.cs +++ b/Constants.cs @@ -36,7 +36,7 @@ public static class Constants public const string ApiEndPoint = "api/v153_2/hash"; public const string API_VERSION = "0.85.1"; - public const uint AppVersion = 8501; + public const uint AppVersion = 8500; public const long Unknown25 = unchecked((long)0x2AC22400401779DE); public const string UnknownPlat8Field = "15c79df0558009a4242518d2ab65de2a59e09499"; From 40e3074caf19c87a6a5717df6150ad382100f12d Mon Sep 17 00:00:00 2001 From: Furtif Date: Thu, 21 Dec 2017 04:55:12 +0100 Subject: [PATCH 08/13] new api support --- Constants.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Constants.cs b/Constants.cs index 2f618dc..c151180 100644 --- a/Constants.cs +++ b/Constants.cs @@ -34,10 +34,10 @@ public static class Constants public const string GoogleAuthApp = "com.nianticlabs.pokemongo"; public const string GoogleAuthClientSig = "321187995bc7cdc2b5fc91b11a96e2baa8602c62"; - public const string ApiEndPoint = "api/v153_2/hash"; - public const string API_VERSION = "0.85.1"; - public const uint AppVersion = 8500; - public const long Unknown25 = unchecked((long)0x2AC22400401779DE); + public const string ApiEndPoint = "api/v157_5/hash"; + public const string API_VERSION = "0.87.5"; + public const uint AppVersion = 8700; + public const long Unknown25 = unchecked((long)0x3E75FB078C4573FA); public const string UnknownPlat8Field = "15c79df0558009a4242518d2ab65de2a59e09499"; // Login PTC From 2e6da1e91c3b42fad22edae745e84cadebae65bd Mon Sep 17 00:00:00 2001 From: Furtif Date: Thu, 21 Dec 2017 06:14:45 +0100 Subject: [PATCH 09/13] according code for new api --- PokemonGo.RocketAPI.csproj | 8 ++++---- Rpc/Encounter.cs | 9 ++++++--- packages.config | 10 +++++----- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/PokemonGo.RocketAPI.csproj b/PokemonGo.RocketAPI.csproj index f3d2359..4937922 100644 --- a/PokemonGo.RocketAPI.csproj +++ b/PokemonGo.RocketAPI.csproj @@ -86,11 +86,11 @@ $(SolutionDir)\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - - $(SolutionDir)\packages\POGOProtos.Core.2.20.0\lib\net45\POGOProtos.Core.dll + + $(SolutionDir)\packages\POGOProtos.Core.2.21.0\lib\net45\POGOProtos.Core.dll - $(SolutionDir)\packages\Thrower.4.3.0\lib\net461\PommaLabs.Thrower.dll + $(SolutionDir)\packages\Thrower.4.3.1\lib\net461\PommaLabs.Thrower.dll $(SolutionDir)\packages\S2Geometry.1.0.3\lib\portable-net45+wp8+win8\S2Geometry.dll @@ -98,7 +98,7 @@ - $(SolutionDir)\packages\System.ComponentModel.Annotations.4.4.0\lib\net461\System.ComponentModel.Annotations.dll + $(SolutionDir)\packages\System.ComponentModel.Annotations.4.4.1\lib\net461\System.ComponentModel.Annotations.dll diff --git a/Rpc/Encounter.cs b/Rpc/Encounter.cs index 358a985..717ccee 100644 --- a/Rpc/Encounter.cs +++ b/Rpc/Encounter.cs @@ -9,6 +9,7 @@ using Google.Protobuf; using PokemonGo.RocketAPI.Helpers; using System; +using POGOProtos.Map.Fort; #endregion @@ -192,7 +193,7 @@ public async Task EncounterIncensePokemon(ulong encoun return response.Item1; } - public async Task EncounterLurePokemon(ulong encounterId, string fortId) + public async Task EncounterLurePokemon(ulong encounterId, FortData fort) { var encounterLurePokemonRequest = new Request { @@ -200,9 +201,11 @@ public async Task EncounterLurePokemon(ulong encounterId, RequestMessage = ((IMessage)new DiskEncounterMessage { EncounterId = encounterId, - FortId = fortId, + FortId = fort.Id, PlayerLatitude = Client.CurrentLatitude, - PlayerLongitude = Client.CurrentLongitude + PlayerLongitude = Client.CurrentLongitude, + GymLatDegrees = fort.Latitude, + GymLngDegrees = fort.Longitude }).ToByteString() }; diff --git a/packages.config b/packages.config index 70b206e..d3786c8 100644 --- a/packages.config +++ b/packages.config @@ -2,16 +2,16 @@ - + - + - + @@ -19,7 +19,7 @@ - + @@ -67,6 +67,6 @@ - + \ No newline at end of file From 9bfc8a56f14b184e7d47675ad0c9b2c12e50d9b9 Mon Sep 17 00:00:00 2001 From: Furtif Date: Fri, 5 Jan 2018 08:17:16 +0100 Subject: [PATCH 10/13] add new feature --- Rpc/Encounter.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Rpc/Encounter.cs b/Rpc/Encounter.cs index 717ccee..5b313db 100644 --- a/Rpc/Encounter.cs +++ b/Rpc/Encounter.cs @@ -10,6 +10,7 @@ using PokemonGo.RocketAPI.Helpers; using System; using POGOProtos.Map.Fort; +using POGOProtos.Data; #endregion @@ -126,11 +127,18 @@ public async Task CatchPokemon(ulong encounterId, string s ItemId pokeballItemId, double normalizedRecticleSize = 1.950, double spinModifier = 1, bool hitPokemon = true, double normalizedHitPos = 1) { + var arPlusValues = new ARPlusEncounterValues(); + APIConfiguration.Logger.LogInfo("Using AR Bonus Values"); + arPlusValues.Awareness = (float)0.000; + arPlusValues.Proximity = (float)0.000; + arPlusValues.PokemonFrightened = false; + var catchPokemonRequest = new Request { RequestType = RequestType.CatchPokemon, RequestMessage = ((IMessage)new CatchPokemonMessage { + ArPlusValues = arPlusValues, EncounterId = encounterId, Pokeball = pokeballItemId, SpawnPointId = spawnPointGuid, From 2df18daab46ebd82986fe57bc24eb4b1d8f075d8 Mon Sep 17 00:00:00 2001 From: Furtif Date: Fri, 5 Jan 2018 08:30:36 +0100 Subject: [PATCH 11/13] Update deps --- PokemonGo.RocketAPI.csproj | 8 ++++---- packages.config | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/PokemonGo.RocketAPI.csproj b/PokemonGo.RocketAPI.csproj index 4937922..e0da7a6 100644 --- a/PokemonGo.RocketAPI.csproj +++ b/PokemonGo.RocketAPI.csproj @@ -74,8 +74,8 @@ $(SolutionDir)\packages\GeoCoordinate.NetStandard1.1.0.1\lib\netstandard1.1\GeoCoordinate.NetStandard1.dll - - $(SolutionDir)\packages\Google.Protobuf.3.5.0\lib\net45\Google.Protobuf.dll + + ..\packages\Google.Protobuf.3.5.1\lib\net45\Google.Protobuf.dll $(SolutionDir)\packages\GPSOAuthSharp.NetStandard1.1.0.1\lib\netstandard1.1\GPSOAuthSharp.NetStandard1.dll @@ -86,8 +86,8 @@ $(SolutionDir)\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - - $(SolutionDir)\packages\POGOProtos.Core.2.21.0\lib\net45\POGOProtos.Core.dll + + $(SolutionDir)\packages\POGOProtos.Core.2.21.1\lib\net45\POGOProtos.Core.dll $(SolutionDir)\packages\Thrower.4.3.1\lib\net461\PommaLabs.Thrower.dll diff --git a/packages.config b/packages.config index d3786c8..fba2382 100644 --- a/packages.config +++ b/packages.config @@ -1,8 +1,8 @@  - - + + @@ -11,7 +11,7 @@ - + From a10510f98b74cb6d1ad37e12c20f4b835f974a8f Mon Sep 17 00:00:00 2001 From: Furtif Date: Fri, 5 Jan 2018 08:41:28 +0100 Subject: [PATCH 12/13] missed... --- PokemonGo.RocketAPI.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PokemonGo.RocketAPI.csproj b/PokemonGo.RocketAPI.csproj index e0da7a6..cc8d972 100644 --- a/PokemonGo.RocketAPI.csproj +++ b/PokemonGo.RocketAPI.csproj @@ -75,7 +75,7 @@ $(SolutionDir)\packages\GeoCoordinate.NetStandard1.1.0.1\lib\netstandard1.1\GeoCoordinate.NetStandard1.dll - ..\packages\Google.Protobuf.3.5.1\lib\net45\Google.Protobuf.dll + $(SolutionDir)\packages\Google.Protobuf.3.5.1\lib\net45\Google.Protobuf.dll $(SolutionDir)\packages\GPSOAuthSharp.NetStandard1.1.0.1\lib\netstandard1.1\GPSOAuthSharp.NetStandard1.dll From 1861ba367ae11ad540ef535e1f5b850a0d939041 Mon Sep 17 00:00:00 2001 From: Furtif Date: Tue, 23 Jan 2018 14:49:23 +0100 Subject: [PATCH 13/13] new api --- Constants.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Constants.cs b/Constants.cs index c151180..6aed386 100644 --- a/Constants.cs +++ b/Constants.cs @@ -15,7 +15,7 @@ public static class Constants public const string LoginUrl = "https://sso.pokemon.com/sso/login?service=https%3A%2F%2Fsso.pokemon.com%2Fsso%2Foauth2.0%2FcallbackAuthorize"; - public const string LoginUserAgent = "pokemongo/1 CFNetwork/893.10 Darwin/17.3.0"; //iOS 11.2.0 + public const string LoginUserAgent = "pokemongo/1 CFNetwork/893.14.2 Darwin/17.4.0"; //iOS 11.2.5 public const string LoginManufactor = "X-Unity-Version"; public const string LoginManufactorVersion = "2017.1.2f1"; //"5.5.1f1";//"5.6.1f1"; public const string LoginHostValue = "sso.pokemon.com"; @@ -34,11 +34,11 @@ public static class Constants public const string GoogleAuthApp = "com.nianticlabs.pokemongo"; public const string GoogleAuthClientSig = "321187995bc7cdc2b5fc91b11a96e2baa8602c62"; - public const string ApiEndPoint = "api/v157_5/hash"; - public const string API_VERSION = "0.87.5"; - public const uint AppVersion = 8700; - public const long Unknown25 = unchecked((long)0x3E75FB078C4573FA); - public const string UnknownPlat8Field = "15c79df0558009a4242518d2ab65de2a59e09499"; + public const string ApiEndPoint = "api/v159_1/hash"; + public const string API_VERSION = "0.89.1"; + public const uint AppVersion = 8900; + public const long Unknown25 = unchecked((long)0xF522F8878F08FFD6); + public const string UnknownPlat8Field = "4d32f6b70cda8539ab82be5750e009d6d05a48ad"; // Login PTC