diff --git a/SessionUtilitiesKit/AESGCM.swift b/SessionUtilitiesKit/Crypto/AESGCM.swift similarity index 100% rename from SessionUtilitiesKit/AESGCM.swift rename to SessionUtilitiesKit/Crypto/AESGCM.swift diff --git a/SessionUtilitiesKit/Data+SecureRandom.swift b/SessionUtilitiesKit/Crypto/Data+SecureRandom.swift similarity index 100% rename from SessionUtilitiesKit/Data+SecureRandom.swift rename to SessionUtilitiesKit/Crypto/Data+SecureRandom.swift diff --git a/SessionUtilitiesKit/DiffieHellman.swift b/SessionUtilitiesKit/Crypto/DiffieHellman.swift similarity index 100% rename from SessionUtilitiesKit/DiffieHellman.swift rename to SessionUtilitiesKit/Crypto/DiffieHellman.swift diff --git a/SessionUtilitiesKit/ECKeyPair+Hexadecimal.swift b/SessionUtilitiesKit/Crypto/ECKeyPair+Hexadecimal.swift similarity index 100% rename from SessionUtilitiesKit/ECKeyPair+Hexadecimal.swift rename to SessionUtilitiesKit/Crypto/ECKeyPair+Hexadecimal.swift diff --git a/SessionUtilitiesKit/Mnemonic.swift b/SessionUtilitiesKit/Crypto/Mnemonic.swift similarity index 100% rename from SessionUtilitiesKit/Mnemonic.swift rename to SessionUtilitiesKit/Crypto/Mnemonic.swift diff --git a/SessionUtilitiesKit/OWSFileSystem.h b/SessionUtilitiesKit/Database/OWSFileSystem.h similarity index 100% rename from SessionUtilitiesKit/OWSFileSystem.h rename to SessionUtilitiesKit/Database/OWSFileSystem.h diff --git a/SessionUtilitiesKit/OWSFileSystem.m b/SessionUtilitiesKit/Database/OWSFileSystem.m similarity index 98% rename from SessionUtilitiesKit/OWSFileSystem.m rename to SessionUtilitiesKit/Database/OWSFileSystem.m index 1534f7a0b..bd3eae2a1 100644 --- a/SessionUtilitiesKit/OWSFileSystem.m +++ b/SessionUtilitiesKit/Database/OWSFileSystem.m @@ -31,8 +31,7 @@ NS_ASSUME_NONNULL_BEGIN + (BOOL)protectFileOrFolderAtPath:(NSString *)path { - return - [self protectFileOrFolderAtPath:path fileProtectionType:NSFileProtectionCompleteUntilFirstUserAuthentication]; + return [self protectFileOrFolderAtPath:path fileProtectionType:NSFileProtectionCompleteUntilFirstUserAuthentication]; } + (BOOL)protectFileOrFolderAtPath:(NSString *)path fileProtectionType:(NSFileProtectionType)fileProtectionType diff --git a/SessionUtilitiesKit/OWSPrimaryStorageProtocol.swift b/SessionUtilitiesKit/Database/OWSPrimaryStorageProtocol.swift similarity index 100% rename from SessionUtilitiesKit/OWSPrimaryStorageProtocol.swift rename to SessionUtilitiesKit/Database/OWSPrimaryStorageProtocol.swift diff --git a/SessionUtilitiesKit/SSKKeychainStorage.swift b/SessionUtilitiesKit/Database/SSKKeychainStorage.swift similarity index 100% rename from SessionUtilitiesKit/SSKKeychainStorage.swift rename to SessionUtilitiesKit/Database/SSKKeychainStorage.swift diff --git a/SessionUtilitiesKit/Storage.swift b/SessionUtilitiesKit/Database/Storage.swift similarity index 100% rename from SessionUtilitiesKit/Storage.swift rename to SessionUtilitiesKit/Database/Storage.swift diff --git a/SessionUtilitiesKit/TSYapDatabaseObject.h b/SessionUtilitiesKit/Database/TSYapDatabaseObject.h similarity index 100% rename from SessionUtilitiesKit/TSYapDatabaseObject.h rename to SessionUtilitiesKit/Database/TSYapDatabaseObject.h diff --git a/SessionUtilitiesKit/TSYapDatabaseObject.m b/SessionUtilitiesKit/Database/TSYapDatabaseObject.m similarity index 100% rename from SessionUtilitiesKit/TSYapDatabaseObject.m rename to SessionUtilitiesKit/Database/TSYapDatabaseObject.m diff --git a/SessionUtilitiesKit/AppContext.h b/SessionUtilitiesKit/General/AppContext.h similarity index 100% rename from SessionUtilitiesKit/AppContext.h rename to SessionUtilitiesKit/General/AppContext.h diff --git a/SessionUtilitiesKit/AppContext.m b/SessionUtilitiesKit/General/AppContext.m similarity index 100% rename from SessionUtilitiesKit/AppContext.m rename to SessionUtilitiesKit/General/AppContext.m diff --git a/SessionUtilitiesKit/Array+Description.swift b/SessionUtilitiesKit/General/Array+Description.swift similarity index 100% rename from SessionUtilitiesKit/Array+Description.swift rename to SessionUtilitiesKit/General/Array+Description.swift diff --git a/SessionUtilitiesKit/BuildConfiguration.swift b/SessionUtilitiesKit/General/BuildConfiguration.swift similarity index 100% rename from SessionUtilitiesKit/BuildConfiguration.swift rename to SessionUtilitiesKit/General/BuildConfiguration.swift diff --git a/SessionUtilitiesKit/Dictionary+Description.swift b/SessionUtilitiesKit/General/Dictionary+Description.swift similarity index 100% rename from SessionUtilitiesKit/Dictionary+Description.swift rename to SessionUtilitiesKit/General/Dictionary+Description.swift diff --git a/SessionUtilitiesKit/General.swift b/SessionUtilitiesKit/General/General.swift similarity index 100% rename from SessionUtilitiesKit/General.swift rename to SessionUtilitiesKit/General/General.swift diff --git a/SessionUtilitiesKit/LKUserDefaults.swift b/SessionUtilitiesKit/General/LKUserDefaults.swift similarity index 100% rename from SessionUtilitiesKit/LKUserDefaults.swift rename to SessionUtilitiesKit/General/LKUserDefaults.swift diff --git a/SessionUtilitiesKit/LRUCache.swift b/SessionUtilitiesKit/General/LRUCache.swift similarity index 100% rename from SessionUtilitiesKit/LRUCache.swift rename to SessionUtilitiesKit/General/LRUCache.swift diff --git a/SessionUtilitiesKit/Logging.swift b/SessionUtilitiesKit/General/Logging.swift similarity index 100% rename from SessionUtilitiesKit/Logging.swift rename to SessionUtilitiesKit/General/Logging.swift diff --git a/SessionUtilitiesKit/NSArray+Functional.h b/SessionUtilitiesKit/General/NSArray+Functional.h similarity index 100% rename from SessionUtilitiesKit/NSArray+Functional.h rename to SessionUtilitiesKit/General/NSArray+Functional.h diff --git a/SessionUtilitiesKit/NSArray+Functional.m b/SessionUtilitiesKit/General/NSArray+Functional.m similarity index 100% rename from SessionUtilitiesKit/NSArray+Functional.m rename to SessionUtilitiesKit/General/NSArray+Functional.m diff --git a/SessionUtilitiesKit/NSDate+Timestamp.h b/SessionUtilitiesKit/General/NSDate+Timestamp.h similarity index 100% rename from SessionUtilitiesKit/NSDate+Timestamp.h rename to SessionUtilitiesKit/General/NSDate+Timestamp.h diff --git a/SessionUtilitiesKit/NSDate+Timestamp.mm b/SessionUtilitiesKit/General/NSDate+Timestamp.mm similarity index 100% rename from SessionUtilitiesKit/NSDate+Timestamp.mm rename to SessionUtilitiesKit/General/NSDate+Timestamp.mm diff --git a/SessionUtilitiesKit/NSNotificationCenter+OWS.h b/SessionUtilitiesKit/General/NSNotificationCenter+OWS.h similarity index 100% rename from SessionUtilitiesKit/NSNotificationCenter+OWS.h rename to SessionUtilitiesKit/General/NSNotificationCenter+OWS.h diff --git a/SessionUtilitiesKit/NSNotificationCenter+OWS.m b/SessionUtilitiesKit/General/NSNotificationCenter+OWS.m similarity index 100% rename from SessionUtilitiesKit/NSNotificationCenter+OWS.m rename to SessionUtilitiesKit/General/NSNotificationCenter+OWS.m diff --git a/SessionUtilitiesKit/NSRegularExpression+SSK.swift b/SessionUtilitiesKit/General/NSRegularExpression+SSK.swift similarity index 100% rename from SessionUtilitiesKit/NSRegularExpression+SSK.swift rename to SessionUtilitiesKit/General/NSRegularExpression+SSK.swift diff --git a/SessionUtilitiesKit/NSString+SSK.h b/SessionUtilitiesKit/General/NSString+SSK.h similarity index 100% rename from SessionUtilitiesKit/NSString+SSK.h rename to SessionUtilitiesKit/General/NSString+SSK.h diff --git a/SessionUtilitiesKit/NSString+SSK.m b/SessionUtilitiesKit/General/NSString+SSK.m similarity index 100% rename from SessionUtilitiesKit/NSString+SSK.m rename to SessionUtilitiesKit/General/NSString+SSK.m diff --git a/SessionUtilitiesKit/NSTimer+Proxying.h b/SessionUtilitiesKit/General/NSTimer+Proxying.h similarity index 100% rename from SessionUtilitiesKit/NSTimer+Proxying.h rename to SessionUtilitiesKit/General/NSTimer+Proxying.h diff --git a/SessionUtilitiesKit/NSTimer+Proxying.m b/SessionUtilitiesKit/General/NSTimer+Proxying.m similarity index 100% rename from SessionUtilitiesKit/NSTimer+Proxying.m rename to SessionUtilitiesKit/General/NSTimer+Proxying.m diff --git a/SessionUtilitiesKit/NSUserDefaults+OWS.h b/SessionUtilitiesKit/General/NSUserDefaults+OWS.h similarity index 100% rename from SessionUtilitiesKit/NSUserDefaults+OWS.h rename to SessionUtilitiesKit/General/NSUserDefaults+OWS.h diff --git a/SessionUtilitiesKit/NSUserDefaults+OWS.m b/SessionUtilitiesKit/General/NSUserDefaults+OWS.m similarity index 100% rename from SessionUtilitiesKit/NSUserDefaults+OWS.m rename to SessionUtilitiesKit/General/NSUserDefaults+OWS.m diff --git a/SessionUtilitiesKit/OWSMath.h b/SessionUtilitiesKit/General/OWSMath.h similarity index 100% rename from SessionUtilitiesKit/OWSMath.h rename to SessionUtilitiesKit/General/OWSMath.h diff --git a/SessionUtilitiesKit/String+SSK.swift b/SessionUtilitiesKit/General/String+SSK.swift similarity index 100% rename from SessionUtilitiesKit/String+SSK.swift rename to SessionUtilitiesKit/General/String+SSK.swift diff --git a/SessionUtilitiesKit/String+Trimming.swift b/SessionUtilitiesKit/General/String+Trimming.swift similarity index 100% rename from SessionUtilitiesKit/String+Trimming.swift rename to SessionUtilitiesKit/General/String+Trimming.swift diff --git a/SessionUtilitiesKit/UIDevice+featureSupport.swift b/SessionUtilitiesKit/General/UIDevice+featureSupport.swift similarity index 100% rename from SessionUtilitiesKit/UIDevice+featureSupport.swift rename to SessionUtilitiesKit/General/UIDevice+featureSupport.swift diff --git a/SessionUtilitiesKit/UIView+OWS.h b/SessionUtilitiesKit/General/UIView+OWS.h similarity index 100% rename from SessionUtilitiesKit/UIView+OWS.h rename to SessionUtilitiesKit/General/UIView+OWS.h diff --git a/SessionUtilitiesKit/UIView+OWS.m b/SessionUtilitiesKit/General/UIView+OWS.m similarity index 100% rename from SessionUtilitiesKit/UIView+OWS.m rename to SessionUtilitiesKit/General/UIView+OWS.m diff --git a/SessionUtilitiesKit/Weak.swift b/SessionUtilitiesKit/General/Weak.swift similarity index 100% rename from SessionUtilitiesKit/Weak.swift rename to SessionUtilitiesKit/General/Weak.swift diff --git a/SessionUtilitiesKit/DataSource.h b/SessionUtilitiesKit/Media/DataSource.h similarity index 100% rename from SessionUtilitiesKit/DataSource.h rename to SessionUtilitiesKit/Media/DataSource.h diff --git a/SessionUtilitiesKit/DataSource.m b/SessionUtilitiesKit/Media/DataSource.m similarity index 100% rename from SessionUtilitiesKit/DataSource.m rename to SessionUtilitiesKit/Media/DataSource.m diff --git a/SessionUtilitiesKit/MIMETypeUtil.h b/SessionUtilitiesKit/Media/MIMETypeUtil.h similarity index 100% rename from SessionUtilitiesKit/MIMETypeUtil.h rename to SessionUtilitiesKit/Media/MIMETypeUtil.h diff --git a/SessionUtilitiesKit/MIMETypeUtil.m b/SessionUtilitiesKit/Media/MIMETypeUtil.m similarity index 100% rename from SessionUtilitiesKit/MIMETypeUtil.m rename to SessionUtilitiesKit/Media/MIMETypeUtil.m diff --git a/SessionUtilitiesKit/NSData+Image.h b/SessionUtilitiesKit/Media/NSData+Image.h similarity index 100% rename from SessionUtilitiesKit/NSData+Image.h rename to SessionUtilitiesKit/Media/NSData+Image.h diff --git a/SessionUtilitiesKit/NSData+Image.m b/SessionUtilitiesKit/Media/NSData+Image.m similarity index 100% rename from SessionUtilitiesKit/NSData+Image.m rename to SessionUtilitiesKit/Media/NSData+Image.m diff --git a/SessionUtilitiesKit/OWSMediaUtils.swift b/SessionUtilitiesKit/Media/OWSMediaUtils.swift similarity index 100% rename from SessionUtilitiesKit/OWSMediaUtils.swift rename to SessionUtilitiesKit/Media/OWSMediaUtils.swift diff --git a/SessionUtilitiesKit/UIImage+OWS.h b/SessionUtilitiesKit/Media/UIImage+OWS.h similarity index 100% rename from SessionUtilitiesKit/UIImage+OWS.h rename to SessionUtilitiesKit/Media/UIImage+OWS.h diff --git a/SessionUtilitiesKit/UIImage+OWS.m b/SessionUtilitiesKit/Media/UIImage+OWS.m similarity index 100% rename from SessionUtilitiesKit/UIImage+OWS.m rename to SessionUtilitiesKit/Media/UIImage+OWS.m diff --git a/SessionUtilitiesKit/LKGroupUtilities.h b/SessionUtilitiesKit/Messaging/LKGroupUtilities.h similarity index 100% rename from SessionUtilitiesKit/LKGroupUtilities.h rename to SessionUtilitiesKit/Messaging/LKGroupUtilities.h diff --git a/SessionUtilitiesKit/LKGroupUtilities.m b/SessionUtilitiesKit/Messaging/LKGroupUtilities.m similarity index 100% rename from SessionUtilitiesKit/LKGroupUtilities.m rename to SessionUtilitiesKit/Messaging/LKGroupUtilities.m diff --git a/SessionUtilitiesKit/ContentProxy.swift b/SessionUtilitiesKit/Networking/ContentProxy.swift similarity index 100% rename from SessionUtilitiesKit/ContentProxy.swift rename to SessionUtilitiesKit/Networking/ContentProxy.swift diff --git a/SessionUtilitiesKit/HTTP.swift b/SessionUtilitiesKit/Networking/HTTP.swift similarity index 100% rename from SessionUtilitiesKit/HTTP.swift rename to SessionUtilitiesKit/Networking/HTTP.swift diff --git a/SessionUtilitiesKit/JSON.swift b/SessionUtilitiesKit/Networking/JSON.swift similarity index 100% rename from SessionUtilitiesKit/JSON.swift rename to SessionUtilitiesKit/Networking/JSON.swift diff --git a/SessionUtilitiesKit/ProxiedContentDownloader.swift b/SessionUtilitiesKit/Networking/ProxiedContentDownloader.swift similarity index 100% rename from SessionUtilitiesKit/ProxiedContentDownloader.swift rename to SessionUtilitiesKit/Networking/ProxiedContentDownloader.swift diff --git a/SessionUtilitiesKit/TSRequest.h b/SessionUtilitiesKit/Networking/TSRequest.h similarity index 100% rename from SessionUtilitiesKit/TSRequest.h rename to SessionUtilitiesKit/Networking/TSRequest.h diff --git a/SessionUtilitiesKit/TSRequest.m b/SessionUtilitiesKit/Networking/TSRequest.m similarity index 100% rename from SessionUtilitiesKit/TSRequest.m rename to SessionUtilitiesKit/Networking/TSRequest.m diff --git a/SessionUtilitiesKit/AnyPromise+Conversion.swift b/SessionUtilitiesKit/PromiseKit/AnyPromise+Conversion.swift similarity index 100% rename from SessionUtilitiesKit/AnyPromise+Conversion.swift rename to SessionUtilitiesKit/PromiseKit/AnyPromise+Conversion.swift diff --git a/SessionUtilitiesKit/Promise+Delaying.swift b/SessionUtilitiesKit/PromiseKit/Promise+Delaying.swift similarity index 100% rename from SessionUtilitiesKit/Promise+Delaying.swift rename to SessionUtilitiesKit/PromiseKit/Promise+Delaying.swift diff --git a/SessionUtilitiesKit/Promise+Retaining.swift b/SessionUtilitiesKit/PromiseKit/Promise+Retaining.swift similarity index 95% rename from SessionUtilitiesKit/Promise+Retaining.swift rename to SessionUtilitiesKit/PromiseKit/Promise+Retaining.swift index fc1ef5d90..cb7262521 100644 --- a/SessionUtilitiesKit/Promise+Retaining.swift +++ b/SessionUtilitiesKit/PromiseKit/Promise+Retaining.swift @@ -2,8 +2,7 @@ import PromiseKit public extension AnyPromise { - @objc - func retainUntilComplete() { + @objc func retainUntilComplete() { var retainCycle: AnyPromise? = self _ = self.ensure { assert(retainCycle != nil) diff --git a/SessionUtilitiesKit/Promise+Retrying.swift b/SessionUtilitiesKit/PromiseKit/Promise+Retrying.swift similarity index 100% rename from SessionUtilitiesKit/Promise+Retrying.swift rename to SessionUtilitiesKit/PromiseKit/Promise+Retrying.swift diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index e71887d37..cd70f99dd 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -877,7 +877,6 @@ C3D90A1125773888002C9DF5 /* Colors.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C39DD28724F3318C008590FC /* Colors.xcassets */; }; C3D90A5C25773A25002C9DF5 /* SessionUtilitiesKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C3C2A679255388CC00C340D1 /* SessionUtilitiesKit.framework */; }; C3D90A7A25773A93002C9DF5 /* Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3F0A5EB255C970D007BE2A3 /* Configuration.swift */; }; - C3D90A8325774A68002C9DF5 /* OWSPrimaryStorageProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3D9E41E25676C870040E4F3 /* OWSPrimaryStorageProtocol.swift */; }; C3D9E35525675EE10040E4F3 /* MIMETypeUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = C33FDB41255A580C00E217F9 /* MIMETypeUtil.m */; }; C3D9E35E25675F640040E4F3 /* OWSFileSystem.m in Sources */ = {isa = PBXBuildFile; fileRef = C33FDA8E255A57FD00E217F9 /* OWSFileSystem.m */; }; C3D9E379256760340040E4F3 /* MIMETypeUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = C33FDAFC255A580600E217F9 /* MIMETypeUtil.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -1700,14 +1699,14 @@ C38EF226255B6D5D007E1867 /* ShareViewDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ShareViewDelegate.swift; path = SignalUtilitiesKit/Utilities/ShareViewDelegate.swift; sourceTree = SOURCE_ROOT; }; C38EF227255B6D5D007E1867 /* OWSVideoPlayer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = OWSVideoPlayer.swift; path = SignalUtilitiesKit/Utilities/OWSVideoPlayer.swift; sourceTree = SOURCE_ROOT; }; C38EF236255B6D65007E1867 /* UIViewController+OWS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIViewController+OWS.h"; path = "SignalUtilitiesKit/UI/UIViewController+OWS.h"; sourceTree = SOURCE_ROOT; }; - C38EF237255B6D65007E1867 /* UIDevice+featureSupport.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "UIDevice+featureSupport.swift"; path = "SessionUtilitiesKit/UIDevice+featureSupport.swift"; sourceTree = SOURCE_ROOT; }; + C38EF237255B6D65007E1867 /* UIDevice+featureSupport.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "UIDevice+featureSupport.swift"; path = "SessionUtilitiesKit/General/UIDevice+featureSupport.swift"; sourceTree = SOURCE_ROOT; }; C38EF238255B6D66007E1867 /* UIFont+OWS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIFont+OWS.m"; path = "SignalUtilitiesKit/UI/UIFont+OWS.m"; sourceTree = SOURCE_ROOT; }; C38EF239255B6D66007E1867 /* UIFont+OWS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIFont+OWS.h"; path = "SignalUtilitiesKit/UI/UIFont+OWS.h"; sourceTree = SOURCE_ROOT; }; C38EF23A255B6D66007E1867 /* NSAttributedString+OWS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSAttributedString+OWS.m"; path = "SignalUtilitiesKit/Utilities/NSAttributedString+OWS.m"; sourceTree = SOURCE_ROOT; }; C38EF23B255B6D66007E1867 /* UIViewController+OWS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIViewController+OWS.m"; path = "SignalUtilitiesKit/UI/UIViewController+OWS.m"; sourceTree = SOURCE_ROOT; }; C38EF23C255B6D66007E1867 /* UIColor+OWS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIColor+OWS.h"; path = "SignalUtilitiesKit/UI/UIColor+OWS.h"; sourceTree = SOURCE_ROOT; }; - C38EF23D255B6D66007E1867 /* UIView+OWS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIView+OWS.h"; path = "SessionUtilitiesKit/UIView+OWS.h"; sourceTree = SOURCE_ROOT; }; - C38EF23E255B6D66007E1867 /* UIView+OWS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIView+OWS.m"; path = "SessionUtilitiesKit/UIView+OWS.m"; sourceTree = SOURCE_ROOT; }; + C38EF23D255B6D66007E1867 /* UIView+OWS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIView+OWS.h"; path = "SessionUtilitiesKit/General/UIView+OWS.h"; sourceTree = SOURCE_ROOT; }; + C38EF23E255B6D66007E1867 /* UIView+OWS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIView+OWS.m"; path = "SessionUtilitiesKit/General/UIView+OWS.m"; sourceTree = SOURCE_ROOT; }; C38EF23F255B6D67007E1867 /* NSAttributedString+OWS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSAttributedString+OWS.h"; path = "SignalUtilitiesKit/Utilities/NSAttributedString+OWS.h"; sourceTree = SOURCE_ROOT; }; C38EF240255B6D67007E1867 /* UIView+OWS.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "UIView+OWS.swift"; path = "SignalUtilitiesKit/UI/UIView+OWS.swift"; sourceTree = SOURCE_ROOT; }; C38EF241255B6D67007E1867 /* Collection+OWS.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "Collection+OWS.swift"; path = "SignalUtilitiesKit/Utilities/Collection+OWS.swift"; sourceTree = SOURCE_ROOT; }; @@ -1747,7 +1746,7 @@ C38EF2E9255B6DBA007E1867 /* OWSUnreadIndicator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OWSUnreadIndicator.h; path = SignalUtilitiesKit/OWSUnreadIndicator.h; sourceTree = SOURCE_ROOT; }; C38EF2EC255B6DBA007E1867 /* ProximityMonitoringManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ProximityMonitoringManager.swift; path = SessionMessagingKit/Utilities/ProximityMonitoringManager.swift; sourceTree = SOURCE_ROOT; }; C38EF2ED255B6DBB007E1867 /* DisplayableText.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = DisplayableText.swift; path = SignalUtilitiesKit/UI/DisplayableText.swift; sourceTree = SOURCE_ROOT; }; - C38EF2EF255B6DBB007E1867 /* Weak.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Weak.swift; path = SessionUtilitiesKit/Weak.swift; sourceTree = SOURCE_ROOT; }; + C38EF2EF255B6DBB007E1867 /* Weak.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Weak.swift; path = SessionUtilitiesKit/General/Weak.swift; sourceTree = SOURCE_ROOT; }; C38EF2F0255B6DBB007E1867 /* OWSAnyTouchGestureRecognizer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OWSAnyTouchGestureRecognizer.m; path = SignalUtilitiesKit/UI/OWSAnyTouchGestureRecognizer.m; sourceTree = SOURCE_ROOT; }; C38EF2F1255B6DBB007E1867 /* OWSPreferences.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OWSPreferences.h; path = SessionMessagingKit/Utilities/OWSPreferences.h; sourceTree = SOURCE_ROOT; }; C38EF2F2255B6DBC007E1867 /* Searcher.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Searcher.swift; path = SignalUtilitiesKit/Searcher.swift; sourceTree = SOURCE_ROOT; }; @@ -2554,6 +2553,117 @@ path = ..; sourceTree = ""; }; + B8A582AB258C64E800AFD84C /* Database */ = { + isa = PBXGroup; + children = ( + C33FDBAB255A581500E217F9 /* OWSFileSystem.h */, + C33FDA8E255A57FD00E217F9 /* OWSFileSystem.m */, + C3D9E41E25676C870040E4F3 /* OWSPrimaryStorageProtocol.swift */, + C33FDBBC255A581600E217F9 /* SSKKeychainStorage.swift */, + C33FDB36255A580B00E217F9 /* Storage.swift */, + C33FDAA1255A57FF00E217F9 /* TSYapDatabaseObject.h */, + C33FDA90255A57FD00E217F9 /* TSYapDatabaseObject.m */, + ); + path = Database; + sourceTree = ""; + }; + B8A582AC258C653C00AFD84C /* Crypto */ = { + isa = PBXGroup; + children = ( + C3C2A5D72553860B00C340D1 /* AESGCM.swift */, + C3C2ABD12553C6C900C340D1 /* Data+SecureRandom.swift */, + C3A71D662558A0170043A11F /* DiffieHellman.swift */, + C33FDA73255A57FA00E217F9 /* ECKeyPair+Hexadecimal.swift */, + C3A71F882558BA9F0043A11F /* Mnemonic.swift */, + ); + path = Crypto; + sourceTree = ""; + }; + B8A582AD258C655E00AFD84C /* PromiseKit */ = { + isa = PBXGroup; + children = ( + C3A721992558C1660043A11F /* AnyPromise+Conversion.swift */, + C3C2A5D32553860900C340D1 /* Promise+Delaying.swift */, + C3A7225D2558C38D0043A11F /* Promise+Retaining.swift */, + C3C2A5D62553860B00C340D1 /* Promise+Retrying.swift */, + ); + path = PromiseKit; + sourceTree = ""; + }; + B8A582AE258C65D000AFD84C /* Networking */ = { + isa = PBXGroup; + children = ( + C33FDB68255A580F00E217F9 /* ContentProxy.swift */, + C3C2A5BC255385EE00C340D1 /* HTTP.swift */, + C3C2A5D92553860B00C340D1 /* JSON.swift */, + C33FDAF2255A580500E217F9 /* ProxiedContentDownloader.swift */, + C352A3A42557B5F000338F3E /* TSRequest.h */, + C352A3A52557B60D00338F3E /* TSRequest.m */, + ); + path = Networking; + sourceTree = ""; + }; + B8A582AF258C665E00AFD84C /* Media */ = { + isa = PBXGroup; + children = ( + C33FDB54255A580D00E217F9 /* DataSource.h */, + C33FDBB6255A581600E217F9 /* DataSource.m */, + C33FDAFC255A580600E217F9 /* MIMETypeUtil.h */, + C33FDB41255A580C00E217F9 /* MIMETypeUtil.m */, + C33FDB29255A580A00E217F9 /* NSData+Image.h */, + C33FDAEF255A580500E217F9 /* NSData+Image.m */, + C33FDB22255A580900E217F9 /* OWSMediaUtils.swift */, + C33FDB1C255A580900E217F9 /* UIImage+OWS.h */, + C33FDB81255A581100E217F9 /* UIImage+OWS.m */, + ); + path = Media; + sourceTree = ""; + }; + B8A582B0258C66C900AFD84C /* General */ = { + isa = PBXGroup; + children = ( + C33FDB8A255A581200E217F9 /* AppContext.h */, + C33FDB85255A581100E217F9 /* AppContext.m */, + C3C2A5D12553860800C340D1 /* Array+Description.swift */, + C33FDAA8255A57FF00E217F9 /* BuildConfiguration.swift */, + C3C2A5D52553860A00C340D1 /* Dictionary+Description.swift */, + B8BC00BF257D90E30032E807 /* General.swift */, + C33FDB6B255A580F00E217F9 /* LKUserDefaults.swift */, + C3C2A5CE2553860700C340D1 /* Logging.swift */, + C33FDAFD255A580600E217F9 /* LRUCache.swift */, + C33FDB5C255A580E00E217F9 /* NSArray+Functional.h */, + C33FDAB8255A580100E217F9 /* NSArray+Functional.m */, + C300A6302554B68200555489 /* NSDate+Timestamp.h */, + C300A6312554B6D100555489 /* NSDate+Timestamp.mm */, + C33FDB3B255A580B00E217F9 /* NSNotificationCenter+OWS.h */, + C33FDB6C255A580F00E217F9 /* NSNotificationCenter+OWS.m */, + C33FDA7A255A57FB00E217F9 /* NSRegularExpression+SSK.swift */, + C33FDB12255A580800E217F9 /* NSString+SSK.h */, + C33FDB45255A580C00E217F9 /* NSString+SSK.m */, + C352A3762557859C00338F3E /* NSTimer+Proxying.h */, + C352A36C2557858D00338F3E /* NSTimer+Proxying.m */, + C33FDB51255A580D00E217F9 /* NSUserDefaults+OWS.h */, + C33FDB77255A581000E217F9 /* NSUserDefaults+OWS.m */, + C33FDB14255A580800E217F9 /* OWSMath.h */, + C33FDB3F255A580C00E217F9 /* String+SSK.swift */, + C3C2AC2D2553CBEB00C340D1 /* String+Trimming.swift */, + C38EF237255B6D65007E1867 /* UIDevice+featureSupport.swift */, + C38EF23D255B6D66007E1867 /* UIView+OWS.h */, + C38EF23E255B6D66007E1867 /* UIView+OWS.m */, + C38EF2EF255B6DBB007E1867 /* Weak.swift */, + ); + path = General; + sourceTree = ""; + }; + B8A582B9258C696200AFD84C /* Messaging */ = { + isa = PBXGroup; + children = ( + C33FDBCA255A581700E217F9 /* LKGroupUtilities.h */, + C33FDBE1255A581A00E217F9 /* LKGroupUtilities.m */, + ); + path = Messaging; + sourceTree = ""; + }; B8B3201F258B1A540020074B /* Contacts */ = { isa = PBXGroup; children = ( @@ -3413,69 +3523,14 @@ isa = PBXGroup; children = ( C3C2A68B255388D500C340D1 /* Meta */, - C3C2A5D72553860B00C340D1 /* AESGCM.swift */, - C3A721992558C1660043A11F /* AnyPromise+Conversion.swift */, - C33FDB8A255A581200E217F9 /* AppContext.h */, - C33FDB85255A581100E217F9 /* AppContext.m */, - C3C2A5D12553860800C340D1 /* Array+Description.swift */, - C33FDAA8255A57FF00E217F9 /* BuildConfiguration.swift */, + B8A582AC258C653C00AFD84C /* Crypto */, + B8A582AB258C64E800AFD84C /* Database */, + B8A582B0258C66C900AFD84C /* General */, + B8A582AF258C665E00AFD84C /* Media */, + B8A582B9258C696200AFD84C /* Messaging */, + B8A582AE258C65D000AFD84C /* Networking */, + B8A582AD258C655E00AFD84C /* PromiseKit */, C3D9E43025676D3D0040E4F3 /* Configuration.swift */, - C33FDB68255A580F00E217F9 /* ContentProxy.swift */, - C33FDB54255A580D00E217F9 /* DataSource.h */, - C33FDBB6255A581600E217F9 /* DataSource.m */, - C3C2ABD12553C6C900C340D1 /* Data+SecureRandom.swift */, - C3C2A5D52553860A00C340D1 /* Dictionary+Description.swift */, - C3A71D662558A0170043A11F /* DiffieHellman.swift */, - C33FDA73255A57FA00E217F9 /* ECKeyPair+Hexadecimal.swift */, - B8BC00BF257D90E30032E807 /* General.swift */, - C3C2A5BC255385EE00C340D1 /* HTTP.swift */, - C3C2A5D92553860B00C340D1 /* JSON.swift */, - C33FDBCA255A581700E217F9 /* LKGroupUtilities.h */, - C33FDBE1255A581A00E217F9 /* LKGroupUtilities.m */, - C33FDB6B255A580F00E217F9 /* LKUserDefaults.swift */, - C3C2A5CE2553860700C340D1 /* Logging.swift */, - C33FDAFD255A580600E217F9 /* LRUCache.swift */, - C33FDAFC255A580600E217F9 /* MIMETypeUtil.h */, - C33FDB41255A580C00E217F9 /* MIMETypeUtil.m */, - C3A71F882558BA9F0043A11F /* Mnemonic.swift */, - C33FDB5C255A580E00E217F9 /* NSArray+Functional.h */, - C33FDAB8255A580100E217F9 /* NSArray+Functional.m */, - C33FDB29255A580A00E217F9 /* NSData+Image.h */, - C33FDAEF255A580500E217F9 /* NSData+Image.m */, - C300A6302554B68200555489 /* NSDate+Timestamp.h */, - C300A6312554B6D100555489 /* NSDate+Timestamp.mm */, - C33FDB3B255A580B00E217F9 /* NSNotificationCenter+OWS.h */, - C33FDB6C255A580F00E217F9 /* NSNotificationCenter+OWS.m */, - C33FDA7A255A57FB00E217F9 /* NSRegularExpression+SSK.swift */, - C33FDB12255A580800E217F9 /* NSString+SSK.h */, - C33FDB45255A580C00E217F9 /* NSString+SSK.m */, - C352A3762557859C00338F3E /* NSTimer+Proxying.h */, - C352A36C2557858D00338F3E /* NSTimer+Proxying.m */, - C33FDB51255A580D00E217F9 /* NSUserDefaults+OWS.h */, - C33FDB77255A581000E217F9 /* NSUserDefaults+OWS.m */, - C33FDBAB255A581500E217F9 /* OWSFileSystem.h */, - C33FDA8E255A57FD00E217F9 /* OWSFileSystem.m */, - C33FDB14255A580800E217F9 /* OWSMath.h */, - C33FDB22255A580900E217F9 /* OWSMediaUtils.swift */, - C3D9E41E25676C870040E4F3 /* OWSPrimaryStorageProtocol.swift */, - C3C2A5D32553860900C340D1 /* Promise+Delaying.swift */, - C3A7225D2558C38D0043A11F /* Promise+Retaining.swift */, - C3C2A5D62553860B00C340D1 /* Promise+Retrying.swift */, - C33FDAF2255A580500E217F9 /* ProxiedContentDownloader.swift */, - C33FDBBC255A581600E217F9 /* SSKKeychainStorage.swift */, - C33FDB36255A580B00E217F9 /* Storage.swift */, - C33FDB3F255A580C00E217F9 /* String+SSK.swift */, - C3C2AC2D2553CBEB00C340D1 /* String+Trimming.swift */, - C352A3A42557B5F000338F3E /* TSRequest.h */, - C352A3A52557B60D00338F3E /* TSRequest.m */, - C33FDAA1255A57FF00E217F9 /* TSYapDatabaseObject.h */, - C33FDA90255A57FD00E217F9 /* TSYapDatabaseObject.m */, - C38EF237255B6D65007E1867 /* UIDevice+featureSupport.swift */, - C33FDB1C255A580900E217F9 /* UIImage+OWS.h */, - C33FDB81255A581100E217F9 /* UIImage+OWS.m */, - C38EF23D255B6D66007E1867 /* UIView+OWS.h */, - C38EF23E255B6D66007E1867 /* UIView+OWS.m */, - C38EF2EF255B6DBB007E1867 /* Weak.swift */, ); path = SessionUtilitiesKit; sourceTree = ""; @@ -4876,7 +4931,6 @@ 34480B361FD0929200BC14EF /* ShareAppExtensionContext.m in Sources */, 34641E1F2088DA6D00E2EDE5 /* SAEScreenLockViewController.m in Sources */, 3461284B1FD0B94000532771 /* SAELoadViewController.swift in Sources */, - C3D90A8325774A68002C9DF5 /* OWSPrimaryStorageProtocol.swift in Sources */, 347850571FD86544007B8332 /* SAEFailedViewController.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0;