From c8fee4efa7b4058509972059c73d4b3d34d5f4a9 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 13 Jun 2018 13:43:16 -0400 Subject: [PATCH] Add swift logging to SSK. --- Signal.xcodeproj/project.pbxproj | 12 ------------ Signal/src/Signal-Bridging-Header.h | 2 +- SignalMessaging/SignalMessaging.h | 1 - .../src/Storage/FullTextSearchFinder.swift | 6 +++--- .../utils => SignalServiceKit/src/Util}/OWSLogger.h | 2 +- .../utils => SignalServiceKit/src/Util}/OWSLogger.m | 2 +- .../src/Util}/OWSSwiftUtils.swift | 2 +- .../SignalShareExtension-Bridging-Header.h | 2 +- 8 files changed, 8 insertions(+), 21 deletions(-) rename {SignalMessaging/utils => SignalServiceKit/src/Util}/OWSLogger.h (85%) rename {SignalMessaging/utils => SignalServiceKit/src/Util}/OWSLogger.m (89%) rename {SignalMessaging/utils => SignalServiceKit/src/Util}/OWSSwiftUtils.swift (88%) diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 4dcc26b51..046338fe7 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -56,8 +56,6 @@ 343A65981FC4CFE7000477A1 /* ConversationScrollButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 343A65961FC4CFE6000477A1 /* ConversationScrollButton.m */; }; 34480B361FD0929200BC14EF /* ShareAppExtensionContext.m in Sources */ = {isa = PBXBuildFile; fileRef = 34480B351FD0929200BC14EF /* ShareAppExtensionContext.m */; }; 34480B491FD0A60200BC14EF /* OWSMath.h in Headers */ = {isa = PBXBuildFile; fileRef = 34480B481FD0A60200BC14EF /* OWSMath.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 34480B521FD0A7A400BC14EF /* OWSLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 34480B4A1FD0A7A200BC14EF /* OWSLogger.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 34480B531FD0A7A400BC14EF /* OWSLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 34480B4B1FD0A7A300BC14EF /* OWSLogger.m */; }; 34480B551FD0A7A400BC14EF /* DebugLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 34480B4D1FD0A7A300BC14EF /* DebugLogger.h */; settings = {ATTRIBUTES = (Public, ); }; }; 34480B561FD0A7A400BC14EF /* DebugLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 34480B4E1FD0A7A300BC14EF /* DebugLogger.m */; }; 34480B571FD0A7A400BC14EF /* OWSScrubbingLogFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 34480B4F1FD0A7A300BC14EF /* OWSScrubbingLogFormatter.h */; }; @@ -86,7 +84,6 @@ 344F249C200FD03300CFB4F4 /* AttachmentApprovalViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 344F2498200FD03200CFB4F4 /* AttachmentApprovalViewController.swift */; }; 345BC30C2047030700257B7C /* OWS2FASettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 345BC30B2047030600257B7C /* OWS2FASettingsViewController.m */; }; 3461284B1FD0B94000532771 /* SAELoadViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3461284A1FD0B93F00532771 /* SAELoadViewController.swift */; }; - 346129341FD1A88700532771 /* OWSSwiftUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 346129331FD1A88700532771 /* OWSSwiftUtils.swift */; }; 346129391FD1B47300532771 /* OWSPreferences.h in Headers */ = {isa = PBXBuildFile; fileRef = 346129371FD1B47200532771 /* OWSPreferences.h */; settings = {ATTRIBUTES = (Public, ); }; }; 3461293A1FD1B47300532771 /* OWSPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 346129381FD1B47200532771 /* OWSPreferences.m */; }; 3461293C1FD1D46A00532771 /* OWSMath.m in Sources */ = {isa = PBXBuildFile; fileRef = 3461293B1FD1D46900532771 /* OWSMath.m */; }; @@ -659,8 +656,6 @@ 34480B371FD092A900BC14EF /* SignalShareExtension-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "SignalShareExtension-Bridging-Header.h"; sourceTree = ""; }; 34480B381FD092E300BC14EF /* SignalShareExtension-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "SignalShareExtension-Prefix.pch"; sourceTree = ""; }; 34480B481FD0A60200BC14EF /* OWSMath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSMath.h; sourceTree = ""; }; - 34480B4A1FD0A7A200BC14EF /* OWSLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSLogger.h; sourceTree = ""; }; - 34480B4B1FD0A7A300BC14EF /* OWSLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSLogger.m; sourceTree = ""; }; 34480B4D1FD0A7A300BC14EF /* DebugLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DebugLogger.h; sourceTree = ""; }; 34480B4E1FD0A7A300BC14EF /* DebugLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DebugLogger.m; sourceTree = ""; }; 34480B4F1FD0A7A300BC14EF /* OWSScrubbingLogFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSScrubbingLogFormatter.h; sourceTree = ""; }; @@ -691,7 +686,6 @@ 345BC30A2047030600257B7C /* OWS2FASettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWS2FASettingsViewController.h; sourceTree = ""; }; 345BC30B2047030600257B7C /* OWS2FASettingsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWS2FASettingsViewController.m; sourceTree = ""; }; 3461284A1FD0B93F00532771 /* SAELoadViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SAELoadViewController.swift; sourceTree = ""; }; - 346129331FD1A88700532771 /* OWSSwiftUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OWSSwiftUtils.swift; sourceTree = ""; }; 346129371FD1B47200532771 /* OWSPreferences.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSPreferences.h; sourceTree = ""; }; 346129381FD1B47200532771 /* OWSPreferences.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSPreferences.m; sourceTree = ""; }; 3461293B1FD1D46900532771 /* OWSMath.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSMath.m; sourceTree = ""; }; @@ -1447,8 +1441,6 @@ 346129AA1FD1F0EE00532771 /* OWSFormat.m */, 45666EC71D994C0D008FE134 /* OWSGroupAvatarBuilder.h */, 45666EC81D994C0D008FE134 /* OWSGroupAvatarBuilder.m */, - 34480B4A1FD0A7A200BC14EF /* OWSLogger.h */, - 34480B4B1FD0A7A300BC14EF /* OWSLogger.m */, 34480B481FD0A60200BC14EF /* OWSMath.h */, 3461293B1FD1D46900532771 /* OWSMath.m */, 344F248E2007D7F200CFB4F4 /* OWSMessagesBubbleImageFactory.swift */, @@ -1457,7 +1449,6 @@ 34641E172088D7E900E2EDE5 /* OWSScreenLock.swift */, 34480B4F1FD0A7A300BC14EF /* OWSScrubbingLogFormatter.h */, 34480B511FD0A7A400BC14EF /* OWSScrubbingLogFormatter.m */, - 346129331FD1A88700532771 /* OWSSwiftUtils.swift */, 34641E1120878FB000E2EDE5 /* OWSWindowManager.h */, 34641E1020878FAF00E2EDE5 /* OWSWindowManager.m */, 45360B8C1F9521F800FA666C /* Searcher.swift */, @@ -2413,7 +2404,6 @@ 34641E1C2088DA4100E2EDE5 /* ScreenLockViewController.h in Headers */, 346129E71FD5C0C600532771 /* OWSDatabaseMigrationRunner.h in Headers */, 344D6CEA20069E070042AF96 /* SelectRecipientViewController.h in Headers */, - 34480B521FD0A7A400BC14EF /* OWSLogger.h in Headers */, 34ABB2C52090C59700C727A6 /* OWSResaveCollectionDBMigration.h in Headers */, 459B775D207BA4810071D0AB /* OWSQuotedReplyModel.h in Headers */, 34612A001FD5F31400532771 /* OWS105AttachmentFilePaths.h in Headers */, @@ -3090,7 +3080,6 @@ 3478506C1FD9B78A007B8332 /* NoopNotificationsManager.swift in Sources */, 34480B621FD0A98800BC14EF /* UIColor+OWS.m in Sources */, 4C20B2B720CA0034001BAC90 /* ThreadViewModel.swift in Sources */, - 34480B531FD0A7A400BC14EF /* OWSLogger.m in Sources */, 34480B641FD0A98800BC14EF /* UIView+OWS.m in Sources */, 34C3C7932040B0DD0000134C /* OWSAudioPlayer.m in Sources */, 3461293A1FD1B47300532771 /* OWSPreferences.m in Sources */, @@ -3118,7 +3107,6 @@ 452C7CA72037628B003D51A5 /* Weak.swift in Sources */, 34D5872F208E2C4200D2255A /* OWS109OutgoingMessageState.m in Sources */, 451F8A341FD710C3005CB9DA /* ConversationSearcher.swift in Sources */, - 346129341FD1A88700532771 /* OWSSwiftUtils.swift in Sources */, 346129FE1FD5F31400532771 /* OWS106EnsureProfileComplete.swift in Sources */, 346129F91FD5F31400532771 /* OWS104CreateRecipientIdentities.m in Sources */, 346129D01FD207F300532771 /* OWSAlerts.swift in Sources */, diff --git a/Signal/src/Signal-Bridging-Header.h b/Signal/src/Signal-Bridging-Header.h index 9dbf6c231..9fa139969 100644 --- a/Signal/src/Signal-Bridging-Header.h +++ b/Signal/src/Signal-Bridging-Header.h @@ -53,7 +53,6 @@ #import #import #import -#import #import #import #import @@ -95,6 +94,7 @@ #import #import #import +#import #import #import #import diff --git a/SignalMessaging/SignalMessaging.h b/SignalMessaging/SignalMessaging.h index c59c7c0eb..c8c35d0b4 100644 --- a/SignalMessaging/SignalMessaging.h +++ b/SignalMessaging/SignalMessaging.h @@ -28,7 +28,6 @@ FOUNDATION_EXPORT const unsigned char SignalMessagingVersionString[]; #import #import #import -#import #import #import #import diff --git a/SignalServiceKit/src/Storage/FullTextSearchFinder.swift b/SignalServiceKit/src/Storage/FullTextSearchFinder.swift index 954c4b97d..e7bca46cf 100644 --- a/SignalServiceKit/src/Storage/FullTextSearchFinder.swift +++ b/SignalServiceKit/src/Storage/FullTextSearchFinder.swift @@ -38,7 +38,7 @@ public class FullTextSearchFinder: NSObject { public func enumerateObjects(searchText: String, transaction: YapDatabaseReadTransaction, block: @escaping (Any, String) -> Void) { guard let ext: YapDatabaseFullTextSearchTransaction = ext(transaction: transaction) else { - assertionFailure("ext was unexpectedly nil") + owsFail("\(logTag) ext was unexpectedly nil") return } @@ -112,12 +112,12 @@ public class FullTextSearchFinder: NSObject { let nationalNumber: String = { (recipientId: String) -> String in guard let phoneNumber = PhoneNumber(fromE164: recipientId) else { - assertionFailure("unexpected unparseable recipientId: \(recipientId)") + owsFail("\(logTag) unexpected unparseable recipientId: \(recipientId)") return "" } guard let digitScalars = phoneNumber.nationalNumber?.unicodeScalars.filter({ CharacterSet.decimalDigits.contains($0) }) else { - assertionFailure("unexpected unparseable recipientId: \(recipientId)") + owsFail("\(logTag) unexpected unparseable recipientId: \(recipientId)") return "" } diff --git a/SignalMessaging/utils/OWSLogger.h b/SignalServiceKit/src/Util/OWSLogger.h similarity index 85% rename from SignalMessaging/utils/OWSLogger.h rename to SignalServiceKit/src/Util/OWSLogger.h index d47e92cc8..be970a108 100644 --- a/SignalMessaging/utils/OWSLogger.h +++ b/SignalServiceKit/src/Util/OWSLogger.h @@ -1,5 +1,5 @@ // -// Copyright (c) 2017 Open Whisper Systems. All rights reserved. +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // NS_ASSUME_NONNULL_BEGIN diff --git a/SignalMessaging/utils/OWSLogger.m b/SignalServiceKit/src/Util/OWSLogger.m similarity index 89% rename from SignalMessaging/utils/OWSLogger.m rename to SignalServiceKit/src/Util/OWSLogger.m index f869ae403..ae1a484cb 100644 --- a/SignalMessaging/utils/OWSLogger.m +++ b/SignalServiceKit/src/Util/OWSLogger.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2017 Open Whisper Systems. All rights reserved. +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // #import "OWSLogger.h" diff --git a/SignalMessaging/utils/OWSSwiftUtils.swift b/SignalServiceKit/src/Util/OWSSwiftUtils.swift similarity index 88% rename from SignalMessaging/utils/OWSSwiftUtils.swift rename to SignalServiceKit/src/Util/OWSSwiftUtils.swift index d70088d68..09a770bad 100644 --- a/SignalMessaging/utils/OWSSwiftUtils.swift +++ b/SignalServiceKit/src/Util/OWSSwiftUtils.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2017 Open Whisper Systems. All rights reserved. +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // import Foundation diff --git a/SignalShareExtension/SignalShareExtension-Bridging-Header.h b/SignalShareExtension/SignalShareExtension-Bridging-Header.h index b634ebde8..a43917d86 100644 --- a/SignalShareExtension/SignalShareExtension-Bridging-Header.h +++ b/SignalShareExtension/SignalShareExtension-Bridging-Header.h @@ -12,7 +12,6 @@ #import #import #import -#import #import #import #import @@ -25,5 +24,6 @@ #import #import #import +#import #import #import