keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

autoformatted

Browse Source
pull/2/head
Michael Kirk 6 years ago
parent 64a0c4bfaa
commit 30266bf65e
30 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File

8
Signal/src/UIApplication+OWS.swift
Unescape Escape View File

@ -1,16 +1,16 @@
// //
// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // Copyright (c) 2019 Open Whisper Systems. All rights reserved.
// //
import Foundation import Foundation
@objc public extension UIApplication { @objc public extension UIApplication {
@objc public var frontmostViewControllerIgnoringAlerts: UIViewController? { public var frontmostViewControllerIgnoringAlerts: UIViewController? {
return findFrontmostViewController(ignoringAlerts: true) return findFrontmostViewController(ignoringAlerts: true)
} }
@objc public var frontmostViewController: UIViewController? { public var frontmostViewController: UIViewController? {
return findFrontmostViewController(ignoringAlerts: false) return findFrontmostViewController(ignoringAlerts: false)
} }
@ -26,7 +26,7 @@ import Foundation
return viewController.findFrontmostViewController(ignoringAlerts) return viewController.findFrontmostViewController(ignoringAlerts)
} }
@objc public func openSystemSettings() { public func openSystemSettings() {
openURL(URL(string: UIApplication.openSettingsURLString)!) openURL(URL(string: UIApplication.openSettingsURLString)!)
} }

2
Signal/src/UserInterface/Notifications/UserNotificationsAdaptee.swift
Unescape Escape View File

@ -288,6 +288,6 @@ extension OWSSound {
} }
// Helper function inserted by Swift 4.2 migrator. // Helper function inserted by Swift 4.2 migrator.
fileprivate func convertToUNNotificationSoundName(_ input: String) -> UNNotificationSoundName { private func convertToUNNotificationSoundName(_ input: String) -> UNNotificationSoundName {
return UNNotificationSoundName(rawValue: input) return UNNotificationSoundName(rawValue: input)
} }

2
Signal/src/ViewControllers/AddContactShareToExistingContactViewController.swift
Unescape Escape View File

@ -1,5 +1,5 @@
// //
// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // Copyright (c) 2019 Open Whisper Systems. All rights reserved.
// //
import Foundation import Foundation

2
Signal/src/ViewControllers/Call/CallViewController.swift
Unescape Escape View File

@ -1227,6 +1227,6 @@ extension CallViewController: CallVideoHintViewDelegate {
} }
// Helper function inserted by Swift 4.2 migrator. // 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 return input.rawValue
} }

2
Signal/src/ViewControllers/ConversationView/Cells/MediaUploadView.swift
Unescape Escape View File

@ -1,5 +1,5 @@
// //
// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // Copyright (c) 2019 Open Whisper Systems. All rights reserved.
// //
import Foundation import Foundation

2
Signal/src/ViewControllers/LongTextViewController.swift
Unescape Escape View File

@ -175,7 +175,7 @@ public class LongTextViewController: OWSViewController {
} }
// Helper function inserted by Swift 4.2 migrator. // 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 } guard let input = input else { return nil }
return Dictionary(uniqueKeysWithValues: input.map { key, value in (NSAttributedString.Key(rawValue: key), value)}) return Dictionary(uniqueKeysWithValues: input.map { key, value in (NSAttributedString.Key(rawValue: key), value)})
} }

4
Signal/src/ViewControllers/MediaPageViewController.swift
Unescape Escape View File

@ -831,12 +831,12 @@ extension MediaPageViewController: CaptionContainerViewDelegate {
} }
// Helper function inserted by Swift 4.2 migrator. // 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 } guard let input = input else { return nil }
return Dictionary(uniqueKeysWithValues: input.map { key, value in (UIPageViewController.OptionsKey(rawValue: key), value)}) return Dictionary(uniqueKeysWithValues: input.map { key, value in (UIPageViewController.OptionsKey(rawValue: key), value)})
} }
// Helper function inserted by Swift 4.2 migrator. // 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 return input.rawValue
} }

2
Signal/src/ViewControllers/OWS2FAReminderViewController.swift
Unescape Escape View File

@ -1,5 +1,5 @@
// //
// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // Copyright (c) 2019 Open Whisper Systems. All rights reserved.
// //
import UIKit import UIKit

10
Signal/src/call/CallAudioService.swift
Unescape Escape View File

