Merge branch 'develop' into aringenbach/3526_user_pills

This commit is contained in:
aringenbach
2022-05-05 10:29:01 +02:00
78 changed files with 3439 additions and 225 deletions
@@ -1344,7 +1344,7 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
- (void)updateBeaconInfoSummaryWithEventId:(NSString *)eventId
{
MXBeaconInfoSummary *beaconInfoSummary = [self.mxSession.aggregations.beaconAggregations beaconInfoSummaryFor:eventId inRoomWithId:self.roomId];
id<MXBeaconInfoSummaryProtocol> beaconInfoSummary = [self.mxSession.aggregations.beaconAggregations beaconInfoSummaryFor:eventId inRoomWithId:self.roomId];
self.beaconInfoSummary = beaconInfoSummary;
}