Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-30 16:22:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1021 from vector-im/riot_990

Browse source 
Bug Fix - App crash: [__NSCFString replaceCharactersInRange:withStrin…
This commit is contained in:
giomfo 2017-02-08 10:20:21 +01:00 committed by GitHub
commit 18727216f5
1 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Vector/Model/Room/RoomBubbleCellData.m
View file

@ -115,6 +115,17 @@ static NSAttributedString *readReceiptVerticalWhitespace = nil;
MXKRoomBubbleComponent *component = [bubbleComponents firstObject];
NSAttributedString *componentString = component.attributedTextMessage;
#ifndef DEBUG
// Sanity check: we observed some app crashes due to a nil string in a component.
// According to the implementation this case should not happen because the components are removed as soon as their string is nil.
// We patch here this issue by adding some logs in order to investigate it in the future.
if (!componentString)
{
NSLog(@"[RoomBubbleCellData] WARNING: refreshAttributedTextMessage: unexpected empty component (0/%tu), %@", bubbleComponents.count, component.event.eventId);
componentString = [[NSAttributedString alloc] initWithString:@""];
}
#endif
NSInteger selectedComponentIndex = self.selectedComponentIndex;
NSInteger lastMessageIndex = self.containsLastMessage ? self.mostRecentComponentIndex : NSNotFound;
@ -150,13 +161,24 @@ static NSAttributedString *readReceiptVerticalWhitespace = nil;
[currentAttributedTextMsg appendAttributedString:[RoomBubbleCellData readReceiptVerticalWhitespace]];
}
for (NSInteger index = 1; index < bubbleComponents.count; index++)
for (NSUInteger index = 1; index < bubbleComponents.count; index++)
{
[currentAttributedTextMsg appendAttributedString:[MXKRoomBubbleCellDataWithAppendingMode messageSeparator]];
component = bubbleComponents[index];
componentString = component.attributedTextMessage;
#ifndef DEBUG
// Sanity check: we observed some app crashes due to a nil string in a component.
// According to the implementation this case should not happen because the components are removed as soon as their string is nil.
// We patch here this issue by adding some logs in order to investigate it in the future.
if (!componentString)
{
NSLog(@"[RoomBubbleCellData] refreshAttributedTextMessage: WARNING: unexpected empty component (%tu/%tu), %@", index, bubbleComponents.count, component.event.eventId);
componentString = [[NSAttributedString alloc] initWithString:@""];
}
#endif
// Check whether another component than this one is selected
if (selectedComponentIndex != NSNotFound && selectedComponentIndex != index)
{