From 1516da17c6c4010792c48a72dde60c0da2118f1b Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Mon, 6 Jan 2020 10:56:34 +1100 Subject: [PATCH] Fix search bar crash on older iOS versions --- Signal/Signal-Info.plist | 4 ++-- Signal/src/Loki/Components/SearchBar.swift | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index 8631d8d3d..fa5981210 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -5,9 +5,9 @@ BuildDetails CarthageVersion - 0.33.0 + 0.34.0 OSXVersion - 10.15 + 10.15.1 WebRTCCommit 1445d719bf05280270e9f77576f80f973fd847f8 M73 diff --git a/Signal/src/Loki/Components/SearchBar.swift b/Signal/src/Loki/Components/SearchBar.swift index a1a1de48b..5a6e78ed3 100644 --- a/Signal/src/Loki/Components/SearchBar.swift +++ b/Signal/src/Loki/Components/SearchBar.swift @@ -19,6 +19,12 @@ final class SearchBar : UISearchBar { setImage(searchImage, for: .search, state: .normal) let clearImage = #imageLiteral(resourceName: "searchbar_clear").asTintedImage(color: Colors.searchBarPlaceholder)! setImage(clearImage, for: .clear, state: .normal) + let searchTextField: UITextField + if #available(iOS 13, *) { + searchTextField = self.searchTextField + } else { + searchTextField = self.value(forKey: "_searchField") as! UITextField + } searchTextField.backgroundColor = Colors.searchBarBackground // The search bar background color searchTextField.textColor = Colors.text searchTextField.attributedPlaceholder = NSAttributedString(string: NSLocalizedString("Search", comment: ""), attributes: [ .foregroundColor : Colors.searchBarPlaceholder ])