no message

This commit is contained in:
Peter
2017-06-24 21:33:46 +03:00
parent 8427b8b889
commit 015da8dfd6
3 changed files with 8 additions and 4 deletions

View File

@@ -79,7 +79,7 @@
- (void)enumerateAddressSetsForDatacenters:(void (^)(NSInteger datacenterId, MTDatacenterAddressSet *addressSet, BOOL *stop))block;
- (MTDatacenterAddressSet *)addressSetForDatacenterWithId:(NSInteger)datacenterId;
- (MTTransportScheme *)transportSchemeForDatacenterWithid:(NSInteger)datacenterId media:(bool)media;
- (MTTransportScheme *)transportSchemeForDatacenterWithid:(NSInteger)datacenterId media:(bool)media optimal:(bool)optimal;
- (void)transportSchemeForDatacenterWithIdRequired:(NSInteger)datacenterId media:(bool)media;
- (void)invalidateTransportSchemeForDatacenterId:(NSInteger)datacenterId transportScheme:(MTTransportScheme *)transportScheme isProbablyHttp:(bool)isProbablyHttp media:(bool)media;
- (void)revalidateTransportSchemeForDatacenterId:(NSInteger)datacenterId transportScheme:(MTTransportScheme *)transportScheme media:(bool)media;

View File

@@ -672,7 +672,7 @@
return result;
}
- (MTTransportScheme *)transportSchemeForDatacenterWithid:(NSInteger)datacenterId media:(bool)media
- (MTTransportScheme *)transportSchemeForDatacenterWithid:(NSInteger)datacenterId media:(bool)media optimal:(bool)optimal
{
__block MTTransportScheme *result = nil;
[[MTContext contextQueue] dispatchOnQueue:^
@@ -694,7 +694,11 @@
if (result != nil && ![result isOptimal])
{
[self transportSchemeForDatacenterWithIdRequired:datacenterId moreOptimalThan:result beginWithHttp:false media:media];
if (optimal) {
result = [self defaultTransportSchemeForDatacenterWithId:datacenterId media:media];
} else {
[self transportSchemeForDatacenterWithIdRequired:datacenterId moreOptimalThan:result beginWithHttp:false media:media];
}
}
}
} synchronous:true];

View File

@@ -284,7 +284,7 @@ static const NSUInteger MTMaxUnacknowledgedMessageCount = 64;
[self setTransport:nil];
}
_transportScheme = [_context transportSchemeForDatacenterWithid:_datacenterId media:_media];
_transportScheme = [_context transportSchemeForDatacenterWithid:_datacenterId media:_media optimal:_apiEnvironment.socksProxySettings != nil];
if (_transportScheme == nil)
{