felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-29 20:56:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Multi-session handling: apply MatrixKit changes into Console.

Browse Source
This commit is contained in:
giomfo
2015-05-28 17:54:50 +02:00
parent a8b01c264d
commit 5cbd906199
9 changed files with 233 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
matrixConsole/ViewController/RoomViewController.m
+6 -6
View File
@@ -136,9 +136,9 @@
[super displayRoom:dataSource];
}
- (void)didMatrixSessionStateChange {
- (void)onMatrixSessionChange {
[super didMatrixSessionStateChange];
[super onMatrixSessionChange];
// Check dataSource state
if (self.roomDataSource && self.roomDataSource.state == MXKDataSourceStatePreparing) {
@@ -187,7 +187,7 @@
// Check
if (roomAlias.length) {
[self.mxSession joinRoom:roomAlias success:^(MXRoom *room) {
[self.mainSession joinRoom:roomAlias success:^(MXRoom *room) {
// Show the room
[[AppDelegate theDelegate].masterTabBarController showRoom:room.state.roomId];
} failure:^(NSError *error) {
@@ -287,14 +287,14 @@
// Dismiss keyboard
[self dismissKeyboard];
MXKRoomMemberListDataSource *membersDataSource = [[MXKRoomMemberListDataSource alloc] initWithRoomId:self.roomDataSource.roomId andMatrixSession:self.mxSession];
MXKRoomMemberListDataSource *membersDataSource = [[MXKRoomMemberListDataSource alloc] initWithRoomId:self.roomDataSource.roomId andMatrixSession:self.mainSession];
[membersController displayList:membersDataSource];
}
} else if ([[segue identifier] isEqualToString:@"showMemberDetails"]) {
MemberViewController* controller = pushedViewController;
if (selectedRoomMember) {
controller.mxSession = self.mxSession;
[controller addMatrixSession:self.mainSession];
controller.mxRoomMember = selectedRoomMember;
controller.mxRoom = self.roomDataSource.room;
selectedRoomMember = nil;
@@ -307,7 +307,7 @@
- (IBAction)onButtonPressed:(id)sender {
if (sender == voipVoiceCallButton || sender == voipVideoCallButton) {
[self.mxSession.callManager placeCallInRoom:self.roomDataSource.roomId withVideo:(sender == voipVideoCallButton)];
[self.mainSession.callManager placeCallInRoom:self.roomDataSource.roomId withVideo:(sender == voipVideoCallButton)];
}
}