felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-21 00:52:43 +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-19 14:35:11 +03:00
parent ca55fc047a c312ea13c2
commit 768f68ab2a
5 changed files with 43 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/RoomViewController.m
+1 -10
View File
@@ -4636,15 +4636,6 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
{
[self declineRoomInvitation];
}
else if ([titleView isKindOfClass:ThreadRoomTitleView.class])
{
ThreadRoomTitleView *threadTitleView = (ThreadRoomTitleView *)titleView;
if (tappedView == threadTitleView.closeButton)
{
// dismiss self
[self dismissViewControllerAnimated:YES completion:nil];
}
}
}
- (void)declineRoomInvitation
@@ -6338,7 +6329,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
previewData:nil];
self.threadBridgePresenter = [[RoomCoordinatorBridgePresenter alloc] initWithParameters:parameters];
self.threadBridgePresenter.delegate = self;
[self.threadBridgePresenter presentFrom:self animated:YES];
[self.threadBridgePresenter pushFrom:self.navigationController animated:YES];
}
#pragma mark - RoomContextualMenuViewControllerDelegate