X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/48f13c8adc5c4b9bc4ca96bf13939a7d7cfae562..f3d61ef57832e5ca37f00ec6702207e0f208bb30:/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 86d9c4b6..d13b71e4 100644
--- a/src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
@@ -160,10 +160,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             break;
         }
         case DIALOG_SSL_VALIDATOR: {
-            SslValidatorDialog sslValidator = SslValidatorDialog.newInstance(this, mLastSslFailedResult, this);
-            if (sslValidator != null)
-                dialog = sslValidator;
-            // else, mLastSslFailedResult is not an SSL fail recoverable by accepting the server certificate as reliable; dialog will still be null
+            dialog = SslValidatorDialog.newInstance(this, mLastSslFailedResult, this);
             break;
         }
         case DIALOG_CERT_NOT_SAVED: {
@@ -540,11 +537,8 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 mStatusText = R.string.auth_ssl_general_error_title;
                 //mStatusText = R.string.auth_ssl_unverified_server_title;
                 mLastSslFailedResult = result;
-                showDialog(DIALOG_SSL_VALIDATOR);   // see onCreateDialog(); it does not always show the dialog
-	            /*if (InteractiveSslValidatorActivity.isRecoverable(result)) {
-	                Intent intent = new Intent(this, InteractiveSslValidatorActivity.class);
-	                startActivityForResult(intent, REQUEST_FOR_SSL_CERT);
-	            }*/
+                if (mLastSslFailedResult.isSslRecoverableException())
+                    showDialog(DIALOG_SSL_VALIDATOR); 
 	            break;
 	            
 	        case HOST_NOT_AVAILABLE: