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

MESSENGER-4390 fix private room sharing

Browse Source
This commit is contained in:
JanNiklas Grabowski
2023-06-15 10:21:50 +02:00
parent 33b943d31f
commit 6bf886499d
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/RoomViewController.m
+6 -2
View File
@@ -4132,7 +4132,9 @@ static CGSize kThreadListBarButtonItemImageSize;
if (selectedEvent.sentState == MXEventSentStateSent &&
!selectedEvent.isTimelinePollEvent &&
// Forwarding of live-location shares still to be implemented
selectedEvent.eventType != MXEventTypeBeaconInfo)
selectedEvent.eventType != MXEventTypeBeaconInfo &&
// bwi #4390: remove forwarding action if room is private
![self.roomDataSource.room.summary.joinRule isEqualToString: kMXRoomJoinRuleInvite])
{
[self.eventMenuBuilder addItemWithType:EventMenuItemTypeForward
action:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionForward]
@@ -4184,7 +4186,9 @@ static CGSize kThreadListBarButtonItemImageSize;
if (selectedEvent.sentState == MXEventSentStateSent && (attachment.type == MXKAttachmentTypeFile ||
attachment.type == MXKAttachmentTypeImage ||
attachment.type == MXKAttachmentTypeVideo ||
attachment.type == MXKAttachmentTypeVoiceMessage)) {
attachment.type == MXKAttachmentTypeVoiceMessage) &&
// bwi #4390: remove forwarding action if room is private
![self.roomDataSource.room.summary.joinRule isEqualToString: kMXRoomJoinRuleInvite]) {
[self.eventMenuBuilder addItemWithType:EventMenuItemTypeForward
action:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionForward]
style:UIAlertActionStyleDefault