Updated Telegram library

Ahmad Noman Musleh · Ahmad Noman Musleh · commit 9e5330804dac · 2020-08-16T13:23:57.000+03:00
diff --git a/src/Alert/Alert.csproj b/src/Alert/Alert.csproj
@@ -50,9 +50,6 @@
     <Reference Include="MahApps.Metro, Version=1.6.5.1, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\MahApps.Metro.1.6.5\lib\net45\MahApps.Metro.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="Prism, Version=7.2.0.1422, Culture=neutral, PublicKeyToken=40ee6c3a2184dc59, processorArchitecture=MSIL">
@@ -77,8 +74,8 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="TelegramBotApi, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\TelegramBotApi.1.0.2\lib\net45\TelegramBotApi.dll</HintPath>
+    <Reference Include="TelegramBotApi, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\TelegramBotApi.1.1.2\lib\net40-client\TelegramBotApi.dll</HintPath>
     </Reference>
     <Reference Include="WindowsBase" />
   </ItemGroup>
diff --git a/src/Alert/ViewModels/SettingsViewModel.cs b/src/Alert/ViewModels/SettingsViewModel.cs
@@ -19,12 +19,13 @@ public class SettingsViewModel : BindableBase
     {
         #region Fields
 
+        private readonly EventAggregator _eventAggregator;
+        private readonly Models.SettingsModel _model;
+
         private List<SolidColorBrush> _colors;
-        private EventAggregator _eventAggregator;
         private List<FontFamily> _fonts;
         private List<Models.FontStyleModel> _fontStyles;
         private List<Models.FontWeightModel> _fontWeights;
-        private Models.SettingsModel _model;
         private Models.TelegramConversation _telegramConversation;
         private List<Models.ThemeAccentModel> _themeAccents;
         private List<Models.ThemeBaseModel> _themeBases;
@@ -243,7 +244,9 @@ private void AddTelegramConversation()
 
             try
             {
-                updates = telegramBotClient.GetUpdates();
+                telegramBotClient.DeleteWebhook();
+
+                updates = telegramBotClient.GetUpdates().Result;
             }
             catch (WebException ex)
             {
diff --git a/src/Alert/ViewModels/ShellViewModel.cs b/src/Alert/ViewModels/ShellViewModel.cs
@@ -9,7 +9,7 @@ public class ShellViewModel : BindableBase
     {
         #region Fields
 
-        private App _app;
+        private readonly App _app;
 
         private bool _isSettingsButtonEnabled;
 
diff --git a/src/Alert/Views/ShellView.xaml b/src/Alert/Views/ShellView.xaml
@@ -7,7 +7,7 @@
     xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
     xmlns:local="clr-namespace:cAlgo.API.Alert"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    Width="800"
+    Width="1000"
     Height="500"
     BorderThickness="0"
     GlowBrush="Black"
diff --git a/src/Alert/packages.config b/src/Alert/packages.config
@@ -4,9 +4,8 @@
   <package id="ControlzEx" version="3.0.2.4" targetFramework="net45" />
   <package id="LiteDB" version="5.0.8" targetFramework="net45" />
   <package id="MahApps.Metro" version="1.6.5" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net45" />
   <package id="Prism.Core" version="7.2.0.1422" targetFramework="net45" />
   <package id="Prism.Wpf" version="7.2.0.1422" targetFramework="net45" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net45" />
-  <package id="TelegramBotApi" version="1.0.2" targetFramework="net45" />
+  <package id="TelegramBotApi" version="1.1.2" targetFramework="net45" />
 </packages>
diff --git a/test/UITestConsole/Program.cs b/test/UITestConsole/Program.cs
@@ -12,11 +12,11 @@ private static void Main(string[] args)
 
             //notifications.ShowPopup();
 
-            //notifications.ShowPopup("Hour", "EURUSD", "Trend Line", "UITestConsole", 1.23452, "No comment 2", DateTimeOffset.Now);
+            notifications.ShowPopup("Hour", "EURUSD", "Trend Line", "UITestConsole", 1.23452, "No comment 2", DateTimeOffset.Now);
 
             //TriggerAlerts(50, notifications);
 
-            TestMultiThread(10);
+            //TestMultiThread(10);
         }
 
         private static void TriggerAlerts(int number, Notifications notifications)
diff --git a/test/UITestConsole/UITestConsole.csproj b/test/UITestConsole/UITestConsole.csproj
@@ -56,10 +56,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\src\Alert\bin\Release\MahApps.Metro.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\src\Alert\bin\Release\Newtonsoft.Json.dll</HintPath>
-    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="Prism, Version=7.1.0.431, Culture=neutral, PublicKeyToken=40ee6c3a2184dc59, processorArchitecture=MSIL">
@@ -85,7 +81,7 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
-    <Reference Include="TelegramBotApi, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="TelegramBotApi, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\src\Alert\bin\Release\TelegramBotApi.dll</HintPath>
     </Reference>

Original file line number	Diff line number	Diff line change
`@@ -19,12 +19,13 @@ public class SettingsViewModel : BindableBase`
`19`	`19`	`{`
`20`	`20`	`#region Fields`
`21`	`21`
	`22`	`+ private readonly EventAggregator _eventAggregator;`
	`23`	`+ private readonly Models.SettingsModel _model;`
	`24`	`+`
`22`	`25`	`private List<SolidColorBrush> _colors;`
`23`		`- private EventAggregator _eventAggregator;`
`24`	`26`	`private List<FontFamily> _fonts;`
`25`	`27`	`private List<Models.FontStyleModel> _fontStyles;`
`26`	`28`	`private List<Models.FontWeightModel> _fontWeights;`
`27`		`- private Models.SettingsModel _model;`
`28`	`29`	`private Models.TelegramConversation _telegramConversation;`
`29`	`30`	`private List<Models.ThemeAccentModel> _themeAccents;`
`30`	`31`	`private List<Models.ThemeBaseModel> _themeBases;`
`@@ -243,7 +244,9 @@ private void AddTelegramConversation()`
`243`	`244`
`244`	`245`	`try`
`245`	`246`	`{`
`246`		`- updates = telegramBotClient.GetUpdates();`
	`247`	`+ telegramBotClient.DeleteWebhook();`
	`248`	`+`
	`249`	`+ updates = telegramBotClient.GetUpdates().Result;`
`247`	`250`	`}`
`248`	`251`	`catch (WebException ex)`
`249`	`252`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ public class ShellViewModel : BindableBase`
`9`	`9`	`{`
`10`	`10`	`#region Fields`
`11`	`11`
`12`		`- private App _app;`
	`12`	`+ private readonly App _app;`
`13`	`13`
`14`	`14`	`private bool _isSettingsButtonEnabled;`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,11 @@ private static void Main(string[] args)`
`12`	`12`
`13`	`13`	`//notifications.ShowPopup();`
`14`	`14`
`15`		`- //notifications.ShowPopup("Hour", "EURUSD", "Trend Line", "UITestConsole", 1.23452, "No comment 2", DateTimeOffset.Now);`
	`15`	`+ notifications.ShowPopup("Hour", "EURUSD", "Trend Line", "UITestConsole", 1.23452, "No comment 2", DateTimeOffset.Now);`
`16`	`16`
`17`	`17`	`//TriggerAlerts(50, notifications);`
`18`	`18`
`19`		`- TestMultiThread(10);`
	`19`	`+ //TestMultiThread(10);`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`private static void TriggerAlerts(int number, Notifications notifications)`