diff --git a/Session/Conversations/ConversationSearch.swift b/Session/Conversations/ConversationSearch.swift index ced2c4e56..a470ba440 100644 --- a/Session/Conversations/ConversationSearch.swift +++ b/Session/Conversations/ConversationSearch.swift @@ -71,7 +71,7 @@ extension ConversationSearchController: UISearchControllerDelegate { extension ConversationSearchController: UISearchResultsUpdating { public func updateSearchResults(for searchController: UISearchController) { - Log.trace("searchBar.text: \( searchController.searchBar.text ?? "")") + Log.verbose("searchBar.text: \( searchController.searchBar.text ?? "")") guard let searchText: String = searchController.searchBar.text?.stripped, diff --git a/Session/Conversations/Message Cells/Content Views/MediaView.swift b/Session/Conversations/Message Cells/Content Views/MediaView.swift index 1364ef8e0..c47a2c394 100644 --- a/Session/Conversations/Message Cells/Content Views/MediaView.swift +++ b/Session/Conversations/Message Cells/Content Views/MediaView.swift @@ -409,7 +409,7 @@ public class MediaView: UIView { // our load attempt is complete. let loadCompletion: (AnyObject?) -> Void = { [weak self] possibleMedia in guard self?.loadState.wrappedValue == .loading else { - Log.trace("[MediaView] Skipping obsolete load.") + Log.verbose("[MediaView] Skipping obsolete load.") return } guard let media: AnyObject = possibleMedia else { @@ -431,7 +431,7 @@ public class MediaView: UIView { } if let media: AnyObject = self.mediaCache?.object(forKey: cacheKey as NSString) { - Log.trace("[MediaView] media cache hit") + Log.verbose("[MediaView] media cache hit") guard Thread.isMainThread else { DispatchQueue.main.async { @@ -444,11 +444,11 @@ public class MediaView: UIView { return } - Log.trace("[MediaView] media cache miss") + Log.verbose("[MediaView] media cache miss") MediaView.loadQueue.async { [weak self] in guard self?.loadState.wrappedValue == .loading else { - Log.trace("[MediaView] Skipping obsolete load.") + Log.verbose("[MediaView] Skipping obsolete load.") return } diff --git a/Session/Media Viewing & Editing/GIFs/GifPickerViewController.swift b/Session/Media Viewing & Editing/GIFs/GifPickerViewController.swift index c62650377..25961e9ec 100644 --- a/Session/Media Viewing & Editing/GIFs/GifPickerViewController.swift +++ b/Session/Media Viewing & Editing/GIFs/GifPickerViewController.swift @@ -505,7 +505,7 @@ class GifPickerViewController: OWSViewController, UISearchBarDelegate, UICollect } private func search(query: String) { - Log.trace("[GifPickerViewController] searching: \(query)") + Log.verbose("[GifPickerViewController] searching: \(query)") progressiveSearchTimer?.invalidate() progressiveSearchTimer = nil @@ -523,13 +523,13 @@ class GifPickerViewController: OWSViewController, UISearchBarDelegate, UICollect switch result { case .finished: break case .failure: - Log.trace("[GifPickerViewController] search failed.") + Log.verbose("[GifPickerViewController] search failed.") // TODO: Present this error to the user. self?.viewMode = .error } }, receiveValue: { [weak self] imageInfos in - Log.trace("[GifPickerViewController] search complete") + Log.verbose("[GifPickerViewController] search complete") self?.imageInfos = imageInfos if imageInfos.count > 0 { diff --git a/Session/Media Viewing & Editing/GIFs/GiphyAPI.swift b/Session/Media Viewing & Editing/GIFs/GiphyAPI.swift index c8de57223..0d7e93ba0 100644 --- a/Session/Media Viewing & Editing/GIFs/GiphyAPI.swift +++ b/Session/Media Viewing & Editing/GIFs/GiphyAPI.swift @@ -78,7 +78,7 @@ class GiphyRendition: ProxiedContentAssetDescription { } public func log() { - Log.trace("[GiphyRendition] \t \(format), \(name), \(width), \(height), \(fileSize)") + Log.verbose("[GiphyRendition] \t \(format), \(name), \(width), \(height), \(fileSize)") } } @@ -110,7 +110,7 @@ class GiphyImageInfo: NSObject { } public func log() { - Log.trace("[GiphyImageInfo] giphyId: \(giphyId), \(renditions.count)") + Log.verbose("[GiphyImageInfo] giphyId: \(giphyId), \(renditions.count)") for rendition in renditions { rendition.log() } @@ -286,13 +286,13 @@ enum GiphyAPI { return urlSession .dataTaskPublisher(for: url) .mapError { urlError in - Log.trace("[GiphyAPI] Search request failed: \(urlError)") + Log.verbose("[GiphyAPI] Search request failed: \(urlError)") // URLError codes are negative values return NetworkError.unknown } .map { data, _ in - Log.trace("[GiphyAPI] Search request succeeded") + Log.verbose("[GiphyAPI] Search request succeeded") guard let imageInfos = self.parseGiphyImages(responseData: data) else { Log.error("[GiphyAPI] Unable to parse trending images") @@ -340,7 +340,7 @@ enum GiphyAPI { return NetworkError.unknown } .tryMap { data, _ -> [GiphyImageInfo] in - Log.trace("[GiphyAPI] Search request succeeded") + Log.verbose("[GiphyAPI] Search request succeeded") guard let imageInfos = self.parseGiphyImages(responseData: data) else { throw NetworkError.invalidResponse @@ -487,7 +487,7 @@ enum GiphyAPI { return nil } guard parsedValue > 0 else { - Log.trace("[GiphyAPI] \(typeName) has non-positive \(key): \(parsedValue).") + Log.verbose("[GiphyAPI] \(typeName) has non-positive \(key): \(parsedValue).") return nil } return parsedValue diff --git a/Session/Media Viewing & Editing/PhotoCapture.swift b/Session/Media Viewing & Editing/PhotoCapture.swift index 93f01df15..dde25b335 100644 --- a/Session/Media Viewing & Editing/PhotoCapture.swift +++ b/Session/Media Viewing & Editing/PhotoCapture.swift @@ -391,7 +391,7 @@ extension PhotoCapture: CaptureButtonDelegate { } func longPressCaptureButton(_ captureButton: CaptureButton, didUpdateZoomAlpha zoomAlpha: CGFloat) { - Log.trace("[PhotoCapture] zoomAlpha: \(zoomAlpha)") + Log.verbose("[PhotoCapture] zoomAlpha: \(zoomAlpha)") updateZoom(alpha: zoomAlpha) } } @@ -522,7 +522,7 @@ class CaptureOutput { let videoOrientation = delegate.captureOrientation photoVideoConnection.videoOrientation = videoOrientation - Log.trace("[CaptureOutput] videoOrientation: \(videoOrientation)") + Log.verbose("[CaptureOutput] videoOrientation: \(videoOrientation)") return imageOutput.takePhoto(delegate: delegate) } diff --git a/Session/Media Viewing & Editing/PhotoCaptureViewController.swift b/Session/Media Viewing & Editing/PhotoCaptureViewController.swift index 6cefe80bb..85f802c34 100644 --- a/Session/Media Viewing & Editing/PhotoCaptureViewController.swift +++ b/Session/Media Viewing & Editing/PhotoCaptureViewController.swift @@ -258,7 +258,7 @@ class PhotoCaptureViewController: OWSViewController { // since the "face up" and "face down" orientations aren't reflected in the photo output, // we need to capture the last known _other_ orientation so we can reflect the appropriate // portrait/landscape in our captured photos. - Log.trace("[PhotoCaptureViewController] lastKnownCaptureOrientation: \(lastKnownCaptureOrientation)->\(captureOrientation)") + Log.verbose("[PhotoCaptureViewController] lastKnownCaptureOrientation: \(lastKnownCaptureOrientation)->\(captureOrientation)") lastKnownCaptureOrientation = captureOrientation updateIconOrientations(isAnimated: true, captureOrientation: captureOrientation) } @@ -267,7 +267,7 @@ class PhotoCaptureViewController: OWSViewController { // MARK: - private func updateIconOrientations(isAnimated: Bool, captureOrientation: AVCaptureVideoOrientation) { - Log.trace("[PhotoCaptureViewController] captureOrientation: \(captureOrientation)") + Log.verbose("[PhotoCaptureViewController] captureOrientation: \(captureOrientation)") let transformFromOrientation: CGAffineTransform switch captureOrientation { @@ -522,7 +522,7 @@ class CaptureButton: UIView { let alpha = ratio.clamp(0, 1) - Log.trace("[CaptureButton] distance: \(distance), alpha: \(alpha)") + Log.verbose("[CaptureButton] distance: \(distance), alpha: \(alpha)") let zoomIndicatorDiameter = alpha.lerp(recordingDiameter, 3) self.zoomIndicatorSizeConstraints.forEach { $0.constant = zoomIndicatorDiameter } @@ -672,7 +672,7 @@ class RecordingTimerView: UIView { @objc private func updateView() { let recordingDuration = self.recordingDuration - Log.trace("[RecordingTimerView] recordingDuration: \(recordingDuration)") + Log.verbose("[RecordingTimerView] recordingDuration: \(recordingDuration)") let durationDate = Date(timeIntervalSinceReferenceDate: recordingDuration) label.text = timeFormatter.string(from: durationDate) } diff --git a/SessionMessagingKit/Database/Models/LinkPreview.swift b/SessionMessagingKit/Database/Models/LinkPreview.swift index cbad366b9..23c499179 100644 --- a/SessionMessagingKit/Database/Models/LinkPreview.swift +++ b/SessionMessagingKit/Database/Models/LinkPreview.swift @@ -327,7 +327,7 @@ public extension LinkPreview { url urlString: String, remainingRetries: UInt = 3 ) -> AnyPublisher<(Data, URLResponse), Error> { - Log.trace("[LinkPreview] Download url: \(urlString)") + Log.verbose("[LinkPreview] Download url: \(urlString)") // let sessionConfiguration = ContentProxy.sessionConfiguration() // Loki: Signal's proxy appears to have been banned by YouTube let sessionConfiguration = URLSessionConfiguration.ephemeral @@ -446,7 +446,7 @@ public extension LinkPreview { title = normalizedTitle } - Log.trace("[LinkPreview] Title: \(String(describing: title))") + Log.verbose("[LinkPreview] Title: \(String(describing: title))") guard let rawImageUrlString = content.ogImageUrlString ?? content.faviconUrlString else { return Contents(title: title) diff --git a/SessionShareExtension/ShareNavController.swift b/SessionShareExtension/ShareNavController.swift index 9af12256d..38b4c579f 100644 --- a/SessionShareExtension/ShareNavController.swift +++ b/SessionShareExtension/ShareNavController.swift @@ -735,14 +735,14 @@ final class ShareNavController: UINavigationController, ShareViewDelegate { private func isVideoNeedingRelocation(itemProvider: NSItemProvider, itemUrl: URL) -> Bool { let pathExtension = itemUrl.pathExtension guard pathExtension.count > 0 else { - Log.trace("item URL has no file extension: \(itemUrl).") + Log.verbose("item URL has no file extension: \(itemUrl).") return false } guard let utiTypeForURL = MimeTypeUtil.utiType(forFileExtension: pathExtension) else { - Log.trace("item has unknown UTI type: \(itemUrl).") + Log.verbose("item has unknown UTI type: \(itemUrl).") return false } - Log.trace("utiTypeForURL: \(utiTypeForURL)") + Log.verbose("utiTypeForURL: \(utiTypeForURL)") guard utiTypeForURL == kUTTypeMPEG4 as String else { // Either it's not a video or it was a video which was not auto-converted to mp4. // Not affected by the issue. diff --git a/SessionUtilitiesKit/General/Logging.swift b/SessionUtilitiesKit/General/Logging.swift index e4574fbe1..bb93f9506 100644 --- a/SessionUtilitiesKit/General/Logging.swift +++ b/SessionUtilitiesKit/General/Logging.swift @@ -510,7 +510,7 @@ public class Logger { switch level { case .off: return - case .trace: DDLogVerbose("๐Ÿ’™ \(logMessage)", file: file, function: function, line: line) + case .verbose: DDLogVerbose("๐Ÿ’™ \(logMessage)", file: file, function: function, line: line) case .debug: DDLogDebug("๐Ÿ’š \(logMessage)", file: file, function: function, line: line) case .info: DDLogInfo("๐Ÿ’› \(logMessage)", file: file, function: function, line: line) case .warn: DDLogWarn("๐Ÿงก \(logMessage)", file: file, function: function, line: line) diff --git a/SignalUtilitiesKit/Media Viewing & Editing/Image Editing/ImageEditorContents.swift b/SignalUtilitiesKit/Media Viewing & Editing/Image Editing/ImageEditorContents.swift index 315736c9a..f6779b900 100644 --- a/SignalUtilitiesKit/Media Viewing & Editing/Image Editing/ImageEditorContents.swift +++ b/SignalUtilitiesKit/Media Viewing & Editing/Image Editing/ImageEditorContents.swift @@ -36,25 +36,25 @@ public class ImageEditorContents { } public func append(item: ImageEditorItem) { - Log.trace("[ImageEditorContents] append: \(item.itemId)") + Log.verbose("[ImageEditorContents] append: \(item.itemId)") itemMap.append(key: item.itemId, value: item) } public func replace(item: ImageEditorItem) { - Log.trace("[ImageEditorContents] replace: \(item.itemId)") + Log.verbose("[ImageEditorContents] replace: \(item.itemId)") itemMap.replace(key: item.itemId, value: item) } public func remove(item: ImageEditorItem) { - Log.trace("[ImageEditorContents] remove: \(item.itemId)") + Log.verbose("[ImageEditorContents] remove: \(item.itemId)") itemMap.remove(key: item.itemId) } public func remove(itemId: String) { - Log.trace("[ImageEditorContents] remove: \(itemId)") + Log.verbose("[ImageEditorContents] remove: \(itemId)") itemMap.remove(key: itemId) } diff --git a/SignalUtilitiesKit/Media Viewing & Editing/Image Editing/ImageEditorCropViewController.swift b/SignalUtilitiesKit/Media Viewing & Editing/Image Editing/ImageEditorCropViewController.swift index d6a7dd2a2..800342dcd 100644 --- a/SignalUtilitiesKit/Media Viewing & Editing/Image Editing/ImageEditorCropViewController.swift +++ b/SignalUtilitiesKit/Media Viewing & Editing/Image Editing/ImageEditorCropViewController.swift @@ -501,7 +501,7 @@ class ImageEditorCropViewController: OWSViewController { // Handle the GR if necessary. switch gestureRecognizer.state { case .began: - Log.trace("[ImageEditorCropViewController] began: \(transform.unitTranslation)") + Log.verbose("[ImageEditorCropViewController] began: \(transform.unitTranslation)") gestureStartTransform = transform // Pans that start near the crop rectangle should be treated as crop gestures. panCropRegion = cropRegion(forGestureRecognizer: gestureRecognizer) diff --git a/SignalUtilitiesKit/Screen Lock/ScreenLock.swift b/SignalUtilitiesKit/Screen Lock/ScreenLock.swift index 20924fb5f..880b11edb 100644 --- a/SignalUtilitiesKit/Screen Lock/ScreenLock.swift +++ b/SignalUtilitiesKit/Screen Lock/ScreenLock.swift @@ -65,11 +65,11 @@ public class ScreenLock { unexpectedFailure(ScreenLockError.general(description: error)) case .success: - Log.trace("[ScreenLock] Local authentication succeeded.") + Log.verbose("[ScreenLock] Local authentication succeeded.") success() case .cancel: - Log.trace("[ScreenLock] Local authentication cancelled.") + Log.verbose("[ScreenLock] Local authentication cancelled.") cancel() } } diff --git a/SignalUtilitiesKit/Utilities/ReverseDispatchQueue.swift b/SignalUtilitiesKit/Utilities/ReverseDispatchQueue.swift index dcb4fd258..f42281ec4 100644 --- a/SignalUtilitiesKit/Utilities/ReverseDispatchQueue.swift +++ b/SignalUtilitiesKit/Utilities/ReverseDispatchQueue.swift @@ -47,7 +47,7 @@ public class ReverseDispatchQueue: NSObject { self.items.append(item) if ReverseDispatchQueue.isVerbose { - Log.trace("[ReverseDispatchQueue] Enqueued[\(self.label)]: \(item.index)") + Log.verbose("[ReverseDispatchQueue] Enqueued[\(self.label)]: \(item.index)") } self.process() @@ -64,7 +64,7 @@ public class ReverseDispatchQueue: NSObject { return } if ReverseDispatchQueue.isVerbose { - Log.trace("[ReverseDispatchQueue] Processing[\(self.label)]: \(item.index)") + Log.verbose("[ReverseDispatchQueue] Processing[\(self.label)]: \(item.index)") } item.workBlock() diff --git a/SignalUtilitiesKit/Utilities/SwiftSingletons.swift b/SignalUtilitiesKit/Utilities/SwiftSingletons.swift index d8537ea80..253324a37 100644 --- a/SignalUtilitiesKit/Utilities/SwiftSingletons.swift +++ b/SignalUtilitiesKit/Utilities/SwiftSingletons.swift @@ -20,7 +20,7 @@ public class SwiftSingletons: NSObject { Log.error("[SwiftSingletons] Duplicate singleton: \(singletonClassName).") return } - Log.trace("[SwiftSingletons] Registering singleton: \(singletonClassName).") + Log.verbose("[SwiftSingletons] Registering singleton: \(singletonClassName).") classSet.insert(singletonClassName) }