prevent zeroconf discovery duplication

Change-Id: I5947ca5c6d29fbac02123cd2b54ba99c25060d9f

2 files changed, 6 insertions, 23 deletions

diff --git a/ios/iosremote/iosremote/serverList_vc.m b/ios/iosremote/iosremote/serverList_vc.m
index 5c158e82da19..2510fdd960c5 100644
--- a/ios/iosremote/iosremote/serverList_vc.m
+++ b/ios/iosremote/iosremote/serverList_vc.m
@@ -89,6 +89,7 @@
            didFindService:(NSNetService *)aNetService
                moreComing:(BOOL)moreComing
 {
+    [self.comManager.autoDiscoveryServers removeObject:aNetService];
     [self.comManager.autoDiscoveryServers addObject:aNetService];
     
     NSLog(@"Got service %p with hostname %@\n", aNetService,
@@ -110,24 +111,6 @@
                moreComing:(BOOL)moreComing
 {
     NSLog(@"Did remove");
-    NSString * ipString;
-    
-    if ([[aNetService addresses] count] > 0){
-        NSData * address = [[aNetService addresses] objectAtIndex: 0];
-        struct sockaddr_in *socketAddress = (struct sockaddr_in *) [address bytes];
-        ipString = [NSString stringWithFormat: @"%s",inet_ntoa(socketAddress->sin_addr)];
-    }
-    
-    for (Server * s in self.comManager.autoDiscoveryServers) {
-        if (ipString){
-            if ([s.serverName isEqualToString:aNetService.name] && [s.serverAddress isEqualToString:ipString])
-                [self.comManager.autoDiscoveryServers removeObjectIdenticalTo:s];
-        } else {
-            if ([s.serverName isEqualToString:aNetService.name])
-                [self.comManager.autoDiscoveryServers removeObjectIdenticalTo:s];
-        }
-    }
-    // in case any residuous netServices still stay in the list
     [self.comManager.autoDiscoveryServers removeObject:aNetService];
     
     if(!moreComing)
@@ -185,14 +168,13 @@
                                                                                            [self disableSpinner];
                                                                                            [self performSegueWithIdentifier:@"SlideShowPreview" sender:self ];
                                                                                        }];
-    [super viewDidAppear:animated];
-    
     NSLog(@"Clear auto discovered servers");
     [self.comManager.autoDiscoveryServers removeAllObjects];
     self.serviceBrowser = [[NSNetServiceBrowser alloc] init];
     [self.serviceBrowser setDelegate:self];
-    [self.serviceBrowser searchForServicesOfType:@"_impressRemote._tcp" inDomain:@"local"];
+    [self.serviceBrowser searchForServicesOfType:@"_impressremote._tcp" inDomain:@"local"];
     [self.serviceBrowser scheduleInRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];
+    [super viewDidAppear:animated];
 }
 
 - (void) viewWillDisappear:(BOOL)animated
@@ -270,10 +252,10 @@
     
     switch (section) {
         case 0:
-            sectionName = [NSString stringWithFormat:@"Visible computers"];
+            sectionName = [NSString stringWithFormat:@"Detected connections"];
             break;
         case 1:
-            sectionName = [NSString stringWithFormat:@"Manual computers"];
+            sectionName = [NSString stringWithFormat:@"Custom connections"];
             break;
     }
     
diff --git a/ios/iosremote/iosremote/slideShowPreviewTable_vc.m b/ios/iosremote/iosremote/slideShowPreviewTable_vc.m
index c2b7dc1aac4d..59139fa71189 100644
--- a/ios/iosremote/iosremote/slideShowPreviewTable_vc.m
+++ b/ios/iosremote/iosremote/slideShowPreviewTable_vc.m
@@ -207,6 +207,7 @@
     UITableViewCell * cell = [tableView cellForRowAtIndexPath:indexPath];
     UISwitch * toggle = [[[cell accessoryView] subviews] objectAtIndex:0];
     [toggle setOn:![toggle isOn] animated:YES];
+    [cell setSelected:NO animated:YES];
 }
 
 - (void)viewDidUnload {