oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity

Change to make the 'getUser(using:)' method more consistent

Browse source
This commit is contained in:
Morgan Pretty 2022-03-24 14:16:38 +11:00
parent 7aa1221987
commit 6205e72eab
2 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
SessionMessagingKit/Database/Storage+Shared.swift
View file

@ -36,21 +36,17 @@ extension Storage {
}
@objc public func getUser() -> Contact? {
return getUser(using: nil)
}
public func getUser(using transaction: Any?) -> Contact? {
guard let userPublicKey = getUserPublicKey() else { return nil }
var result: Contact?
if let transaction = transaction {
result = Storage.shared.getContact(with: userPublicKey, using: transaction)
}
else {
Storage.read { transaction in
result = Storage.shared.getContact(with: userPublicKey, using: transaction)
}
Storage.read { transaction in
result = self.getUser(using: transaction)
}
return result
}
public func getUser(using transaction: Any) -> Contact? {
guard let userPublicKey = getUserPublicKey() else { return nil }
return Storage.shared.getContact(with: userPublicKey, using: transaction)
}
}

2
SessionMessagingKit/Storage.swift
View file

@ -17,7 +17,7 @@ public protocol SessionMessagingKitStorageProtocol {
func getUserKeyPair() -> ECKeyPair?
func getUserED25519KeyPair() -> Box.KeyPair?
func getUser() -> Contact?
func getUser(using transaction: Any?) -> Contact?
func getUser(using transaction: Any) -> Contact?
func getAllContacts() -> Set<Contact>
func getAllContacts(with transaction: YapDatabaseReadTransaction) -> Set<Contact>