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

Merge branch 'develop' into 'feature/5161_basis_update_element'

Browse Source 
# Conflicts:
#   Podfile
This commit is contained in:
Arnfried Griesert
2023-10-05 12:17:36 +00:00
parent 20ed25468c 0954a0bebd
commit c2d44580e4
11 changed files with 120 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/RoomViewController.m
+4 -2
View File
@@ -4108,8 +4108,10 @@ static CGSize kThreadListBarButtonItemImageSize;
[self cancelEventSelection];
}]];
}
if (!isJitsiCallEvent && !selectedEvent.isTimelinePollEvent &&
// bwi: #5160 disable quote function for new wysiwyg composer because it does not work
if (!([RoomViewController mainToolbarClass] == WysiwygInputToolbarView.class) &&
!isJitsiCallEvent && !selectedEvent.isTimelinePollEvent &&
selectedEvent.eventType != MXEventTypeBeaconInfo)
{
[self.eventMenuBuilder addItemWithType:EventMenuItemTypeQuote