MXRoomSummary: Fix infinite loop when using MXNoStore

This issue slowed down integration tests a lot.
matrix-org · Apr 14, 2020 · b4d5ba7 · b4d5ba7
1 parent 04c2611
commit b4d5ba7
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/MatrixSDK/Data/MXRoomSummary.m b/MatrixSDK/Data/MXRoomSummary.m
@@ -375,10 +375,15 @@ - (MXHTTPOperation *)fetchLastMessage:(void (^)(void))complete failure:(void (^)
                 newOperation = [liveTimeline paginate:messagesToPaginate direction:MXTimelineDirectionBackwards onlyFromStore:NO complete:^{
 
                     // Received messages have been stored in the store. We can make a new loop
-                    [self fetchLastMessage:complete failure:failure
-                        lastEventIdChecked:lastEventIdCheckedInBlock
-                                 operation:(operation ? operation : newOperation)
-                                    commit:commit];
+                    // XXX: This is only true for a permanent storage. Only MXNoStore is not permanent.
+                    // MXNoStore is only used for tests. We can skip it here.
+                    if (self.mxSession.store.isPermanent)
+                    {
+                        [self fetchLastMessage:complete failure:failure
+                            lastEventIdChecked:lastEventIdCheckedInBlock
+                                     operation:(operation ? operation : newOperation)
+                                        commit:commit];
+                    }
 
                 } failure:failure];