| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2014 The WebRTC Project Authors. All rights reserved. | 2 * Copyright 2014 The WebRTC Project Authors. All rights reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| 11 #import "RTCICEServer+JSON.h" | 11 #import "RTCIceServer+JSON.h" |
| 12 | 12 |
| 13 static NSString const *kRTCICEServerUsernameKey = @"username"; | 13 static NSString const *kRTCICEServerUsernameKey = @"username"; |
| 14 static NSString const *kRTCICEServerPasswordKey = @"password"; | 14 static NSString const *kRTCICEServerPasswordKey = @"password"; |
| 15 static NSString const *kRTCICEServerUrisKey = @"uris"; | 15 static NSString const *kRTCICEServerUrisKey = @"uris"; |
| 16 static NSString const *kRTCICEServerUrlKey = @"urls"; | 16 static NSString const *kRTCICEServerUrlKey = @"urls"; |
| 17 static NSString const *kRTCICEServerCredentialKey = @"credential"; | 17 static NSString const *kRTCICEServerCredentialKey = @"credential"; |
| 18 | 18 |
| 19 @implementation RTCICEServer (JSON) | 19 @implementation RTCIceServer (JSON) |
| 20 | 20 |
| 21 + (RTCICEServer *)serverFromJSONDictionary:(NSDictionary *)dictionary { | 21 + (RTCIceServer *)serverFromJSONDictionary:(NSDictionary *)dictionary { |
| 22 NSString *url = dictionary[kRTCICEServerUrlKey]; | 22 NSString *url = dictionary[kRTCICEServerUrlKey]; |
| 23 NSString *username = dictionary[kRTCICEServerUsernameKey]; | 23 NSString *username = dictionary[kRTCICEServerUsernameKey]; |
| 24 NSString *credential = dictionary[kRTCICEServerCredentialKey]; | 24 NSString *credential = dictionary[kRTCICEServerCredentialKey]; |
| 25 username = username ? username : @""; | 25 username = username ? username : @""; |
| 26 credential = credential ? credential : @""; | 26 credential = credential ? credential : @""; |
| 27 return [[RTCICEServer alloc] initWithURI:[NSURL URLWithString:url] | 27 return [[RTCIceServer alloc] initWithURLStrings:@[url] |
| 28 username:username | 28 username:username |
| 29 password:credential]; | 29 credential:credential]; |
| 30 } | 30 } |
| 31 | 31 |
| 32 + (NSArray *)serversFromCEODJSONDictionary:(NSDictionary *)dictionary { | 32 + (RTCIceServer *)serverFromCEODJSONDictionary:(NSDictionary *)dictionary { |
| 33 NSString *username = dictionary[kRTCICEServerUsernameKey]; | 33 NSString *username = dictionary[kRTCICEServerUsernameKey]; |
| 34 NSString *password = dictionary[kRTCICEServerPasswordKey]; | 34 NSString *password = dictionary[kRTCICEServerPasswordKey]; |
| 35 NSArray *uris = dictionary[kRTCICEServerUrisKey]; | 35 NSArray *uris = dictionary[kRTCICEServerUrisKey]; |
| 36 NSMutableArray *servers = [NSMutableArray arrayWithCapacity:uris.count]; | 36 RTCIceServer *server = |
| 37 for (NSString *uri in uris) { | 37 [[RTCIceServer alloc] initWithURLStrings:uris |
| 38 RTCICEServer *server = | 38 username:username |
| 39 [[RTCICEServer alloc] initWithURI:[NSURL URLWithString:uri] | 39 credential:password]; |
| 40 username:username | 40 return server; |
| 41 password:password]; | |
| 42 [servers addObject:server]; | |
| 43 } | |
| 44 return servers; | |
| 45 } | 41 } |
| 46 | 42 |
| 47 @end | 43 @end |
| OLD | NEW |