From 858e47b9b51b0e23e661efe0af573d94809a5911 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Fri, 4 Jan 2019 15:22:20 -0500
Subject: [PATCH] Remove unsightly separators from 'no search results' state.

---
 .../ConversationSearchViewController.swift    | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/Signal/src/ViewControllers/HomeView/ConversationSearchViewController.swift b/Signal/src/ViewControllers/HomeView/ConversationSearchViewController.swift
index 5dd1be991..7ac4e81d3 100644
--- a/Signal/src/ViewControllers/HomeView/ConversationSearchViewController.swift
+++ b/Signal/src/ViewControllers/HomeView/ConversationSearchViewController.swift
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
 //
 
 import Foundation
@@ -25,7 +25,13 @@ class ConversationSearchViewController: UITableViewController, BlockListCacheDel
         }
     }
 
-    var searchResultSet: SearchResultSet = SearchResultSet.empty
+    var searchResultSet: SearchResultSet = SearchResultSet.empty {
+        didSet {
+            AssertIsOnMainThread()
+
+            updateSeparators()
+        }
+    }
 
     var uiDatabaseConnection: YapDatabaseConnection {
         return OWSPrimaryStorage.shared().uiDatabaseConnection
@@ -76,6 +82,7 @@ class ConversationSearchViewController: UITableViewController, BlockListCacheDel
                                                object: nil)
 
         applyTheme()
+        updateSeparators()
     }
 
     override func viewDidAppear(_ animated: Bool) {
@@ -116,6 +123,14 @@ class ConversationSearchViewController: UITableViewController, BlockListCacheDel
         self.tableView.backgroundColor = Theme.backgroundColor
     }
 
+    private func updateSeparators() {
+        AssertIsOnMainThread()
+
+        self.tableView.separatorStyle = (searchResultSet.isEmpty
+            ? UITableViewCell.SeparatorStyle.none
+            : UITableViewCell.SeparatorStyle.singleLine)
+    }
+
     // MARK: UITableViewDelegate
 
     override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {