Merge branch 'develop' into videoInstandUploads

[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 aa19314..27e1f5b 100644 (file)
--- a/src/com/owncloud/android/authentication/SsoWebViewClient.java
+++ b/src/com/owncloud/android/authentication/SsoWebViewClient.java
@@ -18,10 +18,7 @@
 package com.owncloud.android.authentication;
 
 import java.io.ByteArrayInputStream;
 package com.owncloud.android.authentication;
 
 import java.io.ByteArrayInputStream;

-import java.io.IOException;

 import java.lang.ref.WeakReference;
 import java.lang.ref.WeakReference;

-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;

 import java.security.cert.Certificate;
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.Certificate;
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;


@@ -149,35 +146,26 @@ public class SsoWebViewClient extends WebViewClient {
     }
     
     @Override
     }
     
     @Override

-    public void onReceivedSslError (WebView view, SslErrorHandler handler, SslError error) {
+    public void onReceivedSslError (final WebView view, final SslErrorHandler handler, SslError error) {

         Log_OC.d(TAG, "onReceivedSslError : " + error);
         // Test 1
         X509Certificate x509Certificate = getX509CertificateFromError(error);
         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 {
         
         if (x509Certificate != null) {
             Log_OC.d(TAG, "------>>>>> x509Certificate " + x509Certificate.toString());
             
             try {

-                isKnowServer = NetworkUtils.isCertInKnownServersStore((Certificate) x509Certificate, mContext);
-            } catch (KeyStoreException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            } catch (NoSuchAlgorithmException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            } catch (CertificateException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            } catch (IOException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
+                isKnownServer = NetworkUtils.isCertInKnownServersStore((Certificate) x509Certificate, mContext);
+            } catch (Exception e) {
+                Log_OC.e(TAG, "Exception: " + e.getMessage());

             }
         }
             }
         }

-         if (isKnowServer) {
+        
+         if (isKnownServer) {

              handler.proceed();
          } else {
              handler.proceed();
          } else {

-             
+             ((AuthenticatorActivity)mContext).showUntrustedCertDialog(x509Certificate, error, handler);

          }
     }
     
          }
     }
     


@@ -200,12 +188,7 @@ public class SsoWebViewClient extends WebViewClient {
             } catch (CertificateException e) {
                 x509Certificate = null;
             }
             } catch (CertificateException e) {
                 x509Certificate = null;
             }

-        }
-
-//        if (x509Certificate != null) {
-//            Log_OC.d(TAG, "------>>>>> x509Certificate " + x509Certificate.toString());
-//        }
-        
+        }        

         return x509Certificate;
     }
     
         return x509Certificate;
     }