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

Merge branch 'feature/4390_fix_forwarding_for_private_rooms' into 'develop'

Browse Source 
MESSENGER-4390 fix message forwarding and disable permalinks for messages in private rooms

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!152
This commit is contained in:
Frank Rotermund
2023-06-26 11:09:37 +00:00
parent 8f45ada0f0 9e381a804f
commit abd7f01602
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Riot/Modules/Room/RoomViewController.m
View File

@@ -4132,9 +4132,7 @@ static CGSize kThreadListBarButtonItemImageSize;
if (selectedEvent.sentState == MXEventSentStateSent &&
!selectedEvent.isTimelinePollEvent &&
// Forwarding of live-location shares still to be implemented
selectedEvent.eventType != MXEventTypeBeaconInfo &&
// bwi #4390: remove forwarding action if room is private
![self.roomDataSource.room.summary.joinRule isEqualToString: kMXRoomJoinRuleInvite])
selectedEvent.eventType != MXEventTypeBeaconInfo)
{
[self.eventMenuBuilder addItemWithType:EventMenuItemTypeForward
action:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionForward]
@@ -4186,9 +4184,7 @@ static CGSize kThreadListBarButtonItemImageSize;
if (selectedEvent.sentState == MXEventSentStateSent && (attachment.type == MXKAttachmentTypeFile ||
attachment.type == MXKAttachmentTypeImage ||
attachment.type == MXKAttachmentTypeVideo ||
attachment.type == MXKAttachmentTypeVoiceMessage) &&
// bwi #4390: remove forwarding action if room is private
![self.roomDataSource.room.summary.joinRule isEqualToString: kMXRoomJoinRuleInvite]) {
attachment.type == MXKAttachmentTypeVoiceMessage)) {
[self.eventMenuBuilder addItemWithType:EventMenuItemTypeForward
action:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionForward]
style:UIAlertActionStyleDefault
@@ -4346,7 +4342,9 @@ static CGSize kThreadListBarButtonItemImageSize;
}
}
if (BWIBuildSettings.shared.messageDetailsAllowPermalink && !(self.roomDataSource.room.isDirect || self.roomDataSource.room.isPersonalNotesRoom || self.roomDataSource.room.summary.membership == MXMembershipInvite))
if (BWIBuildSettings.shared.messageDetailsAllowPermalink && !(self.roomDataSource.room.isDirect || self.roomDataSource.room.isPersonalNotesRoom ||
// bwi #4390: remove permalink action if room is private
[self.roomDataSource.room.summary.joinRule isEqualToString: kMXRoomJoinRuleInvite]))
{
[self.eventMenuBuilder addItemWithType:EventMenuItemTypePermalink
action:[UIAlertAction actionWithTitle:[BWIL10n roomEventActionPermalink]