x

PokemonGo/RocketAPI/Console/App.config

@@ -7,8 +7,19 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
+  <appSettings>
+    <add key="AuthType" value="Google"/><!--Google/Ptc-->
+    <add key="PtcUsername" value="username"/>
+    <add key="PtcPassword" value="pw"/>
+    <add key="GoogleRefreshToken" value=""/>
+    <add key="DefaultLatitude" value="52.379189"/><!--Default Amsterdam Central Station-->
+    <add key="DefaultLongitude" value="4.899431"/><!--Default Amsterdam Central Station-->
+    <add key="TransferType" value="none"/><!--none/cp/leaveStrongest/duplicate/all Whitelists/blackslists for each type is in Program.cs-->
+    <add key="TransferCPThreshold" value="0"/><!--transfer pokemon with CP less than this value if cp transfer type is selected. Whitelist in Program.cs-->
+    <add key="EvolveAllGivenPokemons" value="false"/>
+  </appSettings>
 </configuration>

PokemonGo/RocketAPI/Console/PokemonGo.RocketAPI.Console.csproj

@@ -32,10 +32,12 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Google.Protobuf">
-      <HintPath>..\packages\Google.Protobuf.3.0.0-beta3\lib\dotnet\Google.Protobuf.dll</HintPath>
+    <Reference Include="Google.Protobuf, Version=3.0.0.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Google.Protobuf.3.0.0-beta3\lib\dotnet\Google.Protobuf.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -47,9 +49,11 @@
   <ItemGroup>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Settings.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PokemonGo.RocketAPI.csproj">

PokemonGo/RocketAPI/Console/Properties/AssemblyInfo.cs

@@ -1,10 +1,14 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
+#region
+
+using System.Reflection;
 using System.Runtime.InteropServices;
 
+#endregion
+
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
+
 [assembly: AssemblyTitle("PokemonGoRocketAPI.Console")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
@@ -17,9 +21,11 @@
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
 // COM, set the ComVisible attribute to true on that type.
+
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
+
 [assembly: Guid("1fea147e-f704-497b-a538-00b053b5f672")]
 
 // Version information for an assembly consists of the following four values:
@@ -32,5 +38,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+
+[assembly: AssemblyVersion("1.2.10.0")]
+[assembly: AssemblyFileVersion("1.2.10.0")]

PokemonGo/RocketAPI/Console/Settings.cs

@@ -0,0 +1,54 @@
+#region
+
+using System.Configuration;
+using System.Globalization;
+using System.Runtime.CompilerServices;
+using PokemonGo.RocketAPI.Enums;
+
+#endregion
+
+namespace PokemonGo.RocketAPI.Console
+{
+    public class Settings : ISettings
+    {
+        /// <summary>
+        ///     Don't touch. User settings are in Console/App.config
+        /// </summary>
+        public string TransferType => GetSetting() != string.Empty ? GetSetting() : "none";
+        public int TransferCPThreshold => GetSetting() != string.Empty ? int.Parse(GetSetting(), CultureInfo.InvariantCulture) : 0;
+        public bool EvolveAllGivenPokemons => GetSetting() != string.Empty ? System.Convert.ToBoolean(GetSetting(), CultureInfo.InvariantCulture) : false;
+
+
+        public AuthType AuthType => (GetSetting() != string.Empty ? GetSetting() : "Ptc") == "Ptc" ? AuthType.Ptc : AuthType.Google;
+        public string PtcUsername => GetSetting() != string.Empty ? GetSetting() : "username";
+        public string PtcPassword => GetSetting() != string.Empty ? GetSetting() : "password";
+
+        public double DefaultLatitude => GetSetting() != string.Empty ? double.Parse(GetSetting(), CultureInfo.InvariantCulture) : 51.22640;
+
+        //Default Amsterdam Central Station if another location is not specified
+        public double DefaultLongitude => GetSetting() != string.Empty ? double.Parse(GetSetting(), CultureInfo.InvariantCulture) : 6.77874;
+
+        //Default Amsterdam Central Station if another location is not specified
+
+        // LEAVE EVERYTHING ALONE
+
+
+        public string GoogleRefreshToken
+        {
+            get { return GetSetting() != string.Empty ? GetSetting() : string.Empty; }
+            set { SetSetting(value); }
+        }
+
+        private string GetSetting([CallerMemberName] string key = null)
+        {
+            return ConfigurationManager.AppSettings[key];
+        }
+
+        private void SetSetting(string value, [CallerMemberName] string key = null)
+        {
+            var configFile = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
+            if (key != null) configFile.AppSettings.Settings[key].Value = value;
+            configFile.Save();
+        }
+    }
+}

PokemonGo/RocketAPI/Console/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Google.Protobuf" version="3.0.0-beta3" targetFramework="net45" />
+</packages>

PokemonGo/RocketAPI/Enums/AuthType.cs

@@ -1,14 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PokemonGo.RocketAPI.Enums
+namespace PokemonGo.RocketAPI.Enums
 {
     public enum AuthType
     {
         Google,
         Ptc
     }
-}
+}

