From d76949516bad6425a10573c428bdf0e949427ee5 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Mon, 4 Jan 2021 14:08:05 +1100 Subject: [PATCH] Remove more unused code --- Session/Meta/Signal-Bridging-Header.h | 1 - .../ConversationViewController.m | 1 - Session/Signal/ExperienceUpgrade.swift | 76 ------------ Session/Signal/ExperienceUpgradeFinder.swift | 116 ------------------ Session/Signal/OWSSessionResetJobRecord.h | 23 ---- Session/Signal/OWSSessionResetJobRecord.m | 31 ----- Session/Signal/TurnServerInfo.swift | 32 ----- Signal.xcodeproj/project.pbxproj | 38 ------ .../Database/SignalKeyingStorage.h | 35 ------ .../Database/SignalKeyingStorage.m | 82 ------------- SignalUtilitiesKit/Meta/SignalUtilitiesKit.h | 2 - SignalUtilitiesKit/OWSRecordTranscriptJob.h | 28 ----- SignalUtilitiesKit/OWSRecordTranscriptJob.m | 61 --------- SignalUtilitiesKit/OWSSyncManagerProtocol.h | 34 ----- SignalUtilitiesKit/VersionMigrations.m | 8 -- 15 files changed, 568 deletions(-) delete mode 100644 Session/Signal/ExperienceUpgrade.swift delete mode 100644 Session/Signal/ExperienceUpgradeFinder.swift delete mode 100644 Session/Signal/OWSSessionResetJobRecord.h delete mode 100644 Session/Signal/OWSSessionResetJobRecord.m delete mode 100644 Session/Signal/TurnServerInfo.swift delete mode 100644 SignalUtilitiesKit/Database/SignalKeyingStorage.h delete mode 100644 SignalUtilitiesKit/Database/SignalKeyingStorage.m delete mode 100644 SignalUtilitiesKit/OWSRecordTranscriptJob.h delete mode 100644 SignalUtilitiesKit/OWSRecordTranscriptJob.m delete mode 100644 SignalUtilitiesKit/OWSSyncManagerProtocol.h diff --git a/Session/Meta/Signal-Bridging-Header.h b/Session/Meta/Signal-Bridging-Header.h index 90efdb6ce..52b0662f6 100644 --- a/Session/Meta/Signal-Bridging-Header.h +++ b/Session/Meta/Signal-Bridging-Header.h @@ -31,7 +31,6 @@ #import "OWSNavigationController.h" #import "OWSProgressView.h" #import "OWSQuotedMessageView.h" -#import "OWSSessionResetJobRecord.h" #import "OWSWindowManager.h" #import "PrivacySettingsTableViewController.h" #import "RemoteVideoView.h" diff --git a/Session/Signal/ConversationView/ConversationViewController.m b/Session/Signal/ConversationView/ConversationViewController.m index 63666af9c..ca9811639 100644 --- a/Session/Signal/ConversationView/ConversationViewController.m +++ b/Session/Signal/ConversationView/ConversationViewController.m @@ -24,7 +24,6 @@ #import "OWSSystemMessageCell.h" #import #import "Session-Swift.h" -#import #import "TSAttachmentPointer.h" #import "TSContactThread.h" #import "TSDatabaseView.h" diff --git a/Session/Signal/ExperienceUpgrade.swift b/Session/Signal/ExperienceUpgrade.swift deleted file mode 100644 index c042458d5..000000000 --- a/Session/Signal/ExperienceUpgrade.swift +++ /dev/null @@ -1,76 +0,0 @@ -// -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. -// - -import Foundation -import SignalUtilitiesKit -import SignalUtilitiesKit - -@objc public class ExperienceUpgrade: TSYapDatabaseObject { - let title: String - let body: String - let image: UIImage? - - @objc public required init(uniqueId: String, title: String, body: String, image: UIImage) { - self.title = title - self.body = body - self.image = image - super.init(uniqueId: uniqueId) - } - - @objc - public override init() { - // This is the unfortunate seam between strict swift and fast-and-loose objc - // we can't leave these properties nil, since we really "don't know" that the superclass - // will assign them. - self.title = "New Feature" - self.body = "Bug fixes and performance improvements." - self.image = nil - super.init() - } - - @objc public override required init(uniqueId: String?) { - // This is the unfortunate seam between strict swift and fast-and-loose objc - // we can't leave these properties nil, since we really "don't know" that the superclass - // will assign them. - self.title = "New Feature" - self.body = "Bug fixes and performance improvements." - self.image = nil - super.init(uniqueId: uniqueId) - } - - @objc public required init!(coder: NSCoder) { - // This is the unfortunate seam between strict swift and fast-and-loose objc - // we can't leave these properties nil, since we really "don't know" that the superclass - // will assign them. - self.title = "New Feature" - self.body = "Bug fixes and performance improvements." - self.image = nil - super.init(coder: coder) - } - - @objc public required init(dictionary dictionaryValue: [String: Any]!) throws { - // This is the unfortunate seam between strict swift and fast-and-loose objc - // we can't leave these properties nil, since we really "don't know" that the superclass - // will assign them. - self.title = "New Feature" - self.body = "Bug fixes and performance improvements." - self.image = nil - try super.init(dictionary: dictionaryValue) - } - - @objc public override class func storageBehaviorForProperty(withKey propertyKey: String) -> MTLPropertyStorage { - // These exist in a hardcoded set - no need to save them, plus it allows us to - // update copy/image down the line if there was a typo and we want to re-expose - // these models in a "change log" archive. - if propertyKey == "title" || propertyKey == "body" || propertyKey == "image" { - return MTLPropertyStorageNone - } else if propertyKey == "uniqueId" || propertyKey == "seenAt" { - return super.storageBehaviorForProperty(withKey: propertyKey) - } else { - // Being conservative here in case we rename a property. - owsFailDebug("unknown property \(propertyKey)") - return super.storageBehaviorForProperty(withKey: propertyKey) - } - } -} diff --git a/Session/Signal/ExperienceUpgradeFinder.swift b/Session/Signal/ExperienceUpgradeFinder.swift deleted file mode 100644 index 1242ced4b..000000000 --- a/Session/Signal/ExperienceUpgradeFinder.swift +++ /dev/null @@ -1,116 +0,0 @@ -// -// Copyright (c) 2019 Open Whisper Systems. All rights reserved. -// - -import Foundation -import SignalUtilitiesKit - -enum ExperienceUpgradeId: String { - case videoCalling = "001", - callKit = "002", - introducingProfiles = "003", - introducingReadReceipts = "004", - introducingCustomNotificationAudio = "005", - introducingTypingIndicators = "006", - introducingLinkPreviews = "007" -} - -@objc public class ExperienceUpgradeFinder: NSObject { - - // MARK: - Singleton class - - @objc(sharedManager) - public static let shared = ExperienceUpgradeFinder() - - private override init() { - super.init() - - SwiftSingletons.register(self) - } - - var videoCalling: ExperienceUpgrade { - return ExperienceUpgrade(uniqueId: ExperienceUpgradeId.videoCalling.rawValue, - title: NSLocalizedString("UPGRADE_EXPERIENCE_VIDEO_TITLE", comment: "Header for upgrade experience"), - body: NSLocalizedString("UPGRADE_EXPERIENCE_VIDEO_DESCRIPTION", comment: "Description of video calling to upgrading (existing) users"), - image: #imageLiteral(resourceName: "introductory_splash_video_calling")) - } - - var callKit: ExperienceUpgrade { - return ExperienceUpgrade(uniqueId: ExperienceUpgradeId.callKit.rawValue, - title: NSLocalizedString("UPGRADE_EXPERIENCE_CALLKIT_TITLE", comment: "Header for upgrade experience"), - body: NSLocalizedString("UPGRADE_EXPERIENCE_CALLKIT_DESCRIPTION", comment: "Description of CallKit to upgrading (existing) users"), - image: #imageLiteral(resourceName: "introductory_splash_callkit")) - } - - var introducingProfiles: ExperienceUpgrade { - return ExperienceUpgrade(uniqueId: ExperienceUpgradeId.introducingProfiles.rawValue, - title: NSLocalizedString("UPGRADE_EXPERIENCE_INTRODUCING_PROFILES_TITLE", comment: "Header for upgrade experience"), - body: NSLocalizedString("UPGRADE_EXPERIENCE_INTRODUCING_PROFILES_DESCRIPTION", comment: "Description of new profile feature for upgrading (existing) users"), - image: #imageLiteral(resourceName: "introductory_splash_profile")) - } - - var introducingReadReceipts: ExperienceUpgrade { - return ExperienceUpgrade(uniqueId: ExperienceUpgradeId.introducingReadReceipts.rawValue, - title: NSLocalizedString("UPGRADE_EXPERIENCE_INTRODUCING_READ_RECEIPTS_TITLE", comment: "Header for upgrade experience"), - body: NSLocalizedString("UPGRADE_EXPERIENCE_INTRODUCING_READ_RECEIPTS_DESCRIPTION", comment: "Description of new profile feature for upgrading (existing) users"), - image: #imageLiteral(resourceName: "introductory_splash_read_receipts")) - } - - var configurableNotificationAudio: ExperienceUpgrade { - return ExperienceUpgrade(uniqueId: ExperienceUpgradeId.introducingCustomNotificationAudio.rawValue, - title: NSLocalizedString("UPGRADE_EXPERIENCE_INTRODUCING_NOTIFICATION_AUDIO_TITLE", comment: "Header for upgrade experience"), - body: NSLocalizedString("UPGRADE_EXPERIENCE_INTRODUCING_NOTIFICATION_AUDIO_DESCRIPTION", comment: "Description for notification audio customization"), - image: #imageLiteral(resourceName: "introductory_splash_custom_audio")) - } - - var typingIndicators: ExperienceUpgrade { - return ExperienceUpgrade(uniqueId: ExperienceUpgradeId.introducingTypingIndicators.rawValue, - title: NSLocalizedString("UPGRADE_EXPERIENCE_INTRODUCING_TYPING_INDICATORS_TITLE", comment: "Header for upgrading users"), - body: NSLocalizedString("UPGRADE_EXPERIENCE_INTRODUCING_TYPING_INDICATORS_DESCRIPTION", comment: "Body text for upgrading users"), - image: #imageLiteral(resourceName: "introductory_splash_custom_audio")) - } - - var linkPreviews: ExperienceUpgrade { - let imageName = Theme.isDarkThemeEnabled ? "introducing-link-previews-dark" : "introducing-link-previews-light" - let image: UIImage - if let heroImage = UIImage(named: imageName) { - image = heroImage - } else { - owsFailDebug("Could not load hero image.") - image = #imageLiteral(resourceName: "introductory_splash_custom_audio") - } - return ExperienceUpgrade(uniqueId: ExperienceUpgradeId.introducingLinkPreviews.rawValue, - title: NSLocalizedString("UPGRADE_EXPERIENCE_INTRODUCING_LINK_PREVIEWS_TITLE", comment: "Header for upgrading users"), - body: NSLocalizedString("UPGRADE_EXPERIENCE_INTRODUCING_LINK_PREVIEWS_DESCRIPTION", comment: "Body text for upgrading users"), - image: image) - } - - // Keep these ordered by increasing uniqueId. - @objc - public var allExperienceUpgrades: [ExperienceUpgrade] { - return [ - // Disable old experience upgrades. Most people have seen them by now, and accomodating multiple makes layout harder. - // Note if we ever want to show multiple experience upgrades again - // we'll have to update the layout in ExperienceUpgradesPageViewController - // - // videoCalling, - // (UIDevice.current.supportsCallKit ? callKit : nil), - // introducingProfiles, - // introducingReadReceipts, - // configurableNotificationAudio - // typingIndicators - linkPreviews - ].compactMap { $0 } - } - - // MARK: - Instance Methods - - @objc public func allUnseen(transaction: YapDatabaseReadTransaction) -> [ExperienceUpgrade] { - return allExperienceUpgrades.filter { ExperienceUpgrade.fetch(uniqueId: $0.uniqueId!, transaction: transaction) == nil } - } - - @objc public func markAllAsSeen(transaction: YapDatabaseReadWriteTransaction) { - Logger.info("marking experience upgrades as seen") - allExperienceUpgrades.forEach { $0.save(with: transaction) } - } -} diff --git a/Session/Signal/OWSSessionResetJobRecord.h b/Session/Signal/OWSSessionResetJobRecord.h deleted file mode 100644 index 3d7020832..000000000 --- a/Session/Signal/OWSSessionResetJobRecord.h +++ /dev/null @@ -1,23 +0,0 @@ -// -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. -// - -#import - -@class TSContactThread; - -NS_ASSUME_NONNULL_BEGIN - -@interface OWSSessionResetJobRecord : SSKJobRecord - -@property (nonatomic, readonly) NSString *contactThreadId; - -- (instancetype)initWithContactThread:(TSContactThread *)contactThread - label:(NSString *)label NS_DESIGNATED_INITIALIZER; -- (nullable instancetype)initWithCoder:(NSCoder *)coder NS_DESIGNATED_INITIALIZER; - -- (nullable)initWithLabel:(NSString *)label NS_UNAVAILABLE; - -@end - -NS_ASSUME_NONNULL_END diff --git a/Session/Signal/OWSSessionResetJobRecord.m b/Session/Signal/OWSSessionResetJobRecord.m deleted file mode 100644 index 95953daac..000000000 --- a/Session/Signal/OWSSessionResetJobRecord.m +++ /dev/null @@ -1,31 +0,0 @@ -// -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. -// - -#import "OWSSessionResetJobRecord.h" -#import - -NS_ASSUME_NONNULL_BEGIN - -@implementation OWSSessionResetJobRecord - -- (instancetype)initWithContactThread:(TSContactThread *)contactThread label:(NSString *)label -{ - self = [super initWithLabel:label]; - if (!self) { - return self; - } - - _contactThreadId = contactThread.uniqueId; - - return self; -} - -- (nullable instancetype)initWithCoder:(NSCoder *)coder -{ - return [super initWithCoder:coder]; -} - -@end - -NS_ASSUME_NONNULL_END diff --git a/Session/Signal/TurnServerInfo.swift b/Session/Signal/TurnServerInfo.swift deleted file mode 100644 index 296b9dd04..000000000 --- a/Session/Signal/TurnServerInfo.swift +++ /dev/null @@ -1,32 +0,0 @@ -// -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. -// - -import Foundation - -struct TurnServerInfo { - - let password: String - let username: String - let urls: [String] - - init?(attributes: [String: AnyObject]) { - if let passwordAttribute = (attributes["password"] as? String) { - password = passwordAttribute - } else { - return nil - } - - if let usernameAttribute = attributes["username"] as? String { - username = usernameAttribute - } else { - return nil - } - - if let urlsAttribute = attributes["urls"] as? [String] { - urls = urlsAttribute - } else { - return nil - } - } -} diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index a8ffc9c6c..b8c28819c 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -33,7 +33,6 @@ 34480B361FD0929200BC14EF /* ShareAppExtensionContext.m in Sources */ = {isa = PBXBuildFile; fileRef = 34480B351FD0929200BC14EF /* ShareAppExtensionContext.m */; }; 344825C6211390C800DB4BD8 /* OWSOrphanDataCleaner.m in Sources */ = {isa = PBXBuildFile; fileRef = 344825C5211390C800DB4BD8 /* OWSOrphanDataCleaner.m */; }; 3461284B1FD0B94000532771 /* SAELoadViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3461284A1FD0B93F00532771 /* SAELoadViewController.swift */; }; - 3461293E1FD1D72B00532771 /* ExperienceUpgradeFinder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3461293D1FD1D72B00532771 /* ExperienceUpgradeFinder.swift */; }; 346129991FD1E4DA00532771 /* SignalApp.m in Sources */ = {isa = PBXBuildFile; fileRef = 346129971FD1E4D900532771 /* SignalApp.m */; }; 34641E1F2088DA6D00E2EDE5 /* SAEScreenLockViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34641E1E2088DA6D00E2EDE5 /* SAEScreenLockViewController.m */; }; 34661FB820C1C0D60056EDD6 /* message_sent.aiff in Resources */ = {isa = PBXBuildFile; fileRef = 34661FB720C1C0D60056EDD6 /* message_sent.aiff */; }; @@ -105,7 +104,6 @@ 3681EBBAC430992520DBD9AC /* Pods_SessionShareExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 200605FD180CB8B89F566B41 /* Pods_SessionShareExtension.framework */; }; 4503F1BE20470A5B00CEE724 /* classic-quiet.aifc in Resources */ = {isa = PBXBuildFile; fileRef = 4503F1BB20470A5B00CEE724 /* classic-quiet.aifc */; }; 4503F1BF20470A5B00CEE724 /* classic.aifc in Resources */ = {isa = PBXBuildFile; fileRef = 4503F1BC20470A5B00CEE724 /* classic.aifc */; }; - 4505C2BF1E648EA300CEBF41 /* ExperienceUpgrade.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4505C2BE1E648EA300CEBF41 /* ExperienceUpgrade.swift */; }; 4509E79A1DD653700025A59F /* WebRTC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4509E7991DD653700025A59F /* WebRTC.framework */; }; 450D19131F85236600970622 /* RemoteVideoView.m in Sources */ = {isa = PBXBuildFile; fileRef = 450D19121F85236600970622 /* RemoteVideoView.m */; }; 450DF2051E0D74AC003D14BE /* Platform.swift in Sources */ = {isa = PBXBuildFile; fileRef = 450DF2041E0D74AC003D14BE /* Platform.swift */; }; @@ -128,7 +126,6 @@ 45A2F005204473A3002E978A /* NewMessage.aifc in Resources */ = {isa = PBXBuildFile; fileRef = 45A2F004204473A3002E978A /* NewMessage.aifc */; }; 45A663C51F92EC760027B59E /* GroupTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45A663C41F92EC760027B59E /* GroupTableViewCell.swift */; }; 45A6DAD61EBBF85500893231 /* ReminderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45A6DAD51EBBF85500893231 /* ReminderView.swift */; }; - 45AE48511E0732D6004D96C2 /* TurnServerInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45AE48501E0732D6004D96C2 /* TurnServerInfo.swift */; }; 45B5360E206DD8BB00D61655 /* UIResponder+OWS.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45B5360D206DD8BB00D61655 /* UIResponder+OWS.swift */; }; 45B74A742044AAB600CD42F8 /* aurora-quiet.aifc in Resources */ = {isa = PBXBuildFile; fileRef = 45B74A5B2044AAB300CD42F8 /* aurora-quiet.aifc */; }; 45B74A752044AAB600CD42F8 /* synth-quiet.aifc in Resources */ = {isa = PBXBuildFile; fileRef = 45B74A5C2044AAB300CD42F8 /* synth-quiet.aifc */; }; @@ -182,7 +179,6 @@ 4CB5F26920F7D060004D1B42 /* MessageActions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB5F26820F7D060004D1B42 /* MessageActions.swift */; }; 4CC1ECFB211A553000CC13BE /* AppUpdateNag.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CC1ECFA211A553000CC13BE /* AppUpdateNag.swift */; }; 4CC613362227A00400E21A3A /* ConversationSearch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CC613352227A00400E21A3A /* ConversationSearch.swift */; }; - 4CEB78C92178EBAB00F315D2 /* OWSSessionResetJobRecord.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CEB78C82178EBAB00F315D2 /* OWSSessionResetJobRecord.m */; }; 4CFE6B6C21F92BA700006701 /* LegacyNotificationsAdaptee.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CFE6B6B21F92BA700006701 /* LegacyNotificationsAdaptee.swift */; }; 5DF9AB212C6DB1E8BE70EFF6 /* Pods_SessionMessagingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FB523C549815DE935E98151E /* Pods_SessionMessagingKit.framework */; }; 70377AAB1918450100CAF501 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 70377AAA1918450100CAF501 /* MobileCoreServices.framework */; }; @@ -461,8 +457,6 @@ C33FDC27255A581F00E217F9 /* YapDatabase+Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = C33FDA6D255A57FA00E217F9 /* YapDatabase+Promise.swift */; }; C33FDC29255A581F00E217F9 /* ReachabilityManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = C33FDA6F255A57FA00E217F9 /* ReachabilityManager.swift */; }; C33FDC2C255A581F00E217F9 /* OWSFailedAttachmentDownloadsJob.h in Headers */ = {isa = PBXBuildFile; fileRef = C33FDA72255A57FA00E217F9 /* OWSFailedAttachmentDownloadsJob.h */; settings = {ATTRIBUTES = (Public, ); }; }; - C33FDC2F255A581F00E217F9 /* OWSSyncManagerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = C33FDA75255A57FB00E217F9 /* OWSSyncManagerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; }; - C33FDC39255A581F00E217F9 /* OWSRecordTranscriptJob.m in Sources */ = {isa = PBXBuildFile; fileRef = C33FDA7F255A57FC00E217F9 /* OWSRecordTranscriptJob.m */; }; C33FDC45255A581F00E217F9 /* AppVersion.m in Sources */ = {isa = PBXBuildFile; fileRef = C33FDA8B255A57FD00E217F9 /* AppVersion.m */; }; C33FDC50255A582000E217F9 /* OWSDispatch.h in Headers */ = {isa = PBXBuildFile; fileRef = C33FDA96255A57FE00E217F9 /* OWSDispatch.h */; settings = {ATTRIBUTES = (Public, ); }; }; C33FDC53255A582000E217F9 /* OutageDetection.swift in Sources */ = {isa = PBXBuildFile; fileRef = C33FDA99255A57FE00E217F9 /* OutageDetection.swift */; }; @@ -496,7 +490,6 @@ C33FDD53255A582000E217F9 /* OWSPrimaryStorage+keyFromIntLong.m in Sources */ = {isa = PBXBuildFile; fileRef = C33FDB99255A581300E217F9 /* OWSPrimaryStorage+keyFromIntLong.m */; }; C33FDD5A255A582000E217F9 /* TSStorageHeaders.h in Headers */ = {isa = PBXBuildFile; fileRef = C33FDBA0255A581400E217F9 /* TSStorageHeaders.h */; settings = {ATTRIBUTES = (Public, ); }; }; C33FDD5B255A582000E217F9 /* OWSOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = C33FDBA1255A581400E217F9 /* OWSOperation.h */; settings = {ATTRIBUTES = (Public, ); }; }; - C33FDD67255A582000E217F9 /* OWSRecordTranscriptJob.h in Headers */ = {isa = PBXBuildFile; fileRef = C33FDBAD255A581500E217F9 /* OWSRecordTranscriptJob.h */; settings = {ATTRIBUTES = (Public, ); }; }; C33FDD68255A582000E217F9 /* SignalAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = C33FDBAE255A581500E217F9 /* SignalAccount.h */; settings = {ATTRIBUTES = (Public, ); }; }; C33FDD6E255A582000E217F9 /* NSURLSessionDataTask+StatusCode.m in Sources */ = {isa = PBXBuildFile; fileRef = C33FDBB4255A581600E217F9 /* NSURLSessionDataTask+StatusCode.m */; }; C33FDD74255A582000E217F9 /* OWSPrimaryStorage+keyFromIntLong.h in Headers */ = {isa = PBXBuildFile; fileRef = C33FDBBA255A581600E217F9 /* OWSPrimaryStorage+keyFromIntLong.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -575,10 +568,8 @@ C38EF275255B6D7A007E1867 /* OWSDatabaseMigrationRunner.h in Headers */ = {isa = PBXBuildFile; fileRef = C38EF26F255B6D79007E1867 /* OWSDatabaseMigrationRunner.h */; settings = {ATTRIBUTES = (Public, ); }; }; C38EF276255B6D7A007E1867 /* OWSDatabaseMigration.m in Sources */ = {isa = PBXBuildFile; fileRef = C38EF270255B6D79007E1867 /* OWSDatabaseMigration.m */; }; C38EF277255B6D7A007E1867 /* OWSDatabaseMigration.h in Headers */ = {isa = PBXBuildFile; fileRef = C38EF271255B6D79007E1867 /* OWSDatabaseMigration.h */; settings = {ATTRIBUTES = (Public, ); }; }; - C38EF28E255B6D86007E1867 /* SignalKeyingStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = C38EF282255B6D84007E1867 /* SignalKeyingStorage.m */; }; C38EF28F255B6D86007E1867 /* VersionMigrations.h in Headers */ = {isa = PBXBuildFile; fileRef = C38EF283255B6D84007E1867 /* VersionMigrations.h */; settings = {ATTRIBUTES = (Public, ); }; }; C38EF290255B6D86007E1867 /* AppSetup.h in Headers */ = {isa = PBXBuildFile; fileRef = C38EF284255B6D84007E1867 /* AppSetup.h */; settings = {ATTRIBUTES = (Public, ); }; }; - C38EF291255B6D86007E1867 /* SignalKeyingStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = C38EF285255B6D84007E1867 /* SignalKeyingStorage.h */; settings = {ATTRIBUTES = (Public, ); }; }; C38EF292255B6D86007E1867 /* VersionMigrations.m in Sources */ = {isa = PBXBuildFile; fileRef = C38EF286255B6D85007E1867 /* VersionMigrations.m */; }; C38EF293255B6D86007E1867 /* AppSetup.m in Sources */ = {isa = PBXBuildFile; fileRef = C38EF287255B6D85007E1867 /* AppSetup.m */; }; C38EF2A5255B6D93007E1867 /* Identicon+ObjC.swift in Sources */ = {isa = PBXBuildFile; fileRef = C38EF2A2255B6D93007E1867 /* Identicon+ObjC.swift */; }; @@ -989,7 +980,6 @@ 344825C4211390C700DB4BD8 /* OWSOrphanDataCleaner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSOrphanDataCleaner.h; sourceTree = ""; }; 344825C5211390C800DB4BD8 /* OWSOrphanDataCleaner.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSOrphanDataCleaner.m; sourceTree = ""; }; 3461284A1FD0B93F00532771 /* SAELoadViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SAELoadViewController.swift; sourceTree = ""; }; - 3461293D1FD1D72B00532771 /* ExperienceUpgradeFinder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExperienceUpgradeFinder.swift; sourceTree = ""; }; 346129971FD1E4D900532771 /* SignalApp.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SignalApp.m; sourceTree = ""; }; 346129981FD1E4DA00532771 /* SignalApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SignalApp.h; sourceTree = ""; }; 34641E1D2088DA6C00E2EDE5 /* SAEScreenLockViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAEScreenLockViewController.h; sourceTree = ""; }; @@ -1089,7 +1079,6 @@ 435EAC2E5E22D3F087EB3192 /* Pods-SignalShareExtension.app store release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SignalShareExtension.app store release.xcconfig"; path = "Pods/Target Support Files/Pods-SignalShareExtension/Pods-SignalShareExtension.app store release.xcconfig"; sourceTree = ""; }; 4503F1BB20470A5B00CEE724 /* classic-quiet.aifc */ = {isa = PBXFileReference; lastKnownFileType = file; path = "classic-quiet.aifc"; sourceTree = ""; }; 4503F1BC20470A5B00CEE724 /* classic.aifc */ = {isa = PBXFileReference; lastKnownFileType = file; path = classic.aifc; sourceTree = ""; }; - 4505C2BE1E648EA300CEBF41 /* ExperienceUpgrade.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExperienceUpgrade.swift; sourceTree = ""; }; 4509E7991DD653700025A59F /* WebRTC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebRTC.framework; path = ThirdParty/WebRTC/Build/WebRTC.framework; sourceTree = ""; }; 450D19111F85236600970622 /* RemoteVideoView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RemoteVideoView.h; sourceTree = ""; }; 450D19121F85236600970622 /* RemoteVideoView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RemoteVideoView.m; sourceTree = ""; }; @@ -1114,7 +1103,6 @@ 45A2F004204473A3002E978A /* NewMessage.aifc */ = {isa = PBXFileReference; lastKnownFileType = file; name = NewMessage.aifc; path = Session/Meta/AudioFiles/NewMessage.aifc; sourceTree = SOURCE_ROOT; }; 45A663C41F92EC760027B59E /* GroupTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupTableViewCell.swift; sourceTree = ""; }; 45A6DAD51EBBF85500893231 /* ReminderView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReminderView.swift; sourceTree = ""; }; - 45AE48501E0732D6004D96C2 /* TurnServerInfo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TurnServerInfo.swift; sourceTree = ""; }; 45B201741DAECBFD00C461E0 /* Signal-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Signal-Bridging-Header.h"; sourceTree = ""; }; 45B5360D206DD8BB00D61655 /* UIResponder+OWS.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIResponder+OWS.swift"; sourceTree = ""; }; 45B74A5B2044AAB300CD42F8 /* aurora-quiet.aifc */ = {isa = PBXFileReference; lastKnownFileType = file; path = "aurora-quiet.aifc"; sourceTree = ""; }; @@ -1170,8 +1158,6 @@ 4CB5F26820F7D060004D1B42 /* MessageActions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageActions.swift; sourceTree = ""; }; 4CC1ECFA211A553000CC13BE /* AppUpdateNag.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppUpdateNag.swift; sourceTree = ""; }; 4CC613352227A00400E21A3A /* ConversationSearch.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationSearch.swift; sourceTree = ""; }; - 4CEB78C72178EBAB00F315D2 /* OWSSessionResetJobRecord.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OWSSessionResetJobRecord.h; sourceTree = ""; }; - 4CEB78C82178EBAB00F315D2 /* OWSSessionResetJobRecord.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OWSSessionResetJobRecord.m; sourceTree = ""; }; 4CFE6B6B21F92BA700006701 /* LegacyNotificationsAdaptee.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LegacyNotificationsAdaptee.swift; sourceTree = ""; }; 4CFF4C0920F55BBA005DA313 /* MenuActionsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuActionsViewController.swift; sourceTree = ""; }; 53D547348A367C8A14D37FC0 /* Pods_SignalUtilitiesKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SignalUtilitiesKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -1358,11 +1344,9 @@ C33FDA71255A57FA00E217F9 /* OWSReadReceiptManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSReadReceiptManager.m; sourceTree = ""; }; C33FDA72255A57FA00E217F9 /* OWSFailedAttachmentDownloadsJob.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSFailedAttachmentDownloadsJob.h; sourceTree = ""; }; C33FDA73255A57FA00E217F9 /* ECKeyPair+Hexadecimal.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ECKeyPair+Hexadecimal.swift"; sourceTree = ""; }; - C33FDA75255A57FB00E217F9 /* OWSSyncManagerProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSSyncManagerProtocol.h; sourceTree = ""; }; C33FDA79255A57FB00E217F9 /* TSGroupThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TSGroupThread.h; sourceTree = ""; }; C33FDA7A255A57FB00E217F9 /* NSRegularExpression+SSK.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSRegularExpression+SSK.swift"; sourceTree = ""; }; C33FDA7E255A57FB00E217F9 /* Mention.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Mention.swift; sourceTree = ""; }; - C33FDA7F255A57FC00E217F9 /* OWSRecordTranscriptJob.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSRecordTranscriptJob.m; sourceTree = ""; }; C33FDA80255A57FC00E217F9 /* OWSDisappearingMessagesJob.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSDisappearingMessagesJob.h; sourceTree = ""; }; C33FDA81255A57FC00E217F9 /* MentionsManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MentionsManager.swift; sourceTree = ""; }; C33FDA86255A57FC00E217F9 /* OWSDisappearingMessagesFinder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSDisappearingMessagesFinder.m; sourceTree = ""; }; @@ -1495,7 +1479,6 @@ C33FDBA8255A581500E217F9 /* OWSLinkPreview.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OWSLinkPreview.swift; sourceTree = ""; }; C33FDBA9255A581500E217F9 /* OWSIdentityManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSIdentityManager.m; sourceTree = ""; }; C33FDBAB255A581500E217F9 /* OWSFileSystem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSFileSystem.h; sourceTree = ""; }; - C33FDBAD255A581500E217F9 /* OWSRecordTranscriptJob.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSRecordTranscriptJob.h; sourceTree = ""; }; C33FDBAE255A581500E217F9 /* SignalAccount.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SignalAccount.h; sourceTree = ""; }; C33FDBB0255A581500E217F9 /* TSErrorMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TSErrorMessage.h; sourceTree = ""; }; C33FDBB4255A581600E217F9 /* NSURLSessionDataTask+StatusCode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSURLSessionDataTask+StatusCode.m"; sourceTree = ""; }; @@ -1598,10 +1581,8 @@ C38EF270255B6D79007E1867 /* OWSDatabaseMigration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OWSDatabaseMigration.m; path = SignalUtilitiesKit/Database/Migration/OWSDatabaseMigration.m; sourceTree = SOURCE_ROOT; }; C38EF271255B6D79007E1867 /* OWSDatabaseMigration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OWSDatabaseMigration.h; path = SignalUtilitiesKit/Database/Migration/OWSDatabaseMigration.h; sourceTree = SOURCE_ROOT; }; C38EF281255B6D84007E1867 /* OWSAudioSession.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = OWSAudioSession.swift; path = SessionMessagingKit/Utilities/OWSAudioSession.swift; sourceTree = SOURCE_ROOT; }; - C38EF282255B6D84007E1867 /* SignalKeyingStorage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SignalKeyingStorage.m; path = SignalUtilitiesKit/Database/SignalKeyingStorage.m; sourceTree = SOURCE_ROOT; }; C38EF283255B6D84007E1867 /* VersionMigrations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VersionMigrations.h; path = SignalUtilitiesKit/VersionMigrations.h; sourceTree = SOURCE_ROOT; }; C38EF284255B6D84007E1867 /* AppSetup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppSetup.h; path = SignalUtilitiesKit/AppSetup.h; sourceTree = SOURCE_ROOT; }; - C38EF285255B6D84007E1867 /* SignalKeyingStorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SignalKeyingStorage.h; path = SignalUtilitiesKit/Database/SignalKeyingStorage.h; sourceTree = SOURCE_ROOT; }; C38EF286255B6D85007E1867 /* VersionMigrations.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VersionMigrations.m; path = SignalUtilitiesKit/VersionMigrations.m; sourceTree = SOURCE_ROOT; }; C38EF287255B6D85007E1867 /* AppSetup.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppSetup.m; path = SignalUtilitiesKit/AppSetup.m; sourceTree = SOURCE_ROOT; }; C38EF288255B6D85007E1867 /* OWSSounds.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OWSSounds.h; path = SessionMessagingKit/Utilities/OWSSounds.h; sourceTree = SOURCE_ROOT; }; @@ -2136,10 +2117,7 @@ 3448BFC01EDF0EA7005B2D69 /* ConversationView */, 76EB03C218170B33006006FC /* AppDelegate.h */, 76EB03C318170B33006006FC /* AppDelegate.m */, - 45AE48501E0732D6004D96C2 /* TurnServerInfo.swift */, 34D99CE3217509C1000AFB39 /* AppEnvironment.swift */, - 4505C2BE1E648EA300CEBF41 /* ExperienceUpgrade.swift */, - 3461293D1FD1D72B00532771 /* ExperienceUpgradeFinder.swift */, 4539B5851F79348F007141FF /* PushRegistrationManager.swift */, 346129981FD1E4DA00532771 /* SignalApp.h */, 346129971FD1E4D900532771 /* SignalApp.m */, @@ -2150,8 +2128,6 @@ A5509EC91A69AB8B00ABA4BC /* Main.storyboard */, 3430FE171F7751D4000EC51B /* GiphyAPI.swift */, 34D1F0511F7E8EA30066283D /* GiphyDownloader.swift */, - 4CEB78C72178EBAB00F315D2 /* OWSSessionResetJobRecord.h */, - 4CEB78C82178EBAB00F315D2 /* OWSSessionResetJobRecord.m */, 451166BF1FD86B98000739BA /* AccountManager.swift */, 4CB5F26820F7D060004D1B42 /* MessageActions.swift */, 451A13B01E13DED2000A50FD /* AppNotifications.swift */, @@ -2909,10 +2885,7 @@ C33FDBA1255A581400E217F9 /* OWSOperation.h */, C33FDB78255A581000E217F9 /* OWSOperation.m */, C33FDC19255A581F00E217F9 /* OWSQueues.h */, - C33FDBAD255A581500E217F9 /* OWSRecordTranscriptJob.h */, - C33FDA7F255A57FC00E217F9 /* OWSRecordTranscriptJob.m */, C33FDBD3255A581800E217F9 /* OWSSignalAddress.swift */, - C33FDA75255A57FB00E217F9 /* OWSSyncManagerProtocol.h */, C33FDA6F255A57FA00E217F9 /* ReachabilityManager.swift */, C33FDBAE255A581500E217F9 /* SignalAccount.h */, C33FDC06255A581D00E217F9 /* SignalAccount.m */, @@ -3126,8 +3099,6 @@ C33FDB8B255A581200E217F9 /* Storage+SessionManagement.swift */, C38EF3D2255B6DEE007E1867 /* ThreadViewHelper.h */, C38EF3D1255B6DEE007E1867 /* ThreadViewHelper.m */, - C38EF285255B6D84007E1867 /* SignalKeyingStorage.h */, - C38EF282255B6D84007E1867 /* SignalKeyingStorage.m */, C33FDBA0255A581400E217F9 /* TSStorageHeaders.h */, C33FDBEF255A581B00E217F9 /* TSStorageKeys.h */, C33FDA6D255A57FA00E217F9 /* YapDatabase+Promise.swift */, @@ -3574,7 +3545,6 @@ C38EF334255B6DBF007E1867 /* UIUtil.h in Headers */, C38EF32D255B6DBF007E1867 /* BlockListUIUtils.h in Headers */, C33FDD5B255A582000E217F9 /* OWSOperation.h in Headers */, - C38EF291255B6D86007E1867 /* SignalKeyingStorage.h in Headers */, C33FDC89255A582000E217F9 /* OWSAttachmentDownloads.h in Headers */, C38EF313255B6DBF007E1867 /* OWSUnreadIndicator.h in Headers */, C33FDD7C255A582000E217F9 /* SSKAsserts.h in Headers */, @@ -3584,9 +3554,7 @@ C38EF32B255B6DBF007E1867 /* OWSFormat.h in Headers */, C33FDC2C255A581F00E217F9 /* OWSFailedAttachmentDownloadsJob.h in Headers */, C38EF22A255B6D5D007E1867 /* AttachmentSharing.h in Headers */, - C33FDD67255A582000E217F9 /* OWSRecordTranscriptJob.h in Headers */, C33FDDB8255A582000E217F9 /* NSSet+Functional.h in Headers */, - C33FDC2F255A581F00E217F9 /* OWSSyncManagerProtocol.h in Headers */, C33FDDCC255A582000E217F9 /* TSConstants.h in Headers */, C33FDDBD255A582000E217F9 /* ByteParser.h in Headers */, C38EF243255B6D67007E1867 /* UIViewController+OWS.h in Headers */, @@ -4621,7 +4589,6 @@ C38EF3BF255B6DE7007E1867 /* ImageEditorView.swift in Sources */, C38EF365255B6DCC007E1867 /* OWSTableViewController.m in Sources */, C38EF36B255B6DCC007E1867 /* ScreenLockViewController.m in Sources */, - C33FDC39255A581F00E217F9 /* OWSRecordTranscriptJob.m in Sources */, C38EF228255B6D5D007E1867 /* AttachmentSharing.m in Sources */, C38EF40C255B6DF7007E1867 /* GradientView.swift in Sources */, C38EF35C255B6DCC007E1867 /* SelectThreadViewController.m in Sources */, @@ -4659,7 +4626,6 @@ C38EF31D255B6DBF007E1867 /* UIImage+OWS.swift in Sources */, C38EF359255B6DCC007E1867 /* SheetViewController.swift in Sources */, C38EF386255B6DD2007E1867 /* AttachmentApprovalInputAccessoryView.swift in Sources */, - C38EF28E255B6D86007E1867 /* SignalKeyingStorage.m in Sources */, B8C2B2C82563685C00551B4D /* CircleView.swift in Sources */, C38EF331255B6DBF007E1867 /* UIGestureRecognizer+OWS.swift in Sources */, C33FDDC5255A582000E217F9 /* OWSError.m in Sources */, @@ -4903,7 +4869,6 @@ files = ( C396DAF52518408B00FF6DC5 /* CSV.swift in Sources */, B8CCF63723961D6D0091D419 /* NewPrivateChatVC.swift in Sources */, - 3461293E1FD1D72B00532771 /* ExperienceUpgradeFinder.swift in Sources */, 34C4E2582118957600BEA353 /* WebRTCProto.swift in Sources */, C396DAF12518408B00FF6DC5 /* EnumeratedView.swift in Sources */, 34D1F0BD1F8D108C0066283D /* AttachmentUploadView.m in Sources */, @@ -4932,10 +4897,8 @@ 343A65981FC4CFE7000477A1 /* ConversationScrollButton.m in Sources */, B82B40882399EB0E00A248E7 /* LandingVC.swift in Sources */, 34D1F0A91F867BFC0066283D /* ConversationViewCell.m in Sources */, - 4505C2BF1E648EA300CEBF41 /* ExperienceUpgrade.swift in Sources */, EF764C351DB67CC5000D9A87 /* UIViewController+Permissions.m in Sources */, 45CD81EF1DC030E7004C9430 /* SyncPushTokensJob.swift in Sources */, - 4CEB78C92178EBAB00F315D2 /* OWSSessionResetJobRecord.m in Sources */, C396DAF32518408B00FF6DC5 /* Description.swift in Sources */, 450D19131F85236600970622 /* RemoteVideoView.m in Sources */, 34129B8621EF877A005457A8 /* LinkPreviewView.swift in Sources */, @@ -5017,7 +4980,6 @@ C354E75A23FE2A7600CE22E3 /* BaseVC.swift in Sources */, C32C5D40256DD51E003C73A2 /* Storage+VolumeSamples.swift in Sources */, 3441FD9F21A3604F00BB9542 /* BackupRestoreViewController.swift in Sources */, - 45AE48511E0732D6004D96C2 /* TurnServerInfo.swift in Sources */, 45C0DC1B1E68FE9000E04C47 /* UIApplication+OWS.swift in Sources */, 4539B5861F79348F007141FF /* PushRegistrationManager.swift in Sources */, C396DAF22518408B00FF6DC5 /* NamedView.swift in Sources */, diff --git a/SignalUtilitiesKit/Database/SignalKeyingStorage.h b/SignalUtilitiesKit/Database/SignalKeyingStorage.h deleted file mode 100644 index 83e93f4ee..000000000 --- a/SignalUtilitiesKit/Database/SignalKeyingStorage.h +++ /dev/null @@ -1,35 +0,0 @@ -// -// Copyright (c) 2017 Open Whisper Systems. All rights reserved. -// - -#define LOCAL_NUMBER_KEY @"Number" -#define PASSWORD_COUNTER_KEY @"PasswordCounter" -#define SIGNALING_MAC_KEY @"Signaling Mac Key" -#define SIGNALING_CIPHER_KEY @"Signaling Cipher Key" -#define SIGNALING_EXTRA_KEY @"Signaling Extra Key" - -// TODO: -@interface SignalKeyingStorage : NSObject - -+ (void)generateSignaling; - -#pragma mark Signaling Key - -+ (int64_t)getAndIncrementOneTimeCounter; - -#pragma mark Signaling - -+ (NSData *)signalingMacKey; -+ (NSData *)signalingCipherKey; - -/** - * Returns the extra keying material generated at registration. - ⚠️ Warning: Users of older versions of Signal (<= 2.1.1) might have the signaling cipher key as extra keing - material. - * - * @return Extra keying material from registration time - */ - -+ (NSData *)signalingExtraKey; - -@end diff --git a/SignalUtilitiesKit/Database/SignalKeyingStorage.m b/SignalUtilitiesKit/Database/SignalKeyingStorage.m deleted file mode 100644 index 21e06a677..000000000 --- a/SignalUtilitiesKit/Database/SignalKeyingStorage.m +++ /dev/null @@ -1,82 +0,0 @@ -// -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. -// - -#import "SignalKeyingStorage.h" -#import -#import -#import - -#define SignalKeyingCollection @"SignalKeyingCollection" - -#define SIGNALING_MAC_KEY_LENGTH 20 -#define SIGNALING_CIPHER_KEY_LENGTH 16 -#define SIGNALING_EXTRA_KEY_LENGTH 4 - -@implementation SignalKeyingStorage - -+ (void)generateSignaling -{ - [self storeData:[Randomness generateRandomBytes:SIGNALING_MAC_KEY_LENGTH] forKey:SIGNALING_MAC_KEY]; - [self storeData:[Randomness generateRandomBytes:SIGNALING_CIPHER_KEY_LENGTH] forKey:SIGNALING_CIPHER_KEY]; - [self storeData:[Randomness generateRandomBytes:SIGNALING_EXTRA_KEY_LENGTH] forKey:SIGNALING_EXTRA_KEY]; -} - -+ (int64_t)getAndIncrementOneTimeCounter -{ - __block int64_t oldCounter; - oldCounter = [[self stringForKey:PASSWORD_COUNTER_KEY] longLongValue]; - int64_t newCounter = (oldCounter == INT64_MAX) ? INT64_MIN : (oldCounter + 1); - [self storeString:[@(newCounter) stringValue] forKey:PASSWORD_COUNTER_KEY]; - return newCounter; -} - -+ (NSData *)signalingCipherKey -{ - return [self dataForKey:SIGNALING_CIPHER_KEY andVerifyLength:SIGNALING_CIPHER_KEY_LENGTH]; -} - -+ (NSData *)signalingMacKey -{ - return [self dataForKey:SIGNALING_MAC_KEY andVerifyLength:SIGNALING_MAC_KEY_LENGTH]; -} - -+ (NSData *)signalingExtraKey -{ - return [self dataForKey:SIGNALING_EXTRA_KEY andVerifyLength:SIGNALING_EXTRA_KEY_LENGTH]; -} - -#pragma mark Keychain wrapper methods - -+ (void)storeData:(NSData *)data forKey:(NSString *)key -{ - [OWSPrimaryStorage.dbReadWriteConnection setObject:data forKey:key inCollection:SignalKeyingCollection]; -} - -+ (NSData *)dataForKey:(NSString *)key andVerifyLength:(uint)length -{ - NSData *data = [self dataForKey:key]; - - if (data.length != length) { - OWSLogError(@"Length of data not matching. Got %lu, expected %u", (unsigned long)data.length, length); - } - - return data; -} - -+ (NSData *)dataForKey:(NSString *)key -{ - return [OWSPrimaryStorage.dbReadConnection dataForKey:key inCollection:SignalKeyingCollection]; -} - -+ (NSString *)stringForKey:(NSString *)key -{ - return [OWSPrimaryStorage.dbReadConnection stringForKey:key inCollection:SignalKeyingCollection]; -} - -+ (void)storeString:(NSString *)string forKey:(NSString *)key -{ - [OWSPrimaryStorage.dbReadWriteConnection setObject:string forKey:key inCollection:SignalKeyingCollection]; -} - -@end diff --git a/SignalUtilitiesKit/Meta/SignalUtilitiesKit.h b/SignalUtilitiesKit/Meta/SignalUtilitiesKit.h index 0dc952ed4..23acc2c83 100644 --- a/SignalUtilitiesKit/Meta/SignalUtilitiesKit.h +++ b/SignalUtilitiesKit/Meta/SignalUtilitiesKit.h @@ -26,7 +26,6 @@ FOUNDATION_EXPORT const unsigned char SignalUtilitiesKitVersionString[]; #import #import #import -#import #import #import #import @@ -35,7 +34,6 @@ FOUNDATION_EXPORT const unsigned char SignalUtilitiesKitVersionString[]; #import #import #import -#import #import #import #import diff --git a/SignalUtilitiesKit/OWSRecordTranscriptJob.h b/SignalUtilitiesKit/OWSRecordTranscriptJob.h deleted file mode 100644 index d9e345a4c..000000000 --- a/SignalUtilitiesKit/OWSRecordTranscriptJob.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// Copyright (c) 2019 Open Whisper Systems. All rights reserved. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@class OWSIncomingSentMessageTranscript; -@class SNProtoSyncMessageSentUpdate; -@class TSAttachmentStream; -@class YapDatabaseReadWriteTransaction; - -// This job is used to process "outgoing message" notifications from linked devices. -@interface OWSRecordTranscriptJob : NSObject - -- (instancetype)init NS_UNAVAILABLE; - -+ (void)processIncomingSentMessageTranscript:(OWSIncomingSentMessageTranscript *)incomingSentMessageTranscript - serverID:(uint64_t)serverID - serverTimestamp:(uint64_t)serverTimestamp - attachmentHandler:(void (^)( - NSArray *attachmentStreams))attachmentHandler - transaction:(YapDatabaseReadWriteTransaction *)transaction; - -@end - -NS_ASSUME_NONNULL_END diff --git a/SignalUtilitiesKit/OWSRecordTranscriptJob.m b/SignalUtilitiesKit/OWSRecordTranscriptJob.m deleted file mode 100644 index 8999ed92d..000000000 --- a/SignalUtilitiesKit/OWSRecordTranscriptJob.m +++ /dev/null @@ -1,61 +0,0 @@ -// -// Copyright (c) 2019 Open Whisper Systems. All rights reserved. -// - -#import "OWSRecordTranscriptJob.h" -#import "OWSAttachmentDownloads.h" -#import "OWSDisappearingMessagesJob.h" -#import "OWSReadReceiptManager.h" -#import "SSKEnvironment.h" -#import "TSAttachmentPointer.h" -#import "TSGroupThread.h" -#import "TSInfoMessage.h" -#import "TSOutgoingMessage.h" -#import "TSQuotedMessage.h" -#import "TSThread.h" -#import -#import "OWSPrimaryStorage+Loki.h" - -NS_ASSUME_NONNULL_BEGIN - -@implementation OWSRecordTranscriptJob - -#pragma mark - Dependencies - -+ (OWSPrimaryStorage *)primaryStorage -{ - OWSAssertDebug(SSKEnvironment.shared.primaryStorage); - - return SSKEnvironment.shared.primaryStorage; -} - -+ (OWSReadReceiptManager *)readReceiptManager -{ - OWSAssert(SSKEnvironment.shared.readReceiptManager); - - return SSKEnvironment.shared.readReceiptManager; -} - -#pragma mark - - -+ (void)processIncomingSentMessageTranscript:(OWSIncomingSentMessageTranscript *)transcript - serverID:(uint64_t)serverID - serverTimestamp:(uint64_t)serverTimestamp - attachmentHandler:(void (^)( - NSArray *attachmentStreams))attachmentHandler - transaction:(YapDatabaseReadWriteTransaction *)transaction -{ - -} - -#pragma mark - - -+ (void)processRecipientUpdateWithTranscript:(OWSIncomingSentMessageTranscript *)transcript - transaction:(YapDatabaseReadWriteTransaction *)transaction -{ - -} - -@end - -NS_ASSUME_NONNULL_END diff --git a/SignalUtilitiesKit/OWSSyncManagerProtocol.h b/SignalUtilitiesKit/OWSSyncManagerProtocol.h deleted file mode 100644 index e4ccd1bc5..000000000 --- a/SignalUtilitiesKit/OWSSyncManagerProtocol.h +++ /dev/null @@ -1,34 +0,0 @@ -// -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@class AnyPromise; -@class SignalAccount; -@class YapDatabaseReadTransaction; -@class TSGroupThread; - -@protocol OWSSyncManagerProtocol - -- (void)sendConfigurationSyncMessage; - -- (AnyPromise *)syncLocalContact __attribute__((warn_unused_result)); - -- (AnyPromise *)syncContact:(NSString *)hexEncodedPubKey transaction:(YapDatabaseReadTransaction *)transaction; - -- (AnyPromise *)syncAllContacts __attribute__((warn_unused_result)); - -- (AnyPromise *)syncContactsForSignalAccounts:(NSArray *)signalAccounts __attribute__((warn_unused_result)); - -- (AnyPromise *)syncAllGroups __attribute__((warn_unused_result)); - -- (AnyPromise *)syncGroupForThread:(TSGroupThread *)thread; - -- (AnyPromise *)syncAllOpenGroups __attribute__((warn_unused_result)); - -@end - -NS_ASSUME_NONNULL_END diff --git a/SignalUtilitiesKit/VersionMigrations.m b/SignalUtilitiesKit/VersionMigrations.m index d77495b2e..2e4c75e1c 100644 --- a/SignalUtilitiesKit/VersionMigrations.m +++ b/SignalUtilitiesKit/VersionMigrations.m @@ -4,7 +4,6 @@ #import "VersionMigrations.h" #import "OWSDatabaseMigrationRunner.h" -#import "SignalKeyingStorage.h" #import #import #import @@ -20,13 +19,6 @@ NS_ASSUME_NONNULL_BEGIN #define NEEDS_TO_REGISTER_PUSH_KEY @"Register For Push" #define NEEDS_TO_REGISTER_ATTRIBUTES @"Register Attributes" -@interface SignalKeyingStorage (VersionMigrations) - -+ (void)storeString:(NSString *)string forKey:(NSString *)key; -+ (void)storeData:(NSData *)data forKey:(NSString *)key; - -@end - @implementation VersionMigrations #pragma mark - Dependencies