mirror of
https://github.com/oxen-io/session-ios.git
synced 2023-12-13 21:30:14 +01:00
Fix merge breakage.
This commit is contained in:
parent
8622dba39f
commit
4fcbfe0e12
|
@ -102,10 +102,7 @@ class ContactViewController: OWSViewController, CNContactViewControllerDelegate
|
|||
|
||||
UIUtil.applySignalAppearence()
|
||||
|
||||
if let navigationController = self.navigationController {
|
||||
owsFail("\(logTag) missing navigationController")
|
||||
navigationController.isNavigationBarHidden = true
|
||||
}
|
||||
navigationController?.isNavigationBarHidden = true
|
||||
|
||||
contactsManager.requestSystemContactsOnce(completion: { [weak self] _ in
|
||||
guard let strongSelf = self else { return }
|
||||
|
@ -122,10 +119,7 @@ class ContactViewController: OWSViewController, CNContactViewControllerDelegate
|
|||
override func viewWillDisappear(_ animated: Bool) {
|
||||
super.viewWillDisappear(animated)
|
||||
|
||||
if let navigationController = self.navigationController {
|
||||
owsFail("\(logTag) missing navigationController")
|
||||
navigationController.isNavigationBarHidden = false
|
||||
}
|
||||
navigationController?.isNavigationBarHidden = false
|
||||
}
|
||||
|
||||
override func viewDidDisappear(_ animated: Bool) {
|
||||
|
|
Loading…
Reference in a new issue