oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Respond to CR. 

// FREEBIE
This commit is contained in:
Matthew Chen 2017-10-18 08:32:28 -07:00
parent b90e9fcd64
commit a386ac5685
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Signal/src/ViewControllers/GifPicker/GifPickerViewController.swift
View File

@ -367,15 +367,17 @@ class GifPickerViewController: OWSViewController, UISearchBarDelegate, UICollect
return
}
strongSelf.tryToSearch(dismissKeyboard: false)
strongSelf.tryToSearch()
}
}
public func searchBarSearchButtonClicked(_ searchBar: UISearchBar) {
self.searchBar.resignFirstResponder()
tryToSearch()
}
public func tryToSearch(dismissKeyboard: Bool = true) {
public func tryToSearch() {
progressiveSearchTimer?.invalidate()
progressiveSearchTimer = nil
@ -391,23 +393,17 @@ class GifPickerViewController: OWSViewController, UISearchBarDelegate, UICollect
if (viewMode == .searching || viewMode == .results) && lastQuery == query {
Logger.info("\(TAG) ignoring duplicate search: \(query)")
if dismissKeyboard {
self.searchBar.resignFirstResponder()
}
return
}
search(query: query, dismissKeyboard: dismissKeyboard)
search(query: query)
}
private func search(query: String, dismissKeyboard: Bool = true) {
private func search(query: String) {
Logger.info("\(TAG) searching: \(query)")
progressiveSearchTimer?.invalidate()
progressiveSearchTimer = nil
if dismissKeyboard {
self.searchBar.resignFirstResponder()
}
imageInfos = []
viewMode = .searching
lastQuery = query