Merge remote-tracking branch 'upstream/develop' into wiedmer_proximity_sensor

This commit is contained in:
Simon Wiedmer
2022-02-03 16:52:37 +01:00
422 changed files with 16687 additions and 2054 deletions
@@ -1197,7 +1197,7 @@ static const CGFloat kLocalPreviewMargin = 20;
if (roomListener && mxCall.room)
{
MXWeakify(self);
[mxCall.room liveTimeline:^(MXEventTimeline *liveTimeline) {
[mxCall.room liveTimeline:^(id<MXEventTimeline> liveTimeline) {
MXStrongifyAndReturnIfNil(self);
[liveTimeline removeListener:self->roomListener];