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

RoomSearchDataSource: Remove the matrix session from the parameters in initWithRoomDataSource API.

Browse source 
Use the matrix session of the provided room data source.
This commit is contained in:
giomfo 2016-09-29 11:47:02 +02:00
parent 1f5b524e5d
commit 612d6f1f38
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Vector/Model/Room/RoomSearchDataSource.h
View file

@ -26,9 +26,8 @@
Initialize a new `RoomSearchDataSource` instance.
@param roomDataSource a datasource to be able to reuse `RoomViewController` processing and rendering.
@param mxSession the Matrix session to get data from.
@return the newly created instance.
*/
- (instancetype)initWithRoomDataSource:(MXKRoomDataSource *)roomDataSource andMatrixSession:(MXSession *)mxSession;
- (instancetype)initWithRoomDataSource:(MXKRoomDataSource *)roomDataSource;
@end

4
Vector/Model/Room/RoomSearchDataSource.m
View file

@ -31,9 +31,9 @@
@implementation RoomSearchDataSource
- (instancetype)initWithRoomDataSource:(MXKRoomDataSource *)roomDataSource2 andMatrixSession:(MXSession *)mxSession
- (instancetype)initWithRoomDataSource:(MXKRoomDataSource *)roomDataSource2
{
self = [super initWithRoomId:roomDataSource2.roomId andMatrixSession:mxSession];
self = [super initWithRoomId:roomDataSource2.roomId andMatrixSession:roomDataSource2.mxSession];
if (self)
{
roomDataSource = roomDataSource2;

2
Vector/ViewController/RoomViewController.m
View file

@ -2037,7 +2037,7 @@
RoomSearchViewController* roomSearchViewController = (RoomSearchViewController*)pushedViewController;
RoomSearchDataSource *roomSearchDataSource = [[RoomSearchDataSource alloc] initWithRoomDataSource:self.roomDataSource andMatrixSession:self.mainSession];
RoomSearchDataSource *roomSearchDataSource = [[RoomSearchDataSource alloc] initWithRoomDataSource:self.roomDataSource];
[roomSearchViewController displaySearch:roomSearchDataSource];
}
else if ([[segue identifier] isEqualToString:@"showMemberDetails"])