Fixed. App crash when setting a path without slash

[pub/Android/ownCloud.git] / 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 587c33e..b90ab85 100644 (file)
--- a/src/com/owncloud/android/authentication/SsoWebViewClient.java
+++ b/src/com/owncloud/android/authentication/SsoWebViewClient.java
@@ -24,24 +24,16 @@ import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 
-import com.owncloud.android.R;
 import com.owncloud.android.lib.common.network.NetworkUtils;
-import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;
-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.app.AlertDialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.graphics.Bitmap;
 import android.net.http.SslCertificate;
 import android.net.http.SslError;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
 import android.view.KeyEvent;
 import android.view.View;
 import android.webkit.CookieManager;
@@ -61,11 +53,9 @@ import android.webkit.WebViewClient;
  *   
  * @author David A. Velasco
  */
-public class SsoWebViewClient extends WebViewClient implements OnSslUntrustedCertListener {
+public class SsoWebViewClient extends WebViewClient {
         
     private static final String TAG = SsoWebViewClient.class.getSimpleName();
-
-    public final static String DIALOG_UNTRUSTED_CERT = "UNTRUSTED CERT";
     
     public interface SsoWebViewClientListener {
         public void onSsoFinished(String sessionCookie);
@@ -76,6 +66,7 @@ public class SsoWebViewClient extends WebViewClient implements OnSslUntrustedCer
     private WeakReference<SsoWebViewClientListener> mListenerRef;
     private String mTargetUrl;
     private String mLastReloadedUrlAtError;
+
     
     public SsoWebViewClient (Context context, Handler listenerHandler, SsoWebViewClientListener listener) {
         mContext = context;
@@ -96,6 +87,7 @@ public class SsoWebViewClient extends WebViewClient implements OnSslUntrustedCer
     @Override
     public void onPageStarted (WebView view, String url, Bitmap favicon) {
         Log_OC.d(TAG, "onPageStarted : " + url);
+        view.clearCache(true);
         super.onPageStarted(view, url, favicon);
     }
     
@@ -160,27 +152,22 @@ public class SsoWebViewClient extends WebViewClient implements OnSslUntrustedCer
         Log_OC.d(TAG, "onReceivedSslError : " + error);
         // Test 1
         X509Certificate x509Certificate = getX509CertificateFromError(error);
-        boolean isKnowServer = false;
+        boolean isKnownServer = false;
         
         if (x509Certificate != null) {
             Log_OC.d(TAG, "------>>>>> x509Certificate " + x509Certificate.toString());
             
             try {
-                isKnowServer = NetworkUtils.isCertInKnownServersStore((Certificate) x509Certificate, mContext);
+                isKnownServer = NetworkUtils.isCertInKnownServersStore((Certificate) x509Certificate, mContext);
             } catch (Exception e) {
                 Log_OC.e(TAG, "Exception: " + e.getMessage());
             }
         }
         
-         if (isKnowServer) {
+         if (isKnownServer) {
              handler.proceed();
          } else {
-             // Show a dialog with the certificate info
-             SslUntrustedCertDialog dialog = SslUntrustedCertDialog.newInstance(mContext, x509Certificate, this, handler);
-             FragmentManager fm = ((FragmentActivity)mContext).getSupportFragmentManager();
-             FragmentTransaction ft = fm.beginTransaction();
-             dialog.show(ft, DIALOG_UNTRUSTED_CERT);
-             handler.cancel();
+             ((AuthenticatorActivity)mContext).showUntrustedCertDialog(x509Certificate, error, handler);
          }
     }
     
@@ -210,6 +197,8 @@ public class SsoWebViewClient extends WebViewClient implements OnSslUntrustedCer
     @Override
     public void onReceivedHttpAuthRequest (WebView view, HttpAuthHandler handler, String host, String realm) {
         Log_OC.d(TAG, "onReceivedHttpAuthRequest : " + host);
+
+        ((AuthenticatorActivity)mContext).createAuthenticationDialog(view, handler);
     }
 
     @Override
@@ -244,20 +233,4 @@ public class SsoWebViewClient extends WebViewClient implements OnSslUntrustedCer
         Log_OC.d(TAG, "shouldOverrideKeyEvent : " + event);
         return false;
     }
-
-    @Override
-    public void onFailedSavingCertificate() {
-        AlertDialog.Builder builder = new AlertDialog.Builder(mContext);
-        builder.setMessage(mContext.getString(R.string.ssl_validator_not_saved));
-        builder.setCancelable(false);
-        builder.setPositiveButton(R.string.common_ok, new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                dialog.dismiss();
-            };
-        });
-        builder.create().show();
-        
-    }
-
 }