PokemonGo/RocketAPI/Enums/MiscEnums.cs

@@ -1,14 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PokemonGo.RocketAPI.GeneratedCode
+namespace PokemonGo.RocketAPI.GeneratedCode
 {
     public class MiscEnums
     {
-        public enum FortType 
+        public enum FortType
         {
             GYM = 0,
             CHECKPOINT = 1

PokemonGo/RocketAPI/Enums/RequestType.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PokemonGo.RocketAPI.Enums
+namespace PokemonGo.RocketAPI.Enums
 {
     public enum RequestType
     {
@@ -78,6 +72,6 @@ public enum RequestType
         SFIDA_UPDATE = 803,
         SFIDA_ACTION = 804,
         SFIDA_DOWSER = 805,
-        SFIDA_CAPTURE = 806,
+        SFIDA_CAPTURE = 806
     }
-}
+}

PokemonGo/RocketAPI/Exceptions/PTCOfflineException.cs

@@ -0,0 +1,12 @@
+#region
+
+using System;
+
+#endregion
+
+namespace PokemonGo.RocketAPI.Exceptions
+{
+    public class PtcOfflineException : Exception
+    {
+    }
+}

PokemonGo/RocketAPI/Extensions/DateTimeExtensions.cs

@@ -1,8 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+#region
+
+using System;
+
+#endregion
 
 namespace PokemonGo.RocketAPI.Extensions
 {
@@ -14,4 +14,4 @@ public static long ToUnixTime(this DateTime date)
             return Convert.ToInt64((date - epoch).TotalMilliseconds);
         }
     }
-}
+}

PokemonGo/RocketAPI/Extensions/HttpClientExtensions.cs

@@ -1,30 +1,46 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+#region
+
 using System.Net.Http;
-using System.Text;
 using System.Threading.Tasks;
 using Google.Protobuf;
-using PokemonGo.RocketAPI;
 using PokemonGo.RocketAPI.GeneratedCode;
 
+#endregion
+
 namespace PokemonGo.RocketAPI.Extensions
 {
     public static class HttpClientExtensions
     {
-        public static async Task<V> PostProto<T, V>(this HttpClient client, string url, T request) where T : IMessage<T> where V : IMessage<V>, new()
+        public static async Task<Response> PostProto<TRequest>(this HttpClient client, string url, TRequest request)
+            where TRequest : IMessage<TRequest>
         {
-            //Encode message and send
+            //Encode payload and put in envelop, then send
             var data = request.ToByteString();
             var result = await client.PostAsync(url, new ByteArrayContent(data.ToByteArray()));
 
             //Decode message
             var responseData = await result.Content.ReadAsByteArrayAsync();
             var codedStream = new CodedInputStream(responseData);
-            var decodedResponse = new V();
+            var decodedResponse = new Response();
             decodedResponse.MergeFrom(codedStream);
-                
+
             return decodedResponse;
         }
+
+        public static async Task<TResponsePayload> PostProtoPayload<TRequest, TResponsePayload>(this HttpClient client,
+            string url, TRequest request) where TRequest : IMessage<TRequest>
+            where TResponsePayload : IMessage<TResponsePayload>, new()
+        {
+            //Console.WriteLine($"{DateTime.Now.ToString("HH:mm:ss")} requesting {typeof(TResponsePayload).Name}");
+            var response = await PostProto(client, url, request);
+
+            //Decode payload
+            //todo: multi-payload support
+            var payload = response.Payload[0];
+            var parsedPayload = new TResponsePayload();
+            parsedPayload.MergeFrom(payload);
+
+            return parsedPayload;
+        }
     }
-}
+}