Clean-up excess of logs in SAML dialog

diff --git a/src/com/owncloud/android/authentication/SsoWebViewClient.java b/src/com/owncloud/android/authentication/SsoWebViewClient.java
index 60178a8..2aaecb4 100644 (file)
--- a/src/com/owncloud/android/authentication/SsoWebViewClient.java
+++ b/src/com/owncloud/android/authentication/SsoWebViewClient.java
@@ -1,5 +1,5 @@
 /* ownCloud Android client application
 /* ownCloud Android client application

- *   Copyright (C) 2012-2013 ownCloud Inc.
+ *   Copyright (C) 2012-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,


@@ -120,11 +120,11 @@ public class SsoWebViewClient extends WebViewClient {
     public void onPageFinished (WebView view, String url) {
         Log_OC.d(TAG, "onPageFinished : " + url);
         mLastReloadedUrlAtError = null;
     public void onPageFinished (WebView view, String url) {
         Log_OC.d(TAG, "onPageFinished : " + url);
         mLastReloadedUrlAtError = null;

-        CookieManager cookieManager = CookieManager.getInstance();
-        final String cookies = cookieManager.getCookie(url);
-        Log_OC.d(TAG, "Cookies: " + cookies);

         if (url.startsWith(mTargetUrl)) {
             view.setVisibility(View.GONE);
         if (url.startsWith(mTargetUrl)) {
             view.setVisibility(View.GONE);

+            CookieManager cookieManager = CookieManager.getInstance();
+            final String cookies = cookieManager.getCookie(url);
+            //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() {


@@ -141,22 +141,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) {


@@ -201,36 +193,4 @@ public class SsoWebViewClient extends WebViewClient {
         ((AuthenticatorActivity)mContext).createAuthenticationDialog(view, handler);
     }
 
         ((AuthenticatorActivity)mContext).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;
-    }

 }
 }

diff --git a/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java b/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java
index 2b00e9b..3e8a85f 100644 (file)
--- a/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java
+++ b/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java
@@ -17,8 +17,6 @@
 
 package com.owncloud.android.ui.dialog;
 
 
 package com.owncloud.android.ui.dialog;
 

-import org.apache.commons.httpclient.methods.PostMethod;
-

 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Dialog;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Dialog;


@@ -78,7 +76,6 @@ public class SamlWebViewDialog extends SherlockDialogFragment {
      * @return              New dialog instance, ready to show.
      */
     public static SamlWebViewDialog newInstance(String url, String targetUrl) {
      * @return              New dialog instance, ready to show.
      */
     public static SamlWebViewDialog newInstance(String url, String targetUrl) {

-        Log_OC.d(TAG, "New instance");

         SamlWebViewDialog fragment = new SamlWebViewDialog();
         Bundle args = new Bundle();
         args.putString(ARG_INITIAL_URL, url);
         SamlWebViewDialog fragment = new SamlWebViewDialog();
         Bundle args = new Bundle();
         args.putString(ARG_INITIAL_URL, url);


@@ -90,13 +87,12 @@ public class SamlWebViewDialog extends SherlockDialogFragment {
     
     public SamlWebViewDialog() {
         super();
     
     public SamlWebViewDialog() {
         super();

-        Log_OC.d(TAG, "constructor");

     }
     
     
     @Override
     public void onAttach(Activity activity) {
     }
     
     
     @Override
     public void onAttach(Activity activity) {

-        Log_OC.d(TAG, "onAttach");
+        Log_OC.v(TAG, "onAttach");

         super.onAttach(activity);
         try {
             mSsoWebViewClientListener = (SsoWebViewClientListener) activity;
         super.onAttach(activity);
         try {
             mSsoWebViewClientListener = (SsoWebViewClientListener) activity;


@@ -112,7 +108,7 @@ public class SamlWebViewDialog extends SherlockDialogFragment {
     @SuppressLint("SetJavaScriptEnabled")
     @Override
     public void onCreate(Bundle savedInstanceState) {
     @SuppressLint("SetJavaScriptEnabled")
     @Override
     public void onCreate(Bundle savedInstanceState) {

-        Log_OC.d(TAG, "onCreate, savedInstanceState is " + savedInstanceState);
+        Log_OC.v(TAG, "onCreate, savedInstanceState is " + savedInstanceState);

         super.onCreate(savedInstanceState);
         
         setRetainInstance(true);
         super.onCreate(savedInstanceState);
         
         setRetainInstance(true);


@@ -134,7 +130,7 @@ public class SamlWebViewDialog extends SherlockDialogFragment {
     @SuppressLint("SetJavaScriptEnabled")
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
     @SuppressLint("SetJavaScriptEnabled")
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {

-        Log_OC.d(TAG, "onCreateView, savedInsanceState is " + savedInstanceState);
+        Log_OC.v(TAG, "onCreateView, savedInsanceState is " + savedInstanceState);

         
         // Inflate layout of the dialog  
         RelativeLayout ssoRootView = (RelativeLayout) inflater.inflate(R.layout.sso_dialog, container, false);  // null parent view because it will go in the dialog layout
         
         // Inflate layout of the dialog  
         RelativeLayout ssoRootView = (RelativeLayout) inflater.inflate(R.layout.sso_dialog, container, false);  // null parent view because it will go in the dialog layout


@@ -177,7 +173,7 @@ public class SamlWebViewDialog extends SherlockDialogFragment {
 
     @Override
     public void onSaveInstanceState(Bundle outState) {
 
     @Override
     public void onSaveInstanceState(Bundle outState) {

-        Log_OC.d(TAG, "onSaveInstanceState being CALLED");
+        Log_OC.v(TAG, "onSaveInstanceState being CALLED");

         super.onSaveInstanceState(outState);
         
         // save URLs
         super.onSaveInstanceState(outState);
         
         // save URLs


@@ -187,7 +183,7 @@ public class SamlWebViewDialog extends SherlockDialogFragment {
 
     @Override
     public void onDestroyView() {
 
     @Override
     public void onDestroyView() {

-        Log_OC.d(TAG, "onDestroyView");
+        Log_OC.v(TAG, "onDestroyView");

         
         if ((ViewGroup)mSsoWebView.getParent() != null) {
             ((ViewGroup)mSsoWebView.getParent()).removeView(mSsoWebView);
         
         if ((ViewGroup)mSsoWebView.getParent() != null) {
             ((ViewGroup)mSsoWebView.getParent()).removeView(mSsoWebView);


@@ -199,8 +195,6 @@ public class SamlWebViewDialog extends SherlockDialogFragment {
         Dialog dialog = getDialog();
         if ((dialog != null)) {
             dialog.setOnDismissListener(null);
         Dialog dialog = getDialog();
         if ((dialog != null)) {
             dialog.setOnDismissListener(null);

-            //dialog.dismiss();
-            //dialog.setDismissMessage(null);

         }
         
         super.onDestroyView();
         }
         
         super.onDestroyView();


@@ -208,13 +202,13 @@ public class SamlWebViewDialog extends SherlockDialogFragment {
     
     @Override
     public void onDestroy() {
     
     @Override
     public void onDestroy() {

-        Log_OC.d(TAG, "onDestroy");
+        Log_OC.v(TAG, "onDestroy");

         super.onDestroy();
     }
 
     @Override
     public void onDetach() {
         super.onDestroy();
     }
 
     @Override
     public void onDetach() {

-        Log_OC.d(TAG, "onDetach");
+        Log_OC.v(TAG, "onDetach");

         mSsoWebViewClientListener = null;
         mWebViewClient = null;
         super.onDetach();
         mSsoWebViewClientListener = null;
         mWebViewClient = null;
         super.onDetach();


@@ -234,39 +228,39 @@ public class SamlWebViewDialog extends SherlockDialogFragment {
     
     @Override
     public void onStart() {
     
     @Override
     public void onStart() {

-        Log_OC.d(TAG, "onStart");
+        Log_OC.v(TAG, "onStart");

         super.onStart();
     }
 
     @Override
     public void onStop() {
         super.onStart();
     }
 
     @Override
     public void onStop() {

-        Log_OC.d(TAG, "onStop");
+        Log_OC.v(TAG, "onStop");

         super.onStop();
     }
 
     @Override
     public void onResume() {
         super.onStop();
     }
 
     @Override
     public void onResume() {

-        Log_OC.d(TAG, "onResume");
+        Log_OC.v(TAG, "onResume");

         super.onResume();
         mSsoWebView.onResume();
     }
 
     @Override
     public void onPause() {
         super.onResume();
         mSsoWebView.onResume();
     }
 
     @Override
     public void onPause() {

-        Log_OC.d(TAG, "onPause");
+        Log_OC.v(TAG, "onPause");

         mSsoWebView.onPause();
         super.onPause();
     }
     
     @Override
     public int show (FragmentTransaction transaction, String tag) {
         mSsoWebView.onPause();
         super.onPause();
     }
     
     @Override
     public int show (FragmentTransaction transaction, String tag) {

-        Log_OC.d(TAG, "show (transaction)");
+        Log_OC.v(TAG, "show (transaction)");

         return super.show(transaction, tag);
     }
 
     @Override
     public void show (FragmentManager manager, String tag) {
         return super.show(transaction, tag);
     }
 
     @Override
     public void show (FragmentManager manager, String tag) {

-        Log_OC.d(TAG, "show (manager)");
+        Log_OC.v(TAG, "show (manager)");

         super.show(manager, tag);
     }
     
         super.show(manager, tag);
     }