Moved into try

Author: szv

src/Codebreaker.ViewModels/Pages/GamePageViewModel.cs

@@ -27,11 +27,11 @@ private async Task StartGameAsync(CancellationToken cancellationToken)
     {
         IsLoading = true;
         var usedGameMode = GameType.Game6x4;
-        (Guid id, int numberCode, int maxMoves, IDictionary<string, string[]> fieldValues) response;
 
         try
         {
-            response = await gamesClient.StartGameAsync(usedGameMode, Username);
+            var response = await gamesClient.StartGameAsync(usedGameMode, Username);
+            Game = new Game(response.Id, usedGameMode, Username, DateTime.Now, response.NumberCodes, response.MaxMoves, response.FieldValues);
         }
         catch (InvalidOperationException)
         {
@@ -53,8 +53,6 @@ private async Task StartGameAsync(CancellationToken cancellationToken)
             IsLoading = false;
         }
 
-        Game = new Game(response.id, usedGameMode, Username, DateTime.Now, response.numberCode, response.maxMoves, response.fieldValues);
-
         WeakReferenceMessenger.Default.Send(new GameStartedMessage(Game));
 
         // Initialize SelectedFields
@@ -86,10 +84,20 @@ private async Task MakeMoveAsync(CancellationToken cancellationToken)
         WeakReferenceMessenger.Default.Send(new MakeMoveMessage(new(selectedColors!)));
 
         IsLoading = true;
-        (string[] keyPegs, bool hasEnded, bool isVictory) response;
         try
         {
-            response = await gamesClient.SetMoveAsync(Game.Id, Game.PlayerName, GameType.Game6x4, Game.Moves.Count + 1, selectedColors!);
+            var response = await gamesClient.SetMoveAsync(Game.Id, Game.PlayerName, GameType.Game6x4, Game.Moves.Count + 1, selectedColors!);
+
+            var newMove = new Move(selectedColors!, response.Results);
+            Game.Moves.Add(newMove);
+            WeakReferenceMessenger.Default.Send(new MakeMoveMessage(newMove));
+
+            if (response.Ended)
+            {
+                Game.EndTime = DateTime.Now;
+                Game.IsVictory = response.IsVictory;
+                WeakReferenceMessenger.Default.Send(new GameEndedMessage(Game));
+            }
         }
         catch (InvalidOperationException)
         {
@@ -110,16 +118,5 @@ private async Task MakeMoveAsync(CancellationToken cancellationToken)
         {
             IsLoading = false;
         }
-
-        var newMove = new Move(selectedColors!, response.keyPegs);
-        Game.Moves.Add(newMove);
-        WeakReferenceMessenger.Default.Send(new MakeMoveMessage(newMove));
-
-        if (response.hasEnded)
-        {
-            Game.EndTime = DateTime.Now;
-            Game.IsVictory = response.isVictory;
-            WeakReferenceMessenger.Default.Send(new GameEndedMessage(Game));
-        }
     }
 }