From d4f7b5d45bab4a31293fd28c1cb218799b636190 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 24 Aug 2018 12:40:16 -0400 Subject: [PATCH] Respond to CR. --- Signal/src/Models/CompareSafetyNumbersActivity.swift | 4 ++-- Signal/src/ViewControllers/CallViewController.swift | 2 +- .../ViewControllers/GifPicker/GifPickerViewController.swift | 4 ++-- Signal/src/ViewControllers/MediaGalleryViewController.swift | 2 +- .../src/ViewControllers/OWS2FAReminderViewController.swift | 2 +- Signal/src/call/CallService.swift | 6 +++--- Signal/src/call/SignalCall.swift | 2 +- Signal/src/network/GiphyAPI.swift | 4 ++-- .../Views/DisappearingTimerConfigurationView.swift | 4 ++-- SignalMessaging/attachments/SignalAttachment.swift | 2 +- SignalMessaging/environment/OWSAudioSession.swift | 2 +- SignalServiceKit/src/Network/OutageDetection.swift | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Signal/src/Models/CompareSafetyNumbersActivity.swift b/Signal/src/Models/CompareSafetyNumbersActivity.swift index 253356410..d89be5c87 100644 --- a/Signal/src/Models/CompareSafetyNumbersActivity.swift +++ b/Signal/src/Models/CompareSafetyNumbersActivity.swift @@ -72,10 +72,10 @@ class CompareSafetyNumbersActivity: UIActivity { let pasteboardSafetyNumbers = pasteboardString! if pasteboardSafetyNumbers == mySafetyNumbers { - Logger.info("successfully matched safety numbers. local numbers: \(String(describing: self.mySafetyNumbers)) pasteboard:\(pasteboardSafetyNumbers)") + Logger.info("successfully matched safety numbers. local numbers: \(String(describing: mySafetyNumbers)) pasteboard:\(pasteboardSafetyNumbers)") delegate.compareSafetyNumbersActivitySucceeded(activity: self) } else { - Logger.warn("local numbers: \(String(describing: self.mySafetyNumbers)) didn't match pasteboard:\(pasteboardSafetyNumbers)") + Logger.warn("local numbers: \(String(describing: mySafetyNumbers)) didn't match pasteboard:\(pasteboardSafetyNumbers)") let error = OWSErrorWithCodeDescription(OWSErrorCode.privacyVerificationFailure, NSLocalizedString("PRIVACY_VERIFICATION_FAILED_MISMATCHED_SAFETY_NUMBERS_IN_CLIPBOARD", comment: "Alert body")) delegate.compareSafetyNumbersActivity(self, failedWithError: error) diff --git a/Signal/src/ViewControllers/CallViewController.swift b/Signal/src/ViewControllers/CallViewController.swift index 9661c202f..82e6f765f 100644 --- a/Signal/src/ViewControllers/CallViewController.swift +++ b/Signal/src/ViewControllers/CallViewController.swift @@ -102,7 +102,7 @@ class CallViewController: OWSViewController, CallObserver, CallServiceObserver, // MARK: - Audio Source var hasAlternateAudioSources: Bool { - Logger.info("available audio sources: \(self.allAudioSources)") + Logger.info("available audio sources: \(allAudioSources)") // internal mic and speakerphone will be the first two, any more than one indicates e.g. an attached bluetooth device. // TODO is this sufficient? Are their devices w/ bluetooth but no external speaker? e.g. ipod? diff --git a/Signal/src/ViewControllers/GifPicker/GifPickerViewController.swift b/Signal/src/ViewControllers/GifPicker/GifPickerViewController.swift index de362681e..9231b8764 100644 --- a/Signal/src/ViewControllers/GifPicker/GifPickerViewController.swift +++ b/Signal/src/ViewControllers/GifPicker/GifPickerViewController.swift @@ -22,7 +22,7 @@ class GifPickerViewController: OWSViewController, UISearchBarDelegate, UICollect private var viewMode = ViewMode.idle { didSet { - Logger.info("viewMode: \(self.viewMode)") + Logger.info("viewMode: \(viewMode)") updateContents() } @@ -301,7 +301,7 @@ class GifPickerViewController: OWSViewController, UISearchBarDelegate, UICollect let cell = collectionView.dequeueReusableCell(withReuseIdentifier: kCellReuseIdentifier, for: indexPath) guard indexPath.row < imageInfos.count else { - Logger.warn("indexPath: \(indexPath.row) out of range for imageInfo count: \(self.imageInfos.count) ") + Logger.warn("indexPath: \(indexPath.row) out of range for imageInfo count: \(imageInfos.count) ") return cell } let imageInfo = imageInfos[indexPath.row] diff --git a/Signal/src/ViewControllers/MediaGalleryViewController.swift b/Signal/src/ViewControllers/MediaGalleryViewController.swift index a406ac422..3126388f3 100644 --- a/Signal/src/ViewControllers/MediaGalleryViewController.swift +++ b/Signal/src/ViewControllers/MediaGalleryViewController.swift @@ -623,7 +623,7 @@ class MediaGalleryViewController: OWSNavigationController, MediaGalleryDataSourc // Range instead of indexSet since it's contiguous? var fetchedIndexSet = IndexSet() { didSet { - Logger.debug("\(oldValue) -> \(self.fetchedIndexSet)") + Logger.debug("\(oldValue) -> \(fetchedIndexSet)") } } diff --git a/Signal/src/ViewControllers/OWS2FAReminderViewController.swift b/Signal/src/ViewControllers/OWS2FAReminderViewController.swift index 8490471f2..9affd18f1 100644 --- a/Signal/src/ViewControllers/OWS2FAReminderViewController.swift +++ b/Signal/src/ViewControllers/OWS2FAReminderViewController.swift @@ -96,7 +96,7 @@ public class OWS2FAReminderViewController: UIViewController, PinEntryViewDelegat } private func didSubmitCorrectPin() { - Logger.info("noWrongGuesses: \(self.noWrongGuesses)") + Logger.info("noWrongGuesses: \(noWrongGuesses)") self.dismiss(animated: true) diff --git a/Signal/src/call/CallService.swift b/Signal/src/call/CallService.swift index dabd7d90b..807d1d351 100644 --- a/Signal/src/call/CallService.swift +++ b/Signal/src/call/CallService.swift @@ -138,7 +138,7 @@ private class SignalCallData: NSObject { didSet { AssertIsOnMainThread() - Logger.info("\(self.isRemoteVideoEnabled)") + Logger.info("\(isRemoteVideoEnabled)") } } @@ -146,7 +146,7 @@ private class SignalCallData: NSObject { didSet { AssertIsOnMainThread() - Logger.debug(".peerConnectionClient setter: \(oldValue != nil) -> \(self.peerConnectionClient != nil) \(String(describing: self.peerConnectionClient))") + Logger.debug(".peerConnectionClient setter: \(oldValue != nil) -> \(peerConnectionClient != nil) \(String(describing: peerConnectionClient))") } } @@ -253,7 +253,7 @@ private class SignalCallData: NSObject { } } - Logger.debug(".callData setter: \(oldValue?.call.identifiersForLogs as Optional) -> \(self.callData?.call.identifiersForLogs as Optional)") + Logger.debug(".callData setter: \(oldValue?.call.identifiersForLogs as Optional) -> \(callData?.call.identifiersForLogs as Optional)") for observer in observers { observer.value?.didUpdateCall(call: callData?.call) diff --git a/Signal/src/call/SignalCall.swift b/Signal/src/call/SignalCall.swift index ec2e37a4f..51a018803 100644 --- a/Signal/src/call/SignalCall.swift +++ b/Signal/src/call/SignalCall.swift @@ -121,7 +121,7 @@ protocol CallObserver: class { var audioSource: AudioSource? = nil { didSet { AssertIsOnMainThread() - Logger.debug("audioSource changed: \(String(describing: oldValue)) -> \(String(describing: self.audioSource))") + Logger.debug("audioSource changed: \(String(describing: oldValue)) -> \(String(describing: audioSource))") for observer in observers { observer.value?.audioSourceDidChange(call: self, audioSource: audioSource) diff --git a/Signal/src/network/GiphyAPI.swift b/Signal/src/network/GiphyAPI.swift index caa29d6a9..3ca844f00 100644 --- a/Signal/src/network/GiphyAPI.swift +++ b/Signal/src/network/GiphyAPI.swift @@ -82,7 +82,7 @@ extension GiphyError: LocalizedError { } public func log() { - Logger.verbose("\t \(self.format), \(self.name), \(self.width), \(self.height), \(self.fileSize)") + Logger.verbose("\t \(format), \(name), \(width), \(height), \(fileSize)") } } @@ -114,7 +114,7 @@ extension GiphyError: LocalizedError { } public func log() { - Logger.verbose("giphyId: \(self.giphyId), \(self.renditions.count)") + Logger.verbose("giphyId: \(giphyId), \(renditions.count)") for rendition in renditions { rendition.log() } diff --git a/SignalMessaging/Views/DisappearingTimerConfigurationView.swift b/SignalMessaging/Views/DisappearingTimerConfigurationView.swift index 5f0a9096a..ac82faf14 100644 --- a/SignalMessaging/Views/DisappearingTimerConfigurationView.swift +++ b/SignalMessaging/Views/DisappearingTimerConfigurationView.swift @@ -28,13 +28,13 @@ public class DisappearingTimerConfigurationView: UIView { override public var frame: CGRect { didSet { - Logger.verbose("\(oldValue) -> \(self.frame)") + Logger.verbose("\(oldValue) -> \(frame)") } } override public var bounds: CGRect { didSet { - Logger.verbose("\(oldValue) -> \(self.bounds)") + Logger.verbose("\(oldValue) -> \(bounds)") } } diff --git a/SignalMessaging/attachments/SignalAttachment.swift b/SignalMessaging/attachments/SignalAttachment.swift index f7afc66d1..18d2e18a2 100644 --- a/SignalMessaging/attachments/SignalAttachment.swift +++ b/SignalMessaging/attachments/SignalAttachment.swift @@ -160,7 +160,7 @@ public class SignalAttachment: NSObject { AssertIsOnMainThread() assert(oldValue == nil) - Logger.verbose("Attachment has error: \(String(describing: self.error))") + Logger.verbose("Attachment has error: \(String(describing: error))") } } diff --git a/SignalMessaging/environment/OWSAudioSession.swift b/SignalMessaging/environment/OWSAudioSession.swift index 445df4a3e..6939e9f59 100644 --- a/SignalMessaging/environment/OWSAudioSession.swift +++ b/SignalMessaging/environment/OWSAudioSession.swift @@ -142,7 +142,7 @@ public class OWSAudioSession: NSObject { } guard currentActivities.isEmpty else { - Logger.debug("not deactivating due to currentActivities: \(self.currentActivities)") + Logger.debug("not deactivating due to currentActivities: \(currentActivities)") return } diff --git a/SignalServiceKit/src/Network/OutageDetection.swift b/SignalServiceKit/src/Network/OutageDetection.swift index d2baa774c..a303b1bb6 100644 --- a/SignalServiceKit/src/Network/OutageDetection.swift +++ b/SignalServiceKit/src/Network/OutageDetection.swift @@ -19,7 +19,7 @@ public class OutageDetection: NSObject { AssertIsOnMainThread() if hasOutage != oldValue { - Logger.info("hasOutage: \(self.hasOutage).") + Logger.info("hasOutage: \(hasOutage).") NotificationCenter.default.postNotificationNameAsync(OutageDetection.outageStateDidChange, object: nil) }