felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-05 15:37:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #384 from vector-im/peeking_support

Browse Source 
Room peeking support
This commit is contained in:
giomfo
2016-06-10 22:51:44 +02:00
committed by GitHub
parent ee461c7519 36846071ba
commit 7ef5b98a0d
10 changed files with 254 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Vector/ViewController/HomeViewController.m
+11 -6
View File
@@ -399,10 +399,9 @@
if (_currentRoomViewController)
{
// FIXME: review this code when peekingRoom will be supported
if (_currentRoomViewController.roomDataSource
&& _currentRoomViewController.roomDataSource.isLive
&& !_currentRoomViewController.roomDataSource.isPeeking)
// If the displayed data is not a preview, let the manager release the room data source
// (except if the view controller has the room data source ownership).
if (!_currentRoomViewController.roomPreviewData && _currentRoomViewController.roomDataSource && !_currentRoomViewController.hasRoomDataSourceOwnership)
{
MXSession *mxSession = _currentRoomViewController.roomDataSource.mxSession;
MXKRoomDataSourceManager *roomDataSourceManager = [MXKRoomDataSourceManager sharedManagerForMatrixSession:mxSession];
@@ -581,11 +580,13 @@
// Release existing Room view controller (if any)
if (_currentRoomViewController)
{
if (_currentRoomViewController.roomDataSource)
// If the displayed data is not a preview, let the manager release the room data source
// (except if the view controller has the room data source ownership).
if (!_currentRoomViewController.roomPreviewData && _currentRoomViewController.roomDataSource && !_currentRoomViewController.hasRoomDataSourceOwnership)
{
// Let the manager release this room data source
MXSession *mxSession = _currentRoomViewController.roomDataSource.mxSession;
MXKRoomDataSourceManager *roomDataSourceManager = [MXKRoomDataSourceManager sharedManagerForMatrixSession:mxSession];
[roomDataSourceManager closeRoomDataSource:_currentRoomViewController.roomDataSource forceClose:NO];
}
@@ -612,6 +613,8 @@
// Open the room on the requested event
roomDataSource = [[RoomDataSource alloc] initWithRoomId:_selectedRoomId initialEventId:_selectedEventId andMatrixSession:_selectedRoomSession];
[roomDataSource finalizeInitialization];
// Give the data source ownership to the room view controller.
_currentRoomViewController.hasRoomDataSourceOwnership = YES;
}
}
@@ -620,6 +623,8 @@
// Search result: Create a temp timeline from the selected event
roomDataSource = [[RoomDataSource alloc] initWithRoomId:searchViewController.selectedEvent.roomId initialEventId:searchViewController.selectedEvent.eventId andMatrixSession:searchDataSource.mxSession];
[roomDataSource finalizeInitialization];
// Give the data source ownership to the room view controller.
_currentRoomViewController.hasRoomDataSourceOwnership = YES;
}