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

Resolved a TODO I had missed

Browse Source
pull/894/head
Morgan Pretty 9 months ago
parent d26e5468cb
commit 304423f397
18 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File

2
Scripts/LintLocalizableStrings.swift
Unescape Escape View File

@ -38,7 +38,7 @@ extension ProjectState {
.contains("print(", caseSensitive: false),
.contains("SNLog(", caseSensitive: false),
.contains("Log.setup(", caseSensitive: false),
.contains("Log.trace(", caseSensitive: false),
.contains("Log.verbose(", caseSensitive: false),
.contains("Log.debug(", caseSensitive: false),
.contains("Log.info(", caseSensitive: false),
.contains("Log.warn(", caseSensitive: false),

2
Session/Conversations/ConversationSearch.swift
Unescape Escape View File

@ -71,7 +71,7 @@ extension ConversationSearchController: UISearchControllerDelegate {
extension ConversationSearchController: UISearchResultsUpdating {
public func updateSearchResults(for searchController: UISearchController) {
Log.trace("searchBar.text: \( searchController.searchBar.text ?? "<blank>")")
Log.verbose("searchBar.text: \( searchController.searchBar.text ?? "<blank>")")
guard
let searchText: String = searchController.searchBar.text?.stripped,

8
Session/Conversations/Message Cells/Content Views/MediaView.swift
Unescape Escape View File

@ -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
}

6
Session/Media Viewing & Editing/GIFs/GifPickerViewController.swift
Unescape Escape View File

@ -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 {

12
Session/Media Viewing & Editing/GIFs/GiphyAPI.swift
Unescape Escape View File

@ -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

4
Session/Media Viewing & Editing/PhotoCapture.swift
Unescape Escape View File

@ -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)
}

8
Session/Media Viewing & Editing/PhotoCaptureViewController.swift
Unescape Escape View File

@ -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)
}

18
Session/Shared/ScreenLockUI.swift
Unescape Escape View File

@ -87,17 +87,17 @@ class ScreenLockUI {
private var desiredUIState: ScreenLockViewController.State {
if isScreenLockLocked {
if appIsInactiveOrBackground {
Log.trace("desiredUIState: screen protection 1.")
Log.verbose("desiredUIState: screen protection 1.")
return .protection
}
Log.trace("desiredUIState: screen lock 2.")
Log.verbose("desiredUIState: screen lock 2.")
return (isShowingScreenLockUI ? .protection : .lock)
}
if !self.appIsInactiveOrBackground {
// App is inactive or background.
Log.trace("desiredUIState: none 3.");
Log.verbose("desiredUIState: none 3.");
return .none;
}
@ -105,7 +105,7 @@ class ScreenLockUI {
return .none;
}
Log.trace("desiredUIState: screen protection 4.")
Log.verbose("desiredUIState: screen protection 4.")
return .protection;
}
@ -180,17 +180,17 @@ class ScreenLockUI {
//
// We don't need to try to lock the screen lock;
// It will be initialized by `setupWithRootWindow`.
Log.trace("tryToActivateScreenLockUponBecomingActive NO 0")
Log.verbose("tryToActivateScreenLockUponBecomingActive NO 0")
return
}
guard Storage.shared[.isScreenLockEnabled] else {
// Screen lock is not enabled.
Log.trace("tryToActivateScreenLockUponBecomingActive NO 1")
Log.verbose("tryToActivateScreenLockUponBecomingActive NO 1")
return;
}
guard !isScreenLockLocked else {
// Screen lock is already activated.
Log.trace("tryToActivateScreenLockUponBecomingActive NO 2")
Log.verbose("tryToActivateScreenLockUponBecomingActive NO 2")
return;
}
@ -210,7 +210,7 @@ class ScreenLockUI {
}
let desiredUIState: ScreenLockViewController.State = self.desiredUIState
Log.trace("ensureUI: \(desiredUIState)")
Log.verbose("ensureUI: \(desiredUIState)")
// Show the "iOS auth UI to unlock" if necessary.
if desiredUIState == .lock && !didLastUnlockAttemptFail {
@ -367,7 +367,7 @@ class ScreenLockUI {
//
// We don't need to try to lock the screen lock;
// It will be initialized by `setupWithRootWindow`.
Log.trace("clockDidChange 0")
Log.verbose("clockDidChange 0")
return;
}

4
SessionMessagingKit/Database/Models/LinkPreview.swift
Unescape Escape View File

@ -324,7 +324,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
@ -443,7 +443,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)

2
SessionMessagingKit/Utilities/ProfileManager.swift
Unescape Escape View File

@ -209,7 +209,7 @@ public struct ProfileManager {
let filePath: String = ProfileManager.profileAvatarFilepath(filename: fileName)
var backgroundTask: SessionBackgroundTask? = SessionBackgroundTask(label: #function)
Log.trace("downloading profile avatar: \(profile.id)")
Log.verbose("downloading profile avatar: \(profile.id)")
currentAvatarDownloads.mutate { $0.insert(profile.id) }
LibSession

6
SessionShareExtension/ShareNavController.swift
Unescape Escape View File

@ -734,14 +734,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.

10
SessionUtilitiesKit/General/Logging.swift
Unescape Escape View File

@ -19,7 +19,7 @@ public enum Log {
)
public enum Level {
case trace
case verbose
case debug
case info
case warn
@ -123,8 +123,8 @@ public enum Log {
arguments: ptr)
}
}
// TODO: Rename to 'verbose'
public static func trace(
public static func verbose(
_ message: String,
withPrefixes: Bool = true,
silenceForTests: Bool = false,
@ -132,7 +132,7 @@ public enum Log {
function: StaticString = #function,
line: UInt = #line
) {
custom(.trace, message, withPrefixes: withPrefixes, silenceForTests: silenceForTests, file: file, function: function, line: line)
custom(.verbose, message, withPrefixes: withPrefixes, silenceForTests: silenceForTests, file: file, function: function, line: line)
}
public static func debug(
@ -433,7 +433,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)

2
SessionUtilitiesKit/LibSession/LibSession.swift
Unescape Escape View File

@ -82,7 +82,7 @@ extension LibSession {
fileprivate extension Log.Level {
init(_ level: LOG_LEVEL) {
switch level {
case LOG_LEVEL_TRACE: self = .trace
case LOG_LEVEL_TRACE: self = .verbose
case LOG_LEVEL_DEBUG: self = .debug
case LOG_LEVEL_INFO: self = .info
case LOG_LEVEL_WARN: self = .warn

8
SignalUtilitiesKit/Media Viewing & Editing/Image Editing/ImageEditorContents.swift
Unescape Escape View File

@ -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)
}

2
SignalUtilitiesKit/Media Viewing & Editing/Image Editing/ImageEditorCropViewController.swift
Unescape Escape View File

@ -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)

4
SignalUtilitiesKit/Screen Lock/ScreenLock.swift
Unescape Escape View File

@ -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()
}
}

4
SignalUtilitiesKit/Utilities/ReverseDispatchQueue.swift
Unescape Escape View File

@ -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()

2
SignalUtilitiesKit/Utilities/SwiftSingletons.swift
Unescape Escape View File

@ -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)
}

Write Preview
Loading…
Cancel
Save