Update library reference

[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 83f70ac..46a980b 100644 (file)
--- a/src/com/owncloud/android/authentication/SsoWebViewClient.java
+++ b/src/com/owncloud/android/authentication/SsoWebViewClient.java
@@ -1,5 +1,8 @@
-/* ownCloud Android client application
- *   Copyright (C) 2012-2013 ownCloud Inc.
+/**
+ *   ownCloud Android client application
+ *
+ *   @author David A. Velasco
+ *   Copyright (C) 2015 ownCloud Inc.

  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,


@@ -24,17 +27,16 @@ import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 

-import android.app.AlertDialog;
-import android.app.AlertDialog.Builder;
+import com.owncloud.android.lib.common.network.NetworkUtils;
+import com.owncloud.android.lib.common.utils.Log_OC;
+

 import android.content.Context;
 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.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.text.InputType;

 import android.view.KeyEvent;
 import android.view.View;
 import android.webkit.CookieManager;
 import android.view.KeyEvent;
 import android.view.View;
 import android.webkit.CookieManager;


@@ -43,12 +45,6 @@ import android.webkit.SslErrorHandler;
 import android.webkit.WebResourceResponse;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.webkit.WebResourceResponse;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;

-import android.widget.EditText;
-import android.widget.LinearLayout;
-
-import com.owncloud.android.R;
-import com.owncloud.android.lib.common.network.NetworkUtils;
-import com.owncloud.android.utils.Log_OC;

 
 
 /**
 
 
 /**


@@ -57,8 +53,6 @@ import com.owncloud.android.utils.Log_OC;
  * 
  * Assumes that the single-sign-on is kept thanks to a cookie set at the end of the
  * authentication process.
  * 
  * Assumes that the single-sign-on is kept thanks to a cookie set at the end of the
  * authentication process.

- *   
- * @author David A. Velasco

  */
 public class SsoWebViewClient extends WebViewClient {
         
  */
 public class SsoWebViewClient extends WebViewClient {
         


@@ -73,6 +67,7 @@ public class SsoWebViewClient extends WebViewClient {
     private WeakReference<SsoWebViewClientListener> mListenerRef;
     private String mTargetUrl;
     private String mLastReloadedUrlAtError;
     private WeakReference<SsoWebViewClientListener> mListenerRef;
     private String mTargetUrl;
     private String mLastReloadedUrlAtError;

+

     
     public SsoWebViewClient (Context context, Handler listenerHandler, SsoWebViewClientListener listener) {
         mContext = context;
     
     public SsoWebViewClient (Context context, Handler listenerHandler, SsoWebViewClientListener listener) {
         mContext = context;


@@ -93,6 +88,7 @@ public class SsoWebViewClient extends WebViewClient {
     @Override
     public void onPageStarted (WebView view, String url, Bitmap favicon) {
         Log_OC.d(TAG, "onPageStarted : " + url);
     @Override
     public void onPageStarted (WebView view, String url, Bitmap favicon) {
         Log_OC.d(TAG, "onPageStarted : " + url);

+        view.clearCache(true);

         super.onPageStarted(view, url, favicon);
     }
     
         super.onPageStarted(view, url, favicon);
     }
     


@@ -129,7 +125,7 @@ public class SsoWebViewClient extends WebViewClient {
             view.setVisibility(View.GONE);
             CookieManager cookieManager = CookieManager.getInstance();
             final String cookies = cookieManager.getCookie(url);
             view.setVisibility(View.GONE);
             CookieManager cookieManager = CookieManager.getInstance();
             final String cookies = cookieManager.getCookie(url);

-            Log_OC.d(TAG, "Cookies: " + cookies);
+            //Log_OC.d(TAG, "Cookies: " + cookies);

             if (mListenerHandler != null && mListenerRef != null) {
                 // this is good idea because onPageFinished is not running in the UI thread
                 mListenerHandler.post(new Runnable() {
             if (mListenerHandler != null && mListenerRef != null) {
                 // this is good idea because onPageFinished is not running in the UI thread
                 mListenerHandler.post(new Runnable() {


@@ -146,22 +142,14 @@ public class SsoWebViewClient extends WebViewClient {
         } 
     }
     
         } 
     }
     

-    
-    @Override
-    public void doUpdateVisitedHistory (WebView view, String url, boolean isReload) {
-        Log_OC.d(TAG, "doUpdateVisitedHistory : " + url);
-    }
-    

     @Override
     public void onReceivedSslError (final WebView view, final SslErrorHandler handler, SslError error) {
     @Override
     public void onReceivedSslError (final WebView view, final SslErrorHandler handler, SslError error) {

-        Log_OC.d(TAG, "onReceivedSslError : " + error);
+        Log_OC.e(TAG, "onReceivedSslError : " + error);

         // Test 1
         X509Certificate x509Certificate = getX509CertificateFromError(error);
         boolean isKnownServer = false;
         
         if (x509Certificate != null) {
         // Test 1
         X509Certificate x509Certificate = getX509CertificateFromError(error);
         boolean isKnownServer = false;
         
         if (x509Certificate != null) {

-            Log_OC.d(TAG, "------>>>>> x509Certificate " + x509Certificate.toString());
-            

             try {
                 isKnownServer = NetworkUtils.isCertInKnownServersStore((Certificate) x509Certificate, mContext);
             } catch (Exception e) {
             try {
                 isKnownServer = NetworkUtils.isCertInKnownServersStore((Certificate) x509Certificate, mContext);
             } catch (Exception e) {


@@ -202,97 +190,8 @@ public class SsoWebViewClient extends WebViewClient {
     @Override
     public void onReceivedHttpAuthRequest (WebView view, HttpAuthHandler handler, String host, String realm) {
         Log_OC.d(TAG, "onReceivedHttpAuthRequest : " + host);
     @Override
     public void onReceivedHttpAuthRequest (WebView view, HttpAuthHandler handler, String host, String realm) {
         Log_OC.d(TAG, "onReceivedHttpAuthRequest : " + host);

-//        Toast.makeText(mContext, "onReceivedHttpAuthRequest : " + host, Toast.LENGTH_LONG).show();
-
-        createAuthenticationDialog(view, handler);
-
-    }
-
-    @Override
-    public WebResourceResponse shouldInterceptRequest (WebView view, String url) {
-        Log_OC.d(TAG, "shouldInterceptRequest : " + url);
-        return null;
-    }
-    
-    @Override
-    public void onLoadResource (WebView view, String url) {
-        Log_OC.d(TAG, "onLoadResource : " + url);   
-    }
-    
-    @Override
-    public void onReceivedLoginRequest (WebView view, String realm, String account, String args) {
-        Log_OC.d(TAG, "onReceivedLoginRequest : " + realm + ", " + account + ", " + args);
-    }
-    
-    @Override
-    public void onScaleChanged (WebView view, float oldScale, float newScale) {
-        Log_OC.d(TAG, "onScaleChanged : " + oldScale + " -> " + newScale);
-        super.onScaleChanged(view, oldScale, newScale);
-    }

 
 

-    @Override
-    public void onUnhandledKeyEvent (WebView view, KeyEvent event) {
-        Log_OC.d(TAG, "onUnhandledKeyEvent : " + event);
-    }
-    
-    @Override
-    public boolean shouldOverrideKeyEvent (WebView view, KeyEvent event) {
-        Log_OC.d(TAG, "shouldOverrideKeyEvent : " + event);
-        return false;
+        ((AuthenticatorActivity)mContext).createAuthenticationDialog(view, handler);

     }
 
     }
 

-    /**
-     * Create dialog for request authentication to the user
-     * @param webView
-     * @param handler
-     */
-    private void createAuthenticationDialog(WebView webView, HttpAuthHandler handler) {
-        final WebView mWebView = webView;
-        final HttpAuthHandler mHandler = handler;
-
-        // Create field for username
-        final EditText usernameET = new EditText(mContext);
-        usernameET.setHint(mContext.getText(R.string.auth_username));
-
-        // Create field for password
-        final EditText passwordET = new EditText(mContext);
-        passwordET.setHint(mContext.getText(R.string.auth_password));
-        passwordET.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
-
-        // Prepare LinearLayout for dialog
-        LinearLayout ll = new LinearLayout(mContext);
-        ll.setOrientation(LinearLayout.VERTICAL);
-        ll.addView(usernameET);
-        ll.addView(passwordET);
-
-        Builder authDialog = new AlertDialog
-                .Builder(mContext)
-                .setTitle(mContext.getText(R.string.saml_authentication_required_text))
-                .setView(ll)
-                .setCancelable(false)
-                .setPositiveButton(mContext.getText(R.string.common_ok),
-                        new DialogInterface.OnClickListener() {
-                    public void onClick(DialogInterface dialog, int whichButton) {
-
-                        String username = usernameET.getText().toString().trim();
-                        String password = passwordET.getText().toString().trim();
-
-                        // Proceed with the authentication
-                        mHandler.proceed(username, password);
-                        dialog.dismiss();
-                    }
-                })
-                .setNegativeButton(mContext.getText(R.string.common_cancel),
-                        new DialogInterface.OnClickListener() {
-                    public void onClick(DialogInterface dialog, int whichButton) {
-                        dialog.dismiss();
-                        mWebView.stopLoading();
-                    }
-                });
-
-        if (mWebView!=null) {
-            authDialog.show();
-        }
-
-    }

 }
 }