Merge pull request #1435 from wutschel/fix_discovery_timeout

Bugfix: Do not show results after a TCP discovery timeout

Author: kambala-decapitator

XBMC Remote/HostViewController.h

@@ -25,7 +25,8 @@
     IBOutlet UITextField *mac_5_UI;
     IBOutlet UITextField *tcpPortUI;
     NSMutableArray *services;
-    BOOL searching;
+    BOOL discoveryIsSearching;
+    BOOL discoveryDidFail;
     NSNetServiceBrowser *netServiceBrowser;
     NSNetService *remoteService;
     NSTimer *discoveryTimeoutTimer;

XBMC Remote/HostViewController.m

@@ -199,17 +199,16 @@ - (BOOL)textField:(UITextField*)textField shouldChangeCharactersInRange:(NSRange
 # pragma mark - NSNetServiceBrowserDelegate Methods
 
 - (void)netServiceBrowserWillSearch:(NSNetServiceBrowser*)browser {
-    searching = YES;
-    [self updateUI];
+    discoveryIsSearching = YES;
 }
 
 - (void)netServiceBrowserDidStopSearch:(NSNetServiceBrowser*)browser {
-    searching = NO;
+    discoveryIsSearching = NO;
     [self updateUI];
 }
 
 - (void)netServiceBrowser:(NSNetServiceBrowser*)browser didNotSearch:(NSDictionary*)errorDict {
-    searching = NO;
+    discoveryIsSearching = NO;
     [self handleError:errorDict[NSNetServicesErrorCode]];
     [activityIndicatorView stopAnimating];
     startDiscover.enabled = YES;
@@ -224,7 +223,7 @@ - (void)netServiceBrowser:(NSNetServiceBrowser*)browser
     if ([type containsString:SERVICE_TYPE_HTTP]) {
         [services addObject:aNetService];
         if (!moreComing) {
-            [self stopDiscovery];
+            [self stopDiscover];
         }
     }
     else if ([name isEqualToString:descriptionUI.text]) {
@@ -250,20 +249,22 @@ - (void)handleError:(NSNumber*)error {
 }
 
 - (void)updateUI {
-    if (!searching) {
-        NSInteger j = services.count;
-        if (j == 1) {
+    if (discoveryIsSearching || (discoveryDidFail && services.count)) {
+        return;
+    }
+    switch (services.count) {
+        case 0:
+            [Utilities AnimView:noInstances AnimDuration:0.3 Alpha:1.0 XPos:0];
+            break;
+            
+        case 1:
             [self resolveIPAddress:services[0]];
-        }
-        else {
-            if (j == 0) {
-                [Utilities AnimView:noInstances AnimDuration:0.3 Alpha:1.0 XPos:0];
-            }
-            else {
-                [discoveredInstancesTableView reloadData];
-                [Utilities AnimView:discoveredInstancesView AnimDuration:0.3 Alpha:1.0 XPos:0];
-            }
-        }
+            break;
+            
+        default:
+            [discoveredInstancesTableView reloadData];
+            [Utilities AnimView:discoveredInstancesView AnimDuration:0.3 Alpha:1.0 XPos:0];
+            break;
     }
 }
 
@@ -444,7 +445,13 @@ - (void)netServiceDidResolveAddress:(NSNetService*)service {
     [self fillServerDetailsForSegment:segmentServerType.selectedSegmentIndex];
 }
 
-- (void)stopDiscovery {
+- (void)handleDiscoverTimeout {
+    NSLog(@"Discovery timed out.");
+    discoveryDidFail = YES;
+    [self stopDiscover];
+}
+
+- (void)stopDiscover {
     [discoveryTimeoutTimer invalidate];
     [netServiceBrowser stop];
     [activityIndicatorView stopAnimating];
@@ -460,18 +467,20 @@ - (IBAction)startDiscover:(id)sender {
     [Utilities AnimView:noInstances AnimDuration:0.3 Alpha:0.0 XPos:self.view.frame.size.width];
     [Utilities AnimView:discoveredInstancesView AnimDuration:0.3 Alpha:1.0 XPos:self.view.frame.size.width];
 
-    searching = NO;
+    discoveryIsSearching = NO;
     netServiceBrowser.delegate = self;
     [netServiceBrowser searchForServicesOfType:SERVICE_TYPE_HTTP inDomain:DOMAIN_NAME];
     [self startDiscoveryTimeoutTimer];
 }
 
 - (void)startDiscoveryTimeoutTimer {
+    [discoveryTimeoutTimer invalidate];
     discoveryTimeoutTimer = [NSTimer scheduledTimerWithTimeInterval:DISCOVER_TIMEOUT
                                                              target:self
-                                                           selector:@selector(stopDiscovery)
+                                                           selector:@selector(handleDiscoverTimeout)
                                                            userInfo:nil
                                                             repeats:NO];
+    discoveryDidFail = NO;
 }
 
 #pragma mark - Segment control