OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2015 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2015 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.h" | 11 #import "RTCIceServer.h" |
12 | 12 |
13 #import "webrtc/api/objc/RTCIceServer+Private.h" | 13 #import "webrtc/api/objc/RTCIceServer+Private.h" |
14 #import "webrtc/base/objc/NSString+StdString.h" | 14 #import "webrtc/base/objc/NSString+StdString.h" |
15 | 15 |
16 @implementation RTCIceServer | 16 @implementation RTCIceServer |
| 17 // TODO(hjon): Update nullability types. See http://crbug/webrtc/5592 |
17 | 18 |
18 @synthesize urlStrings = _urlStrings; | 19 @synthesize urlStrings = _urlStrings; |
19 @synthesize username = _username; | 20 @synthesize username = _username; |
20 @synthesize credential = _credential; | 21 @synthesize credential = _credential; |
21 | 22 |
22 - (instancetype)initWithURLStrings:(NSArray<NSString *> *)urlStrings { | 23 - (instancetype)initWithURLStrings:(NSArray *)urlStrings { |
| 24 // - (instancetype)initWithURLStrings:(NSArray<NSString *> *)urlStrings { |
23 NSParameterAssert(urlStrings.count); | 25 NSParameterAssert(urlStrings.count); |
24 return [self initWithURLStrings:urlStrings | 26 return [self initWithURLStrings:urlStrings |
25 username:nil | 27 username:nil |
26 credential:nil]; | 28 credential:nil]; |
27 } | 29 } |
28 | 30 |
29 - (instancetype)initWithURLStrings:(NSArray<NSString *> *)urlStrings | 31 - (instancetype)initWithURLStrings:(NSArray *)urlStrings |
| 32 // - (instancetype)initWithURLStrings:(NSArray<NSString *> *)urlStrings |
30 username:(NSString *)username | 33 username:(NSString *)username |
31 credential:(NSString *)credential { | 34 credential:(NSString *)credential { |
32 NSParameterAssert(urlStrings.count); | 35 NSParameterAssert(urlStrings.count); |
33 if (self = [super init]) { | 36 if (self = [super init]) { |
34 _urlStrings = [[NSArray alloc] initWithArray:urlStrings copyItems:YES]; | 37 _urlStrings = [[NSArray alloc] initWithArray:urlStrings copyItems:YES]; |
35 _username = [username copy]; | 38 _username = [username copy]; |
36 _credential = [credential copy]; | 39 _credential = [credential copy]; |
37 } | 40 } |
38 return self; | 41 return self; |
39 } | 42 } |
(...skipping 30 matching lines...) Expand all Loading... |
70 } | 73 } |
71 NSString *username = [NSString stringForStdString:nativeServer.username]; | 74 NSString *username = [NSString stringForStdString:nativeServer.username]; |
72 NSString *credential = [NSString stringForStdString:nativeServer.password]; | 75 NSString *credential = [NSString stringForStdString:nativeServer.password]; |
73 self = [self initWithURLStrings:urls | 76 self = [self initWithURLStrings:urls |
74 username:username | 77 username:username |
75 credential:credential]; | 78 credential:credential]; |
76 return self; | 79 return self; |
77 } | 80 } |
78 | 81 |
79 @end | 82 @end |
OLD | NEW |