Merge pull request #573 from vector-im/vector_572

Unable to join federated rooms #572
This commit is contained in:
manuroe 2016-09-05 15:05:00 +02:00 committed by GitHub
commit 6a15fd1f3c

View file

@ -2374,9 +2374,9 @@
// We promote here join by room alias instead of room id when an alias is available.
NSString *roomIdOrAlias = roomPreviewData.roomId;
if (roomPreviewData.roomDataSource.room.state.aliases.count)
if (roomPreviewData.roomAliases.count)
{
roomIdOrAlias = roomPreviewData.roomDataSource.room.state.aliases.firstObject;
roomIdOrAlias = roomPreviewData.roomAliases.firstObject;
}
// Note in case of simple link to a room the signUrl param is nil