Reimplemented string array resources.

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;
@@ skipping 211 matching lines @@
                 }
                 return true;
 
             default:
                 return super.onOptionsItemSelected(item);
         }
     }
 
     /** Called when the user taps on a host entry. */
     public void connectToHost(HostInfo host) {
+        mProgressIndicator = ProgressDialog.show(this,

[Jamie, 2014/03/05 20:51:31]

Any reason not to create the progress dialog before the first state change
notification, while the host name is available?

[Lambros, 2014/03/05 23:36:54]

I think that's fine.

+              host.name, getString(R.string.footer_connecting), true, true,
+              new DialogInterface.OnCancelListener() {
+                  @Override
+                  public void onCancel(DialogInterface dialog) {
+                      JniInterface.disconnectFromHost();
+                  }
+              });
         SessionConnector connector = new SessionConnector(this, this, mHostListLoader);
         connector.connectToHost(mAccount.name, mToken, host);
     }
 
     private void refreshHostList() {
         mTriedNewAuthToken = false;
 
         // The refresh button simply makes use of the currently-chosen account.
         AccountManager.get(this).getAuthToken(mAccount, TOKEN_SCOPE, null, this, this, null);
     }
@@ skipping 116 matching lines @@
         mGreeting.setText(getString(R.string.mode_me2me));
 
         ArrayAdapter<HostInfo> displayer = new HostListAdapter(this, R.layout.host, mHosts);
         Log.i("hostlist", "About to populate host list display");
         mList.setAdapter(displayer);
     }
 
     @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.footer_connecting), stateText, true, true,
-                            new DialogInterface.OnCancelListener() {
-                                @Override
-                                public void onCancel(DialogInterface dialog) {
-                                    JniInterface.disconnectFromHost();
-                                }
-                            });
-                } else {
-                    mProgressIndicator.setMessage(stateText);
-                }
+                // The connection is still being established.
                 break;
 
             case CONNECTED:
                 dismissProgress = true;
-                Toast.makeText(this, stateText, Toast.LENGTH_SHORT).show();

[Jamie, 2014/03/05 20:51:31]

I think this is unnecessary, although it might not always be obvious that you
are connected, for example if the screen is blanked. LMK if you'd like me to
reinstate it.

[Lambros, 2014/03/05 23:56:36]

If we maybe change the title (or subtitle) of this screen to the name of the
connected host, I think we won't need this tooltip anyway. Fine to remove it for
now.

[Jamie, 2014/03/06 01:29:32]

Do you want me to make that change in this CL, or leave it for now?

-
                 // 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();
-
+                Toast.makeText(this, getString(error.toResourceId()), 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;
 
             default:
                 // Unreachable, but required by Google Java style and findbugs.
                 assert false : "Unreached";
         }
 
         if (dismissProgress && mProgressIndicator != null) {
             mProgressIndicator.dismiss();
             mProgressIndicator = null;
         }
     }
 }