Android-Interop-test: fix lint errors/warnings, enable proguard.

This commit is contained in:
Xudong Ma 2015-08-04 10:44:12 -07:00
parent 41d875c7e3
commit 512134b095
5 changed files with 31 additions and 12 deletions

View File

@ -13,10 +13,17 @@ android {
versionName "1.0" versionName "1.0"
} }
buildTypes { buildTypes {
release { debug {
minifyEnabled false minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
} }
release {
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
lintOptions {
disable 'InvalidPackage', 'HardcodedText'
} }
} }

View File

@ -15,3 +15,6 @@
#-keepclassmembers class fqcn.of.javascript.interface.for.webview { #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *; # public *;
#} #}
-dontwarn com.google.common.**
-dontwarn okio.**

View File

@ -34,8 +34,10 @@ package io.grpc.android.integrationtest;
import com.google.protobuf.EmptyProtos; import com.google.protobuf.EmptyProtos;
import com.google.protobuf.nano.MessageNano; import com.google.protobuf.nano.MessageNano;
import android.annotation.TargetApi;
import android.net.SSLCertificateSocketFactory; import android.net.SSLCertificateSocketFactory;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Build;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.util.Log; import android.util.Log;
@ -49,6 +51,7 @@ import junit.framework.Assert;
import java.io.InputStream; import java.io.InputStream;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.io.StringWriter; import java.io.StringWriter;
import java.lang.RuntimeException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.security.KeyStore; import java.security.KeyStore;
import java.security.cert.CertificateFactory; import java.security.cert.CertificateFactory;
@ -343,8 +346,13 @@ public final class InteropTester extends AsyncTask<Void, Void, String> {
return context.getSocketFactory(); return context.getSocketFactory();
} }
@TargetApi(14)
private SSLCertificateSocketFactory getSslCertificateSocketFactory( private SSLCertificateSocketFactory getSslCertificateSocketFactory(
@Nullable InputStream testCa, String androidSocketFatoryTls) throws Exception { @Nullable InputStream testCa, String androidSocketFatoryTls) throws Exception {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH /* API level 14 */) {
throw new RuntimeException(
"android_socket_factory_tls doesn't work with API level less than 14.");
}
SSLCertificateSocketFactory factory = (SSLCertificateSocketFactory) SSLCertificateSocketFactory factory = (SSLCertificateSocketFactory)
SSLCertificateSocketFactory.getDefault(5000 /* Timeout in ms*/); SSLCertificateSocketFactory.getDefault(5000 /* Timeout in ms*/);
// Use HTTP/2.0 // Use HTTP/2.0

View File

@ -58,13 +58,15 @@ public class TesterInstrumentation extends Instrumentation {
public void onCreate(Bundle args) { public void onCreate(Bundle args) {
super.onCreate(args); super.onCreate(args);
testCase = args.getString("test_case", "empty_unary"); testCase = args.getString("test_case") != null ? args.getString("test_case") : "empty_unary";
host = args.getString("server_host", ""); host = args.getString("server_host");
port = Integer.parseInt(args.getString("server_port", "8080")); port = Integer.parseInt(args.getString("server_port"));
serverHostOverride = args.getString("server_host_override", null); serverHostOverride = args.getString("server_host_override");
useTls = Boolean.parseBoolean(args.getString("use_tls", "true")); useTls = args.getString("use_tls") != null ?
useTestCa = Boolean.parseBoolean(args.getString("use_test_ca", "false")); Boolean.parseBoolean(args.getString("use_tls")) : true;
androidSocketFactoryTls = args.getString("android_socket_factory_tls", null); useTestCa = args.getString("use_test_ca") != null ?
Boolean.parseBoolean(args.getString("use_test_ca")) : false;
androidSocketFactoryTls = args.getString("android_socket_factory_tls");
InputStream testCa = null; InputStream testCa = null;
if (useTestCa) { if (useTestCa) {

View File

@ -73,7 +73,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="12dp" android:paddingTop="12dp"
android:paddingBottom="12dp" android:paddingBottom="12dp"
android:textSize="16dp" android:textSize="16sp"
android:text="Response:" android:text="Response:"
/> />
@ -89,8 +89,7 @@
android:id="@+id/grpc_response_text" android:id="@+id/grpc_response_text"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="16dp" android:textSize="16sp"
android:layout_weight="1.0"
/> />
</ScrollView> </ScrollView>