Merge pull request #1784 from matrix-org/langleyd/7551_fix_threads_em…

…pty_state Fix threads empty state: Allow empty array for chunk in MXAggregationPaginatedResponse
matrix-org · May 19, 2023 · 258bdb8 · 258bdb8
2 parents ddb0682 + 3287d5c
commit 258bdb8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/MatrixSDK/JSONModels/Aggregations/MXAggregationPaginatedResponse.m b/MatrixSDK/JSONModels/Aggregations/MXAggregationPaginatedResponse.m
@@ -35,12 +35,20 @@ + (instancetype)modelFromJSON:(NSDictionary *)JSONDictionary
  MXAggregationPaginatedResponse *paginatedResponse;
 
  NSArray<MXEvent*> *chunk;
- MXJSONModelSetMXJSONModelArray(chunk, MXEvent.class, JSONDictionary[@"chunk"])
-
+ NSArray *chunkJson = JSONDictionary[@"chunk"];
+
+ // 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([chunkJson isKindOfClass:NSArray.class] && chunkJson.count == 0)
+ {
+ chunk = @[];
+ } else {
+ MXJSONModelSetMXJSONModelArray(chunk, MXEvent.class, chunkJson)
+ }
+
  if (chunk)
  {
  paginatedResponse = [MXAggregationPaginatedResponse new];
-
  paginatedResponse->_chunk = chunk;
  MXJSONModelSetString(paginatedResponse->_nextBatch, JSONDictionary[@"next_batch"])
 

diff --git a/changelog.d/7551.bugfix b/changelog.d/7551.bugfix
@@ -0,0 +1 @@
+Fixes a bug where an unhelpful message is shown rather than the threads empty state.