X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/9cac3b60a574f2b82cb3b33b45d3a4ba9a2f4d3e..208d44d61632c3796aeab3c6e37c58c39c643bb1:/src/com/owncloud/android/authentication/SsoWebViewClient.java diff --git a/src/com/owncloud/android/authentication/SsoWebViewClient.java b/src/com/owncloud/android/authentication/SsoWebViewClient.java index e498d0d8..6ce86689 100644 --- a/src/com/owncloud/android/authentication/SsoWebViewClient.java +++ b/src/com/owncloud/android/authentication/SsoWebViewClient.java @@ -25,12 +25,7 @@ import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; import com.owncloud.android.lib.common.network.NetworkUtils; -import com.actionbarsherlock.app.SherlockFragmentActivity; -import com.owncloud.android.R; -import com.owncloud.android.ui.dialog.SslUntrustedCertDialog; -import com.owncloud.android.ui.dialog.SslUntrustedCertDialogABSTRACT; -import com.owncloud.android.ui.dialog.SslUntrustedCertDialog.OnSslUntrustedCertListener; -import com.owncloud.android.utils.Log_OC; +import com.owncloud.android.lib.common.utils.Log_OC; import android.content.Context; import android.graphics.Bitmap; @@ -39,8 +34,6 @@ import android.net.http.SslError; import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentTransaction; import android.view.KeyEvent; import android.view.View; import android.webkit.CookieManager; @@ -171,17 +164,8 @@ public class SsoWebViewClient extends WebViewClient { if (isKnownServer) { handler.proceed(); - } else if (x509Certificate != null) { - // Show a dialog with the certificate info - ((AuthenticatorActivity)mContext).showUntrustedCertDialog(x509Certificate, error); - handler.cancel(); } else { - // Show a dialog with the certificate information available in SslError (not full) - SslUntrustedCertDialogABSTRACT dialog = SslUntrustedCertDialogABSTRACT.newInstanceForEmptySslError(error, handler); - FragmentManager fm = ((SherlockFragmentActivity)mContext).getSupportFragmentManager(); - FragmentTransaction ft = fm.beginTransaction(); - dialog.show(ft, AuthenticatorActivity.DIALOG_UNTRUSTED_CERT); - // let's forward the handler, and see what happens... + ((AuthenticatorActivity)mContext).showUntrustedCertDialog(x509Certificate, error, handler); } }