Fix retain cycles in MXEventListener & MXRoomSummary

Relates to: element-hq/element-ios#5058 Signed-off-by: Johannes Marbach <[email protected]>
matrix-org · Mar 27, 2022 · a744830 · a744830
1 parent 358e2f0
commit a744830
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/MatrixSDK/Data/MXEventListener.h b/MatrixSDK/Data/MXEventListener.h
@@ -51,7 +51,7 @@ typedef void (^MXOnEvent)(MXEvent *event, MXTimelineDirection direction, id _Nul
  */
 - (void)notify:(MXEvent*)event direction:(MXTimelineDirection)direction andCustomObject:(nullable id)customObject;
 
-@property (nonatomic, readonly) id sender;
+@property (nonatomic, weak, readonly) id sender;
 @property (nonatomic, nullable, readonly) NSArray<MXEventTypeString>* eventTypes;
 @property (nonatomic, readonly) MXOnEvent listenerBlock;
 

diff --git a/MatrixSDK/Data/MXRoomSummary.m b/MatrixSDK/Data/MXRoomSummary.m
@@ -374,7 +374,9 @@ - (MXHTTPOperation *)fetchLastMessageWithMaxServerPaginationCount:(NSUInteger)ma
 
     // Process every message received by back pagination
     __block BOOL lastMessageUpdated = NO;
+    MXWeakify(timeline);
     [timeline listenToEvents:^(MXEvent *event, MXTimelineDirection direction, MXRoomState *eventState) {
+        MXStrongifyAndReturnIfNil(timeline);
         if (direction == MXTimelineDirectionBackwards
             && !lastMessageUpdated)
         {

diff --git a/changelog.d/5058.bugfix b/changelog.d/5058.bugfix
@@ -0,0 +1 @@
+MXEventListener/MXRoomSummary: Fix retain cycles