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

Merge branch 'release/v1.26.0' into develop

Browse Source
This commit is contained in:
Frank Rotermund
2022-10-31 19:37:38 +01:00
parent 1734e0ef0f 2802fc76c4
commit f021779932
4 changed files with 53 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/RoomViewController.m
+1 -1
View File
@@ -4331,7 +4331,7 @@ static CGSize kThreadListBarButtonItemImageSize;
}]];
}
if (!isJitsiCallEvent && self.roomDataSource.room.summary.isEncrypted)
if (!isJitsiCallEvent && self.roomDataSource.room.summary.isEncrypted && BuildSettings.roomContextualMenuShowEncryptionOption)
{
[self.eventMenuBuilder addItemWithType:EventMenuItemTypeViewEncryption
action:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionViewEncryption]