diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m index 4865a188e..890a13395 100644 --- a/Signal/src/AppDelegate.m +++ b/Signal/src/AppDelegate.m @@ -777,10 +777,7 @@ static NSTimeInterval launchStartedAt; OutboundCallInitiator *outboundCallInitiator = SignalApp.sharedApp.outboundCallInitiator; OWSAssert(outboundCallInitiator); -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wunused-result" [outboundCallInitiator initiateCallWithHandle:phoneNumber]; -#pragma GCC diagnostic pop }]; return YES; } else if ([userActivity.activityType isEqualToString:@"INStartAudioCallIntent"]) { @@ -824,10 +821,7 @@ static NSTimeInterval launchStartedAt; OutboundCallInitiator *outboundCallInitiator = SignalApp.sharedApp.outboundCallInitiator; OWSAssert(outboundCallInitiator); -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wunused-result" [outboundCallInitiator initiateCallWithHandle:phoneNumber]; -#pragma GCC diagnostic pop }]; return YES; } else { diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 6acf8b6cc..cc3ae95fd 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -1456,10 +1456,7 @@ typedef enum : NSUInteger { return; } -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wunused-result" [self.outboundCallInitiator initiateCallWithRecipientId:self.thread.contactIdentifier isVideo:isVideo]; -#pragma GCC diagnostic pop } - (BOOL)canCall diff --git a/Signal/src/call/OutboundCallInitiator.swift b/Signal/src/call/OutboundCallInitiator.swift index c5b200574..b3900960f 100644 --- a/Signal/src/call/OutboundCallInitiator.swift +++ b/Signal/src/call/OutboundCallInitiator.swift @@ -27,7 +27,7 @@ import SignalMessaging /** * |handle| is a user formatted phone number, e.g. from a system contacts entry */ - @objc public func initiateCall(handle: String) -> Bool { + @discardableResult @objc public func initiateCall(handle: String) -> Bool { Logger.info("\(TAG) in \(#function) with handle: \(handle)") guard let recipientId = PhoneNumber(fromE164: handle)?.toE164() else { @@ -41,7 +41,7 @@ import SignalMessaging /** * |recipientId| is a e164 formatted phone number. */ - @objc public func initiateCall(recipientId: String, + @discardableResult @objc public func initiateCall(recipientId: String, isVideo: Bool) -> Bool { // Rather than an init-assigned dependency property, we access `callUIAdapter` via Environment // because it can change after app launch due to user settings