Update iOS AppRTCDemo to use the updated Objective-C API.

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 "RTCLogging.h"
+#import "webrtc/base/objc/RTCLogging.h"
 
 #import "ARDUtilities.h"
-#import "RTCICECandidate+JSON.h"
+#import "RTCIceCandidate+JSON.h"
 #import "RTCSessionDescription+JSON.h"
 
 static NSString const *kARDSignalingMessageTypeKey = @"type";
 
 @implementation ARDSignalingMessage
 
 @synthesize type = _type;
 
 - (instancetype)initWithType:(ARDSignalingMessageType)type {
   if (self = [super init]) {
@@ skipping 10 matching lines @@
 + (ARDSignalingMessage *)messageFromJSONString:(NSString *)jsonString {
   NSDictionary *values = [NSDictionary dictionaryWithJSONString:jsonString];
   if (!values) {
     RTCLogError(@"Error parsing signaling message JSON.");
     return nil;
   }
 
   NSString *typeString = values[kARDSignalingMessageTypeKey];
   ARDSignalingMessage *message = nil;
   if ([typeString isEqualToString:@"candidate"]) {
-    RTCICECandidate *candidate =
-        [RTCICECandidate candidateFromJSONDictionary:values];
+    RTCIceCandidate *candidate =
+        [RTCIceCandidate candidateFromJSONDictionary:values];
     message = [[ARDICECandidateMessage alloc] initWithCandidate:candidate];
   } 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);
   }
   return message;
 }
 
 - (NSData *)JSONData {
   return nil;
 }
 
 @end
 
 @implementation ARDICECandidateMessage
 
 @synthesize candidate = _candidate;
 
-- (instancetype)initWithCandidate:(RTCICECandidate *)candidate {
+- (instancetype)initWithCandidate:(RTCIceCandidate *)candidate {
   if (self = [super initWithType:kARDSignalingMessageTypeCandidate]) {
     _candidate = candidate;
   }
   return self;
 }
 
 - (NSData *)JSONData {
   return [_candidate JSONData];
 }
 
 @end
 
 @implementation ARDSessionDescriptionMessage
 
 @synthesize sessionDescription = _sessionDescription;
 
 - (instancetype)initWithDescription:(RTCSessionDescription *)description {
-  ARDSignalingMessageType type = kARDSignalingMessageTypeOffer;
-  NSString *typeString = description.type;
-  if ([typeString isEqualToString:@"offer"]) {
-    type = kARDSignalingMessageTypeOffer;
-  } else if ([typeString isEqualToString:@"answer"]) {
-    type = kARDSignalingMessageTypeAnswer;
-  } else {
-    NSAssert(NO, @"Unexpected type: %@", typeString);
+  ARDSignalingMessageType messageType = kARDSignalingMessageTypeOffer;
+  RTCSdpType sdpType = description.type;
+  switch (sdpType) {
+    case RTCSdpTypeOffer:
+      messageType = kARDSignalingMessageTypeOffer;
+    case RTCSdpTypeAnswer:
+      messageType = kARDSignalingMessageTypeAnswer;
+    case RTCSdpTypePrAnswer:
+      NSAssert(NO, @"Unexpected type: %@",
+          [RTCSessionDescription stringForType:sdpType]);
   }
-  if (self = [super initWithType:type]) {
+  if (self = [super initWithType:messageType]) {
     _sessionDescription = description;
   }
   return self;
 }
 
 - (NSData *)JSONData {
   return [_sessionDescription JSONData];
 }
 
 @end
 
 @implementation ARDByeMessage
 
 - (instancetype)init {
   return [super initWithType:kARDSignalingMessageTypeBye];
 }
 
 - (NSData *)JSONData {
   NSDictionary *message = @{
     @"type": @"bye"
   };
   return [NSJSONSerialization dataWithJSONObject:message
                                          options:NSJSONWritingPrettyPrinted
                                            error:NULL];
 }
 
 @end