summaryrefslogtreecommitdiff
path: root/ZeroTier One/JoinNetworkViewController.m
diff options
context:
space:
mode:
authorGrant Limberg <glimberg@gmail.com>2016-08-30 20:28:52 -0700
committerGrant Limberg <glimberg@gmail.com>2016-08-30 20:28:52 -0700
commitc2a01f6db46273d7013d22c59e4cc6500866fbd3 (patch)
tree384bb15f5712c5f0906ba51d38abaf2451d17e25 /ZeroTier One/JoinNetworkViewController.m
parent35d5ed9c2bdbb920684a4088bd5bb6a3df332121 (diff)
downloadinfinitytier-c2a01f6db46273d7013d22c59e4cc6500866fbd3.tar.gz
infinitytier-c2a01f6db46273d7013d22c59e4cc6500866fbd3.zip
Added a path for error handling when fetching data from the ZeroTier daemon
Still need to wire up error messages to the user.
Diffstat (limited to 'ZeroTier One/JoinNetworkViewController.m')
-rw-r--r--ZeroTier One/JoinNetworkViewController.m9
1 files changed, 8 insertions, 1 deletions
diff --git a/ZeroTier One/JoinNetworkViewController.m b/ZeroTier One/JoinNetworkViewController.m
index 60e8e1cc..f91589d9 100644
--- a/ZeroTier One/JoinNetworkViewController.m
+++ b/ZeroTier One/JoinNetworkViewController.m
@@ -72,10 +72,17 @@ NSString * const JoinedNetworksKey = @"com.zerotier.one.joined-networks";
- (IBAction)onJoinClicked:(id)sender {
NSString *networkId = self.network.stringValue;
+ NSError *error = nil;
[[ServiceCom sharedInstance] joinNetwork:networkId
allowManaged:(self.allowManagedCheckBox.state == NSOnState)
allowGlobal:(self.allowGlobalCheckBox.state == NSOnState)
- allowDefault:(self.allowDefaultCheckBox.state == NSOnState)];
+ allowDefault:(self.allowDefaultCheckBox.state == NSOnState)
+ error:&error];
+
+ if(error) {
+ // TODO: display error message
+ return;
+ }
self.network.stringValue = @"";