@ -1,5 +1,5 @@
// //
// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // Copyright (c) 2019 Open Whisper Systems. All rights reserved.
// //
import Foundation import Foundation
@ -550,21 +550,21 @@ protocol CallAudioServiceDelegate: class {
} }
// Helper function inserted by Swift 4.2 migrator. // 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 return input.rawValue
} }
// Helper function inserted by Swift 4.2 migrator. // 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 return input.rawValue
} }
// Helper function inserted by Swift 4.2 migrator. // 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 return input.rawValue
} }
// Helper function inserted by Swift 4.2 migrator. // 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) return AVAudioSession.Category(rawValue: input)
} }

2
Signal/src/call/SignalCall.swift
Unescape Escape View File

@ -1,5 +1,5 @@
// //
// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // Copyright (c) 2019 Open Whisper Systems. All rights reserved.
// //
import Foundation import Foundation

2
Signal/src/call/Speakerbox/CallKitCallManager.swift
Unescape Escape View File

@ -1,5 +1,5 @@
// //
// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // Copyright (c) 2019 Open Whisper Systems. All rights reserved.
// //
import UIKit import UIKit

2
Signal/src/views/AvatarTableViewCell.swift
Unescape Escape View File

@ -1,5 +1,5 @@
// //
// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // Copyright (c) 2019 Open Whisper Systems. All rights reserved.
// //
import Foundation import Foundation

2
Signal/src/views/CaptionView.swift
Unescape Escape View File

@ -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 { public protocol CaptionContainerViewDelegate: class {

2
Signal/src/views/ContactCell.swift
Unescape Escape View File

@ -1,5 +1,5 @@
// //
// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // Copyright (c) 2019 Open Whisper Systems. All rights reserved.
// //
import UIKit import UIKit

18
Signal/src/views/MarqueeLabel.swift
Unescape Escape View File

@ -245,7 +245,7 @@ open class MarqueeLabel: UILabel, CAAnimationDelegate {
get { get {
switch speed { switch speed {
case .duration(let duration): return duration case .duration(let duration): return duration
case .rate(_): return 0.0 case .rate: return 0.0
} }
} }
set { set {
@ -257,7 +257,7 @@ open class MarqueeLabel: UILabel, CAAnimationDelegate {
@IBInspectable open var scrollRate: CGFloat { @IBInspectable open var scrollRate: CGFloat {
get { get {
switch speed { switch speed {
case .duration(_): return 0.0 case .duration: return 0.0
case .rate(let rate): return rate case .rate(let rate): return rate
} }
} }
@ -1139,11 +1139,11 @@ open class MarqueeLabel: UILabel, CAAnimationDelegate {
return CAReplicatorLayer.self return CAReplicatorLayer.self
} }
fileprivate weak var repliLayer: CAReplicatorLayer? { fileprivate var repliLayer: CAReplicatorLayer? {
return self.layer as? CAReplicatorLayer return self.layer as? CAReplicatorLayer
} }
fileprivate weak var maskLayer: CAGradientLayer? { fileprivate var maskLayer: CAGradientLayer? {
return self.layer.mask as! CAGradientLayer? return self.layer.mask as! CAGradientLayer?
} }
@ -1168,7 +1168,7 @@ open class MarqueeLabel: UILabel, CAAnimationDelegate {
} }
class fileprivate func notifyController(_ controller: UIViewController, message: MarqueeKeys) { 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) { @objc public func restartForViewController(_ notification: Notification) {
@ -1705,8 +1705,8 @@ public struct EdgeFade: OptionSet {
} }
// Define helpful typealiases // Define helpful typealiases
fileprivate typealias MLAnimationCompletionBlock = (_ finished: Bool) -> Void private typealias MLAnimationCompletionBlock = (_ finished: Bool) -> Void
fileprivate typealias MLAnimation = (anim: CAKeyframeAnimation, duration: CGFloat) private typealias MLAnimation = (anim: CAKeyframeAnimation, duration: CGFloat)
private class GradientSetupAnimation: CABasicAnimation { private class GradientSetupAnimation: CABasicAnimation {
} }
@ -1842,11 +1842,11 @@ fileprivate extension CAMediaTimingFunction {
} }
// Helper function inserted by Swift 4.2 migrator. // Helper function inserted by Swift 4.2 migrator.
fileprivate func convertFromCAMediaTimingFunctionName(_ input: CAMediaTimingFunctionName) -> String { private func convertFromCAMediaTimingFunctionName(_ input: CAMediaTimingFunctionName) -> String {
return input.rawValue return input.rawValue
} }
// Helper function inserted by Swift 4.2 migrator. // Helper function inserted by Swift 4.2 migrator.
fileprivate func convertToCAMediaTimingFunctionName(_ input: String) -> CAMediaTimingFunctionName { private func convertToCAMediaTimingFunctionName(_ input: String) -> CAMediaTimingFunctionName {
return CAMediaTimingFunctionName(rawValue: input) return CAMediaTimingFunctionName(rawValue: input)
} }

2
Signal/test/contact/ContactsPickerTest.swift
Unescape Escape View File

@ -1,5 +1,5 @@
// //
// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // Copyright (c) 2019 Open Whisper Systems. All rights reserved.
// //
import XCTest import XCTest

4
SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift
Unescape Escape View File

@ -794,12 +794,12 @@ extension AttachmentApprovalViewController: AttachmentApprovalInputAccessoryView
} }
// Helper function inserted by Swift 4.2 migrator. // 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 } guard let input = input else { return nil }
return Dictionary(uniqueKeysWithValues: input.map { key, value in (UIPageViewController.OptionsKey(rawValue: key), value)}) return Dictionary(uniqueKeysWithValues: input.map { key, value in (UIPageViewController.OptionsKey(rawValue: key), value)})
} }
// Helper function inserted by Swift 4.2 migrator. // 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 return input.rawValue
} }

