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

Merge branch 'element_4014' into element_4013

Browse Source 
# Conflicts:
#	Riot/Modules/Room/DataSources/RoomDataSource.m
This commit is contained in:
Gil Eluard
2021-03-09 13:22:13 +01:00
parent 22a3cc87ec 230498192a
commit 84d49f1344
19 changed files with 302 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
View File

@@ -290,6 +290,7 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
if (!_publicRoomsDirectoryDataSource)
{
_publicRoomsDirectoryDataSource = [[PublicRoomsDirectoryDataSource alloc] initWithMatrixSession:mxSession];
_publicRoomsDirectoryDataSource.showNSFWRooms = RiotSettings.shared.showNSFWPublicRooms;
_publicRoomsDirectoryDataSource.delegate = self;
}