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

Merge branch 'develop' into ismail/5068_start_thread

Browse Source
This commit is contained in:
ismailgulek
2021-12-09 15:25:14 +03:00
parent 5dfb0fbbfe b8b0fe5545
commit 3a6e7a19e2
765 changed files with 94930 additions and 1211 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/CellData/RoomBubbleCellData.h
+3 -2
View File
@@ -14,7 +14,7 @@
limitations under the License.
*/
#import <MatrixKit/MatrixKit.h>
#import "MatrixKit.h"
extern NSString *const URLPreviewDidUpdateNotification;
@@ -31,7 +31,8 @@ typedef NS_ENUM(NSInteger, RoomBubbleCellDataTag)
RoomBubbleCellDataTagKeyVerificationConclusion,
RoomBubbleCellDataTagCall,
RoomBubbleCellDataTagGroupCall,
RoomBubbleCellDataTagRoomCreationIntro
RoomBubbleCellDataTagRoomCreationIntro,
RoomBubbleCellDataTagPoll
};
/**
Riot/Modules/Room/CellData/RoomBubbleCellData.m
+20 -1
View File
@@ -149,6 +149,15 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
// Show timestamps always on right
self.displayTimestampForSelectedComponentOnLeftWhenPossible = NO;
break;
}
case MXEventTypePollStart:
{
self.tag = RoomBubbleCellDataTagPoll;
self.collapsable = NO;
self.collapsed = NO;
break;
}
case MXEventTypeCustom:
{
@@ -259,6 +268,11 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
return NO;
}
if (self.tag == RoomBubbleCellDataTagPoll)
{
return NO;
}
return [super hasNoDisplay];
}
@@ -428,7 +442,9 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
{
__block NSInteger firstVisibleComponentIndex = NSNotFound;
if (self.attachment && self.bubbleComponents.count)
BOOL isPoll = (self.events.firstObject.eventType == MXEventTypePollStart);
if ((isPoll || self.attachment) && self.bubbleComponents.count)
{
firstVisibleComponentIndex = 0;
}
@@ -913,6 +929,9 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
case MXEventTypeCallReject:
shouldAddEvent = NO;
break;
case MXEventTypePollStart:
shouldAddEvent = NO;
break;
case MXEventTypeCustom:
{
if ([event.type isEqualToString:kWidgetMatrixEventTypeString]