Browse Source

Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev

Adam Ierymenko 8 years ago
parent
commit
78d5f1a803
1 changed files with 28 additions and 0 deletions
  1. 28 0
      macui/ZeroTier One/ShowNetworksViewController.m

+ 28 - 0
macui/ZeroTier One/ShowNetworksViewController.m

@@ -58,8 +58,36 @@ BOOL hasNetworkWithID(NSArray<Network*> *list, UInt64 nwid)
     self.visible = NO;
     self.visible = NO;
 }
 }
 
 
+- (NSInteger)findNetworkWithID:(UInt64)networkId
+{
+    for(int i = 0; i < [_networkList count]; ++i) {
+        Network *nw = [_networkList objectAtIndex:i];
+        
+        if(nw.nwid == networkId) {
+            return i;
+        }
+    }
+    
+    return NSNotFound;
+}
+
+
 - (void)deleteNetworkFromList:(NSString *)nwid {
 - (void)deleteNetworkFromList:(NSString *)nwid {
     [self.netMonitor deleteSavedNetwork:nwid];
     [self.netMonitor deleteSavedNetwork:nwid];
+    
+    UInt64 netid = 0;
+    NSScanner *scanner = [NSScanner scannerWithString:nwid];
+    [scanner scanHexLongLong:&netid];
+    for (Network *n in _networkList) {
+        if (n.nwid == netid) {
+            NSInteger index = [self findNetworkWithID:netid];
+            
+            if (index != NSNotFound) {
+                [_networkList removeObjectAtIndex:index];
+                [_tableView reloadData];
+            }
+        }
+    }
 }
 }
 
 
 - (void)setNetworks:(NSArray<Network *> *)list {
 - (void)setNetworks:(NSArray<Network *> *)list {