Update dependencies and proper GetInbox.

AeonLucid · Jul 12, 2017 · 306b675 · 306b675
1 parent c02ddce
commit 306b675
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 16 deletions.
diff --git a/POGOLib.Official.Demo.ConsoleApp.Multiple/POGOLib.Official.Demo.ConsoleApp.Multiple.csproj b/POGOLib.Official.Demo.ConsoleApp.Multiple/POGOLib.Official.Demo.ConsoleApp.Multiple.csproj
@@ -10,7 +10,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NLog" Version="5.0.0-beta08" />
+    <PackageReference Include="NLog" Version="5.0.0-beta09" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/POGOLib.Official.Demo.ConsoleApp/POGOLib.Official.Demo.ConsoleApp.csproj b/POGOLib.Official.Demo.ConsoleApp/POGOLib.Official.Demo.ConsoleApp.csproj
@@ -10,7 +10,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NLog" Version="5.0.0-beta08" />
+    <PackageReference Include="NLog" Version="5.0.0-beta09" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/POGOLib.Official/Net/RpcClient.cs b/POGOLib.Official/Net/RpcClient.cs
@@ -53,7 +53,8 @@ public class RpcClient : IDisposable
             RequestType.GetHatchedEggs,
             RequestType.GetInventory,
             RequestType.CheckAwardedBadges,
-            RequestType.DownloadSettings
+            RequestType.DownloadSettings,
+            RequestType.GetInbox
         };
 
         private readonly ConcurrentQueue<RequestEnvelope> _rpcQueue = new ConcurrentQueue<RequestEnvelope>();
@@ -334,7 +335,8 @@ private IEnumerable<Request> GetDefaultRequests()
                 },
                 new Request
                 {
-                    RequestType = RequestType.GetHatchedEggs
+                    RequestType = RequestType.GetHatchedEggs,
+                    RequestMessage = new GetHatchedEggsMessage().ToByteString()
                 },
                 new Request
                 {
@@ -346,7 +348,8 @@ private IEnumerable<Request> GetDefaultRequests()
                 },
                 new Request
                 {
-                    RequestType = RequestType.CheckAwardedBadges
+                    RequestType = RequestType.CheckAwardedBadges,
+                    RequestMessage = new CheckAwardedBadgesMessage().ToByteString()
                 }
             };
 
@@ -368,6 +371,12 @@ private IEnumerable<Request> GetDefaultRequests()
                     }.ToByteString()
                 });
             }
+
+            request.Add(new Request
+            {
+                RequestType = RequestType.GetInbox,
+                RequestMessage = ByteString.Empty    // TODO: Figure out parameters for "GetInboxMessage".
+            });
 
             //If Incense is active we add this:
             //request.Add(new Request
@@ -432,16 +441,6 @@ public async Task<RequestEnvelope> GetRequestEnvelopeAsync(IEnumerable<Request>
                 requestEnvelope.AuthTicket = _session.AccessToken.AuthTicket;
             }
 
-            if (requestEnvelope.Requests.Count > 0 &&
-                requestEnvelope.Requests[0].RequestType == RequestType.GetMapObjects)
-            {
-                requestEnvelope.Requests.Add(new Request
-                {
-                    RequestType = RequestType.GetInbox,
-                    RequestMessage = ByteString.Empty
-                });
-            }
-
             requestEnvelope.PlatformRequests.Add(await _rpcEncryption.GenerateSignatureAsync(requestEnvelope));
 
             if (requestEnvelope.Requests.Count > 0 && (

diff --git a/POGOLib.Official/POGOLib.Official.csproj b/POGOLib.Official/POGOLib.Official.csproj
@@ -17,7 +17,7 @@
 
   <ItemGroup>
     <PackageReference Include="GeoCoordinate.NetStandard1" Version="1.0.1" />
-    <PackageReference Include="POGOProtos.NetStandard1" Version="2.11.0-beta" />
+    <PackageReference Include="POGOProtos.NetStandard1" Version="2.11.0" />
     <PackageReference Include="Google.Protobuf" Version="3.3.0" />
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
     <PackageReference Include="S2Geometry" Version="1.0.3" />