Merge pull request #5690 from vector-im/andy/5603_room_indicators

Room activity indicators
This commit is contained in:
Anderas
2022-03-01 13:08:29 +00:00
committed by GitHub
28 changed files with 458 additions and 329 deletions
+4 -6
View File
@@ -1772,23 +1772,21 @@
#pragma mark - activity indicator
- (void)stopActivityIndicator
{
- (BOOL)canStopActivityIndicator {
// Keep the loading wheel displayed while we are joining the room
if (joinRoomRequest)
{
return;
return NO;
}
// Check internal processes before stopping the loading wheel
if (isPaginationInProgress || isInputToolbarProcessing)
{
// Keep activity indicator running
return;
return NO;
}
// Leave super decide
[super stopActivityIndicator];
return [super canStopActivityIndicator];
}
#pragma mark - Pagination