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

Move getRoomStartedWithMember from RoomViewCrontroller to MatrixHandler

Browse Source
This commit is contained in:
Yannick Le Collen
2014-12-18 11:01:04 +01:00
parent d1035861d9
commit b72713d743
3 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
matrixConsole/ViewController/RoomViewController.m
+1 -36
View File
@@ -1398,41 +1398,6 @@ NSString *const kCmdResetUserPowerLevel = @"/deop";
#pragma mark - UITableView delegate
// search if a conversation has been started with this user
- (NSString*) getRoomStartedWith:(MXRoomMember*)roomMember {
//
MatrixHandler *mxHandler = [MatrixHandler sharedHandler];
if (mxHandler.mxSession) {
// list the last messages of each room to get the rooms list
NSArray *recentEvents = [NSMutableArray arrayWithArray:[mxHandler.mxSession recentsWithTypeIn:mxHandler.eventsFilterForMessages]];
// loops
for (MXEvent *mxEvent in recentEvents) {
// get the dedicated mxRooms
MXRoom *mxRoom = [mxHandler.mxSession roomWithRoomId:mxEvent.roomId];
// accept only room with 2 users
if (mxRoom.state.members.count == 2)
{
NSArray* roomMembers = mxRoom.state.members;
MXRoomMember* member1 = [roomMembers objectAtIndex:0];
MXRoomMember* member2 = [roomMembers objectAtIndex:1];
// check if they are the dedicated users
if (
([member1.userId isEqualToString:mxHandler.mxSession.myUser.userId] || [member1.userId isEqualToString:roomMember.userId]) &&
([member2.userId isEqualToString:mxHandler.mxSession.myUser.userId] || [member2.userId isEqualToString:roomMember.userId])) {
return mxRoom.state.roomId;
}
}
}
}
return nil;
}
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
// Check table view members vs messages
if (tableView == self.membersTableView) {
@@ -1572,7 +1537,7 @@ NSString *const kCmdResetUserPowerLevel = @"/deop";
// the current web interface always creates a new room
// uncoment this line opens any existing room with the same uers
__block NSString* startedRoomID = nil;//[self getRoomStartedWith:roomMember];
__block NSString* startedRoomID = nil; // [mxHandler getRoomStartedWithMember:roomMember];
//, offer to chat with this user only
if (startedRoomID) {