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

Bug Fix SYIOS-15: Entering a room should show all cached history from global initialsync until the room initialsync completes

Browse Source
This commit is contained in:
giomfo
2014-12-16 21:33:45 +01:00
parent e22ba21dbe
commit ec3687779c
1 changed files with 39 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
matrixConsole/ViewController/RoomViewController.m
+39 -14
View File
@@ -59,7 +59,9 @@ NSString *const kCmdResetUserPowerLevel = @"/deop";
// Back pagination
BOOL isBackPaginationInProgress;
BOOL isFirstPagination;
NSUInteger backPaginationAddedMsgNb;
NSUInteger backPaginationHandledEventsNb;
// Members list
NSArray *members;
@@ -423,10 +425,14 @@ NSString *const kCmdResetUserPowerLevel = @"/deop";
firstMessage = [[RoomMessage alloc] initWithEvent:event andRoomState:roomState];
if (firstMessage) {
[messages insertObject:firstMessage atIndex:0];
backPaginationAddedMsgNb++;
backPaginationAddedMsgNb ++;
backPaginationHandledEventsNb ++;
}
// Ignore unsupported/unexpected events
} else {
backPaginationHandledEventsNb ++;
}
// Display is refreshed at the end of back pagination (see onComplete block)
}
}];
@@ -470,33 +476,51 @@ NSString *const kCmdResetUserPowerLevel = @"/deop";
}
if (self.mxRoom.canPaginate) {
NSUInteger requestedItemsNb = ROOMVIEWCONTROLLER_BACK_PAGINATION_SIZE;
// In case of first pagination, we will request only messages from the store to speed up the room display
if (!messages.count) {
isFirstPagination = YES;
requestedItemsNb = self.mxRoom.remainingMessagesForPaginationInStore;
if (!requestedItemsNb || ROOMVIEWCONTROLLER_BACK_PAGINATION_SIZE < requestedItemsNb) {
requestedItemsNb = ROOMVIEWCONTROLLER_BACK_PAGINATION_SIZE;
}
}
[self startActivityIndicator];
isBackPaginationInProgress = YES;
backPaginationAddedMsgNb = 0;
[self paginateBackMessages:ROOMVIEWCONTROLLER_BACK_PAGINATION_SIZE];
[self paginateBackMessages:requestedItemsNb];
}
}
- (void)paginateBackMessages:(NSUInteger)requestedItemsNb {
backPaginationHandledEventsNb = 0;
[self.mxRoom paginateBackMessages:requestedItemsNb complete:^{
// Sanity check: check whether the view controller has not been released while back pagination was running
if (self.roomId == nil) {
return;
}
// Compute number of received items
NSUInteger itemsCount = 0;
for (NSUInteger index = 0; index < backPaginationAddedMsgNb; index++) {
RoomMessage *message = [messages objectAtIndex:index];
itemsCount += message.components.count;
}
// Check whether we got enough items
if (itemsCount < requestedItemsNb && self.mxRoom.canPaginate) {
// Ask more items
[self paginateBackMessages:(requestedItemsNb - itemsCount)];
} else {
[self onBackPaginationComplete];
// Check whether we received less items than expected, and check condition to be able to ask more
BOOL shouldLoop = ((backPaginationHandledEventsNb < requestedItemsNb) && self.mxRoom.canPaginate);
if (shouldLoop) {
NSUInteger missingItemsNb = requestedItemsNb - backPaginationHandledEventsNb;
// About first pagination, we will loop only if the store has more items (except if none item has been handled, in this case loop is required)
if (isFirstPagination && backPaginationHandledEventsNb) {
if (self.mxRoom.remainingMessagesForPaginationInStore < missingItemsNb) {
missingItemsNb = self.mxRoom.remainingMessagesForPaginationInStore;
}
}
if (missingItemsNb) {
// Ask more items
[self paginateBackMessages:missingItemsNb];
return;
}
}
// Here we are done
[self onBackPaginationComplete];
} failure:^(NSError *error) {
[self onBackPaginationComplete];
NSLog(@"Failed to paginate back: %@", error);
@@ -538,6 +562,7 @@ NSString *const kCmdResetUserPowerLevel = @"/deop";
[self.messagesTableView setContentOffset:contentOffset animated:NO];
}
}
isFirstPagination = NO;
isBackPaginationInProgress = NO;
[self stopActivityIndicator];
}