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

Merge branch 'develop' into gil/5225_invite_to_space_in_room_landing

Browse Source 
# Conflicts:
#	Riot/Modules/Room/RoomCoordinator.swift
This commit is contained in:
Gil Eluard
2021-12-13 15:09:40 +01:00
parent 1bb99ac215 3de1a8525c
commit a067a06071
52 changed files with 1746 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/RoomViewController.h
+6
View File
@@ -188,6 +188,12 @@ handleUniversalLinkWithParameters:(UniversalLinkParameters*)parameters;
*/
- (void)roomViewControllerDidRequestPollCreationFormPresentation:(RoomViewController *)roomViewController;
- (BOOL)roomViewController:(RoomViewController *)roomViewController
canEndPollWithEventIdentifier:(NSString *)eventIdentifier;
- (void)roomViewController:(RoomViewController *)roomViewController
endPollWithEventIdentifier:(NSString *)eventIdentifier;
@end
NS_ASSUME_NONNULL_END