Skip to content

Commit 0a92018

Browse files
authored
Merge pull request #6028 from vector-im/ismail/6023_crashes
Fix some crashes
2 parents 79db235 + 46b7681 commit 0a92018

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.m

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2387,17 +2387,18 @@ - (void)didReceiveReceiptEvent:(MXEvent *)receiptEvent roomState:(MXRoomState *)
23872387
{
23882388
NSMutableDictionary<NSString* /* eventId */, NSArray<MXReceiptData*> *> *updatedCellDataReadReceipts = [NSMutableDictionary dictionary];
23892389

2390-
for (NSString *eventId in cellData.readReceipts)
2390+
NSDictionary<NSString*, NSArray<MXReceiptData*>*> *readReceiptsCopy = [cellData.readReceipts mutableDeepCopy];
2391+
for (NSString *eventId in readReceiptsCopy)
23912392
{
2392-
for (MXReceiptData *receiptData in cellData.readReceipts[eventId])
2393+
for (MXReceiptData *receiptData in readReceiptsCopy[eventId])
23932394
{
23942395
for (NSString *senderId in readReceiptSenders)
23952396
{
23962397
if ([receiptData.userId isEqualToString:senderId])
23972398
{
23982399
if (!updatedCellDataReadReceipts[eventId])
23992400
{
2400-
updatedCellDataReadReceipts[eventId] = cellData.readReceipts[eventId];
2401+
updatedCellDataReadReceipts[eventId] = readReceiptsCopy[eventId];
24012402
}
24022403

24032404
NSPredicate *predicate = [NSPredicate predicateWithFormat:@"userId!=%@", receiptData.userId];

Riot/Modules/Room/RoomViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3647,7 +3647,7 @@ - (void)showAdditionalActionsMenuForEvent:(MXEvent*)selectedEvent inCell:(id<MXK
36473647
activityViewController = [self.delegate roomViewController:self locationShareActivityViewControllerForEvent:selectedEvent];
36483648
}
36493649

3650-
if (activityViewController == nil) {
3650+
if (activityViewController == nil && selectedComponent.textMessage) {
36513651
NSArray *activityItems = @[selectedComponent.textMessage];
36523652
activityViewController = [[UIActivityViewController alloc] initWithActivityItems:activityItems applicationActivities:nil];
36533653
}

Riot/Modules/Spaces/SpaceList/SpaceListItemViewData.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import Foundation
1919
/// SpaceListViewCell view data
2020
struct SpaceListItemViewData {
2121
let spaceId: String
22-
let title: String
22+
let title: String?
2323
let avatarViewData: AvatarViewDataProtocol
2424
let isInvite: Bool
2525
let notificationCount: UInt

changelog.d/6023.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Element: Fix some crashes after 1.8.10.

0 commit comments

Comments
 (0)