Updated to latest POGOProtos (a01a480)

PoGo.NecroBot.Logic/Common/ApiFailureStrategy.cs

@@ -24,6 +24,64 @@ public ApiFailureStrategy(ISession session)
             _session = session;
         }
 
+        public void HandleApiSuccess(RequestEnvelope request, ResponseEnvelope response)
+        {
+            if (response.StatusCode == ResponseEnvelope.Types.StatusCode.BadRequest)
+            {
+                for (var i = 0; i < request.Requests.Count; i++)
+                {
+                    if (request.Requests[i].RequestType != RequestType.GetInventory || !response.Returns[i].IsEmpty)
+                        continue;
+
+                    _session.EventDispatcher.Send(new ErrorEvent
+                    {
+                        Message = _session.Translation.GetTranslation(TranslationString.AccountBanned)
+                    });
+
+                    _session.EventDispatcher.Send(new WarnEvent
+                    {
+                        Message = _session.Translation.GetTranslation(TranslationString.RequireInputText)
+                    });
+
+                    Console.ReadKey();
+                    Environment.Exit(0);
+                }
+            }
+
+            _retryCount = 0;
+        }
+
+        public async Task<ApiOperation> HandleApiFailure(RequestEnvelope request, ResponseEnvelope response)
+        {
+            if (_retryCount == 11)
+                return ApiOperation.Abort;
+
+            await Task.Delay(500);
+            _retryCount++;
+
+            if (_retryCount%5 != 0)
+                return ApiOperation.Retry;
+
+            try
+            {
+                DoLogin();
+            }
+            catch (PtcOfflineException)
+            {
+                await Task.Delay(20000);
+            }
+            catch (AccessTokenExpiredException)
+            {
+                await Task.Delay(2000);
+            }
+            catch (Exception ex) when (ex is InvalidResponseException || ex is TaskCanceledException)
+            {
+                await Task.Delay(1000);
+            }
+
+            return ApiOperation.Retry;
+        }
+
         public async Task<ApiOperation> HandleApiFailure()
         {
             if (_retryCount == 11)
@@ -32,7 +90,7 @@ public async Task<ApiOperation> HandleApiFailure()
             await Task.Delay(500);
             _retryCount++;
 
-            if (_retryCount % 5 == 0)
+            if (_retryCount%5 == 0)
             {
                 DoLogin();
             }
@@ -121,7 +179,7 @@ private async void DoLogin()
             }
             catch (InvalidResponseException)
             {
-                _session.EventDispatcher.Send(new ErrorEvent()
+                _session.EventDispatcher.Send(new ErrorEvent
                 {
                     Message = _session.Translation.GetTranslation(TranslationString.InvalidResponse)
                 });
@@ -140,62 +198,5 @@ private async void DoLogin()
                 });
             }
         }
-        public void HandleApiSuccess(RequestEnvelope request, ResponseEnvelope response)
-        {
-            if (response.StatusCode == 3)
-            {
-                for (int i = 0; i < request.Requests.Count; i++)
-                {
-                    if (request.Requests[i].RequestType == RequestType.GetInventory && response.Returns[i].IsEmpty)
-                    {
-                        _session.EventDispatcher.Send(new ErrorEvent
-                        {
-                            Message = _session.Translation.GetTranslation(TranslationString.AccountBanned)
-                        });
-
-                        _session.EventDispatcher.Send(new WarnEvent
-                        {
-                            Message = _session.Translation.GetTranslation(TranslationString.RequireInputText)
-                        });
-
-                        Console.ReadKey();
-                        Environment.Exit(0);
-                    }
-                }
-            }
-
-            _retryCount = 0;
-        }
-
-        public async Task<ApiOperation> HandleApiFailure(RequestEnvelope request, ResponseEnvelope response)
-        {
-            if (_retryCount == 11)
-                return ApiOperation.Abort;
-
-            await Task.Delay(500);
-            _retryCount++;
-
-            if (_retryCount % 5 == 0)
-            {
-                try
-                {
-                    DoLogin();
-                }
-                catch (PtcOfflineException)
-                {
-                    await Task.Delay(20000);
-                }
-                catch (AccessTokenExpiredException)
-                {
-                    await Task.Delay(2000);
-                }
-                catch (Exception ex) when (ex is InvalidResponseException || ex is TaskCanceledException)
-                {
-                    await Task.Delay(1000);
-                }
-            }
-
-            return ApiOperation.Retry;
-        }
     }
-}
+}