Fix problem where a discovered instance has a base_url set without a …

…port
home-assistant · Apr 11, 2017 · 81d407a · 81d407a
1 parent 036f323
commit 81d407a
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/HomeAssistant/Views/SettingsViewController.swift b/HomeAssistant/Views/SettingsViewController.swift
@@ -402,8 +402,12 @@ class SettingsViewController: FormViewController {
         if let userInfo = (notification as Notification).userInfo as? [String:Any] {
             let discoveryInfo = DiscoveryInfoResponse(JSON: userInfo)!
             let needsPass = discoveryInfo.RequiresPassword ? " - Requires password" : ""
+            var url = "\(discoveryInfo.BaseURL!.host!)"
+            if let port = discoveryInfo.BaseURL!.port {
+                url = "\(discoveryInfo.BaseURL!.host!):\(port)"
+            }
             // swiftlint:disable:next line_length
-            let detailTextLabel = "\(discoveryInfo.BaseURL!.host!):\(discoveryInfo.BaseURL!.port!) - \(discoveryInfo.Version) - \(discoveryInfo.BaseURL!.scheme!.uppercased()) \(needsPass)"
+            let detailTextLabel = "\(url) - \(discoveryInfo.Version) - \(discoveryInfo.BaseURL!.scheme!.uppercased()) \(needsPass)"
             if self.form.rowBy(tag: discoveryInfo.LocationName) == nil {
                 discoverySection
                     <<< ButtonRow(discoveryInfo.LocationName) {