Pass around the candidate removals events in IOS clients

webrtc/examples/objc/AppRTCDemo/ARDSignalingMessage.m

 /*
  *  Copyright 2014 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #import "ARDSignalingMessage.h"
 
 #import "WebRTC/RTCLogging.h"
 
 #import "ARDUtilities.h"
 #import "RTCIceCandidate+JSON.h"
 #import "RTCSessionDescription+JSON.h"
 
 static NSString const *kARDSignalingMessageTypeKey = @"type";
+static NSString const *kARDSignalingMessageCandidatesKey = @"candidates";
 
 @implementation ARDSignalingMessage
 
 @synthesize type = _type;
 
 - (instancetype)initWithType:(ARDSignalingMessageType)type {
   if (self = [super init]) {
     _type = type;
   }
   return self;
@@ skipping 10 matching lines @@
     RTCLogError(@"Error parsing signaling message JSON.");
     return nil;
   }
 
   NSString *typeString = values[kARDSignalingMessageTypeKey];
   ARDSignalingMessage *message = nil;
   if ([typeString isEqualToString:@"candidate"]) {
     RTCIceCandidate *candidate =
         [RTCIceCandidate candidateFromJSONDictionary:values];
     message = [[ARDICECandidateMessage alloc] initWithCandidate:candidate];
+  } else if ([typeString isEqualToString:@"remove-candidates"]) {
+    RTCLogInfo(@"Received remove-candidates message");
+    NSArray *jsonCandidates = values[kARDSignalingMessageCandidatesKey];
+    NSMutableArray<RTCIceCandidate *> *candidates =
+        [NSMutableArray arrayWithCapacity:[jsonCandidates count]];

[tkchin_webrtc, 2016/05/16 20:48:58]

dot syntax for properties. jsonCandidates.count

[honghaiz3, 2016/05/17 00:46:53]

Done.

+    for (NSDictionary *jsonCandidate in jsonCandidates) {
+      RTCIceCandidate *candidate =
+          [RTCIceCandidate candidateFromJSONDictionary:jsonCandidate];
+      [candidates addObject:candidate];
+    }
+    message = [[ARDICECandidatesRemovalMessage alloc]
+                  initWithRemovedCandidates:candidates];

[tkchin_webrtc, 2016/05/16 20:48:58]

nit: Just move the entire thing to next line if it fits instead of doing odd
break

[honghaiz3, 2016/05/17 00:46:53]

It does not fit even if I move the entire thing to the next line. 
Hope this have used 100-column limit. 

   } else if ([typeString isEqualToString:@"offer"] ||
              [typeString isEqualToString:@"answer"]) {
     RTCSessionDescription *description =
         [RTCSessionDescription descriptionFromJSONDictionary:values];
     message =
         [[ARDSessionDescriptionMessage alloc] initWithDescription:description];
   } else if ([typeString isEqualToString:@"bye"]) {
     message = [[ARDByeMessage alloc] init];
   } else {
     RTCLogError(@"Unexpected type: %@", typeString);
@@ skipping 17 matching lines @@
   }
   return self;
 }
 
 - (NSData *)JSONData {
   return [_candidate JSONData];
 }
 
 @end
 
+@implementation ARDICECandidatesRemovalMessage
+
+@synthesize candidates = _candidates;
+
+- (instancetype)initWithRemovedCandidates:(
+      NSArray<RTCIceCandidate *> *)candidates {

[tkchin_webrtc, 2016/05/16 20:48:58]

nit: indent 4 from leftmost margin (so remove two spaces on left here)

[honghaiz3, 2016/05/17 00:46:53]

Done.

+  if (self = [super initWithType:kARDSignalingMessageTypeCandidatesRemoval]) {

[tkchin_webrtc, 2016/05/16 20:48:58]

May be worth tossing an assertion here. NSParameterAssert(candidates.count)

[honghaiz3, 2016/05/17 00:46:53]

Done.

+    _candidates = candidates;
+  }
+  return self;
+}
+
+- (NSData *)JSONData {
+  NSMutableArray *jsonCandidates =
+      [NSMutableArray arrayWithCapacity:[_candidates count]];

[tkchin_webrtc, 2016/05/16 20:48:58]

dot syntax for count

[honghaiz3, 2016/05/17 00:46:52]

Done.

+  for (const RTCIceCandidate *candidate in _candidates) {

[tkchin_webrtc, 2016/05/16 20:48:58]

const qualifier not necessary

[honghaiz3, 2016/05/17 00:46:52]

Done.

+    NSDictionary *jsonCandidate = [candidate JSONDictionary];
+    [jsonCandidates addObject:jsonCandidate];
+  }
+  NSDictionary * json = @{

[tkchin_webrtc, 2016/05/16 20:48:58]

*json

[honghaiz3, 2016/05/17 00:46:53]

Done.

+    kARDSignalingMessageTypeKey : @"remove-candidates",
+    kARDSignalingMessageCandidatesKey : jsonCandidates
+  };
+  NSError *error = nil;
+  NSData *data =
+      [NSJSONSerialization dataWithJSONObject:json
+                                      options:NSJSONWritingPrettyPrinted
+                                        error:&error];
+  if (error) {
+    RTCLogError(@"Error serializing JSON: %@", error);
+    return nil;
+  }
+  return data;
+}
+
+@end
+
 @implementation ARDSessionDescriptionMessage
 
 @synthesize sessionDescription = _sessionDescription;
 
 - (instancetype)initWithDescription:(RTCSessionDescription *)description {
   ARDSignalingMessageType messageType = kARDSignalingMessageTypeOffer;
   RTCSdpType sdpType = description.type;
   switch (sdpType) {
     case RTCSdpTypeOffer:
       messageType = kARDSignalingMessageTypeOffer;
@@ skipping 27 matching lines @@
 - (NSData *)JSONData {
   NSDictionary *message = @{
     @"type": @"bye"
   };
   return [NSJSONSerialization dataWithJSONObject:message
                                          options:NSJSONWritingPrettyPrinted
                                            error:NULL];
 }
 
 @end