[Spaces] Show spaces in left panel #4509

- Prevent crash when logging in
element-hq · Jul 16, 2021 · 63da1ab · 63da1ab
1 parent f1da8c2
commit 63da1ab
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Riot/Modules/SideMenu/SideMenuViewModel.swift b/Riot/Modules/SideMenu/SideMenuViewModel.swift
@@ -71,11 +71,12 @@ final class SideMenuViewModel: SideMenuViewModelType {
     }
 
     private func userAvatarViewData(from mxSession: MXSession) -> UserAvatarViewData? {
-        guard let userId = mxSession.myUserId, let mediaManager = mxSession.mediaManager else {
+        guard let userId = mxSession.myUserId, let mediaManager = mxSession.mediaManager, let myUser = mxSession.myUser else {
             return nil
         }
-        let userDisplayName = mxSession.myUser.displayname
-        let avatarUrl = mxSession.myUser.avatarUrl
+
+        let userDisplayName = myUser.displayname
+        let avatarUrl = myUser.avatarUrl
 
         return UserAvatarViewData(userId: userId,
                                   displayName: userDisplayName,

diff --git a/Riot/Modules/Spaces/SpaceList/SpaceListViewModel.swift b/Riot/Modules/Spaces/SpaceList/SpaceListViewModel.swift
@@ -74,6 +74,9 @@ final class SpaceListViewModel: SpaceListViewModelType {
     }
 
     private func loadData() {
+        guard session.mediaManager != nil else {
+            return
+        }
 
         self.update(viewState: .loading)