From 6b0909b41bc72ef4acfd5acbf433352824a1fe95 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Thu, 17 Dec 2020 16:09:49 +1100 Subject: [PATCH] Create contact model --- SessionMessagingKit/Contacts/Contact.swift | 42 ++++++++++++++++++++++ Signal.xcodeproj/project.pbxproj | 12 +++++++ 2 files changed, 54 insertions(+) create mode 100644 SessionMessagingKit/Contacts/Contact.swift diff --git a/SessionMessagingKit/Contacts/Contact.swift b/SessionMessagingKit/Contacts/Contact.swift new file mode 100644 index 000000000..b70609e8f --- /dev/null +++ b/SessionMessagingKit/Contacts/Contact.swift @@ -0,0 +1,42 @@ + +@objc(SNContact) +public class Contact : NSObject, NSCoding { // NSObject/NSCoding conformance is needed for YapDatabase compatibility + public let sessionID: String + /// The display name of the contact. + public var displayName: String? + /// The URL from which to fetch the contact's profile picture. + public var profilePictureURL: String? + /// The file name of the contact's profile picture on local storage. + public var profilePictureFileName: String? + /// The key with which the profile picture is encrypted. + public var profilePictureEncryptionKey: OWSAES256Key? + /// The ID of the thread associated with this contact. + public var threadID: String? + + public init(sessionID: String) { + self.sessionID = sessionID + super.init() + } + + private override init() { preconditionFailure("Use init(sessionID:) instead.") } + + // MARK: Coding + public required init?(coder: NSCoder) { + guard let sessionID = coder.decodeObject(forKey: "sessionID") as! String? else { return nil } + self.sessionID = sessionID + if let displayName = coder.decodeObject(forKey: "displayName") as! String? { self.displayName = displayName } + if let profilePictureURL = coder.decodeObject(forKey: "profilePictureURL") as! String? { self.profilePictureURL = profilePictureURL } + if let profilePictureFileName = coder.decodeObject(forKey: "profilePictureFileName") as! String? { self.profilePictureFileName = profilePictureFileName } + if let profilePictureEncryptionKey = coder.decodeObject(forKey: "profilePictureEncryptionKey") as! OWSAES256Key? { self.profilePictureEncryptionKey = profilePictureEncryptionKey } + if let threadID = coder.decodeObject(forKey: "threadID") as! String? { self.threadID = threadID } + } + + public func encode(with coder: NSCoder) { + coder.encode(sessionID, forKey: "sessionID") + coder.encode(displayName, forKey: "displayName") + coder.encode(profilePictureURL, forKey: "profilePictureURL") + coder.encode(profilePictureFileName, forKey: "profilePictureFileName") + coder.encode(profilePictureEncryptionKey, forKey: "profilePictureEncryptionKey") + coder.encode(threadID, forKey: "threadID") + } +} diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 5171dfac9..ea3086152 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -282,6 +282,7 @@ B894D0752339EDCF00B4D94D /* NukeDataModal.swift in Sources */ = {isa = PBXBuildFile; fileRef = B894D0742339EDCF00B4D94D /* NukeDataModal.swift */; }; B8A14D702589CE9000E70D57 /* KeyPairMigrationSuccessSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8A14D6F2589CE9000E70D57 /* KeyPairMigrationSuccessSheet.swift */; }; B8B26C8F234D629C004ED98C /* MentionCandidateSelectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8B26C8E234D629C004ED98C /* MentionCandidateSelectionView.swift */; }; + B8B32021258B1A650020074B /* Contact.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8B32020258B1A650020074B /* Contact.swift */; }; B8BB82A5238F627000BA5194 /* HomeVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8BB82A4238F627000BA5194 /* HomeVC.swift */; }; B8BC00C0257D90E30032E807 /* General.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8BC00BF257D90E30032E807 /* General.swift */; }; B8C2B2C82563685C00551B4D /* CircleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8C2B2C72563685C00551B4D /* CircleView.swift */; }; @@ -1375,6 +1376,7 @@ B894D0742339EDCF00B4D94D /* NukeDataModal.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NukeDataModal.swift; sourceTree = ""; }; B8A14D6F2589CE9000E70D57 /* KeyPairMigrationSuccessSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyPairMigrationSuccessSheet.swift; sourceTree = ""; }; B8B26C8E234D629C004ED98C /* MentionCandidateSelectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MentionCandidateSelectionView.swift; sourceTree = ""; }; + B8B32020258B1A650020074B /* Contact.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Contact.swift; sourceTree = ""; }; B8B5BCEB2394D869003823C9 /* Button.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Button.swift; sourceTree = ""; }; B8BB829F238F322400BA5194 /* Colors.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Colors.swift; sourceTree = ""; }; B8BB82A1238F356100BA5194 /* Values.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Values.swift; sourceTree = ""; }; @@ -2546,6 +2548,14 @@ path = ..; sourceTree = ""; }; + B8B3201F258B1A540020074B /* Contacts */ = { + isa = PBXGroup; + children = ( + B8B32020258B1A650020074B /* Contact.swift */, + ); + path = Contacts; + sourceTree = ""; + }; B8CCF63B239757C10091D419 /* Components */ = { isa = PBXGroup; children = ( @@ -3478,6 +3488,7 @@ C32C5BB9256DC7C4003C73A2 /* To Do */, C3BBE0752554CDA60050F1E3 /* Configuration.swift */, C3BBE07F2554CDD70050F1E3 /* Storage.swift */, + B8B3201F258B1A540020074B /* Contacts */, C32C5BCB256DC818003C73A2 /* Database */, C300A5BB2554AFFB00555489 /* Messages */, C32C59AF256DB31A003C73A2 /* Threads */, @@ -5149,6 +5160,7 @@ C32C5BDD256DC88D003C73A2 /* OWSReadReceiptManager.m in Sources */, C3D9E3BF25676AD70040E4F3 /* TSAttachmentStream.m in Sources */, C3C2A7562553A3AB00C340D1 /* VisibleMessage+Quote.swift in Sources */, + B8B32021258B1A650020074B /* Contact.swift in Sources */, C32C5C89256DD0D2003C73A2 /* Storage+Jobs.swift in Sources */, C300A5FC2554B0A000555489 /* MessageReceiver.swift in Sources */, C32C5A76256DBBCF003C73A2 /* SignalAttachment.swift in Sources */,