Android Chromoting - Close the Desktop view on disconnection

remoting/android/java/src/org/chromium/chromoting/Chromoting.java

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chromoting;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AccountManagerCallback;
 import android.accounts.AccountManagerFuture;
 import android.accounts.AuthenticatorException;
 import android.accounts.OperationCanceledException;
 import android.app.Activity;
+import android.app.ProgressDialog;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import org.chromium.chromoting.jni.JniInterface;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.IOException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.Scanner;
 
 /**
  * The user interface for querying and displaying a user's host list from the directory server. It
  * also requests and renews authentication tokens using the system account manager.
  */
-public class Chromoting extends Activity {
+public class Chromoting extends Activity implements JniInterface.ConnectionListener {
     /** Only accounts of this type will be selectable for authentication. */
     private static final String ACCOUNT_TYPE = "com.google";
 
     /** Scopes at which the authentication token we request will be valid. */
     private static final String TOKEN_SCOPE = "oauth2:https://www.googleapis.com/auth/chromoting " +
             "https://www.googleapis.com/auth/googletalk";
 
     /** Path from which to download a user's host list JSON object. */
     private static final String HOST_LIST_PATH =
             "https://www.googleapis.com/chromoting/v1/@me/hosts?key=";
@@ skipping 19 matching lines @@
 
     /** Greeting at the top of the displayed list. */
     private TextView mGreeting;
 
     /** Host list as it appears to the user. */
     private ListView mList;
 
     /** Callback handler to be used for network operations. */
     private Handler mNetwork;
 
+    /** Dialog for reporting connection progress. */
+    private ProgressDialog mProgressIndicator;
+
     /**
      * Called when the activity is first created. Loads the native library and requests an
      * authentication token from the system.
      */
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.main);
 
         // Get ahold of our view widgets.
@@ skipping 89 matching lines @@
         }
 
         return true;
     }
 
     /** Called when the user taps on a host entry. */
     public void connectToHost(JSONObject host) {
         try {
             synchronized (mLock) {
                 JniInterface.connectToHost(mAccount.name, mToken, host.getString("jabberId"),
-                        host.getString("hostId"), host.getString("publicKey"),
-                        new Runnable() {
-                                @Override
-                                public void run() {
-                                    startActivity(new Intent(Chromoting.this, Desktop.class));
-                                }
-                        });
+                        host.getString("hostId"), host.getString("publicKey"), this);
             }
         } catch (JSONException ex) {
             Log.w("host", ex);
             Toast.makeText(this, getString(R.string.error_reading_host),
                     Toast.LENGTH_LONG).show();
             // Close the application.
             finish();
         }
     }
 
@@ skipping 149 matching lines @@
             mList.setAdapter(displayer);
         } catch (JSONException ex) {
             Log.w("hostlist", ex);
             Toast.makeText(this, getString(R.string.error_cataloging_hosts),
                     Toast.LENGTH_LONG).show();
 
             // Close the application.
             finish();
         }
     }
+
+    @Override
+    public void onConnectionState(JniInterface.ConnectionListener.State state,
+            JniInterface.ConnectionListener.Error error) {
+        String stateText = getResources().getStringArray(R.array.protoc_states)[state.value()];
+        boolean dismissProgress = false;
+        switch (state) {
+            case INITIALIZING:
+            case CONNECTING:
+            case AUTHENTICATED:
+                // The connection is still being established, so we'll report the current progress.
+                if (mProgressIndicator == null) {
+                    mProgressIndicator = ProgressDialog.show(this,
+                            getString(R.string.progress_title), stateText, true, true,
+                            new DialogInterface.OnCancelListener() {
+                                @Override
+                                public void onCancel(DialogInterface dialog) {
+                                    JniInterface.disconnectFromHost();
+                                }
+                            });
+                } else {
+                    mProgressIndicator.setMessage(stateText);
+                }
+                break;
+
+            case CONNECTED:
+                dismissProgress = true;
+                Toast.makeText(this, stateText, Toast.LENGTH_SHORT).show();
+
+                // Display the remote desktop.
+                startActivityForResult(new Intent(this, Desktop.class), 0);
+                break;
+
+            case FAILED:
+                dismissProgress = true;
+                Toast.makeText(this, stateText + ": "
+                        + getResources().getStringArray(R.array.protoc_errors)[error.value()],
+                        Toast.LENGTH_LONG).show();
+
+                // Close the Desktop view, if it is currently running.
+                finishActivity(0);
+                break;
+
+            case CLOSED:
+                // No need to show toast in this case. Either the connection will have failed
+                // because of an error, which will trigger toast already. Or the disconnection will
+                // have been initiated by the user.
+                dismissProgress = true;
+                finishActivity(0);
+                break;
+        }

[frankf, 2014/01/10 18:31:05]

fidnbugs step on FYI bot is complaining about default case missing here:

http://build.chromium.org/p/chromium.fyi/builders/Android%20Builder%20%28dbg%...

[phoglund_chromium, 2014/01/13 16:19:49]

+1: please fix.

+
+        if (dismissProgress && mProgressIndicator != null) {
+            mProgressIndicator.dismiss();
+            mProgressIndicator = null;
+        }
+    }
 }