-
Notifications
You must be signed in to change notification settings - Fork 341
Conversation
@@ -203,9 +231,25 @@ public static string CurrentVersion | |||
/// </summary> | |||
public static InventoryDelta InventoryDelta { get; private set; } | |||
|
|||
public static bool IsIncenseActive |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm seeing a lot of unrelated changes like this line, can you please just add what's needed for captcha to work?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry, I will clean the code up tomorrow, I had multiple branches in the same folder
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is fixed
} | ||
|
||
private static async | ||
Task |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please fix code format.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is part of the unrelated code, will fix this problem tomorrow
EDIT: Oh, I see what you mean
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is fixed
if (url.StartsWith("unity:")) | ||
{ | ||
int index = url.IndexOf("unity:"); | ||
if (index != -1) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think that this check is needed, if url starts with "unity:" then you can just take a substring starting from "unity:".Length
. The else
should be for the outer if
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK, I will fix this tomorrow along with the. Csproj file
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is fixed
@Rover656 Thanks for your effort. I have the code running in my phone. Just need to trigger captcha somehow. |
@ST-Apps The code is all fixed 😄 |
CheckChallenge is already called with login in Login.cs:64 - you should use this response and don't call it again separately |
@WallyCZ How do you mean? |
@WallyCZ oh ok, how would we adapt this to use in the current situation? |
so it would look like this?:
|
You should not call UI elements (Navigate) from API, so you can trigger in API some event or store ChallengeResponse object to be able to read it from client after login. But you found right place to hook it. If you want help just let me know |
Yea, could you help me please @WallyCZ i am not sure how this api works, i'm better with webviews and client sided programming |
I will on look it after work. Meantime please check if _client attribute is properly initialized in your .xaml.cs class. |
@WallyCZ no, i don't think so, i will look into it |
This will not work this way. Have you tested it? It will crash when first call _client. occurs. There is already one (properly initialized) static instance inside GameClient, so you must use this (through creating new method in GameClient). This is what you have already done but it seems you are not using it. |
Could you try to repair this? |
ok |
Just thinking... If the captcha is checked only when the user logs in how will he know in the middle of the game that he has been hit by captcha? |
Request for captcha can virtually come with every response in original client. I'll try to do something similar, but this RocketAPI was not designed to fit these requirements... |
…d and verified it works
@Rover656 Sent PR https://github.com/Rover656/PoGo-UWP/pull/3 to your repo so please merge it ;) |
Ok |
Changes in API to make work check challenge correctly + Captcha tested and verified it works
All ready for merge |
Sry, forgot to add this line to GameClient.cs:378:
so it should look like this: var apiFailureStrategy = new ApiFailureStrategy(_client);
_client.ApiFailure = apiFailureStrategy;
// Register to AccessTokenChanged
apiFailureStrategy.OnAccessTokenUpdated += (s, e) => SaveAccessToken();
apiFailureStrategy.OnFailureToggleUpdateTimer += ToggleUpdateTimer;
} @Rover656 Could you do it? Thanks |
@WallyCZ all fixed |
Tested, works nicely. |
@BadiBasso Great. @ST-Apps, it is ready for merge |
Closes issues
Changes
Change details
Using changes discussed in #1764 (It's a big conversation)
Other informations
It may not work, looking for people to test it.