mirror of
https://github.com/vector-im/element-ios.git
synced 2024-09-29 07:42:40 +00:00
Directory item in search doesn't open the directory if I don't search
https://github.com/vector-im/vector-ios/issues/353
This commit is contained in:
parent
fbd68515f5
commit
e1c16bf082
2 changed files with 11 additions and 5 deletions
|
@ -82,10 +82,14 @@ double const kPublicRoomsDirectoryDataExpiration = 10;
|
|||
// Do not refresh data if it is not too old
|
||||
if (lastRefreshDate && -lastRefreshDate.timeIntervalSinceNow < kPublicRoomsDirectoryDataExpiration)
|
||||
{
|
||||
// Apply the new filter on the current data
|
||||
[self refreshFilteredPublicRooms];
|
||||
|
||||
[self setState:MXKDataSourceStateReady];
|
||||
// Do not disturb the current request if any
|
||||
if (!publicRoomsRequest)
|
||||
{
|
||||
// Apply the new filter on the current data
|
||||
[self refreshFilteredPublicRooms];
|
||||
|
||||
[self setState:MXKDataSourceStateReady];
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -132,6 +136,7 @@ double const kPublicRoomsDirectoryDataExpiration = 10;
|
|||
[self setState:MXKDataSourceStateReady];
|
||||
|
||||
} failure:^(NSError *error) {
|
||||
|
||||
NSLog(@"[PublicRoomsDirectoryDataSource] Failed to fecth public rooms.");
|
||||
|
||||
[self setState:MXKDataSourceStateFailed];
|
||||
|
@ -141,6 +146,7 @@ double const kPublicRoomsDirectoryDataExpiration = 10;
|
|||
|
||||
// Alert user
|
||||
[[AppDelegate theDelegate] showErrorAsAlert:error];
|
||||
|
||||
}];
|
||||
}
|
||||
}
|
||||
|
|
|
@ -51,7 +51,7 @@
|
|||
{
|
||||
self.titleLabel.text = NSLocalizedStringFromTable(@"directory_title", @"Vector", nil);
|
||||
self.descriptionLabel.text = [NSString stringWithFormat:NSLocalizedStringFromTable(@"directory_description", @"Vector", nil),
|
||||
publicRoomsDirectoryDataSource.filteredRooms.count];
|
||||
publicRoomsDirectoryDataSource.rooms.count];
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue