Update android example.

zsurocking · zsurocking · commit 0d89bb494206 · 2016-08-17T14:17:32.000-07:00
Show the full stacktrace when error happens and make the result text view scrollable.
diff --git a/examples/android/helloworld/app/src/main/java/io/grpc/helloworldexample/HelloworldActivity.java b/examples/android/helloworld/app/src/main/java/io/grpc/helloworldexample/HelloworldActivity.java
@@ -36,6 +36,7 @@
 import android.os.Bundle;
 import android.support.v7.app.ActionBarActivity;
 import android.text.TextUtils;
+import android.text.method.ScrollingMovementMethod;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
@@ -48,6 +49,8 @@
 import io.grpc.examples.helloworld.HelloReply;
 import io.grpc.examples.helloworld.HelloRequest;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.util.concurrent.TimeUnit;
 
 public class HelloworldActivity extends ActionBarActivity {
@@ -66,6 +69,7 @@ protected void onCreate(Bundle savedInstanceState) {
         mPortEdit = (EditText) findViewById(R.id.port_edit_text);
         mMessageEdit = (EditText) findViewById(R.id.message_edit_text);
         mResultText = (TextView) findViewById(R.id.grpc_response_text);
+        mResultText.setMovementMethod(new ScrollingMovementMethod());
     }
 
     public void sendMessage(View view) {
@@ -90,22 +94,22 @@ protected void onPreExecute() {
             mResultText.setText("");
         }
 
-        private String sayHello(ManagedChannel channel) {
-            GreeterGrpc.GreeterBlockingStub stub = GreeterGrpc.newBlockingStub(channel);
-            HelloRequest message = HelloRequest.newBuilder().setName(mMessage).build();
-            HelloReply reply = stub.sayHello(message);
-            return reply.getMessage();
-        }
-
         @Override
         protected String doInBackground(Void... nothing) {
             try {
                 mChannel = ManagedChannelBuilder.forAddress(mHost, mPort)
                     .usePlaintext(true)
                     .build();
-                return sayHello(mChannel);
+                GreeterGrpc.GreeterBlockingStub stub = GreeterGrpc.newBlockingStub(mChannel);
+                HelloRequest message = HelloRequest.newBuilder().setName(mMessage).build();
+                HelloReply reply = stub.sayHello(message);
+                return reply.getMessage();
             } catch (Exception e) {
-                return "Failed... : " + e.getMessage();
+                StringWriter sw = new StringWriter();
+                PrintWriter pw = new PrintWriter(sw);
+                e.printStackTrace(pw);
+                pw.flush();
+                return "Failed... : " + System.lineSeparator() + sw;
             }
         }
 
diff --git a/examples/android/helloworld/app/src/main/res/layout/activity_helloworld.xml b/examples/android/helloworld/app/src/main/res/layout/activity_helloworld.xml
@@ -49,6 +49,7 @@
             android:id="@+id/grpc_response_text"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:scrollbars = "vertical"
             android:textSize="16sp" />
 
-</LinearLayout>
+</LinearLayout>
