Make MXRoomAccountDataUpdater and MXRoomSummaryUpdater map tables weak.

Author: pixlwave

MatrixSDK/Data/MXRoom.m

@@ -546,6 +546,7 @@ - (MXHTTPOperation*)sendEventOfType:(MXEventTypeString)eventTypeString
 
     MXWeakify(self);
     void(^onSuccess)(NSString *) = ^(NSString *eventId) {
+        MXStrongifyAndReturnIfNil(self);
 
         if (event)
         {
@@ -559,7 +560,6 @@ - (MXHTTPOperation*)sendEventOfType:(MXEventTypeString)eventTypeString
             // Update stored echo.
             // We keep this event here as local echo to handle correctly outgoing messages from multiple devices.
             // The echo will be removed when the corresponding event will come through the server sync.
-            MXStrongifyAndReturnIfNil(self);
             [self updateOutgoingMessage:localEventId withOutgoingMessage:event];
         }
 
@@ -568,11 +568,11 @@ - (MXHTTPOperation*)sendEventOfType:(MXEventTypeString)eventTypeString
             success(eventId);
         }
 
-        MXStrongifyAndReturnIfNil(self);
         [self handleNextOperationAfter:roomOperation];
     };
 
     void(^onFailure)(NSError *) = ^(NSError *error) {
+        MXStrongifyAndReturnIfNil(self);
 
         if (event)
         {
@@ -581,7 +581,6 @@ - (MXHTTPOperation*)sendEventOfType:(MXEventTypeString)eventTypeString
             event.sentState = MXEventSentStateFailed;
 
             // Update the stored echo.
-            MXStrongifyAndReturnIfNil(self);
             [self updateOutgoingMessage:event.eventId withOutgoingMessage:event];
         }
 
@@ -590,7 +589,6 @@ - (MXHTTPOperation*)sendEventOfType:(MXEventTypeString)eventTypeString
             failure(error);
         }
 
-        MXStrongifyAndReturnIfNil(self);
         [self handleNextOperationAfter:roomOperation];
     };
 
@@ -1039,13 +1037,13 @@ - (MXHTTPOperation*)sendImage:(NSData*)imageData
 
     MXWeakify(self);
     void(^onSuccess)(NSString *) = ^(NSString *eventId) {
+        MXStrongifyAndReturnIfNil(self);
 
         if (success)
         {
             success(eventId);
         }
 
-        MXStrongifyAndReturnIfNil(self);
         [self handleNextOperationAfter:roomOperation];
     };
 

MatrixSDK/Data/MXRoomAccountDataUpdater.m

@@ -28,7 +28,9 @@ + (instancetype)roomAccountDataUpdaterForSession:(MXSession *)mxSession
 
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
-        updaterPerSession = [[NSMapTable alloc] init];
+        updaterPerSession = [[NSMapTable alloc] initWithKeyOptions:NSPointerFunctionsWeakMemory
+                                                      valueOptions:NSPointerFunctionsWeakMemory
+                                                          capacity:1];
     });
 
     MXRoomAccountDataUpdater *updater = [updaterPerSession objectForKey:mxSession];

MatrixSDK/Data/MXRoomSummaryUpdater.m

@@ -44,7 +44,9 @@ + (instancetype)roomSummaryUpdaterForSession:(MXSession *)mxSession
 
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
-        updaterPerSession = [[NSMapTable alloc] init];
+        updaterPerSession = [[NSMapTable alloc] initWithKeyOptions:NSPointerFunctionsWeakMemory
+                                                      valueOptions:NSPointerFunctionsWeakMemory
+                                                          capacity:1];
     });
 
     MXRoomSummaryUpdater *updater = [updaterPerSession objectForKey:mxSession];

MatrixSDK/MXSession.h

@@ -1084,12 +1084,16 @@ typedef void (^MXOnBackgroundSyncFail)(NSError *error);
 /**
  Delegate for updating room summaries.
  By default, it is the one returned by [MXRoomSummaryUpdater roomSummaryUpdaterForSession:].
+ 
+ This property is strong as the only other reference to the delegate is a weak ref in the updaterPerSession table.
  */
 @property id<MXRoomSummaryUpdating> roomSummaryUpdateDelegate;
 
 /**
  Delegate for updating room account data.
  By default, it is the one returned by [MXRoomAccountDataUpdater roomAccountDataUpdaterForSession:].
+ 
+ This property is strong as the only other reference to the delegate is a weak ref in the updaterPerSession table.
  */
 @property id<MXRoomAccountDataUpdating> roomAccountDataUpdateDelegate;
 

changelog.d/5805.bugfix

@@ -0,0 +1 @@
+MXRoom: Fix retain cycles, in particular between MXRoomOperation and its block.