remove unused code/comments

Signal/src/ViewControllers/HomeView/ConversationSearchViewController.swift

@@ -29,8 +29,6 @@ class ConversationSearchViewController: UITableViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        self.view.isHidden = true
-
         tableView.rowHeight = UITableViewAutomaticDimension
         tableView.estimatedRowHeight = 60
 

Signal/src/ViewControllers/HomeView/HomeViewController.m

@@ -56,7 +56,6 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations
 
 // Mark: Search
 
-//@property (nonatomic) UISearchBar *searchBar;
 @property (nonatomic) UISearchController *searchController;
 @property (nonatomic) ConversationSearchViewController *searchResultsController;
 

SignalMessaging/utils/ConversationSearcher.swift

@@ -44,8 +44,6 @@ public class ConversationSearcher: NSObject {
     }
 
     public func results(searchText: String, transaction: YapDatabaseReadTransaction) -> SearchResultSet {
-
-        // TODO limit results, prioritize conversations, then contacts, then messages.
         var conversations: [SearchResult] = []
         var contacts: [SearchResult] = []
         var messages: [SearchResult] = []
@@ -149,50 +147,3 @@ public class ConversationSearcher: NSObject {
         return "\(recipientId) \(contactName) \(profileName ?? "")"
     }
 }
-
-//public class ConversationFullTextSearchFinder {
-//
-//    public func enumerateObjects(searchText: String, transaction: YapDatabaseReadTransaction, block: @escaping (Any) -> Void) {
-//        guard let ext = ext(transaction: transaction) else {
-//            owsFail("ext was unexpectedly nil")
-//            return
-//        }
-//
-//        ext.enumerateKeysAndObjects(matching: searchText) { (_, _, object, _) in
-//            block(object)
-//        }
-//    }
-//
-//    private func ext(transaction: YapDatabaseReadTransaction) -> YapDatabaseFullTextSearchTransaction? {
-//        return transaction.ext(ConversationFullTextSearchFinder.dbExtensionName) as? YapDatabaseFullTextSearchTransaction
-//    }
-//
-//    // MARK: - Extension Registration
-//
-//    static let dbExtensionName: String = "ConversationFullTextSearchFinderExtension1"
-//
-//    public class func asyncRegisterDatabaseExtension(storage: OWSStorage) {
-//        storage.asyncRegister(dbExtensionConfig, withName: dbExtensionName)
-//    }
-//
-//    // Only for testing.
-//    public class func syncRegisterDatabaseExtension(storage: OWSStorage) {
-//        storage.register(dbExtensionConfig, withName: dbExtensionName)
-//    }
-//
-//    private class var dbExtensionConfig: YapDatabaseFullTextSearch {
-//        let contentColumnName = "content"
-//        let handler = YapDatabaseFullTextSearchHandler.withObjectBlock { (dict: NSMutableDictionary, _: String, _: String, object: Any) in
-//            if let groupThread = object as? TSGroupThread {
-//                dict[contentColumnName] = groupThread.groupModel.groupName
-//            }
-//        }
-//
-//        // update search index on contact name changes?
-//        // update search index on message insertion?
-//
-//        // TODO is it worth doing faceted search, i.e. Author / Name / Content?
-//        // seems unlikely that mobile users would use the "author: Alice" search syntax.
-//        return YapDatabaseFullTextSearch(columnNames: ["content"], handler: handler)
-//    }
-//}

SignalServiceKit/src/Storage/FullTextSearchFinder.swift

@@ -94,34 +94,6 @@ public class FullTextSearchFinder: NSObject {
         return normalize(text: searchableContent)
     }
 
-//    private lazy var groupThreadSearcher: Searcher<TSGroupThread> = Searcher { (groupThread: TSGroupThread) in
-//        let groupName = groupThread.groupModel.groupName
-//        let memberStrings = groupThread.groupModel.groupMemberIds.map { recipientId in
-//            self.indexingString(recipientId: recipientId)
-//            }.joined(separator: " ")
-//
-//        return "\(memberStrings) \(groupName ?? "")"
-//    }
-//
-//    private lazy var contactThreadSearcher: Searcher<TSContactThread> = Searcher { (contactThread: TSContactThread) in
-//        let recipientId = contactThread.contactIdentifier()
-//        return self.indexingString(recipientId: recipientId)
-//    }
-//
-//    private lazy var signalAccountSearcher: Searcher<SignalAccount> = Searcher { (signalAccount: SignalAccount) in
-//        let recipientId = signalAccount.recipientId
-//        return self.indexingString(recipientId: recipientId)
-//    }
-//
-
-//
-//    private func indexingString(recipientId: String) -> String {
-//        let contactName = contactsManager.displayName(forPhoneIdentifier: recipientId)
-//        let profileName = contactsManager.profileName(forRecipientId: recipientId)
-//
-//        return "\(recipientId) \(contactName) \(profileName ?? "")"
-//    }
-
     private class func indexContent(object: Any) -> String? {
         if let groupThread = object as? TSGroupThread {
             return self.groupThreadIndexer.index(groupThread)
@@ -136,7 +108,7 @@ public class FullTextSearchFinder: NSObject {
 
     // MARK: - Extension Registration
 
-    // MJK - FIXME, remove dynamic name when done developing.
+    // MJK - FIXME - while developing it's helpful to rebuild the index every launch. But we need to remove this before releasing.
     private static let dbExtensionName: String = "FullTextSearchFinderExtension\(Date())"
 
     @objc

SignalServiceKit/src/Storage/OWSPrimaryStorage.m

@@ -59,7 +59,6 @@ void RunAsyncRegistrationsForStorage(OWSStorage *storage, dispatch_block_t compl
     [TSDatabaseView asyncRegisterThreadOutgoingMessagesDatabaseView:storage];
     [TSDatabaseView asyncRegisterThreadSpecialMessagesDatabaseView:storage];
 
-
     [FullTextSearchFinder asyncRegisterDatabaseExtensionWithStorage:storage];
     [OWSIncomingMessageFinder asyncRegisterExtensionWithPrimaryStorage:storage];
     [TSDatabaseView asyncRegisterSecondaryDevicesDatabaseView:storage];