Simplify myUser property

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

View file

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