Fix merge breakage.

pull/1/head
Matthew Chen 7 years ago
parent 8622dba39f
commit 4fcbfe0e12

@ -102,10 +102,7 @@ class ContactViewController: OWSViewController, CNContactViewControllerDelegate
UIUtil.applySignalAppearence() UIUtil.applySignalAppearence()
if let navigationController = self.navigationController { navigationController?.isNavigationBarHidden = true
owsFail("\(logTag) missing navigationController")
navigationController.isNavigationBarHidden = true
}
contactsManager.requestSystemContactsOnce(completion: { [weak self] _ in contactsManager.requestSystemContactsOnce(completion: { [weak self] _ in
guard let strongSelf = self else { return } guard let strongSelf = self else { return }
@ -122,10 +119,7 @@ class ContactViewController: OWSViewController, CNContactViewControllerDelegate
override func viewWillDisappear(_ animated: Bool) { override func viewWillDisappear(_ animated: Bool) {
super.viewWillDisappear(animated) super.viewWillDisappear(animated)
if let navigationController = self.navigationController { navigationController?.isNavigationBarHidden = false
owsFail("\(logTag) missing navigationController")
navigationController.isNavigationBarHidden = false
}
} }
override func viewDidDisappear(_ animated: Bool) { override func viewDidDisappear(_ animated: Bool) {

Loading…
Cancel
Save