Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-28 23:32:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Simplify myUser property

Browse source
This commit is contained in:
ismailgulek 2020-06-19 11:28:13 +03:00
parent aff35d71f0
commit 403c329b6e
No known key found for this signature in database
GPG key ID: E96336D42D9470A9
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
RiotNSE/NSEMemoryStore.swift
View file

@ -33,7 +33,7 @@ class NSEMemoryStore: MXMemoryStore {
private var credentials: MXCredentials private var credentials: MXCredentials
// real store // real store
private var fileStore: MXFileStore! private var fileStore: MXFileStore!
private var myUser: MXMyUser? private var myUser: MXUser?
init(withCredentials credentials: MXCredentials) { init(withCredentials credentials: MXCredentials) {
self.credentials = credentials self.credentials = credentials
@ -54,7 +54,7 @@ class NSEMemoryStore: MXMemoryStore {
} }
// load session user before calling onComplete // load session user before calling onComplete
self.fileStore.asyncUsers(withUserIds: [userId], success: { (users) in self.fileStore.asyncUsers(withUserIds: [userId], success: { (users) in
if let user = users.first as? MXMyUser { if let user = users.first {
self.myUser = user self.myUser = user
} }
onComplete?() onComplete?()
@ -112,13 +112,10 @@ class NSEMemoryStore: MXMemoryStore {
// Override and return a user to be stored on session.myUser // Override and return a user to be stored on session.myUser
override func user(withUserId userId: String) -> MXUser? { override func user(withUserId userId: String) -> MXUser? {
if userId == credentials.userId { if userId == credentials.userId, let myUser = myUser {
// if myUser is set, return that // if asking for session user and myUser is set, return that
if let myUser = myUser {
return myUser return myUser
} }
return MXMyUser(userId: userId)
}
return MXUser(userId: userId) return MXUser(userId: userId)
} }