Move listen methods out of Client and into MQTT class

gave92 · Feb 9, 2020 · 3c523a9 · 3c523a9
1 parent 331a86e
commit 3c523a9
Show file tree

Hide file tree

Showing 12 changed files with 369 additions and 1,082 deletions.
diff --git a/examples/netcore/Basic_Usage.cs b/examples/netcore/Basic_Usage.cs
@@ -90,7 +90,7 @@ await client.sendLocalFiles(
                 Console.WriteLine("Listening... Press Ctrl+C to exit.");
                 Console.CancelKeyPress += new ConsoleCancelEventHandler((s, e) => { e.Cancel = true; _closing.Set(); });
                 _closing.WaitOne();
-                client.StopListening();
+                await client.StopListening();
 
                 // Logging out is not required
                 // await client.DoLogout();

diff --git a/examples/netcore/FBClient_Cookies.cs b/examples/netcore/FBClient_Cookies.cs
@@ -27,7 +27,7 @@ private async Task<string> get2FACode()
             return Console.ReadLine();
         }
 
-        protected override async Task onEvent(FB_Event ev)
+        protected override async Task OnEvent(FB_Event ev)
         {
             switch (ev)
             {

diff --git a/examples/netcore/FBClient_Simple.cs b/examples/netcore/FBClient_Simple.cs
@@ -21,7 +21,7 @@ private async Task<string> get2FACode()
             return Console.ReadLine();
         }
 
-        protected override async Task onEvent(FB_Event ev)
+        protected override async Task OnEvent(FB_Event ev)
         {
             switch (ev)
             {

diff --git a/examples/uwpapp/FBClient_Uwp.cs b/examples/uwpapp/FBClient_Uwp.cs
@@ -56,7 +56,7 @@ public UpdateEventArgs(UpdateStatus _update_event, object _data)
             }
         }
 
-        protected override async Task onEvent(FB_Event ev)
+        protected override async Task OnEvent(FB_Event ev)
         {
             switch (ev)
             {

diff --git a/examples/uwpapp/MainPage.xaml.cs b/examples/uwpapp/MainPage.xaml.cs
@@ -61,7 +61,7 @@ private async void ScrollViewer_ViewChanged(object sender, ScrollViewerViewChang
         private void MainPage_Unloaded(object sender, RoutedEventArgs e)
         {
             Client.UpdateEvent -= Client_UpdateEvent;
-            Client.StopListening();
+            Client.StopListening().Wait();
         }
 
         private async void Client_UpdateEvent(object sender, UpdateEventArgs e)

diff --git a/examples/wpfapp/FBClient_Wpf.cs b/examples/wpfapp/FBClient_Wpf.cs
@@ -55,7 +55,7 @@ public UpdateEventArgs(UpdateStatus _update_event, object _data)
             }
         }
 
-        protected override async Task onEvent(FB_Event ev)
+        protected override async Task OnEvent(FB_Event ev)
         {
             switch (ev)
             {

diff --git a/examples/wpfapp/MainPage.xaml.cs b/examples/wpfapp/MainPage.xaml.cs
@@ -49,7 +49,7 @@ private async void MainPage_Loaded(object sender, RoutedEventArgs e)
         private void MainPage_Unloaded(object sender, RoutedEventArgs e)
         {
             Client.UpdateEvent -= Client_UpdateEvent;
-            Client.StopListening();
+            Client.StopListening().Wait();
         }
 
         private void Client_UpdateEvent(object sender, UpdateEventArgs e)
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
             }
-            protected override async Task onEvent(FB_Event ev)
+            protected override async Task OnEvent(FB_Event ev)
             {
                 switch (ev)
                 {
@@ Expand Down @@