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

Merge branch 'ismail/5068_start_thread' into ismail/5117_thread_message_actions

Browse Source
This commit is contained in:
ismailgulek
2021-11-26 01:43:44 +03:00
parent 84cfd33700 fbe64bab10
commit 5b9ccbdaa0
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/RoomViewController.m
+3 -3
View File
@@ -3211,7 +3211,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
BOOL showThreadOption = RiotSettings.shared.enableThreads
&& !self.roomDataSource.threadId
&& !selectedEvent.threadIdentifier;
&& !selectedEvent.threadId;
if (showThreadOption && [self canCopyEvent:selectedEvent andCell:cell])
{
[currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionCopy]
@@ -4037,7 +4037,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
- (void)roomDataSource:(RoomDataSource *)roomDataSource didTapThread:(MXThread *)thread
{
[self openThreadWithId:thread.identifier];
[self openThreadWithId:thread.id];
}
#pragma mark - Segues
@@ -5971,7 +5971,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
BOOL showMoreOption = (event.isState && RiotSettings.shared.roomContextualMenuShowMoreOptionForStates)
|| (!event.isState && RiotSettings.shared.roomContextualMenuShowMoreOptionForMessages);
BOOL showThreadOption = RiotSettings.shared.enableThreads && !self.roomDataSource.threadId && !event.threadIdentifier;
BOOL showThreadOption = RiotSettings.shared.enableThreads && !self.roomDataSource.threadId && !event.threadId;
NSMutableArray<RoomContextualMenuItem*> *items = [NSMutableArray arrayWithCapacity:5];