this probably makes more sense

Topheee · May 18, 2023 · 3287d5c · 3287d5c
1 parent e1c9e5a
commit 3287d5c
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/MatrixSDK/JSONModels/Aggregations/MXAggregationPaginatedResponse.m b/MatrixSDK/JSONModels/Aggregations/MXAggregationPaginatedResponse.m
@@ -36,12 +36,14 @@ + (instancetype)modelFromJSON:(NSDictionary *)JSONDictionary
 
     NSArray<MXEvent*> *chunk;
     NSArray *chunkJson = JSONDictionary[@"chunk"];
-    MXJSONModelSetMXJSONModelArray(chunk, MXEvent.class, chunkJson)
+
     // For some reason modelsFromJSON returns nil if you pass it an empty array.
     // In this case we want an empty array or we get an error.
-    if(!chunk && [chunkJson isKindOfClass:NSArray.class])
+    if([chunkJson isKindOfClass:NSArray.class] && chunkJson.count == 0)
     {
         chunk = @[];
+    } else {
+        MXJSONModelSetMXJSONModelArray(chunk, MXEvent.class, chunkJson)
     }
 
     if (chunk)