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

RoomBubbleCellData: Handle atttributed text message without vert space.

Browse Source
This commit is contained in:
SBiOSoftWhare
2022-02-09 16:27:30 +01:00
parent f3d61dda24
commit 9c34d1e053
1 changed files with 39 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/CellData/RoomBubbleCellData.m
+39 -44
View File
@@ -38,9 +38,6 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
// Flags to "Show All" reactions for an event
@property(nonatomic) NSMutableSet<NSString* /* eventId */> *eventsToShowAllReactions;
@property (nonatomic, strong) NSAttributedString *currentAttributedTextMsg;
@property (nonatomic, strong) NSAttributedString *currentAttributedTextMsgWithoutVertSpace;
@end
@implementation RoomBubbleCellData
@@ -244,32 +241,18 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
- (NSAttributedString*)attributedTextMessage
{
@synchronized(bubbleComponents)
{
if (self.hasAttributedTextMessage && !attributedTextMessage.length)
{
// Attributed text message depends on the room read receipts which must be retrieved on the main thread to prevent us from race conditions.
// Check here the current thread, this is just a sanity check because the attributed text message
// is requested during the rendering step which takes place on the main thread.
if ([NSThread currentThread] != [NSThread mainThread])
{
MXLogDebug(@"[RoomBubbleCellData] attributedTextMessage called on wrong thread");
dispatch_sync(dispatch_get_main_queue(), ^{
[self buildAttributedString];
self.attributedTextMessage = [self getAppropriatedAttributedString];
});
}
else
{
[self buildAttributedString];
self.attributedTextMessage = [self getAppropriatedAttributedString];
}
}
}
[self buildAttributedStringIfNeeded];
return attributedTextMessage;
}
- (NSAttributedString*)attributedTextMessageWithoutPositioningSpace
{
[self buildAttributedStringIfNeeded];
return attributedTextMessageWithoutPositioningSpace;
}
- (BOOL)hasNoDisplay
{
if (self.tag == RoomBubbleCellDataTagKeyVerificationNoDisplay)
@@ -383,20 +366,6 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
[self setNeedsUpdateAdditionalContentHeight];
}
- (NSAttributedString*)getAppropriatedAttributedString
{
RoomTimelineConfiguration *timelineConfiguration = [RoomTimelineConfiguration shared];
if (timelineConfiguration.currentStyle.useVerticalWhiteSpaceForText)
{
return self.currentAttributedTextMsg;
}
else
{
return self.currentAttributedTextMsgWithoutVertSpace;
}
}
- (void)buildAttributedString
{
// CAUTION: This method must be called on the main thread.
@@ -404,8 +373,10 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
// Return the collapsed string only for cells series header
if (self.collapsed && self.collapsedAttributedTextMessage && self.nextCollapsableCellData)
{
self.currentAttributedTextMsg = super.collapsedAttributedTextMessage;
self.currentAttributedTextMsgWithoutVertSpace = super.collapsedAttributedTextMessage;
NSAttributedString *attributedString = super.collapsedAttributedTextMessage;
self.attributedTextMessage = attributedString;
self.attributedTextMessageWithoutPositioningSpace = attributedString;
return;
}
@@ -495,10 +466,34 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
{
[currentAttributedTextMsgWithoutVertSpace appendString:@" "];
}
self.attributedTextMessage = currentAttributedTextMsg;
self.currentAttributedTextMsg = currentAttributedTextMsg;
self.currentAttributedTextMsgWithoutVertSpace = currentAttributedTextMsgWithoutVertSpace;
self.attributedTextMessageWithoutPositioningSpace = currentAttributedTextMsgWithoutVertSpace;
}
- (void)buildAttributedStringIfNeeded
{
@synchronized(bubbleComponents)
{
if (self.hasAttributedTextMessage && !attributedTextMessage.length)
{
// Attributed text message depends on the room read receipts which must be retrieved on the main thread to prevent us from race conditions.
// Check here the current thread, this is just a sanity check because the attributed text message
// is requested during the rendering step which takes place on the main thread.
if ([NSThread currentThread] != [NSThread mainThread])
{
MXLogDebug(@"[RoomBubbleCellData] attributedTextMessage called on wrong thread");
dispatch_sync(dispatch_get_main_queue(), ^{
[self buildAttributedString];
});
}
else
{
[self buildAttributedString];
}
}
}
}
- (NSInteger)firstVisibleComponentIndex