aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Muxi Yan <mxyan@google.com>2018-10-18 15:22:16 -0700
committerGravatar Muxi Yan <mxyan@google.com>2018-10-18 15:22:16 -0700
commitd92c62fcde8559393aee346e5518faecb6f1301b (patch)
tree5e0f76152d1812ab4f0e65969f09dd477d03ebbc
parent31de6d67e7557208b9d1e8c37300fb3f6b45a47d (diff)
Enable Cronet with old API
-rw-r--r--src/objective-c/GRPCClient/private/GRPCHost.m16
1 files changed, 15 insertions, 1 deletions
diff --git a/src/objective-c/GRPCClient/private/GRPCHost.m b/src/objective-c/GRPCClient/private/GRPCHost.m
index 7c31b10636..6bb5996a1b 100644
--- a/src/objective-c/GRPCClient/private/GRPCHost.m
+++ b/src/objective-c/GRPCClient/private/GRPCHost.m
@@ -113,7 +113,21 @@ static NSMutableDictionary *kHostCache;
options.PEMPrivateKey = _PEMPrivateKey;
options.PEMCertChain = _pemCertChain;
options.hostNameOverride = _hostNameOverride;
- options.transportType = _transportType;
+#ifdef GRPC_COMPILE_WITH_CRONET
+ // By old API logic, insecure channel precedes Cronet channel; Cronet channel preceeds default
+ // channel.
+ if ([GRPCCall isUsingCronet]) {
+ if (_transportType == GRPCTransportTypeInsecure) {
+ options.transportType = GRPCTransportTypeInsecure;
+ } else {
+ NSAssert(_transportType == GRPCTransportTypeDefault, @"Invalid transport type");
+ options.transportType = GRPCTransportTypeCronet;
+ }
+ } else
+#endif
+ {
+ options.transportType = _transportType;
+ }
options.logContext = _logContext;
return options;