2
SignalMessaging/ViewControllers/MediaMessageView.swift
Unescape Escape View File

@ -1,5 +1,5 @@
// //
// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // Copyright (c) 2019 Open Whisper Systems. All rights reserved.
// //
import Foundation import Foundation

2
SignalMessaging/ViewControllers/ModalActivityIndicatorViewController.swift
Unescape Escape View File

@ -1,5 +1,5 @@
// //
// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // Copyright (c) 2019 Open Whisper Systems. All rights reserved.
// //
import Foundation import Foundation

2
SignalMessaging/Views/AvatarImageView.swift
Unescape Escape View File

@ -1,5 +1,5 @@
// //
// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // Copyright (c) 2019 Open Whisper Systems. All rights reserved.
// //
import UIKit import UIKit

2
SignalMessaging/Views/VideoPlayerView.swift
Unescape Escape View File

@ -1,5 +1,5 @@
// //
// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // Copyright (c) 2019 Open Whisper Systems. All rights reserved.
// //
import Foundation import Foundation

2
SignalMessaging/attachments/OWSVideoPlayer.swift
Unescape Escape View File

@ -1,5 +1,5 @@
// //
// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // Copyright (c) 2019 Open Whisper Systems. All rights reserved.
// //
import Foundation import Foundation

4
SignalMessaging/environment/OWSAudioSession.swift
Unescape Escape View File

@ -1,5 +1,5 @@
// //
// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // Copyright (c) 2019 Open Whisper Systems. All rights reserved.
// //
import Foundation import Foundation
@ -217,6 +217,6 @@ public class OWSAudioSession: NSObject {
} }
// Helper function inserted by Swift 4.2 migrator. // 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 return input.rawValue
} }

2
SignalMessaging/utils/ConversationStyle.swift
Unescape Escape View File

@ -1,5 +1,5 @@
// //
// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // Copyright (c) 2019 Open Whisper Systems. All rights reserved.
// //
import Foundation import Foundation

2
SignalMessaging/utils/ProximityMonitoringManager.swift
Unescape Escape View File

@ -1,5 +1,5 @@
// //
// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // Copyright (c) 2019 Open Whisper Systems. All rights reserved.
// //
@objc @objc

2
SignalServiceKit/src/Messages/Attachments/OWSMediaUtils.swift
Unescape Escape View File

@ -1,5 +1,5 @@
// //
// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // Copyright (c) 2019 Open Whisper Systems. All rights reserved.
// //
import Foundation import Foundation

2
SignalServiceKit/src/Messages/Attachments/OWSThumbnailService.swift
Unescape Escape View File

@ -1,5 +1,5 @@
// //
// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // Copyright (c) 2019 Open Whisper Systems. All rights reserved.
// //
import Foundation import Foundation

2
SignalServiceKit/src/Util/MessageSender+Promise.swift
Unescape Escape View File

@ -1,5 +1,5 @@
// //
// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // Copyright (c) 2019 Open Whisper Systems. All rights reserved.
// //
import Foundation import Foundation

2
SignalShareExtension/SAELoadViewController.swift
Unescape Escape View File

@ -1,5 +1,5 @@
// //
// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // Copyright (c) 2019 Open Whisper Systems. All rights reserved.
// //
import UIKit import UIKit

2
SignalShareExtension/ShareViewController.swift
Unescape Escape View File

@ -1,5 +1,5 @@
// //
// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // Copyright (c) 2019 Open Whisper Systems. All rights reserved.
// //
import UIKit import UIKit

Write Preview
Loading…
Cancel
Save