Merge branch 'develop' into check_server_certificates_in_SSO_webview

diff --combined res/values/strings.xml
index 829b4bb,c8f370e..6967fd0
--- 1/res/values/strings.xml
--- 2/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -166,6 -166,7 +166,7 @@@
        <string name="auth_connecting_auth_server">Connecting to authentication server…</string>
        <string name="auth_unsupported_auth_method">The server does not support this authentication method</string>    
        <string name="auth_unsupported_multiaccount">%1$s does not support multiple accounts</string>
+       <string name="auth_fail_get_user_name">Your server is not returning a correct user id, contact with your admin please</string>
      
      <string name="fd_keep_in_sync">Keep file up to date</string>
      <string name="common_rename">Rename</string>
@@@ -215,8 -216,6 +216,8 @@@
        <string name="ssl_validator_label_validity_to">To:</string>
        <string name="ssl_validator_label_signature">Signature:</string>
        <string name="ssl_validator_label_signature_algorithm">Algorithm:</string>
 +      <string name="ssl_validator_null_cert">The certificate could not be shown.</string>
 +      <string name="ssl_validator_no_info_about_error">- No information about the error</string>
                        
      <string name="placeholder_sentence">This is a placeholder</string>
      <string name="placeholder_filename">placeholder.txt</string>

diff --combined src/com/owncloud/android/authentication/AuthenticatorActivity.java
index 2fabc33,e604a95..9b66869
--- 1/src/com/owncloud/android/authentication/AuthenticatorActivity.java
--- 2/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@@ -18,8 -18,6 +18,8 @@@
  \r
  package com.owncloud.android.authentication;\r
  \r
 +import java.security.cert.X509Certificate;\r
 +\r
  import android.accounts.Account;\r
  import android.accounts.AccountManager;\r
  import android.app.AlertDialog;\r
@@@ -31,13 -29,10 +31,13 @@@ import android.content.SharedPreference
  import android.graphics.Rect;\r
  import android.graphics.drawable.Drawable;\r
  import android.net.Uri;\r
 +import android.net.http.SslError;\r
  import android.os.Bundle;\r
  import android.os.Handler;\r
  import android.preference.PreferenceManager;\r
  import android.support.v4.app.Fragment;\r
 +import android.support.v4.app.FragmentManager;\r
 +import android.support.v4.app.FragmentTransaction;\r
  import android.text.Editable;\r
  import android.text.InputType;\r
  import android.text.TextWatcher;\r
@@@ -48,7 -43,6 +48,7 @@@ import android.view.View.OnFocusChangeL
  import android.view.View.OnTouchListener;\r
  import android.view.Window;\r
  import android.view.inputmethod.EditorInfo;\r
 +import android.webkit.SslErrorHandler;\r
  import android.widget.Button;\r
  import android.widget.CheckBox;\r
  import android.widget.EditText;\r
@@@ -65,7 -59,6 +65,7 @@@ import com.owncloud.android.lib.common.
  import com.owncloud.android.lib.common.OwnCloudClient;\r
  import com.owncloud.android.operations.OAuth2GetAccessToken;\r
  
 +import com.owncloud.android.lib.common.network.CertificateCombinedException;\r
  import com.owncloud.android.lib.common.operations.OnRemoteOperationListener;\r
  import com.owncloud.android.lib.resources.status.GetRemoteStatusOperation;\r
  import com.owncloud.android.lib.common.operations.RemoteOperation;\r
@@@ -75,8 -68,8 +75,8 @@@ import com.owncloud.android.lib.resourc
  import com.owncloud.android.lib.resources.users.GetRemoteUserNameOperation;\r
  
  import com.owncloud.android.ui.dialog.SamlWebViewDialog;\r
 -import com.owncloud.android.ui.dialog.SslValidatorDialog;\r
 -import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener;\r
 +import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;\r
 +import com.owncloud.android.ui.dialog.SslUntrustedCertDialog.OnSslUntrustedCertListener;\r
  import com.owncloud.android.utils.Log_OC;\r
  import com.owncloud.android.lib.resources.status.OwnCloudVersion;\r
  \r
