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

Directory item in search doesn't open the directory if I don't search

Browse source 
https://github.com/vector-im/vector-ios/issues/353
This commit is contained in:
giomfo 2016-06-02 11:38:35 +02:00
parent fbd68515f5
commit e1c16bf082
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Vector/Model/RoomList/PublicRoomsDirectoryDataSource.m
View file

@ -82,10 +82,14 @@ double const kPublicRoomsDirectoryDataExpiration = 10;
// Do not refresh data if it is not too old // Do not refresh data if it is not too old
if (lastRefreshDate && -lastRefreshDate.timeIntervalSinceNow < kPublicRoomsDirectoryDataExpiration) if (lastRefreshDate && -lastRefreshDate.timeIntervalSinceNow < kPublicRoomsDirectoryDataExpiration)
{ {
// Apply the new filter on the current data // Do not disturb the current request if any
[self refreshFilteredPublicRooms]; if (!publicRoomsRequest)
{
[self setState:MXKDataSourceStateReady]; // Apply the new filter on the current data
[self refreshFilteredPublicRooms];
[self setState:MXKDataSourceStateReady];
}
} }
else else
{ {
@ -132,6 +136,7 @@ double const kPublicRoomsDirectoryDataExpiration = 10;
[self setState:MXKDataSourceStateReady]; [self setState:MXKDataSourceStateReady];
} failure:^(NSError *error) { } failure:^(NSError *error) {
NSLog(@"[PublicRoomsDirectoryDataSource] Failed to fecth public rooms."); NSLog(@"[PublicRoomsDirectoryDataSource] Failed to fecth public rooms.");
[self setState:MXKDataSourceStateFailed]; [self setState:MXKDataSourceStateFailed];
@ -141,6 +146,7 @@ double const kPublicRoomsDirectoryDataExpiration = 10;
// Alert user // Alert user
[[AppDelegate theDelegate] showErrorAsAlert:error]; [[AppDelegate theDelegate] showErrorAsAlert:error];
}]; }];
} }
} }

2
Vector/Views/RoomList/DirectoryRecentTableViewCell.m
View file

@ -51,7 +51,7 @@
{ {
self.titleLabel.text = NSLocalizedStringFromTable(@"directory_title", @"Vector", nil); self.titleLabel.text = NSLocalizedStringFromTable(@"directory_title", @"Vector", nil);
self.descriptionLabel.text = [NSString stringWithFormat:NSLocalizedStringFromTable(@"directory_description", @"Vector", nil), self.descriptionLabel.text = [NSString stringWithFormat:NSLocalizedStringFromTable(@"directory_description", @"Vector", nil),
publicRoomsDirectoryDataSource.filteredRooms.count]; publicRoomsDirectoryDataSource.rooms.count];
} }