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

Fix compilation issue while merging room versioning and lazy_loading

Browse source
This commit is contained in:
manuroe 2018-08-07 18:20:22 +02:00
parent 0556ef2ee2
commit 1ed670e1c3
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Riot/Modules/Room/RoomViewController.m
View file

@ -940,7 +940,7 @@
NSInteger userPowerLevel = [powerLevels powerLevelOfUserWithUserID:self.mainSession.myUser.userId];
BOOL canSend = (userPowerLevel >= [powerLevels minimumPowerLevelForSendingEventAsMessage:kMXEventTypeStringRoomMessage]);
BOOL isRoomObsolete = self.roomDataSource.room.state.isObsolete;
BOOL isRoomObsolete = self.roomDataSource.roomState.isObsolete;
if (isRoomObsolete)
{
@ -4758,14 +4758,14 @@
- (void)listenTombstoneEventNotifications
{
// Room is already obsolete do not listen to tombstone event
if (self.roomDataSource.room.state.isObsolete)
if (self.roomDataSource.roomState.isObsolete)
{
return;
}
MXWeakify(self);
tombstoneEventNotificationsListener = [self.roomDataSource.room.liveTimeline listenToEventsOfTypes:@[kMXEventTypeStringRoomTombStone] onEvent:^(MXEvent *event, MXTimelineDirection direction, MXRoomState *roomState) {
tombstoneEventNotificationsListener = [self.roomDataSource.room listenToEventsOfTypes:@[kMXEventTypeStringRoomTombStone] onEvent:^(MXEvent *event, MXTimelineDirection direction, MXRoomState *roomState) {
MXStrongifyAndReturnIfNil(self);
@ -4784,7 +4784,7 @@
// Remove the previous live listener
if (tombstoneEventNotificationsListener)
{
[self.roomDataSource.room.liveTimeline removeListener:tombstoneEventNotificationsListener];
[self.roomDataSource.room removeListener:tombstoneEventNotificationsListener];
tombstoneEventNotificationsListener = nil;
}
}