From f34bdd34bc8aeda764cf65ad26886300f41f418f Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 24 Aug 2018 12:37:33 -0400 Subject: [PATCH] Respond to CR. --- .../Models/CompareSafetyNumbersActivity.swift | 4 ++-- .../src/ViewControllers/CallViewController.swift | 2 +- .../GifPicker/GifPickerViewController.swift | 4 ++-- .../OWS2FAReminderViewController.swift | 2 +- Signal/src/call/CallService.swift | 2 +- .../src/Network/OutageDetection.swift | 2 +- .../src/Util/{OWSLogger.swift => Logger.swift} | 16 ++++++++-------- 7 files changed, 16 insertions(+), 16 deletions(-) rename SignalServiceKit/src/Util/{OWSLogger.swift => Logger.swift} (76%) diff --git a/Signal/src/Models/CompareSafetyNumbersActivity.swift b/Signal/src/Models/CompareSafetyNumbersActivity.swift index d89be5c87..253356410 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: mySafetyNumbers)) pasteboard:\(pasteboardSafetyNumbers)") + Logger.info("successfully matched safety numbers. local numbers: \(String(describing: self.mySafetyNumbers)) pasteboard:\(pasteboardSafetyNumbers)") delegate.compareSafetyNumbersActivitySucceeded(activity: self) } else { - Logger.warn("local numbers: \(String(describing: mySafetyNumbers)) didn't match pasteboard:\(pasteboardSafetyNumbers)") + Logger.warn("local numbers: \(String(describing: self.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 82e6f765f..9661c202f 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: \(allAudioSources)") + Logger.info("available audio sources: \(self.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 9231b8764..de362681e 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: \(viewMode)") + Logger.info("viewMode: \(self.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: \(imageInfos.count) ") + Logger.warn("indexPath: \(indexPath.row) out of range for imageInfo count: \(self.imageInfos.count) ") return cell } let imageInfo = imageInfos[indexPath.row] diff --git a/Signal/src/ViewControllers/OWS2FAReminderViewController.swift b/Signal/src/ViewControllers/OWS2FAReminderViewController.swift index 9affd18f1..8490471f2 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: \(noWrongGuesses)") + Logger.info("noWrongGuesses: \(self.noWrongGuesses)") self.dismiss(animated: true) diff --git a/Signal/src/call/CallService.swift b/Signal/src/call/CallService.swift index d7ec24c28..dabd7d90b 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("\(isRemoteVideoEnabled)") + Logger.info("\(self.isRemoteVideoEnabled)") } } diff --git a/SignalServiceKit/src/Network/OutageDetection.swift b/SignalServiceKit/src/Network/OutageDetection.swift index a303b1bb6..d2baa774c 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: \(hasOutage).") + Logger.info("hasOutage: \(self.hasOutage).") NotificationCenter.default.postNotificationNameAsync(OutageDetection.outageStateDidChange, object: nil) } diff --git a/SignalServiceKit/src/Util/OWSLogger.swift b/SignalServiceKit/src/Util/Logger.swift similarity index 76% rename from SignalServiceKit/src/Util/OWSLogger.swift rename to SignalServiceKit/src/Util/Logger.swift index d3d48b14d..be05f3e1c 100644 --- a/SignalServiceKit/src/Util/OWSLogger.swift +++ b/SignalServiceKit/src/Util/Logger.swift @@ -21,7 +21,7 @@ public func owsFormatLogMessage(_ logString: String, */ open class Logger: NSObject { - open class func verbose(_ logString: @escaping @autoclosure () -> String, + open class func verbose(_ logString: @autoclosure () -> String, file: String = #file, function: String = #function, line: Int = #line) { @@ -31,7 +31,7 @@ open class Logger: NSObject { OWSLogger.verbose(owsFormatLogMessage(logString(), file: file, function: function, line: line)) } - open class func debug(_ logString: @escaping @autoclosure () -> String, + open class func debug(_ logString: @autoclosure () -> String, file: String = #file, function: String = #function, line: Int = #line) { @@ -41,34 +41,34 @@ open class Logger: NSObject { OWSLogger.debug(owsFormatLogMessage(logString(), file: file, function: function, line: line)) } - open class func info(_ logString: String, + open class func info(_ logString: @autoclosure () -> String, file: String = #file, function: String = #function, line: Int = #line) { guard ShouldLogInfo() else { return } - OWSLogger.info(owsFormatLogMessage(logString, file: file, function: function, line: line)) + OWSLogger.info(owsFormatLogMessage(logString(), file: file, function: function, line: line)) } - open class func warn(_ logString: String, + open class func warn(_ logString: @autoclosure () -> String, file: String = #file, function: String = #function, line: Int = #line) { guard ShouldLogWarning() else { return } - OWSLogger.warn(owsFormatLogMessage(logString, file: file, function: function, line: line)) + OWSLogger.warn(owsFormatLogMessage(logString(), file: file, function: function, line: line)) } - open class func error(_ logString: String, + open class func error(_ logString: @autoclosure () -> String, file: String = #file, function: String = #function, line: Int = #line) { guard ShouldLogError() else { return } - OWSLogger.error(owsFormatLogMessage(logString, file: file, function: function, line: line)) + OWSLogger.error(owsFormatLogMessage(logString(), file: file, function: function, line: line)) } open class func flush() {