diff options
Diffstat (limited to 'windows')
| -rw-r--r-- | windows/WinUI/AboutView.xaml | 4 | ||||
| -rw-r--r-- | windows/WinUI/CentralAPI.cs | 2 | ||||
| -rw-r--r-- | windows/WinUI/ToolbarItem.xaml | 5 | ||||
| -rw-r--r-- | windows/WinUI/ToolbarItem.xaml.cs | 42 |
4 files changed, 44 insertions, 9 deletions
diff --git a/windows/WinUI/AboutView.xaml b/windows/WinUI/AboutView.xaml index b1df750b..118a61b1 100644 --- a/windows/WinUI/AboutView.xaml +++ b/windows/WinUI/AboutView.xaml @@ -19,9 +19,9 @@ <Run Text="ZeroTier One"/> </Paragraph> <Paragraph TextAlignment="Center"> - <Run FontSize="14" Text="Version 1.2.10"/> + <Run FontSize="14" Text="Version 1.2.12"/> <LineBreak/> - <Run FontSize="14" Text="(c) 2011-2017 ZeroTier, Inc."/> + <Run FontSize="14" Text="(c) 2011-2018 ZeroTier, Inc."/> <LineBreak/> <Run FontSize="14" Text="www.zerotier.com"/> </Paragraph> diff --git a/windows/WinUI/CentralAPI.cs b/windows/WinUI/CentralAPI.cs index fc37aedf..8c36f455 100644 --- a/windows/WinUI/CentralAPI.cs +++ b/windows/WinUI/CentralAPI.cs @@ -207,7 +207,7 @@ namespace WinUI public async Task<CentralNetwork> CreateNewNetwork() { - string networkURL = Central.ServerURL + "/api/network/"; + string networkURL = Central.ServerURL + "/api/network?easy=1"; CentralNetwork network = new CentralNetwork(); network.Config = new CentralNetwork.CentralNetworkConfig(); network.Config.Name = NetworkNameGenerator.GenerateName(); diff --git a/windows/WinUI/ToolbarItem.xaml b/windows/WinUI/ToolbarItem.xaml index 85e4122a..9517455c 100644 --- a/windows/WinUI/ToolbarItem.xaml +++ b/windows/WinUI/ToolbarItem.xaml @@ -43,7 +43,10 @@ <Separator/> <MenuItem Header="ZeroTier Central" Click="ToolbarItem_CentralClicked"/> - + <MenuItem Header="Create and Join Network" + Click="ToolbarItem_NewNetwork" + x:Name="newNetworkItem"/> + <Separator/> <MenuItem Header="About..." Click="ToolbarItem_AboutClicked"/> <MenuItem Header="Preferences..." diff --git a/windows/WinUI/ToolbarItem.xaml.cs b/windows/WinUI/ToolbarItem.xaml.cs index c16de3c3..2a0d717b 100644 --- a/windows/WinUI/ToolbarItem.xaml.cs +++ b/windows/WinUI/ToolbarItem.xaml.cs @@ -120,17 +120,21 @@ namespace WinUI if (shouldShowOnboardProcess) { // TODO: Show onboarding process window (on main thread - Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() => - { - PageSwitcher ps = new PageSwitcher(); - ps.Show(); - })); + showOnboardProcess(); shouldShowOnboardProcess = false; } } } + private void showOnboardProcess() + { + Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() => + { + PageSwitcher ps = new PageSwitcher(); + ps.Show(); + })); + } private void updateStatus(ZeroTierStatus status) { if (status != null) @@ -142,6 +146,15 @@ namespace WinUI nodeId = status.Address; })); } + + if (CentralAPI.Instance.HasAccessToken()) + { + newNetworkItem.IsEnabled = true; + } + else + { + newNetworkItem.IsEnabled = false; + } } private void ToolbarItem_NodeIDClicked(object sender, System.Windows.RoutedEventArgs e) @@ -331,6 +344,25 @@ namespace WinUI } } + private async void ToolbarItem_NewNetwork(object sender, System.Windows.RoutedEventArgs e) + { + if (CentralAPI.Instance.HasAccessToken()) + { + CentralAPI api = CentralAPI.Instance; + CentralNetwork newNetwork = await api.CreateNewNetwork(); + + APIHandler handler = APIHandler.Instance; + handler.JoinNetwork(this.Dispatcher, newNetwork.Id); + + string nodeId = APIHandler.Instance.NodeAddress(); + bool authorized = await CentralAPI.Instance.AuthorizeNode(nodeId, newNetwork.Id); + } + else + { + showOnboardProcess(); + } + } + private void setWindowPosition(Window w) { double width = w.ActualWidth; |