Merge pull request #1408 from nextcloud/fix-reaction-crashes

Fix crashes when adding/removing reactions
nextcloud · Nov 3, 2023 · 0ec421f · 0ec421f
2 parents 24ac5c8 + 740306d
commit 0ec421f
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/NextcloudTalk/NCAPIController.m b/NextcloudTalk/NCAPIController.m
@@ -1704,7 +1704,13 @@ - (NSURLSessionDataTask *)addReaction:(NSString *)reaction toMessage:(NSInteger)
         NSDictionary *reactionsDict = [[responseObject objectForKey:@"ocs"] objectForKey:@"data"];
         if (block) {
             NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)task.response;
-            block(reactionsDict, nil, httpResponse.statusCode);
+
+            // When there are no elements, the server returns an empty array instead of an empty dictionary
+            if (![reactionsDict isKindOfClass:[NSDictionary class]]) {
+                block(@{}, nil, httpResponse.statusCode);
+            } else {
+                block(reactionsDict, nil, httpResponse.statusCode);
+            }
         }
     } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
         NSInteger statusCode = [self getResponseStatusCode:task.response];
@@ -1729,7 +1735,13 @@ - (NSURLSessionDataTask *)removeReaction:(NSString *)reaction fromMessage:(NSInt
         NSDictionary *reactionsDict = [[responseObject objectForKey:@"ocs"] objectForKey:@"data"];
         if (block) {
             NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)task.response;
-            block(reactionsDict, nil, httpResponse.statusCode);
+
+            // When there are no elements, the server returns an empty array instead of an empty dictionary
+            if (![reactionsDict isKindOfClass:[NSDictionary class]]) {
+                block(@{}, nil, httpResponse.statusCode);
+            } else {
+                block(reactionsDict, nil, httpResponse.statusCode);
+            }
         }
     } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
         NSInteger statusCode = [self getResponseStatusCode:task.response];