Server certificates improvements: fixed problems in devices with OpenSSL implementati...

[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 d13b71e..16c807c 100644 (file)
--- a/src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
@@ -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,7 +160,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             break;\r
         }\r
         case DIALOG_SSL_VALIDATOR: {\r
-            dialog = SslValidatorDialog.newInstance(this, mLastSslFailedResult, this);\r
+            dialog = SslValidatorDialog.newInstance(this, mLastSslUntrustedServerResult, this);\r
             break;\r
         }\r
         case DIALOG_CERT_NOT_SAVED: {\r
@@ -189,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
@@ -532,15 +532,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
-                if (mLastSslFailedResult.isSslRecoverableException())\r
-                    showDialog(DIALOG_SSL_VALIDATOR); \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
@@ -563,7 +566,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