From 39563ab8c20500d9953e295b76c0faa7679caf64 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 20 Jun 2017 16:39:27 -0400 Subject: [PATCH] present from signalsViewController so users don't get confused by being dropped into a different thread when the call is over. e.g. chatting with Alice, but Bob calls. When I end the call with Bob It would be too easy to fire off a message assuming it's going to Bob. // FREEBIE --- Signal/src/Signal-Bridging-Header.h | 1 + Signal/src/call/UserInterface/CallUIAdapter.swift | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Signal/src/Signal-Bridging-Header.h b/Signal/src/Signal-Bridging-Header.h index 80c2e5818..91f3d71b7 100644 --- a/Signal/src/Signal-Bridging-Header.h +++ b/Signal/src/Signal-Bridging-Header.h @@ -22,6 +22,7 @@ #import "PropertyListPreferences.h" #import "PushManager.h" #import "SettingsTableViewController.h" +#import "SignalsViewController.h" #import "UIColor+OWS.h" #import "UIFont+OWS.h" #import "UIUtil.h" diff --git a/Signal/src/call/UserInterface/CallUIAdapter.swift b/Signal/src/call/UserInterface/CallUIAdapter.swift index 520a646d8..8f183af7f 100644 --- a/Signal/src/call/UserInterface/CallUIAdapter.swift +++ b/Signal/src/call/UserInterface/CallUIAdapter.swift @@ -40,9 +40,9 @@ extension CallUIAdaptee { callViewController.thread = thread callViewController.modalTransitionStyle = .crossDissolve - guard let presentingViewController = UIApplication.shared.frontmostViewController else { - Logger.error("in \(#function) frontmost view controller unexpectedly nil") - assertionFailure("in \(#function) frontmost view controller unexpectedly nil") + guard let presentingViewController = Environment.getCurrent().signalsViewController else { + Logger.error("in \(#function) view controller unexpectedly nil") + assertionFailure("in \(#function) view controller unexpectedly nil") return }