diff --git a/Riot/Managers/UserSessions/UserSessionsService.swift b/Riot/Managers/UserSessions/UserSessionsService.swift index 19d9b05fa..f6d91bc0b 100644 --- a/Riot/Managers/UserSessions/UserSessionsService.swift +++ b/Riot/Managers/UserSessions/UserSessionsService.swift @@ -34,6 +34,10 @@ extension UserSessionsService { @objcMembers class UserSessionsService: NSObject { + // MARK: - Singleton + + static public let shared: UserSessionsService = UserSessionsService() + // MARK: - Properties // MARK: Private diff --git a/Riot/Modules/Application/AppCoordinator.swift b/Riot/Modules/Application/AppCoordinator.swift index f7b19ec0f..0f6261778 100755 --- a/Riot/Modules/Application/AppCoordinator.swift +++ b/Riot/Modules/Application/AppCoordinator.swift @@ -67,7 +67,7 @@ final class AppCoordinator: NSObject, AppCoordinatorType { init(router: RootRouterType, window: UIWindow) { self.rootRouter = router self.customSchemeURLParser = CustomSchemeURLParser() - self.userSessionsService = UserSessionsService() + self.userSessionsService = UserSessionsService.shared super.init() diff --git a/Riot/Modules/People/PeopleViewController.m b/Riot/Modules/People/PeopleViewController.m index b08b6be8e..7d4e9260c 100644 --- a/Riot/Modules/People/PeopleViewController.m +++ b/Riot/Modules/People/PeopleViewController.m @@ -30,7 +30,6 @@ { NSInteger directRoomsSectionNumber; RecentsDataSource *recentsDataSource; - UserSessionsService *userSessionsService; } @property(nonatomic) SpaceMembersCoordinatorBridgePresenter *spaceMembersCoordinatorBridgePresenter; @@ -51,7 +50,6 @@ [super finalizeInit]; directRoomsSectionNumber = 0; - userSessionsService = [UserSessionsService new]; self.screenName = @"People"; } @@ -125,7 +123,7 @@ { if (self.dataSource.currentSpace != nil) { - self.spaceMembersCoordinatorBridgePresenter = [[SpaceMembersCoordinatorBridgePresenter alloc] initWithUserSessionsService:userSessionsService session:self.mainSession spaceId:self.dataSource.currentSpace.spaceId]; + self.spaceMembersCoordinatorBridgePresenter = [[SpaceMembersCoordinatorBridgePresenter alloc] initWithUserSessionsService:[UserSessionsService shared] session:self.mainSession spaceId:self.dataSource.currentSpace.spaceId]; self.spaceMembersCoordinatorBridgePresenter.delegate = self; [self.spaceMembersCoordinatorBridgePresenter presentFrom:self animated:YES]; }