adapt to rebase conflicts

Signal/src/ViewControllers/HomeView/ConversationSearchViewController.swift

@@ -47,24 +47,36 @@ class ConversationSearchViewController: UITableViewController {
             return
         }
         
-        var sectionResults: [SearchResult]
         switch searchSection {
         case .conversations:
-            sectionResults = searchResultSet.conversations
+            let sectionResults = searchResultSet.conversations
+            guard let searchResult = sectionResults[safe: indexPath.row] else {
+                owsFail("\(logTag) unknown row selected.")
+                return
+            }
+            
+            let thread = searchResult.thread
+            SignalApp.shared().presentConversation(for: thread.threadRecord, action: .compose)
+            
         case .contacts:
-            sectionResults = searchResultSet.contacts
+            let sectionResults = searchResultSet.contacts
+            guard let searchResult = sectionResults[safe: indexPath.row] else {
+                owsFail("\(logTag) unknown row selected.")
+                return
+            }
+            
+            SignalApp.shared().presentConversation(forRecipientId: searchResult.recipientId, action: .compose)
+            
         case .messages:
-            sectionResults = searchResultSet.messages
-        }
+            let sectionResults = searchResultSet.messages
+            guard let searchResult = sectionResults[safe: indexPath.row] else {
+                owsFail("\(logTag) unknown row selected.")
+                return
+            }
             
-        guard indexPath.row < sectionResults.count else {
-            owsFail("\(logTag) unknown row selected.")
-            return
+            let thread = searchResult.thread
+            SignalApp.shared().presentConversation(for: thread.threadRecord, action: .compose)
         }
-
-        let searchResult = sectionResults[indexPath.row]
-        let thread = searchResult.thread
-        SignalApp.shared().presentConversation(for: thread.threadRecord, action: .compose)
     }
 
     // MARK: UITableViewDataSource

SignalMessaging/utils/ConversationSearcher.swift

@@ -87,7 +87,7 @@ public class ConversationSearcher: NSObject {
             }
         }
 
-        // Only show contacts which were not included in an existing conversation.
+        // Only show contacts which were not included in an existing 1:1 conversation.
         let otherContacts: [ContactSearchResult] = contacts.filter { !existingConversationRecipientIds.contains($0.recipientId) }
 
         return SearchResultSet(conversations: conversations, contacts: otherContacts, messages: messages)

SignalServiceKit/src/Storage/FullTextSearchFinder.swift

@@ -106,6 +106,12 @@ public class FullTextSearchFinder: NSObject {
         if let groupThread = object as? TSGroupThread {
             return self.groupThreadIndexer.index(groupThread)
         } else if let contactThread = object as? TSContactThread {
+            guard contactThread.hasEverHadMessage else {
+                // If we've never sent/received a message in a TSContactThread,
+                // then we want it to appear in the "Other Contacts" section rather
+                // than in the "Conversations" section.
+                return nil
+            }
             return self.contactThreadIndexer.index(contactThread)
         } else if let message = object as? TSMessage {
             return self.messageIndexer.index(message)