From c6f3f8eba660eb24e9027e2fed720c4ac5adfa33 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 17 Sep 2020 21:18:35 -0300 Subject: [PATCH] Fix rebase breakage. --- .../ViewControllers/AppSettings/AboutTableViewController.m | 3 ++- Signal/src/call/CallAudioService.swift | 2 +- Signal/src/call/SignalCall.swift | 2 +- .../ViewControllers/UIViewController+Permissions.m | 2 +- SignalMessaging/environment/OWSAudioSession.swift | 4 ++-- SignalMessaging/utils/DebugLogger.m | 2 +- SignalServiceKit/tests/SSKBaseTestObjC.m | 2 +- SignalServiceKit/tests/SSKBaseTestSwift.swift | 2 +- 8 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Signal/src/ViewControllers/AppSettings/AboutTableViewController.m b/Signal/src/ViewControllers/AppSettings/AboutTableViewController.m index fd9a95cdde..86bd1a01f1 100644 --- a/Signal/src/ViewControllers/AppSettings/AboutTableViewController.m +++ b/Signal/src/ViewControllers/AppSettings/AboutTableViewController.m @@ -195,7 +195,8 @@ // Strip prefix from category, otherwise it's too long to fit into cell on a small device. NSString *audioCategory = - [AVAudioSession.shared.category stringByReplacingOccurrencesOfString:@"AVAudioSessionCategory" withString:@""]; + [AVAudioSession.sharedInstance.category stringByReplacingOccurrencesOfString:@"AVAudioSessionCategory" + withString:@""]; [debugSection addItem:[OWSTableItem labelItemWithText:[NSString stringWithFormat:@"Audio Category: %@", audioCategory]]]; diff --git a/Signal/src/call/CallAudioService.swift b/Signal/src/call/CallAudioService.swift index 9d6946cae8..b22eb9d156 100644 --- a/Signal/src/call/CallAudioService.swift +++ b/Signal/src/call/CallAudioService.swift @@ -36,7 +36,7 @@ protocol CallAudioServiceDelegate: class { } var avAudioSession: AVAudioSession { - return AVAudioSession.shared() + return AVAudioSession.sharedInstance() } // MARK: - Initializers diff --git a/Signal/src/call/SignalCall.swift b/Signal/src/call/SignalCall.swift index 6f7ab5066b..51698b7e03 100644 --- a/Signal/src/call/SignalCall.swift +++ b/Signal/src/call/SignalCall.swift @@ -188,7 +188,7 @@ public class SignalCall: NSObject, SignalCallNotificationInfo { // We start out muted if the record permission isn't granted. This should generally // only happen for incoming calls, because we proactively ask about it before you // can make an outgoing call. - public var isMuted = AVAudioSession.shared().recordPermission != .granted { + public var isMuted = AVAudioSession.sharedInstance().recordPermission != .granted { didSet { AssertIsOnMainThread() diff --git a/SignalMessaging/ViewControllers/UIViewController+Permissions.m b/SignalMessaging/ViewControllers/UIViewController+Permissions.m index 45bc0ef069..a0aabc6e8d 100644 --- a/SignalMessaging/ViewControllers/UIViewController+Permissions.m +++ b/SignalMessaging/ViewControllers/UIViewController+Permissions.m @@ -163,7 +163,7 @@ NS_ASSUME_NONNULL_BEGIN return; } - [[AVAudioSession shared] requestRecordPermission:callback]; + [[AVAudioSession sharedInstance] requestRecordPermission:callback]; } - (void)ows_showNoMicrophonePermissionActionSheet diff --git a/SignalMessaging/environment/OWSAudioSession.swift b/SignalMessaging/environment/OWSAudioSession.swift index f06483fbbc..1474978173 100644 --- a/SignalMessaging/environment/OWSAudioSession.swift +++ b/SignalMessaging/environment/OWSAudioSession.swift @@ -66,7 +66,7 @@ public class OWSAudioSession: NSObject { return Environment.shared.proximityMonitoringManager } - private let avAudioSession = AVAudioSession.shared() + private let avAudioSession = AVAudioSession.sharedInstance() private let device = UIDevice.current @@ -232,7 +232,7 @@ public class OWSAudioSession: NSObject { /** * The private class that manages AVAudioSession for WebRTC */ - private let rtcAudioSession = RTCAudioSession.shared() + private let rtcAudioSession = RTCAudioSession.sharedInstance() /** * This must be called before any audio tracks are added to the peerConnection, else we'll start recording before all diff --git a/SignalMessaging/utils/DebugLogger.m b/SignalMessaging/utils/DebugLogger.m index 46dad0bff9..f697c77072 100644 --- a/SignalMessaging/utils/DebugLogger.m +++ b/SignalMessaging/utils/DebugLogger.m @@ -83,7 +83,7 @@ const NSUInteger kMaxDebugLogFileSize = 1024 * 1024 * 3; - (void)enableTTYLogging { - [DDLog addLogger:DDTTYLogger.shared]; + [DDLog addLogger:DDTTYLogger.sharedInstance]; } - (NSURL *)errorLogsDir diff --git a/SignalServiceKit/tests/SSKBaseTestObjC.m b/SignalServiceKit/tests/SSKBaseTestObjC.m index 215f08007e..fa7d9167ef 100644 --- a/SignalServiceKit/tests/SSKBaseTestObjC.m +++ b/SignalServiceKit/tests/SSKBaseTestObjC.m @@ -23,7 +23,7 @@ NS_ASSUME_NONNULL_BEGIN [super setUp]; - [DDLog addLogger:DDTTYLogger.shared]; + [DDLog addLogger:DDTTYLogger.sharedInstance]; ClearCurrentAppContextForTests(); SetCurrentAppContext([TestAppContext new]); diff --git a/SignalServiceKit/tests/SSKBaseTestSwift.swift b/SignalServiceKit/tests/SSKBaseTestSwift.swift index 3c0c3972c3..2db79fb494 100644 --- a/SignalServiceKit/tests/SSKBaseTestSwift.swift +++ b/SignalServiceKit/tests/SSKBaseTestSwift.swift @@ -21,7 +21,7 @@ public class SSKBaseTestSwift: XCTestCase { public override func setUp() { super.setUp() - DDLog.add(DDTTYLogger.shared!) + DDLog.add(DDTTYLogger.sharedInstance!) ClearCurrentAppContextForTests() SetCurrentAppContext(TestAppContext())