diff --git a/android-interop-testing/app/proguard-rules.pro b/android-interop-testing/app/proguard-rules.pro index 96bf83ca4d..dec098b312 100644 --- a/android-interop-testing/app/proguard-rules.pro +++ b/android-interop-testing/app/proguard-rules.pro @@ -11,3 +11,7 @@ -dontwarn com.google.common.** -dontwarn okio.** + +# Need to create channel through service provider. +-keepnames class io.grpc.ManagedChannelProvider +-keep class io.grpc.okhttp.OkHttpChannelProvider diff --git a/android-interop-testing/app/src/main/java/io/grpc/android/integrationtest/InteropTester.java b/android-interop-testing/app/src/main/java/io/grpc/android/integrationtest/InteropTester.java index efb35aa30e..9ac9d690c9 100644 --- a/android-interop-testing/app/src/main/java/io/grpc/android/integrationtest/InteropTester.java +++ b/android-interop-testing/app/src/main/java/io/grpc/android/integrationtest/InteropTester.java @@ -49,6 +49,7 @@ import static junit.framework.Assert.fail; import io.grpc.CallOptions; import io.grpc.ClientCall; import io.grpc.ManagedChannel; +import io.grpc.ManagedChannelBuilder; import io.grpc.Metadata; import io.grpc.StatusRuntimeException; import io.grpc.android.integrationtest.nano.Messages; @@ -133,7 +134,7 @@ public final class InteropTester extends AsyncTask { this.testCase = testCase; this.listener = listener; - OkHttpChannelBuilder channelBuilder = OkHttpChannelBuilder.forAddress(host, port); + ManagedChannelBuilder channelBuilder = ManagedChannelBuilder.forAddress(host, port); if (serverHostOverride != null) { // Force the hostname to match the cert the server uses. channelBuilder.overrideAuthority(serverHostOverride); @@ -146,13 +147,13 @@ public final class InteropTester extends AsyncTask { } else { factory = getSslSocketFactory(testCa); } - channelBuilder.negotiationType(NegotiationType.TLS); - channelBuilder.sslSocketFactory(factory); + ((OkHttpChannelBuilder) channelBuilder).negotiationType(NegotiationType.TLS); + ((OkHttpChannelBuilder) channelBuilder).sslSocketFactory(factory); } catch (Exception e) { throw new RuntimeException(e); } } else { - channelBuilder.negotiationType(NegotiationType.PLAINTEXT); + channelBuilder.usePlaintext(true); } channel = channelBuilder.build();