Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(284)

Side by Side Diff: webrtc/examples/objc/AppRTCMobile/RTCIceServer+JSON.m

Issue 2627523004: Update ice server provider response format in iOS AppRTCMobile (Closed)
Patch Set: lower similarity and rebase Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/examples/objc/AppRTCMobile/RTCIceServer+JSON.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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";
14 static NSString const *kRTCICEServerPasswordKey = @"password";
15 static NSString const *kRTCICEServerUrisKey = @"uris";
16 static NSString const *kRTCICEServerUrlKey = @"urls";
17 static NSString const *kRTCICEServerCredentialKey = @"credential";
18
19 @implementation RTCIceServer (JSON) 13 @implementation RTCIceServer (JSON)
20 14
21 + (RTCIceServer *)serverFromJSONDictionary:(NSDictionary *)dictionary { 15 + (RTCIceServer *)serverFromJSONDictionary:(NSDictionary *)dictionary {
22 NSString *url = dictionary[kRTCICEServerUrlKey]; 16 NSArray *turnUrls = dictionary[@"urls"];
23 NSString *username = dictionary[kRTCICEServerUsernameKey]; 17 NSString *username = dictionary[@"username"] ?: @"";
24 NSString *credential = dictionary[kRTCICEServerCredentialKey]; 18 NSString *credential = dictionary[@"credential"] ?: @"";
25 username = username ? username : @""; 19 return [[RTCIceServer alloc] initWithURLStrings:turnUrls
26 credential = credential ? credential : @"";
27 return [[RTCIceServer alloc] initWithURLStrings:@[url]
28 username:username 20 username:username
29 credential:credential]; 21 credential:credential];
30 } 22 }
31 23
32 + (RTCIceServer *)serverFromCEODJSONDictionary:(NSDictionary *)dictionary {
33 NSString *username = dictionary[kRTCICEServerUsernameKey];
34 NSString *password = dictionary[kRTCICEServerPasswordKey];
35 NSArray *uris = dictionary[kRTCICEServerUrisKey];
36 RTCIceServer *server =
37 [[RTCIceServer alloc] initWithURLStrings:uris
38 username:username
39 credential:password];
40 return server;
41 }
42
43 @end 24 @end
OLDNEW
« no previous file with comments | « webrtc/examples/objc/AppRTCMobile/RTCIceServer+JSON.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698