Fixed local path NULL when making favourite a file not down ; fixed change of local...

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / activity / AuthenticatorActivity.java

diff --git a/src/com/owncloud/android/ui/activity/AuthenticatorActivity.java b/src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
index 86d9c4b..52714b6 100644 (file)
--- a/src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
@@ -24,12 +24,12 @@ import java.net.URL;
 import com.owncloud.android.AccountUtils;\r
 import com.owncloud.android.authenticator.AccountAuthenticator;\r
 import com.owncloud.android.authenticator.AuthenticationRunnable;\r
-import com.owncloud.android.authenticator.ConnectionCheckOperation;\r
 import com.owncloud.android.authenticator.OnAuthenticationResultListener;\r
 import com.owncloud.android.authenticator.OnConnectCheckListener;\r
 import com.owncloud.android.ui.dialog.SslValidatorDialog;\r
 import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener;\r
 import com.owncloud.android.network.OwnCloudClientUtils;\r
+import com.owncloud.android.operations.ConnectionCheckOperation;\r
 import com.owncloud.android.operations.OnRemoteOperationListener;\r
 import com.owncloud.android.operations.RemoteOperation;\r
 import com.owncloud.android.operations.RemoteOperationResult;\r
@@ -89,7 +89,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     private static final String IS_SSL_CONN = "IS_SSL_CONN";\r
     private int mStatusText, mStatusIcon;\r
     private boolean mStatusCorrect, mIsSslConn;\r
-    private RemoteOperationResult mLastSslFailedResult;\r
+    private RemoteOperationResult mLastSslUntrustedServerResult;\r
 \r
     public static final String PARAM_USERNAME = "param_Username";\r
     public static final String PARAM_HOSTNAME = "param_Hostname";\r
@@ -160,10 +160,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             break;\r
         }\r
         case DIALOG_SSL_VALIDATOR: {\r
-            SslValidatorDialog sslValidator = SslValidatorDialog.newInstance(this, mLastSslFailedResult, this);\r
-            if (sslValidator != null)\r
-                dialog = sslValidator;\r
-            // else, mLastSslFailedResult is not an SSL fail recoverable by accepting the server certificate as reliable; dialog will still be null\r
+            dialog = SslValidatorDialog.newInstance(this, mLastSslUntrustedServerResult, this);\r
             break;\r
         }\r
         case DIALOG_CERT_NOT_SAVED: {\r
@@ -192,7 +189,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         case DIALOG_CERT_NOT_SAVED:\r
             break;\r
         case DIALOG_SSL_VALIDATOR: {\r
-            ((SslValidatorDialog)dialog).updateResult(mLastSslFailedResult);\r
+            ((SslValidatorDialog)dialog).updateResult(mLastSslUntrustedServerResult);\r
             break;\r
         }\r
         default:\r
@@ -243,8 +240,6 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                     AccountAuthenticator.ACCOUNT_TYPE);\r
             intent.putExtra(AccountManager.KEY_USERDATA, username);\r
 \r
-            accManager.setUserData(account, AccountAuthenticator.KEY_OC_URL,\r
-                    url.toString());\r
             accManager.setUserData(account,\r
                     AccountAuthenticator.KEY_OC_VERSION, mConnChkRunnable\r
                             .getDiscoveredVersion().toString());\r
@@ -481,8 +476,14 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             onFocusChange(findViewById(R.id.host_URL), false);\r
         } else if (v.getId() == R.id.viewPassword) {\r
             TextView view = (TextView) findViewById(R.id.account_password);\r
-            int input_type = InputType.TYPE_CLASS_TEXT\r
-                    | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD;\r
+            int input_type = view.getInputType();\r
+            if ((input_type & InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD) == InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD) {\r
+                input_type = InputType.TYPE_CLASS_TEXT\r
+                        | InputType.TYPE_TEXT_VARIATION_PASSWORD;\r
+            } else {\r
+                input_type = InputType.TYPE_CLASS_TEXT\r
+                        | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD;\r
+            }\r
             view.setInputType(input_type);\r
         }\r
     }\r
@@ -535,18 +536,18 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                    mStatusText = R.string.auth_incorrect_address_title;\r
                    break;\r
                    \r
-               case SSL_ERROR:\r
+            case SSL_RECOVERABLE_PEER_UNVERIFIED:\r
                 mStatusIcon = R.drawable.common_error;\r
-                mStatusText = R.string.auth_ssl_general_error_title;\r
-                //mStatusText = R.string.auth_ssl_unverified_server_title;\r
-                mLastSslFailedResult = result;\r
-                showDialog(DIALOG_SSL_VALIDATOR);   // see onCreateDialog(); it does not always show the dialog\r
-                   /*if (InteractiveSslValidatorActivity.isRecoverable(result)) {\r
-                       Intent intent = new Intent(this, InteractiveSslValidatorActivity.class);\r
-                       startActivityForResult(intent, REQUEST_FOR_SSL_CERT);\r
-                   }*/\r
-                   break;\r
+                mStatusText = R.string.auth_ssl_unverified_server_title;\r
+                mLastSslUntrustedServerResult = result;\r
+                showDialog(DIALOG_SSL_VALIDATOR); \r
+                break;\r
                    \r
+            case SSL_ERROR:\r
+                mStatusIcon = R.drawable.common_error;\r
+                mStatusText = R.string.auth_ssl_general_error_title;\r
+                break;\r
+                \r
                case HOST_NOT_AVAILABLE:\r
                    mStatusIcon = R.drawable.common_error;\r
                    mStatusText = R.string.auth_unknown_host_title;\r
@@ -569,7 +570,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 mStatusText = R.string.auth_unknown_error_title;\r
                 break;\r
                default:\r
-                   Log.e(TAG, "Incorrect connection checker result type: " + operation);\r
+                   Log.e(TAG, "Incorrect connection checker result type: " + result.getHttpCode());\r
                }\r
                setResultIconAndText(mStatusIcon, mStatusText);\r
                if (!mStatusCorrect)\r