signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Merge branch 'martin/IOS-2156' into release/5.27.0

Browse Source
This commit is contained in:
Martin Böttcher 2022-01-27 22:08:33 +01:00
commit e5ff284f4e
1 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Signal/src/ViewControllers/HomeView/ConversationSearchViewController.swift
View File

@ -563,17 +563,9 @@ public class ConversationSearchViewController: UITableViewController, ThreadSwip
// Discard results from stale search.
return
}
self.searchResultSet = results
if let candidates = updateCellCandidates {
for cell in candidates {
if let (section, row) = self.getIndexPathFor(threadId: cell.thread?.uniqueId), let configuration = self.cellConfiguration(searchSection: section, row: row) {
cell.reset()
cell.configure(cellContentToken: self.cellContentToken(forConfiguration: configuration, useCache: false))
}
}
} else {
self.reloadTableData()
}
self.reloadTableData()
})
}
@ -590,21 +582,6 @@ public class ConversationSearchViewController: UITableViewController, ThreadSwip
return nil
}
private func getIndexPathFor(threadId: String?) -> (SearchSection, Int)? {
if let threadId = threadId {
if let row = searchResultSet.contactThreads.map({$0.thread.threadRecord.uniqueId}).firstIndex(of: threadId) {
return (SearchSection.contactThreads, row)
}
if let row = searchResultSet.groupThreads.map({$0.thread.threadRecord.uniqueId}).firstIndex(of: threadId) {
return (SearchSection.groupThreads, row)
}
if let row = searchResultSet.messages.map({$0.thread.threadRecord.uniqueId}).firstIndex(of: threadId) {
return (SearchSection.messages, row)
}
}
return nil
}
private func isBlocked(thread: ThreadViewModel) -> Bool {
owsAssertDebug(thread.homeViewInfo != nil)