Merge pull request Necrobot-Private#27 from Necrobot-Private/master

v1.0.0.80
Lord-Haji · Jan 31, 2017 · 2088f61 · 2088f61
2 parents 382f608 + ade0b9a
commit 2088f61
Show file tree

Hide file tree

Showing 11 changed files with 127 additions and 41 deletions.
diff --git a/PoGo.NecroBot.CLI/PoGo.NecroBot.CLI.csproj b/PoGo.NecroBot.CLI/PoGo.NecroBot.CLI.csproj
@@ -124,6 +124,7 @@
   <ItemGroup>
     <Content Include="Resources\Ico.ico" />
     <Content Include="FodyWeavers.xml" />
+    <None Include="Resources\msvc.cer" />
     <None Include="Resources\PayPalDonateNow1.png" />
     <None Include="Resources\PayPalDonateNow.png" />
     <None Include="Resources\necro_logo.jpg" />

diff --git a/PoGo.NecroBot.CLI/Program.cs b/PoGo.NecroBot.CLI/Program.cs
@@ -24,7 +24,7 @@
 using PoGo.NecroBot.Logic.Utils;
 using ProgressBar = PoGo.NecroBot.CLI.Resources.ProgressBar;
 
-#endregion
+#endregion using directives
 
 namespace PoGo.NecroBot.CLI
 {
@@ -84,6 +84,7 @@ public static void RunBotWithParameters(Action<ISession, StatisticsAggregator> o
                     case "true":
                         _enableJsonValidation = true;
                         break;
+
                     case "false":
                         _enableJsonValidation = false;
                         break;
@@ -96,6 +97,7 @@ public static void RunBotWithParameters(Action<ISession, StatisticsAggregator> o
                     case "true":
                         _ignoreKillSwitch = false;
                         break;
+
                     case "false":
                         _ignoreKillSwitch = true;
                         break;
@@ -147,7 +149,7 @@ public static void RunBotWithParameters(Action<ISession, StatisticsAggregator> o
                     ProfilePath = profilePath,
                     ProfileConfigPath = profileConfigPath,
                     GeneralConfigPath = Path.Combine(Directory.GetCurrentDirectory(), "config"),
-                    ConsoleConfig = {TranslationLanguageCode = strCulture}
+                    ConsoleConfig = { TranslationLanguageCode = strCulture }
                 };
 
                 boolNeedsSetup = true;
@@ -374,12 +376,11 @@ public static void RunBotWithParameters(Action<ISession, StatisticsAggregator> o
             ProgressBar.Fill(90);
 
             _session.Navigation.WalkStrategy.UpdatePositionEvent +=
-                (lat, lng) => _session.EventDispatcher.Send(new UpdatePositionEvent {Latitude = lat, Longitude = lng});
+                (lat, lng) => _session.EventDispatcher.Send(new UpdatePositionEvent { Latitude = lat, Longitude = lng });
             _session.Navigation.WalkStrategy.UpdatePositionEvent += SaveLocationToDisk;
 
             ProgressBar.Fill(100);
 
-
             var accountManager = new MultiAccountManager(logicSettings.Bots);
 
             accountManager.Add(settings.Auth.AuthConfig);
@@ -423,6 +424,8 @@ public static void RunBotWithParameters(Action<ISession, StatisticsAggregator> o
 
             if (_session.LogicSettings.ActivateMSniper)
             {
+                ServicePointManager.ServerCertificateValidationCallback +=
+                    (sender, certificate, chain, sslPolicyErrors) => true;
                 MSniperServiceTask.ConnectToService();
                 _session.EventDispatcher.EventReceived += evt => MSniperServiceTask.AddToList(evt);
             }
@@ -431,7 +434,7 @@ public static void RunBotWithParameters(Action<ISession, StatisticsAggregator> o
             if (!File.Exists(trackFile) || File.GetLastWriteTime(trackFile) < DateTime.Now.AddDays(-1))
             {
                 Thread.Sleep(10000);
-                Thread mThread = new Thread(delegate()
+                Thread mThread = new Thread(delegate ()
                 {
                     var infoForm = new InfoForm();
                     infoForm.ShowDialog();
@@ -442,7 +445,6 @@ public static void RunBotWithParameters(Action<ISession, StatisticsAggregator> o
                 mThread.Start();
             }
 
-
             QuitEvent.WaitOne();
         }
 
@@ -476,7 +478,6 @@ private static bool CheckMKillSwitch()
                         var strReason1 = strSplit1[1];
                         var strExitMsg = strSplit1[2];
 
-
                         if (strStatus1.ToLower().Contains("disable"))
                         {
                             Logger.Write(strReason1 + $"\n", LogLevel.Warning);
@@ -546,7 +547,6 @@ private static bool CheckKillSwitch()
             return false;
         }
 
-
         private static void UnhandledExceptionEventHandler(object obj, UnhandledExceptionEventArgs args)
         {
             Logger.Write("Exception caught, writing LogBuffer.", force: true);
@@ -566,8 +566,10 @@ public static bool PromptForKillSwitchOverride()
                     case "y":
                         // Override killswitch
                         return true;
+
                     case "n":
                         return false;
+
                     default:
                         Logger.Write("Enter y or n", LogLevel.Error);
                         continue;

diff --git a/PoGo.NecroBot.CLI/Properties/AssemblyInfo.cs b/PoGo.NecroBot.CLI/Properties/AssemblyInfo.cs
@@ -40,7 +40,7 @@
 // [assembly: AssemblyVersion1("0.9.9.5")]
 
 
-[assembly: AssemblyVersion("1.0.0.79")]
+[assembly: AssemblyVersion("1.0.0.80")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: AssemblyInformationalVersion("v1.0.0.79")]
+[assembly: AssemblyInformationalVersion("v1.0.0.80")]
 
diff --git a/PoGo.NecroBot.CLI/Resources/msvc.cer b/PoGo.NecroBot.CLI/Resources/msvc.cer
@@ -0,0 +1,36 @@
+-----BEGIN CERTIFICATE-----
+MIIGWjCCBgGgAwIBAgIRAJtzYJj1v6UIpdZSq/YF1zUwCgYIKoZIzj0EAwIwgZIx
+CzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNV
+BAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTgwNgYDVQQD
+Ey9DT01PRE8gRUNDIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0Eg
+MjAeFw0xNzAxMjYwMDAwMDBaFw0xNzA3MzAyMzU5NTlaMGwxITAfBgNVBAsTGERv
+bWFpbiBDb250cm9sIFZhbGlkYXRlZDEhMB8GA1UECxMYUG9zaXRpdmVTU0wgTXVs
+dGktRG9tYWluMSQwIgYDVQQDExtzbmkxMTI4NjIuY2xvdWRmbGFyZXNzbC5jb20w
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATon4Be/HsYijtXzLrCRhnercqtQyZ3
+M4pM5JajJW3hDDTV64LMfJGnWdHZa8jx5pz0U3D5DiP1C5cl3mqlDRWIo4IEWzCC
+BFcwHwYDVR0jBBgwFoAUQAlhZ/C8g3FP3hIILG/U1Ct2PZYwHQYDVR0OBBYEFJwB
+2MLF2Urtg7te2gUcNvN69kXMMA4GA1UdDwEB/wQEAwIHgDAMBgNVHRMBAf8EAjAA
+MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBPBgNVHSAESDBGMDoGCysG
+AQQBsjEBAgIHMCswKQYIKwYBBQUHAgEWHWh0dHBzOi8vc2VjdXJlLmNvbW9kby5j
+b20vQ1BTMAgGBmeBDAECATBWBgNVHR8ETzBNMEugSaBHhkVodHRwOi8vY3JsLmNv
+bW9kb2NhNC5jb20vQ09NT0RPRUNDRG9tYWluVmFsaWRhdGlvblNlY3VyZVNlcnZl
+ckNBMi5jcmwwgYgGCCsGAQUFBwEBBHwwejBRBggrBgEFBQcwAoZFaHR0cDovL2Ny
+dC5jb21vZG9jYTQuY29tL0NPTU9ET0VDQ0RvbWFpblZhbGlkYXRpb25TZWN1cmVT
+ZXJ2ZXJDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2NzcC5jb21vZG9jYTQu
+Y29tMIICogYDVR0RBIICmTCCApWCG3NuaTExMjg2Mi5jbG91ZGZsYXJlc3NsLmNv
+bYIVKi5hY3RpdmVzY2FuMTMub25saW5lghMqLmFuZ2VsdG9ycmVudDB5LnRrggsq
+LmJpcnUwNC50a4INKi5ib29rb2ZyYS5jZoISKi5kYnpkaW1lbnNpb24uY29tghQq
+LmRpcmVjdG1haWxjb3N0LmNvbYIYKi5lZ2dib3JvdWdoc3BvcnRzLmNvLnVrghEq
+LmZvcnN0dWRlbnQuY2x1YoIPKi5pcHJpY2VlLnByZXNzghAqLmxlbmdhc2dzZHMu
+Y29tghYqLm1hcnZlbGl0c2VydmljZXMuY29tggkqLm1uaWoudWuCDSoubXNuaXBl
+ci5jb22CFyoubXlvbmdvaW5nc2NhbGVuZGFyLmV1ghQqLnByaW50LWEtcG9zdGVy
+LmNvbYIVKi5za2FjaGF0bmV3eW9ya3hjLnRrghEqLnRvcnJlbnRpc2Q3MC50a4IT
+YWN0aXZlc2NhbjEzLm9ubGluZYIRYW5nZWx0b3JyZW50MHkudGuCCWJpcnUwNC50
+a4ILYm9va29mcmEuY2aCEGRiemRpbWVuc2lvbi5jb22CEmRpcmVjdG1haWxjb3N0
+LmNvbYIWZWdnYm9yb3VnaHNwb3J0cy5jby51a4IPZm9yc3R1ZGVudC5jbHVigg1p
+cHJpY2VlLnByZXNzgg5sZW5nYXNnc2RzLmNvbYIUbWFydmVsaXRzZXJ2aWNlcy5j
+b22CB21uaWoudWuCC21zbmlwZXIuY29tghVteW9uZ29pbmdzY2FsZW5kYXIuZXWC
+EnByaW50LWEtcG9zdGVyLmNvbYITc2thY2hhdG5ld3lvcmt4Yy50a4IPdG9ycmVu
+dGlzZDcwLnRrMAoGCCqGSM49BAMCA0cAMEQCIEy8uzuY+GxkwDgWhGG2+rqQITEF
+Igtr+Z20Y9556tHCAiBqol9omUKoFalOY9N0LuhaV0qEpKtSXGrbEQ0X5KC/Vw==
+-----END CERTIFICATE-----
diff --git a/PoGo.NecroBot.GUI/Properties/AssemblyInfo.cs b/PoGo.NecroBot.GUI/Properties/AssemblyInfo.cs
@@ -37,9 +37,9 @@
 //
 // 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.0.79")]
+// [assembly: AssemblyVersion("1.0.0.80")]
 
 
-[assembly: AssemblyVersion("1.0.0.79")]
+[assembly: AssemblyVersion("1.0.0.80")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: AssemblyInformationalVersion("v1.0.0.79")]
+[assembly: AssemblyInformationalVersion("v1.0.0.80")]
diff --git a/PoGo.NecroBot.Logic/PoGo.NecroBot.Logic.csproj b/PoGo.NecroBot.Logic/PoGo.NecroBot.Logic.csproj
@@ -541,6 +541,7 @@
     </None>
     <EmbeddedResource Include="config.xlsm" />
     <None Include="packages.config" />
+    <None Include="Resources\msvc.cer" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\FeroxRev\PokemonGo.RocketAPI.csproj">

diff --git a/PoGo.NecroBot.Logic/Properties/AssemblyInfo.cs b/PoGo.NecroBot.Logic/Properties/AssemblyInfo.cs
@@ -40,6 +40,6 @@
 // [assembly: AssemblyVersion1("0.9.9.5")]
 //
 
-[assembly: AssemblyVersion("1.0.0.79")]
+[assembly: AssemblyVersion("1.0.0.80")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: AssemblyInformationalVersion("v1.0.0.79")]
+[assembly: AssemblyInformationalVersion("v1.0.0.80")]
diff --git a/PoGo.NecroBot.Logic/Properties/Resources.Designer.cs b/PoGo.NecroBot.Logic/Properties/Resources.Designer.cs
diff --git a/PoGo.NecroBot.Logic/Properties/Resources.resx b/PoGo.NecroBot.Logic/Properties/Resources.resx
@@ -121,4 +121,7 @@
   <data name="ajax-loader" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\ajax-loader.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="msvc" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\msvc.cer;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
 </root>
diff --git a/PoGo.NecroBot.Logic/Resources/msvc.cer b/PoGo.NecroBot.Logic/Resources/msvc.cer
@@ -0,0 +1,36 @@
+-----BEGIN CERTIFICATE-----
+MIIGWjCCBgGgAwIBAgIRAJtzYJj1v6UIpdZSq/YF1zUwCgYIKoZIzj0EAwIwgZIx
+CzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNV
+BAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTgwNgYDVQQD
+Ey9DT01PRE8gRUNDIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0Eg
+MjAeFw0xNzAxMjYwMDAwMDBaFw0xNzA3MzAyMzU5NTlaMGwxITAfBgNVBAsTGERv
+bWFpbiBDb250cm9sIFZhbGlkYXRlZDEhMB8GA1UECxMYUG9zaXRpdmVTU0wgTXVs
+dGktRG9tYWluMSQwIgYDVQQDExtzbmkxMTI4NjIuY2xvdWRmbGFyZXNzbC5jb20w
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATon4Be/HsYijtXzLrCRhnercqtQyZ3
+M4pM5JajJW3hDDTV64LMfJGnWdHZa8jx5pz0U3D5DiP1C5cl3mqlDRWIo4IEWzCC
+BFcwHwYDVR0jBBgwFoAUQAlhZ/C8g3FP3hIILG/U1Ct2PZYwHQYDVR0OBBYEFJwB
+2MLF2Urtg7te2gUcNvN69kXMMA4GA1UdDwEB/wQEAwIHgDAMBgNVHRMBAf8EAjAA
+MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBPBgNVHSAESDBGMDoGCysG
+AQQBsjEBAgIHMCswKQYIKwYBBQUHAgEWHWh0dHBzOi8vc2VjdXJlLmNvbW9kby5j
+b20vQ1BTMAgGBmeBDAECATBWBgNVHR8ETzBNMEugSaBHhkVodHRwOi8vY3JsLmNv
+bW9kb2NhNC5jb20vQ09NT0RPRUNDRG9tYWluVmFsaWRhdGlvblNlY3VyZVNlcnZl
+ckNBMi5jcmwwgYgGCCsGAQUFBwEBBHwwejBRBggrBgEFBQcwAoZFaHR0cDovL2Ny
+dC5jb21vZG9jYTQuY29tL0NPTU9ET0VDQ0RvbWFpblZhbGlkYXRpb25TZWN1cmVT
+ZXJ2ZXJDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2NzcC5jb21vZG9jYTQu
+Y29tMIICogYDVR0RBIICmTCCApWCG3NuaTExMjg2Mi5jbG91ZGZsYXJlc3NsLmNv
+bYIVKi5hY3RpdmVzY2FuMTMub25saW5lghMqLmFuZ2VsdG9ycmVudDB5LnRrggsq
+LmJpcnUwNC50a4INKi5ib29rb2ZyYS5jZoISKi5kYnpkaW1lbnNpb24uY29tghQq
+LmRpcmVjdG1haWxjb3N0LmNvbYIYKi5lZ2dib3JvdWdoc3BvcnRzLmNvLnVrghEq
+LmZvcnN0dWRlbnQuY2x1YoIPKi5pcHJpY2VlLnByZXNzghAqLmxlbmdhc2dzZHMu
+Y29tghYqLm1hcnZlbGl0c2VydmljZXMuY29tggkqLm1uaWoudWuCDSoubXNuaXBl
+ci5jb22CFyoubXlvbmdvaW5nc2NhbGVuZGFyLmV1ghQqLnByaW50LWEtcG9zdGVy
+LmNvbYIVKi5za2FjaGF0bmV3eW9ya3hjLnRrghEqLnRvcnJlbnRpc2Q3MC50a4IT
+YWN0aXZlc2NhbjEzLm9ubGluZYIRYW5nZWx0b3JyZW50MHkudGuCCWJpcnUwNC50
+a4ILYm9va29mcmEuY2aCEGRiemRpbWVuc2lvbi5jb22CEmRpcmVjdG1haWxjb3N0
+LmNvbYIWZWdnYm9yb3VnaHNwb3J0cy5jby51a4IPZm9yc3R1ZGVudC5jbHVigg1p
+cHJpY2VlLnByZXNzgg5sZW5nYXNnc2RzLmNvbYIUbWFydmVsaXRzZXJ2aWNlcy5j
+b22CB21uaWoudWuCC21zbmlwZXIuY29tghVteW9uZ29pbmdzY2FsZW5kYXIuZXWC
+EnByaW50LWEtcG9zdGVyLmNvbYITc2thY2hhdG5ld3lvcmt4Yy50a4IPdG9ycmVu
+dGlzZDcwLnRrMAoGCCqGSM49BAMCA0cAMEQCIEy8uzuY+GxkwDgWhGG2+rqQITEF
+Igtr+Z20Y9556tHCAiBqol9omUKoFalOY9N0LuhaV0qEpKtSXGrbEQ0X5KC/Vw==
+-----END CERTIFICATE-----