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

BugFix: Outgoing calls in the timeline are shown as Incoming calls in recents #102

Browse Source 
The matrix session was missing in the event formatter of RecentsDataSource.
This commit is contained in:
giomfo
2016-03-10 18:00:40 +01:00
parent aafeeef28c
commit c152928352
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Vector/Model/RoomList/RecentsDataSource.m
+16 -11
View File
@@ -56,10 +56,6 @@
self = [super init];
if (self)
{
// Replace event formatter
self.eventFormatter = [[EventFormatter alloc] initWithMatrixSession:self.mxSession];
self.eventFormatter.isForSubtitle = YES;
favoriteCellDataArray = [[NSMutableArray alloc] init];
conversationCellDataArray = [[NSMutableArray alloc] init];
lowPriorityCellDataArray = [[NSMutableArray alloc] init];
@@ -80,9 +76,16 @@
}
- (void)addMatrixSession:(MXSession *)mxSession
- (MXKSessionRecentsDataSource *)addMatrixSession:(MXSession *)mxSession
{
[super addMatrixSession:mxSession];
MXKSessionRecentsDataSource *recentsDataSource = [super addMatrixSession:mxSession];
if (recentsDataSource)
{
// Replace default event formatter
recentsDataSource.eventFormatter = [[EventFormatter alloc] initWithMatrixSession:mxSession];
recentsDataSource.eventFormatter.isForSubtitle = YES;
}
// Initialise the public room directory data source
// Note that it is single matrix session only for now
@@ -91,6 +94,8 @@
_publicRoomsDirectoryDataSource = [[PublicRoomsDirectoryDataSource alloc] initWithMatrixSession:mxSession];
_publicRoomsDirectoryDataSource.delegate = self;
}
return recentsDataSource;
}
- (void)removeMatrixSession:(MXSession*)matrixSession
@@ -104,7 +109,7 @@
if (roomTagListener)
{
[self.mxSession removeListener:roomTagListener];
[matrixSession removeListener:roomTagListener];
[roomTagsListenerByUserId removeObjectForKey:matrixSession.myUser.userId];
}
@@ -126,10 +131,10 @@
{
[super dataSource:dataSource didStateChange:aState];
if ((aState == MXKDataSourceStateReady) && self.mxSession && self.mxSession.myUser && self.mxSession.myUser.userId)
if ((aState == MXKDataSourceStateReady) && dataSource.mxSession.myUser.userId)
{
// Register the room tags updates to refresh the favorites order
id roomTagsListener = [self.mxSession listenToEventsOfTypes:@[kMXEventTypeStringRoomTag]
id roomTagsListener = [dataSource.mxSession listenToEventsOfTypes:@[kMXEventTypeStringRoomTag]
onEvent:^(MXEvent *event, MXTimelineDirection direction, id customObject) {
// Consider only live event
@@ -144,7 +149,7 @@
}];
[roomTagsListenerByUserId setObject:roomTagsListener forKey:self.mxSession.myUser.userId];
[roomTagsListenerByUserId setObject:roomTagsListener forKey:dataSource.mxSession.myUser.userId];
}
}
}
@@ -187,7 +192,7 @@
- (void)didMXSessionInviteRoomUpdate:(NSNotification *)notif
{
MXSession *mxSession = notif.object;
if (mxSession == self.mxSession)
if ([self.mxSessions indexOfObject:mxSession] != NSNotFound)
{
[self refreshRoomsSectionsAndReload];
}