Added network monitor pub/sub class

1 files changed, 9 insertions, 14 deletions

diff --git a/windows/WinUI/ToolbarItem.xaml.cs b/windows/WinUI/ToolbarItem.xaml.cs
index e53e4b35..991e1b4a 100644
--- a/windows/WinUI/ToolbarItem.xaml.cs
+++ b/windows/WinUI/ToolbarItem.xaml.cs
@@ -30,6 +30,8 @@ namespace WinUI
         private NetworkListView netListView = null;
         private List<ZeroTierNetwork> networkList = null;
 
+        private NetworkMonitor mon = NetworkMonitor.Instance;
+
         private ObservableCollection<ZeroTierNetwork> _networkCollection = new ObservableCollection<ZeroTierNetwork>();
 
         public ObservableCollection<ZeroTierNetwork> NetworkCollection
@@ -44,15 +46,14 @@ namespace WinUI
         {
             InitializeComponent();
 
-            onUpdateTimer(this, null);
-
-            timer = new Timer();
-            timer.Elapsed += new ElapsedEventHandler(onUpdateTimer);
-            timer.Interval = 2000;
-            timer.Enabled = true;
+            mon.SubscribeNetworkUpdates(updateNetworks);
+            mon.SubscribeStatusUpdates(updateStatus);
+        }
 
-            nodeIdMenuItem.Header = "OFFLINE";
-            nodeIdMenuItem.IsEnabled = false;
+        ~ToolbarItem()
+        {
+            mon.UnsubscribeNetworkUpdates(updateNetworks);
+            mon.UnsubscribeStatusUpdates(updateStatus);
         }
 
         private void updateNetworks(List<ZeroTierNetwork> networks)
@@ -92,12 +93,6 @@ namespace WinUI
             }
         }
 
-        private void onUpdateTimer(object source, ElapsedEventArgs e)
-        {
-            APIHandler.Instance.GetStatus(updateStatus);
-            APIHandler.Instance.GetNetworks(updateNetworks);
-        }
-
         private void ToolbarItem_TrayContextMenuOpen(object sender, System.Windows.RoutedEventArgs e)
         {
             Console.WriteLine("TrayContextMenuOpen");