diff --git a/Signal/src/UIApplication+OWS.swift b/Signal/src/UIApplication+OWS.swift index f5b8377e6..b6410c284 100644 --- a/Signal/src/UIApplication+OWS.swift +++ b/Signal/src/UIApplication+OWS.swift @@ -1,16 +1,16 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation @objc public extension UIApplication { - @objc public var frontmostViewControllerIgnoringAlerts: UIViewController? { + public var frontmostViewControllerIgnoringAlerts: UIViewController? { return findFrontmostViewController(ignoringAlerts: true) } - @objc public var frontmostViewController: UIViewController? { + public var frontmostViewController: UIViewController? { return findFrontmostViewController(ignoringAlerts: false) } @@ -26,7 +26,7 @@ import Foundation return viewController.findFrontmostViewController(ignoringAlerts) } - @objc public func openSystemSettings() { + public func openSystemSettings() { openURL(URL(string: UIApplication.openSettingsURLString)!) } diff --git a/Signal/src/UserInterface/Notifications/UserNotificationsAdaptee.swift b/Signal/src/UserInterface/Notifications/UserNotificationsAdaptee.swift index cf85fac9a..361859e09 100644 --- a/Signal/src/UserInterface/Notifications/UserNotificationsAdaptee.swift +++ b/Signal/src/UserInterface/Notifications/UserNotificationsAdaptee.swift @@ -288,6 +288,6 @@ extension OWSSound { } // Helper function inserted by Swift 4.2 migrator. -fileprivate func convertToUNNotificationSoundName(_ input: String) -> UNNotificationSoundName { +private func convertToUNNotificationSoundName(_ input: String) -> UNNotificationSoundName { return UNNotificationSoundName(rawValue: input) } diff --git a/Signal/src/ViewControllers/AddContactShareToExistingContactViewController.swift b/Signal/src/ViewControllers/AddContactShareToExistingContactViewController.swift index a79dc9e93..0cc652d48 100644 --- a/Signal/src/ViewControllers/AddContactShareToExistingContactViewController.swift +++ b/Signal/src/ViewControllers/AddContactShareToExistingContactViewController.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation diff --git a/Signal/src/ViewControllers/Call/CallViewController.swift b/Signal/src/ViewControllers/Call/CallViewController.swift index 8b02f5df7..779ba56f3 100644 --- a/Signal/src/ViewControllers/Call/CallViewController.swift +++ b/Signal/src/ViewControllers/Call/CallViewController.swift @@ -1227,6 +1227,6 @@ extension CallViewController: CallVideoHintViewDelegate { } // Helper function inserted by Swift 4.2 migrator. -fileprivate func convertFromAVAudioSessionPort(_ input: AVAudioSession.Port) -> String { +private func convertFromAVAudioSessionPort(_ input: AVAudioSession.Port) -> String { return input.rawValue } diff --git a/Signal/src/ViewControllers/ConversationView/Cells/MediaUploadView.swift b/Signal/src/ViewControllers/ConversationView/Cells/MediaUploadView.swift index 3fae2f099..f2159af58 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/MediaUploadView.swift +++ b/Signal/src/ViewControllers/ConversationView/Cells/MediaUploadView.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation diff --git a/Signal/src/ViewControllers/LongTextViewController.swift b/Signal/src/ViewControllers/LongTextViewController.swift index 99521f116..295b939cf 100644 --- a/Signal/src/ViewControllers/LongTextViewController.swift +++ b/Signal/src/ViewControllers/LongTextViewController.swift @@ -175,7 +175,7 @@ public class LongTextViewController: OWSViewController { } // Helper function inserted by Swift 4.2 migrator. -fileprivate func convertToOptionalNSAttributedStringKeyDictionary(_ input: [String: Any]?) -> [NSAttributedString.Key: Any]? { +private func convertToOptionalNSAttributedStringKeyDictionary(_ input: [String: Any]?) -> [NSAttributedString.Key: Any]? { guard let input = input else { return nil } return Dictionary(uniqueKeysWithValues: input.map { key, value in (NSAttributedString.Key(rawValue: key), value)}) } diff --git a/Signal/src/ViewControllers/MediaPageViewController.swift b/Signal/src/ViewControllers/MediaPageViewController.swift index 7558a6010..5ff4fd936 100644 --- a/Signal/src/ViewControllers/MediaPageViewController.swift +++ b/Signal/src/ViewControllers/MediaPageViewController.swift @@ -831,12 +831,12 @@ extension MediaPageViewController: CaptionContainerViewDelegate { } // Helper function inserted by Swift 4.2 migrator. -fileprivate func convertToOptionalUIPageViewControllerOptionsKeyDictionary(_ input: [String: Any]?) -> [UIPageViewController.OptionsKey: Any]? { +private func convertToOptionalUIPageViewControllerOptionsKeyDictionary(_ input: [String: Any]?) -> [UIPageViewController.OptionsKey: Any]? { guard let input = input else { return nil } return Dictionary(uniqueKeysWithValues: input.map { key, value in (UIPageViewController.OptionsKey(rawValue: key), value)}) } // Helper function inserted by Swift 4.2 migrator. -fileprivate func convertFromUIPageViewControllerOptionsKey(_ input: UIPageViewController.OptionsKey) -> String { +private func convertFromUIPageViewControllerOptionsKey(_ input: UIPageViewController.OptionsKey) -> String { return input.rawValue } diff --git a/Signal/src/ViewControllers/OWS2FAReminderViewController.swift b/Signal/src/ViewControllers/OWS2FAReminderViewController.swift index 4f78f79f2..42e8a2cfd 100644 --- a/Signal/src/ViewControllers/OWS2FAReminderViewController.swift +++ b/Signal/src/ViewControllers/OWS2FAReminderViewController.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import UIKit diff --git a/Signal/src/call/CallAudioService.swift b/Signal/src/call/CallAudioService.swift index 45613c626..376639c2e 100644 --- a/Signal/src/call/CallAudioService.swift +++ b/Signal/src/call/CallAudioService.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation @@ -550,21 +550,21 @@ protocol CallAudioServiceDelegate: class { } // Helper function inserted by Swift 4.2 migrator. -fileprivate func convertFromAVAudioSessionPort(_ input: AVAudioSession.Port) -> String { +private func convertFromAVAudioSessionPort(_ input: AVAudioSession.Port) -> String { return input.rawValue } // Helper function inserted by Swift 4.2 migrator. -fileprivate func convertFromAVAudioSessionCategory(_ input: AVAudioSession.Category) -> String { +private func convertFromAVAudioSessionCategory(_ input: AVAudioSession.Category) -> String { return input.rawValue } // Helper function inserted by Swift 4.2 migrator. -fileprivate func convertFromAVAudioSessionMode(_ input: AVAudioSession.Mode) -> String { +private func convertFromAVAudioSessionMode(_ input: AVAudioSession.Mode) -> String { return input.rawValue } // Helper function inserted by Swift 4.2 migrator. -fileprivate func convertToAVAudioSessionCategory(_ input: String) -> AVAudioSession.Category { +private func convertToAVAudioSessionCategory(_ input: String) -> AVAudioSession.Category { return AVAudioSession.Category(rawValue: input) } diff --git a/Signal/src/call/SignalCall.swift b/Signal/src/call/SignalCall.swift index ea7c989d2..339029884 100644 --- a/Signal/src/call/SignalCall.swift +++ b/Signal/src/call/SignalCall.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation diff --git a/Signal/src/call/Speakerbox/CallKitCallManager.swift b/Signal/src/call/Speakerbox/CallKitCallManager.swift index 588d1f4f2..1ef422f33 100644 --- a/Signal/src/call/Speakerbox/CallKitCallManager.swift +++ b/Signal/src/call/Speakerbox/CallKitCallManager.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import UIKit diff --git a/Signal/src/views/AvatarTableViewCell.swift b/Signal/src/views/AvatarTableViewCell.swift index d30e2b1f4..955584d82 100644 --- a/Signal/src/views/AvatarTableViewCell.swift +++ b/Signal/src/views/AvatarTableViewCell.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation diff --git a/Signal/src/views/CaptionView.swift b/Signal/src/views/CaptionView.swift index cfaf5cb08..44bf66fd7 100644 --- a/Signal/src/views/CaptionView.swift +++ b/Signal/src/views/CaptionView.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // public protocol CaptionContainerViewDelegate: class { diff --git a/Signal/src/views/ContactCell.swift b/Signal/src/views/ContactCell.swift index a6f01776d..f796f20f5 100644 --- a/Signal/src/views/ContactCell.swift +++ b/Signal/src/views/ContactCell.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import UIKit diff --git a/Signal/src/views/MarqueeLabel.swift b/Signal/src/views/MarqueeLabel.swift index f8810497c..26b31a9d7 100644 --- a/Signal/src/views/MarqueeLabel.swift +++ b/Signal/src/views/MarqueeLabel.swift @@ -245,7 +245,7 @@ open class MarqueeLabel: UILabel, CAAnimationDelegate { get { switch speed { case .duration(let duration): return duration - case .rate(_): return 0.0 + case .rate: return 0.0 } } set { @@ -257,7 +257,7 @@ open class MarqueeLabel: UILabel, CAAnimationDelegate { @IBInspectable open var scrollRate: CGFloat { get { switch speed { - case .duration(_): return 0.0 + case .duration: return 0.0 case .rate(let rate): return rate } } @@ -1139,11 +1139,11 @@ open class MarqueeLabel: UILabel, CAAnimationDelegate { return CAReplicatorLayer.self } - fileprivate weak var repliLayer: CAReplicatorLayer? { + fileprivate var repliLayer: CAReplicatorLayer? { return self.layer as? CAReplicatorLayer } - fileprivate weak var maskLayer: CAGradientLayer? { + fileprivate var maskLayer: CAGradientLayer? { return self.layer.mask as! CAGradientLayer? } @@ -1168,7 +1168,7 @@ open class MarqueeLabel: UILabel, CAAnimationDelegate { } class fileprivate func notifyController(_ controller: UIViewController, message: MarqueeKeys) { - NotificationCenter.default.post(name: Notification.Name(rawValue: message.rawValue), object: nil, userInfo: ["controller" : controller]) + NotificationCenter.default.post(name: Notification.Name(rawValue: message.rawValue), object: nil, userInfo: ["controller": controller]) } @objc public func restartForViewController(_ notification: Notification) { @@ -1705,8 +1705,8 @@ public struct EdgeFade: OptionSet { } // Define helpful typealiases -fileprivate typealias MLAnimationCompletionBlock = (_ finished: Bool) -> Void -fileprivate typealias MLAnimation = (anim: CAKeyframeAnimation, duration: CGFloat) +private typealias MLAnimationCompletionBlock = (_ finished: Bool) -> Void +private typealias MLAnimation = (anim: CAKeyframeAnimation, duration: CGFloat) private class GradientSetupAnimation: CABasicAnimation { } @@ -1842,11 +1842,11 @@ fileprivate extension CAMediaTimingFunction { } // Helper function inserted by Swift 4.2 migrator. -fileprivate func convertFromCAMediaTimingFunctionName(_ input: CAMediaTimingFunctionName) -> String { +private func convertFromCAMediaTimingFunctionName(_ input: CAMediaTimingFunctionName) -> String { return input.rawValue } // Helper function inserted by Swift 4.2 migrator. -fileprivate func convertToCAMediaTimingFunctionName(_ input: String) -> CAMediaTimingFunctionName { +private func convertToCAMediaTimingFunctionName(_ input: String) -> CAMediaTimingFunctionName { return CAMediaTimingFunctionName(rawValue: input) } diff --git a/Signal/test/contact/ContactsPickerTest.swift b/Signal/test/contact/ContactsPickerTest.swift index 02f77b0f0..1f91f3d55 100644 --- a/Signal/test/contact/ContactsPickerTest.swift +++ b/Signal/test/contact/ContactsPickerTest.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import XCTest diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift index 0a0b8d618..d9c6fbb02 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift @@ -794,12 +794,12 @@ extension AttachmentApprovalViewController: AttachmentApprovalInputAccessoryView } // Helper function inserted by Swift 4.2 migrator. -fileprivate func convertToOptionalUIPageViewControllerOptionsKeyDictionary(_ input: [String: Any]?) -> [UIPageViewController.OptionsKey: Any]? { +private func convertToOptionalUIPageViewControllerOptionsKeyDictionary(_ input: [String: Any]?) -> [UIPageViewController.OptionsKey: Any]? { guard let input = input else { return nil } return Dictionary(uniqueKeysWithValues: input.map { key, value in (UIPageViewController.OptionsKey(rawValue: key), value)}) } // Helper function inserted by Swift 4.2 migrator. -fileprivate func convertFromUIPageViewControllerOptionsKey(_ input: UIPageViewController.OptionsKey) -> String { +private func convertFromUIPageViewControllerOptionsKey(_ input: UIPageViewController.OptionsKey) -> String { return input.rawValue } diff --git a/SignalMessaging/ViewControllers/MediaMessageView.swift b/SignalMessaging/ViewControllers/MediaMessageView.swift index e4f88db71..4f3da9010 100644 --- a/SignalMessaging/ViewControllers/MediaMessageView.swift +++ b/SignalMessaging/ViewControllers/MediaMessageView.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation diff --git a/SignalMessaging/ViewControllers/ModalActivityIndicatorViewController.swift b/SignalMessaging/ViewControllers/ModalActivityIndicatorViewController.swift index eaf999acf..07ec2bcbe 100644 --- a/SignalMessaging/ViewControllers/ModalActivityIndicatorViewController.swift +++ b/SignalMessaging/ViewControllers/ModalActivityIndicatorViewController.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation diff --git a/SignalMessaging/Views/AvatarImageView.swift b/SignalMessaging/Views/AvatarImageView.swift index c3ba5c0cb..1e08b37c3 100644 --- a/SignalMessaging/Views/AvatarImageView.swift +++ b/SignalMessaging/Views/AvatarImageView.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import UIKit diff --git a/SignalMessaging/Views/VideoPlayerView.swift b/SignalMessaging/Views/VideoPlayerView.swift index 0dfb10d2d..213c2fe39 100644 --- a/SignalMessaging/Views/VideoPlayerView.swift +++ b/SignalMessaging/Views/VideoPlayerView.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation diff --git a/SignalMessaging/attachments/OWSVideoPlayer.swift b/SignalMessaging/attachments/OWSVideoPlayer.swift index 0856bf9a6..95532b2a7 100644 --- a/SignalMessaging/attachments/OWSVideoPlayer.swift +++ b/SignalMessaging/attachments/OWSVideoPlayer.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation diff --git a/SignalMessaging/environment/OWSAudioSession.swift b/SignalMessaging/environment/OWSAudioSession.swift index 5c7932883..ae0e11c17 100644 --- a/SignalMessaging/environment/OWSAudioSession.swift +++ b/SignalMessaging/environment/OWSAudioSession.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation @@ -217,6 +217,6 @@ public class OWSAudioSession: NSObject { } // Helper function inserted by Swift 4.2 migrator. -fileprivate func convertFromAVAudioSessionCategory(_ input: AVAudioSession.Category) -> String { +private func convertFromAVAudioSessionCategory(_ input: AVAudioSession.Category) -> String { return input.rawValue } diff --git a/SignalMessaging/utils/ConversationStyle.swift b/SignalMessaging/utils/ConversationStyle.swift index 39f06dc75..28df78303 100644 --- a/SignalMessaging/utils/ConversationStyle.swift +++ b/SignalMessaging/utils/ConversationStyle.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation diff --git a/SignalMessaging/utils/ProximityMonitoringManager.swift b/SignalMessaging/utils/ProximityMonitoringManager.swift index aba48e36c..8c8ec9aef 100644 --- a/SignalMessaging/utils/ProximityMonitoringManager.swift +++ b/SignalMessaging/utils/ProximityMonitoringManager.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // @objc diff --git a/SignalServiceKit/src/Messages/Attachments/OWSMediaUtils.swift b/SignalServiceKit/src/Messages/Attachments/OWSMediaUtils.swift index 77f42d52f..3ec42e904 100644 --- a/SignalServiceKit/src/Messages/Attachments/OWSMediaUtils.swift +++ b/SignalServiceKit/src/Messages/Attachments/OWSMediaUtils.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation diff --git a/SignalServiceKit/src/Messages/Attachments/OWSThumbnailService.swift b/SignalServiceKit/src/Messages/Attachments/OWSThumbnailService.swift index 7d6ffebe3..d65a502d5 100644 --- a/SignalServiceKit/src/Messages/Attachments/OWSThumbnailService.swift +++ b/SignalServiceKit/src/Messages/Attachments/OWSThumbnailService.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation diff --git a/SignalServiceKit/src/Util/MessageSender+Promise.swift b/SignalServiceKit/src/Util/MessageSender+Promise.swift index 4edb93363..a60cba6b6 100644 --- a/SignalServiceKit/src/Util/MessageSender+Promise.swift +++ b/SignalServiceKit/src/Util/MessageSender+Promise.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation diff --git a/SignalShareExtension/SAELoadViewController.swift b/SignalShareExtension/SAELoadViewController.swift index ed062ccbe..52279f024 100644 --- a/SignalShareExtension/SAELoadViewController.swift +++ b/SignalShareExtension/SAELoadViewController.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import UIKit diff --git a/SignalShareExtension/ShareViewController.swift b/SignalShareExtension/ShareViewController.swift index c747bc19d..1815b14ac 100644 --- a/SignalShareExtension/ShareViewController.swift +++ b/SignalShareExtension/ShareViewController.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import UIKit