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

Make sample app compile with new MXRoomState

Browse Source
This commit is contained in:
manuroe
2014-11-13 15:11:48 +01:00
parent f8571e87c7
commit 6d099cbee0
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
syMessaging/syMessaging/MatrixHandler.m
View File

@@ -273,7 +273,7 @@ static MatrixHandler *sharedHandler = nil;
[self.mxNotification dismiss:NO];
}
self.mxNotification = [[CustomAlert alloc] initWithTitle:[self.mxSession room:event.roomId].displayname
self.mxNotification = [[CustomAlert alloc] initWithTitle:[self.mxSession room:event.roomId].state.displayname
message:[self displayTextFor:event inSubtitleMode:YES]
style:CustomAlertStyleAlert];
self.mxNotification.cancelButtonIndex = [self.mxNotification addActionWithTitle:@"OK"
@@ -438,10 +438,10 @@ static MatrixHandler *sharedHandler = nil;
// Retrieve roomData related to the message
MXRoom *room = [self.mxSession room:message.roomId];
// Prepare display name for concerned users
NSString *memberDisplayName = [room memberName:message.userId];
NSString *memberDisplayName = [room.state memberName:message.userId];
NSString *targetDisplayName = nil;
if (message.stateKey) {
targetDisplayName = [room memberName:message.stateKey];
targetDisplayName = [room.state memberName:message.stateKey];
}
switch (message.eventType) {
@@ -525,7 +525,7 @@ static MatrixHandler *sharedHandler = nil;
case MXEventTypeRoomCreate: {
NSString *creatorId = message.content[@"creator"];
if (creatorId) {
displayText = [NSString stringWithFormat:@"%@ created the room", [room memberName:creatorId]];
displayText = [NSString stringWithFormat:@"%@ created the room", [room.state memberName:creatorId]];
}
break;
}

4
syMessaging/syMessaging/View/RoomMemberTableCell.m
View File

@@ -21,7 +21,7 @@
- (void)setRoomMember:(MXRoomMember *)roomMember withRoom:(MXRoom *)room {
if (room && roomMember) {
self.userLabel.text = [room memberName:roomMember.userId];
self.userLabel.text = [room.state memberName:roomMember.userId];
self.placeholder = @"default-profile";
self.pictureURL = roomMember.avatarUrl;
@@ -49,7 +49,7 @@
// Handle power level display
self.userPowerLevel.hidden = NO;
NSDictionary *powerLevels = room.powerLevels;
NSDictionary *powerLevels = room.state.powerLevels;
if (powerLevels) {
int maxLevel = 0;
for (NSString *powerLevel in powerLevels.allValues) {

4
syMessaging/syMessaging/ViewController/RecentsViewController.m
View File

@@ -250,11 +250,11 @@
MatrixHandler *mxHandler = [MatrixHandler sharedHandler];
MXRoom *mxRoom = [mxHandler.mxSession room:mxEvent.roomId];
cell.roomTitle.text = [mxRoom displayname];
cell.roomTitle.text = [mxRoom.state displayname];
cell.lastEventDescription.text = [mxHandler displayTextFor:mxEvent inSubtitleMode:YES];
// Set in bold public room name
if (mxRoom.isPublic) {
if (mxRoom.state.isPublic) {
cell.roomTitle.font = [UIFont boldSystemFontOfSize:20];
} else {
cell.roomTitle.font = [UIFont systemFontOfSize:19];

16
syMessaging/syMessaging/ViewController/RoomViewController.m
View File

@@ -246,10 +246,10 @@ NSString *const kFailedEventId = @"failedEventId";
mxRoom = [mxHandler.mxSession room:self.roomId];
// Update room title
self.roomNavItem.title = mxRoom.displayname;
self.roomNavItem.title = mxRoom.state.displayname;
// Join the room if the user is not already listed in room's members
if ([mxRoom getMember:mxHandler.userId] == nil) {
if ([mxRoom.state getMember:mxHandler.userId] == nil) {
isJoinRequestInProgress = YES;
[_activityIndicator startAnimating];
[mxHandler.mxRestClient joinRoom:self.roomId success:^{
@@ -271,7 +271,7 @@ NSString *const kFailedEventId = @"failedEventId";
} failure:^(NSError *error) {
[_activityIndicator stopAnimating];
isJoinRequestInProgress = NO;
NSLog(@"Failed to join room (%@): %@", mxRoom.displayname, error);
NSLog(@"Failed to join room (%@): %@", mxRoom.state.displayname, error);
//Alert user
[[AppDelegate theDelegate] showErrorAsAlert:error];
}];
@@ -401,7 +401,7 @@ NSString *const kFailedEventId = @"failedEventId";
}
- (void)updateRoomMembers {
members = [[mxRoom members] sortedArrayUsingComparator:^NSComparisonResult(id obj1, id obj2) {
members = [[mxRoom.state members] sortedArrayUsingComparator:^NSComparisonResult(id obj1, id obj2) {
MXRoomMember *member1 = (MXRoomMember*)obj1;
MXRoomMember *member2 = (MXRoomMember*)obj2;
@@ -433,7 +433,7 @@ NSString *const kFailedEventId = @"failedEventId";
if (user1.lastActiveAgo < user2.lastActiveAgo) {
return NSOrderedAscending;
} else if (user1.lastActiveAgo == user2.lastActiveAgo) {
return [[mxRoom memberName:member1.userId] compare:[mxRoom memberName:member2.userId] options:NSCaseInsensitiveSearch];
return [[mxRoom.state memberName:member1.userId] compare:[mxRoom.state memberName:member2.userId] options:NSCaseInsensitiveSearch];
}
return NSOrderedDescending;
} else {
@@ -446,7 +446,7 @@ NSString *const kFailedEventId = @"failedEventId";
return NSOrderedDescending;
}
return [[mxRoom memberName:member1.userId] compare:[mxRoom memberName:member2.userId] options:NSCaseInsensitiveSearch];
return [[mxRoom.state memberName:member1.userId] compare:[mxRoom.state memberName:member2.userId] options:NSCaseInsensitiveSearch];
}
}];
}
@@ -648,7 +648,7 @@ NSString *const kFailedEventId = @"failedEventId";
// Set user's picture
cell.placeholder = @"default-profile";
cell.pictureURL = [mxRoom getMember:mxEvent.userId].avatarUrl;
cell.pictureURL = [mxRoom.state getMember:mxEvent.userId].avatarUrl;
} else {
// Adjust display of other messages of the chunk
cell.pictureView.hidden = YES;
@@ -676,7 +676,7 @@ NSString *const kFailedEventId = @"failedEventId";
// Display user's display name for the first meesage of a chunk, except if the name appears in the displayed text (see emote and membership event)
if (isNewChunk && [mxHandler isNotification:mxEvent] == NO) {
incomingMsgCell.userNameLabel.hidden = NO;
incomingMsgCell.userNameLabel.text = [mxRoom memberName:mxEvent.userId];
incomingMsgCell.userNameLabel.text = [mxRoom.state memberName:mxEvent.userId];
} else {
incomingMsgCell.userNameLabel.hidden = YES;
}