@@@ -87,8 -80,7 +87,8 @@@
   * @author David A. Velasco\r
   */\r
  public class AuthenticatorActivity extends AccountAuthenticatorActivity\r
 -implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeListener, OnEditorActionListener, SsoWebViewClientListener{\r
 +    implements  OnRemoteOperationListener, OnFocusChangeListener, OnEditorActionListener, \r
 +    SsoWebViewClientListener, OnSslUntrustedCertListener {\r
  \r
      private static final String TAG = AuthenticatorActivity.class.getSimpleName();\r
  \r
@@@ -121,8 -113,9 +121,8 @@@
      private static final String AUTH_OPTIONAL = "optional";\r
      \r
      private static final int DIALOG_LOGIN_PROGRESS = 0;\r
 -    private static final int DIALOG_SSL_VALIDATOR = 1;\r
 -    private static final int DIALOG_CERT_NOT_SAVED = 2;\r
 -    private static final int DIALOG_OAUTH2_LOGIN_PROGRESS = 3;\r
 +    private static final int DIALOG_CERT_NOT_SAVED = 1;\r
 +    private static final int DIALOG_OAUTH2_LOGIN_PROGRESS = 2;\r
  \r
      public static final byte ACTION_CREATE = 0;\r
      public static final byte ACTION_UPDATE_TOKEN = 1;\r
@@@ -142,6 -135,7 +142,6 @@@
      private Thread mOperationThread;\r
      private GetRemoteStatusOperation mOcServerChkOperation;\r
      private ExistenceCheckRemoteOperation mAuthCheckOperation;\r
 -    private RemoteOperationResult mLastSslUntrustedServerResult;\r
  \r
      private Uri mNewCapturedUriFromOAuth2Redirection;\r
  \r
@@@ -174,8 -168,6 +174,8 @@@
      \r
      private boolean mResumed; // Control if activity is resumed\r
  \r
 +    public static String DIALOG_UNTRUSTED_CERT = "DIALOG_UNTRUSTED_CERT";\r
 +\r
  \r
      /**\r
       * {@inheritDoc}\r
@@@ -815,6 -807,7 +815,7 @@@
      }\r
  \r
      private void onGetUserNameFinish(GetRemoteUserNameOperation operation, RemoteOperationResult result) {\r
+         \r
          if (result.isSuccess()) {\r
              boolean success = false;\r
              String username = operation.getUserName();\r
@@@ -839,7 -832,7 +840,7 @@@
              if (success)\r
                  finish();\r
          } else {\r
-             updateAuthStatusIconAndText(result);\r
+             updateStatusIconFailUserName();\r
              showAuthStatus();\r
              Log_OC.e(TAG, "Access to user name failed: " + result.getLogMessage());\r
          }\r
@@@ -900,7 -893,8 +901,7 @@@
  \r
              /// very special case (TODO: move to a common place for all the remote operations)\r
              if (result.getCode() == ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED) {\r
 -                mLastSslUntrustedServerResult = result;\r
 -                showDialog(DIALOG_SSL_VALIDATOR); \r
 +                showUntrustedCertDialog(result);\r
              }\r
  \r
              /// retrieve discovered version and normalize server URL\r
@@@ -1111,6 -1105,11 +1112,11 @@@
      }\r
  \r
  \r
+     private void updateStatusIconFailUserName(){\r
+         mAuthStatusIcon = android.R.drawable.ic_secure;\r
+         mAuthStatusText = R.string.auth_fail_get_user_name;\r
+     }\r
+     \r
      /**\r
       * Processes the result of the request for and access token send \r
       * to an OAuth authorization server.\r
@@@ -1199,7 -1198,8 +1205,7 @@@
  \r
              // very special case (TODO: move to a common place for all the remote operations) (dangerous here?)\r
              if (result.getCode() == ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED) {\r
 -                mLastSslUntrustedServerResult = result;\r
 -                showDialog(DIALOG_SSL_VALIDATOR); \r
 +                showUntrustedCertDialog(result);\r
              }\r
  \r
          } else {    // authorization fail due to client side - probably wrong credentials\r
@@@ -1331,6 -1331,10 +1337,6 @@@
          case DIALOG_CERT_NOT_SAVED:\r
          case DIALOG_OAUTH2_LOGIN_PROGRESS:\r
              break;\r
 -        case DIALOG_SSL_VALIDATOR: {\r
 -            ((SslValidatorDialog)dialog).updateResult(mLastSslUntrustedServerResult);\r
 -            break;\r
 -        }\r
          default:\r
              Log_OC.e(TAG, "Incorrect dialog called with id = " + id);\r
          }\r
@@@ -1381,6 -1385,11 +1387,6 @@@
              dialog = working_dialog;\r
              break;\r
          }\r
 -        case DIALOG_SSL_VALIDATOR: {\r
 -            /// TODO start to use new dialog interface, at least for this (it is a FragmentDialog already)\r
 -            dialog = SslValidatorDialog.newInstance(this, mLastSslUntrustedServerResult, this);\r
 -            break;\r
 -        }\r
          case DIALOG_CERT_NOT_SAVED: {\r
              AlertDialog.Builder builder = new AlertDialog.Builder(this);\r
              builder.setMessage(getResources().getString(R.string.ssl_validator_not_saved));\r
@@@ -1531,6 -1540,23 +1537,6 @@@
      }\r
      \r
      /**\r
 -     * Called from SslValidatorDialog when a new server certificate was correctly saved.\r
 -     */\r
 -    public void onSavedCertificate() {\r
 -        checkOcServer();\r
 -    }\r
 -\r
 -    /**\r
 -     * Called from SslValidatorDialog when a new server certificate could not be saved \r
 -     * when the user requested it.\r
 -     */\r
 -    @Override\r
 -    public void onFailedSavingCertificate() {\r
 -        showDialog(DIALOG_CERT_NOT_SAVED);\r
 -    }\r
 -\r
 -\r
 -    /**\r
       *  Called when the 'action' button in an IME is pressed ('enter' in software keyboard).\r
       * \r
       *  Used to trigger the authentication check when the user presses 'enter' after writing the password, \r
@@@ -1644,91 -1670,5 +1650,91 @@@
          }\r
          return super.onTouchEvent(event);\r
      }\r
 +\r
 +\r
 +    /**\r
 +     * Show untrusted cert dialog \r
 +     */\r
 +    public void showUntrustedCertDialog(X509Certificate x509Certificate, SslError error, SslErrorHandler handler) {\r
 +        // Show a dialog with the certificate info\r
 +        SslUntrustedCertDialog dialog = null;\r
 +        if (x509Certificate == null) {\r
 +            dialog = SslUntrustedCertDialog.newInstanceForEmptySslError(error, handler);\r
 +        } else {\r
 +            dialog = SslUntrustedCertDialog.newInstanceForFullSslError(x509Certificate, error, handler);\r
 +        }\r
 +        FragmentManager fm = getSupportFragmentManager();\r
 +        FragmentTransaction ft = fm.beginTransaction();\r
 +        dialog.show(ft, DIALOG_UNTRUSTED_CERT);\r
 +    }\r
 +    \r
 +    /**\r
 +     * Show untrusted cert dialog \r
 +     */\r
 +    public void showUntrustedCertDialog(RemoteOperationResult result) {\r
 +        // Show a dialog with the certificate info\r
 +        SslUntrustedCertDialog dialog = SslUntrustedCertDialog.newInstanceForFullSslError((CertificateCombinedException)result.getException());\r
 +        FragmentManager fm = getSupportFragmentManager();\r
 +        FragmentTransaction ft = fm.beginTransaction();\r
 +        dialog.show(ft, DIALOG_UNTRUSTED_CERT);\r
 +        \r
 +    }\r
      \r
 +    /**\r
 +     * Dismiss untrusted cert dialog\r
 +     */\r
 +    public void dismissUntrustedCertDialog(){\r
 +        /*Fragment frag = getSupportFragmentManager().findFragmentByTag(DIALOG_UNTRUSTED_CERT);\r
 +        if (frag != null) {\r
 +            SslErrorViewAdapter dialog = (SslErrorViewAdapter) frag;\r
 +            dialog.dismiss();\r
 +        }\r
 +        */\r
 +    }\r
 +    \r
 +    /**\r
 +     * Called from SslValidatorDialog when a new server certificate was correctly saved.\r
 +     */\r
 +    public void onSavedCertificate() {\r
 +        Fragment fd = getSupportFragmentManager().findFragmentByTag(TAG_SAML_DIALOG);\r
 +        if (fd == null) {\r
 +            // if SAML dialog is not shown, the SslDialog was shown due to an SSL error in the server check\r
 +            checkOcServer();\r
 +        }\r
 +    }\r
 +\r
 +    /**\r
 +     * Called from SslValidatorDialog when a new server certificate could not be saved \r
 +     * when the user requested it.\r
 +     */\r
 +    @Override\r
 +    public void onFailedSavingCertificate() {\r
 +        showDialog(DIALOG_CERT_NOT_SAVED);\r
 +        cancelWebView();\r
 +    }\r
 +\r
 +    @Override\r
 +    public void onCancelCertificate() {\r
 +        cancelWebView();\r
 +    }\r
 +    \r
 +\r
 +    public void cancelWebView() {\r
 +        Fragment fd = getSupportFragmentManager().findFragmentByTag(TAG_SAML_DIALOG);\r
 +        if (fd != null && fd instanceof SherlockDialogFragment) {\r
 +            Dialog d = ((SherlockDialogFragment)fd).getDialog();\r
 +            if (d != null && d.isShowing()) {\r
 +                d.dismiss();\r
 +            }\r
 +        }\r
 +        \r
 +    }\r
 +\r
 +    public void reloadWebView() {\r
 +        Fragment fd = getSupportFragmentManager().findFragmentByTag(TAG_SAML_DIALOG);\r
 +        if (fd != null && fd instanceof SamlWebViewDialog) {\r
 +                ((SamlWebViewDialog) fd).reloadWebView();\r
 +        }\r
 +    }\r
 +\r
  }\r